gs-cae-design 1.1.58 → 1.1.60

package/src/viewerWrapper/commands/aftertreatment/editWindLoad/commandEditWindLoad.ts

@@ -0,0 +1,296 @@
+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 EditWindLoadConfig from "./editWindLoadConfig";
+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 { WindLoadObject } from "../../../../gsDevFx/objects/loadObjects/windLoadObject";
+import { SeastateLdopt } from "../../../../gsDevFx/objects/caeObjects/optionObjects/seastateLdopt"
+import { CardLDOPT } from "../../../../caeCardEditor/caeCardObjects/seainp/cardLDOPT"
+
+export default class CommandEditWindLoad extends CommandComponent {
+  typeName = "CommandEditWindLoad";
+
+  config: EditWindLoadConfig;
+  preSelector: CAEObjectPreSelector;
+  caeObjectSelector: CAEObjectSelector;
+
+  loadConditionRO: LoadConditionObject = null;
+  currentWindLoadRO: WindLoadObject = null;
+
+  constructor() {
+    super();
+  }
+
+  begin(): void {
+    this.changeOperators();
+
+    console.log("CommandEditWindLoad");
+    this.config = new EditWindLoadConfig();
+    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.currentWindLoadRO = null;
+      for (let i = 0; i < loadGroupRO.childObjects.length; i++) {
+        let windLoad = loadGroupRO.childObjects[i] as WindLoadObject;
+        if (windLoad.checkBusinessStateIsActive()) {
+          this.currentWindLoadRO = windLoad;
+          data.windVelocity.value = windLoad.windVelocity;
+          data.referenceHeightOrWindPressure.value = windLoad.referenceHeightOrWindPressure;
+          data.windVariationDefinition.value = windLoad.windVariationDefinition;
+          data.windDirection.value = windLoad.windDirection;
+          data.memberLoadingOption.value = windLoad.memberLoadingOption;
+          data.isWaterDepthRatherThanOriginElevation.value = windLoad.isWaterDepthRatherThanOriginElevation;
+          data.stillWaterDepthOverride.value = windLoad.stillWaterDepthOverride;
+          data.isPrintDetailedLoadReport.value = windLoad.isPrintDetailedLoadReport;
+        }
+      }
+    };
+  }
+
+  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;
+    }
+
+    let windLoad = new WindLoadObject(this.loadConditionRO.name);
+
+    windLoad.businessState = BusinessState.Creating;
+
+    this.process.addRenderObject(loadGroupRO, windLoad);
+
+    windLoad.loadCondition = data.loadCondition.value;
+
+    windLoad.windVelocity = CaeNumber(data.windVelocity.value);
+
+    windLoad.referenceHeightOrWindPressure = CaeNumber(
+      data.referenceHeightOrWindPressure.value
+    );
+
+    windLoad.windVariationDefinition = data.windVariationDefinition.value;
+
+    windLoad.windDirection = CaeNumber(data.windDirection.value);
+
+    windLoad.memberLoadingOption = data.memberLoadingOption.value;
+
+    windLoad.isWaterDepthRatherThanOriginElevation =
+      data.isWaterDepthRatherThanOriginElevation.value;
+
+    windLoad.stillWaterDepthOverride = CaeNumber(
+      data.stillWaterDepthOverride.value
+    );
+
+    windLoad.isPrintDetailedLoadReport = data.isPrintDetailedLoadReport.value;
+
+    this.viewer.updateDisplay();
+    data.tip.value = 1;
+    
+    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.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,
+      "WINDLoads"
+    ) as DesignBaseObject;
+    if (!loadGroupRO) {
+      loadGroupRO = new DesignBaseObject();
+      loadGroupRO.name = "WINDLoads";
+      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;
+  }
+}

package/src/viewerWrapper/commands/aftertreatment/editWindLoad/editWindLoadConfig.ts

