gs-bim-air 3.0.3 → 3.0.5

package/src/viewerWrapper/panels/viewPlan/viewPlanPanel.ts

@@ -1,97 +0,0 @@
-import * as Longan from "gs-longan";
-import store from "../../../store";
-import Panel from "../panel";
-import { threeChannelToFourChannel, imageDataToSrc } from "../../../utils/fileUtility";
-import { Viewer } from "gs-bim-air-core/gsDevFx/viewer";
-
-import * as Panels from "gs-bim-air-core/panels";
-
-export default class ViewPlanPanel extends Panels.ViewPlanPanel {
-  // lightmodel = null;
-  // drawingList = new Longan.List<Drawing>();
-
-  panelComponent: Panel;
-  constructor(viewer: Viewer) {
-    super(viewer);
-    // this.componentData = [];
-  }
-
-  show() {
-    if (!this.panelComponent) {
-      this.panelComponent = new Panel(this, () => import("./interfaceViewPlanPanel.vue"));
-    }
-    this.panelComponent.show();
-
-    // this.componentData = [];
-    super.show();
-  }
-
-  hide() {
-    // this.lightmodel = null;
-    // this.componentData = [];
-    this.panelComponent.hide();
-    super.hide();
-  }
-
-  // interrupt() {
-  //   let viewer = this.viewer;
-  //   viewer.operatorManager.add(new Longan.CameraMouse());
-  // }
-
-  // getDrawingList(segment: Longan.Segment) {
-  //   // if (segment.subsegmentExists("main/楼层平面")) {
-  //   //   let darwingSegment = segment.subsegment("main/楼层平面");
-  //   //   let subs = darwingSegment.subsegments;
-  //   //   if (subs.count() > 0) {
-  //   //     for (let i = 0; i < subs.count(); i++) {
-  //   //       let sub = subs.items[i];
-  //   //       let drawing = new Drawing();
-  //   //       drawing.name = sub.name;
-  //   //       drawing.segment = sub;
-  //   //       let geometries = sub.geometries;
-  //   //       for (let j = 0; j < geometries.count(); j++) {
-  //   //         let geometry = geometries.items[j];
-  //   //         if (geometry.typeName === "Image") {
-  //   //           let image = geometry as Longan.Image;
-  //   //           if (image.externalLoad && image.id) {
-  //   //             let url = this.viewer.getAsynImageAction.url + image.id;
-  //   //             fetch(url).then(response => {
-  //   //               response.blob().then(blob => {
-  //   //                 blob.arrayBuffer().then((buffer) => {
-  //   //                   if (image.format === "rgb") {
-  //   //                     let imageData = threeChannelToFourChannel(new Uint8Array(buffer));
-  //   //                     drawing.imageSrc = imageDataToSrc(
-  //   //                       imageData,
-  //   //                       image.size.width,
-  //   //                       image.size.height
-  //   //                     );
-  //   //                     this.componentData.push(drawing);
-  //   //                   }
-  //   //                 });
-  //   //               })
-  //   //             });
-  //   //           } else {
-  //   //             let imageData = image.data;
-  //   //             if (image.format === "rgb") {
-  //   //               imageData = threeChannelToFourChannel(imageData);
-  //   //             }
-  //   //             drawing.imageSrc = imageDataToSrc(
-  //   //               imageData,
-  //   //               image.size.width,
-  //   //               image.size.height
-  //   //             );
-  //   //             this.componentData.push(drawing);
-  //   //           }
-  //   //         }
-  //   //       }
-  //   //     }
-  //   //   }
-  //   // }
-  // }
-}
-
-export class Drawing {
-  imageSrc: string;
-  name: string;
-  segment: Longan.Segment;
-}

package/src/viewerWrapper/panels/viewPoint/interfaceViewPointPanel.vue

