gs-cae-design 1.1.61 → 1.1.63

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gs-cae-design",
-  "version": "1.1.61",
+  "version": "1.1.63",
   "description": "广州图石科技有限公司发布的基于gs-longan的CAE图形控件",
   "main": "lib/CAEDesign.umd.min.js",
   "types": "./types/caeDesign/src/index.d.ts",

package/src/caeCardEditor/caeCardObjects/sacinp/cardAREA.ts

@@ -17,7 +17,8 @@ export class CardAREA extends CardObject {
     type: "Character",
     unit: "",
   };
-  totalArea = {
+
+  xProjArea = {
     value: "",
     range: [6, 12],
     span: 0,
@@ -25,7 +26,7 @@ export class CardAREA extends CardObject {
     type: "Floating Point",
     unit: "m2",
   };
-  horizontalAngle = {
+  yProjArea = {
     value: "",
     range: [12, 18],
     span: 0,
@@ -33,7 +34,7 @@ export class CardAREA extends CardObject {
     type: "Floating Point",
     unit: "m2",
   };
-  verticalAngle = {
+  zProjArea = {
     value: "",
     range: [18, 24],
     span: 0,
@@ -129,7 +130,14 @@ export class CardAREA extends CardObject {
     type: "Alphanumeric",
     unit: "",
   };
-  areaOption = { value: "", range: [78, 79], span: 0 };
+  areaDefinition = {
+    value: "",
+    range: [78, 79],
+    span: 0,
+    label: "Area Definition",
+    type: "Alphanumeric",
+    unit: "",
+  };
 
   constructor(line?: string) {
     super();

package/src/caeCardEditor/caeCardObjects/sacinp/cardCENTER.ts

@@ -48,9 +48,8 @@ export class CardCENTER extends CardObject {
     this.init(line);
   }
   toRenderObject() {
-    console.log('回转中心toRenderObject~~~~~~');
     //  导入需要用到的
-    let centerRenderObject = new CenterRenderObject();
+    let centerRenderObject = new CenterRenderObject(this.centerID.value.trimEnd());
     centerRenderObject.centerID = this.centerID.value.trimEnd();
     centerRenderObject.coordinatesX = CaeNumber(this.coordinatesX.value);
     centerRenderObject.coordinatesY = CaeNumber(this.coordinatesY.value);

package/src/caeCardEditor/caeCardObjects/sacinp/cardSURFDR.ts

@@ -1,6 +1,6 @@
 // 表面定义--边界节点卡片信息
 import { CardObject } from "../cardObject";
-
+import { BoundaryJointsObject } from "../../../gsDevFx/objects/caeObjects/pretreatment/boundaryJointsObject";
 export class CardSURFDR extends CardObject {
   lineLabel = {
     value: "SURFDR",
@@ -135,4 +135,24 @@ export class CardSURFDR extends CardObject {
     super();
     this.init(line);
   }
+  toRenderObject(surfaceID){
+    // 导入需要用到的
+    let  boundaryJointsObject = new BoundaryJointsObject(surfaceID);
+    boundaryJointsObject.boundryJoint1st = this.boundryJoint1st.value.trimEnd();
+    boundaryJointsObject.boundryJoint2st = this.boundryJoint2st.value.trimEnd();
+    boundaryJointsObject.boundryJoint3st = this.boundryJoint3st.value.trimEnd();
+    boundaryJointsObject.boundryJoint4st = this.boundryJoint4st.value.trimEnd();
+    boundaryJointsObject.boundryJoint5st = this.boundryJoint5st.value.trimEnd();
+    boundaryJointsObject.boundryJoint6st = this.boundryJoint6st.value.trimEnd();
+    boundaryJointsObject.boundryJoint7st = this.boundryJoint7st.value.trimEnd();
+    boundaryJointsObject.boundryJoint8st = this.boundryJoint8st.value.trimEnd();
+    boundaryJointsObject.boundryJoint9st = this.boundryJoint9st.value.trimEnd();
+    boundaryJointsObject.boundryJoint10st = this.boundryJoint10st.value.trimEnd();
+    boundaryJointsObject.boundryJoint11st = this.boundryJoint11st.value.trimEnd();
+    boundaryJointsObject.boundryJoint12st = this.boundryJoint12st.value.trimEnd();
+    boundaryJointsObject.boundryJoint13st = this.boundryJoint13st.value.trimEnd();
+    boundaryJointsObject.boundryJoint14st = this.boundryJoint14st.value.trimEnd();
+
+    return boundaryJointsObject;
+  }
 }

package/src/caeCardEditor/caeCardObjects/sacinp/cardSURFID.ts

@@ -1,5 +1,7 @@
 import { CardObject } from "../cardObject";
 
+import { SurfaceDefinitionObject } from "../../../gsDevFx/objects/caeObjects/pretreatment/surfaceDefinitionObject";
+import { CaeNumber } from "../../../utility/utility";
 export class CardSURFID extends CardObject {
   lineLabel = {
     value: "SURFID",
@@ -55,7 +57,7 @@ export class CardSURFID extends CardObject {
     span: 0,
     label: "Out-of-Plane Tolerance",
     type: "Floating Point",
-    unit: "cm",
+    unit: "m",
   };
   leaveBlank = { value: "", range: [40, 80], span: 0 };
 
@@ -63,4 +65,22 @@ export class CardSURFID extends CardObject {
     super();
     this.init(line);
   }
+  toRenderObject() {
+    let surfaceDefinitionObject = new SurfaceDefinitionObject(
+      this.surfaceID.value.trimEnd()
+    );
+    surfaceDefinitionObject.surfaceID = this.surfaceID.value.trimEnd();
+    surfaceDefinitionObject.loadDistuibutionType =
+      this.loadDistuibutionType.value.trimEnd();
+    surfaceDefinitionObject.originJointName =
+      this.originJointName.value.trimEnd();
+    surfaceDefinitionObject.localXJointName =
+      this.localXJointName.value.trimEnd();
+    surfaceDefinitionObject.localYJointName =
+      this.localYJointName.value.trimEnd();
+    surfaceDefinitionObject.outOfPlaneTolerance = CaeNumber(
+      this.outOfPlaneTolerance.value
+    );
+    return surfaceDefinitionObject;
+  }
 }

package/src/caeCardEditor/caeCardObjects/sacinp/cardSURFWT.ts

@@ -1,5 +1,6 @@
 import { CardObject } from "../cardObject";
-
+import { SurfaceWeightObject } from "../../../gsDevFx/objects/caeObjects/pretreatment/surfaceWeightObject";
+import { CaeNumber } from "../../../utility/utility";
 export class CardSURFWT extends CardObject {
   lineLabel = {
     value: "SURFWT",
@@ -110,4 +111,23 @@ export class CardSURFWT extends CardObject {
     super();
     this.init(line);
   }
+  toRenderObject() {
+    //  导入需要用到的
+    let surfaceWeightObject = new SurfaceWeightObject(
+      this.weightID.value.trimEnd()
+    );
+    surfaceWeightObject.weightGroupID = this.weightGroupID.value.trimEnd();
+    surfaceWeightObject.weightID = this.weightID.value.trimEnd();
+    surfaceWeightObject.pressure = CaeNumber(this.pressure.value);
+    surfaceWeightObject.density = CaeNumber(this.density.value);
+    surfaceWeightObject.xFactor = CaeNumber(this.xFactor.value);
+    surfaceWeightObject.yFactor = CaeNumber(this.yFactor.value);
+    surfaceWeightObject.zFactor = CaeNumber(this.zFactor.value);
+    surfaceWeightObject.surfaceIDfirst = this.surfaceIDfirst.value.trimEnd();
+    surfaceWeightObject.surfaceIDSecond = this.surfaceIDSecond.value.trimEnd();
+    surfaceWeightObject.surfaceIDThird = this.surfaceIDThird.value.trimEnd();
+    surfaceWeightObject.surfaceID4th = this.surfaceID4th.value.trimEnd();
+    surfaceWeightObject.surfaceID5th = this.surfaceID5th.value.trimEnd();
+    return surfaceWeightObject;
+  }
 }

package/src/caeCardEditor/caeCardObjects/sacinp/cardWINSHL.ts

@@ -0,0 +1,109 @@
+import { CardObject } from "../cardObject";
+import { WindShieldObject } from "../../../gsDevFx/objects/caeObjects/pretreatment/windShieldObject";
+import { CaeNumber } from "../../../utility/utility"
+export class CardWINSHL extends CardObject {
+ lineLabel = {
+    value: "WINSHL",
+    range: [0, 6],
+    span: 4,
+    label: "Line Label",
+    type: "Character",
+    unit: "",
+  };
+
+  zone1Bottom = {
+    value: "",
+    range: [10, 18],
+    span: 0,
+    label: "Bottom of 1st Zone",
+    type: "Floating Point",
+    unit: "(m)",
+  };
+
+  zone1Top = {
+    value: "",
+    range: [18, 26],
+    span:0,
+    label: "Top of 1st Zone",
+    type: "Floating Point",
+    unit: "(m)",
+  };
+
+  zone2Bottom = {
+    value: "",
+    range: [26, 34],
+    span: 0,
+    label: "Bottom of 2nd Zone",
+    type: "Floating Point",
+    unit: "(m)",
+  };
+
+  zone2Top = {
+    value: "",
+    range: [34, 42],
+    span: 0,
+    label: "Top of 2nd Zone",
+    type: "Floating Point",
+    unit: "(m)",
+  };
+
+  zone3Bottom = {
+    value: "",
+    range: [42, 50],
+    span: 0,
+    label: "Bottom of 3rd Zone",
+    type: "Floating Point",
+    unit: "(m)",
+  };
+
+  zone3Top = {
+    value: "",
+    range: [50, 58],
+    span: 0,
+    label: "Top of 3rd Zone",
+    type: "Floating Point",
+    unit: "(m)",
+  };
+
+  zone4Bottom = {
+    value: "",
+    range: [58, 66],
+    span: 0,
+    label: "Bottom of 4th Zone",
+    type: "Floating Point",
+    unit: "(m)",
+  };
+
+  zone4Top = {
+    value: "",
+    range: [66, 74],
+    span: 0,
+    label: "Top of 4th Zone",
+    type: "Floating Point",
+    unit: "(m)",
+  };
+
+  leaveBlank = {
+    value: "",
+    range: [74, 82],
+    span: 0,
+  };
+
+  constructor(line?: string) {
+    super();
+    this.init(line);
+  }
+
+  toRenderObject(){
+    let ro = new WindShieldObject()
+    ro.zone1Bottom=CaeNumber(this.zone1Bottom.value)
+    ro.zone1Top=CaeNumber(this.zone1Top.value)
+    ro.zone2Bottom=CaeNumber(this.zone2Bottom.value)
+    ro.zone2Top=CaeNumber(this.zone2Top.value)
+    ro.zone3Bottom=CaeNumber(this.zone3Bottom.value)
+    ro.zone3Top=CaeNumber(this.zone3Top.value)
+    ro.zone4Bottom=CaeNumber(this.zone4Bottom.value)
+    ro.zone4Top=CaeNumber(this.zone4Top.value)
+    return ro;
+  }
+}

package/src/caeCardEditor/caeCardObjects/seainp/cardCDM.ts

@@ -1,4 +1,6 @@
 import { CardObject } from "../cardObject";
+import { CdmRenderObject } from "../../../gsDevFx/objects/caeObjects/optionObjects/cdmRenderObject";
+import { CaeNumber } from "../../../utility/utility";
 
 export class CardCDM extends CardObject {
   lineLabel = {
@@ -103,4 +105,19 @@ export class CardCDM extends CardObject {
     super();
     this.init(line);
   }
+
+  toRenderObject() {
+    let cdmRenderObject = new CdmRenderObject();
+    cdmRenderObject.diameter = CaeNumber(this.diameter.value)
+    cdmRenderObject.cleanMember_normalDragCoef = CaeNumber(this.cleanMember_normalDragCoef.value)
+    cdmRenderObject.cleanMember_tangentialDragCoef = CaeNumber(this.cleanMember_tangentialDragCoef.value)
+    cdmRenderObject.cleanMember_normalInertiaCoeff = CaeNumber(this.cleanMember_normalInertiaCoeff.value)
+    cdmRenderObject.cleanMember_tangentialInertiaCoef = CaeNumber(this.cleanMember_tangentialInertiaCoef.value)
+    cdmRenderObject.fouledMember_normalDragCoef = CaeNumber(this.fouledMember_normalDragCoef.value)
+    cdmRenderObject.fouledMember_tangentialDragCoef = CaeNumber(this.fouledMember_tangentialDragCoef.value)
+    cdmRenderObject.fouledMember_normalInertiaCoef = CaeNumber(this.fouledMember_normalInertiaCoef.value)
+    cdmRenderObject.fouledMember_tangentialInertiaCoef = CaeNumber(this.fouledMember_tangentialInertiaCoef.value)
+
+    return cdmRenderObject
+  }
 }

package/src/caeCardEditor/caeCardObjects/seainp/cardCURR.ts

@@ -1,5 +1,5 @@
 import { CardObject } from "../cardObject";
-import { ElevationPercentOption, ApparentWavePeriodOption, FactorOption, CrsetStretchingOption, CurrLoadObject } from "../../../gsDevFx/objects/loadObjects/currLoadObject";
+import { ElevationPercentOption, ApparentWavePeriodOption, FactorOption, CrsetStretchingOption, VelocityUnitsOption, CurrLoadObject } from "../../../gsDevFx/objects/loadObjects/currLoadObject";
 import { CaeNumber } from "../../../utility/utility"
 
 export class CardCURR extends CardObject {
@@ -110,6 +110,11 @@ export class CardCURR extends CardObject {
     ro.elevation = CaeNumber(this.elevation.value)
     ro.crsetStretchingOption = this.crsetStretchingOption.value as CrsetStretchingOption
     ro.minimumInlineCurrentVelocity = CaeNumber(this.minimumInlineCurrentVelocity.value)
+    ro.elevationAboveMudline = CaeNumber(this.elevationAboveMudline.value)
+    ro.currentVelocity = CaeNumber(this.currentVelocity.value)
+    ro.direction = CaeNumber(this.direction.value)
+    ro.isVelocityUnitsOption = this.velocityUnitsOption.value.trim() === VelocityUnitsOption.True
+
     return ro;
   }
 }

package/src/caeCardEditor/caeCardObjects/seainp/cardDEAD.ts

@@ -1,5 +1,5 @@
 import { CardObject } from "../cardObject";
-
+import { DeadLoadObject } from '../../../gsDevFx/objects/caeObjects/aftertreatment/deadLoadObject'
 export class CardDEAD extends CardObject {
   lineLabel = {
     value: "DEAD",
@@ -73,7 +73,7 @@ export class CardDEAD extends CardObject {
     type: "Character",
     unit: "",
   };
- dlRationalOption = {
+  dlRationalOption = {
     value: "",
     range: [51, 53],
     span: 0,
@@ -85,4 +85,17 @@ export class CardDEAD extends CardObject {
     super();
     this.init(line);
   }
+  toRenderObject() {
+    let deadLoadObject = new DeadLoadObject()
+    deadLoadObject.gravityDirection = this.gravityDirection.value
+    deadLoadObject.floodedConditionOverride = this.floodedConditionOverride.value
+    deadLoadObject.waterDepthOverride = this.waterDepthOverride.value
+    deadLoadObject.mudlineElevationOverride = this.mudlineElevationOverride.value
+    deadLoadObject.waterDensityOverride = this.waterDensityOverride.value
+    deadLoadObject.buoyancyCalculationMethod = this.buoyancyCalculationMethod.value
+    deadLoadObject.includeBuoyancyBelowMudline = this.includeBuoyancyBelowMudline.value
+    deadLoadObject.includeMarineGrowthOnly = this.includeMarineGrowthOnly.value
+    deadLoadObject.dlRationalOption = this.dlRationalOption.value
+    return deadLoadObject
+  }
 }

package/src/caeCardEditor/caeCardObjects/seainp/cardWAVE.ts

@@ -190,6 +190,8 @@ export class CardWAVE extends CardObject {
     ro.memberSegmentationMax = CaeNumber(this.memberSegmentationMax.value)
     ro.memberSegmentationMin = CaeNumber(this.memberSegmentationMin.value)
     ro.printOption = this.printOption.value.trim() as PrintOption
+    console.log('wavero:', ro);
+    
 
     return ro;
   }

package/src/caeCardEditor/caeCardObjects/seainp/cardWIND.ts

@@ -144,7 +144,7 @@ export class CardWIND extends CardObject {
     ro.windVariationDefinition = this.windVariationDefinition.value.trim() as WindVariationDefinition
     ro.windDirection = CaeNumber(this.windDirection.value)
     ro.memberLoadingOption = this.memberLoadingOption.value.trim() as MemberLoadingOption
-    ro.isWaterDepthRatherThanOriginElevation = this.waterDepthOrOriginElevation.value.trim() === WaterDepthRatherThanOriginElevation.Depth
+    ro.isOriginElevationRatherThanWaterDepth = this.waterDepthOrOriginElevation.value.trim() === WaterDepthRatherThanOriginElevation.Elevation
     ro.stillWaterDepthOverride = CaeNumber(this.stillWaterDepthOverride.value)
     ro.isPrintDetailedLoadReport = this.printDetailedLoadReport.value.trim() === PrintDetailedLoadReport.True
     return ro

package/src/gsDevFx/managers/caeRenderObjectTreeManager.ts

@@ -342,7 +342,6 @@ export class CAERenderObjectTreeManager extends Longan.ProcessManagerBase {
     } else {
       // 升序
       newName = this.stringAscendingOrder(name, name.length - 1);
-      // console.log("newName:", newName);
     }
 
     // 查重
@@ -533,7 +532,7 @@ export class CAERenderObjectTreeManager extends Longan.ProcessManagerBase {
       if(obj && obj instanceof DesignBaseObject && obj.checkBusinessStateIsActive()) {
         isRepeat = true;
       }
-  
+
       return isRepeat;
     }
 

package/src/gsDevFx/managers/cloudMemberTransformManager.ts

@@ -4,6 +4,7 @@ import { MemberObject } from "../objects/caeObjects/memberObject";
 import { ConSectionObject } from "../objects/caeObjects/sections/conSectionObject";
 import { Process } from "../process";
 import { TubSectionObject } from "../objects/caeObjects/sections/tubSectionObject";
+import { BusinessState } from "gs-ceec-design";
 
 export class CloudMemberTransformManager extends Longan.ProcessManagerBase {
   constructor(process: Longan.Process) {
@@ -31,9 +32,13 @@ export class CloudMemberTransformManager extends Longan.ProcessManagerBase {
       let cloudMember = this.process.cloneManager.cloneObject(
         originMember
       ) as MemberObject;
+      cloudMember._businessState = BusinessState.Living;
+
       cloudMember.grup = this.process.cloneManager.cloneObject(
         originMember.grup
       ) as GrupObject;
+      cloudMember.grup._businessState = BusinessState.Living;
+
       cloudMember.grup.id = originMember.grup.id;
       let newGrupSegments = new Array<GrupSegment>();
 
@@ -385,6 +390,7 @@ export class CloudMemberTransformManager extends Longan.ProcessManagerBase {
       let newSection = this.process.cloneManager.cloneObject(
         section
       ) as ConSectionObject;
+      newSection._businessState = BusinessState.Living;
       newSection.name = uuid();
       let largeOD = Number(newSection.largeOD);
       let smallOD = Number(newSection.smallOD);