gs-bim-air 3.0.3 → 3.0.5

package/src/viewerWrapper/commands/showMarkup/lib/arrow.ts

@@ -1,342 +0,0 @@
-import Markup from "./markup";
-import { Container } from "@svgdotjs/svg.js";
-import { MarkupObjects } from "gs-bim-air-core/gsDevFx/objects/markupObjects";
-import { SvgDraw } from "../../../../plugins/svgDraw";
-
-import * as Longan from "gs-longan";
-import { CommandShowMarkup, MarkupType } from "../commandShowMarkup";
-import { ArrowObject } from "gs-bim-air-core/gsDevFx/objects/markupObjects/arrowObject";
-import { MarkupObject } from "gs-bim-air-core/gsDevFx/objects/markupObjects/markupObject";
-import { ObjectPreSelector } from "gs-bim-air-core/gsDevFx/operators/objectPreSelector";
-import { LonganCore } from "gs-longan";
-import { MarkupArrowSelector } from "gs-bim-air-core/gsDevFx/operators/markupArrowSelector";
-
-export default class Arrow extends Markup {
-  markupObjects;
-  lineGroup = [];
-
-  lineX;
-  lineY;
-  lineZ;
-
-  rectGroup = [];
-  textGroup = [];
-  line;
-  startCircle;
-  endCircle;
-
-  activeIndex = null;
-  arrowObject: ArrowObject;
-
-  get activeMarkup() {
-    this.viewer.markupManager.markupObjects.childObjects.forEach((item: MarkupObject) => {
-      if (item.active) {
-        console.log("activeMarkup", item);
-        return item;
-      }
-    });
-    return null;
-  }
-
-  constructor(svgDraw, viewer) {
-    super(svgDraw, viewer);
-
-    this.init();
-  }
-
-  init() {
-    super.begin();
-  }
-
-  // addMarkupObject(startPoint, endPoint) {
-  //   let markupObjects: MarkupObjects =
-  //     this.viewer.markupManager.markupObjects;
-  //   let arrowObject = new ArrowObject(this.viewer);
-  //   arrowObject.data = [
-  //     ...(startPoint as [number, number, number]),
-  //     ...(endPoint as [number, number, number]),
-  //   ];
-  //   markupObjects.addChildObject(arrowObject);
-
-  //   // 画出最新的
-  //   markupObjects.clearActive();
-  //   arrowObject.active = true;
-  //   markupObjects.render();
-
-  //   let instance = this.viewer.process.commandManager
-  //     .currentCommand as CommandShowMarkup;
-
-  //   instance.commandData.startPos = startPoint;
-  //   instance.commandData.endPos = endPoint;
-  //   instance.activeMarkupTypeChange(MarkupType.Arrow);
-  // }
-
-  deleteActiveArrow() {
-    let markupObjects = this.viewer.markupManager.markupObjects;
-
-    if (markupObjects) {
-      markupObjects.childObjects.forEach((item: MarkupObject) => {
-        if (item.active) {
-          item.remove();
-        }
-      });
-    }
-
-    // this.clearActive();
-  }
-
-  // this.clearActive();
-
-  clearActive() {
-    if (this.startCircle) {
-      if (this.rectGroup[this.activeIndex]) {
-        this.rectGroup[this.activeIndex].stroke({ color: "#E09C0D", width: 0 });
-      }
-
-      this.startCircle.remove();
-      this.endCircle.remove();
-
-      this.lineX.remove();
-      this.lineY.remove();
-      this.lineZ.remove();
-
-      this.startCircle = null;
-      this.endCircle = null;
-
-      this.lineX = null;
-      this.lineY = null;
-      this.lineZ = null;
-    }
-
-    super.clearActive();
-  }
-
-  operatorChange() {
-    super.operatorChange();
-
-    //切换测量类型时，若激活的对象不是该类型，面板测量数据清零
-    let instance = this.viewer.process.commandManager.currentCommand as CommandShowMarkup;
-
-    let commandShowMarkup = instance;
-    if (commandShowMarkup.activeMarkupType !== MarkupType.Arrow) {
-      commandShowMarkup.commandData.arrow = 0;
-      commandShowMarkup.commandData.startPos = [0, 0, 0];
-      commandShowMarkup.commandData.endPos = [0, 0, 0];
-    }
-
-    this.svgDraw.lButtonDown.clear();
-    this.svgDraw.lButtonDownAndMove.clear();
-
-    // let startX, startY;
-    let arrowObject: ArrowObject;
-    this.svgDraw.lButtonDown.add((sender, e) => {
-      let isEditing = false;
-      this.viewer.markupManager.markupObjects.forEach((item: MarkupObject) => {
-        if (item._isEditing) {
-          isEditing = true;
-        }
-      });
-      if (isEditing) {
-        arrowObject = null;
-      } else {
-        arrowObject = new ArrowObject(this.viewer);
-        arrowObject.x1 = e.offsetX;
-        arrowObject.y1 = e.offsetY;
-      }
-    });
-    this.svgDraw.lButtonDownAndMove.add((sender, e) => {
-      //console.log("lButtonDownAndMove", sender, e);
-      if (arrowObject) {
-        arrowObject.x2 = e.offsetX;
-        arrowObject.y2 = e.offsetY;
-        arrowObject._isEditing = true;
-
-        arrowObject.render();
-      }
-    });
-
-    this.svgDraw.lButtonUp.add((sender, e) => {
-      if (
-        arrowObject &&
-        arrowObject.x2 !== null &&
-        arrowObject.y2 !== null &&
-        this.viewer.markupManager.markupObjects.childObjects.indexOf(arrowObject) === -1 &&
-        arrowObject._isEditing
-      ) {
-        this.viewer.markupManager.markupObjects.addChildObject(arrowObject);
-        arrowObject._isEditing = false;
-      }
-    });
-
-    this.viewer.onWindowKeyDown.add((sender, e) => {
-      if ((e.uiEvent as any).key === "Delete") {
-        this.deleteActiveArrow();
-        // saveModel()
-        // this.activeLabelIndex = null
-      }
-    });
-  }
-
-  markupArrowSelector() {
-    // this.viewer.lButtonDown.add(() => {
-    //   console.log("----------------------");
-    // });
-    // let markupArrowSelector = new MarkupArrowSelector();
-    // markupArrowSelector.addMarkup.add((startPoint, endPoint) => {
-    //   this.addMarkupObject(startPoint, endPoint);
-    // });
-    // let draw = this.svgDraw.draw as Container;
-    // // let this.startCircle;
-    // // let this.line;
-    // markupArrowSelector.lButtonDown.add(() => {
-    //   console.log(
-    //     "lbuttondown",
-    //     markupArrowSelector.startPoint,
-    //     markupArrowSelector.endPoint
-    //   );
-    //   if (markupArrowSelector.startPoint && !markupArrowSelector.endPoint) {
-    //     let startPixelPos = this.viewer.worldPointToPixelPoint([
-    //       markupArrowSelector.startPoint,
-    //     ])[0];
-    //     let startX = startPixelPos[0];
-    //     let startY = startPixelPos[1];
-    //     this.startCircle = draw
-    //       .circle(10)
-    //       .fill("#E09C0D")
-    //       .stroke({
-    //         color: "#fff",
-    //         width: 3,
-    //       })
-    //       .move(startX - 5, startY - 5);
-    //   } else {
-    //     if (this.startCircle) {
-    //       this.startCircle.remove();
-    //     }
-    //     if (this.line) {
-    //       this.line.remove();
-    //     }
-    //   }
-    // });
-    // let mouseOffsetX;
-    // let mouseOffsetY;
-    // markupArrowSelector.mouseMove.add(
-    //   (sender: Longan.ViewerOperator, e: ViewerEvent) => {
-    //     if (markupArrowSelector.startPoint) {
-    //       let startPixelPos = this.viewer.worldPointToPixelPoint([
-    //         markupArrowSelector.startPoint,
-    //       ])[0];
-    //       let startX = startPixelPos[0];
-    //       let startY = startPixelPos[1];
-    //       mouseOffsetX = e.mouseEvent().offsetX;
-    //       mouseOffsetY = e.mouseEvent().offsetY;
-    //       if (this.line) {
-    //         // let plotArr = this.line.plot()
-    //         // startX = plotArr[0][0]
-    //         // startY = plotArr[0][1]
-    //         this.line.remove();
-    //       }
-    //       this.line = draw
-    //         .line(startX, startY, mouseOffsetX, mouseOffsetY)
-    //         .stroke({
-    //           color: "#E09C0D",
-    //           width: 3,
-    //           linecap: "round",
-    //         });
-    //     }
-    //   }
-    // );
-    // this.updateTemporarySvg = () => {
-    //   if (markupArrowSelector.startPoint && this.startCircle) {
-    //     let startPixelPos = this.viewer.worldPointToPixelPoint([
-    //       markupArrowSelector.startPoint,
-    //     ])[0];
-    //     let startX = startPixelPos[0];
-    //     let startY = startPixelPos[1];
-    //     this.startCircle.move(startX - 5, startY - 5);
-    //     if (this.line) {
-    //       this.line.remove();
-    //     }
-    //     this.line = draw
-    //       .line(startX, startY, mouseOffsetX, mouseOffsetY)
-    //       .stroke({
-    //         color: "#E09C0D",
-    //         width: 3,
-    //         linecap: "round",
-    //       });
-    //   }
-    // };
-    // this.viewer.sceneCameraChanged.add(this.updateTemporarySvg);
-    // markupArrowSelector.windowKeyDown.add(
-    //   (sender: Longan.ViewerOperator, e: ViewerEvent) => {
-    //     let commandShowMarkup = this.viewer.process.commandManager
-    //       .currentCommand as CommandShowMarkup;
-    //     if (
-    //       (e.uiEvent as any).key === "Delete" &&
-    //       commandShowMarkup.activeMarkupType === MarkupType.Arrow
-    //     ) {
-    //       this.deleteActiveArrow();
-    //       // saveModel()
-    //       this.activeIndex = null;
-    //     }
-    //     if (
-    //       (e.uiEvent as any).key === "Escape" &&
-    //       commandShowMarkup.activeMarkupType === MarkupType.Arrow
-    //     ) {
-    //       if (this.line) {
-    //         this.line.remove();
-    //         this.line = null;
-    //       }
-    //       if (this.startCircle) {
-    //         this.startCircle.remove();
-    //         this.startCircle = null;
-    //       }
-    //     }
-    //   }
-    // );
-    // return markupArrowSelector;
-  }
-
-  end(): void {
-    // this.viewer.sceneCameraChanged.remove(this.updateTemporarySvg);
-    if (this.line) {
-      this.line.remove();
-    }
-    if (this.startCircle) {
-      this.startCircle.remove();
-    }
-  }
-
-  clearAll() {
-    super.clearAll();
-    this.lineGroup.forEach((item) => {
-      item.remove();
-    });
-
-    if (this.startCircle) {
-      this.startCircle.remove();
-      this.endCircle.remove();
-      this.lineX.remove();
-      this.lineY.remove();
-      this.lineZ.remove();
-    }
-
-    this.rectGroup.forEach((item) => {
-      item.remove();
-    });
-    this.textGroup.forEach((item) => {
-      item.remove();
-    });
-
-    this.lineGroup = [];
-
-    this.startCircle = null;
-    this.endCircle = null;
-
-    this.lineX = null;
-    this.lineY = null;
-    this.lineZ = null;
-
-    this.rectGroup = [];
-    this.textGroup = [];
-  }
-}

