From 4dbabdf3501978338b2338535c602c9fcab54202 Mon Sep 17 00:00:00 2001
From: David Sehnal <david.sehnal@gmail.com>
Date: Sat, 2 Nov 2019 13:13:31 +0100
Subject: [PATCH] mol-plugin: fix SubstructureParentHelper
---
.../util/substructure-parent-helper.ts | 26 ++++++++++++++-----
1 file changed, 20 insertions(+), 6 deletions(-)
diff --git a/src/mol-plugin/util/substructure-parent-helper.ts b/src/mol-plugin/util/substructure-parent-helper.ts
index d7449a0c4..eef04b2f0 100644
--- a/src/mol-plugin/util/substructure-parent-helper.ts
+++ b/src/mol-plugin/util/substructure-parent-helper.ts
@@ -12,32 +12,46 @@ import { PluginStateObject } from '../state/objects';
export { SubstructureParentHelper };
class SubstructureParentHelper {
- private root = new Map<Structure, string>();
+ private root = new Map<Structure, { ref: string, count: number }>();
private tracked = new Map<string, Structure>();
get(s: Structure): StateObjectCell<PluginStateObject.Molecule.Structure> | undefined {
const r = this.root.get(s);
if (!r) return;
- return this.plugin.state.dataState.cells.get(r);
+ return this.plugin.state.dataState.cells.get(r.ref);
}
private addMapping(state: State, ref: string, obj: StateObject) {
if (!PluginStateObject.Molecule.Structure.is(obj)) return;
const parent = state.select(StateSelection.Generators.byRef(ref).rootOfType([PluginStateObject.Molecule.Structure]))[0];
+
this.tracked.set(ref, obj.data);
+
+ // if the structure is already present in the tree, do not rewrite the root.
+ if (this.root.has(obj.data)) {
+ this.root.get(obj.data)!.count++;
+ return;
+ }
+
if (!parent) {
- this.root.set(obj.data, ref);
+ this.root.set(obj.data, { ref, count : 1 });
} else {
- this.root.set(obj.data, parent.transform.ref);
+ this.root.set(obj.data, { ref: parent.transform.ref, count: 1 });
}
}
private removeMapping(ref: string) {
if (!this.tracked.has(ref)) return;
+
const s = this.tracked.get(ref)!;
this.tracked.delete(ref);
- this.root.get(s);
- this.root.delete(s);
+
+ const root = this.root.get(s)!;
+ if (root.count > 1) {
+ root.count--;
+ } else {
+ this.root.delete(s);
+ }
}
private updateMapping(state: State, ref: string, oldObj: StateObject | undefined, obj: StateObject) {
--
GitLab