@openbraininstitute/morphoviewer 0.30.0 → 0.31.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/components/morpho-viewer-small-circuit/morpho-viewer-small-circuit.js +14 -9
- package/dist/components/morpho-viewer-small-circuit/morpho-viewer-small-circuit.module.css +10 -0
- package/dist/components/morpho-viewer-small-circuit/painter/camera.d.ts +4 -1
- package/dist/components/morpho-viewer-small-circuit/painter/camera.d.ts.map +1 -1
- package/dist/components/morpho-viewer-small-circuit/painter/camera.js +12 -2
- package/dist/components/morpho-viewer-small-circuit/painter/manager.d.ts +39 -8
- package/dist/components/morpho-viewer-small-circuit/painter/manager.d.ts.map +1 -1
- package/dist/components/morpho-viewer-small-circuit/painter/manager.js +292 -20
- package/dist/components/morpho-viewer-small-circuit/painter/offscreen-painter/offscreen-painter.js +4 -4
- package/dist/components/morpho-viewer-small-circuit/painter/painter-cell/index.d.ts +2 -0
- package/dist/components/morpho-viewer-small-circuit/painter/painter-cell/index.d.ts.map +1 -1
- package/dist/components/morpho-viewer-small-circuit/painter/painter-cell/index.js +3 -1
- package/dist/components/morpho-viewer-small-circuit/painter/painter-cell/material-diffuse-alpha.d.ts +26 -0
- package/dist/components/morpho-viewer-small-circuit/painter/painter-cell/material-diffuse-alpha.d.ts.map +1 -0
- package/dist/components/morpho-viewer-small-circuit/painter/painter-cell/material-diffuse-alpha.js +105 -0
- package/dist/components/morpho-viewer-small-circuit/painter/painter-cell/painter-cell-flat.d.ts +11 -0
- package/dist/components/morpho-viewer-small-circuit/painter/painter-cell/painter-cell-flat.d.ts.map +1 -0
- package/dist/components/morpho-viewer-small-circuit/painter/painter-cell/painter-cell-flat.js +7 -0
- package/dist/components/morpho-viewer-small-circuit/painter/painter-cell/painter-cell-id.d.ts +12 -0
- package/dist/components/morpho-viewer-small-circuit/painter/painter-cell/painter-cell-id.d.ts.map +1 -0
- package/dist/components/morpho-viewer-small-circuit/painter/painter-cell/painter-cell-id.js +7 -0
- package/dist/components/morpho-viewer-small-circuit/painter/painter-cell/painter-cell.d.ts +9 -2
- package/dist/components/morpho-viewer-small-circuit/painter/painter-cell/painter-cell.d.ts.map +1 -1
- package/dist/components/morpho-viewer-small-circuit/painter/painter-cell/painter-cell.js +76 -8
- package/dist/components/morpho-viewer-small-circuit/painter/painter-synapses/painter-synapses.d.ts +6 -8
- package/dist/components/morpho-viewer-small-circuit/painter/painter-synapses/painter-synapses.d.ts.map +1 -1
- package/dist/components/morpho-viewer-small-circuit/painter/painter-synapses/painter-synapses.js +2 -1
- package/dist/components/morpho-viewer-small-circuit/types.d.ts +6 -2
- package/dist/components/morpho-viewer-small-circuit/types.d.ts.map +1 -1
- package/dist/components/morpho-viewer-somas-only/manager/manager.d.ts +32 -4
- package/dist/components/morpho-viewer-somas-only/manager/manager.d.ts.map +1 -1
- package/dist/components/morpho-viewer-somas-only/manager/manager.js +254 -13
- package/dist/components/morpho-viewer-somas-only/manager/painter-cell-infos.d.ts +5 -0
- package/dist/components/morpho-viewer-somas-only/manager/painter-cell-infos.d.ts.map +1 -1
- package/dist/components/morpho-viewer-somas-only/manager/painter-cell-infos.js +43 -6
- package/dist/components/morpho-viewer-somas-only/morpho-viewer-somas-only.js +14 -9
- package/dist/components/morpho-viewer-somas-only/morpho-viewer-somas-only.module.css +10 -0
- package/dist/components/morpho-viewer-somas-only/types.d.ts +6 -2
- package/dist/components/morpho-viewer-somas-only/types.d.ts.map +1 -1
- package/dist/components/signals.d.ts +6 -3
- package/dist/components/signals.d.ts.map +1 -1
- package/dist/components/signals.js +1 -1
- package/dist/components/types.d.ts +32 -0
- package/dist/components/types.d.ts.map +1 -1
- package/dist/index.d.ts +3 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -2
- package/dist/package.json +2 -2
- package/dist/painters/overlay-interaction.d.ts +49 -0
- package/dist/painters/overlay-interaction.d.ts.map +1 -0
- package/dist/painters/overlay-interaction.js +432 -0
- package/dist/painters/overlay-surface.d.ts +18 -0
- package/dist/painters/overlay-surface.d.ts.map +1 -0
- package/dist/painters/overlay-surface.js +83 -0
- package/dist/painters/world-overlays.d.ts +25 -0
- package/dist/painters/world-overlays.d.ts.map +1 -0
- package/dist/painters/world-overlays.js +185 -0
- package/package.json +2 -2
- package/dist/components/snapshot.d.ts +0 -3
- package/dist/components/snapshot.d.ts.map +0 -1
- package/dist/components/snapshot.js +0 -32
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../../../src/components/morpho-viewer-somas-only/manager/manager.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,QAAQ,EAER,KAAK,sBAAsB,
|
|
1
|
+
{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../../../src/components/morpho-viewer-somas-only/manager/manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,19 +1,31 @@
|
|
|
1
1
|
import { __awaiter } from "tslib";
|
|
2
|
-
import { TgdBoundingBox, TgdCameraOrthographic, TgdCameraPerspective, TgdColor, TgdContext, TgdControllerCameraOrbit, TgdEvent, TgdPainterClear, TgdPainterState, tgdActionCreateCameraInterpolation, } from "@tolokoban/tgd";
|
|
2
|
+
import { TgdBoundingBox, TgdCameraOrthographic, TgdCameraPerspective, TgdColor, TgdContext, TgdControllerCameraOrbit, TgdEvent, TgdPainterClear, TgdPainterState, tgdActionCreateCameraInterpolation, webglBlendGet, webglBlendSet, webglPresetBlend, } from "@tolokoban/tgd";
|
|
3
3
|
import React from "react";
|
|
4
4
|
import { watchSpacePerPixel } from "./../../../behaviors";
|
|
5
5
|
import { PainterGizmo } from "./../../../painters/gizmo";
|
|
6
|
-
import {
|
|
6
|
+
import { OverlayInteractionController } from "./../../../painters/overlay-interaction";
|
|
7
|
+
import { OverlaySurface } from "./../../../painters/overlay-surface";
|
|
7
8
|
import { AdpatativeResolution } from "./adaptative-resolution";
|
|
8
9
|
import { PainterCellInfos } from "./painter-cell-infos";
|
|
9
10
|
class PainterManager {
|
|
10
11
|
constructor() {
|
|
11
12
|
this.eventScalebar = new TgdEvent();
|
|
12
13
|
this._canvas = null;
|
|
14
|
+
this._overlayCanvas = null;
|
|
13
15
|
this._cellInfos = [];
|
|
14
16
|
this._backgroundColor = "black";
|
|
15
17
|
this.parsedBackgroundColor = new TgdColor(0, 0, 0, 1);
|
|
16
18
|
this.painterCellInfos = null;
|
|
19
|
+
this.painterOverlays = null;
|
|
20
|
+
this.overlaySurface = new OverlaySurface();
|
|
21
|
+
this.overlayInteraction = null;
|
|
22
|
+
this._overlays = [];
|
|
23
|
+
this._overlaysRadius = 5;
|
|
24
|
+
this._overlaysMinRadiusInPixels = 4;
|
|
25
|
+
this._overlaysInteractive = false;
|
|
26
|
+
this._highlightedOverlayId = null;
|
|
27
|
+
this._pinnedOverlayOrigin = null;
|
|
28
|
+
this._pinTimeout = null;
|
|
17
29
|
this.state = null;
|
|
18
30
|
this.painterClear = null;
|
|
19
31
|
this.context = null;
|
|
@@ -23,6 +35,8 @@ class PainterManager {
|
|
|
23
35
|
this.painterGizmo = new PainterGizmo();
|
|
24
36
|
this.adaptativeResolution = new AdpatativeResolution();
|
|
25
37
|
this._somaRadius = 1;
|
|
38
|
+
this._neuronOpacity = 1;
|
|
39
|
+
this.spacePerPixel = 1;
|
|
26
40
|
this.cameraOrtho = new TgdCameraOrthographic({
|
|
27
41
|
name: "CameraOrtho",
|
|
28
42
|
});
|
|
@@ -30,7 +44,8 @@ class PainterManager {
|
|
|
30
44
|
name: "CameraPersp",
|
|
31
45
|
});
|
|
32
46
|
this._cameraType = "orthographic";
|
|
33
|
-
this.cameraReset = () => {
|
|
47
|
+
this.cameraReset = (options) => {
|
|
48
|
+
var _a;
|
|
34
49
|
const { context, bbox } = this;
|
|
35
50
|
if (!context)
|
|
36
51
|
return;
|
|
@@ -48,6 +63,7 @@ class PainterManager {
|
|
|
48
63
|
if (Number.isNaN(resettedCamera.transfo.distance)) {
|
|
49
64
|
return;
|
|
50
65
|
}
|
|
66
|
+
resettedCamera.zoom = (_a = options === null || options === void 0 ? void 0 : options.zoom) !== null && _a !== void 0 ? _a : 1;
|
|
51
67
|
const state = resettedCamera.getCurrentState();
|
|
52
68
|
context.animSchedule({
|
|
53
69
|
duration: 0.5,
|
|
@@ -56,21 +72,24 @@ class PainterManager {
|
|
|
56
72
|
});
|
|
57
73
|
this.adaptativeResolution.lowRes();
|
|
58
74
|
};
|
|
59
|
-
this.
|
|
75
|
+
this.snapshot = (options) => __awaiter(this, void 0, void 0, function* () {
|
|
60
76
|
const { context } = this;
|
|
61
77
|
if (!context)
|
|
62
78
|
return null;
|
|
63
79
|
const gizmoWas = this.painterGizmo.options;
|
|
64
80
|
this.painterGizmo.options = false;
|
|
65
81
|
context.resolution = captureResolution();
|
|
66
|
-
const snapshot = context.takeSnapshot();
|
|
82
|
+
const snapshot = context.takeSnapshot(Object.assign({ type: "image/png", quality: 0.8 }, options));
|
|
67
83
|
context.paint();
|
|
68
84
|
const image = yield snapshot;
|
|
69
85
|
this.painterGizmo.options = gizmoWas;
|
|
70
86
|
this.adaptativeResolution.highRes();
|
|
71
87
|
context.paint();
|
|
72
|
-
return
|
|
88
|
+
return image;
|
|
73
89
|
});
|
|
90
|
+
this.handleSpacePerPixel = (spacePerPixel) => {
|
|
91
|
+
this.spacePerPixel = spacePerPixel;
|
|
92
|
+
};
|
|
74
93
|
this._cameraChangeTimeout = -1;
|
|
75
94
|
this.handleCameraChange = () => {
|
|
76
95
|
const { context } = this;
|
|
@@ -114,6 +133,18 @@ class PainterManager {
|
|
|
114
133
|
}
|
|
115
134
|
this.adaptativeResolution.reset();
|
|
116
135
|
}
|
|
136
|
+
get neuronOpacity() {
|
|
137
|
+
return this._neuronOpacity;
|
|
138
|
+
}
|
|
139
|
+
set neuronOpacity(neuronOpacity) {
|
|
140
|
+
const opacity = clamp01(neuronOpacity);
|
|
141
|
+
if (this._neuronOpacity === opacity)
|
|
142
|
+
return;
|
|
143
|
+
this._neuronOpacity = opacity;
|
|
144
|
+
if (this.painterCellInfos) {
|
|
145
|
+
this.painterCellInfos.opacity = opacity;
|
|
146
|
+
}
|
|
147
|
+
}
|
|
117
148
|
get canvas() {
|
|
118
149
|
return this._canvas;
|
|
119
150
|
}
|
|
@@ -126,6 +157,15 @@ class PainterManager {
|
|
|
126
157
|
else
|
|
127
158
|
this.delete();
|
|
128
159
|
}
|
|
160
|
+
get overlayCanvas() {
|
|
161
|
+
return this._overlayCanvas;
|
|
162
|
+
}
|
|
163
|
+
set overlayCanvas(canvas) {
|
|
164
|
+
if (this._overlayCanvas === canvas)
|
|
165
|
+
return;
|
|
166
|
+
this._overlayCanvas = canvas;
|
|
167
|
+
this.bindOverlaySurface();
|
|
168
|
+
}
|
|
129
169
|
get backgroundColor() {
|
|
130
170
|
return this._backgroundColor;
|
|
131
171
|
}
|
|
@@ -161,6 +201,74 @@ class PainterManager {
|
|
|
161
201
|
}
|
|
162
202
|
this.initialize();
|
|
163
203
|
}
|
|
204
|
+
setOverlays(overlays, overlaysRadius, overlaysMinRadiusInPixels) {
|
|
205
|
+
var _a, _b;
|
|
206
|
+
this._overlaysRadius = overlaysRadius;
|
|
207
|
+
this._overlaysMinRadiusInPixels = overlaysMinRadiusInPixels;
|
|
208
|
+
if ((_a = this.overlayInteraction) === null || _a === void 0 ? void 0 : _a.isDragging) {
|
|
209
|
+
const painter = this.painterOverlays;
|
|
210
|
+
if (painter) {
|
|
211
|
+
painter.radius = this._overlaysRadius;
|
|
212
|
+
painter.minRadiusInPixels = this._overlaysMinRadiusInPixels;
|
|
213
|
+
}
|
|
214
|
+
return;
|
|
215
|
+
}
|
|
216
|
+
if (this._pinnedOverlayOrigin && (overlays === null || overlays === void 0 ? void 0 : overlays.length)) {
|
|
217
|
+
const host = overlays.find((o) => o.id === this._pinnedOverlayOrigin.id && o.origin);
|
|
218
|
+
const tip = readOverlayTip(overlays, this._pinnedOverlayOrigin.id);
|
|
219
|
+
if ((host === null || host === void 0 ? void 0 : host.origin) &&
|
|
220
|
+
tip &&
|
|
221
|
+
originsNearlyEqual(host.origin, this._pinnedOverlayOrigin.origin) &&
|
|
222
|
+
rotationsNearlyEqual(host.rotation, this._pinnedOverlayOrigin.rotation) &&
|
|
223
|
+
originsNearlyEqual(tip, this._pinnedOverlayOrigin.tip)) {
|
|
224
|
+
this.clearPinnedOverlay();
|
|
225
|
+
}
|
|
226
|
+
else {
|
|
227
|
+
const painter = this.painterOverlays;
|
|
228
|
+
if (painter) {
|
|
229
|
+
painter.radius = this._overlaysRadius;
|
|
230
|
+
painter.minRadiusInPixels = this._overlaysMinRadiusInPixels;
|
|
231
|
+
}
|
|
232
|
+
return;
|
|
233
|
+
}
|
|
234
|
+
}
|
|
235
|
+
this._overlays = cloneOverlays(overlays);
|
|
236
|
+
this.applyOverlays();
|
|
237
|
+
(_b = this.context) === null || _b === void 0 ? void 0 : _b.paint();
|
|
238
|
+
}
|
|
239
|
+
setOverlayInteraction(interactive, onTransform) {
|
|
240
|
+
var _a, _b, _c;
|
|
241
|
+
this._overlaysInteractive = interactive;
|
|
242
|
+
this._onOverlayTransform = onTransform;
|
|
243
|
+
(_a = this.overlayInteraction) === null || _a === void 0 ? void 0 : _a.setOnTransform(onTransform);
|
|
244
|
+
if (interactive) {
|
|
245
|
+
(_b = this.overlayInteraction) === null || _b === void 0 ? void 0 : _b.attach();
|
|
246
|
+
}
|
|
247
|
+
else {
|
|
248
|
+
(_c = this.overlayInteraction) === null || _c === void 0 ? void 0 : _c.detach();
|
|
249
|
+
}
|
|
250
|
+
}
|
|
251
|
+
get highlightedOverlayId() {
|
|
252
|
+
return this._highlightedOverlayId;
|
|
253
|
+
}
|
|
254
|
+
set highlightedOverlayId(id) {
|
|
255
|
+
var _a;
|
|
256
|
+
const next = id !== null && id !== void 0 ? id : null;
|
|
257
|
+
if (this._highlightedOverlayId === next)
|
|
258
|
+
return;
|
|
259
|
+
this._highlightedOverlayId = next;
|
|
260
|
+
if (!((_a = this.overlayInteraction) === null || _a === void 0 ? void 0 : _a.isDragging) && this.painterOverlays) {
|
|
261
|
+
this.painterOverlays.highlightedId = next;
|
|
262
|
+
}
|
|
263
|
+
}
|
|
264
|
+
applyOverlays() {
|
|
265
|
+
const { painterOverlays } = this;
|
|
266
|
+
if (!painterOverlays)
|
|
267
|
+
return;
|
|
268
|
+
painterOverlays.overlays = this._overlays;
|
|
269
|
+
painterOverlays.radius = this._overlaysRadius;
|
|
270
|
+
painterOverlays.minRadiusInPixels = this._overlaysMinRadiusInPixels;
|
|
271
|
+
}
|
|
164
272
|
recolorInPlace() {
|
|
165
273
|
const { context, state, cellInfos } = this;
|
|
166
274
|
if (!context || !state)
|
|
@@ -169,6 +277,7 @@ class PainterManager {
|
|
|
169
277
|
const painterCellInfos = new PainterCellInfos(context, {
|
|
170
278
|
cellInfos,
|
|
171
279
|
somaRadius: this.somaRadius,
|
|
280
|
+
opacity: this._neuronOpacity,
|
|
172
281
|
});
|
|
173
282
|
this.painterCellInfos = painterCellInfos;
|
|
174
283
|
this.bbox = painterCellInfos.bbox;
|
|
@@ -205,6 +314,7 @@ class PainterManager {
|
|
|
205
314
|
this.context = context;
|
|
206
315
|
this.adaptativeResolution.context = context;
|
|
207
316
|
this.scalebarCleanup = watchSpacePerPixel(context, this.eventScalebar);
|
|
317
|
+
this.eventScalebar.addListener(this.handleSpacePerPixel);
|
|
208
318
|
this.parsedBackgroundColor.parse(this._backgroundColor);
|
|
209
319
|
const clear = new TgdPainterClear(context, {
|
|
210
320
|
color: this.parsedBackgroundColor.toArayNumber4(),
|
|
@@ -214,11 +324,25 @@ class PainterManager {
|
|
|
214
324
|
const painterCellInfos = new PainterCellInfos(context, {
|
|
215
325
|
cellInfos,
|
|
216
326
|
somaRadius: this.somaRadius,
|
|
327
|
+
opacity: this._neuronOpacity,
|
|
217
328
|
});
|
|
218
329
|
this.painterCellInfos = painterCellInfos;
|
|
330
|
+
let savedNeuronBlend;
|
|
219
331
|
const state = new TgdPainterState(context, {
|
|
220
332
|
depth: "less",
|
|
221
333
|
children: [painterCellInfos],
|
|
334
|
+
onEnter: () => {
|
|
335
|
+
if (this._neuronOpacity >= 1)
|
|
336
|
+
return;
|
|
337
|
+
savedNeuronBlend = webglBlendGet(context);
|
|
338
|
+
webglBlendSet(context, webglPresetBlend.alpha);
|
|
339
|
+
},
|
|
340
|
+
onExit: () => {
|
|
341
|
+
if (!savedNeuronBlend)
|
|
342
|
+
return;
|
|
343
|
+
webglBlendSet(context, savedNeuronBlend);
|
|
344
|
+
savedNeuronBlend = undefined;
|
|
345
|
+
},
|
|
222
346
|
});
|
|
223
347
|
this.state = state;
|
|
224
348
|
this.painterGizmo.context = context;
|
|
@@ -234,21 +358,93 @@ class PainterManager {
|
|
|
234
358
|
inertiaZoom: 300,
|
|
235
359
|
});
|
|
236
360
|
this.orbit.eventChange.addListener(this.handleCameraChange);
|
|
361
|
+
this.overlayInteraction = new OverlayInteractionController({
|
|
362
|
+
context,
|
|
363
|
+
getOverlays: () => this._overlays,
|
|
364
|
+
setOverlays: (overlays) => {
|
|
365
|
+
this._overlays = overlays;
|
|
366
|
+
this.applyOverlays();
|
|
367
|
+
},
|
|
368
|
+
syncOverlayPositions: () => {
|
|
369
|
+
var _a;
|
|
370
|
+
(_a = this.painterOverlays) === null || _a === void 0 ? void 0 : _a.syncPositions();
|
|
371
|
+
},
|
|
372
|
+
getHitRadiusPixels: () => Math.max(this._overlaysMinRadiusInPixels * 1.8, this._overlaysRadius / Math.max(this.spacePerPixel, 1e-6)),
|
|
373
|
+
getOrbit: () => this.orbit,
|
|
374
|
+
setHighlightedId: (id) => {
|
|
375
|
+
if (this.painterOverlays) {
|
|
376
|
+
this.painterOverlays.highlightedId = id !== null && id !== void 0 ? id : this._highlightedOverlayId;
|
|
377
|
+
}
|
|
378
|
+
},
|
|
379
|
+
onTransform: this._onOverlayTransform,
|
|
380
|
+
onDragStart: () => this.overlaySurface.beginDrag(),
|
|
381
|
+
onDragEnd: (id) => {
|
|
382
|
+
this.overlaySurface.endDrag();
|
|
383
|
+
this.pinOverlaysAfterDrag(id);
|
|
384
|
+
},
|
|
385
|
+
});
|
|
386
|
+
if (this._overlaysInteractive)
|
|
387
|
+
this.overlayInteraction.attach();
|
|
388
|
+
this.bindOverlaySurface();
|
|
237
389
|
context.paint();
|
|
238
|
-
context.execAfterNextPaint(this.cameraReset);
|
|
390
|
+
context.execAfterNextPaint(() => this.cameraReset());
|
|
391
|
+
}
|
|
392
|
+
bindOverlaySurface() {
|
|
393
|
+
this.overlaySurface.setCanvas(this._overlayCanvas, this.context);
|
|
394
|
+
this.painterOverlays = this.overlaySurface.overlaysPainter;
|
|
395
|
+
if (this.painterOverlays)
|
|
396
|
+
this.applyOverlays();
|
|
397
|
+
}
|
|
398
|
+
pinOverlaysAfterDrag(id) {
|
|
399
|
+
var _a, _b, _c;
|
|
400
|
+
this.clearPinnedOverlay();
|
|
401
|
+
if (!this._onOverlayTransform)
|
|
402
|
+
return;
|
|
403
|
+
const withOrigin = this._overlays.find((o) => o.id === id && o.origin);
|
|
404
|
+
if (!(withOrigin === null || withOrigin === void 0 ? void 0 : withOrigin.id) || !withOrigin.origin)
|
|
405
|
+
return;
|
|
406
|
+
const tip = readOverlayTip(this._overlays, withOrigin.id);
|
|
407
|
+
if (!tip)
|
|
408
|
+
return;
|
|
409
|
+
const rot = withOrigin.rotation;
|
|
410
|
+
this._pinnedOverlayOrigin = {
|
|
411
|
+
id: withOrigin.id,
|
|
412
|
+
origin: [withOrigin.origin[0], withOrigin.origin[1], withOrigin.origin[2]],
|
|
413
|
+
rotation: {
|
|
414
|
+
x: (_a = rot === null || rot === void 0 ? void 0 : rot.x) !== null && _a !== void 0 ? _a : 0,
|
|
415
|
+
y: (_b = rot === null || rot === void 0 ? void 0 : rot.y) !== null && _b !== void 0 ? _b : 0,
|
|
416
|
+
z: (_c = rot === null || rot === void 0 ? void 0 : rot.z) !== null && _c !== void 0 ? _c : 0,
|
|
417
|
+
},
|
|
418
|
+
tip,
|
|
419
|
+
};
|
|
420
|
+
this._pinTimeout = setTimeout(() => this.clearPinnedOverlay(), OVERLAY_PIN_TIMEOUT_MS);
|
|
421
|
+
}
|
|
422
|
+
clearPinnedOverlay() {
|
|
423
|
+
this._pinnedOverlayOrigin = null;
|
|
424
|
+
if (this._pinTimeout !== null) {
|
|
425
|
+
clearTimeout(this._pinTimeout);
|
|
426
|
+
this._pinTimeout = null;
|
|
427
|
+
}
|
|
239
428
|
}
|
|
240
429
|
delete() {
|
|
241
|
-
var _a, _b;
|
|
430
|
+
var _a, _b, _c;
|
|
431
|
+
this.clearPinnedOverlay();
|
|
242
432
|
this.adaptativeResolution.context = null;
|
|
243
433
|
if (!this.context) {
|
|
244
434
|
return;
|
|
245
435
|
}
|
|
246
436
|
(_a = this.scalebarCleanup) === null || _a === void 0 ? void 0 : _a.call(this);
|
|
247
|
-
|
|
437
|
+
this.eventScalebar.removeListener(this.handleSpacePerPixel);
|
|
438
|
+
(_b = this.overlayInteraction) === null || _b === void 0 ? void 0 : _b.detach();
|
|
439
|
+
this.overlayInteraction = null;
|
|
440
|
+
this.overlaySurface.delete();
|
|
441
|
+
(_c = this.orbit) === null || _c === void 0 ? void 0 : _c.detach();
|
|
248
442
|
this.orbit = null;
|
|
249
443
|
this.painterClear = null;
|
|
250
444
|
this.state = null;
|
|
251
445
|
this.painterCellInfos = null;
|
|
446
|
+
this.painterOverlays = null;
|
|
447
|
+
this.painterGizmo.context = null;
|
|
252
448
|
this.context.delete();
|
|
253
449
|
this.context = null;
|
|
254
450
|
}
|
|
@@ -269,7 +465,40 @@ function sameGeometry(a, b) {
|
|
|
269
465
|
}
|
|
270
466
|
return true;
|
|
271
467
|
}
|
|
272
|
-
|
|
468
|
+
function clamp01(value) {
|
|
469
|
+
if (Number.isNaN(value))
|
|
470
|
+
return 1;
|
|
471
|
+
return Math.min(1, Math.max(0, value));
|
|
472
|
+
}
|
|
473
|
+
const OVERLAY_PIN_TIMEOUT_MS = 2000;
|
|
474
|
+
function cloneOverlays(overlays) {
|
|
475
|
+
if (!(overlays === null || overlays === void 0 ? void 0 : overlays.length))
|
|
476
|
+
return [];
|
|
477
|
+
return overlays.map((overlay) => (Object.assign(Object.assign({}, overlay), { origin: overlay.origin ? [...overlay.origin] : undefined, rotation: overlay.rotation ? Object.assign({}, overlay.rotation) : undefined })));
|
|
478
|
+
}
|
|
479
|
+
const ORIGIN_EPS = 0.05;
|
|
480
|
+
const ROT_EPS = 0.05;
|
|
481
|
+
function originsNearlyEqual(a, b) {
|
|
482
|
+
return (Math.abs(a[0] - b[0]) <= ORIGIN_EPS &&
|
|
483
|
+
Math.abs(a[1] - b[1]) <= ORIGIN_EPS &&
|
|
484
|
+
Math.abs(a[2] - b[2]) <= ORIGIN_EPS);
|
|
485
|
+
}
|
|
486
|
+
function rotationsNearlyEqual(a, b) {
|
|
487
|
+
var _a, _b, _c;
|
|
488
|
+
return (Math.abs(((_a = a === null || a === void 0 ? void 0 : a.x) !== null && _a !== void 0 ? _a : 0) - b.x) <= ROT_EPS &&
|
|
489
|
+
Math.abs(((_b = a === null || a === void 0 ? void 0 : a.y) !== null && _b !== void 0 ? _b : 0) - b.y) <= ROT_EPS &&
|
|
490
|
+
Math.abs(((_c = a === null || a === void 0 ? void 0 : a.z) !== null && _c !== void 0 ? _c : 0) - b.z) <= ROT_EPS);
|
|
491
|
+
}
|
|
492
|
+
function readOverlayTip(overlays, id) {
|
|
493
|
+
var _a;
|
|
494
|
+
const prefer = overlays.find((o) => o.id === id && (o.kind === "electrodes" || !o.kind) && o.coordinates.length >= 3);
|
|
495
|
+
const fallback = overlays.find((o) => o.id === id && o.coordinates.length >= 3);
|
|
496
|
+
const coords = (_a = prefer === null || prefer === void 0 ? void 0 : prefer.coordinates) !== null && _a !== void 0 ? _a : fallback === null || fallback === void 0 ? void 0 : fallback.coordinates;
|
|
497
|
+
if (!coords || coords.length < 3)
|
|
498
|
+
return null;
|
|
499
|
+
return [coords[0], coords[1], coords[2]];
|
|
500
|
+
}
|
|
501
|
+
export function useManager({ cellInfos, somaRadius, gizmo, cameraType, backgroundColor, overlays, overlaysRadius = 5, overlaysMinRadiusInPixels = 4, overlaysInteractive = false, onOverlayTransform, highlightedOverlayId, neuronOpacity = 1, signals, }) {
|
|
273
502
|
const refManager = React.useRef(null);
|
|
274
503
|
if (!refManager.current)
|
|
275
504
|
refManager.current = new PainterManager();
|
|
@@ -283,8 +512,8 @@ export function useManager({ cellInfos, somaRadius, gizmo, cameraType, backgroun
|
|
|
283
512
|
React.useEffect(() => {
|
|
284
513
|
if (!signals)
|
|
285
514
|
return;
|
|
286
|
-
const unregisterReset = signals.cameraReset.register(() => manager.cameraReset());
|
|
287
|
-
const unregisterSnapshot = signals.snapshot.register((options) => manager.
|
|
515
|
+
const unregisterReset = signals.cameraReset.register((options) => manager.cameraReset(options));
|
|
516
|
+
const unregisterSnapshot = signals.snapshot.register((options) => manager.snapshot(options));
|
|
288
517
|
return () => {
|
|
289
518
|
unregisterReset();
|
|
290
519
|
unregisterSnapshot();
|
|
@@ -296,10 +525,22 @@ export function useManager({ cellInfos, somaRadius, gizmo, cameraType, backgroun
|
|
|
296
525
|
React.useEffect(() => {
|
|
297
526
|
manager.somaRadius = somaRadius !== null && somaRadius !== void 0 ? somaRadius : DEFAULT_SOMA_RADIUS;
|
|
298
527
|
}, [somaRadius, manager]);
|
|
528
|
+
React.useEffect(() => {
|
|
529
|
+
manager.neuronOpacity = neuronOpacity;
|
|
530
|
+
}, [neuronOpacity, manager]);
|
|
531
|
+
React.useEffect(() => {
|
|
532
|
+
manager.setOverlays(overlays, overlaysRadius, overlaysMinRadiusInPixels);
|
|
533
|
+
}, [overlays, overlaysRadius, overlaysMinRadiusInPixels, manager]);
|
|
534
|
+
React.useEffect(() => {
|
|
535
|
+
manager.setOverlayInteraction(overlaysInteractive, onOverlayTransform);
|
|
536
|
+
}, [overlaysInteractive, onOverlayTransform, manager]);
|
|
537
|
+
React.useEffect(() => {
|
|
538
|
+
manager.highlightedOverlayId = highlightedOverlayId !== null && highlightedOverlayId !== void 0 ? highlightedOverlayId : null;
|
|
539
|
+
}, [highlightedOverlayId, manager]);
|
|
299
540
|
React.useEffect(() => {
|
|
300
541
|
manager.gizmo = gizmo;
|
|
301
542
|
}, [gizmo, manager]);
|
|
302
543
|
return refManager.current;
|
|
303
544
|
}
|
|
304
545
|
const DEFAULT_SOMA_RADIUS = 12;
|
|
305
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../../src/components/morpho-viewer-somas-only/manager/manager.ts"],"names":[],"mappings":"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"}
|
|
546
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"manager.js","sourceRoot":"","sources":["../../../../src/components/morpho-viewer-somas-only/manager/manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,15 +3,20 @@ import type { MorphoViewerCellInfo } from "../types";
|
|
|
3
3
|
export interface PainterCellInfosOptions {
|
|
4
4
|
cellInfos: MorphoViewerCellInfo[];
|
|
5
5
|
somaRadius: number;
|
|
6
|
+
opacity?: number;
|
|
6
7
|
}
|
|
7
8
|
export declare class PainterCellInfos extends TgdPainterGroup {
|
|
8
9
|
readonly context: TgdContext;
|
|
9
10
|
readonly bbox: TgdBoundingBox;
|
|
10
11
|
private readonly texturePalette;
|
|
11
12
|
private readonly painterPointsCloud;
|
|
13
|
+
private readonly paletteColors;
|
|
14
|
+
private _opacity;
|
|
12
15
|
constructor(context: TgdContext, options: PainterCellInfosOptions);
|
|
13
16
|
get somaRadius(): number;
|
|
14
17
|
set somaRadius(somaRadius: number);
|
|
18
|
+
get opacity(): number;
|
|
19
|
+
set opacity(opacity: number);
|
|
15
20
|
delete(): void;
|
|
16
21
|
}
|
|
17
22
|
//# sourceMappingURL=painter-cell-infos.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"painter-cell-infos.d.ts","sourceRoot":"","sources":["../../../../src/components/morpho-viewer-somas-only/manager/painter-cell-infos.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,KAAK,UAAU,EACf,eAAe,EAKhB,MAAM,gBAAgB,CAAC;AAIxB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAerD,MAAM,WAAW,uBAAuB;IACtC,SAAS,EAAE,oBAAoB,EAAE,CAAC;IAClC,UAAU,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"painter-cell-infos.d.ts","sourceRoot":"","sources":["../../../../src/components/morpho-viewer-somas-only/manager/painter-cell-infos.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,KAAK,UAAU,EACf,eAAe,EAKhB,MAAM,gBAAgB,CAAC;AAIxB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAerD,MAAM,WAAW,uBAAuB;IACtC,SAAS,EAAE,oBAAoB,EAAE,CAAC;IAClC,UAAU,EAAE,MAAM,CAAC;IAEnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,gBAAiB,SAAQ,eAAe;aASjC,OAAO,EAAE,UAAU;IARrC,SAAgB,IAAI,EAAE,cAAc,CAAC;IAErC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAe;IAC9C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAwB;IAC3D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAkB;IAChD,OAAO,CAAC,QAAQ,CAAS;gBAGP,OAAO,EAAE,UAAU,EACnC,OAAO,EAAE,uBAAuB;IAsClC,IAAI,UAAU,IAAI,MAAM,CAEvB;IACD,IAAI,UAAU,CAAC,UAAU,EAAE,MAAM,EAKhC;IAED,IAAI,OAAO,IAAI,MAAM,CAEpB;IACD,IAAI,OAAO,CAAC,OAAO,EAAE,MAAM,EAO1B;IAED,MAAM,IAAI,IAAI;CAIf"}
|