gs-cae-design 1.1.60 → 1.1.62

package/src/viewerWrapper/commands/aftertreatment/addWaveLoad/commandAddWaveLoad.ts

@@ -8,7 +8,7 @@ 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 { WaveLoadObject, WaveType, InputMode, CriticalPosition, PrintOption } from "../../../../gsDevFx/objects/loadObjects/waveLoadObject";
 import { SeastateLdopt } from "../../../../gsDevFx/objects/caeObjects/optionObjects/seastateLdopt"
 import { CardLDOPT } from "../../../../caeCardEditor/caeCardObjects/seainp/cardLDOPT"
 
@@ -34,8 +34,63 @@ export default class CommandAddWaveLoad extends CommandComponent {
     this.config = new AddWaveLoadConfig();
     this.config.show();
 
-    this.waveLoadRO = new WaveLoadObject();
-    this.setWaveLoadRODataToConfigData();
+    this.setConfig()
+
+    let data = this.config.properties.items[0].data;
+
+    data.waveType.selectOptions.selections = []
+    data.inputMode.selectOptions.selections = []
+    data.criticalPosition.selectOptions.selections = []
+    data.printOption.selectOptions.selections = []
+    if(this.viewer.commonInterfaceManager.showEnglishText) {
+      data.waveType.selectOptions.selections.push({label: "Airy", value: WaveType.AIRY })
+      // data.waveType.selectOptions.selections.push({label: "Airy Wave", value: WaveType.AIRC })
+      data.waveType.selectOptions.selections.push({label: "Stokes", value: WaveType.STOK })
+      // data.waveType.selectOptions.selections.push({label: "Stream", value: WaveType.STRE })
+      data.waveType.selectOptions.selections.push({label: "StreamN", value: WaveType.STRN })
+      // data.waveType.selectOptions.selections.push({label: "Cnoidal", value: WaveType.CNOI })
+      // data.waveType.selectOptions.selections.push({label: "Solitary", value: WaveType.SOLI })
+      // data.waveType.selectOptions.selections.push({label: "User", value: WaveType.LINE })
+      data.waveType.selectOptions.selections.push({label: "Repeat", value: WaveType.REPT })
+      data.inputMode.selectOptions.selections.push({ label: "Length", value: InputMode.Length})
+      data.inputMode.selectOptions.selections.push({ label: "Degrees", value: InputMode.Degrees})
+      data.inputMode.selectOptions.selections.push({ label: "Time", value: InputMode.Time})
+      data.criticalPosition.selectOptions.selections.push({ label: "Max overturning moment", value: CriticalPosition.MM })
+      data.criticalPosition.selectOptions.selections.push({ label: "Min overturning moment", value: CriticalPosition.NM })
+      data.criticalPosition.selectOptions.selections.push({ label: "Max base shear", value: CriticalPosition.MS })
+      data.criticalPosition.selectOptions.selections.push({ label: "Min base shear", value: CriticalPosition.NS })
+      data.criticalPosition.selectOptions.selections.push({ label: "Max upward force", value: CriticalPosition.MU })
+      data.criticalPosition.selectOptions.selections.push({ label: "Max downward force", value: CriticalPosition.MD })
+      data.criticalPosition.selectOptions.selections.push({ label: "All positions", value: CriticalPosition.AL })
+      data.printOption.selectOptions.selections.push({ label: "Minimum print", value: PrintOption.PrintOption0 })
+      data.printOption.selectOptions.selections.push({ label: "Overturning moment and shear", value: PrintOption.PrintOption1 })
+      data.printOption.selectOptions.selections.push({ label: "Sum of forces and moments about mudline", value: PrintOption.PrintOption2 })
+      data.printOption.selectOptions.selections.push({ label: "Velocity and acceleration of grid points", value: PrintOption.PrintOption3 })
+    }else {
+      data.waveType.selectOptions.selections.push({label: "线性波", value: WaveType.AIRY })
+      // data.waveType.selectOptions.selections.push({label: "线性波浪", value: WaveType.AIRC })
+      data.waveType.selectOptions.selections.push({label: "斯托克斯波", value: WaveType.STOK })
+      // data.waveType.selectOptions.selections.push({label: "精确流函数波", value: WaveType.STRE })
+      data.waveType.selectOptions.selections.push({label: "N阶流函数波", value: WaveType.STRN })
+      // data.waveType.selectOptions.selections.push({label: "椭圆余弦波", value: WaveType.CNOI })
+      // data.waveType.selectOptions.selections.push({label: "孤立波", value: WaveType.SOLI })
+      // data.waveType.selectOptions.selections.push({label: "用户自定义波", value: WaveType.LINE })
+      data.waveType.selectOptions.selections.push({label: "复用波浪设置", value: WaveType.REPT })
+      data.inputMode.selectOptions.selections.push({ label: "长度", value: InputMode.Length})
+      data.inputMode.selectOptions.selections.push({ label: "角度", value: InputMode.Degrees})
+      data.inputMode.selectOptions.selections.push({ label: "时间", value: InputMode.Time})
+      data.criticalPosition.selectOptions.selections.push({ label: "最大倾覆力矩", value: CriticalPosition.MM })
+      data.criticalPosition.selectOptions.selections.push({ label: "最小倾覆力矩", value: CriticalPosition.NM })
+      data.criticalPosition.selectOptions.selections.push({ label: "最大基底剪力", value: CriticalPosition.MS })
+      data.criticalPosition.selectOptions.selections.push({ label: "最小基底剪力", value: CriticalPosition.NS })
+      data.criticalPosition.selectOptions.selections.push({ label: "最大上拔力", value: CriticalPosition.MU })
+      data.criticalPosition.selectOptions.selections.push({ label: "最大下压力", value: CriticalPosition.MD })
+      data.criticalPosition.selectOptions.selections.push({ label: "所有位置 / 全工况", value: CriticalPosition.AL })
+      data.printOption.selectOptions.selections.push({ label: "最简输出", value: PrintOption.PrintOption0 })
+      data.printOption.selectOptions.selections.push({ label: "倾覆力矩与剪力", value: PrintOption.PrintOption1 })
+      data.printOption.selectOptions.selections.push({ label: "泥线处力与力矩合力", value: PrintOption.PrintOption2 })
+      data.printOption.selectOptions.selections.push({ label: "网格点速度与加速度", value: PrintOption.PrintOption3 })
+    }
   }
 
   restore(): void {
@@ -186,17 +241,17 @@ export default class CommandAddWaveLoad extends CommandComponent {
     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);
-    }
+    // 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);
+    // }
 
     // 添加或修改荷载组.
 