@@ -1,241 +0,0 @@
-<template>
-  <div class="showViewPoint">
-    <div class="content">
-      <div class="topButton">
-        <el-button type="primary" round @click="viewPointDialogVisible = true">
-          <i class="el-icon-plus"></i>
-          创建视点
-        </el-button>
-      </div>
-      <div class="scrollbar">
-        <div
-          class="item"
-          v-for="(item, index) in viewPointObjects"
-          :class="{ active: activeIndex === index }"
-          :key="index"
-          @click="viewPointClick(item.id, index)">
-          <!-- <img :src="imageUrl(item.imageId)" crossorigin="*" /> -->
-          <img
-            :src="item.image ? item.image : require('../../../assets/images/placeholder.jpg')"
-            crossorigin="*"
-            style="width: 210px; height: 126px"
-            v-fallback="require('../../../assets/images/placeholder.jpg')" />
-          <!-- fallback在viewerWrapper.ts定义 -->
-
-          <div class="mask"></div>
-          <span>{{ item.name }}</span>
-          <div class="button-wrapper">
-            <!-- <i class="el-icon-share"></i> -->
-            <i class="el-icon-delete" @click.stop="deletePointClick(item.id)"></i>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <gs-dialog title="视点" v-model="viewPointDialogVisible" @confirm="addViewPointClick(viewPointName)" type="dark">
-      <el-form label-position="right" label-width="100px" style="margin-top: 20px">
-        <el-form-item label="视点名称">
-          <el-input v-model="viewPointName" @keyup.enter.native="addViewPointClick(viewPointName)"></el-input>
-        </el-form-item>
-      </el-form>
-    </gs-dialog>
-  </div>
-</template>
-
-<script lang="ts">
-import { Component, Inject, Prop, Vue, Watch } from "vue-property-decorator";
-import store from "../../../store";
-
-import GsDialog from "../../../components/gs/gsDialog/gs-dialog.vue";
-import { MessageBox } from "element-ui";
-import { Viewer } from "gs-bim-air-core/gsDevFx/viewer";
-import { ViewPointObject } from "gs-bim-air-core/gsDevFx/objects/viewPointObject";
-import { ModelObject, RenderObject } from "gs-longan";
-import ViewPointPanel from "./viewPointPanel";
-
-@Component({
-  components: { GsDialog },
-})
-export default class InterfaceViewPointPanel extends Vue {
-  @Prop() componentData;
-  @Inject() getViewer;
-  activeName = "first";
-  viewPointDialogVisible = false;
-  viewPointName = "";
-  viewPointImageList = [];
-  activeIndex = null;
-  store = store;
-  // imageUrls = {};
-
-  get viewer(): Viewer {
-    return this.getViewer();
-  }
-
-  get viewPointObjects(): ViewPointObject[] {
-    if (this.componentData) {
-      this.componentData.forEach((item) => {
-        if (!item.image) {
-          this.viewer.viewPointManager.getImage(item.id).then((res: any) => {
-            if (res && res.data) {
-              Vue.set(item, "image", window.URL.createObjectURL(res.data));
-              // item.image = window.URL.createObjectURL(res.data);
-            }
-          });
-        }
-      });
-    }
-    return this.componentData || [];
-  }
-
-  get currentGroupId() {
-    let groupId = "";
-    let lightModelList: ModelObject[] = this.viewer.process.findModelRenderObjects();
-
-    lightModelList.forEach((item) => {
-      groupId += item.id + ",";
-    });
-    return groupId;
-  }
-
-  // getImageSrc(viewPointId) {
-  //   return this.viewer.viewPointManager.getImageSrc(viewPointId);
-  // }
-
-  viewPointClick(id, index) {
-    // let viewPointObject = this.viewPointObjects[index];
-    this.activeIndex = index;
-    // if (viewPointObject) {
-    this.viewer.viewPointManager.restoreViewPointById(id);
-    // }
-  }
-
-  addViewPointClick(viewPointName: string) {
-    if (!viewPointName) {
-      return this.$message.warning("视点名称不可为空");
-    }
-    this.viewPointDialogVisible = false;
-    this.viewer.viewPointManager.addViewPoint(viewPointName).then(() => {
-      this.viewPointName = "";
-      // this.activeIndex = this.viewPointObjects.length - 1;
-      this.activeIndex = 0;
-    });
-  }
-
-  deletePointClick(id) {
-    MessageBox.confirm("确定删除选中的视点？")
-      .then(() => {
-        this.viewer.viewPointManager.deleteViewPointById(id);
-      })
-      .catch(() => {});
-  }
-  setData() {
-    this.$emit("setData", {
-      icon: "a-shidian",
-      title: "视点列表",
-      top: "10px",
-      bottom: "10px",
-      left: "80px",
-    });
-  }
-
-  // closeClick() {
-  //   ViewPointPlan.instance.end()
-  // }
-
-  mounted() {
-    this.setData();
-    this.activeName = "first";
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-@import "../../../assets/scss/site";
-@import "../../../assets/theme/handle.scss";
-
-.showViewPoint {
-  color: $gs-primary-fontColor;
-  // background-color: $gs-primary-background;
-  min-width: 230px;
-  height: 100%;
-  min-height: 50px;
-}
-
-.content {
-  display: flex;
-  flex-direction: column;
-  // max-height: 700px;
-  height: 100%;
-  // background: $gs-primary-background2;
-  .topButton {
-    margin: 10px 0;
-    padding: 0 10px;
-    text-align: left;
-    // background: $gs-primary-background;
-  }
-  .el-button--text {
-    color: $gs-primary-checkboxColor;
-  }
-}
-
-.add-icon-wrapper {
-  width: 40px;
-  margin: auto;
-
-  i {
-    margin: auto;
-    cursor: pointer;
-    font-size: 25px;
-    padding: 10px 0;
-  }
-}
-
-.scrollbar {
-  height: calc(100% - 50px);
-  width: 250px;
-  //flex: 1;
-  overflow: auto;
-
-  .item {
-    // width: 230px;
-    display: inline-block;
-    position: relative;
-    border: 2px solid transparent;
-    // border-top: 2px solid transparent;
-
-    img {
-      // max-width: 230px;
-      // height: 140px;
-      mask-image: linear-gradient(0deg, transparent, #a5a5a5 50%);
-    }
-
-    span {
-      position: absolute;
-      bottom: 20px;
-      left: 20px;
-    }
-
-    .button-wrapper {
-      display: inline-block;
-      position: absolute;
-      bottom: 10px;
-      right: 20px;
-      color: $gs-primary-active;
-      i {
-        cursor: pointer;
-        padding: 10px;
-      }
-    }
-  }
-
-  .active {
-    border: 2px solid $gs-primary-checkboxColor;
-  }
-}
-:deep(.el-input__inner) {
-  background: transparent;
-  border: 1px solid #aaa;
-  border-radius: 4px;
-  color: $gs-primary-fontColor;
-}
-</style>

package/src/viewerWrapper/panels/viewPoint/viewPointPanel.ts

@@ -1,350 +0,0 @@
-import renderObjectsService from "../../../api/renderObjectService";
-import axios from "../../../axiosRequestExport";
-import { ViewPointObjects } from "gs-bim-air-core/gsDevFx/objects/viewPointObjects";
-import Panel from "../panel";
-import { Viewer } from "gs-bim-air-core/gsDevFx/viewer";
-import { ViewPoint, ViewPointObject } from "gs-bim-air-core/gsDevFx/objects/viewPointObject";
-import uuid from "../../../utils/uuid";
-import getRelatedIds from "../../module/getRelatedIds";
-import { Constants, ProjectionType, Vector3 } from "gs-longan";
-import { modelService } from "../../../api/modelService";
-import fromJson from "gs-bim-air-core/gsDevFx/objects/fromJson";
-import { MarkupObject } from "gs-bim-air-core/gsDevFx/objects/markupObjects/markupObject";
-import { MeasureObject } from "gs-bim-air-core/gsDevFx/objects/measureObjects/measureObject";
-import { LabelObject } from "gs-bim-air-core/gsDevFx/objects/labelObjects/labelObject";
-import { CuttingObject } from "gs-bim-air-core/gsDevFx/objects/cuttingObjects/cuttingObject";
-import { CuttingPlaneObject } from "gs-bim-air-core/gsDevFx/objects/cuttingObjects/cuttingPlaneObject";
-import { CuttingBoxObject } from "gs-bim-air-core/gsDevFx/objects/cuttingObjects/cuttingBoxObject";
-import * as Panels from "gs-bim-air-core/panels";
-
-export default class ViewPointPanel extends Panels.ViewPointPanel {
-  // viewPointObjects: ViewPointObjects;
-  // activeViewPointIndex;
-  // viewPoints: ViewPoint[] = [];
-
-  // clearMarkupsObservable;
-
-  // clearMarkups = () => {
-  //   this.viewer.viewPointManager.markupObjects.removeChildren();
-  //   // this.viewer.camera.changed.remove(this.clearMarkups);
-  // };
-
-  panelComponent: Panel;
-  constructor(viewer: Viewer) {
-    super(viewer);
-    // renderObjectsService.viewer = viewer;
-  }
-
-  show() {
-    if (!this.panelComponent) {
-      this.panelComponent = new Panel(this, () => import("./interfaceViewPointPanel.vue"));
-    }
-    this.panelComponent.show();
-    super.show();
-
-    // this.getViewPoints();
-  }
-
-  hide() {
-    this.panelComponent.hide();
-    super.hide();
-  }
-
-  // private generateViewPointObjectList(viewPoints: ViewPoint[]) {
-  //   if (viewPoints) {
-  //     this.componentData = viewPoints;
-  //   }
-  // }
-
-  // private async saveImage(blob): Promise<any> {
-  //   //上传图片到数据库,返回id
-  //   let formData = new FormData();
-  //   console.log("视点图片数据：", blob);
-  //   formData.append("file", blob as any);
-  //   return axios.post(this.viewer.options.modelService + `/file-service/files`, formData);
-  // }
-
-  // /**
-  //  * 获取当前视点图片
-  //  * @returns 图片Blob数据
-  //  */
-  // public async getImage(width?: number, height?: number, quality = 1): Promise<string> {
-  //   let viewerId = this.viewer.container.id;
-  //   let modelViewer = document.getElementById(viewerId);
-  //   // let canvasList = modelViewer!.getElementsByTagName("canvas");
-
-  //   // let width;
-  //   // let height;
-  //   let targetWidth;
-  //   let targetHeight;
-  //   if (width && height) {
-  //     targetWidth = width;
-  //     targetHeight = height;
-  //   } else {
-  //     targetWidth = this.viewer.width;
-  //     targetHeight = this.viewer.height;
-  //   }
-
-  //   let canvas = document.createElement("canvas");
-  //   canvas.width = targetWidth;
-  //   canvas.height = targetHeight;
-  //   let context = canvas.getContext("2d");
-
-  //   // for (let i = 0; i < canvasList.length; i++) {
-  //   let modelCanvas = document.getElementById("canvas_" + viewerId) as HTMLCanvasElement;
-  //   console.log(modelCanvas);
-  //   let modelBase64Image = modelCanvas.toDataURL("image/png");
-
-  //   //生成模型图片
-  //   let modelImage = new Image();
-  //   modelImage.src = modelBase64Image;
-  //   modelImage.crossOrigin = "Anonymous";
-
-  //   await new Promise<void>((resolve, reject) => {
-  //     modelImage.onload = () => {
-  //       // if (!width && !height) {
-  //       //   targetWidth = modelImage.width;
-  //       //   targetWidth = modelImage.height;
-  //       // }
-  //       context.drawImage(modelCanvas, 0, 0, targetWidth, targetHeight);
-  //       resolve();
-  //     };
-  //   });
-  //   // }
-
-  //   //生成svg图片
-  //   // let svgId = SvgDraw.getInstance(this.viewer.container.id).svgId;
-
-  //   let svg = modelViewer.getElementsByTagName("svg")[0];
-  //   let svgHtml = svg.outerHTML;
-
-  //   let svgImage = new Image();
-  //   let src = "data:image/svg+xml;base64," + btoa(unescape(encodeURIComponent(svgHtml)));
-  //   svgImage.src = src;
-
-  //   await new Promise<void>((resolve, reject) => {
-  //     svgImage.onload = () => {
-  //       context.drawImage(svgImage, 0, 0, targetWidth, targetHeight);
-  //       resolve();
-  //     };
-  //     svgImage.onerror = (e, ee) => {
-  //       console.error(e, ee);
-  //       reject();
-  //     };
-  //   });
-  //   return new Promise((resolve, reject) => {
-  //     let imageData = canvas.toDataURL("image/jpg", quality);
-  //     resolve(imageData);
-  //   });
-  // }
-  // /**
-  //  * 获取视点数据列表
-  //  * @returns 视点数据列表
-  //  */
-  // getViewPoints(): Promise<ViewPoint[]> {
-  //   let ids = getRelatedIds(this.viewer);
-
-  //   return modelService.getViewPoints(this.viewer.projectId, ids).then((data: any) => {
-  //     if (data) {
-  //       this.viewPoints = data.sort((a, b) => new Date(b.createTime).getTime() - new Date(a.createTime).getTime());
-  //       this.generateViewPointObjectList(this.viewPoints);
-  //       // this.componentData = this.viewPoints;
-  //       return this.viewPoints;
-  //     }
-  //   });
-  // }
-
-  // /**
-  //  * 通过Id获取视点
-  //  * @param id
-  //  * @returns
-  //  */
-  // getViewPointById(id): Promise<ViewPoint> {
-  //   return modelService.getViewPoint(id).then((data: any) => {
-  //     return data;
-  //   });
-  // }
-
-  // /**
-  //  * 获取当前视点数据
-  //  * @returns 视点对象和视点图片数据
-  //  */
-  // getCurrentViewPoint(): Promise<{ viewPoint: ViewPoint; imageData: string }> {
-  //   return this.getImage(210, 126).then((imageData) => {
-  //     let camera = this.viewer.camera;
-  //     if (camera) {
-  //       let cameraJson = {
-  //         position: camera.position.asArray(),
-  //         target: camera.target.asArray(),
-  //         up: camera.upVector.asArray(),
-  //         width: camera.orthoWidth,
-  //         height: camera.orthoHeight,
-  //         projection: camera.mode === Constants.ORTHOGRAPHIC_CAMERA ? "orthographic" : "perspective",
-  //       };
-
-  //       let viewPointObject: ViewPointObject = new ViewPointObject();
-
-  //       viewPointObject.camera = cameraJson;
-  //       viewPointObject.projectId = this.viewer.projectId;
-
-  //       this.viewer.viewPointManager.measureObjects.childObjects.forEach((ro: MeasureObject) => {
-  //         viewPointObject.measures.push(ro.toJson());
-  //       });
-
-  //       this.viewer.viewPointManager.markupObjects.childObjects.forEach((ro: MarkupObject) => {
-  //         viewPointObject.markups.push(ro.toJson());
-  //       });
-
-  //       this.viewer.viewPointManager.labelObjects.childObjects.forEach((ro: LabelObject) => {
-  //         viewPointObject.labels.push(ro.toJson());
-  //       });
-
-  //       // this.viewer.viewPointManager.cuttingObjects.childObjects.forEach((ro: CuttingObject) => {
-  //       //   viewPointObject.cuttings.push(ro.toJson());
-  //       // });
-  //       const cuttingPlaneObject = this.viewer.renderObjects.find<CuttingPlaneObject>("CuttingPlaneObject");
-  //       const cuttingBoxObject = this.viewer.renderObjects.find<CuttingBoxObject>("CuttingBoxObject");
-  //       if (cuttingPlaneObject) {
-  //         viewPointObject.cuttings.push(cuttingPlaneObject.toJson());
-  //       }
-  //       if (cuttingBoxObject) {
-  //         viewPointObject.cuttings.push(cuttingBoxObject.toJson());
-  //       }
-
-  //       let ids = getRelatedIds(this.viewer);
-  //       viewPointObject.related = ids;
-
-  //       let obj = viewPointObject.serialize();
-
-  //       // 重写id
-  //       this.reloadObjectId(obj);
-  //       return {
-  //         viewPoint: obj,
-  //         imageData: imageData,
-  //       };
-  //     }
-  //     return {
-  //       viewPoint: null,
-  //       imageData: imageData,
-  //     };
-  //   });
-  // }
-
-  // /**
-  //  * 添加视点
-  //  * @param viewPointName 视点名字
-  //  * @returns
-  //  */
-  // async addViewPoint(viewPointName): Promise<{ viewPoint: ViewPoint; imageData: string }> {
-  //   let { viewPoint, imageData } = await this.getCurrentViewPoint();
-  //   let obj = viewPoint;
-  //   obj.name = viewPointName;
-  //   obj.image = imageData;
-
-  //   return modelService.createViewPoint(obj).then((data: any) => {
-  //     this.viewPoints.unshift(data);
-  //     this.generateViewPointObjectList(this.viewPoints);
-  //     return { viewPoint: data, imageData };
-  //   });
-  // }
-
-  // private reloadObjectId(obj) {
-  //   if (obj.id) {
-  //     obj.id = uuid();
-  //   }
-  //   if (obj.childObjects) {
-  //     obj.childObjects.forEach((item) => {
-  //       this.reloadObjectId(item);
-  //     });
-  //   }
-  // }
-
-  // /**
-  //  * 通过Id删除视点
-  //  * @param id
-  //  * @returns
-  //  */
-  // deleteViewPointById(id): Promise<any> {
-  //   let viewPoint = this.viewPoints.find((obj) => obj.id === id) || null;
-
-  //   let index = this.viewPoints.indexOf(viewPoint);
-  //   return modelService.deleteViewPoint(id).then((data: any) => {
-  //     this.viewPoints.splice(index, 1);
-  //     this.generateViewPointObjectList(this.viewPoints);
-  //   });
-  // }
-
-  // /**
-  //  * 恢复视点
-  //  * @param index 视点序号
-  //  */
-  // restoreViewPoint(viewPoint: ViewPoint) {
-  //   if (!this.clearMarkupsObservable) {
-  //     this.clearMarkupsObservable = this.viewer.camera.onViewMatrixChangedObservable.add(this.clearMarkups);
-  //   }
-  //   let viewPointObject = this.viewer.viewPointManager.viewPointObject;
-  //   viewPointObject.deserialize(viewPoint);
-
-  //   this.viewer.smoothTransition = false;
-
-  //   this.viewer.camera.position = new Vector3(...viewPointObject.camera.position);
-  //   this.viewer.camera.target = new Vector3(...viewPointObject.camera.target);
-  //   this.viewer.camera.upVector = new Vector3(...viewPointObject.camera.up);
-  //   this.viewer.camera.orthoWidth = viewPointObject.camera.width;
-  //   this.viewer.camera.orthoHeight = viewPointObject.camera.height;
-
-  //   this.viewer.camera.update();
-
-  //   this.viewer.smoothTransition = true;
-  //   // this.viewer.viewPointManager.measureObjects.removeChildren();
-  //   // this.viewer.viewPointManager.markupObjects.removeChildren();
-  //   // this.viewer.viewPointManager.labelObjects.removeChildren();
-  //   // this.viewer.viewPointManager.cuttingObjects.clearChildObjects();
-  //   this.viewer.viewPointManager.clearAll();
-
-  //   viewPointObject.measures.forEach((obj) => {
-  //     let ro = fromJson(this.viewer, obj);
-  //     this.viewer.process.addRenderObject(this.viewer.viewPointManager.measureObjects, ro);
-  //   });
-
-  //   viewPointObject.markups.forEach((obj) => {
-  //     let ro = fromJson(this.viewer, obj);
-  //     this.viewer.process.addRenderObject(this.viewer.viewPointManager.markupObjects, ro);
-  //   });
-
-  //   viewPointObject.labels.forEach((obj) => {
-  //     let ro = fromJson(this.viewer, obj);
-  //     this.viewer.process.addRenderObject(this.viewer.viewPointManager.labelObjects, ro);
-  //   });
-
-  //   viewPointObject.cuttings.forEach((obj) => {
-  //     let ro = fromJson(this.viewer, obj);
-  //     // this.viewer.process.addRenderObject(this.viewer.viewPointManager.cuttingObjects, ro);
-  //     this.viewer.renderObjects.add(this.viewer.renderObject, ro);
-  //   });
-
-  //   viewPointObject.render();
-  // }
-
-  // /**
-  //  * 通过Id恢复视点
-  //  * @param id
-  //  * @returns
-  //  */
-  // restoreViewPointById(id): Promise<ViewPoint> {
-  //   return new Promise((resolve) => {
-  //     let viewPoint = this.viewPoints.find((obj) => obj.id === id) || null;
-  //     if (viewPoint) {
-  //       this.activeViewPointIndex = this.viewPoints.indexOf(viewPoint);
-  //       console.log("this.activeViewPointIndex", this.activeViewPointIndex, viewPoint);
-  //       this.restoreViewPoint(viewPoint);
-  //       resolve(viewPoint);
-  //     } else {
-  //       this.getViewPointById(id).then((res: any) => {
-  //         this.restoreViewPoint(res);
-  //         resolve(res);
-  //       });
-  //     }
-  //   });
-  // }
-}