gs-cae-design 1.1.56 → 1.1.57

package/src/viewerWrapper/commands/pretreatment/addJointWeight/commandAddJointWeight.ts

@@ -111,6 +111,15 @@ export default class CommandAddJointWeight extends CommandComponent {
       return;
     }
 
+    if (
+      isNaN(Number(data.weight.value)) ||
+      Number(data.weight.value) <= 0
+    ) {
+      // 质量不能小于0
+      data.tip.value = 11;
+      return;
+    }
+
     let selectedJoints = data.selectedJoints;
     let selectedObjects = new Longan.List<JointObject>();
     if (selectedJoints.listOptions.list.length === 0) {
@@ -122,15 +131,6 @@ export default class CommandAddJointWeight extends CommandComponent {
     let factorData = this.config.properties.items[1].data;
     let axisData = this.config.properties.items[2].data;
 
-    if(!factorData.xFactor.value && !factorData.yFactor.value && !factorData.zFactor.value && !axisData.xAxis.value && !axisData.yAxis.value && !axisData.zAxis.value) {
-      data.tip.value = 7;
-      return;
-    }
-
-    if(!Number(factorData.xFactor.value) && !Number(factorData.yFactor.value) && !Number(factorData.zFactor.value) && !Number(axisData.xAxis.value) && !Number(axisData.yAxis.value) && !Number(axisData.zAxis.value)) {
-      data.tip.value = 7;
-      return;
-    }
 
     let errorNames = "";
     let jointNames = new Array<string>();

package/src/viewerWrapper/commands/pretreatment/addMemberWeight/addMemberWeightConfig.ts

@@ -0,0 +1,111 @@
+import { Config } from "../../../../gsDevFx/propertyComponents/config";
+import { PropertyComponent } from "../../../../gsDevFx/propertyComponents/propertyComponent";
+
+export default class AddMemberWeightConfig extends Config {
+  constructor() {
+    super();
+
+    let property = new PropertyComponent();
+    property.name = "新增杆件质量";
+    property.data = {
+      selectedMembers: {
+        value: null,
+        name: "选中杆件列表",
+        type: "list",
+        listOptions: {
+          list: [],
+        },
+      },
+      weightGroupID: {
+        name: '质量组名',
+        value: null
+      },
+      distance: {
+        name: '始端距离',
+        value: null
+      },
+      weightValue: {
+        name: '质量值',
+        value: null
+      },
+      weightTypes: {
+        value: null,
+        name: "质量类别",
+        type: "select",
+        selectOptions: {
+          selections: [
+            {
+              value: "1",
+              label: "分布式",
+            },
+            {
+              value: "2",
+              label: "集中式",
+            }
+          ],
+          change: () => {
+            this.clearConfig();
+          }
+        }
+      },
+      weightActiveLength: {
+        name: '质量长度',
+        value: null
+      },
+      finalDistanceWeightValue: {
+        name: '最终质量值',
+        value: null
+      },
+      xFactor: {
+        name: 'xFactor',
+        value: null
+      },
+      yFactor: {
+        name: 'yFactor',
+        value: null
+      },
+      zFactor: {
+        name: 'zFactor',
+        value: null
+      },
+      cooSystemOption: {
+        name: '坐标系',
+        value: null,
+        type: "select",
+        selectOptions: {
+          selections: [
+            {
+              value: "GLOB",
+              label: "Global",
+            },
+            {
+              value: "MEMB",
+              label: "Local",
+            }
+          ]
+        }
+      },
+      density: {
+        name: '密度',
+        value: null
+      },
+      weightID: {
+        name: '质量ID',
+        value: null
+      },
+      isInclude: {
+        value: false,
+        name: "考虑附加质量在水中的浮力和波浪荷载",
+        type: "switch",
+      },
+      tip: {
+        name: "提示",
+        value: null,
+      },
+    };
+
+    this.properties.add(property);
+  }
+
+  clearConfig(): void {}
+}

package/src/viewerWrapper/commands/pretreatment/addMemberWeight/commandAddMemberWeight.ts

@@ -0,0 +1,405 @@
+import { CameraMouse } from "../../../../gsDevFx/operators/cameraMouse";
+import { CommandComponent } from "../../commandComponent";
+import { CAEObjectPreSelector } from "../../../../gsDevFx/operators/cAEObjectPreSelector";
+import { CAEObjectSelector } from "../../../../gsDevFx/operators/caeObjectSelector";
+import { CommandSelect } from "../../../../gsDevFx/commands/commandSelect";
+import { SelectorFiliter } from "../../../../gsDevFx/managers/interfaceManagers/selectionInterfaceManager";
+import AddMemberWeightConfig from "./addMemberWeightConfig";
+import { WeightGroupObject } from "../../../../gsDevFx/objects/weightObjects/weightGroupObject";
+import { WeightIdObject } from "../../../../gsDevFx/objects/weightObjects/weightIdObject";
+import { MemberWeightConcentratedObject } from "../../../../gsDevFx/objects/weightObjects/memberWeightConcentratedObject";
+import { MemberWeightDistributedObject } from "../../../../gsDevFx/objects/weightObjects/memberWeightDistributedObject";
+import { MemberObject } from "../../../../gsDevFx/objects/caeObjects/memberObject";
+import { DesignBaseObject } from "gs-ceec-design";
+import { BusinessState } from "gs-ceec-design";
+import { Longan } from "gs-bim-air";
+import { CaeNumber } from "../../../../utility/utility";
+
+export default class CommandAddMemberWeight extends CommandComponent {
+  typeName: string = "CommandAddMemberWeight";
+
+  config: AddMemberWeightConfig;
+  preSelector: CAEObjectPreSelector = null;
+  caeObjectSelector: CAEObjectSelector = null;
+
+  weightGroupRO: WeightGroupObject = null;
+  weightIdRO: WeightIdObject = null;
+  expectFilter = SelectorFiliter.Member;
+
+  constructor() {
+    super();
+  }
+
+  begin(): void {
+    this.changeOperators();
+
+    console.log("CommandAddMemberWeight");
+    this.config = new AddMemberWeightConfig();
+    this.config.show();
+
+    let data = this.config.properties.items[0].data;
+    data.cooSystemOption.selectOptions.selections = [];
+    if (this.viewer.commonInterfaceManager.showEnglishText) {
+      data.cooSystemOption.selectOptions.selections.push({
+        value: "GLOB",
+        label: "Global",
+      });
+      data.cooSystemOption.selectOptions.selections.push({
+        value: "MEMB",
+        label: "Local",
+      });
+    } else {
+      data.cooSystemOption.selectOptions.selections.push({
+        value: "GLOB",
+        label: "全局坐标",
+      });
+      data.cooSystemOption.selectOptions.selections.push({
+        value: "MEMB",
+        label: "局部坐标",
+      });
+    }
+
+    this.config.clearConfig =()=> {
+      let data = this.config.properties.items[0].data;
+      data.distance.value = null
+      data.weightValue.value = null
+      data.weightActiveLength.value = null
+      data.finalDistanceWeightValue.value = null
+      data.xFactor.value = null
+      data.yFactor.value = null
+      data.zFactor.value = null
+      data.density.value = null
+      data.tip.value = null
+    }
+  }
+
+  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.viewer.selectionInterfaceManager.selectorFilter = this.expectFilter;
+
+    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.weightGroupRO) {
+      this.weightGroupRO.inactive(this.viewer);
+    }
+
+    let commandSelect = new CommandSelect();
+    this.process.commandManager.execute(commandSelect);
+  }
+
+  commandOk(): void {
+    let data = this.config.properties.items[0].data;
+
+    let weightGroupID = data.weightGroupID.value;
+    let weightID = data.weightID.value;
+    let weightTypeValue = data.weightTypes.value;
+
+    if (!weightGroupID) {
+      // 没有填质量组数组
+      data.tip.value = 3;
+      return;
+    }
+
+    let isLegal1 = WeightGroupObject.checkNamelegal(weightGroupID);
+    if(!isLegal1) {
+      data.tip.value = 4;
+      return;
+    }
+
+    let isLegal2 = WeightGroupObject.checkWeightIdNamelegal(weightID);
+    if(!isLegal2) {
+      data.tip.value = 5;
+      return;
+    }
+
+    if (!weightID) {
+      // 没有填质量ID数据
+      data.tip.value = 3;
+      return;
+    }
+
+    if (
+      isNaN(Number(data.weightValue.value)) ||
+      Number(data.weightValue.value) <= 0
+    ) {
+      // 质量不能小于0
+      data.tip.value = 11;
+      return;
+    }
+
+    let selectedMembers = data.selectedMembers;
+    let selectedObjects = new Longan.List<MemberObject>();
+    if (selectedMembers.listOptions.list.length === 0) {
+      // 没有选择杆件
+      data.tip.value = 2;
+      return;
+    }
+
+    if(!data.xFactor.value && !data.yFactor.value && !data.zFactor.value) {
+      data.tip.value = 7;
+      return;
+    }
+
+    if(!Number(data.xFactor.value) && !Number(data.yFactor.value) && !Number(data.zFactor.value)) {
+      data.tip.value = 7;
+      return;
+    }
+
+    let errorNames = "";
+    let memberNames = new Array<string>();
+    for (let i = 0; i < data.selectedMembers.listOptions.list.length; i++) {
+      memberNames.push(data.selectedMembers.listOptions.list[i].label);
+    }
+    for (let i = 0; i < memberNames.length; i++) {
+      let member = this.process.findCaeObjectByNameInChildObject(
+        this.process.caeRenderObjectTreeManager.memberNode,
+        memberNames[i]
+      );
+      if (member instanceof MemberObject) {
+        selectedObjects.add(member);
+      } else {
+        errorNames += memberNames[i] + ",";
+      }
+    }
+    errorNames = errorNames.substring(0, errorNames.length - 1);
+
+    if (
+      selectedMembers.listOptions.list.length === 1 &&
+      selectedObjects.count() === 0
+    ) {
+      data.tip.value = 6 + "," + errorNames;
+      return;
+    }
+
+    if (selectedObjects) {
+      this.viewer.selectionManager.clearAllSelectionAndHighlight();
+
+      // 添加杆件质量.
+      this.weightGroupRO =
+        this.getAndCreateWeightGroupObjectByName(weightGroupID);
+      this.weightIdRO = this.getAndCreateWeightIdObjectByName(
+        this.weightGroupRO,
+        weightID
+      );
+
+      let errorNames2 = "";
+      for (let i = 0; i < selectedObjects.count(); i++) {
+        let selectedObj = selectedObjects.items[i];
+        let memberWeight = null;
+        
+        if(!memberWeight && selectedObj instanceof MemberObject) {
+          if (weightTypeValue === '1') {
+            // 杆件质量长度不合理
+            if(Number(data.distance.value) + Number(data.weightActiveLength.value) > selectedObj.getMemberLength()) {
+              errorNames2 += memberNames[i] + ",";
+              continue
+            }
+
+            memberWeight = new MemberWeightDistributedObject(weightGroupID, weightID, selectedObj);
+            memberWeight.name = selectedObj.name;
+            memberWeight.weightType = 'UNIF'
+            memberWeight.businessState = BusinessState.Creating;
+            this.process.addRenderObject(this.weightIdRO, memberWeight);
+          }else if(weightTypeValue === '2') {
+            // 杆件质量长度不合理
+            if(Number(data.distance.value) > selectedObj.getMemberLength()) {
+              errorNames2 += memberNames[i] + ",";
+              continue
+            }
+
+            memberWeight = new MemberWeightConcentratedObject(weightGroupID, weightID, selectedObj);
+            memberWeight.name = selectedObj.name;
+            memberWeight.weightType = 'CONC'
+            memberWeight.businessState = BusinessState.Creating;
+            this.process.addRenderObject(this.weightIdRO, memberWeight);
+          }
+          
+          memberWeight.memberJointA = selectedObj.name.split('-')[0];
+          memberWeight.memberJointB = selectedObj.name.split('-')[1];
+          memberWeight.distance = CaeNumber(data.distance.value)
+          memberWeight.weightValue = CaeNumber(data.weightValue.value)
+          memberWeight.xFactor = CaeNumber(data.xFactor.value)
+          memberWeight.yFactor = CaeNumber(data.yFactor.value)
+          memberWeight.zFactor = CaeNumber(data.zFactor.value)
+          memberWeight.cooSystemOption = data.cooSystemOption.value
+          memberWeight.density = CaeNumber(data.density.value)
+          memberWeight.isInclude = data.isInclude.value
+
+          if(memberWeight instanceof MemberWeightDistributedObject) {
+            if(data.weightActiveLength.value) {
+              memberWeight.weightActiveLength = CaeNumber(data.weightActiveLength.value)
+            }else {
+              memberWeight.weightActiveLength = CaeNumber(selectedObj.getMemberLength() - data.distance.value)
+            }
+            memberWeight.finalDistanceWeightValue = CaeNumber(data.finalDistanceWeightValue.value)
+          }
+        }
+      }
+      errorNames2 = errorNames2.substring(0, errorNames2.length - 1);
+
+      this.viewer.updateDisplay();
+      if (errorNames) {
+        data.tip.value = 1 + "," + errorNames;
+      }else if (errorNames2) {
+        data.tip.value = 8 + "," + errorNames2;
+      } else {
+        data.tip.value = 1;
+      }
+    }
+  }
+
+  updatePanel() {
+    if (
+      this.viewer.selectionInterfaceManager.selectorFilter === this.expectFilter
+    ) {
+      // 更新面板的选中杆件列表.
+      let data = this.config.properties.items[0].data;
+      data.selectedMembers.listOptions.list = [];
+      let objects = this.caeObjectSelector.selectedRenderObjects;
+      for (let i = 0; i < objects.count(); i++) {
+        let object = objects.items[i];
+        if (object instanceof MemberObject) {
+          data.selectedMembers.listOptions.list.push({
+            value: object.id,
+            label: object.name,
+          });
+        }
+      }
+    }
+  }
+
+  private getAndCreateWeightGroupObjectByName(weightGroupID: string) {
+    let weightGroupRO = this.getWeightGroupObjectByName(weightGroupID);
+
+    if (!weightGroupRO) {
+      let pretreatmentRO = this.viewer.process.findRenderObjectByName(
+        "前处理可视化辅助"
+      ) as DesignBaseObject;
+
+      let weightGroupParent = this.process.findCaeObjectByNameInChildObject(
+        pretreatmentRO,
+        "附加质量"
+      ) as DesignBaseObject;
+
+      if (!weightGroupParent) {
+        weightGroupParent = new DesignBaseObject();
+        weightGroupParent.businessState = BusinessState.Creating;
+        weightGroupParent.name = "附加质量";
+        this.process.addRenderObject(pretreatmentRO, weightGroupParent);
+      }
+
+      weightGroupRO = new WeightGroupObject(weightGroupID);
+      weightGroupRO.businessState = BusinessState.Creating;
+      this.process.addRenderObject(weightGroupParent, weightGroupRO);
+    } else {
+      weightGroupRO.businessState = BusinessState.Editing;
+    }
+
+    return weightGroupRO;
+  }
+
+  private getWeightGroupObjectByName(weightGroupID: string) {
+    let pretreatmentRO = this.viewer.process.findRenderObjectByName(
+      "前处理可视化辅助"
+    ) as DesignBaseObject;
+    let weightGroupParent =
+      this.viewer.process.findCaeObjectByNameInChildObject(
+        pretreatmentRO,
+        "附加质量"
+      ) as DesignBaseObject;
+
+    if (!weightGroupParent) {
+      weightGroupParent = new DesignBaseObject();
+      weightGroupParent.businessState = BusinessState.Creating;
+      weightGroupParent.name = "附加质量";
+      this.process.addRenderObject(pretreatmentRO, weightGroupParent);
+    }
+
+    let weightGroupRO = this.process.findCaeObjectByNameInChildObject(
+      weightGroupParent,
+      weightGroupID
+    ) as WeightGroupObject;
+
+    return weightGroupRO;
+  }
+
+  private getWeightIdObjectByName(
+    weightGroup: WeightGroupObject,
+    weightID: string
+  ) {
+    let weightIdRO = this.process.findCaeObjectByNameInChildObject(
+      weightGroup,
+      weightID
+    ) as WeightIdObject;
+
+    return weightIdRO;
+  }
+
+  private getAndCreateWeightIdObjectByName(
+    weightGroup: WeightGroupObject,
+    weightID: string
+  ) {
+    let weightIdRO = this.getWeightIdObjectByName(weightGroup, weightID);
+    if (!weightIdRO) {
+      weightIdRO = new WeightIdObject(weightID);
+      weightIdRO.businessState = BusinessState.Creating;
+      this.process.addRenderObject(weightGroup, weightIdRO);
+    } else {
+      weightIdRO.businessState = BusinessState.Editing;
+    }
+
+    return weightIdRO;
+  }
+
+  getWeightGroups() {
+    let weightGroups =
+      this.viewer.process.findRenderObjectsByType("WeightGroupObject");
+    return weightGroups;
+  }
+
+  getWeightIds(weightGroupID: string) {
+    let weightGroups = this.getWeightGroups();
+    let weightIds = new Array<WeightIdObject>();
+    for (let i = 0; i < weightGroups.length; i++) {
+      if (weightGroups[i].name === weightGroupID) {
+        for (let j = 0; j < weightGroups[i].childObjects.length; j++) {
+          let weightId = weightGroups[i].childObjects[j] as WeightIdObject;
+          weightIds.push(weightId);
+        }
+      }
+    }
+
+    return weightIds;
+  }
+}

