gs-bim-air 3.0.3 → 3.0.5

package/src/viewerWrapper/commands/createWall/commandCreateWall.ts

@@ -1,231 +0,0 @@
-// import saveModel from '../../module/saveModel';
-import { CommandComponent } from "../commandComponent";
-import { CreateWallSelector } from "gs-bim-air-core/gsDevFx/operators/createWallSelector";
-
-import * as Longan from "gs-longan";
-import { SvgDraw } from "../../../plugins/svgDraw";
-import { Container } from "@svgdotjs/svg.js";
-import { ObjectPreSelector } from "gs-bim-air-core/gsDevFx/operators/objectPreSelector";
-// import { LonganCore } from "gs-longan";
-import { ViewerEvent } from "gs-longan";
-import { GPUPreSelector } from "gs-bim-air-core/gsDevFx/operators/gpuPreSelector";
-import { CameraMouse } from "gs-bim-air-core/gsDevFx/operators/cameraMouse";
-import * as Commands from "gs-bim-air-core/commands";
-
-export default class CommandCreateWall extends Commands.CommandCreateWall {
-  static instance: CommandCreateWall = new CommandCreateWall();
-  static addWallObject: (pathPoints: Float64Array) => void;
-
-  typeName = "CommandCreateWall";
-
-  currentLine;
-  svgGroup;
-
-  component: CommandComponent;
-
-  constructor() {
-    super();
-  }
-
-  begin() {
-    this.viewer.operatorManager.clear();
-    this.viewer.operatorManager.add(new CameraMouse());
-
-    let gpuPreSelector = new GPUPreSelector();
-    this.viewer.operatorManager.add(gpuPreSelector);
-
-    // 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;
-
-    this.viewer.operatorManager.add(this.createWallSelector());
-
-    super.begin();
-  }
-
-  end() {
-    let createWallSelector = this.viewer.operatorManager.find("CreateWallSelector") as CreateWallSelector;
-    if (createWallSelector) {
-      createWallSelector.pathPoints = [];
-    }
-
-    if (this.currentLine) {
-      this.currentLine.remove();
-      this.currentLine = null;
-    }
-    if (this.svgGroup) {
-      this.svgGroup.remove();
-      this.svgGroup = null;
-    }
-    this.component.hide();
-
-    super.end();
-  }
-
-  createWallSelector() {
-    let createWallSelector = new CreateWallSelector();
-
-    createWallSelector.addWall.add((pathPoints) => {
-      this.addWallObject(pathPoints);
-      if (CommandCreateWall.addWallObject) {
-        CommandCreateWall.addWallObject(pathPoints);
-      }
-    });
-
-    let svgDraw = SvgDraw.getInstance(this.viewer.container.id);
-    let draw = svgDraw.draw as Container;
-
-    // this.viewer.sceneCameraChanged.add(() => {
-    // 	this.render(createWallSelector);
-    // });
-
-    createWallSelector.lButtonDown.add(() => {
-      this.render(createWallSelector);
-    });
-
-    createWallSelector.mouseMove.add((e: ViewerEvent) => {
-      this.renderCurrentLine(createWallSelector, e);
-    });
-    createWallSelector.rButtonDown.add((e: ViewerEvent) => {
-      if (this.currentLine) {
-        this.currentLine.remove();
-        this.currentLine = null;
-      }
-      if (this.svgGroup) {
-        this.svgGroup.remove();
-        this.svgGroup = draw.group();
-      }
-      createWallSelector.pathPoints = [];
-    });
-
-    // createWallSelector.windowKeyDown.add((sender: Longan.ViewerOperator, e: ViewerEvent) => {
-    //     let commandShowMeasure = CommandShowMeasure.instance;
-    //     if ((e.uiEvent as any).key === "Delete" && commandShowMeasure.activeMeasureType === MeasureType.Angle) {
-    //         this.deleteActiveAngle()
-    //         // saveModel()
-    //         this.activeIndex = null
-
-    //     }
-    // })
-
-    return createWallSelector;
-  }
-
-  addWallObject(pathPoints) {}
-
-  render(createWallSelector: CreateWallSelector) {
-    let svgDraw = SvgDraw.getInstance(this.viewer.container.id);
-    let draw = svgDraw.draw as Container;
-
-    // if (this.currentLine) {
-    //     this.currentLine.remove()
-    //     this.currentLine = null
-    // }
-    if (this.svgGroup) {
-      this.svgGroup.remove();
-    }
-    this.svgGroup = draw.group();
-
-    let pathPoints = createWallSelector.pathPoints;
-    let currentPoint = createWallSelector.pathPoints[createWallSelector.pathPoints.length - 1];
-    let startPoint = createWallSelector.pathPoints[0];
-
-    if (
-      createWallSelector.pathPoints.length >= 4 &&
-      Longan.GeometryOperators.samePoint(new Float32Array(currentPoint), new Float32Array(startPoint))
-    ) {
-      console.log("闭环");
-      if (this.currentLine) {
-        this.currentLine.remove();
-        this.currentLine = null;
-      }
-      if (this.svgGroup) {
-        this.svgGroup.remove();
-      }
-      createWallSelector.pathPoints = [];
-      return;
-    }
-
-    for (let i = 0; i < pathPoints.length; i++) {
-      let point1 = pathPoints[i];
-      // let pixelPos1 =LonganCore.JS_Compute_Coordinates_By_Key(this.viewer.sceneKey, "world", point1, "pixels");
-      let pixelPos1 = this.viewer.worldPointToPixelPoint([point1])[0];
-      if (pathPoints.length >= 2 && i < pathPoints.length - 1) {
-        let point2 = pathPoints[i + 1];
-        // let pixelPos2 =LonganCore.JS_Compute_Coordinates_By_Key(this.viewer.sceneKey, "world", point2, "pixels");
-        let pixelPos2 = this.viewer.worldPointToPixelPoint([point2])[0];
-
-        let line = draw.line(pixelPos1[0], pixelPos1[1], pixelPos2[0], pixelPos2[1]).stroke({
-          color: "#E09C0D",
-          width: 3,
-          linecap: "round",
-        });
-        this.svgGroup.add(line);
-      }
-
-      let circle = draw
-        .circle(10)
-        .fill("#E09C0D")
-        .stroke({
-          color: "#fff",
-          width: 3,
-        })
-        .move(pixelPos1[0] - 5, pixelPos1[1] - 5);
-      this.svgGroup.add(circle);
-    }
-  }
-
-  renderCurrentLine(createWallSelector, e) {
-    let svgDraw = SvgDraw.getInstance(this.viewer.container.id);
-    let draw = svgDraw.draw as Container;
-    if (this.currentLine) {
-      this.currentLine.remove();
-    }
-    let pointLength = createWallSelector.pathPoints.length;
-    if (pointLength >= 1) {
-      if (this.currentLine) {
-        this.currentLine.remove();
-      }
-      let lastPoint = createWallSelector.pathPoints[createWallSelector.pathPoints.length - 1];
-      // let lastPixelPos =LonganCore.JS_Compute_Coordinates_By_Key(this.viewer.sceneKey, "world", lastPoint, "pixels");
-      let lastPixelPos = this.viewer.worldPointToPixelPoint([lastPoint])[0];
-
-      let lastX = lastPixelPos[0];
-      let lastY = lastPixelPos[1];
-
-      let currentX = e.mouseEvent().offsetX;
-      let currentY = e.mouseEvent().offsetY;
-      if (pointLength >= 3) {
-        let pixelPos = [e.mouseEvent().offsetX, e.mouseEvent().offsetY];
-        // let startPixelPos =LonganCore.JS_Compute_Coordinates_By_Key(
-        //   this.viewer.sceneKey,
-        //   "world",
-        //   createWallSelector.pathPoints[0],
-        //   "pixels"
-        // );
-        let startPixelPos = this.viewer.worldPointToPixelPoint([createWallSelector.pathPoints[0]])[0];
-
-        if (
-          pixelPos[0] > startPixelPos[0] - 10 &&
-          pixelPos[0] < startPixelPos[0] + 10 &&
-          pixelPos[1] > startPixelPos[1] - 10 &&
-          pixelPos[1] < startPixelPos[1] + 10
-        ) {
-          currentX = startPixelPos[0];
-          currentY = startPixelPos[1];
-        }
-      }
-      this.currentLine = draw.line(lastX, lastY, currentX, currentY).stroke({
-        color: "#E09C0D",
-        width: 3,
-        linecap: "round",
-      });
-    }
-  }
-}

