gs-bim-air 3.0.3 → 3.0.5

package/src/viewerWrapper/commands/showCut/showElementCut/showElementCut.vue

@@ -1,185 +0,0 @@
-<template>
-  <div class="showBoxCut">
-    <div style="border-bottom: 1px solid #aaa; padding: 0 10px; display: flex">
-      <gs-button-icon icon="bukejian" title="隐藏" @click="hideBoxClick"></gs-button-icon>
-      <!-- <gs-button-icon
-        icon="iconfontBimAir icon-bukejian"
-        title="剖切全部"
-        :disabled="!isSelectedSegment"
-        @click="cutAllClick"
-      >
-      </gs-button-icon>-->
-      <!-- <el-switch
-        v-model="commandData.isAllCut"
-        @change="cutAllClick"
-        title="剖切整个模型"
-        style="margin: auto"></el-switch> -->
-    </div>
-    <div class="slider-wrapper">
-      <div class="row">
-        <div class="label">X</div>
-        <div class="slider-item">
-          <el-slider v-model="commandData.xValue" range @input="xValueChange" :max="100"></el-slider>
-        </div>
-      </div>
-      <div class="row">
-        <div class="label">Y</div>
-        <div class="slider-item">
-          <el-slider v-model="commandData.yValue" range @input="yValueChange" :max="100"></el-slider>
-        </div>
-      </div>
-      <div class="row">
-        <div class="label">Z</div>
-        <div class="slider-item">
-          <el-slider v-model="commandData.zValue" range @input="zValueChange" :max="100"></el-slider>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script lang="ts">
-import { Component, Vue, Prop, Inject } from "vue-property-decorator";
-import CommandShowBoxCut from "../showBoxCut/commandShowBoxCut";
-import GsButtonIcon from "../../../../components/gs/gsButtonIcon/gs-button-icon.vue";
-import { Viewer } from "gs-bim-air-core/gsDevFx/viewer";
-import { CuttingBoxObject } from "gs-bim-air-core/gsDevFx/objects/cuttingObjects/cuttingBoxObject";
-
-@Component({
-  components: { GsButtonIcon },
-})
-export default class ShowElementCut extends Vue {
-  @Prop() componentData;
-  @Inject() getViewer;
-  defaultCommandData = null;
-  xValue = [0, 100];
-  yValue = [0, 100];
-  zValue = [0, 100];
-  vueShowing = true;
-  // isSelectedComponent = false
-  isAllCut = true;
-
-  get commandData() {
-    return (
-      this.componentData || { isAllCut: true, xValue: [0, 100], yValue: [0, 100], zValue: [0, 100], isOperator: false }
-    );
-  }
-
-  get viewer(): Viewer {
-    return this.getViewer();
-  }
-
-  get isSelectedSegment() {
-    let commandShowBoxCut = this.viewer.process.commandManager.currentCommand as CommandShowBoxCut;
-    return commandShowBoxCut.isSelectedSegment;
-  }
-
-  hideBoxClick() {
-    let commandShowBoxCut = this.viewer.process.commandManager.currentCommand as CommandShowBoxCut;
-
-    commandShowBoxCut._cuttingBoxOperator.boxVisible = !commandShowBoxCut._cuttingBoxOperator.boxVisible;
-  }
-
-  cutAllClick() {
-    let commandShowBoxCut = this.viewer.process.commandManager.currentCommand as CommandShowBoxCut;
-
-    let cuttingBox = this.viewer.renderObjects.find<CuttingBoxObject>("CuttingBoxObject");
-    if (cuttingBox) {
-      cuttingBox.isAllCut = this.componentData.isAllCut;
-
-      if (!cuttingBox.isAllCut) {
-        for (let i = 0; i < 6; i++) {
-          commandShowBoxCut._cuttingBoxOperator.updateInterface(i);
-        }
-      }
-    }
-
-    // cuttingBox.clear();
-    // cuttingBox.render();
-
-    // this.viewer.updateDisplay();
-  }
-
-  xValueChange(value) {
-    if (!this.vueShowing && !this.commandData.isOperator) {
-      let commandShowBoxCut = this.viewer.process.commandManager.currentCommand as CommandShowBoxCut;
-
-      commandShowBoxCut.setXValue(this.commandData.xValue[0] / 100, this.commandData.xValue[1] / 100);
-    }
-  }
-
-  yValueChange(value) {
-    if (!this.vueShowing && !this.commandData.isOperator) {
-      let commandShowBoxCut = this.viewer.process.commandManager.currentCommand as CommandShowBoxCut;
-
-      commandShowBoxCut.setYValue(this.commandData.yValue[0] / 100, this.commandData.yValue[1] / 100);
-    }
-  }
-
-  zValueChange(value) {
-    if (!this.vueShowing && !this.commandData.isOperator) {
-      let commandShowBoxCut = this.viewer.process.commandManager.currentCommand as CommandShowBoxCut;
-
-      commandShowBoxCut.setZValue(this.commandData.zValue[0] / 100, this.commandData.zValue[1] / 100);
-    }
-  }
-
-  setData() {
-    this.$emit("setData", {
-      title: "元素剖切",
-      bottom: "20px",
-      right: "20px",
-    });
-  }
-
-  mounted() {
-    this.setData();
-
-    this.$nextTick(() => {
-      this.vueShowing = false;
-    });
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../../../assets/scss/site";
-@import "../../../../assets/theme/handle.scss";
-
-.showBoxCut {
-  text-align: left;
-  padding: 0 0 10px 0;
-  font-size: 12px;
-  background: $gs-primary-background2;
-  // width: 200px;
-  border-radius: 0 0 4px 4px;
-}
-
-.slider-wrapper {
-  padding: 0 10px;
-  .row {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-
-    .label {
-      width: 30px;
-    }
-
-    .slider-item {
-      flex: 1;
-      padding-right: 10px;
-    }
-  }
-}
-.el-switch.is-checked .el-switch__core {
-  border-color: $gs-primary-active;
-  background-color: $gs-primary-active;
-}
-.el-slider__bar {
-  background-color: $gs-primary-active;
-}
-.el-slider__button {
-  border-color: $gs-primary-active;
-}
-</style>

package/src/viewerWrapper/commands/showDrawingItem/commandShowDrawingItem.ts

@@ -1,215 +0,0 @@
-import { CommandComponent } from "../commandComponent";
-
-import * as Longan from "gs-longan";
-import { ProjectionType } from "gs-longan";
-import { ComponentSelector as SegmentComponentSelector } from "gs-bim-air-core/gsDevFx/segmentOperators/componentSelector";
-import { ComponentSelector } from "gs-bim-air-core/gsDevFx/operators/componentSelector";
-import { Viewer } from "gs-bim-air-core/gsDevFx/viewer";
-import { ComponentPreSelector } from "gs-bim-air-core/gsDevFx/operators/componentPreSelector";
-import { ComponentPreSelector as SegmentComponentPreSelector } from "gs-bim-air-core/gsDevFx/segmentOperators/componentPreSelector";
-import { LonganCore } from "gs-longan";
-
-import { SegmentViewObject } from "gs-bim-air-core/gsDevFx/objects/segmentViewObject";
-import { ViewerEvent } from "gs-longan";
-import { CameraMouse as SegmentCameramous } from "gs-bim-air-core/gsDevFx/segmentOperators/cameraMouse";
-import { CameraMouse } from "gs-bim-air-core/gsDevFx/operators/cameraMouse";
-import { modelService } from "../../../api/modelService";
-import { SegmentObject } from "gs-bim-air-core/gsDevFx/segmentObjects/segmentObject";
-import { CameraPlanMouse } from "gs-bim-air-core/gsDevFx/segmentOperators/cameraPlanMouse";
-import * as Commands from "gs-bim-air-core/commands";
-
-export default class CommandShowDrawingItem extends Commands.CommandShowDrawingItem {
-  typeName = "CommandShowDrawingItem";
-
-  viewer2d: Viewer;
-
-  component: CommandComponent;
-
-  constructor() {
-    super();
-  }
-
-  begin() {
-    this.component = new CommandComponent(this, () => import("./showDrawingItem.vue"));
-
-    this.commandData = { name: "" };
-
-    this.component.show();
-    this.initViewer3D();
-
-    // setTimeout(() => {
-    //   this.initViewer2D();
-    //   this.initViewer3D();
-    // }, 400);
-  }
-
-  end() {
-    this.viewer2d.dispose();
-
-    // this.viewer.isolationManager.clearAllIsolation();
-    this.viewer.updateDisplay();
-    this.component.hide();
-
-    // this.hide();
-  }
-
-  initViewer3D() {
-    this.viewer.operatorManager.clear();
-    this.viewer.operatorManager.add(new CameraMouse());
-
-    let componentSelector = new ComponentSelector();
-
-    componentSelector.isAreaSelect = false;
-    //三维中点击事件
-    componentSelector.lButtonUp.add((event) => {
-      this.modellButtonDown(componentSelector, event);
-    });
-    this.viewer.operatorManager.add(componentSelector);
-  }
-
-  initViewer2D() {
-    //初始化2d视图
-    this.viewer2d = new Viewer({
-      elementId: "viewer-drawing",
-      toolbarVisible: {
-        leftToolbar: false,
-        rightToolbar: false,
-        bottomToolbar: false,
-      },
-      components: {
-        compass: {
-          visible: false,
-        },
-      },
-      theme: this.viewer?.options?.theme,
-    });
-    // this.viewer2d.updateType = Longan.UpdateType.Asynchronization;
-    // this.viewer2d.isUpdateTt = false;
-    this.viewer2d.name = "viewer2d";
-    this.viewer2d.backgroundColor = [37, 40, 59];
-    this.viewer2d.camera.mode = Longan.Camera.ORTHOGRAPHIC_CAMERA;
-    this.viewer2d.sceneSegment.camera.projection = ProjectionType.Orthographic;
-    // this.viewer2d.scene["name"] = "viewer2d";
-
-    // this.viewer2d.sceneSegment.camera.projection = ProjectionType.Orthographic;
-    // this.viewer.process.addViewer(this.viewer2d);
-    //添加2d视图的镜头操作
-    this.viewer2d.operatorManager.clear();
-    this.viewer2d.operatorManager.add(new CameraPlanMouse());
-    this.viewer2d.operatorManager.add(new SegmentComponentPreSelector());
-
-    let componentSelector = new SegmentComponentSelector();
-    componentSelector.isAreaSelect = false;
-    //二维视图中左键点击事件
-    componentSelector.lButtonDown.add((event) => {
-      this.drawinglButtonDown(componentSelector, event);
-    });
-
-    //二维视图选择器
-    this.viewer2d.operatorManager.add(componentSelector);
-
-    // //选择器的灵敏度
-    // LonganCore.JS_Open_Segment_By_Key(this.viewer2d.viewKey);
-    // {
-    //   LonganCore.JS_Set_Driver_Options("selection tolerance=0.03");
-    // }
-    // LonganCore.JS_Close_Segment();
-  }
-
-  //切换图纸
-  switchDrawing(item: { modelId: string; name: string; image: string; path: string }) {
-    let promise = new Promise((resolve) => {
-      if (!this.viewer2d) {
-        setTimeout(() => {
-          this.initViewer2D();
-          resolve(null);
-        }, 400);
-      } else {
-        resolve(null);
-      }
-    });
-
-    promise.then(() => {
-      modelService.getBlobResource(item.modelId, "/Extensions/" + item.path, false).then((blob: any) => {
-        this.viewer2d.loadGSModel(item.modelId, item.path, blob, true).then((ro) => {
-          let bb = this.viewer2d.computeViewBoundingBox(ro.segment);
-          for (let i = 0; i < bb.length; i++) {
-            bb[i] *= 0.6;
-          }
-          this.viewer2d.boundingBox = Longan.BoundingBox.FromArray(bb);
-          this.viewer2d.locateWorldByBoundingBox(this.viewer2d.boundingBox);
-          this.viewer2d.setViewMode(Longan.ViewMode.XY, false);
-          ro.segment.selectability.line = Longan.SelectabilityType.On;
-        });
-      });
-    });
-    // let drawingSegment = item.segment.subsegment("main");
-
-    // //设置第二个viewer显示的内容
-    // let viewer2dSegmentViewObject = new SegmentViewObject();
-    // viewer2dSegmentViewObject.viewSegment = drawingSegment;
-    // viewer2dSegmentViewObject.needSerialization = false;
-    // this.viewer2d.renderObject = viewer2dSegmentViewObject;
-    // this.viewer2d.fitWorld();
-    // this.viewer2d.updateDisplay();
-
-    this.commandData.name = item.name;
-  }
-
-  //左键点击二维视图
-  drawinglButtonDown(sender: SegmentComponentSelector, event: ViewerEvent) {
-    let segmentObject = this.viewer2d.segmentSelectionManager.segmentObject;
-
-    if (segmentObject) {
-      //三维视图中定位构件
-      // this.viewer2d.selectionManager.clearAllSelection();
-      this.viewer2d.segmentSelectionManager.selectAndHighlight([segmentObject]);
-
-      let segmentViewObject = this.viewer2d.renderObject as Longan.SegmentViewObject;
-      if (segmentViewObject && segmentObject.modelId && segmentObject.componentId) {
-        // console.log("segmentObject", segmentObject);
-        // let componentId = segmentObject.componentId.replace(segmentViewObject.viewSegment.owner.name, "");
-        // let componentKey = LonganCore.JS_Show_Key_By_Id(componentId);
-        // if (componentKey != -1) {
-        //   let component = new SegmentObject(this.viewer, new Longan.Segment(componentKey));
-
-        // this.viewer.isolationManager.isolationInvert([component]);
-        let treeNode = this.viewer.structureTreeManager.getTreeNodeByComponentId(
-          segmentObject.modelId,
-          segmentObject.componentId
-        );
-        if (treeNode) {
-          console.log("treeNode", treeNode);
-          treeNode.locate();
-          treeNode.highlight(true);
-        }
-
-        // this.viewer.locateObject(component);
-        // this.viewer.updateDisplay();
-        // }
-      }
-    }
-  }
-
-  //左键点击三维视图
-  modellButtonDown(sender: ComponentSelector, event: ViewerEvent) {
-    if (this.viewer.selectionManager.selectedObject) {
-      // this.viewer.selectionManager.selectAndHighlight(this.viewer.selectionManager.selectedObject);
-      if (this.viewer2d) {
-        let model2dId = this.viewer.selectionManager.selectedObject.modelId;
-        let component2dId = this.viewer.selectionManager.selectedObject.componentId;
-        // let componentKey = LonganCore.JS_Show_Key_By_Id(component2dId);
-        // let component = new SegmentObject(this.viewer2d, new Longan.Segment(componentKey));
-        if (model2dId && component2dId) {
-          let component = this.viewer2d.segmentComponentManager.getSegmentObject(model2dId, component2dId);
-          if (component) {
-            // this.viewer2d.locateObject(component);
-            // // this.viewer2d.selectionManager.clearAllSelectionAndHighlight();
-            // this.viewer2d.segmentSelectionManager.selectAndHighlight([component]);
-            // // this.viewer2d.updateDisplay();
-          }
-        }
-      }
-    }
-  }
-}

package/src/viewerWrapper/commands/showDrawingItem/showDrawingItem.vue

@@ -1,65 +0,0 @@
-<template>
-  <div class="showDrawingItem">
-    <!-- <div id="viewer-drawing"></div> -->
-    <viewer-wrapper elementId="viewer-drawing" />
-  </div>
-</template>
-
-<script lang="ts">
-// import ViewerWrapper from "../../viewerWrapper";
-import { Component, Prop, Vue, Watch } from "vue-property-decorator";
-import store from "../../../store";
-
-@Component({
-  components: {
-    // ViewerWrapper: () => import("../../viewerWrapper"),
-  },
-})
-export default class ShowDrawingItem extends Vue {
-  @Prop() componentData;
-
-  defaultCommandData = null;
-
-  get commandData() {
-    return this.componentData || this.defaultCommandData;
-  }
-
-  @Watch("componentData", { deep: true })
-  onIsComputeChange(val, oldVal) {
-    if (this.componentData.name) {
-      this.$emit("setSubTitle", this.componentData.name);
-    }
-  }
-
-  borderMouseUp() {
-    // store.state.viewer2d.updateSize();
-  }
-
-  setData() {
-    this.$emit("setData", {
-      title: "二维图纸",
-      bottom: "20px",
-      left: "20px",
-      width: "400px",
-      height: "300px",
-    });
-  }
-
-  mounted() {
-    this.setData();
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.showDrawingItem {
-  position: relative;
-  height: 100%;
-  width: 100%;
-}
-
-#viewer-drawing {
-  height: 100%;
-  width: 100%;
-}
-</style>

package/src/viewerWrapper/commands/showEditLabel/commandShowEditLabel.ts

@@ -1,48 +0,0 @@
-import * as Longan from "gs-longan";
-import { CameraMouse } from "gs-bim-air-core/gsDevFx/operators/cameraMouse";
-import { LabelObjects } from "gs-bim-air-core/gsDevFx/objects/labelObjects";
-import { LeadTextObject } from "gs-bim-air-core/gsDevFx/objects/labelObjects/leadTextObject";
-import { LabelObjectSelector } from "gs-bim-air-core/gsDevFx/operators/labelObjectSelector";
-import { SvgDraw } from "../../../plugins/svgDraw";
-import { CommandComponent } from "../commandComponent";
-import Label from "./lib/label";
-import LeadText from "./lib/leadtext";
-import Location from "./lib/location";
-import Image from "./lib/image";
-import { ImageObject } from "gs-bim-air-core/gsDevFx/objects/labelObjects/imageObject";
-import { LabelObject } from "gs-bim-air-core/gsDevFx/objects/labelObjects/labelObject";
-import * as Commands from "gs-bim-air-core/commands";
-import store from "../../../store";
-
-export enum LabelType {
-  Location,
-  LeadText,
-  Image,
-}
-
-export class CommandShowEditLabel extends Commands.CommandShowEditLabel {
-  component: CommandComponent;
-
-  constructor() {
-    super();
-  }
-
-  begin() {
-    this.component = new CommandComponent(this, () => import("./showEditLabel.vue"));
-
-    // this.commandDataInit();
-
-    super.begin();
-
-    this.component.show();
-
-    // this.viewer.updateDisplay();
-  }
-
-  end() {
-    this.component.hide();
-    // this.hide();
-    store.commit("toolbar/resetToolbar", this.viewer.container.id);
-    super.end();
-  }
-}

package/src/viewerWrapper/commands/showEditLabel/lib/image.ts

@@ -1,136 +0,0 @@
-import { LabelObjects } from "gs-bim-air-core/gsDevFx/objects/labelObjects";
-import Label from "./label";
-
-import * as Longan from "gs-longan";
-import { CommandShowEditLabel, LabelType } from "../commandShowEditLabel";
-import { LabelObjectSelector } from "gs-bim-air-core/gsDevFx/operators/labelObjectSelector";
-import { Container } from "@svgdotjs/svg.js";
-import { LeadTextObject } from "gs-bim-air-core/gsDevFx/objects/labelObjects/leadTextObject";
-import { LocationObject } from "gs-bim-air-core/gsDevFx/objects/labelObjects/locationObject";
-import { ImageLable, ImageObject } from "gs-bim-air-core/gsDevFx/objects/labelObjects/imageObject";
-import { LabelObject } from "gs-bim-air-core/gsDevFx/objects/labelObjects/labelObject";
-import { ViewerEvent } from "gs-longan";
-import { Message } from "element-ui";
-import { isPC } from "gs-longan";
-import { labelService } from "../../../../api/labelService";
-
-export default class Image extends Label {
-  currentPoint;
-  picture;
-  labelObjects: LabelObjects;
-
-  constructor(svgDraw, viewer) {
-    super(svgDraw, viewer);
-
-    this.init();
-  }
-
-  init() {
-    super.begin();
-  }
-
-  addLabelObject(point: number[]) {
-    // let labelObjects = this.viewer.labelManager.labelObjects;
-    // if (!labelObjects) {
-    //   labelObjects = new LabelObjects(this.viewer);
-    //   let viewPointStateObject = this.viewer.process.findRenderObject("ViewPointStateObject");
-    //   this.viewer.process.addRenderObject(viewPointStateObject, labelObjects);
-    // }
-    let labelObjects = this.viewer.labelManager.labelObjects;
-
-    let imageObject = new ImageObject(this.viewer);
-    imageObject.position = point;
-
-    let instance = this.viewer.process.commandManager.currentCommand as CommandShowEditLabel;
-    if (instance.typeName === "CommandShowEditLabel") {
-      imageObject.picture = instance.commandData.picture;
-    }
-
-    imageObject.clickFun = (obj: ImageObject) => {
-      let instance = obj.viewer.process.commandManager.currentCommand as CommandShowEditLabel;
-      if (instance.typeName !== "CommandShowEditLabel" && isPC()) {
-        instance = new CommandShowEditLabel();
-        obj.viewer.process.commandManager.execute(instance);
-      }
-      instance.commandData.position = obj.position;
-      // commandShowEditLabel.commandData.isLeadTextLabelEditing = true
-      instance.commandData.picture = obj.picture;
-      instance.activeLabelTypeChange(LabelType.Image);
-    };
-
-    // this.viewer.process.addRenderObject(labelObjects, imageObject);
-    labelObjects.addChildObject(imageObject);
-
-    // 画出最新的角度线
-    labelObjects.clearActive();
-    imageObject.active = true;
-    labelObjects.render();
-
-    instance.commandData.position = point;
-    instance.activeLabelTypeChange(LabelType.Image);
-
-    labelService.createLabel(this.viewer.projectSceneManager.currentScene.id, imageObject.toJson()).then((data) => {
-      imageObject.fromJson(data as ImageLable);
-    });
-  }
-
-  // updateLabelText(text) {
-  //     let lightModel = this.viewer.process.renderObject;
-  //     let labelObjects: LabelObjects = null;
-  //     for (let i = 0; i < lightModel.childObjects.length; i++) {
-  //         let ro = lightModel.childObjects[i];
-  //         if (ro.typeName == "LabelObjects") {
-  //             labelObjects = ro as LabelObjects;
-  //             break;
-  //         }
-  //     }
-  //     // labelObjects.leadTextList[this.activeLabelIndex].data = text
-  // }
-
-  operatorChange() {
-    super.operatorChange();
-
-    let labelObjectSelector: LabelObjectSelector = new LabelObjectSelector();
-    this.viewer.operatorManager.add(labelObjectSelector);
-
-    let instance = this.viewer.process.commandManager.currentCommand as CommandShowEditLabel;
-
-    labelObjectSelector.lButtonDown.add(() => {
-      instance.commandData.isSelectPositionTip = false;
-      instance.commandData.isChooseImage = true;
-      instance.commandData.picture = "";
-    });
-
-    labelObjectSelector.addLabelObject.add((point: Float64Array) => {
-      if (!instance.commandData.picture) {
-        Message.warning("请先选取图片");
-        return;
-      }
-      this.addLabelObject(Array.from(point));
-      this.currentPoint = point;
-    });
-
-    labelObjectSelector.windowKeyDown.add((e: ViewerEvent) => {
-      if ((e.uiEvent as any).key === "Delete") {
-        this.deleteActiveLabel();
-        // saveModel()
-        // this.activeLabelIndex = null
-      }
-    });
-  }
-
-  // deleteActiveLabel() {
-  //   let labelObjects = this.viewer.labelManager.labelObjects;
-
-  //   if (labelObjects) {
-  //     labelObjects.childObjects.forEach((item: LabelObject) => {
-  //       if (item.active) {
-  //         item.remove();
-  //       }
-  //     });
-  //   }
-  //   //删除角度数据时面板数据清零
-  //   // let commandShowMeasure = CommandShowMeasure.instance;
-  //   // commandShowMeasure.commandData.angleValue = 0;
-  // }
-}