Skip to content
Snippets Groups Projects
Commit 198e2f20 authored by Alexander Rose's avatar Alexander Rose
Browse files

support for currentSelection in StructureSelectionHelper and surroundings query

parent 6ae3d411
No related branches found
No related tags found
No related merge requests found
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
import { MolScriptBuilder as MS } from '../../mol-script/language/builder'; import { MolScriptBuilder as MS } from '../../mol-script/language/builder';
import { StateSelection } from '../../mol-state'; import { StateSelection } from '../../mol-state';
import { PluginStateObject } from '../state/objects'; import { PluginStateObject } from '../state/objects';
import { QueryContext, StructureSelection, StructureQuery } from '../../mol-model/structure'; import { QueryContext, StructureSelection, StructureQuery, StructureElement } from '../../mol-model/structure';
import { compile } from '../../mol-script/runtime/query/compiler'; import { compile } from '../../mol-script/runtime/query/compiler';
import { Loci } from '../../mol-model/loci'; import { Loci } from '../../mol-model/loci';
import { PluginContext } from '../context'; import { PluginContext } from '../context';
...@@ -185,6 +185,17 @@ const coarse = MS.struct.modifier.union([ ...@@ -185,6 +185,17 @@ const coarse = MS.struct.modifier.union([
}) })
]) ])
const surroundings = MS.struct.modifier.union([
MS.struct.modifier.exceptBy({
0: MS.struct.modifier.includeSurroundings({
0: MS.internal.generator.current(),
radius: 5,
'as-whole-residues': true
}),
by: MS.internal.generator.current()
})
])
export const StructureSelectionQueries = { export const StructureSelectionQueries = {
all, all,
polymer, polymer,
...@@ -202,6 +213,7 @@ export const StructureSelectionQueries = { ...@@ -202,6 +213,7 @@ export const StructureSelectionQueries = {
connectedOnly, connectedOnly,
modified, modified,
coarse, coarse,
surroundings,
} }
export const CompiledStructureSelectionQueries = (function () { export const CompiledStructureSelectionQueries = (function () {
...@@ -241,7 +253,13 @@ export class StructureSelectionHelper { ...@@ -241,7 +253,13 @@ export class StructureSelectionHelper {
for (const so of this.structures) { for (const so of this.structures) {
const s = so.obj!.data const s = so.obj!.data
const result = compiled(new QueryContext(s))
const current = this.plugin.helpers.structureSelectionManager.get(s)
const currentSelection = Loci.isEmpty(current)
? StructureSelection.Empty(s)
: StructureSelection.Singletons(s, StructureElement.Loci.toStructure(current))
const result = compiled(new QueryContext(s, { currentSelection }))
const loci = StructureSelection.toLociWithSourceUnits(result) const loci = StructureSelection.toLociWithSourceUnits(result)
this._set(modifier, loci) this._set(modifier, loci)
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment