From 74990cab2362d1805a73ac76a1f44a8de20d6548 Mon Sep 17 00:00:00 2001
From: Alexander Rose <alexander.rose@weirdbyte.de>
Date: Tue, 13 Nov 2018 23:58:29 -0800
Subject: [PATCH] repr support for canvas3d.mark
---
src/mol-canvas3d/canvas3d.ts | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/mol-canvas3d/canvas3d.ts b/src/mol-canvas3d/canvas3d.ts
index 420ca3987..e803e1e18 100644
--- a/src/mol-canvas3d/canvas3d.ts
+++ b/src/mol-canvas3d/canvas3d.ts
@@ -54,7 +54,7 @@ interface Canvas3D {
animate: () => void
pick: () => void
identify: (x: number, y: number) => Promise<PickingId | undefined>
- mark: (loci: Loci, action: MarkerAction) => void
+ mark: (loci: Loci, action: MarkerAction, repr?: Representation.Any) => void
getLoci: (pickingId: PickingId) => { loci: Loci, repr?: Representation.Any }
readonly didDraw: BehaviorSubject<now.Timestamp>
@@ -133,10 +133,12 @@ namespace Canvas3D {
return { loci, repr }
}
- function mark(loci: Loci, action: MarkerAction) {
+ function mark(loci: Loci, action: MarkerAction, repr?: Representation.Any) {
let changed = false
- reprRenderObjects.forEach((roSet, repr) => {
- changed = repr.mark(loci, action) || changed
+ reprRenderObjects.forEach((_, _repr) => {
+ if (!repr || repr === _repr) {
+ changed = _repr.mark(loci, action) || changed
+ }
})
if (changed) {
// console.log('changed')
--
GitLab