@inweb/viewer-visualize 26.11.0 → 26.11.1

package/lib/Viewer/Draggers/MeasureLineDragger/MeasureLineItem.d.ts

@@ -5,9 +5,8 @@ export declare class MeasureLineItem {
     protected htmlElemTitle: HTMLElement;
     protected startPoint: number[];
     protected endPoint: number[];
-    protected scale: number;
     protected unit: string;
-    protected precision: any;
+    protected scale: number;
     protected size: number;
     protected style: CSSStyleDeclaration;
     protected viewer: any;
@@ -18,8 +17,6 @@ export declare class MeasureLineItem {
     constructor(targetElement: HTMLElement, viewer: any, moduleInstance: any);
     drawMeasureLine(): void;
     getDistance(): number;
-    calculatePrecision(value: number): number;
-    formatDistance(distance: number): string;
     setStartPoint(gePoint: number[]): void;
     setEndPoint(gePoint: number[], isFinish: boolean): void;
     update(): void;
@@ -27,7 +24,6 @@ export declare class MeasureLineItem {
     clear(): void;
     setUnit(unit: string): void;
     setConversionFactor(scale: number): void;
-    setPrecision(precision: any): void;
     setStyle(style: CSSStyleDeclaration): void;
     setSelectionReactor(reactor: any): void;
     setSelectability(enable: boolean): void;

package/lib/Viewer/Draggers/MeasureLineDragger/index.d.ts

@@ -6,13 +6,12 @@ export declare class MeasureLineDragger extends OdBaseDragger {
     protected gripingRadius: number;
     protected firstPoint: number[];
     protected secondPoint: number[];
+    protected renameUnitTable: any;
     protected items: MeasureLineItem[];
     protected m_overlayElement: HTMLElement;
     protected previewMeasureLine: MeasureLineItem;
     protected conversionFactor: number;
-    protected rulerUnitTable: any;
-    protected rulerUnit: string;
-    protected rulerPrecision: any;
+    protected oldRulerUnit: string;
     constructor(subject: Viewer);
     initialize(): void;
     dispose(): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inweb/viewer-visualize",
-  "version": "26.11.0",
+  "version": "26.11.1",
   "description": "JavaScript library for rendering CAD and BIM files in a browser using VisualizeJS",
   "homepage": "https://cloud.opendesign.com/docs/index.html",
   "license": "SEE LICENSE IN LICENSE",
@@ -29,10 +29,10 @@
     "docs": "typedoc"
   },
   "dependencies": {
-    "@inweb/client": "~26.11.0",
-    "@inweb/eventemitter2": "~26.11.0",
-    "@inweb/markup": "~26.11.0",
-    "@inweb/viewer-core": "~26.11.0"
+    "@inweb/client": "~26.11.1",
+    "@inweb/eventemitter2": "~26.11.1",
+    "@inweb/markup": "~26.11.1",
+    "@inweb/viewer-core": "~26.11.1"
   },
-  "visualizeJS": "https://public-fhemb7e3embacwec.z02.azurefd.net/libs/visualizejs/master/Visualize.js"
+  "visualizeJS": "https://public-fhemb7e3embacwec.z02.azurefd.net/libs/visualizejs/26.11/Visualize.js"
 }

package/src/Viewer/Draggers/MeasureLineDragger/MeasureLineItem.ts

@@ -20,7 +20,6 @@
 // By use of this software, its documentation or related materials, you
 // acknowledge and accept the above terms.
 ///////////////////////////////////////////////////////////////////////////////
-
 import * as utils from "./MeasureUtils";
 
 export class MeasureLineItem {
@@ -30,9 +29,8 @@ export class MeasureLineItem {
   protected htmlElemTitle: HTMLElement;
   protected startPoint: number[];
   protected endPoint: number[];
-  protected scale: number;
   protected unit: string;
-  protected precision: any;
+  protected scale: number;
   protected size: number;
   protected style: CSSStyleDeclaration;
   protected viewer: any;
@@ -51,9 +49,8 @@ export class MeasureLineItem {
     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;
 
@@ -156,11 +153,13 @@ export class MeasureLineItem {
         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 = utils.createHtmlElementIfNeed(this.htmlElemTitle, this.targetElement, "ruler-value");
         this.htmlElemTitle.style.display = "block";
         this.htmlElemTitle.style.cursor = "pointer";
@@ -168,8 +167,9 @@ export class MeasureLineItem {
         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";
@@ -177,7 +177,7 @@ export class MeasureLineItem {
         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";
         this.htmlElemTitle.style.display = "none";
@@ -187,37 +187,11 @@ export class MeasureLineItem {
 
   getDistance(): number {
     let distance = utils.getDistance(this.startPoint, this.endPoint, this.moduleInstance);
-    if (Math.abs(this.scale) > 1e-10) distance /= this.scale;
-    return distance;
-  }
-
-  calculatePrecision(value: number) {
-    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: number): string {
-    let digits: number;
-
-    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;
+    if (Math.abs(this.scale - 1.0) > 10e-5) {
+      distance = (distance / this.scale).toFixed(2);
+    }
 
-    return `${result} ${this.unit}`;
+    return distance;
   }
 
   setStartPoint(gePoint: number[]): void {
@@ -259,11 +233,6 @@ export class MeasureLineItem {
     this.drawMeasureLine();
   }
 
-  setPrecision(precision: any): void {
-    this.precision = precision;
-    this.drawMeasureLine();
-  }
-
   setStyle(style: CSSStyleDeclaration): void {
     this.style = style;
     this.drawMeasureLine();

package/src/Viewer/Draggers/MeasureLineDragger/index.ts

@@ -34,24 +34,22 @@ export class MeasureLineDragger extends OdBaseDragger {
   protected gripingRadius: number;
   protected firstPoint: number[];
   protected secondPoint: number[];
+  protected renameUnitTable: any;
   protected items: MeasureLineItem[];
   protected m_overlayElement: HTMLElement;
   protected previewMeasureLine: MeasureLineItem;
   protected conversionFactor: number;
-  protected rulerUnitTable: any;
-  protected rulerUnit: string;
-  protected rulerPrecision: any;
+  protected oldRulerUnit: string;
 
   constructor(subject: Viewer) {
     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",
@@ -61,16 +59,14 @@ export class MeasureLineDragger extends OdBaseDragger {
       Kilometers: "km",
       Miles: "mi",
       Micrometers: "µm",
-      Mils: "mil",
       MicroInches: "µin",
       Default: "unit",
     };
 
-    this.rulerUnit = subject.options.rulerUnit ?? "Default";
-    this.rulerPrecision = subject.options.rulerPrecision ?? "Default";
-
     this.items = [];
-    this.canvasEvents.push("resize", "optionsChange");
+    this.canvasEvents.push("resize");
+    this.oldRulerUnit = subject.options.rulerUnit ?? "Default";
+    this.optionsChange = this.optionsChange.bind(this);
   }
 
   override initialize(): void {
@@ -178,14 +174,9 @@ export class MeasureLineDragger extends OdBaseDragger {
   createMeasureLine(): MeasureLineItem {
     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);
@@ -195,13 +186,6 @@ export class MeasureLineDragger extends OdBaseDragger {
     } else {
       item.setConversionFactor(1.0);
     }
-
-    if (!isDefaultPrecision) {
-      item.setPrecision(this.rulerPrecision);
-    } else {
-      item.setPrecision(2);
-    }
-
     this.items.push(item);
     return item;
   }
@@ -209,38 +193,22 @@ export class MeasureLineDragger extends OdBaseDragger {
   optionsChange(event): void {
     const options: IOptions = event.data;
     const toUnitName = options.rulerUnit ?? "Default";
-    const toPrecision = options.rulerPrecision ?? "Default";
-
-    const unitChanged = this.rulerUnit !== toUnitName;
-    const precisionChanged = this.rulerPrecision !== toPrecision;
-
-    if (!unitChanged && !precisionChanged) return;
-
-    this.rulerUnit = toUnitName;
-    this.rulerPrecision = toPrecision;
+    if (this.oldRulerUnit === toUnitName) return;
+    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 (precisionChanged) {
-        if (toPrecision === "Default") {
-          item.setPrecision(2);
-        } else {
-          item.setPrecision(toPrecision);
-        }
+      if (toUnitName === "Default") {
+        item.setUnit(renameUnit(this.renameUnitTable, drawingUnit));
+        item.setConversionFactor(1.0);
+      } else {
+        item.setUnit(renameUnit(this.renameUnitTable, toUnitName));
+        const multiplier = this.m_module.getViewer().getUnitsConversionCoef(eFromUnit, eToUnit);
+        this.conversionFactor = 1 / multiplier;
+        item.setConversionFactor(this.conversionFactor);
       }
     });
   }
@@ -275,9 +243,6 @@ export class MeasureLineDragger extends OdBaseDragger {
       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;