@@ -293,17 +348,26 @@ export default class CommandAddWaveLoad extends CommandComponent {
     return loadConditions;
   }
 
-  private setWaveLoadRODataToConfigData() {
-    if(this.waveLoadRO) {
-      let data = this.config.properties.items[0].data;
-      let waveLoadRO = this.waveLoadRO;
-
-      data.waveType.value = waveLoadRO.waveType
-      data.inputMode.value = waveLoadRO.inputMode
-      data.criticalPosition.value = waveLoadRO.criticalPosition
-      data.memberSegmentationMax.value = waveLoadRO.memberSegmentationMax
-      data.memberSegmentationMin.value = waveLoadRO.memberSegmentationMin
-      data.printOption.value = waveLoadRO.printOption
-    }
+  private setConfig() {
+    let data = this.config.properties.items[0].data;
+      
+    data.waveType.value = WaveType.STRE
+    data.waveHeight.value = ""
+    data.wavePeriod.value = ""
+    data.waveLength.value = ""
+    data.waveAngle.value = ""
+    data.kinematFactor.value = 1
+    data.orderOfStream.value = ""
+    data.isLocalAccelOnly.value = ""
+    data.inputMode.value = InputMode.Length
+    data.crestPosition.value = ""
+    data.stepSize.value = ""
+    data.staticSteps.value = ""
+    data.criticalPosition.value = CriticalPosition.MM
+    data.stillWaterDepth.value = ""
+    data.mudlineElevation.value = ""
+    data.memberSegmentationMax.value = 10
+    data.memberSegmentationMin.value = 1
+    data.printOption.value = PrintOption.PrintOption0
   }
 }

