gs-bim-air 3.0.3 → 3.0.5

package/src/viewerWrapper/commands/showMeasure/lib/angle.ts

@@ -1,387 +0,0 @@
-import { MeasureAngleSelector } from "gs-bim-air-core/gsDevFx/operators/measureAngleSelector";
-import Measure from "./measure";
-import { Container } from "@svgdotjs/svg.js";
-import { MeasureObjects } from "gs-bim-air-core/gsDevFx/objects/measureObjects";
-
-import * as Longan from "gs-longan";
-import { CommandShowMeasure, MeasureType } from "../commandShowMeasure";
-import { AngleMeasure, AngleObject } from "gs-bim-air-core/gsDevFx/objects/measureObjects/angleObject";
-import { MeasureObject } from "gs-bim-air-core/gsDevFx/objects/measureObjects/measureObject";
-import { ObjectPreSelector } from "gs-bim-air-core/gsDevFx/operators/objectPreSelector";
-// import { LonganCore } from "gs-longan";
-import { Vector3, ViewerEvent } from "gs-longan";
-import { isPC } from "gs-longan";
-import { GPUPreSelector } from "gs-bim-air-core/gsDevFx/operators/gpuPreSelector";
-import { measureService } from "../../../../api/measureService";
-
-export default class Angle extends Measure {
-  measureObjects;
-  line1;
-  line2;
-  startCircle;
-  midCircle;
-  endCircle;
-  measureAngleSelector;
-
-  constructor(svgDraw, viewer) {
-    super(svgDraw, viewer);
-    this.init();
-  }
-
-  init() {
-    super.begin();
-  }
-
-  addMeasureObject(startPoint: Vector3, midPoint: Vector3, endPoint: Vector3) {
-    // let measureObjects = this.viewer.measureManager.measureObjects;
-    // if (!measureObjects) {
-    //   measureObjects = new MeasureObjects(this.viewer);
-    //   let viewPointStateObject = this.viewer.process.findRenderObject("ViewPointStateObject");
-    //   this.viewer.process.addRenderObject(viewPointStateObject, measureObjects);
-    // }
-
-    let measureObjects = this.viewer.measureManager.measureObjects;
-
-    let angleObject = new AngleObject(this.viewer);
-    angleObject.startPoint = startPoint;
-    angleObject.midPoint = midPoint;
-    angleObject.endPoint = endPoint;
-    // angleObject.data = [
-    //   ...(startPoint as [number, number, number]),
-    //   ...(midPoint as [number, number, number]),
-    //   ...(endPoint as [number, number, number]),
-    // ];
-
-    angleObject.clickFun = (obj: AngleObject) => {
-      let instance = obj.viewer.process.commandManager.currentCommand as CommandShowMeasure;
-
-      if (instance.typeName !== "CommandShowMeasure" && isPC()) {
-        instance = new CommandShowMeasure();
-        obj.viewer.process.commandManager.execute(instance);
-      }
-
-      instance.commandData.angleValue = obj.angle;
-      instance.activeMeasureTypeChange(MeasureType.Angle);
-    };
-
-    // this.viewer.process.addRenderObject(measureObjects, angleObject);
-    measureObjects.addChildObject(angleObject);
-
-    // 画出最新的角度线
-    measureObjects.clearActive();
-    angleObject.active = true;
-    measureObjects.render();
-
-    let instance = this.viewer.process.commandManager.currentCommand as CommandShowMeasure;
-
-    instance.commandData.angleValue = angleObject.angle;
-    instance.activeMeasureTypeChange(MeasureType.Angle);
-    measureService.createMeasure(this.viewer.projectSceneManager.currentScene.id, angleObject.toJson()).then((data) => {
-      angleObject.fromJson(data as AngleMeasure);
-    });
-  }
-
-  deleteActiveAngle() {
-    super.deleteActiveMeasure();
-
-    //删除角度数据时面板数据清零
-    let instance = this.viewer.process.commandManager.currentCommand as CommandShowMeasure;
-    instance.commandData.angleValue = 0;
-  }
-
-  operatorChange() {
-    super.operatorChange();
-
-    // let objectPreSelector = new ObjectPreSelector();
-
-    // this.viewer.operatorManager.add(objectPreSelector);
-
-    // objectPreSelector.vertexSelection = true;
-    // objectPreSelector.edgeSelection = true;
-    // objectPreSelector.faceSelection = true;
-    // objectPreSelector.highlightVertex = true;
-    // objectPreSelector.highlightEdge = true;
-    // objectPreSelector.highlightFace = true;
-
-    let gpuPreSelector = new GPUPreSelector();
-    this.viewer.operatorManager.add(gpuPreSelector);
-
-    this.viewer.operatorManager.add(this.getMeasureAngleSelector());
-
-    //切换测量类型时，若激活的对象不是该类型，面板测量数据清零
-    let instance = this.viewer.process.commandManager.currentCommand as CommandShowMeasure;
-
-    let commandShowMeasure = instance;
-    if (commandShowMeasure.activeMeasureType !== MeasureType.Angle) {
-      commandShowMeasure.commandData.angleValue = 0;
-    }
-  }
-
-  getMeasureAngleSelector() {
-    let measureAngleSelector = new MeasureAngleSelector();
-    this.measureAngleSelector = measureAngleSelector;
-
-    measureAngleSelector.addMeasure.add((startPoint, midPoint, endPoint) => {
-      this.addMeasureObject(startPoint, midPoint, endPoint);
-    });
-
-    // let this.startCircle;
-    // let this.midCircle;
-    // let this.line1;
-    // let this.line2;
-    measureAngleSelector.lButtonDown.add(() => {
-      let draw = this.svgDraw.draw as Container;
-      //   console.log(
-      //     "lbuttondown",
-      //     measureAngleSelector.startPoint,
-      //     measureAngleSelector.midPoint,
-      //     measureAngleSelector.endPoint
-      //   );
-      if (measureAngleSelector.startPoint && !measureAngleSelector.midPoint) {
-        // let startPixelPos =LonganCore.JS_Compute_Coordinates_By_Key(
-        //   this.viewer.sceneKey,
-        //   "world",
-        //   measureAngleSelector.startPoint,
-        //   "pixels"
-        // );
-        let startPixelPos = this.viewer.worldPointToPixelPoint([measureAngleSelector.startPoint.asArray()])[0];
-
-        let startX = startPixelPos[0];
-        let startY = startPixelPos[1];
-        if (!this.startCircle) {
-          this.startCircle = draw
-            .circle(10)
-            .fill("#E09C0D")
-            .stroke({
-              color: "#fff",
-              width: 3,
-            })
-            .move(startX - 5, startY - 5);
-        } else {
-          this.startCircle.move(startX - 5, startY - 5);
-        }
-      } else {
-        if (measureAngleSelector.midPoint) {
-          if (!measureAngleSelector.endPoint) {
-            // let midPixelPos =LonganCore.JS_Compute_Coordinates_By_Key(
-            //   this.viewer.sceneKey,
-            //   "world",
-            //   measureAngleSelector.midPoint,
-            //   "pixels"
-            // );
-            let midPixelPos = this.viewer.worldPointToPixelPoint([measureAngleSelector.midPoint.asArray()])[0];
-
-            let midX = midPixelPos[0];
-            let midY = midPixelPos[1];
-            if (!this.midCircle) {
-              this.midCircle = draw
-                .circle(10)
-                .fill("#E09C0D")
-                .stroke({
-                  color: "#fff",
-                  width: 3,
-                })
-                .move(midX - 5, midY - 5);
-            } else {
-              this.midCircle.move(midX - 5, midY - 5);
-            }
-          }
-        } else {
-          if (this.startCircle) {
-            this.startCircle.remove();
-            this.midCircle.remove();
-            this.line1.remove();
-            this.line2.remove();
-
-            this.startCircle = null;
-            this.midCircle = null;
-            this.line1 = null;
-            this.line2 = null;
-          }
-        }
-      }
-    });
-
-    let draw = this.svgDraw.draw as Container;
-
-    let mouseOffsetX;
-    let mouseOffsetY;
-
-    measureAngleSelector.mouseMove.add((e: ViewerEvent) => {
-      mouseOffsetX = e.mouseEvent().offsetX;
-      mouseOffsetY = e.mouseEvent().offsetY;
-
-      if (this.line1) {
-        this.line1.remove();
-      }
-      if (this.line2) {
-        this.line2.remove();
-      }
-
-      let startPixelPos;
-      let midPixelPos;
-
-      if (measureAngleSelector.startPoint) {
-        startPixelPos = this.viewer.worldPointToPixelPoint([measureAngleSelector.startPoint.asArray()])[0];
-
-        if (this.startCircle) {
-          let startX = startPixelPos[0];
-          let startY = startPixelPos[1];
-          this.startCircle.move(startX - 5, startY - 5);
-        }
-      }
-      if (measureAngleSelector.midPoint) {
-        midPixelPos = this.viewer.worldPointToPixelPoint([measureAngleSelector.midPoint.asArray()])[0];
-        if (this.midCircle) {
-          let midX = midPixelPos[0];
-          let midY = midPixelPos[1];
-          this.midCircle.move(midX - 5, midY - 5);
-        }
-      }
-      if (measureAngleSelector.startPoint && !measureAngleSelector.midPoint) {
-        this.line1 = draw.line(startPixelPos[0], startPixelPos[1], mouseOffsetX, mouseOffsetY).stroke({
-          color: "#E09C0D",
-          width: 3,
-          linecap: "round",
-        });
-      } else if (measureAngleSelector.startPoint && measureAngleSelector.midPoint) {
-        this.line1 = draw.line(startPixelPos[0], startPixelPos[1], midPixelPos[0], midPixelPos[1]).stroke({
-          color: "#E09C0D",
-          width: 3,
-          linecap: "round",
-        });
-      }
-      if (measureAngleSelector.midPoint && !measureAngleSelector.endPoint) {
-        this.line2 = draw.line(midPixelPos[0], midPixelPos[1], mouseOffsetX, mouseOffsetY).stroke({
-          color: "#E09C0D",
-          width: 3,
-          linecap: "round",
-        });
-      }
-    });
-    this.updateTemporarySvg = () => {
-      this.updateSvgFun(mouseOffsetX, mouseOffsetY);
-    };
-
-    // this.viewer.sceneCameraChanged.add(this.updateTemporarySvg);
-
-    measureAngleSelector.windowKeyDown.add((e: ViewerEvent) => {
-      let instance = this.viewer.process.commandManager.currentCommand as CommandShowMeasure;
-
-      let commandShowMeasure = instance;
-      if ((e.uiEvent as any).key === "Delete" && commandShowMeasure.activeMeasureType === MeasureType.Angle) {
-        this.deleteActiveAngle();
-        this.activeIndex = null;
-      }
-      // console.log(
-      //   "(e.uiEvent as any).key",
-      //   (e.uiEvent as any).key,
-      //   commandShowMeasure.activeMeasureType,
-      //   MeasureType.Angle
-      // );
-      if ((e.uiEvent as any).key === "Escape" && commandShowMeasure.activeMeasureType === MeasureType.Angle) {
-        if (this.line1) {
-          this.line1.remove();
-          this.line1 = null;
-        }
-        if (this.line2) {
-          this.line2.remove();
-          this.line2 = null;
-        }
-        if (this.startCircle) {
-          this.startCircle.remove();
-          this.startCircle = null;
-        }
-        if (this.midCircle) {
-          this.midCircle.remove();
-          this.midCircle = null;
-        }
-      }
-    });
-
-    return measureAngleSelector;
-  }
-
-  updateSvgFun(mouseOffsetX, mouseOffsetY) {
-    if (this.line1) {
-      this.line1.remove();
-    }
-    if (this.line2) {
-      this.line2.remove();
-    }
-
-    let startPixelPos;
-    let midPixelPos;
-    let draw = this.svgDraw.draw as Container;
-
-    if (this.measureAngleSelector.startPoint) {
-      // startPixelPos =LonganCore.JS_Compute_Coordinates_By_Key(
-      //   this.viewer.sceneKey,
-      //   "world",
-      //   this.measureAngleSelector.startPoint,
-      //   "pixels"
-      // );
-      startPixelPos = this.viewer.worldPointToPixelPoint([this.measureAngleSelector.startPoint])[0];
-
-      this.startCircle.move(startPixelPos[0] - 5, startPixelPos[1] - 5);
-    }
-    if (this.measureAngleSelector.midPoint) {
-      // midPixelPos =LonganCore.JS_Compute_Coordinates_By_Key(
-      //   this.viewer.sceneKey,
-      //   "world",
-      //   this.measureAngleSelector.midPoint,
-      //   "pixels"
-      // );
-      midPixelPos = this.viewer.worldPointToPixelPoint([this.measureAngleSelector.midPoint])[0];
-
-      this.midCircle.move(midPixelPos[0] - 5, midPixelPos[1] - 5);
-    }
-    if (this.measureAngleSelector.startPoint && !this.measureAngleSelector.midPoint) {
-      this.line1 = draw.line(startPixelPos[0], startPixelPos[1], mouseOffsetX, mouseOffsetY).stroke({
-        color: "#E09C0D",
-        width: 3,
-        linecap: "round",
-      });
-    }
-    if (this.measureAngleSelector.midPoint && !this.measureAngleSelector.endPoint) {
-      this.line1 = draw.line(startPixelPos[0], startPixelPos[1], midPixelPos[0], midPixelPos[1]).stroke({
-        color: "#E09C0D",
-        width: 3,
-        linecap: "round",
-      });
-      this.line2 = draw.line(midPixelPos[0], midPixelPos[1], mouseOffsetX, mouseOffsetY).stroke({
-        color: "#E09C0D",
-        width: 3,
-        linecap: "round",
-      });
-    }
-  }
-
-  end(): void {
-    // this.viewer.sceneCameraChanged.remove(this.updateTemporarySvg);
-    if (this.line1) {
-      this.line1.remove();
-    }
-    if (this.line2) {
-      this.line2.remove();
-    }
-    if (this.startCircle) {
-      this.startCircle.remove();
-    }
-    if (this.midCircle) {
-      this.midCircle.remove();
-    }
-  }
-
-  clearAll() {
-    super.clearAll();
-    if (this.startCircle) {
-      this.startCircle.remove();
-      this.midCircle.remove();
-      this.endCircle.remove();
-    }
-    this.startCircle = null;
-    this.midCircle = null;
-    this.endCircle = null;
-  }
-}

