From ecb13e41807d578078cddbf3e11bf3f119bc2dbe Mon Sep 17 00:00:00 2001
From: David Sehnal <david.sehnal@gmail.com>
Date: Wed, 18 Jul 2018 16:55:08 +0200
Subject: [PATCH] StructureQuery.run name tweak
---
src/mol-app/ui/visualization/sequence-view.tsx | 2 +-
src/mol-model/structure/query/query.ts | 2 +-
src/perf-tests/structure.ts | 4 ++--
src/servers/model/server/query.ts | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/mol-app/ui/visualization/sequence-view.tsx b/src/mol-app/ui/visualization/sequence-view.tsx
index 7d9bf1430..640f81a6d 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 acbd39ff6..98f8ab4d7 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 347065088..22708aa0e 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 00551c2c0..908f16dc8 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.');
--
GitLab