Browse Source

Remove comment-out lines. Moved un-bracketed residue name to the supported feature

yakomaxa 2 years ago
parent
commit
bf5f26cb12

+ 2 - 2
src/mol-script/transpilers/_spec/rasmol.spec.ts

@@ -30,10 +30,10 @@ const general = {
         '  [ALA] and [VAL]',
         // within with whitespaces
         'within (   5 ,  [HEM] ) ',
-    ],
-    unsupported: [
         // un-braketed residue name
         'LEU and ILE',
+    ],
+    unsupported: [
         // un-parenthesized residue index
         '100-120',
         // within in the head or the middle of sentence

+ 0 - 16
src/mol-script/transpilers/rasmol/macroproperties.ts

@@ -8,9 +8,6 @@ import { MolScriptBuilder } from '../../../mol-script/language/builder';
 const B = MolScriptBuilder;
 import { PropertyDict } from '../types';
 
-// const reFloat = /[-+]?[0-9]*\.?[0-9]+/;
-// const rePosInt = /[0-9]+/;
-
 function atomNameListMap(x: string) { return x.split(',').map(B.atomName); }
 function listMap(x: string) { return x.split(',').map(x => x.replace(/^["']|["']$/g, '')); }
 function rangeMap(x: string) {
@@ -44,19 +41,6 @@ function elementListMap(x: string) {
     return x.split(',').map(B.struct.type.elementSymbol);
 }
 
-// const sstrucDict: { [k: string]: string } = {
-//    H: 'helix',
-//    S: 'beta',
-//    L: 'none'
-// };
-// function sstrucListMap(x: string) {
-//    return {
-//        flags: B.struct.type.secondaryStructureFlags(
-//            x.toUpperCase().split('+').map(ss => sstrucDict[ss] || 'none')
-//        )
-//    };
-// }
-
 export const macroproperties: PropertyDict = {
     symbol: {
         '@desc': 'chemical-symbol-list: list of 1- or 2-letter chemical symbols from the periodic table',