From 529c6ac81c1df9c01e6d472adc2e11d828f4acd5 Mon Sep 17 00:00:00 2001
From: David Sehnal <david.sehnal@gmail.com>
Date: Tue, 24 Sep 2019 14:07:42 +0200
Subject: [PATCH] mol-plugin: fix SelectionFromScript & volume streaming bugs
---
.../behavior/dynamic/volume-streaming/behavior.ts | 2 +-
src/mol-plugin/state/transforms/model.ts | 2 +-
src/mol-plugin/util/structure-comlex-helper.ts | 6 ++++++
3 files changed, 8 insertions(+), 2 deletions(-)
create mode 100644 src/mol-plugin/util/structure-comlex-helper.ts
diff --git a/src/mol-plugin/behavior/dynamic/volume-streaming/behavior.ts b/src/mol-plugin/behavior/dynamic/volume-streaming/behavior.ts
index 951ec3946..8a5da762c 100644
--- a/src/mol-plugin/behavior/dynamic/volume-streaming/behavior.ts
+++ b/src/mol-plugin/behavior/dynamic/volume-streaming/behavior.ts
@@ -212,7 +212,7 @@ export namespace VolumeStreaming {
});
this.subscribeObservable(this.plugin.behaviors.interaction.click, ({ current, buttons, modifiers }) => {
- if (!Binding.match(this.params.bindings.clickVolumeAroundOnly, buttons, modifiers)) return;
+ if (!Binding.match(this.params.bindings.clickVolumeAroundOnly || DefaultBindings.clickVolumeAroundOnly, buttons, modifiers)) return;
if (this.params.view.name !== 'selection-box') {
this.lastLoci = current;
} else {
diff --git a/src/mol-plugin/state/transforms/model.ts b/src/mol-plugin/state/transforms/model.ts
index 5bc63f833..921f3d939 100644
--- a/src/mol-plugin/state/transforms/model.ts
+++ b/src/mol-plugin/state/transforms/model.ts
@@ -425,7 +425,7 @@ const StructureSelectionFromScript = PluginStateTransform.BuiltIn({
return new SO.Molecule.Structure(s, props);
},
update: ({ a, b, oldParams, newParams, cache }) => {
- if (Script.areEqual(oldParams.script, newParams.script)) {
+ if (!Script.areEqual(oldParams.script, newParams.script)) {
return StateTransformer.UpdateResult.Recreate;
}
diff --git a/src/mol-plugin/util/structure-comlex-helper.ts b/src/mol-plugin/util/structure-comlex-helper.ts
new file mode 100644
index 000000000..7166dc0aa
--- /dev/null
+++ b/src/mol-plugin/util/structure-comlex-helper.ts
@@ -0,0 +1,6 @@
+/**
+ * Copyright (c) 2019 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ *
+ * @author David Sehnal <david.sehnal@gmail.com>
+ */
+
--
GitLab