package/src/viewerWrapper/commands/createWall/createWall.vue

@@ -1,120 +0,0 @@
-<template>
-  <div
-    class="createWall"
-    v-loading="collisionTableDataLoading"
-    :element-loading-text="collisionTableDataLoadingText"
-    element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(0, 0, 0, 0.8)">
-    <el-table
-      :data="collisionTableData"
-      :row-class-name="tableRowClassName"
-      @row-click="tableRowClick"
-      :row-style="{ cursor: 'pointer' }"
-      height="70vh">
-      <el-table-column type="index" label="碰撞ID" width="80"></el-table-column>
-      <el-table-column label="碰撞对比" width="200" prop="compaire">
-        <template slot-scope="scope">
-          <span
-            :style="{
-              backgroundColor: activeRowIndex === scope.row.index ? 'rgba(255,0,0,0.5)' : '',
-            }">
-            {{ scope.row.compaire.split(",")[0] }}
-          </span>
-          ,
-          <span
-            :style="{
-              backgroundColor: activeRowIndex === scope.row.index ? 'rgba(0,0,255,0.5)' : '',
-            }">
-            {{ scope.row.compaire.split(",")[1] }}
-          </span>
-        </template>
-      </el-table-column>
-      <el-table-column label="类型" width="80" prop="type"></el-table-column>
-    </el-table>
-  </div>
-</template>
-
-<script lang="ts">
-import { Component, Prop, Vue, Watch } from "vue-property-decorator";
-import store from "../../../store";
-import * as Longan from "gs-longan";
-
-import { CollisionObjects } from "gs-bim-air-core/gsDevFx/objects/collisionObjects";
-import { mapMutations } from "vuex";
-import { uniqueByProperty } from "../../../utils/dataUtility";
-
-@Component({
-  components: {},
-})
-export default class CreateWall extends Vue {
-  @Prop() componentData;
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/scss/site";
-@import "../../../assets/theme/handle.scss";
-
-.createWall {
-  padding: 0 10px;
-}
-
-:deep(.el-table) {
-  background: $model-theme;
-  // width: 600px;
-
-  .el-table__header-wrapper {
-    th {
-      background: $model-theme-light;
-      color: white;
-      border-bottom: 1px solid $model-theme;
-    }
-  }
-
-  .el-table__body-wrapper {
-    tr {
-      background: $model-theme-light;
-      color: white;
-
-      td {
-        padding: 6px 0;
-        border-bottom: 1px solid $model-theme;
-      }
-    }
-  }
-
-  .el-table__body tr:hover > td {
-    background-color: $gs-primary-background;
-  }
-}
-::v-deep .el-loading-mask {
-  background-color: $gs-primary-loadingColor;
-}
-.el-table:before {
-  height: 0;
-}
-
-.setting-wrapper {
-  text-align: left;
-  display: flex;
-  justify-content: space-between;
-
-  .el-button {
-    // margin: 0 20px;
-  }
-
-  .el-checkbox {
-    color: white;
-    margin: 0 20px;
-  }
-
-  .el-slider {
-    width: 150px;
-    display: inline-block;
-    vertical-align: middle;
-    margin-left: 20px;
-    height: 32px;
-    margin-top: -3px;
-  }
-}
-</style>

package/src/viewerWrapper/commands/multiPoint/multiPointCommand.ts

@@ -1,228 +0,0 @@
-// import saveModel from '../../module/saveModel';
-import { CommandComponent } from "gs-bim-air-core/commands/commandComponent";
-import { CreateWallSelector } from "gs-bim-air-core/gsDevFx/operators/createWallSelector";
-
-import * as Longan from "gs-longan";
-import { SvgDraw } from "../../../plugins/svgDraw";
-import { Container } from "@svgdotjs/svg.js";
-import { ObjectPreSelector } from "gs-bim-air-core/gsDevFx/operators/objectPreSelector";
-// import { LonganCore } from "gs-longan";
-import { ViewerEvent } from "gs-longan";
-import { GPUPreSelector } from "gs-bim-air-core/gsDevFx/operators/gpuPreSelector";
-import { CameraMouse } from "gs-bim-air-core/gsDevFx/operators/cameraMouse";
-import { CommandSelect } from "../../commands/commandSelect";
-export default class CommandCreateWall extends CommandComponent {
-  static instance: CommandCreateWall = new CommandCreateWall();
-  static addWallObject: (pathPoints: Float64Array) => void;
-
-  typeName = "CommandCreateWall";
-
-  currentLine;
-  svgGroup;
-
-  constructor() {
-    super();
-  }
-
-  begin() {
-    this.viewer.operatorManager.clear();
-    this.viewer.operatorManager.add(new CameraMouse());
-
-    let gpuPreSelector = new GPUPreSelector();
-    this.viewer.operatorManager.add(gpuPreSelector);
-
-    // 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;
-
-    this.viewer.operatorManager.add(this.createWallSelector());
-
-    super.begin();
-  }
-
-  end() {
-    let createWallSelector = this.viewer.operatorManager.find("CreateWallSelector") as CreateWallSelector;
-    if (createWallSelector) {
-      createWallSelector.pathPoints = [];
-    }
-
-    if (this.currentLine) {
-      this.currentLine.remove();
-      this.currentLine = null;
-    }
-    if (this.svgGroup) {
-      this.svgGroup.remove();
-      this.svgGroup = null;
-    }
-    super.end();
-  }
-
-  createWallSelector() {
-    let createWallSelector = new CreateWallSelector();
-
-    createWallSelector.addWall.add((pathPoints) => {
-      this.addWallObject(pathPoints);
-      if (CommandCreateWall.addWallObject) {
-        CommandCreateWall.addWallObject(pathPoints);
-        //创建围墙后清空命令
-        this.viewer.process.commandManager.execute(new CommandSelect());
-      }
-    });
-
-    let svgDraw = SvgDraw.getInstance(this.viewer.container.id);
-    let draw = svgDraw.draw as Container;
-
-    // this.viewer.sceneCameraChanged.add(() => {
-    // 	this.render(createWallSelector);
-    // });
-
-    createWallSelector.lButtonDown.add(() => {
-      this.render(createWallSelector);
-    });
-
-    createWallSelector.mouseMove.add((e: ViewerEvent) => {
-      this.renderCurrentLine(createWallSelector, e);
-    });
-    createWallSelector.rButtonDown.add((e: ViewerEvent) => {
-      if (this.currentLine) {
-        this.currentLine.remove();
-        this.currentLine = null;
-      }
-      if (this.svgGroup) {
-        this.svgGroup.remove();
-        this.svgGroup = draw.group();
-      }
-      createWallSelector.pathPoints = [];
-    });
-
-    // createWallSelector.windowKeyDown.add((sender: Longan.ViewerOperator, e: ViewerEvent) => {
-    //     let commandShowMeasure = CommandShowMeasure.instance;
-    //     if ((e.uiEvent as any).key === "Delete" && commandShowMeasure.activeMeasureType === MeasureType.Angle) {
-    //         this.deleteActiveAngle()
-    //         // saveModel()
-    //         this.activeIndex = null
-
-    //     }
-    // })
-
-    return createWallSelector;
-  }
-
-  addWallObject(pathPoints) {}
-
-  render(createWallSelector: CreateWallSelector) {
-    let svgDraw = SvgDraw.getInstance(this.viewer.container.id);
-    let draw = svgDraw.draw as Container;
-
-    // if (this.currentLine) {
-    //     this.currentLine.remove()
-    //     this.currentLine = null
-    // }
-    if (this.svgGroup) {
-      this.svgGroup.remove();
-    }
-    this.svgGroup = draw.group();
-
-    let pathPoints = createWallSelector.pathPoints;
-    let currentPoint = createWallSelector.pathPoints[createWallSelector.pathPoints.length - 1];
-    let startPoint = createWallSelector.pathPoints[0];
-
-    if (
-      createWallSelector.pathPoints.length >= 4 &&
-      Longan.GeometryOperators.samePoint(new Float32Array(currentPoint), new Float32Array(startPoint))
-    ) {
-      console.log("闭环");
-      if (this.currentLine) {
-        this.currentLine.remove();
-        this.currentLine = null;
-      }
-      if (this.svgGroup) {
-        this.svgGroup.remove();
-      }
-      createWallSelector.pathPoints = [];
-      return;
-    }
-
-    for (let i = 0; i < pathPoints.length; i++) {
-      let point1 = pathPoints[i];
-      // let pixelPos1 =LonganCore.JS_Compute_Coordinates_By_Key(this.viewer.sceneKey, "world", point1, "pixels");
-      let pixelPos1 = this.viewer.worldPointToPixelPoint([point1])[0];
-      if (pathPoints.length >= 2 && i < pathPoints.length - 1) {
-        let point2 = pathPoints[i + 1];
-        // let pixelPos2 =LonganCore.JS_Compute_Coordinates_By_Key(this.viewer.sceneKey, "world", point2, "pixels");
-        let pixelPos2 = this.viewer.worldPointToPixelPoint([point2])[0];
-
-        let line = draw.line(pixelPos1[0], pixelPos1[1], pixelPos2[0], pixelPos2[1]).stroke({
-          color: "#E09C0D",
-          width: 3,
-          linecap: "round",
-        });
-        this.svgGroup.add(line);
-      }
-
-      let circle = draw
-        .circle(10)
-        .fill("#E09C0D")
-        .stroke({
-          color: "#fff",
-          width: 3,
-        })
-        .move(pixelPos1[0] - 5, pixelPos1[1] - 5);
-      this.svgGroup.add(circle);
-    }
-  }
-
-  renderCurrentLine(createWallSelector, e) {
-    let svgDraw = SvgDraw.getInstance(this.viewer.container.id);
-    let draw = svgDraw.draw as Container;
-    if (this.currentLine) {
-      this.currentLine.remove();
-    }
-    let pointLength = createWallSelector.pathPoints.length;
-    if (pointLength >= 1) {
-      if (this.currentLine) {
-        this.currentLine.remove();
-      }
-      let lastPoint = createWallSelector.pathPoints[createWallSelector.pathPoints.length - 1];
-      // let lastPixelPos =LonganCore.JS_Compute_Coordinates_By_Key(this.viewer.sceneKey, "world", lastPoint, "pixels");
-      let lastPixelPos = this.viewer.worldPointToPixelPoint([lastPoint])[0];
-
-      let lastX = lastPixelPos[0];
-      let lastY = lastPixelPos[1];
-
-      let currentX = e.mouseEvent().offsetX;
-      let currentY = e.mouseEvent().offsetY;
-      if (pointLength >= 3) {
-        let pixelPos = [e.mouseEvent().offsetX, e.mouseEvent().offsetY];
-        // let startPixelPos =LonganCore.JS_Compute_Coordinates_By_Key(
-        //   this.viewer.sceneKey,
-        //   "world",
-        //   createWallSelector.pathPoints[0],
-        //   "pixels"
-        // );
-        let startPixelPos = this.viewer.worldPointToPixelPoint([createWallSelector.pathPoints[0]])[0];
-
-        if (
-          pixelPos[0] > startPixelPos[0] - 10 &&
-          pixelPos[0] < startPixelPos[0] + 10 &&
-          pixelPos[1] > startPixelPos[1] - 10 &&
-          pixelPos[1] < startPixelPos[1] + 10
-        ) {
-          currentX = startPixelPos[0];
-          currentY = startPixelPos[1];
-        }
-      }
-      this.currentLine = draw.line(lastX, lastY, currentX, currentY).stroke({
-        color: "#E09C0D",
-        width: 3,
-        linecap: "round",
-      });
-    }
-  }
-}