gs-cae-design 1.1.57 → 1.1.59

package/src/viewerWrapper/commands/aftertreatment/editJointLoad/commandEditJointLoad.ts

@@ -22,9 +22,11 @@ export default class CommandEditJointLoad extends CommandComponent {
   caeObjectSelector: CAEObjectSelector;
 
   loadConditionRO: LoadConditionObject = null;
-  loadGroupRO: LoadGroupObject = null;
+  // loadGroupRO: LoadGroupObject = null;
   expectFilter = SelectorFiliter.Joint;
 
+  prepareToDeleteLoadList = new Longan.List<JointLoadObject>();
+
   constructor() {
     super();
   }
@@ -77,6 +79,7 @@ export default class CommandEditJointLoad extends CommandComponent {
   }
 
   changeOperators(): void {
+    this.prepareToDeleteLoadList.clear();
     // 进入命令前清空选中与高亮.
     this.viewer.selectionManager.clearAllSelectionAndHighlight();
     this.viewer.updateDisplay();
@@ -117,6 +120,12 @@ export default class CommandEditJointLoad extends CommandComponent {
   }
 
   commandOk(): void {
+    // 正式删除点荷载
+    for (let i = 0; i < this.prepareToDeleteLoadList.count(); i++) {
+      this.prepareToDeleteLoadList.items[i].tempDelete(this.viewer);
+    }
+    this.prepareToDeleteLoadList.clear();
+
     let data = this.config.properties.items[0].data;
 
     let loadCondition = data.loadCondition.value;
@@ -154,18 +163,17 @@ export default class CommandEditJointLoad extends CommandComponent {
       }
     }
 
-
     if (selectedObjects) {
       this.viewer.selectionManager.clearAllSelectionAndHighlight();
 
       // 添加或修改工况.
       this.loadConditionRO = this.getLoadConditionObjectByName(loadCondition);
-      this.loadGroupRO = this.getLoadGroupByName(
+      let loadGroupRO = this.getLoadGroupByName(
         this.loadConditionRO,
         loadGroup
       );
 
-      if (!this.loadConditionRO || !this.loadGroupRO) {
+      if (!this.loadConditionRO || !loadGroupRO) {
         // 没有查找到对应的工况或荷载组
         data.tip.value = 4;
         return;
@@ -176,8 +184,8 @@ export default class CommandEditJointLoad extends CommandComponent {
         let selectedObj = selectedObjects.items[i];
         let jointLoad = null;
 
-        for (let j = 0; j < this.loadGroupRO.childObjects.length; j++) {
-          let load = this.loadGroupRO.childObjects[j];
+        for (let j = 0; j < loadGroupRO.childObjects.length; j++) {
+          let load = loadGroupRO.childObjects[j];
           if (load instanceof JointLoadObject) {
             if (load.jointName === selectedObj.name) {
               counter++;
@@ -372,7 +380,7 @@ export default class CommandEditJointLoad extends CommandComponent {
       let child = loadGroupRO.childObjects[i] as DesignBaseObject;
       if (child instanceof JointLoadObject) {
         deletingList.push(child);
-      } else if(child.checkBusinessStateIsActive()) {
+      } else if (child.checkBusinessStateIsActive()) {
         restObject++;
       }
     }
@@ -382,8 +390,8 @@ export default class CommandEditJointLoad extends CommandComponent {
       // this.process.removeRenderObject(deletingList[i]);
     }
 
-    if(restObject === 0) {
-      this.loadGroupRO.tempDelete(this.viewer);
+    if (restObject === 0) {
+      loadGroupRO.tempDelete(this.viewer);
     }
 
     this.viewer.updateDisplay();
@@ -405,10 +413,13 @@ export default class CommandEditJointLoad extends CommandComponent {
       if (conditions[i].name === loadConditionName) {
         for (let j = 0; j < conditions[i].childObjects.length; j++) {
           let loadGroup = conditions[i].childObjects[j] as LoadGroupObject;
-          if(loadGroup.checkBusinessStateIsActive()) {
+          if (loadGroup.checkBusinessStateIsActive()) {
             for (let k = 0; k < loadGroup.childObjects.length; k++) {
               let load = loadGroup.childObjects[k];
-              if (load instanceof JointLoadObject && load.checkBusinessStateIsActive()) {
+              if (
+                load instanceof JointLoadObject &&
+                load.checkBusinessStateIsActive()
+              ) {
                 loadGroups.push(loadGroup);
                 break;
               }
@@ -425,12 +436,15 @@ export default class CommandEditJointLoad extends CommandComponent {
     let groups = this.getLoadGroups(loadConditionName);
     let jointLoads = new Array<JointLoadObject>();
 
-    for(let i = 0; i < groups.length; i++) {
+    for (let i = 0; i < groups.length; i++) {
       let loadGroup = groups[i];
-      if(loadGroup.name === loadGroupName) {
-        for(let j = 0; j < loadGroup.childObjects.length; j++) {
+      if (loadGroup.name === loadGroupName) {
+        for (let j = 0; j < loadGroup.childObjects.length; j++) {
           let load = loadGroup.childObjects[j];
-          if(load instanceof JointLoadObject && load.checkBusinessStateIsActive()) {
+          if (
+            load instanceof JointLoadObject &&
+            load.checkBusinessStateIsActive()
+          ) {
             jointLoads.push(load);
           }
         }
@@ -440,4 +454,68 @@ export default class CommandEditJointLoad extends CommandComponent {
 
     return jointLoads;
   }
+
+  /**
+   * 将点荷载标记为待删除/或取消删除.
+   * 在应用时正式删除
+   * @param jointName 带有点荷载的空间点名
+   * @param isDelete true——标记为待删除；false——取消待删除标记
+   * @returns 
+   */
+  markJointLoad(jointName: string, isDelete: boolean) {
+    let data = this.config.properties.items[0].data;
+
+    let loadConditionName = data.loadCondition.value;
+    let loadGroupName = data.loadGroup.value;
+    if (loadConditionName && loadGroupName) {
+      let loadConditionRO =
+        this.getLoadConditionObjectByName(loadConditionName);
+      if (loadConditionRO) {
+        let loadGroupRO = this.getLoadGroupByName(
+          loadConditionRO,
+          loadGroupName
+        );
+        if (loadGroupRO) {
+          let jointLoad: JointLoadObject = null;
+          for (let j = 0; j < loadGroupRO.childObjects.length; j++) {
+            let child = loadGroupRO.childObjects[j];
+            if (child instanceof JointLoadObject) {
+              if (child.jointName === jointName) {
+                jointLoad = child;
+                break;
+              }
+            }
+          }
+          if (jointLoad) {
+            if (isDelete) {
+              if (this.prepareToDeleteLoadList.indexOf(jointLoad) === -1) {
+                this.prepareToDeleteLoadList.add(jointLoad);
+              }
+              // 将点荷载添加到待删除列表.
+              data.tip.value = 7 + "," + jointName;
+            } else {
+              if (this.prepareToDeleteLoadList.indexOf(jointLoad) > -1) {
+                this.prepareToDeleteLoadList.remove(jointLoad);
+              }
+              // 将点荷载从待删除列表中移除.
+              data.tip.value = 8 + "," + jointName;
+            }
+
+            return;
+          } else {
+            // 没有查找到点荷载.
+            data.tip.value = 9;
+            return;
+          }
+        }
+      }
+
+      // 无法查找到工况名对象或荷载组对象.
+      data.tip.value = 6;
+      return;
+    } else {
+      // 没有填写工况名和荷载组名
+      data.tip.value = 5;
+    }
+  }
 }

package/src/viewerWrapper/commands/aftertreatment/editWaveLoad/commandEditWaveLoad.ts

@@ -0,0 +1,330 @@
+import { CameraMouse } from "../../../../gsDevFx/operators/cameraMouse";
+import { CAEObjectPreSelector } from "../../../../gsDevFx/operators/cAEObjectPreSelector";
+import { CAEObjectSelector } from "../../../../gsDevFx/operators/caeObjectSelector";
+import { CommandSelect } from "../../../../gsDevFx/commands/commandSelect";
+import { CommandComponent } from "../../commandComponent";
+import EditWaveLoadConfig from "./editWaveLoadConfig";
+import { DesignBaseObject } from "gs-ceec-design";
+import { LoadConditionObject } from "../../../../gsDevFx/objects/loadObjects/loadConditionObject";
+import { BusinessState } from "gs-ceec-design";
+import { CaeNumber } from "../../../../utility/utility";
+import { WaveLoadObject } from "../../../../gsDevFx/objects/loadObjects/waveLoadObject";
+import { SeastateLdopt } from "../../../../gsDevFx/objects/caeObjects/optionObjects/seastateLdopt"
+import { CardLDOPT } from "../../../../caeCardEditor/caeCardObjects/seainp/cardLDOPT"
+
+export default class CommandEditWaveLoad extends CommandComponent {
+  typeName = "CommandEditWaveLoad";
+
+  config: EditWaveLoadConfig;
+  preSelector: CAEObjectPreSelector;
+  caeObjectSelector: CAEObjectSelector;
+
+  loadConditionRO: LoadConditionObject = null;
+
+  currentWaveLoadRO: WaveLoadObject = null;
+
+  constructor() {
+    super();
+  }
+
+  begin(): void {
+    this.changeOperators();
+
+    console.log("CommandEditWaveLoad");
+    this.config = new EditWaveLoadConfig();
+    this.config.show();
+
+    this.config.loadConditionChange = () => {
+      let data = this.config.properties.items[0].data;
+      let loadCondition = data.loadCondition.value
+    
+      this.loadConditionRO =
+        this.getAndCreateLoadConditionObjectByName(loadCondition);
+
+      let loadGroupRO = this.getAndCreateLoadGroupByLoadCondition(
+        this.loadConditionRO
+      );
+
+      this.currentWaveLoadRO = null;
+      for(let i = 0; i < loadGroupRO.childObjects.length; i++) {
+        let waveLoad = loadGroupRO.childObjects[i] as WaveLoadObject;
+        if(waveLoad.checkBusinessStateIsActive()) {
+          this.currentWaveLoadRO = waveLoad;
+          data.waveType.value = waveLoad.waveType
+          data.waveHeight.value = waveLoad.waveHeight
+          data.wavePeriod.value = waveLoad.wavePeriod
+          data.waveLength.value = waveLoad.waveLength
+          data.waveAngle.value = waveLoad.waveAngle
+          data.kinematFactor.value = waveLoad.kinematFactor
+          data.orderOfStream.value = waveLoad.orderOfStream
+          data.isLocalAccelOnly.value = waveLoad.isLocalAccelOnly
+          data.inputMode.value = waveLoad.inputMode
+          data.crestPosition.value = waveLoad.crestPosition
+          data.stepSize.value = waveLoad.stepSize
+          data.staticSteps.value = waveLoad.staticSteps
+          data.criticalPosition.value = waveLoad.criticalPosition
+          data.stillWaterDepth.value = waveLoad.stillWaterDepth
+          data.mudlineElevation.value = waveLoad.mudlineElevation
+          data.memberSegmentationMax.value = waveLoad.memberSegmentationMax
+          data.memberSegmentationMin.value = waveLoad.memberSegmentationMin
+          data.printOption.value = waveLoad.printOption
+        }
+      }
+    }
+  }
+
+  restore(): void {
+    this.changeOperators();
+    this.config.show();
+  }
+
+  changeOperators(): void {
+    // 进入命令前清空选中与高亮.
+    this.viewer.selectionManager.clearAllSelectionAndHighlight();
+    this.viewer.updateDisplay();
+
+    // 清空操作器.
+    this.viewer.operatorManager.clear();
+    // 添加操作器
+    this.viewer.operatorManager.add(new CameraMouse());
+
+    this.preSelector = new CAEObjectPreSelector();
+    this.viewer.operatorManager.add(this.preSelector);
+
+    this.caeObjectSelector = new CAEObjectSelector();
+    this.viewer.operatorManager.add(this.caeObjectSelector);
+    //this.caeObjectSelector.isMultiSelect = true;
+
+    this.caeObjectSelector.lButtonUp.add(() => {
+      setTimeout(() => {
+        this.updatePanel();
+      }, 0);
+    });
+  }
+
+  end(): void {
+    this.config.hide();
+    super.end();
+
+    this.viewer.selectionManager.clearAllSelectionAndHighlight();
+    this.viewer.updateDisplay();
+
+    if (this.loadConditionRO) {
+      this.loadConditionRO.inactive(this.viewer);
+    }
+
+    let commandSelect = new CommandSelect();
+    this.process.commandManager.execute(commandSelect);
+  }
+
+  commandOk(): void {
+    let data = this.config.properties.items[0].data;
+
+    let loadCondition = data.loadCondition.value;
+    if (!loadCondition) {
+      // 没有填工况名数组
+      data.tip.value = 2;
+      return;
+    }
+
+    let isLegal1 = LoadConditionObject.checkNamelegal(loadCondition);
+    if (!isLegal1) {
+      data.tip.value = 3;
+      return;
+    }
+
+    let pretreatmentRO = this.viewer.process.findRenderObjectByName(
+      "后处理计算结果"
+    ) as DesignBaseObject;
+    let combinationParent = this.process.findCaeObjectByNameInChildObject(
+      pretreatmentRO,
+      "荷载组合"
+    ) as DesignBaseObject;
+    let combinationRO = this.process.findCaeObjectByNameInChildObject(
+      combinationParent,
+      loadCondition
+    ) as DesignBaseObject;
+    if(combinationRO) {
+      // 同名
+      data.tip.value = 4;
+      return;
+    }
+
+    this.viewer.selectionManager.clearAllSelectionAndHighlight();
+
+    // 添加或修改工况.
+    this.loadConditionRO =
+      this.getAndCreateLoadConditionObjectByName(loadCondition);
+
+    let loadGroupRO = this.getAndCreateLoadGroupByLoadCondition(
+      this.loadConditionRO
+    );
+
+    for (let i = 0; i < loadGroupRO.childObjects.length; i++) {
+      const item = loadGroupRO.childObjects[i] as DesignBaseObject;
+      item.tempDelete(this.viewer);
+      item.businessState = BusinessState.Deleting;
+    }
+
+    this.currentWaveLoadRO = new WaveLoadObject(loadCondition);
+
+    let waveLoad = this.currentWaveLoadRO;
+
+    waveLoad.businessState = BusinessState.Creating;
+
+    this.process.addRenderObject(loadGroupRO, waveLoad);
+
+    waveLoad.loadCondition = data.loadCondition.value;
+
+    waveLoad.waveType = data.waveType.value;
+
+    waveLoad.waveHeight = CaeNumber(data.waveHeight.value);
+
+    waveLoad.wavePeriod = CaeNumber(data.wavePeriod.value);
+
+    waveLoad.waveLength = CaeNumber(data.waveLength.value);
+
+    waveLoad.waveAngle = CaeNumber(data.waveAngle.value);
+
+    waveLoad.kinematFactor = CaeNumber(data.kinematFactor.value);
+
+    waveLoad.orderOfStream = CaeNumber(data.orderOfStream.value);
+
+    waveLoad.inputMode = data.inputMode.value;
+
+    waveLoad.isLocalAccelOnly = data.isLocalAccelOnly.value;
+
+    waveLoad.crestPosition = CaeNumber(data.crestPosition.value);
+
+    waveLoad.stepSize = CaeNumber(data.stepSize.value);
+
+    waveLoad.dynSteps = 0;
+
+    waveLoad.staticSteps = CaeNumber(data.staticSteps.value);
+
+    waveLoad.criticalPosition = data.criticalPosition.value;
+
+    waveLoad.stillWaterDepth = CaeNumber(data.stillWaterDepth.value);
+
+    waveLoad.mudlineElevation = CaeNumber(data.mudlineElevation.value);
+
+    waveLoad.memberSegmentationMax = CaeNumber(
+      data.memberSegmentationMax.value
+    );
+
+    waveLoad.memberSegmentationMin = CaeNumber(
+      data.memberSegmentationMin.value
+    );
+
+    waveLoad.printOption = data.printOption.value;
+
+    let seastateNode = this.process.caeRenderObjectTreeManager.seastateNode
+    let seastateLdoptObj = this.process.findRenderObjectByType(
+      "SeastateLdopt"
+    ) as SeastateLdopt
+    if (!seastateLdoptObj) {
+      seastateLdoptObj = new SeastateLdopt();
+      seastateLdoptObj.businessState = BusinessState.Creating
+      seastateLdoptObj.cardObject = new CardLDOPT("LDOPT       NF+Z   1.025   7.849                GLOBMN    HYD                 K                                          ")
+      seastateLdoptObj.cardData = seastateLdoptObj.cardObject.getLine()
+      this.process.addRenderObject(seastateNode,seastateLdoptObj);
+    }
+
+    this.viewer.updateDisplay();
+    data.tip.value = 1;
+
+    // 添加或修改荷载组.
+
+    //   this.viewer.addState(oldObj, newObj, (stateItem) => {
+    //     let obj = stateItem.newObj.obj;
+    //     obj.offsets = stateItem.newObj.offsets;
+    //     obj.businessState = BusinessState.Editing;
+
+    //     obj.setNeedUpdate();
+    //     this.viewer.updateDisplay();
+    //   });
+  }
+
+  updatePanel() {}
+
+  private getLoadConditionObjectByName(loadConditionName: string) {
+    let pretreatmentRO = this.viewer.process.findRenderObjectByName(
+      "后处理计算结果"
+    ) as DesignBaseObject;
+
+    let conditionParent = this.process.findCaeObjectByNameInChildObject(
+      pretreatmentRO,
+      "荷载工况"
+    ) as DesignBaseObject;
+
+    if (!conditionParent) {
+      conditionParent = new DesignBaseObject();
+      conditionParent.businessState = BusinessState.Creating;
+      conditionParent.name = "荷载工况";
+      this.process.addRenderObject(pretreatmentRO, conditionParent);
+    }
+
+    let loadConditionRO = this.process.findCaeObjectByNameInChildObject(
+      conditionParent,
+      loadConditionName
+    ) as LoadConditionObject;
+
+    return loadConditionRO;
+  }
+
+  private getAndCreateLoadConditionObjectByName(loadConditionName: string) {
+    let loadConditionRO = this.getLoadConditionObjectByName(loadConditionName);
+
+    if (!loadConditionRO) {
+      let pretreatmentRO = this.viewer.process.findRenderObjectByName(
+        "后处理计算结果"
+      ) as DesignBaseObject;
+
+      let conditionParent = this.process.findCaeObjectByNameInChildObject(
+        pretreatmentRO,
+        "荷载工况"
+      ) as DesignBaseObject;
+
+      if (!conditionParent) {
+        conditionParent = new DesignBaseObject();
+        conditionParent.businessState = BusinessState.Creating;
+        conditionParent.name = "荷载工况";
+        this.process.addRenderObject(pretreatmentRO, conditionParent);
+      }
+
+      loadConditionRO = new LoadConditionObject(loadConditionName);
+      loadConditionRO.businessState = BusinessState.Creating;
+      this.process.addRenderObject(conditionParent, loadConditionRO);
+    } else {
+      loadConditionRO.businessState = BusinessState.Editing;
+    }
+
+    return loadConditionRO;
+  }
+
+  private getAndCreateLoadGroupByLoadCondition(
+    loadCondition: LoadConditionObject
+  ) {
+    let loadGroupRO = this.process.findCaeObjectByNameInChildObject(
+      loadCondition,
+      "WAVELoads"
+    ) as DesignBaseObject;
+    if (!loadGroupRO) {
+      loadGroupRO = new DesignBaseObject();
+      loadGroupRO.name = "WAVELoads";
+      loadGroupRO.businessState = BusinessState.Creating;
+      this.process.addRenderObject(loadCondition, loadGroupRO);
+    } else {
+      loadGroupRO.businessState = BusinessState.Editing;
+    }
+
+    return loadGroupRO;
+  }
+
+  getLoadConditons() {
+    let loadConditions = this.viewer.process.findRenderObjectsByType(
+      "LoadConditionObject"
+    );
+    return loadConditions;
+  }
+}