Browse Source

封装描述阅读

dev
刘向辉 3 years ago
parent
commit
8058e87fe6
  1. 11
      src/app/babylon/model/info/mark/mark-plan-info.ts
  2. 8
      src/app/babylon/view/mark-window/mark-window.ts

11
src/app/babylon/model/info/mark/mark-plan-info.ts

@ -1,5 +1,6 @@
import { TsTool } from "src/app/babylon/tool/ts-tool"; import { TsTool } from "src/app/babylon/tool/ts-tool";
import { MarkWindow } from "src/app/babylon/view/mark-window/mark-window";
import { MarkTagPos, MarkType } from "../../data/mark/mark-data"; import { MarkTagPos, MarkType } from "../../data/mark/mark-data";
import { MarkNodeData, MarkPlanData } from "../../data/mark/mark-plan-data"; import { MarkNodeData, MarkPlanData } from "../../data/mark/mark-plan-data";
import { ModelInfo_mark } from "./model-info-mark"; import { ModelInfo_mark } from "./model-info-mark";
@ -99,6 +100,16 @@ export class MarkNodeInfo {
return this.currentMarkDataIndex; return this.currentMarkDataIndex;
} }
/**
*
*/
readDescribe() {
if (this.nodeData != null) {
MarkWindow.instance.readDescribe(this.nodeData.describe);
}
}
/** /**

8
src/app/babylon/view/mark-window/mark-window.ts

@ -9,7 +9,6 @@ import { Event_GetAllMarkPlanData } from "../../controller/event-manager/events/
import { Event_KeyboardInput } from "../../controller/event-manager/events/event-keyboard-input"; import { Event_KeyboardInput } from "../../controller/event-manager/events/event-keyboard-input";
import { Event_MarkInfoChange, MarkInfoChangeType } from "../../controller/event-manager/events/event-mark-info-change"; import { Event_MarkInfoChange, MarkInfoChangeType } from "../../controller/event-manager/events/event-mark-info-change";
import { InputController } from "../../controller/inputController"; import { InputController } from "../../controller/inputController";
import { ModeManager } from "../../controller/mode-manager";
import { SceneManager } from "../../controller/scene-manager"; import { SceneManager } from "../../controller/scene-manager";
import { BuildingStatus } from "../../controller/status/building-status"; import { BuildingStatus } from "../../controller/status/building-status";
import { IndoorStatus } from "../../controller/status/indoor-status"; import { IndoorStatus } from "../../controller/status/indoor-status";
@ -237,7 +236,7 @@ export class MarkWindow extends UIBase {
* @param markPlanId idID * @param markPlanId idID
* @param nodeId idid * @param nodeId idid
*/ */
saveToOldNode(markPlanId: number, nodeId: number) { saveToOldNode(markPlanId: number, nodeId: number, newName?: string) {
let markPlaneData = DataManager.allMarkPlanData.getMarkPlanById(markPlanId); let markPlaneData = DataManager.allMarkPlanData.getMarkPlanById(markPlanId);
if (markPlaneData == null) { if (markPlaneData == null) {
console.error("没找到标绘方案:" + markPlanId) console.error("没找到标绘方案:" + markPlanId)
@ -248,6 +247,9 @@ export class MarkWindow extends UIBase {
let copyNodeData = classToClass(this.currentMarkNodeDataCopy);//覆盖数据 let copyNodeData = classToClass(this.currentMarkNodeDataCopy);//覆盖数据
copyNodeData.id = oldNodeData.id; copyNodeData.id = oldNodeData.id;
copyNodeData.index = oldNodeData.index; copyNodeData.index = oldNodeData.index;
if (newName != null) {
copyNodeData.name = newName;
}
// copyNodeData.name = oldNodeData.name; // copyNodeData.name = oldNodeData.name;
markPlaneData.setNodeData(nodeId, copyNodeData);//覆盖数据 markPlaneData.setNodeData(nodeId, copyNodeData);//覆盖数据
@ -261,7 +263,7 @@ export class MarkWindow extends UIBase {
*/ */
createNewNodeAndSave(markPlanId: number, name: string) { createNewNodeAndSave(markPlanId: number, name: string) {
let newNode = this.createMarkNodeData(markPlanId, name); let newNode = this.createMarkNodeData(markPlanId, name);
this.saveToOldNode(markPlanId, newNode.id); this.saveToOldNode(markPlanId, newNode.id, name);
} }

Loading…
Cancel
Save