package/src/viewerWrapper/commands/pretreatment/centerOfRoll/centerOfRollConfig.ts

@@ -0,0 +1,54 @@
+import { Process } from "../../../../gsDevFx/process";
+import { Config } from "../../../../gsDevFx/propertyComponents/config";
+import { PropertyComponent } from "../../../../gsDevFx/propertyComponents/propertyComponent";
+import { CenterRenderObject } from "../../../../gsDevFx/objects/caeObjects/pretreatment/centerRenderObject";
+
+import {
+  BusinessState,
+
+} from "gs-ceec-design";
+export default class CenterOfRollConfig extends Config {
+  centerRollList: CenterRenderObject[] = null
+  constructor() {
+    super();
+    let property = new PropertyComponent();
+    property.name = "回转中心列表";
+
+    this.centerRollList = new Array<CenterRenderObject>();
+    property.data = {
+
+      tip: {
+        name: "提示",
+        value: null,
+      },
+    }
+
+    this.properties.add(property);
+    this.refreshCenterIdList()
+  }
+
+  refreshCenterIdList() {
+    this.centerRollList = []
+    // 获取当前模型的回转中心节点
+    let grupGroup = Process.activeProcess.findRenderObjectByName('回转中心');
+    console.log('获取当前模型的回转中心节点',grupGroup);
+
+    if (grupGroup) {
+      for (let i = 0; i < grupGroup.childObjects.length; i++) {
+        let child = grupGroup.childObjects[i];
+        if (
+          child instanceof CenterRenderObject &&
+          child.checkBusinessStateIsActive() &&
+          child.lastBusinessState !== BusinessState.Deleting &&
+          child.lastBusinessState !== BusinessState.Dead
+        ) {
+          this.centerRollList.push(
+            child
+          );
+        }
+      }
+    }
+    console.log('赋值初始centerRollList',this.centerRollList);
+
+  }
+}