@inweb/viewer-visualize 26.11.0 → 26.11.1

package/README.md

@@ -4,12 +4,10 @@
 
 Core capabilities:
 
-- Rendering CAD/BIM files from [Open Cloud Server](https://cloud.opendesign.com/docs/index.html#/opencloud_server), web, or local files
-- Interactive scene navigation (Orbit, Pan, Zoom, Walk, Fly modes)
-- Model selection and highlighting
-- Cutting planes and slicing
-- Markups and measurements
-- Viewpoint management
+- Visualize files stored on the [Open Cloud Server](https://cloud.opendesign.com/docs/index.html#/opencloud_server), on the web, or on your local computer.
+- Add user interaction with scenes.
+- Create markups.
+- Save and load viewpoints.
 
 This library is a part of [CDE SDK](https://www.opendesign.com/products/cde) by [Open Design Alliance](https://opendesign.com).
 

package/dist/viewer-visualize.js

@@ -244,7 +244,6 @@
             enableGestures: true,
             geometryType: "vsfx",
             rulerUnit: "Default",
-            rulerPrecision: 2,
             cameraMode: "perspective",
         };
     }
@@ -501,13 +500,6 @@
             this._data.rulerUnit = value;
             this.change();
         }
-        get rulerPrecision() {
-            return this._data.rulerPrecision;
-        }
-        set rulerPrecision(value) {
-            this._data.rulerPrecision = value;
-            this.change();
-        }
         get cameraMode() {
             return this._data.cameraMode || "perspective";
         }
@@ -912,9 +904,8 @@
             this.htmlElemTitle = null;
             this.startPoint = null;
             this.endPoint = null;
-            this.scale = 1.0;
             this.unit = "";
-            this.precision = 2;
+            this.scale = 1.0;
             this.size = 10.0;
             this.lineThickness = 2;
             this.style = {
@@ -999,9 +990,10 @@
                     this.htmlElemLine.style.background = this.style.background;
                     this.htmlElemLine.style.zIndex = "1";
                     this.htmlElemLine.style.height = `${height}px`;
-                    const distance = this.getDistance();
+                    const distance = `${this.getDistance()} ${this.unit}`;
                     const pX = p1.x + dx / 2;
                     const pY = p1.y + dy / 2;
+                    const widthTitle = distance.length * 10;
                     this.htmlElemTitle = createHtmlElementIfNeed(this.htmlElemTitle, this.targetElement, "ruler-value");
                     this.htmlElemTitle.style.display = "block";
                     this.htmlElemTitle.style.cursor = "pointer";
@@ -1009,8 +1001,9 @@
                     this.htmlElemTitle.style.color = "white";
                     this.htmlElemTitle.style.position = "Absolute";
                     this.htmlElemTitle.style.top = `${pY}px`;
-                    this.htmlElemTitle.style.left = `${pX}px`;
-                    this.htmlElemTitle.style.transform = "translate(-50%, -50%)";
+                    this.htmlElemTitle.style.left = `${pX - widthTitle / 2}px`;
+                    this.htmlElemTitle.style.width = `${widthTitle}px`;
+                    this.htmlElemTitle.style.transformOrigin = "0px 0px";
                     this.htmlElemTitle.style.borderRadius = "5px";
                     this.htmlElemTitle.style.boxShadow = this.style.boxShadow;
                     this.htmlElemTitle.style.border = "none";
@@ -1018,7 +1011,7 @@
                     this.htmlElemTitle.style.zIndex = "3";
                     this.htmlElemTitle.style.padding = "2px";
                     this.htmlElemTitle.style.textAlign = "center";
-                    this.htmlElemTitle.innerHTML = this.formatDistance(distance);
+                    this.htmlElemTitle.innerHTML = `${distance}`;
                 }
                 else {
                     this.htmlElemLine.style.display = "none";
@@ -1028,43 +1021,11 @@
         }
         getDistance() {
             let distance = getDistance(this.startPoint, this.endPoint, this.moduleInstance);
-            if (Math.abs(this.scale) > 1e-10)
-                distance /= this.scale;
+            if (Math.abs(this.scale - 1.0) > 10e-5) {
+                distance = (distance / this.scale).toFixed(2);
+            }
             return distance;
         }
-        calculatePrecision(value) {
-            const distance = Math.abs(value);
-            if (distance >= 1000)
-                return 0;
-            if (distance >= 10)
-                return 1;
-            if (distance >= 0.1)
-                return 2;
-            if (distance >= 0.001)
-                return 3;
-            return distance > 0 ? Math.floor(-Math.log10(distance)) + 1 : 2;
-        }
-        formatDistance(distance) {
-            let digits;
-            if (this.precision === "Auto")
-                digits = this.calculatePrecision(distance);
-            else if (Number.isFinite(this.precision))
-                digits = this.precision;
-            else
-                digits = parseFloat(this.precision);
-            if (!Number.isFinite(digits))
-                digits = 2;
-            else if (digits < 0)
-                digits = 0;
-            else if (digits > 10)
-                digits = 10;
-            let result = distance.toFixed(digits);
-            if (this.precision === "Auto")
-                result = result.replace(/\.0+$/, "").replace(/\.$/, "");
-            if (+result !== distance)
-                result = "~ " + result;
-            return `${result} ${this.unit}`;
-        }
         setStartPoint(gePoint) {
             this.startPoint = gePoint;
             this.drawMeasureLine();
@@ -1097,10 +1058,6 @@
             this.scale = scale;
             this.drawMeasureLine();
         }