package/src/viewerWrapper/commands/aftertreatment/addWindLoad/addWindLoadConfig.ts

@@ -119,7 +119,7 @@ export default class AddWindLoadConfig extends Config {
           ],
         },
       },
-      isWaterDepthRatherThanOriginElevation: {
+      isOriginElevationRatherThanWaterDepth: {
         name: "使用原点高程替代水深",
         type: "switch",
         value: false,

package/src/viewerWrapper/commands/aftertreatment/addWindLoad/commandAddWindLoad.ts

@@ -8,7 +8,7 @@ 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 { WindLoadObject, MemberLoadingOption } from "../../../../gsDevFx/objects/loadObjects/windLoadObject";
 import { SeastateLdopt } from "../../../../gsDevFx/objects/caeObjects/optionObjects/seastateLdopt"
 import { CardLDOPT } from "../../../../caeCardEditor/caeCardObjects/seainp/cardLDOPT"
 
@@ -34,8 +34,20 @@ export default class CommandAddWindLoad extends CommandComponent {
     this.config = new AddWindLoadConfig();
     this.config.show();
 
-    this.windLoadRO = new WindLoadObject();
-    this.setConfigData();
+    this.setConfig();
+
+    let data = this.config.properties.items[0].data;
+
+    data.memberLoadingOption.selectOptions.selections = []
+    if(this.viewer.commonInterfaceManager.showEnglishText) {
+      data.memberLoadingOption.selectOptions.selections.push({ label: "None", value: MemberLoadingOption.None })
+      data.memberLoadingOption.selectOptions.selections.push({ label: "Use wave/current Cd", value: MemberLoadingOption.W })
+      data.memberLoadingOption.selectOptions.selections.push({ label: "Ignore load on member", value: MemberLoadingOption.I })
+    }else {
+      data.memberLoadingOption.selectOptions.selections.push({ label: "无覆盖", value: MemberLoadingOption.None })
+      data.memberLoadingOption.selectOptions.selections.push({ label: "采用波浪/海流阻力系数", value: MemberLoadingOption.W })
+      data.memberLoadingOption.selectOptions.selections.push({ label: "忽略杆件荷载", value: MemberLoadingOption.I })
+    }
   }
 
   restore(): void {
@@ -151,7 +163,7 @@ export default class CommandAddWindLoad extends CommandComponent {
 
     windLoad.memberLoadingOption = data.memberLoadingOption.value
 
-    windLoad.isWaterDepthRatherThanOriginElevation = data.isWaterDepthRatherThanOriginElevation.value
+    windLoad.isOriginElevationRatherThanWaterDepth = data.isOriginElevationRatherThanWaterDepth.value
 
     windLoad.stillWaterDepthOverride = CaeNumber(data.stillWaterDepthOverride.value)
 
@@ -160,17 +172,17 @@ export default class CommandAddWindLoad extends CommandComponent {
     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);
-    }
+    // 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);
+    // }
 
     // 添加或修改荷载组.
 
@@ -267,13 +279,16 @@ export default class CommandAddWindLoad extends CommandComponent {
     return loadConditions;
   }
 
-  private setConfigData() {
-    if(this.windLoadRO) {
-      let data = this.config.properties.items[0].data;
-      let windLoadRO = this.windLoadRO;
+  private setConfig() {
+    let data = this.config.properties.items[0].data;
 
-      data.isWaterDepthRatherThanOriginElevation.value = windLoadRO.isWaterDepthRatherThanOriginElevation
-      data.windVelocity.value = windLoadRO.windVelocity
-    }
+    data.windVelocity.value = 1
+    data.referenceHeightOrWindPressure.value = ""
+    data.windVariationDefinition.value = ""
+    data.windDirection.value = ""
+    data.memberLoadingOption.value = ""
+    data.isOriginElevationRatherThanWaterDepth.value = false
+    data.stillWaterDepthOverride.value = ""
+    data.isPrintDetailedLoadReport.value = false
   }
 }

package/src/viewerWrapper/commands/aftertreatment/editCurrentLoad/commandEditCurrentLoad.ts

@@ -8,7 +8,7 @@ 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 { CurrLoadObject } from "../../../../gsDevFx/objects/loadObjects/currLoadObject";
+import { CurrLoadObject, FactorOption, CrsetStretchingOption } from "../../../../gsDevFx/objects/loadObjects/currLoadObject";
 import { SeastateLdopt } from "../../../../gsDevFx/objects/caeObjects/optionObjects/seastateLdopt"
 import { CardLDOPT } from "../../../../caeCardEditor/caeCardObjects/seainp/cardLDOPT"
 
@@ -20,6 +20,7 @@ export default class CommandEditCurrentLoad extends CommandComponent {
   caeObjectSelector: CAEObjectSelector;
 
   loadConditionRO: LoadConditionObject;
+  loadGroupRO: DesignBaseObject = null;
   currentCurrLoadRO: CurrLoadObject;
 
   constructor() {
@@ -33,6 +34,28 @@ export default class CommandEditCurrentLoad extends CommandComponent {
     this.config = new EditCurrentLoadConfig();
     this.config.show();
 
+    let data = this.config.properties.items[0].data;
+
+    data.factorOption.selectOptions.selections = []
+    data.crsetStretchingOption.selectOptions.selections = []
+    if(this.viewer.commonInterfaceManager.showEnglishText) {
+      data.factorOption.selectOptions.selections.push({ label: "None", value: FactorOption.None })
+      data.factorOption.selectOptions.selections.push({ label: "Auto", value: FactorOption.BC })
+      data.factorOption.selectOptions.selections.push({ label: "User defined", value: FactorOption.US })
+      data.crsetStretchingOption.selectOptions.selections.push({label: "Constant", value: CrsetStretchingOption.CN })
+      data.crsetStretchingOption.selectOptions.selections.push({label: "Non-Linear", value: CrsetStretchingOption.NL })
+      data.crsetStretchingOption.selectOptions.selections.push({label: "Linear", value: CrsetStretchingOption.LN })
+      // data.crsetStretchingOption.selectOptions.selections.push({label: "None", value: CrsetStretchingOption.None })
+    }else {
+      data.factorOption.selectOptions.selections.push({ label: "无", value: FactorOption.None })
+      data.factorOption.selectOptions.selections.push({ label: "自动", value: FactorOption.BC })
+      data.factorOption.selectOptions.selections.push({ label: "自定义", value: FactorOption.US })
+      data.crsetStretchingOption.selectOptions.selections.push({label: "常数", value: CrsetStretchingOption.CN })
+      data.crsetStretchingOption.selectOptions.selections.push({label: "非线性", value: CrsetStretchingOption.NL })
+      data.crsetStretchingOption.selectOptions.selections.push({label: "线性", value: CrsetStretchingOption.LN })
+      // data.crsetStretchingOption.selectOptions.selections.push({label: "无", value: CrsetStretchingOption.None })
+    }
+
     this.config.loadConditionChange = () => {
       let data = this.config.properties.items[0].data;
       let loadCondition = data.loadCondition.value
@@ -40,14 +63,14 @@ export default class CommandEditCurrentLoad extends CommandComponent {
       this.loadConditionRO =
         this.getAndCreateLoadConditionObjectByName(loadCondition);
 
-      let loadGroupRO = this.getAndCreateLoadGroupByLoadCondition(
+      this.loadGroupRO = this.getAndCreateLoadGroupByLoadCondition(
         this.loadConditionRO
       );
 
       this.config.currList = [];
       this.currentCurrLoadRO = null;
-      for(let i = 0; i < loadGroupRO.childObjects.length; i++) {
-        let currLoad = loadGroupRO.childObjects[i] as CurrLoadObject;
+      for(let i = 0; i < this.loadGroupRO.childObjects.length; i++) {
+        let currLoad = this.loadGroupRO.childObjects[i] as CurrLoadObject;
         if(currLoad.checkBusinessStateIsActive()) {
           this.config.currList.push(currLoad)
           if(!this.currentCurrLoadRO) {
@@ -149,7 +172,7 @@ export default class CommandEditCurrentLoad extends CommandComponent {
     this.loadConditionRO =
       this.getAndCreateLoadConditionObjectByName(loadCondition);
 
-    let loadGroupRO = this.getAndCreateLoadGroupByLoadCondition(
+    this.loadGroupRO = this.getAndCreateLoadGroupByLoadCondition(
       this.loadConditionRO
     );
 
@@ -159,8 +182,8 @@ export default class CommandEditCurrentLoad extends CommandComponent {
       return;
     }
 
-    for (let i = 0; i < loadGroupRO.childObjects.length; i++) {
-      const item = loadGroupRO.childObjects[i] as DesignBaseObject;
+    for (let i = 0; i < this.loadGroupRO.childObjects.length; i++) {
+      const item = this.loadGroupRO.childObjects[i] as DesignBaseObject;
       item.tempDelete(this.viewer);
       item.businessState = BusinessState.Deleting;
     }
@@ -169,7 +192,7 @@ export default class CommandEditCurrentLoad extends CommandComponent {
       let currLoad = currList[i] as CurrLoadObject;
       if(currLoad instanceof CurrLoadObject) {
         currLoad.businessState = BusinessState.Creating;
-        this.process.addRenderObject(loadGroupRO, currLoad);
+        this.process.addRenderObject(this.loadGroupRO, currLoad);
 
         if(i === 0) {
           currLoad.mudlineElevationOverride = CaeNumber(data.mudlineElevationOverride.value)
@@ -283,4 +306,66 @@ export default class CommandEditCurrentLoad extends CommandComponent {
     );
     return loadConditions;
   }
+
+  deleteLoadGroup(loadConditionName: string) {
+    let data = this.config.properties.items[0].data;
+
+    // 添加或修改工况.
+    let loadConditionRO = this.getLoadConditionObjectByName(loadConditionName);
+    if (!loadConditionRO) {
+      // 没有查找到对应的工况或荷载组
+      data.tip.value = 2;
+      return;
+    }
+
+    let loadGroupRO = this.process.findCaeObjectByNameInChildObject(
+      loadConditionRO,
+      "CURRLoads"
+    ) as DesignBaseObject;
+    if (!loadGroupRO) {
+      // 没有查找到对应的工况或荷载组
+      data.tip.value = 2;
+      return;
+    }
+
+    let deletingList = new Array<CurrLoadObject>();
+    let restObject = 0;
+    for (let i = 0; i < loadGroupRO.childObjects.length; i++) {
+      let child = loadGroupRO.childObjects[i] as DesignBaseObject;
+      if (child instanceof CurrLoadObject) {
+        deletingList.push(child);
+      } else if (child.checkBusinessStateIsActive()) {
+        restObject++;
+      }
+    }
+
+    for (let i = 0; i < deletingList.length; i++) {
+      deletingList[i].tempDelete(this.viewer);
+      // this.process.removeRenderObject(deletingList[i]);
+    }
+
+    if (restObject === 0) {
+      loadGroupRO.tempDelete(this.viewer);
+    }
+
+    this.viewer.updateDisplay();
+    data.tip.value = 1;
+    // this.loadGroupRO.tempDelete(this.viewer);
+  }
+
+  private setConfig() {
+    let data = this.config.properties.items[0].data
+
+    data.mudlineElevationOverride.value = ""
+    data.isElevationPercentOption.value = ""
+    data.isApparentWavePeriodOption.value = ""
+    data.factorOption.value = ""
+    data.factor.value = ""
+    data.elevation.value = ""
+    data.crsetStretchingOption.value = CrsetStretchingOption.CN
+    data.minimumInlineCurrentVelocity.value = ""
+        
+    let config = this.config;
+    config.currList = new Array<CurrLoadObject>();
+  }
 }