@inweb/viewer-visualize 25.8.9 → 25.8.11
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/viewer-visualize.js +37 -42
- package/dist/viewer-visualize.js.map +1 -1
- package/dist/viewer-visualize.min.js +1 -1
- package/dist/viewer-visualize.module.js +34 -40
- package/dist/viewer-visualize.module.js.map +1 -1
- package/lib/Viewer/Viewer.d.ts +2 -2
- package/package.json +5 -5
- package/src/Viewer/Markup/Visualize/VisualizeMarkup.ts +7 -46
- package/src/Viewer/Viewer.ts +36 -3
package/lib/Viewer/Viewer.d.ts
CHANGED
|
@@ -193,11 +193,11 @@ export declare class Viewer extends EventEmitter2<ViewerEventMap & CanvasEventMa
|
|
|
193
193
|
*/
|
|
194
194
|
clearSlices(): void;
|
|
195
195
|
/**
|
|
196
|
-
*
|
|
196
|
+
* Clear overlay view.
|
|
197
197
|
*/
|
|
198
198
|
clearOverlay(): void;
|
|
199
199
|
/**
|
|
200
|
-
*
|
|
200
|
+
* Create overlay view.
|
|
201
201
|
*/
|
|
202
202
|
syncOverlay(): any;
|
|
203
203
|
/**
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@inweb/viewer-visualize",
|
|
3
|
-
"version": "25.8.
|
|
3
|
+
"version": "25.8.11",
|
|
4
4
|
"description": "3D CAD and BIM data Viewer powered by Visualize",
|
|
5
5
|
"homepage": "https://cloud.opendesign.com/docs/index.html",
|
|
6
6
|
"license": "SEE LICENSE IN LICENSE",
|
|
@@ -29,10 +29,10 @@
|
|
|
29
29
|
"docs": "typedoc"
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@inweb/client": "~25.8.
|
|
33
|
-
"@inweb/eventemitter2": "~25.8.
|
|
34
|
-
"@inweb/markup": "~25.8.
|
|
35
|
-
"@inweb/viewer-core": "~25.8.
|
|
32
|
+
"@inweb/client": "~25.8.11",
|
|
33
|
+
"@inweb/eventemitter2": "~25.8.11",
|
|
34
|
+
"@inweb/markup": "~25.8.11",
|
|
35
|
+
"@inweb/viewer-core": "~25.8.11"
|
|
36
36
|
},
|
|
37
37
|
"visualizeJS": "https://opencloud.azureedge.net/libs/visualizejs/master/Visualize.js"
|
|
38
38
|
}
|
|
@@ -5,8 +5,6 @@ import { Viewer } from "../../Viewer";
|
|
|
5
5
|
import { MARKUP_ENTITY_LINE, OdaLineDragger } from "../../Draggers/OdaLineDragger";
|
|
6
6
|
import { MARKUP_ENTITY_TEXT, OdaTextDragger } from "../../Draggers/OdaTextDragger";
|
|
7
7
|
|
|
8
|
-
const OVERLAY_VIEW_NAME = "$OVERLAY_VIEW_NAME";
|
|
9
|
-
|
|
10
8
|
export class VisualizeMarkup implements IMarkup {
|
|
11
9
|
private _viewer: Viewer;
|
|
12
10
|
protected _markupColor = { r: 255, g: 0, b: 0 };
|
|
@@ -28,38 +26,7 @@ export class VisualizeMarkup implements IMarkup {
|
|
|
28
26
|
|
|
29
27
|
dispose(): void {}
|
|
30
28
|
|
|
31
|
-
syncOverlay(): void {
|
|
32
|
-
if (!this._viewer.visualizeJs) return;
|
|
33
|
-
|
|
34
|
-
const visViewer = this._viewer.visViewer();
|
|
35
|
-
const activeView = visViewer.activeView;
|
|
36
|
-
|
|
37
|
-
let overlayView = visViewer.getViewByName(OVERLAY_VIEW_NAME);
|
|
38
|
-
if (!overlayView) {
|
|
39
|
-
const overlayModel = visViewer.getMarkupModel();
|
|
40
|
-
const pDevice = visViewer.getActiveDevice();
|
|
41
|
-
|
|
42
|
-
overlayView = pDevice.createView(OVERLAY_VIEW_NAME, false);
|
|
43
|
-
overlayView.addModel(overlayModel);
|
|
44
|
-
|
|
45
|
-
activeView.addSibling(overlayView);
|
|
46
|
-
pDevice.addView(overlayView);
|
|
47
|
-
}
|
|
48
|
-
|
|
49
|
-
overlayView.viewPosition = activeView.viewPosition;
|
|
50
|
-
overlayView.viewTarget = activeView.viewTarget;
|
|
51
|
-
overlayView.upVector = activeView.upVector;
|
|
52
|
-
overlayView.viewFieldWidth = activeView.viewFieldWidth;
|
|
53
|
-
overlayView.viewFieldHeight = activeView.viewFieldHeight;
|
|
54
|
-
|
|
55
|
-
const viewPort = overlayView.getViewport();
|
|
56
|
-
overlayView.setViewport(viewPort.lowerLeft, viewPort.upperRight);
|
|
57
|
-
overlayView.vportRect = activeView.vportRect;
|
|
58
|
-
|
|
59
|
-
this._viewer.update();
|
|
60
|
-
|
|
61
|
-
return overlayView;
|
|
62
|
-
}
|
|
29
|
+
syncOverlay(): void {}
|
|
63
30
|
|
|
64
31
|
clearOverlay(): void {
|
|
65
32
|
if (!this._viewer.visualizeJs) return;
|
|
@@ -68,8 +35,6 @@ export class VisualizeMarkup implements IMarkup {
|
|
|
68
35
|
const model = visViewer.getMarkupModel();
|
|
69
36
|
model.clearEntities();
|
|
70
37
|
model.delete();
|
|
71
|
-
|
|
72
|
-
this._viewer.update();
|
|
73
38
|
}
|
|
74
39
|
|
|
75
40
|
getMarkupColor(): { r: number; g: number; b: number } {
|
|
@@ -243,26 +208,22 @@ export class VisualizeMarkup implements IMarkup {
|
|
|
243
208
|
}
|
|
244
209
|
|
|
245
210
|
enableEditMode(mode: MarkupMode | false): this {
|
|
246
|
-
|
|
211
|
+
return this;
|
|
247
212
|
}
|
|
248
213
|
|
|
249
214
|
createObject(type: string, params: any): IMarkupObject {
|
|
250
|
-
|
|
215
|
+
return undefined;
|
|
251
216
|
}
|
|
252
217
|
|
|
253
218
|
getObjects(): IMarkupObject[] {
|
|
254
|
-
|
|
219
|
+
return [];
|
|
255
220
|
}
|
|
256
221
|
|
|
257
222
|
getSelectedObjects(): IMarkupObject[] {
|
|
258
|
-
|
|
223
|
+
return [];
|
|
259
224
|
}
|
|
260
225
|
|
|
261
|
-
selectObjects(objects: IMarkupObject[]): void {
|
|
262
|
-
throw new Error("Not implemented yet");
|
|
263
|
-
}
|
|
226
|
+
selectObjects(objects: IMarkupObject[]): void {}
|
|
264
227
|
|
|
265
|
-
clearSelected(): void {
|
|
266
|
-
throw new Error("Not implemented yet");
|
|
267
|
-
}
|
|
228
|
+
clearSelected(): void {}
|
|
268
229
|
}
|
package/src/Viewer/Viewer.ts
CHANGED
|
@@ -57,6 +57,8 @@ import { loadVisualizeJs } from "./utils";
|
|
|
57
57
|
import { LoaderFactory } from "./Loaders/LoaderFactory";
|
|
58
58
|
import { MarkupFactory, MarkupType } from "./Markup/MarkupFactory";
|
|
59
59
|
|
|
60
|
+
const OVERLAY_VIEW_NAME = "$OVERLAY_VIEW_NAME";
|
|
61
|
+
|
|
60
62
|
const isExist = (value) => value !== undefined && value !== null;
|
|
61
63
|
|
|
62
64
|
/**
|
|
@@ -711,17 +713,48 @@ export class Viewer
|
|
|
711
713
|
}
|
|
712
714
|
|
|
713
715
|
/**
|
|
714
|
-
*
|
|
716
|
+
* Clear overlay view.
|
|
715
717
|
*/
|
|
716
718
|
clearOverlay(): void {
|
|
719
|
+
if (!this.visualizeJs) return;
|
|
720
|
+
|
|
717
721
|
this._markup.clearOverlay();
|
|
722
|
+
this.update();
|
|
718
723
|
}
|
|
719
724
|
|
|
720
725
|
/**
|
|
721
|
-
*
|
|
726
|
+
* Create overlay view.
|
|
722
727
|
*/
|
|
723
728
|
syncOverlay(): any {
|
|
724
|
-
|
|
729
|
+
if (!this.visualizeJs) return;
|
|
730
|
+
|
|
731
|
+
const visViewer = this.visViewer();
|
|
732
|
+
const activeView = visViewer.activeView;
|
|
733
|
+
|
|
734
|
+
let overlayView = visViewer.getViewByName(OVERLAY_VIEW_NAME);
|
|
735
|
+
if (!overlayView) {
|
|
736
|
+
const markupModel = visViewer.getMarkupModel();
|
|
737
|
+
const pDevice = visViewer.getActiveDevice();
|
|
738
|
+
|
|
739
|
+
overlayView = pDevice.createView(OVERLAY_VIEW_NAME, false);
|
|
740
|
+
overlayView.addModel(markupModel);
|
|
741
|
+
|
|
742
|
+
activeView.addSibling(overlayView);
|
|
743
|
+
pDevice.addView(overlayView);
|
|
744
|
+
}
|
|
745
|
+
|
|
746
|
+
overlayView.viewPosition = activeView.viewPosition;
|
|
747
|
+
overlayView.viewTarget = activeView.viewTarget;
|
|
748
|
+
overlayView.upVector = activeView.upVector;
|
|
749
|
+
overlayView.viewFieldWidth = activeView.viewFieldWidth;
|
|
750
|
+
overlayView.viewFieldHeight = activeView.viewFieldHeight;
|
|
751
|
+
|
|
752
|
+
const viewPort = overlayView.getViewport();
|
|
753
|
+
overlayView.setViewport(viewPort.lowerLeft, viewPort.upperRight);
|
|
754
|
+
overlayView.vportRect = activeView.vportRect;
|
|
755
|
+
|
|
756
|
+
this._markup.syncOverlay();
|
|
757
|
+
this.update();
|
|
725
758
|
}
|
|
726
759
|
|
|
727
760
|
/**
|