-        setPrecision(precision) {
-            this.precision = precision;
-            this.drawMeasureLine();
-        }
         setStyle(style) {
             this.style = style;
             this.drawMeasureLine();
@@ -1123,14 +1080,14 @@
     }
     class MeasureLineDragger extends OdBaseDragger {
         constructor(subject) {
-            var _a, _b;
+            var _a;
             super(subject);
             this.lineThickness = 2;
             this.press = false;
             this.gripingRadius = 5.0;
             this.firstPoint = null;
             this.secondPoint = null;
-            this.rulerUnitTable = {
+            this.renameUnitTable = {
                 Millimeters: "mm",
                 Centimeters: "cm",
                 Meters: "m",
@@ -1140,14 +1097,13 @@
                 Kilometers: "km",
                 Miles: "mi",
                 Micrometers: "µm",
-                Mils: "mil",
                 MicroInches: "µin",
                 Default: "unit",
             };
-            this.rulerUnit = (_a = subject.options.rulerUnit) !== null && _a !== void 0 ? _a : "Default";
-            this.rulerPrecision = (_b = subject.options.rulerPrecision) !== null && _b !== void 0 ? _b : "Default";
             this.items = [];
-            this.canvasEvents.push("resize", "optionsChange");
+            this.canvasEvents.push("resize");
+            this.oldRulerUnit = (_a = subject.options.rulerUnit) !== null && _a !== void 0 ? _a : "Default";
+            this.optionsChange = this.optionsChange.bind(this);
         }
         initialize() {
             super.initialize();
@@ -1242,9 +1198,8 @@
             const viewer = this.m_module.getViewer();
             const item = new MeasureLineItem(this.m_overlayElement, viewer, this.m_module);
             item.lineThickness = this.lineThickness || item.lineThickness;
-            const isDefaultUnit = this.rulerUnit === "Default";
-            const isDefaultPrecision = this.rulerPrecision === "Default";
-            item.setUnit(renameUnit(this.rulerUnitTable, isDefaultUnit ? viewer.getUnit() : this.rulerUnit));
+            const isDefaultUnit = !this.subject.options.rulerUnit || this.subject.options.rulerUnit === "Default";
+            item.setUnit(renameUnit(this.renameUnitTable, isDefaultUnit ? viewer.getUnit() : this.subject.options.rulerUnit));
             if (!isDefaultUnit) {
                 const fromUnit = this.getKUnitByName(viewer.getUnit());
                 const toUnit = this.getKUnitByName(this.subject.options.rulerUnit);
@@ -1255,49 +1210,29 @@
             else {
                 item.setConversionFactor(1.0);
             }
-            if (!isDefaultPrecision) {
-                item.setPrecision(this.rulerPrecision);
-            }
-            else {
-                item.setPrecision(2);
-            }
             this.items.push(item);
             return item;
         }
         optionsChange(event) {
-            var _a, _b;
+            var _a;
             const options = event.data;
             const toUnitName = (_a = options.rulerUnit) !== null && _a !== void 0 ? _a : "Default";
-            const toPrecision = (_b = options.rulerPrecision) !== null && _b !== void 0 ? _b : "Default";
-            const unitChanged = this.rulerUnit !== toUnitName;
-            const precisionChanged = this.rulerPrecision !== toPrecision;
-            if (!unitChanged && !precisionChanged)
+            if (this.oldRulerUnit === toUnitName)
                 return;
-            this.rulerUnit = toUnitName;
-            this.rulerPrecision = toPrecision;
+            this.oldRulerUnit = toUnitName;
             const drawingUnit = this.m_module.getViewer().getUnit();
             const eToUnit = this.getKUnitByName(toUnitName);
             const eFromUnit = this.getKUnitByName(drawingUnit);
             this.items.forEach((item) => {
-                if (unitChanged) {
-                    if (toUnitName === "Default") {
-                        item.setUnit(renameUnit(this.rulerUnitTable, drawingUnit));
-                        item.setConversionFactor(1.0);
-                    }
-                    else {
-                        item.setUnit(renameUnit(this.rulerUnitTable, toUnitName));
-                        const multiplier = this.m_module.getViewer().getUnitsConversionCoef(eFromUnit, eToUnit);
-                        this.conversionFactor = 1 / multiplier;
-                        item.setConversionFactor(this.conversionFactor);
-                    }
+                if (toUnitName === "Default") {
+                    item.setUnit(renameUnit(this.renameUnitTable, drawingUnit));
+                    item.setConversionFactor(1.0);
                 }
-                if (precisionChanged) {
-                    if (toPrecision === "Default") {
-                        item.setPrecision(2);
-                    }
-                    else {
-                        item.setPrecision(toPrecision);
-                    }
+                else {
+                    item.setUnit(renameUnit(this.renameUnitTable, toUnitName));
+                    const multiplier = this.m_module.getViewer().getUnitsConversionCoef(eFromUnit, eToUnit);
+                    this.conversionFactor = 1 / multiplier;
+                    item.setConversionFactor(this.conversionFactor);
                 }
             });
         }
@@ -1331,9 +1266,6 @@
                 case "Micrometers":
                     eUnit = this.m_module.Units.kMicrometers;
                     break;
-                case "Mils":
-                    eUnit = this.m_module.Units.kMils;
-                    break;
                 case "MicroInches":
                     eUnit = this.m_module.Units.kMicroInches;
                     break;
@@ -17969,7 +17901,7 @@ js: import "konva/skia-backend";
             return this._markup;
         }
         configure(params) {
-            this._visualizeJsUrl = params.visualizeJsUrl || "https://public-fhemb7e3embacwec.z02.azurefd.net/libs/visualizejs/master/Visualize.js";
+            this._visualizeJsUrl = params.visualizeJsUrl || "https://public-fhemb7e3embacwec.z02.azurefd.net/libs/visualizejs/26.11/Visualize.js";
             this._crossOrigin = params.crossOrigin;
             return this;
         }