package/src/viewerWrapper/commands/showMeasure/lib/area.ts

@@ -1,103 +0,0 @@
-import { AreaMeasure, AreaObject } from "gs-bim-air-core/gsDevFx/objects/measureObjects/areaObject";
-import * as Longan from "gs-longan";
-import { MeasureObjects } from "gs-bim-air-core/gsDevFx/objects/measureObjects";
-import Measure from "./measure";
-import { CommandShowMeasure, MeasureType } from "../commandShowMeasure";
-import { ComponentPreSelector } from "gs-bim-air-core/gsDevFx/operators/componentPreSelector";
-import { MeasureObject } from "gs-bim-air-core/gsDevFx/objects/measureObjects/measureObject";
-import { ViewerEvent } from "gs-longan";
-import { isPC } from "gs-longan";
-import { CameraMouse } from "gs-bim-air-core/gsDevFx/operators/cameraMouse";
-import { measureService } from "../../../../api/measureService";
-
-export default class Area extends Measure {
-  updateType;
-  componentPreSelector: ComponentPreSelector;
-
-  constructor(svgDraw, viewer) {
-    super(svgDraw, viewer);
-  }
-
-  operatorChange() {
-    super.operatorChange();
-    // this.updateType = this.viewer.updateType;
-    // this.viewer.updateType = Longan.UpdateType.Synchronization;
-
-    // // this.viewer.selectionManager.clearAllSelectionAndHighlight();
-    this.viewer.updateDisplay();
-
-    this.viewer.operatorManager.clear();
-
-    this.viewer.operatorManager.add(new CameraMouse());
-
-    this.componentPreSelector = new ComponentPreSelector();
-    this.viewer.operatorManager.add(this.componentPreSelector);
-    this.addMeasureObject();
-
-    const instance = this.viewer.process.commandManager.currentCommand as CommandShowMeasure;
-    if (instance.activeMeasureType !== MeasureType.Area) {
-      instance.commandData.areaValue = 0;
-    }
-  }
-
-  addMeasureObject() {
-    if (this.componentPreSelector) {
-      this.componentPreSelector.lButtonDown.add((sender) => {
-        let treeNodeObject = this.componentPreSelector.preHighlightObject;
-        if (!treeNodeObject) {
-          return;
-        }
-
-        let measureObjects = this.viewer.measureManager.measureObjects;
-
-        let areaObject = new AreaObject(this.viewer);
-        areaObject.treeNodeObject = treeNodeObject;
-        areaObject.clickFun = (obj: AreaObject) => {
-          let instance = obj.viewer.process.commandManager.currentCommand as CommandShowMeasure;
-          if (instance.typeName !== "CommandShowMeasure" && isPC()) {
-            instance = new CommandShowMeasure();
-            obj.viewer.process.commandManager.execute(instance);
-          }
-
-          instance.commandData.areaValue = obj.area;
-          instance.activeMeasureTypeChange(MeasureType.Area);
-        };
-        // this.viewer.process.addRenderObject(measureObjects, areaObject);
-        measureObjects.addChildObject(areaObject);
-
-        // 画出最新的
-        let instance = this.viewer.process.commandManager.currentCommand as CommandShowMeasure;
-
-        instance.commandData.areaValue = areaObject.area;
-
-        measureObjects.clearActive();
-        areaObject.active = true;
-        measureObjects.render();
-
-        this.componentPreSelector.clearPreSelect();
-        measureService
-          .createMeasure(this.viewer.projectSceneManager.currentScene.id, areaObject.toJson())
-          .then((data) => {
-            areaObject.fromJson(data as AreaMeasure);
-          });
-      });
-
-      this.componentPreSelector.windowKeyDown.add((e: ViewerEvent) => {
-        let commandShowMeasure = this.viewer.process.commandManager.currentCommand as CommandShowMeasure;
-        if ((e.uiEvent as any).key === "Delete" && commandShowMeasure.activeMeasureType === MeasureType.Area) {
-          this.deleteActiveMeasureArea();
-          this.activeIndex = null;
-        }
-      });
-    } else {
-      console.log("this.componentPreSelector is null");
-    }
-  }
-
-  deleteActiveMeasureArea() {
-    super.deleteActiveMeasure();
-    //面板数据清零
-    (this.viewer.process.commandManager.currentCommand as CommandShowMeasure).commandData.areaValue = 0;
-    this.activeIndex = null;
-  }
-}