@@ -0,0 +1,176 @@
+import { DesignBaseObject } from "gs-ceec-design";
+import { Process } from "../../../../gsDevFx/process";
+import { Config } from "../../../../gsDevFx/propertyComponents/config";
+import { PropertyComponent } from "../../../../gsDevFx/propertyComponents/propertyComponent";
+import {
+  WindVariationDefinition,
+  MemberLoadingOption,
+} from "../../../../gsDevFx/objects/loadObjects/windLoadObject";
+
+export default class EditWindLoadConfig extends Config {
+  constructor() {
+    super();
+
+    let property = new PropertyComponent();
+    property.name = "编辑风荷载";
+    property.data = {
+      loadCondition: {
+        name: "荷载工况",
+        type: "select",
+        selectOptions: {
+          selections: [],
+          change: () => {
+            this.loadConditionChange();
+          }
+        },
+        value: null,
+      },
+      windVelocity: {
+        name: "风速",
+        value: null,
+      },
+      referenceHeightOrWindPressure: {
+        name: "参考高度或风压",
+        value: null,
+      },
+      windVariationDefinition: {
+        name: "风随高程变化方式",
+        type: "select",
+        value: null,
+        selectOptions: {
+          selections: [
+            {
+              label: "恒定风速",
+              value: WindVariationDefinition.CONS,
+            },
+            {
+              label: "ABS",
+              value: WindVariationDefinition.ABS,
+            },
+            {
+              label: "AP07",
+              value: WindVariationDefinition.AP07,
+            },
+            {
+              label: "AP08",
+              value: WindVariationDefinition.AP08,
+            },
+            {
+              label: "AP09",
+              value: WindVariationDefinition.AP09,
+            },
+            {
+              label: "AP10",
+              value: WindVariationDefinition.AP10,
+            },
+            {
+              label: "AP11",
+              value: WindVariationDefinition.AP11,
+            },
+            {
+              label: "AP12",
+              value: WindVariationDefinition.AP12,
+            },
+            {
+              label: "AP13",
+              value: WindVariationDefinition.AP13,
+            },
+            {
+              label: "AS01",
+              value: WindVariationDefinition.AS01,
+            },
+            {
+              label: "AS02",
+              value: WindVariationDefinition.AS02,
+            },
+            {
+              label: "AS03",
+              value: WindVariationDefinition.AS03,
+            },
+            {
+              label: "AS04",
+              value: WindVariationDefinition.AS04,
+            },
+            {
+              label: "ABS2",
+              value: WindVariationDefinition.ABS2,
+            },
+            {
+              label: "21AP",
+              value: WindVariationDefinition.AP21,
+            },
+            {
+              label: "AP4F",
+              value: WindVariationDefinition.AP4F,
+            },
+          ],
+        },
+      },
+      windDirection: {
+        name: "风向",
+        value: null,
+      },
+      memberLoadingOption: {
+        name: "构件荷载覆盖方式",
+        value: null,
+        type: "select",
+        selectOptions: {
+          selections: [
+            {
+              label: "无覆盖",
+              value: MemberLoadingOption.None,
+            },
+            {
+              label: "采用波浪/海流阻力系数",
+              value: MemberLoadingOption.W,
+            },
+            {
+              label: "忽略杆件荷载",
+              value: MemberLoadingOption.I,
+            },
+          ],
+        },
+      },
+      isWaterDepthRatherThanOriginElevation: {
+        name: "使用原点高程替代水深",
+        type: "switch",
+        value: false,
+      },
+      stillWaterDepthOverride: {
+        name: "输入静水深覆盖值或原点高程覆盖值",
+        value: null,
+      },
+      isPrintDetailedLoadReport: {
+        name: "为每个风区生成详细荷载报告",
+        type: "switch",
+        value: false,
+      },
+      tip: {
+        name: "提示",
+        value: null,
+      },
+    };
+    this.properties.add(property);
+
+    this.refreshLoadConditionList()
+  }
+
+  refreshLoadConditionList() {
+    let property = this.properties.items[0];
+    let conditionNode =
+      Process.activeProcess.findRenderObjectByName("荷载工况");
+    if (conditionNode) {
+      property.data.loadCondition.selectOptions.selections = [];
+      conditionNode.childObjects.map((item) => {
+        if ((item as DesignBaseObject).checkBusinessStateIsActive()) {
+          property.data.loadCondition.selectOptions.selections.push({
+            label: item.name,
+            value: item.name,
+          });
+        }
+      });
+    }
+  }
+
+  loadConditionChange() {}
+}

package/src/viewerWrapper/commands/aftertreatment/postResultCloud/commandPostResultCloud.ts

@@ -113,8 +113,11 @@ export default class CommandPostResultCloud extends CommandComponent {
       this.cutlineObject.title = "最大合成应力比";
       this.cutlineObject.ucRanges = [0, 0.4, 0.6, 0.8, 1.0];
       this.cutlineObject.ucRangesColors = [
-        0.82, 0.82, 0.82, 1, 0.5, 0.5, 0.5, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 0, 0,
-        1,
+        0.82, 0.82, 0.82, 1, 
+        0.5, 0.5, 0.5, 1, 
+        0, 1, 0, 1, 
+        1, 1, 0, 1, 
+        1, 0, 0, 1,
       ];
       // this.cutlineObject.stressLevelsActual = [
       //   10, 20, 40, 50, 75, 100, 133, 148,
@@ -482,6 +485,10 @@ export default class CommandPostResultCloud extends CommandComponent {
       for (let i = 0; i < members.length; i++) {
         let member = members[i] as MemberObject;
 
+        if(!member.checkBusinessStateIsActive()) {
+          continue;
+        }
+
         // 如果是需要从ElementUC表获取最危险工况的后处理效果，则需要更新获取的工况数据.
         switch (data.resultParameter.value) {
           case ResultParameterType.TotalShearUC:

package/src/viewerWrapper/commands/commandSplitMemberBase.ts

@@ -1,10 +1,7 @@
 import { JointObject } from "../../gsDevFx/objects/caeObjects/jointObject";
 import { CommandComponent } from "./commandComponent";
 import { MemberObject } from "../../gsDevFx/objects/caeObjects/memberObject";
-import {
-  BusinessState,
-  DesignBaseObject,
-} from "gs-ceec-design";
+import { BusinessState, DesignBaseObject } from "gs-ceec-design";
 import { Longan } from "gs-bim-air";
 import {
   GrupObject,
@@ -229,9 +226,6 @@ export default class CommandSplitMemberBase extends CommandComponent {
     grupNames: string[]
   ) {
     // 当前被拆分的杆件截面组.
-    let currentGrup = this.process.cloneManager.cloneObject(
-      member.grup
-    ) as GrupObject;
     for (let i = 0; i < splitJoints.length - 1; i++) {
       let cloneMember = this.process.cloneManager.cloneObject(
         member
@@ -252,7 +246,11 @@ export default class CommandSplitMemberBase extends CommandComponent {
       );
       createItems.push(cloneMember);
 
-      if (currentGrup) {
+      if (member.grup) {
+        let currentGrup = this.process.cloneManager.cloneObject(
+          member.grup
+        ) as GrupObject;
+
         if (!grupNames) {
           cloneMember.grup = member.grup;
         } else {