gs-bim-air 3.0.3 → 3.0.5

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

@@ -1,334 +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 { WaveRectangleObject } from "gs-bim-air-core/gsDevFx/objects/markupObjects/waveRectangleObject";
-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;
-  waveRectangleObject: WaveRectangleObject;
-
-  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();
-
-    this.svgDraw.lButtonDown.add((sender, e) => {
-      let isEditing = false;
-      this.viewer.markupManager.markupObjects.forEach((item: MarkupObject) => {
-        if (item._isEditing) {
-          isEditing = true;
-        }
-      });
-      if (isEditing) {
-        this.waveRectangleObject = null;
-      } else {
-        this.viewer.markupManager.markupObjects.forEach((item: MarkupObject) => {
-          item.active = false;
-        });
-        this.waveRectangleObject = new WaveRectangleObject(this.viewer);
-        this.waveRectangleObject.x1 = e.offsetX;
-        this.waveRectangleObject.y1 = e.offsetY;
-      }
-    });
-
-    this.svgDraw.lButtonDownAndMove.add((sender, e) => {
-      //console.log("lButtonDownAndMove", sender, e);
-      if (this.waveRectangleObject) {
-        this.waveRectangleObject.x2 = e.offsetX;
-        this.waveRectangleObject.y2 = e.offsetY;
-        this.waveRectangleObject._isEditing = true;
-        this.waveRectangleObject.render();
-      }
-    });
-
-    this.svgDraw.lButtonUp.add((sender, e) => {
-      if (
-        this.waveRectangleObject &&
-        this.waveRectangleObject.x1 !== null &&
-        this.waveRectangleObject.y1 !== null &&
-        this.waveRectangleObject.x2 !== null &&
-        this.waveRectangleObject.y2 !== null &&
-        this.viewer.markupManager.markupObjects.childObjects.indexOf(this.waveRectangleObject) === -1 &&
-        this.waveRectangleObject._isEditing
-      ) {
-        this.viewer.markupManager.markupObjects.addChildObject(this.waveRectangleObject);
-        this.waveRectangleObject._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/showMarkup.vue

@@ -1,203 +0,0 @@
-<template>
-  <div class="showMarkup">
-    <div class="top">
-      <gs-button-group>
-        <gs-button-icon icon="GSBimAir icon-land-1" @click="setCanvasDrawModel(toolTypeEnum.Rectangle)" />
-        <!-- <gs-button-icon icon="GSBimAir icon-quxian" @click="setCanvasDrawModel(toolTypeEnum.WaveRectangle)" /> -->
-        <gs-button-icon icon="GSBimAir icon-yuanxing" @click="setCanvasDrawModel(toolTypeEnum.Elliptic)" />
-        <gs-button-icon icon="GSBimAir icon-A" @click="setCanvasDrawModel(toolTypeEnum.Text)" />
-        <!-- <div class="move-text-input" v-if="isMoveTextInputShow">
-      <el-input size="small" value="canvasInputText"></el-input>
-      <el-button icon="el-icon-check"></el-button>
-      <el-button icon="el-icon-close"></el-button>
-    </div> -->
-
-        <gs-button-icon icon="arrow" @click="setCanvasDrawModel(toolTypeEnum.Arrow)" />
-        <!-- <gs-button-icon
-        icon="GSBimAir icon-quxian"
-        @click="setCanvasDrawModel(toolTypeEnum.Pen)"
-      /> -->
-      </gs-button-group>
-    </div>
-    <div class="middle">
-      <!-- <gs-divider></gs-divider> -->
-      <gs-button-group :activeIndex="penSizeButtonIndex">
-        <gs-button-icon icon="pensmall" @click="penSizeChange(penSizeEnum.Small)" />
-        <gs-button-icon icon="penmiddle" @click="penSizeChange(penSizeEnum.Middle)" />
-        <gs-button-icon icon="penlarge" @click="penSizeChange(penSizeEnum.Large)" />
-      </gs-button-group>
-      <el-color-picker
-        v-model="color"
-        @change="colorChange"
-        style="margin-left: 10px; vertical-align: middle"></el-color-picker>
-    </div>
-    <!-- <gs-divider></gs-divider> -->
-    <div class="bottom">
-      <el-button type="text" @click="clearFabricObjects">删除全部</el-button>
-    </div>
-    <!--    <gs-button-icon icon="GSBimAir icon-undo" title="撤销" @click="undoClick"/>-->
-    <!--    <gs-button-icon icon="GSBimAir icon-redo" title="恢复" @click="redoClick"/>-->
-    <!--    <gs-button-icon-->
-    <!--        icon="GSBimAir icon-shanchu"-->
-    <!--        title="清空批注"-->
-    <!--        @click="clearFabricObjects"-->
-    <!--    />-->
-    <!--    <gs-button-icon icon="GSBimAir icon-baocuncunchucunchuka"-->
-    <!--                    title="保存批注"-->
-    <!--                    @click="saveMarkupClick"/>-->
-    <!-- <gs-button-icon
-      icon="GSBimAir icon-baocuncunchucunchuka"
-      title="保存"
-      @click="saveMarkupClick"
-    /> -->
-  </div>
-</template>
-
-<script lang="ts">
-// import { PenSize } from "../../../plugins/canvasDraw";
-// import { ToolType } from "../../../plugins/canvasDraw/lib/editor";
-import { Component, Inject, Prop, Vue, Watch } from "vue-property-decorator";
-import store from "../../../store";
-// import saveModel from "../../module/saveModel";
-import GsButtonIcon from "../../../components/gs/gsButtonIcon/gs-button-icon.vue";
-import GsButtonGroup from "../../../components/gs/gsButtonGroup/gs-button-group.vue";
-import GsDivider from "../../../components/gs/gsDivider/gs-divider.vue";
-import { Message } from "element-ui";
-import { CommandShowMarkup, MarkupType } from "./commandShowMarkup";
-import { PenSize } from "../../../plugins/svgDraw";
-
-@Component({
-  components: { GsButtonIcon, GsButtonGroup, GsDivider },
-})
-export default class ShowMarkup extends Vue {
-  @Inject() getViewer;
-  activeName = "first";
-  viewPointDialogVisible = false;
-  viewPointName = "";
-  color = "#ff0000";
-  penSize = PenSize.Middle;
-  penSizeEnum = PenSize;
-  toolTypeEnum = MarkupType;
-  canvasInputText = "";
-  isMoveTextInputShow = true;
-  commandShowMarkup: CommandShowMarkup;
-  penSizeButtonIndex = 1;
-
-  get viewer() {
-    return this.getViewer();
-  }
-
-  colorChange(color) {
-    this.commandShowMarkup.penColor = color;
-  }
-
-  penSizeChange(size) {
-    this.commandShowMarkup.penSize = size;
-  }
-
-  setCanvasDrawModel(markupType: MarkupType) {
-    this.commandShowMarkup.chooseTool(markupType);
-  }
-
-  undoClick() {
-    this.commandShowMarkup.undo();
-  }
-
-  redoClick() {
-    this.commandShowMarkup.redo();
-  }
-
-  clearFabricObjects() {
-    this.commandShowMarkup.clearMarkups();
-  }
-
-  // deleteActiveFabricObjectClick() {
-  //   this.commandShowMarkup.deleteActiveFabricObject();
-  // }
-
-  setData() {
-    this.$emit("setData", {
-      title: "批注工具栏",
-      bottom: "20px",
-      right: "20px",
-    });
-  }
-
-  mounted() {
-    this.setData();
-    this.commandShowMarkup = this.viewer.process.commandManager.currentCommand as CommandShowMarkup;
-    this.color = this.commandShowMarkup.penColor;
-    this.penSize = this.commandShowMarkup.penSize;
-    this.penSizeChange(this.penSize);
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/scss/site";
-@import "../../../assets/theme/handle.scss";
-
-.showMarkup {
-  color: white;
-  background-color: $model-theme-light;
-  min-width: 250px;
-  height: auto;
-  min-height: 50px;
-  padding-top: 5px;
-  border-radius: 0 0 4px 4px;
-
-  :deep(.el-color-picker__trigger) {
-    border: none;
-  }
-
-  .top {
-    margin: 0 10px;
-    padding: 4px 0;
-    border-bottom: 1px solid #aaa;
-  }
-  .middle {
-    padding: 4px 10px;
-    background: transparent;
-    flex: 1;
-  }
-  .bottom {
-    display: flex;
-    // justify-content: space-between;
-    justify-content: flex-end;
-
-    margin: 0 10px;
-    border-top: 1px solid #aaa;
-    height: 45px;
-    background: $gs-primary-background;
-
-    display: flex;
-    justify-content: flex-end;
-    padding: 0 10px;
-    border-radius: 0 0 4px 4px;
-    .el-button--text {
-      color: $gs-primary-active;
-    }
-
-    i {
-      font-size: 18px;
-    }
-  }
-  // .bottom {
-  //   background: #292b36;
-  //   display: flex;
-  //   justify-content: flex-end;
-  //   padding: 0 10px;
-  //   border-radius: 0 0 4px 4px;
-  // }
-}
-
-.move-text-input {
-  position: absolute;
-  left: 0;
-  top: 0;
-}
-
-.gs-divider {
-  padding: 4px 0;
-}
-</style>

package/src/viewerWrapper/commands/showMeasure/commandShowMeasure.ts

@@ -1,104 +0,0 @@
-import { Marker } from "gs-longan";
-import { CameraMouse } from "gs-bim-air-core/gsDevFx/operators/cameraMouse";
-import * as Longan from "gs-longan";
-import { SvgDraw } from "../../../plugins/svgDraw";
-import { MeasureObjects } from "gs-bim-air-core/gsDevFx/objects/measureObjects";
-import { ViewPointObjects } from "gs-bim-air-core/gsDevFx/objects/viewPointObjects";
-import { ViewPointStateObject } from "gs-bim-air-core/gsDevFx/objects/viewPointStateObject";
-import { CommandComponent } from "../commandComponent";
-import Measure from "./lib/measure";
-import Distance from "./lib/distance";
-import Mindistance from "./lib/minDistance";
-import Angle from "./lib/angle";
-import Elevation from "./lib/elevation";
-import Slope from "./lib/slope";
-import Point from "./lib/point";
-import { Message } from "element-ui";
-import Area from "./lib/area";
-import Volume from "./lib/volume";
-import { ElMessageComponent } from "element-ui/types/message";
-import * as Commands from "gs-bim-air-core/commands";
-import store from "../../../store";
-import { ToolbarType } from "../../../store/toolbar";
-
-export enum MeasureType {
-  Distance,
-  Mindistance,
-  Angle,
-  Elevation,
-  Slope,
-  Point,
-  Area,
-  Volume,
-}
-
-export class CommandShowMeasure extends Commands.CommandShowMeasure {
-  message: ElMessageComponent;
-  component: CommandComponent;
-
-  constructor() {
-    super();
-  }
-
-  begin() {
-    //     this.component = new CommandComponent(this, () => import("./showMeasure.vue"));
-
-    this.message = Message({
-      type: "info",
-      message: "中断测量使用 Esc ，删除测量使用 Delete",
-      duration: 5000,
-      showClose: true,
-    });
-
-    super.begin();
-    // console.log("begin", this);
-    this.component = new CommandComponent(this, () => import("./showMeasure.vue"));
-    // this.component.commandData = this.commandData;
-    this.component.show();
-  }
-
-  // show() {
-  //   this.component.show();
-  //   // this.init();
-
-  //   // this.currentMeasure = this.distance;
-  //   // // 修改当前操作方式
-  //   // this.currentMeasure.operatorChange();
-  //   // this.commandData.measureType = MeasureType.Distance;
-  // }
-
-  end() {
-    this.message.close();
-    // this.currentMeasure.end();
-    // //面板数据清零
-    // this.commandDataInit();
-
-    // // this.commandData = {
-    // //   measureType: MeasureType.Distance,
-    // //   distance: 0,
-    // //   minDistance: 0,
-    // //   startPos: [0, 0, 0],
-    // //   endPos: [0, 0, 0],
-    // //   pointPos: [0, 0, 0],
-    // // };
-
-    // this.viewer.operatorManager.clear();
-    // // this.viewer.updateType = this.updateType;
-    // // this.viewer.asynUpdateView();
-
-    // this.viewer.updateDisplay();
-    this.component.hide();
-    // this.viewer.updateDisplay();
-    // this.hide();
-    store.commit("toolbar/resetToolbar", this.viewer.container.id);
-    super.end();
-  }
-
-  commandOk() {
-    console.log("ok");
-  }
-
-  commandCancel() {
-    console.log("cancel");
-  }
-}