package/src/viewerWrapper/commands/showMarkup/lib/elliptic.ts

@@ -1,331 +0,0 @@
-import Markup from "./markup";
-import { Container } from "@svgdotjs/svg.js";
-import { MarkupObjects } from "gs-bim-air-core/gsDevFx/objects/markupObjects";
-import { SvgDraw } from "../../../../plugins/svgDraw";
-
-import * as Longan from "gs-longan";
-import { CommandShowMarkup, MarkupType } from "../commandShowMarkup";
-import { RectangleObject } from "gs-bim-air-core/gsDevFx/objects/markupObjects/rectangleObject";
-import { MarkupObject } from "gs-bim-air-core/gsDevFx/objects/markupObjects/markupObject";
-import { EllipticObject } from "gs-bim-air-core/gsDevFx/objects/markupObjects/ellipticObject";
-
-export default class Elliptic extends Markup {
-  markupObjects;
-  lineGroup = [];
-
-  lineX;
-  lineY;
-  lineZ;
-
-  rectGroup = [];
-  textGroup = [];
-  line;
-  startCircle;
-  endCircle;
-
-  activeIndex = null;
-
-  get activeMarkup() {
-    this.viewer.markupManager.markupObjects.childObjects.forEach((item: MarkupObject) => {
-      if (item.active) {
-        console.log("activeMarkup", item);
-        return item;
-      }
-    });
-    return null;
-  }
-
-  constructor(svgDraw, viewer) {
-    super(svgDraw, viewer);
-
-    this.init();
-  }
-
-  init() {
-    super.begin();
-  }
-
-  addMarkupObject(startPoint, endPoint) {
-    let markupObjects: MarkupObjects = this.viewer.markupManager.markupObjects;
-    let ellipticObject = new EllipticObject(this.viewer);
-    ellipticObject.data = [...(startPoint as [number, number, number]), ...(endPoint as [number, number, number])];
-    markupObjects.addChildObject(ellipticObject);
-
-    // 画出最新的
-    console.log("markupObjects----", markupObjects);
-    markupObjects.clearActive();
-    ellipticObject.active = true;
-    markupObjects.render();
-
-    let instance = this.viewer.process.commandManager.currentCommand as CommandShowMarkup;
-
-    instance.commandData.startPos = startPoint;
-    instance.commandData.endPos = endPoint;
-    instance.activeMarkupTypeChange(MarkupType.Rectangle);
-  }
-
-  deleteActiveEllitic() {
-    let markupObjects = this.viewer.markupManager.markupObjects;
-
-    if (markupObjects) {
-      markupObjects.childObjects.forEach((item: MarkupObject) => {
-        if (item.active) {
-          item.remove();
-        }
-      });
-    }
-
-    // this.clearActive();
-  }
-
-  // this.clearActive();
-
-  clearActive() {
-    if (this.startCircle) {
-      if (this.rectGroup[this.activeIndex]) {
-        this.rectGroup[this.activeIndex].stroke({ color: "#E09C0D", width: 0 });
-      }
-
-      this.startCircle.remove();
-      this.endCircle.remove();
-
-      this.lineX.remove();
-      this.lineY.remove();
-      this.lineZ.remove();
-
-      this.startCircle = null;
-      this.endCircle = null;
-
-      this.lineX = null;
-      this.lineY = null;
-      this.lineZ = null;
-    }
-
-    super.clearActive();
-  }
-
-  operatorChange() {
-    super.operatorChange();
-
-    this.svgDraw.lButtonDown.clear();
-    this.svgDraw.lButtonDownAndMove.clear();
-
-    // let startX, startY;
-    let ellipticObject: EllipticObject;
-    this.svgDraw.lButtonDown.add((sender, e) => {
-      console.log("sender", sender, e);
-      let isEditing = false;
-      this.viewer.markupManager.markupObjects.forEach((item: MarkupObject) => {
-        if (item._isEditing) {
-          isEditing = true;
-        }
-      });
-      if (isEditing) {
-        ellipticObject = null;
-      } else {
-        this.viewer.markupManager.markupObjects.forEach((item: MarkupObject) => {
-          item.active = false;
-        });
-        ellipticObject = new EllipticObject(this.viewer);
-        ellipticObject.x1 = e.offsetX;
-        ellipticObject.y1 = e.offsetY;
-      }
-    });
-    this.svgDraw.lButtonDownAndMove.add((sender, e) => {
-      // console.log("lButtonDownAndMove", sender, e);
-      if (ellipticObject) {
-        ellipticObject.x2 = e.offsetX;
-        ellipticObject.y2 = e.offsetY;
-        ellipticObject._isEditing = true;
-
-        ellipticObject.render();
-      }
-    });
-
-    this.svgDraw.lButtonUp.add((sender, e) => {
-      if (
-        ellipticObject &&
-        ellipticObject.x1 !== null &&
-        ellipticObject.y1 !== null &&
-        ellipticObject.x2 !== null &&
-        ellipticObject.y2 !== null &&
-        this.viewer.markupManager.markupObjects.childObjects.indexOf(ellipticObject) === -1 &&
-        ellipticObject._isEditing
-      ) {
-        this.viewer.markupManager.markupObjects.addChildObject(ellipticObject);
-        ellipticObject._isEditing = false;
-      }
-    });
-
-    this.viewer.onWindowKeyDown.add((sender, e) => {
-      if ((e.uiEvent as any).key === "Delete") {
-        this.deleteActiveEllitic();
-        // saveModel()
-        // this.activeLabelIndex = null
-      }
-    });
-  }
-
-  markupRectangleSelector() {
-    // this.viewer.lButtonDown.add(() => {
-    //   console.log("----------------------");
-    // });
-    // let markupRectangleSelector = new MarkupRectangleSelector();
-    // markupRectangleSelector.addMarkup.add((startPoint, endPoint) => {
-    //   this.addMarkupObject(startPoint, endPoint);
-    // });
-    // let draw = this.svgDraw.draw as Container;
-    // // let this.startCircle;
-    // // let this.line;
-    // markupRectangleSelector.lButtonDown.add(() => {
-    //   console.log(
-    //     "lbuttondown",
-    //     markupRectangleSelector.startPoint,
-    //     markupRectangleSelector.endPoint
-    //   );
-    //   if (markupRectangleSelector.startPoint && !markupRectangleSelector.endPoint) {
-    //     let startPixelPos = this.viewer.worldPointToPixelPoint([
-    //       markupRectangleSelector.startPoint,
-    //     ])[0];
-    //     let startX = startPixelPos[0];
-    //     let startY = startPixelPos[1];
-    //     this.startCircle = draw
-    //       .circle(10)
-    //       .fill("#E09C0D")
-    //       .stroke({
-    //         color: "#fff",
-    //         width: 3,
-    //       })
-    //       .move(startX - 5, startY - 5);
-    //   } else {
-    //     if (this.startCircle) {
-    //       this.startCircle.remove();
-    //     }
-    //     if (this.line) {
-    //       this.line.remove();
-    //     }
-    //   }
-    // });
-    // let mouseOffsetX;
-    // let mouseOffsetY;
-    // markupRectangleSelector.mouseMove.add(
-    //   (sender: Longan.ViewerOperator, e: ViewerEvent) => {
-    //     if (markupRectangleSelector.startPoint) {
-    //       let startPixelPos = this.viewer.worldPointToPixelPoint([
-    //         markupRectangleSelector.startPoint,
-    //       ])[0];
-    //       let startX = startPixelPos[0];
-    //       let startY = startPixelPos[1];
-    //       mouseOffsetX = e.mouseEvent().offsetX;
-    //       mouseOffsetY = e.mouseEvent().offsetY;
-    //       if (this.line) {
-    //         // let plotArr = this.line.plot()
-    //         // startX = plotArr[0][0]
-    //         // startY = plotArr[0][1]
-    //         this.line.remove();
-    //       }
-    //       this.line = draw
-    //         .line(startX, startY, mouseOffsetX, mouseOffsetY)
-    //         .stroke({
-    //           color: "#E09C0D",
-    //           width: 3,
-    //           linecap: "round",
-    //         });
-    //     }
-    //   }
-    // );
-    // this.updateTemporarySvg = () => {
-    //   if (markupRectangleSelector.startPoint && this.startCircle) {
-    //     let startPixelPos = this.viewer.worldPointToPixelPoint([
-    //       markupRectangleSelector.startPoint,
-    //     ])[0];
-    //     let startX = startPixelPos[0];
-    //     let startY = startPixelPos[1];
-    //     this.startCircle.move(startX - 5, startY - 5);
-    //     if (this.line) {
-    //       this.line.remove();
-    //     }
-    //     this.line = draw
-    //       .line(startX, startY, mouseOffsetX, mouseOffsetY)
-    //       .stroke({
-    //         color: "#E09C0D",
-    //         width: 3,
-    //         linecap: "round",
-    //       });
-    //   }
-    // };
-    // this.viewer.sceneCameraChanged.add(this.updateTemporarySvg);
-    // markupRectangleSelector.windowKeyDown.add(
-    //   (sender: Longan.ViewerOperator, e: ViewerEvent) => {
-    //     let commandShowMarkup = this.viewer.process.commandManager
-    //       .currentCommand as CommandShowMarkup;
-    //     if (
-    //       (e.uiEvent as any).key === "Delete" &&
-    //       commandShowMarkup.activeMarkupType === MarkupType.Rectangle
-    //     ) {
-    //       this.deleteActiveRectangle();
-    //       // saveModel()
-    //       this.activeIndex = null;
-    //     }
-    //     if (
-    //       (e.uiEvent as any).key === "Escape" &&
-    //       commandShowMarkup.activeMarkupType === MarkupType.Rectangle
-    //     ) {
-    //       if (this.line) {
-    //         this.line.remove();
-    //         this.line = null;
-    //       }
-    //       if (this.startCircle) {
-    //         this.startCircle.remove();
-    //         this.startCircle = null;
-    //       }
-    //     }
-    //   }
-    // );
-    // return markupRectangleSelector;
-  }
-
-  end(): void {
-    // this.viewer.sceneCameraChanged.remove(this.updateTemporarySvg);
-    if (this.line) {
-      this.line.remove();
-    }
-    if (this.startCircle) {
-      this.startCircle.remove();
-    }
-  }
-
-  clearAll() {
-    super.clearAll();
-    this.lineGroup.forEach((item) => {
-      item.remove();
-    });
-
-    if (this.startCircle) {
-      this.startCircle.remove();
-      this.endCircle.remove();
-      this.lineX.remove();
-      this.lineY.remove();
-      this.lineZ.remove();
-    }
-
-    this.rectGroup.forEach((item) => {
-      item.remove();
-    });
-    this.textGroup.forEach((item) => {
-      item.remove();
-    });
-
-    this.lineGroup = [];
-
-    this.startCircle = null;
-    this.endCircle = null;
-
-    this.lineX = null;
-    this.lineY = null;
-    this.lineZ = null;
-
-    this.rectGroup = [];
-    this.textGroup = [];
-  }
-}

package/src/viewerWrapper/commands/showMarkup/lib/markup.ts

@@ -1,35 +0,0 @@
-import * as Longan from "gs-longan";
-import { Viewer } from "gs-bim-air-core/gsDevFx/viewer";
-import { SvgDraw } from "../../../../plugins/svgDraw";
-import { MarkupObject } from "gs-bim-air-core/gsDevFx/objects/markupObjects/markupObject";
-import { MarkupObjects } from "gs-bim-air-core/gsDevFx/objects/markupObjects";
-
-export default class Markup {
-  viewer: Viewer;
-  svgDraw: SvgDraw;
-  // currentSelector: Longan.ViewerOperator
-  activeIndex = null;
-  updateTemporarySvg: () => void;
-
-  // group: G = null;
-
-  constructor(svgDraw, viewer) {
-    this.svgDraw = svgDraw;
-    this.viewer = viewer;
-  }
-
-  begin() {}
-
-  end() {}
-
-  operatorChange() {
-    this.viewer.operatorManager.clear();
-    // this.viewer.operatorManager.add(new Longan.CameraMouse());
-  }
-
-  clearActive() {
-    this.activeIndex = null;
-  }
-
-  clearAll() {}
-}