From d60c88c506f0a4a6a0965c0edbebaec059d30282 Mon Sep 17 00:00:00 2001
From: "DESKTOP-O6LIMN9\\ludov" <ludovic.autin@gmail.com>
Date: Wed, 8 Apr 2020 14:53:36 +0200
Subject: [PATCH] parsing the selection string
---
src/apps/viewer/extensions/cellpack/data.ts | 4 ++--
src/apps/viewer/extensions/cellpack/model.ts | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/apps/viewer/extensions/cellpack/data.ts b/src/apps/viewer/extensions/cellpack/data.ts
index 67e59cd02..a22c19df5 100644
--- a/src/apps/viewer/extensions/cellpack/data.ts
+++ b/src/apps/viewer/extensions/cellpack/data.ts
@@ -54,8 +54,8 @@ export interface Ingredient {
source: IngredientSource;
results: [Vec3, Quat][];
name: string;
- positions?: [Positions];//Vec3[]];
- radii?: [Radii];//number[]];
+ positions?: [Positions];//Vec3[]];CoarseGraind Beads coordinates LOD
+ radii?: [Radii];//number[]];CoarseGraind Beads radii LOD
/** Number of `curveX` properties in the object where `X` is a 0-indexed number */
nbCurve?: number;
/** Curve properties are Vec3[] but that is not expressable in TypeScript */
diff --git a/src/apps/viewer/extensions/cellpack/model.ts b/src/apps/viewer/extensions/cellpack/model.ts
index 58fa20a6c..0e9a3d067 100644
--- a/src/apps/viewer/extensions/cellpack/model.ts
+++ b/src/apps/viewer/extensions/cellpack/model.ts
@@ -57,7 +57,9 @@ async function getStructure(model: Model, source:IngredientSource, props: { asse
structure = await StructureSymmetry.buildAssembly(structure, assembly).run()
}
if (source.selection){
- const asymIds:string[] = source.selection.split(":")
+ //use NGL selection string or :A or :B etc...
+ const asymIds:string[] = source.selection.replace(" :","").split(" or")
+ console.log(asymIds)
const query = MS.struct.modifier.union([
MS.struct.generator.atomGroups({
'chain-test': MS.core.set.has([MS.set(...asymIds), MS.ammp('label_asym_id')])
--
GitLab