Explorar el Código

remove namedAtomProperty from vmd/parser.ts, removed as any from definition of withSameAtomProperties, un-commented out the continue line in filter.ts

yakomaxa hace 2 años
padre
commit
24ebd44f87

+ 1 - 1
src/mol-model/structure/query/queries/filters.ts

@@ -91,7 +91,7 @@ export function getCurrentStructurePropertiesInternal(ctx: QueryContext, props:
         const fn = props;
         //        if (Unit.isAtomic(unit)) fn = props.atomic;
         //        else fn = props.coarse;
-        //        if (!fn) continue;
+        if (!fn) continue;
 
         for (let j = 0, _j = elements.length; j < _j; j++) {
             l.element = elements[j];

+ 1 - 1
src/mol-script/runtime/query/table.ts

@@ -211,7 +211,7 @@ const symbols = [
     // ============= FILTERS ================
     D(MolScript.structureQuery.filter.pick, (ctx, xs) => Queries.filters.pick(xs[0] as any, xs['test'])(ctx)),
     D(MolScript.structureQuery.filter.first, (ctx, xs) => Queries.filters.first(xs[0] as any)(ctx)),
-    D(MolScript.structureQuery.filter.withSameAtomProperties, (ctx, xs) => Queries.filters.withSameAtomProperties(xs[0] as any, xs['source'] as any, xs['property'] as any)(ctx)),
+    D(MolScript.structureQuery.filter.withSameAtomProperties, (ctx, xs) => Queries.filters.withSameAtomProperties(xs[0] as any, xs['source'] as any, xs['property'])(ctx)),
     D(MolScript.structureQuery.filter.intersectedBy, (ctx, xs) => Queries.filters.areIntersectedBy(xs[0] as any, xs['by'] as any)(ctx)),
     D(MolScript.structureQuery.filter.within, (ctx, xs) => Queries.filters.within({
         query: xs[0] as any,

+ 1 - 1
src/mol-script/transpilers/vmd/parser.ts

@@ -130,7 +130,7 @@ const lang = P.MonadicParser.createLanguage({
     Expression: function (r: any) {
         return P.MonadicParser.alt(
             r.RangeListProperty,
-	    r.NamedAtomProperties,
+//	    r.NamedAtomProperties,
             r.ValueQuery,
             r.Keywords,
         );