From 9942b0e389dedddfbb185ca481bb7b948b7c07d6 Mon Sep 17 00:00:00 2001
From: Alexander Rose <alexander.rose@weirdbyte.de>
Date: Fri, 1 Nov 2019 13:41:39 -0700
Subject: [PATCH] avoid extra selection in cellpack loader
---
src/apps/viewer/extensions/cellpack/model.ts | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/apps/viewer/extensions/cellpack/model.ts b/src/apps/viewer/extensions/cellpack/model.ts
index 320a20256..9a6bbae59 100644
--- a/src/apps/viewer/extensions/cellpack/model.ts
+++ b/src/apps/viewer/extensions/cellpack/model.ts
@@ -385,17 +385,17 @@ export const LoadCellPackModel = StateAction.build({
const hue = [Math.max(0, hcl[0] - 35), Math.min(360, hcl[0] + 35)] as [number, number]
const p = { packing: i, baseUrl: params.baseUrl }
- const expression = params.preset.traceOnly
- ? MS.struct.generator.atomGroups({
+ let cellpackTree = tree.apply(StructureFromCellpack, p)
+ if (params.preset.traceOnly) {
+ const expression = MS.struct.generator.atomGroups({
'atom-test': MS.core.logic.or([
MS.core.rel.eq([MS.ammp('label_atom_id'), 'CA']),
MS.core.rel.eq([MS.ammp('label_atom_id'), 'P'])
])
})
- : MS.struct.generator.all()
-
- tree.apply(StructureFromCellpack, p)
- .apply(StateTransforms.Model.StructureSelectionFromExpression, { expression }, { state: { isGhost: true } })
+ cellpackTree = cellpackTree.apply(StateTransforms.Model.StructureSelectionFromExpression, { expression }, { state: { isGhost: true } })
+ }
+ cellpackTree
.apply(StateTransforms.Representation.StructureRepresentation3D,
StructureRepresentation3DHelpers.createParams(ctx, Structure.Empty, {
repr: getReprParams(ctx, params.preset),
--
GitLab