@cornerstonejs/tools 1.14.3 → 1.14.4
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/cjs/store/SynchronizerManager/Synchronizer.js +10 -2
- package/dist/cjs/store/SynchronizerManager/Synchronizer.js.map +1 -1
- package/dist/cjs/synchronizers/callbacks/stackImageSyncCallback.js +25 -22
- package/dist/cjs/synchronizers/callbacks/stackImageSyncCallback.js.map +1 -1
- package/dist/cjs/synchronizers/callbacks/voiSyncCallback.js +1 -1
- package/dist/cjs/synchronizers/callbacks/voiSyncCallback.js.map +1 -1
- package/dist/esm/store/SynchronizerManager/Synchronizer.js +10 -2
- package/dist/esm/store/SynchronizerManager/Synchronizer.js.map +1 -1
- package/dist/esm/synchronizers/callbacks/stackImageSyncCallback.js +26 -23
- package/dist/esm/synchronizers/callbacks/stackImageSyncCallback.js.map +1 -1
- package/dist/esm/synchronizers/callbacks/voiSyncCallback.js +1 -1
- package/dist/esm/synchronizers/callbacks/voiSyncCallback.js.map +1 -1
- package/dist/umd/index.js +1 -1
- package/dist/umd/index.js.map +1 -1
- package/package.json +3 -3
- package/src/store/SynchronizerManager/Synchronizer.ts +16 -8
- package/src/synchronizers/callbacks/stackImageSyncCallback.ts +63 -68
- package/src/synchronizers/callbacks/voiSyncCallback.ts +1 -1
|
@@ -112,6 +112,7 @@ class Synchronizer {
|
|
|
112
112
|
return;
|
|
113
113
|
}
|
|
114
114
|
this._ignoreFiredEvents = true;
|
|
115
|
+
const promises = [];
|
|
115
116
|
try {
|
|
116
117
|
for (let i = 0; i < this._targetViewports.length; i++) {
|
|
117
118
|
const targetViewport = this._targetViewports[i];
|
|
@@ -119,14 +120,21 @@ class Synchronizer {
|
|
|
119
120
|
if (targetIsSource) {
|
|
120
121
|
continue;
|
|
121
122
|
}
|
|
122
|
-
this._eventHandler(this, sourceViewport, targetViewport, sourceEvent, this._options);
|
|
123
|
+
promises.push(this._eventHandler(this, sourceViewport, targetViewport, sourceEvent, this._options));
|
|
123
124
|
}
|
|
124
125
|
}
|
|
125
126
|
catch (ex) {
|
|
126
127
|
console.warn(`Synchronizer, for: ${this._eventName}`, ex);
|
|
127
128
|
}
|
|
128
129
|
finally {
|
|
129
|
-
|
|
130
|
+
if (promises.length) {
|
|
131
|
+
Promise.allSettled(promises).then(() => {
|
|
132
|
+
this._ignoreFiredEvents = false;
|
|
133
|
+
});
|
|
134
|
+
}
|
|
135
|
+
else {
|
|
136
|
+
this._ignoreFiredEvents = false;
|
|
137
|
+
}
|
|
130
138
|
}
|
|
131
139
|
}
|
|
132
140
|
_hasSourceElements() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Synchronizer.js","sourceRoot":"","sources":["../../../../src/store/SynchronizerManager/Synchronizer.ts"],"names":[],"mappings":";;AAAA,8CAK6B;AAU7B,MAAM,YAAY;IAYhB,YACE,cAAsB,EACtB,SAAiB,EACjB,YAAuC,EACvC,OAAa;QARP,qBAAgB,GAA4C,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"Synchronizer.js","sourceRoot":"","sources":["../../../../src/store/SynchronizerManager/Synchronizer.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@ const gl_matrix_1 = require("gl-matrix");
|
|
|
16
16
|
const core_1 = require("@cornerstonejs/core");
|
|
17
17
|
const utilities_1 = require("../../utilities");
|
|
18
18
|
const areViewportsCoplanar_1 = __importDefault(require("./areViewportsCoplanar "));
|
|
19
|
+
const getSpatialRegistration = (targetId, sourceId) => core_1.utilities.spatialRegistrationMetadataProvider.get('spatialRegistrationModule', [targetId, sourceId]);
|
|
19
20
|
function stackImageSyncCallback(synchronizerInstance, sourceViewport, targetViewport) {
|
|
20
21
|
return __awaiter(this, void 0, void 0, function* () {
|
|
21
22
|
const renderingEngine = (0, core_1.getRenderingEngine)(targetViewport.renderingEngineId);
|
|
@@ -23,9 +24,11 @@ function stackImageSyncCallback(synchronizerInstance, sourceViewport, targetView
|
|
|
23
24
|
throw new Error(`No RenderingEngine for Id: ${targetViewport.renderingEngineId}`);
|
|
24
25
|
}
|
|
25
26
|
const sViewport = renderingEngine.getViewport(sourceViewport.viewportId);
|
|
27
|
+
const options = synchronizerInstance.getOptions(targetViewport.viewportId);
|
|
28
|
+
if (options === null || options === void 0 ? void 0 : options.disabled) {
|
|
29
|
+
return;
|
|
30
|
+
}
|
|
26
31
|
const tViewport = renderingEngine.getViewport(targetViewport.viewportId);
|
|
27
|
-
const frameOfReferenceUID1 = sViewport.getFrameOfReferenceUID();
|
|
28
|
-
const frameOfReferenceUID2 = tViewport.getFrameOfReferenceUID();
|
|
29
32
|
const imageId1 = sViewport.getCurrentImageId();
|
|
30
33
|
const imagePlaneModule1 = core_1.metaData.get('imagePlaneModule', imageId1);
|
|
31
34
|
const sourceImagePositionPatient = imagePlaneModule1.imagePositionPatient;
|
|
@@ -33,30 +36,30 @@ function stackImageSyncCallback(synchronizerInstance, sourceViewport, targetView
|
|
|
33
36
|
if (!(0, areViewportsCoplanar_1.default)(sViewport, tViewport)) {
|
|
34
37
|
return;
|
|
35
38
|
}
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
return;
|
|
39
|
+
let registrationMatrixMat4 = getSpatialRegistration(targetViewport.viewportId, sourceViewport.viewportId);
|
|
40
|
+
if (!registrationMatrixMat4) {
|
|
41
|
+
const frameOfReferenceUID1 = sViewport.getFrameOfReferenceUID();
|
|
42
|
+
const frameOfReferenceUID2 = tViewport.getFrameOfReferenceUID();
|
|
43
|
+
if (frameOfReferenceUID1 === frameOfReferenceUID2 &&
|
|
44
|
+
options.useInitialPosition !== false) {
|
|
45
|
+
registrationMatrixMat4 = gl_matrix_1.mat4.identity(gl_matrix_1.mat4.create());
|
|
44
46
|
}
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
if (!registrationMatrixMat4) {
|
|
49
|
-
throw new Error(`No registration matrix found for sourceViewport: ${sourceViewport.viewportId} and targetViewport: ${targetViewport.viewportId}, viewports with different frameOfReferenceUIDs must have a registration matrix in the registrationMetadataProvider. Use calculateViewportsRegistrationMatrix to calculate the matrix.`);
|
|
47
|
+
else {
|
|
48
|
+
core_1.utilities.calculateViewportsSpatialRegistration(sViewport, tViewport);
|
|
49
|
+
registrationMatrixMat4 = getSpatialRegistration(targetViewport.viewportId, sourceViewport.viewportId);
|
|
50
50
|
}
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
if (closestImageIdIndex2.index !== -1 &&
|
|
54
|
-
tViewport.getCurrentImageIdIndex() !== closestImageIdIndex2.index) {
|
|
55
|
-
yield (0, utilities_1.jumpToSlice)(tViewport.element, {
|
|
56
|
-
imageIndex: closestImageIdIndex2.index,
|
|
57
|
-
});
|
|
51
|
+
if (!registrationMatrixMat4) {
|
|
52
|
+
return;
|
|
58
53
|
}
|
|
59
54
|
}
|
|
55
|
+
const targetImagePositionPatientWithRegistrationMatrix = gl_matrix_1.vec3.transformMat4(gl_matrix_1.vec3.create(), sourceImagePositionPatient, registrationMatrixMat4);
|
|
56
|
+
const closestImageIdIndex2 = _getClosestImageIdIndex(targetImagePositionPatientWithRegistrationMatrix, targetImageIds);
|
|
57
|
+
if (closestImageIdIndex2.index !== -1 &&
|
|
58
|
+
tViewport.getCurrentImageIdIndex() !== closestImageIdIndex2.index) {
|
|
59
|
+
yield (0, utilities_1.jumpToSlice)(tViewport.element, {
|
|
60
|
+
imageIndex: closestImageIdIndex2.index,
|
|
61
|
+
});
|
|
62
|
+
}
|
|
60
63
|
});
|
|
61
64
|
}
|
|
62
65
|
exports.default = stackImageSyncCallback;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stackImageSyncCallback.js","sourceRoot":"","sources":["../../../../src/synchronizers/callbacks/stackImageSyncCallback.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"stackImageSyncCallback.js","sourceRoot":"","sources":["../../../../src/synchronizers/callbacks/stackImageSyncCallback.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ function voiSyncCallback(synchronizerInstance, sourceViewport, targetViewport, v
|
|
|
12
12
|
const tProperties = {
|
|
13
13
|
voiRange: range,
|
|
14
14
|
};
|
|
15
|
-
if (options.syncInvertState && invertStateChanged) {
|
|
15
|
+
if ((options === null || options === void 0 ? void 0 : options.syncInvertState) && invertStateChanged) {
|
|
16
16
|
tProperties.invert = invert;
|
|
17
17
|
}
|
|
18
18
|
if (tViewport instanceof core_1.BaseVolumeViewport) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"voiSyncCallback.js","sourceRoot":"","sources":["../../../../src/synchronizers/callbacks/voiSyncCallback.ts"],"names":[],"mappings":";;AAAA,8CAK6B;AAY7B,SAAwB,eAAe,CACrC,oBAAoB,EACpB,cAAiC,EACjC,cAAiC,EACjC,gBAAmD,EACnD,OAAa;IAEb,MAAM,WAAW,GAAG,gBAAgB,CAAC,MAAM,CAAC;IAC5C,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,kBAAkB,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC;IAEpE,MAAM,eAAe,GAAG,IAAA,yBAAkB,EAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC;IAC7E,IAAI,CAAC,eAAe,EAAE;QACpB,MAAM,IAAI,KAAK,CACb,oCAAoC,cAAc,CAAC,iBAAiB,EAAE,CACvE,CAAC;KACH;IAED,MAAM,SAAS,GAAG,eAAe,CAAC,WAAW,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IACzE,MAAM,WAAW,GAEmB;QAClC,QAAQ,EAAE,KAAK;KAChB,CAAC;IAEF,IAAI,OAAO,
|
|
1
|
+
{"version":3,"file":"voiSyncCallback.js","sourceRoot":"","sources":["../../../../src/synchronizers/callbacks/voiSyncCallback.ts"],"names":[],"mappings":";;AAAA,8CAK6B;AAY7B,SAAwB,eAAe,CACrC,oBAAoB,EACpB,cAAiC,EACjC,cAAiC,EACjC,gBAAmD,EACnD,OAAa;IAEb,MAAM,WAAW,GAAG,gBAAgB,CAAC,MAAM,CAAC;IAC5C,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,kBAAkB,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC;IAEpE,MAAM,eAAe,GAAG,IAAA,yBAAkB,EAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC;IAC7E,IAAI,CAAC,eAAe,EAAE;QACpB,MAAM,IAAI,KAAK,CACb,oCAAoC,cAAc,CAAC,iBAAiB,EAAE,CACvE,CAAC;KACH;IAED,MAAM,SAAS,GAAG,eAAe,CAAC,WAAW,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IACzE,MAAM,WAAW,GAEmB;QAClC,QAAQ,EAAE,KAAK;KAChB,CAAC;IAEF,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,eAAe,KAAI,kBAAkB,EAAE;QAClD,WAAW,CAAC,MAAM,GAAG,MAAM,CAAC;KAC7B;IAED,IAAI,SAAS,YAAY,yBAAkB,EAAE;QAC3C,SAAS,CAAC,aAAa,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;KAChD;SAAM,IAAI,SAAS,YAAY,oBAAa,EAAE;QAC7C,SAAS,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;KACtC;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;KACjD;IAED,SAAS,CAAC,MAAM,EAAE,CAAC;AACrB,CAAC;AArCD,kCAqCC"}
|
|
@@ -110,6 +110,7 @@ class Synchronizer {
|
|
|
110
110
|
return;
|
|
111
111
|
}
|
|
112
112
|
this._ignoreFiredEvents = true;
|
|
113
|
+
const promises = [];
|
|
113
114
|
try {
|
|
114
115
|
for (let i = 0; i < this._targetViewports.length; i++) {
|
|
115
116
|
const targetViewport = this._targetViewports[i];
|
|
@@ -117,14 +118,21 @@ class Synchronizer {
|
|
|
117
118
|
if (targetIsSource) {
|
|
118
119
|
continue;
|
|
119
120
|
}
|
|
120
|
-
this._eventHandler(this, sourceViewport, targetViewport, sourceEvent, this._options);
|
|
121
|
+
promises.push(this._eventHandler(this, sourceViewport, targetViewport, sourceEvent, this._options));
|
|
121
122
|
}
|
|
122
123
|
}
|
|
123
124
|
catch (ex) {
|
|
124
125
|
console.warn(`Synchronizer, for: ${this._eventName}`, ex);
|
|
125
126
|
}
|
|
126
127
|
finally {
|
|
127
|
-
|
|
128
|
+
if (promises.length) {
|
|
129
|
+
Promise.allSettled(promises).then(() => {
|
|
130
|
+
this._ignoreFiredEvents = false;
|
|
131
|
+
});
|
|
132
|
+
}
|
|
133
|
+
else {
|
|
134
|
+
this._ignoreFiredEvents = false;
|
|
135
|
+
}
|
|
128
136
|
}
|
|
129
137
|
}
|
|
130
138
|
_hasSourceElements() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Synchronizer.js","sourceRoot":"","sources":["../../../../src/store/SynchronizerManager/Synchronizer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,iBAAiB,EACjB,KAAK,GAEN,MAAM,qBAAqB,CAAC;AAU7B,MAAM,YAAY;IAYhB,YACE,cAAsB,EACtB,SAAiB,EACjB,YAAuC,EACvC,OAAa;QARP,qBAAgB,GAA4C,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"Synchronizer.js","sourceRoot":"","sources":["../../../../src/store/SynchronizerManager/Synchronizer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,19 @@
|
|
|
1
|
-
import { vec3 } from 'gl-matrix';
|
|
1
|
+
import { vec3, mat4 } from 'gl-matrix';
|
|
2
2
|
import { getRenderingEngine, metaData, utilities, } from '@cornerstonejs/core';
|
|
3
3
|
import { jumpToSlice } from '../../utilities';
|
|
4
4
|
import areViewportsCoplanar from './areViewportsCoplanar ';
|
|
5
|
+
const getSpatialRegistration = (targetId, sourceId) => utilities.spatialRegistrationMetadataProvider.get('spatialRegistrationModule', [targetId, sourceId]);
|
|
5
6
|
export default async function stackImageSyncCallback(synchronizerInstance, sourceViewport, targetViewport) {
|
|
6
7
|
const renderingEngine = getRenderingEngine(targetViewport.renderingEngineId);
|
|
7
8
|
if (!renderingEngine) {
|
|
8
9
|
throw new Error(`No RenderingEngine for Id: ${targetViewport.renderingEngineId}`);
|
|
9
10
|
}
|
|
10
11
|
const sViewport = renderingEngine.getViewport(sourceViewport.viewportId);
|
|
12
|
+
const options = synchronizerInstance.getOptions(targetViewport.viewportId);
|
|
13
|
+
if (options?.disabled) {
|
|
14
|
+
return;
|
|
15
|
+
}
|
|
11
16
|
const tViewport = renderingEngine.getViewport(targetViewport.viewportId);
|
|
12
|
-
const frameOfReferenceUID1 = sViewport.getFrameOfReferenceUID();
|
|
13
|
-
const frameOfReferenceUID2 = tViewport.getFrameOfReferenceUID();
|
|
14
17
|
const imageId1 = sViewport.getCurrentImageId();
|
|
15
18
|
const imagePlaneModule1 = metaData.get('imagePlaneModule', imageId1);
|
|
16
19
|
const sourceImagePositionPatient = imagePlaneModule1.imagePositionPatient;
|
|
@@ -18,30 +21,30 @@ export default async function stackImageSyncCallback(synchronizerInstance, sourc
|
|
|
18
21
|
if (!areViewportsCoplanar(sViewport, tViewport)) {
|
|
19
22
|
return;
|
|
20
23
|
}
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
return;
|
|
24
|
+
let registrationMatrixMat4 = getSpatialRegistration(targetViewport.viewportId, sourceViewport.viewportId);
|
|
25
|
+
if (!registrationMatrixMat4) {
|
|
26
|
+
const frameOfReferenceUID1 = sViewport.getFrameOfReferenceUID();
|
|
27
|
+
const frameOfReferenceUID2 = tViewport.getFrameOfReferenceUID();
|
|
28
|
+
if (frameOfReferenceUID1 === frameOfReferenceUID2 &&
|
|
29
|
+
options.useInitialPosition !== false) {
|
|
30
|
+
registrationMatrixMat4 = mat4.identity(mat4.create());
|
|
29
31
|
}
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
if (!registrationMatrixMat4) {
|
|
34
|
-
throw new Error(`No registration matrix found for sourceViewport: ${sourceViewport.viewportId} and targetViewport: ${targetViewport.viewportId}, viewports with different frameOfReferenceUIDs must have a registration matrix in the registrationMetadataProvider. Use calculateViewportsRegistrationMatrix to calculate the matrix.`);
|
|
32
|
+
else {
|
|
33
|
+
utilities.calculateViewportsSpatialRegistration(sViewport, tViewport);
|
|
34
|
+
registrationMatrixMat4 = getSpatialRegistration(targetViewport.viewportId, sourceViewport.viewportId);
|
|
35
35
|
}
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
if (closestImageIdIndex2.index !== -1 &&
|
|
39
|
-
tViewport.getCurrentImageIdIndex() !== closestImageIdIndex2.index) {
|
|
40
|
-
await jumpToSlice(tViewport.element, {
|
|
41
|
-
imageIndex: closestImageIdIndex2.index,
|
|
42
|
-
});
|
|
36
|
+
if (!registrationMatrixMat4) {
|
|
37
|
+
return;
|
|
43
38
|
}
|
|
44
39
|
}
|
|
40
|
+
const targetImagePositionPatientWithRegistrationMatrix = vec3.transformMat4(vec3.create(), sourceImagePositionPatient, registrationMatrixMat4);
|
|
41
|
+
const closestImageIdIndex2 = _getClosestImageIdIndex(targetImagePositionPatientWithRegistrationMatrix, targetImageIds);
|
|
42
|
+
if (closestImageIdIndex2.index !== -1 &&
|
|
43
|
+
tViewport.getCurrentImageIdIndex() !== closestImageIdIndex2.index) {
|
|
44
|
+
await jumpToSlice(tViewport.element, {
|
|
45
|
+
imageIndex: closestImageIdIndex2.index,
|
|
46
|
+
});
|
|
47
|
+
}
|
|
45
48
|
}
|
|
46
49
|
function _getClosestImageIdIndex(targetPoint, imageIds) {
|
|
47
50
|
return imageIds.reduce((closestImageIdIndex, imageId, index) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stackImageSyncCallback.js","sourceRoot":"","sources":["../../../../src/synchronizers/callbacks/stackImageSyncCallback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"stackImageSyncCallback.js","sourceRoot":"","sources":["../../../../src/synchronizers/callbacks/stackImageSyncCallback.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ export default function voiSyncCallback(synchronizerInstance, sourceViewport, ta
|
|
|
10
10
|
const tProperties = {
|
|
11
11
|
voiRange: range,
|
|
12
12
|
};
|
|
13
|
-
if (options
|
|
13
|
+
if (options?.syncInvertState && invertStateChanged) {
|
|
14
14
|
tProperties.invert = invert;
|
|
15
15
|
}
|
|
16
16
|
if (tViewport instanceof BaseVolumeViewport) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"voiSyncCallback.js","sourceRoot":"","sources":["../../../../src/synchronizers/callbacks/voiSyncCallback.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,kBAAkB,EAClB,aAAa,GAEd,MAAM,qBAAqB,CAAC;AAY7B,MAAM,CAAC,OAAO,UAAU,eAAe,CACrC,oBAAoB,EACpB,cAAiC,EACjC,cAAiC,EACjC,gBAAmD,EACnD,OAAa;IAEb,MAAM,WAAW,GAAG,gBAAgB,CAAC,MAAM,CAAC;IAC5C,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,kBAAkB,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC;IAEpE,MAAM,eAAe,GAAG,kBAAkB,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC;IAC7E,IAAI,CAAC,eAAe,EAAE;QACpB,MAAM,IAAI,KAAK,CACb,oCAAoC,cAAc,CAAC,iBAAiB,EAAE,CACvE,CAAC;KACH;IAED,MAAM,SAAS,GAAG,eAAe,CAAC,WAAW,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IACzE,MAAM,WAAW,GAEmB;QAClC,QAAQ,EAAE,KAAK;KAChB,CAAC;IAEF,IAAI,OAAO,
|
|
1
|
+
{"version":3,"file":"voiSyncCallback.js","sourceRoot":"","sources":["../../../../src/synchronizers/callbacks/voiSyncCallback.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,kBAAkB,EAClB,aAAa,GAEd,MAAM,qBAAqB,CAAC;AAY7B,MAAM,CAAC,OAAO,UAAU,eAAe,CACrC,oBAAoB,EACpB,cAAiC,EACjC,cAAiC,EACjC,gBAAmD,EACnD,OAAa;IAEb,MAAM,WAAW,GAAG,gBAAgB,CAAC,MAAM,CAAC;IAC5C,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,kBAAkB,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC;IAEpE,MAAM,eAAe,GAAG,kBAAkB,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC;IAC7E,IAAI,CAAC,eAAe,EAAE;QACpB,MAAM,IAAI,KAAK,CACb,oCAAoC,cAAc,CAAC,iBAAiB,EAAE,CACvE,CAAC;KACH;IAED,MAAM,SAAS,GAAG,eAAe,CAAC,WAAW,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IACzE,MAAM,WAAW,GAEmB;QAClC,QAAQ,EAAE,KAAK;KAChB,CAAC;IAEF,IAAI,OAAO,EAAE,eAAe,IAAI,kBAAkB,EAAE;QAClD,WAAW,CAAC,MAAM,GAAG,MAAM,CAAC;KAC7B;IAED,IAAI,SAAS,YAAY,kBAAkB,EAAE;QAC3C,SAAS,CAAC,aAAa,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;KAChD;SAAM,IAAI,SAAS,YAAY,aAAa,EAAE;QAC7C,SAAS,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;KACtC;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;KACjD;IAED,SAAS,CAAC,MAAM,EAAE,CAAC;AACrB,CAAC"}
|