diff --git a/src/mol-model/structure/query/queries/atom-set.ts b/src/mol-model/structure/query/queries/atom-set.ts index 6f9f966177cce86868e0f78186f3cf176d4d7862..ae30073d41dd67c1624b0bb2177882ecafec4c00 100644 --- a/src/mol-model/structure/query/queries/atom-set.ts +++ b/src/mol-model/structure/query/queries/atom-set.ts @@ -16,14 +16,11 @@ import { QueryContext, QueryFn } from '../context'; export function atomCount(ctx: QueryContext) { - return (ctx: QueryContext) => { - const all = StructureSelection.Singletons(ctx.currentStructure, ctx.currentStructure); - const x: number = StructureSelection.structureCount(all); - return x; - }; + return ctx.currentStructure.elementCount; } -export function countQuery(ctx: QueryContext, query: StructureQuery) { + +export function countQuery(query: StructureQuery) { return (ctx: QueryContext) => { const sel = query(ctx); const x: number = StructureSelection.structureCount(sel);