gs-bim-air 3.0.3 → 3.0.5

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

@@ -1,335 +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";
-
-export default class Rectangle extends Markup {
-  markupObjects;
-  lineGroup = [];
-
-  lineX;
-  lineY;
-  lineZ;
-
-  rectGroup = [];
-  textGroup = [];
-  line;
-  startCircle;
-  endCircle;
-
-  activeIndex = null;
-  // rectangleObject: RectangleObject;
-
-  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 rectangleObject = new RectangleObject(this.viewer);
-  //   rectangleObject.data = [...(startPoint as [number, number, number]), ...(endPoint as [number, number, number])];
-  //   markupObjects.addChildObject(rectangleObject);
-
-  //   // 画出最新的
-  //   markupObjects.clearActive();
-  //   rectangleObject.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);
-  // }
-
-  deleteActiveRectangle() {
-    let markupObjects: 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();
-    // this.svgDraw.keyDown.clear();
-    let rectangleObject: RectangleObject;
-
-    this.svgDraw.lButtonDown.add((sender, e) => {
-      let isEditing = false;
-      this.viewer.markupManager.markupObjects.forEach((item: MarkupObject) => {
-        if (item._isEditing) {
-          isEditing = true;
-        }
-      });
-      if (isEditing) {
-        rectangleObject = null;
-      } else {
-        this.viewer.markupManager.markupObjects.forEach((item: MarkupObject) => {
-          item.active = false;
-        });
-        rectangleObject = new RectangleObject(this.viewer);
-        rectangleObject.x1 = e.offsetX;
-        rectangleObject.y1 = e.offsetY;
-      }
-    });
-
-    this.svgDraw.lButtonDownAndMove.add((sender, e) => {
-      //console.log("lButtonDownAndMove", sender, e);
-      if (rectangleObject) {
-        rectangleObject.x2 = e.offsetX;
-        rectangleObject.y2 = e.offsetY;
-        rectangleObject._isEditing = true;
-        rectangleObject.render();
-      }
-    });
-
-    this.svgDraw.lButtonUp.add((sender, e) => {
-      if (
-        rectangleObject &&
-        rectangleObject.x1 !== null &&
-        rectangleObject.y1 !== null &&
-        rectangleObject.x2 !== null &&
-        rectangleObject.y2 !== null &&
-        this.viewer.markupManager.markupObjects.childObjects.indexOf(rectangleObject) === -1 &&
-        rectangleObject._isEditing
-      ) {
-        this.viewer.markupManager.markupObjects.addChildObject(rectangleObject);
-        rectangleObject._isEditing = false;
-      }
-    });
-    this.viewer.onWindowKeyDown.add((sender, e) => {
-      if ((e.uiEvent as any).key === "Delete") {
-        this.deleteActiveRectangle();
-        // saveModel()
-        // this.activeLabelIndex = null
-      }
-    });
-    // this.svgDraw.keyDown.add((sender, e) => {
-    //   if (e.key === "Delete") {
-    //     this.deleteActiveRectangle();
-    //     // 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/text.ts

@@ -1,317 +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 { TextObject } from "gs-bim-air-core/gsDevFx/objects/markupObjects/textObject";
-
-export default class Text 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 textObject = new TextObject(this.viewer);
-    textObject.data = [...(startPoint as [number, number, number]), ...(endPoint as [number, number, number])];
-    markupObjects.addChildObject(textObject);
-
-    // 画出最新的
-    markupObjects.clearActive();
-    textObject.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);
-  }
-
-  deleteActiveText() {
-    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 textObject: TextObject;
-    this.svgDraw.lButtonDown.add((sender, e) => {
-      let isEditing = false;
-      this.viewer.markupManager.markupObjects.forEach((item: MarkupObject) => {
-        if (item._isEditing) {
-          isEditing = true;
-        }
-      });
-      if (isEditing) {
-        textObject = null;
-      } else {
-        this.viewer.markupManager.markupObjects.forEach((item: MarkupObject) => {
-          item.active = false;
-        });
-        textObject = new TextObject(this.viewer);
-        textObject.x1 = e.offsetX;
-        textObject.y1 = e.offsetY;
-        textObject._isEditing = true;
-
-        textObject.render();
-      }
-    });
-    this.svgDraw.lButtonUp.add((sender, e) => {
-      if (
-        textObject &&
-        textObject.x1 !== null &&
-        textObject.y1 !== null &&
-        this.viewer.markupManager.markupObjects.childObjects.indexOf(textObject) === -1 &&
-        textObject._isEditing
-      ) {
-        this.viewer.markupManager.markupObjects.addChildObject(textObject);
-        textObject._isEditing = false;
-      }
-    });
-
-    this.viewer.onWindowKeyDown.add((sender, e) => {
-      if ((e.uiEvent as any).key === "Delete") {
-        this.deleteActiveText();
-        // 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 = [];
-  }
-}