diff --git a/src/mol-app/ui/visualization/sequence-view.tsx b/src/mol-app/ui/visualization/sequence-view.tsx index 7d9bf14301011078b26c7f53915fe03f71c5fdd5..640f81a6d5e9d6d6bb2904d0338e06434faa1345 100644 --- a/src/mol-app/ui/visualization/sequence-view.tsx +++ b/src/mol-app/ui/visualization/sequence-view.tsx @@ -41,7 +41,7 @@ class EntitySequence extends React.Component<{ ctx: Context, seq: StructureSeque } const query = createQuery(this.props.seq.entityId, seqId); - const loci = StructureSelection.toLoci(StructureQuery.run1(query, this.props.structure)); + const loci = StructureSelection.toLoci(StructureQuery.run(query, this.props.structure)); if (loci.elements.length === 0) InteractivityEvents.HighlightLoci.dispatch(this.props.ctx, EmptyLoci); else InteractivityEvents.HighlightLoci.dispatch(this.props.ctx, loci); } diff --git a/src/mol-model/structure/query/query.ts b/src/mol-model/structure/query/query.ts index acbd39ff65f9bc1e9d4fddf04eeaa8f3d426429d..98f8ab4d71b559f1fe9acc4d390f618a8daf1d1d 100644 --- a/src/mol-model/structure/query/query.ts +++ b/src/mol-model/structure/query/query.ts @@ -10,7 +10,7 @@ import { QueryContext } from './context'; interface StructureQuery { (ctx: QueryContext): StructureSelection } namespace StructureQuery { - export function run1(query: StructureQuery, structure: Structure) { + export function run(query: StructureQuery, structure: Structure) { return query(new QueryContext(structure)) } } diff --git a/src/perf-tests/structure.ts b/src/perf-tests/structure.ts index 347065088dcbbcea98d1c393e8a1dc66021671cf..22708aa0e91e43d097186ad18b074d2b747f2bb6 100644 --- a/src/perf-tests/structure.ts +++ b/src/perf-tests/structure.ts @@ -331,7 +331,7 @@ export namespace PropertyAccess { radius: 5, wholeResidues: true }); - const surr = StructureSelection.unionStructure(StructureQuery.run1(q1, a)); + const surr = StructureSelection.unionStructure(StructureQuery.run(q1, a)); console.timeEnd('symmetry') // for (const u of surr.units) { @@ -372,7 +372,7 @@ export namespace PropertyAccess { // } function query(q: StructureQuery, s: Structure) { - return StructureQuery.run1(q, s); + return StructureQuery.run(q, s); } export async function run() { diff --git a/src/servers/model/server/query.ts b/src/servers/model/server/query.ts index 00551c2c02ba7085cb33d58cb3352aba0e7b4df5..908f16dc833fc56c814b2691d3df213265f9c093 100644 --- a/src/servers/model/server/query.ts +++ b/src/servers/model/server/query.ts @@ -36,7 +36,7 @@ export async function resolveJob(job: Job, writer: Writer) { ? await job.queryDefinition.structureTransform(job.normalizedParams, wrappedStructure.structure) : wrappedStructure.structure; const query = job.queryDefinition.query(job.normalizedParams, structure); - const result = StructureSelection.unionStructure(StructureQuery.run1(query, structure)); + const result = StructureSelection.unionStructure(StructureQuery.run(query, structure)); perf.end('query'); ConsoleLogger.logId(job.id, 'Query', 'Query finished.');