gs-cae-design 1.1.67 → 1.1.69

package/package.json

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

package/src/caeCardEditor/caeCardObjects/cardJointElastic.ts

@@ -1,5 +1,6 @@
 import { JointElasticRestraint } from "../../gsDevFx/objects/caeObjects/jointObject";
 import { CardObject } from "./cardObject";
+import { CaeNumber } from "../../utility/utility";
 
 /**
  * 卡片编辑器的空间点对象
@@ -124,12 +125,12 @@ export class CardJointElastic extends CardObject {
 
   toElastic() {
     let elastic = new JointElasticRestraint();
-    elastic.dx = this.dx.value;
-    elastic.dy = this.dy.value;
-    elastic.dz = this.dz.value;
-    elastic.rx = this.rx.value;
-    elastic.ry = this.ry.value;
-    elastic.rz = this.rz.value;
+    elastic.dx = CaeNumber(this.dx.value);
+    elastic.dy = CaeNumber(this.dy.value);
+    elastic.dz = CaeNumber(this.dz.value);
+    elastic.rx = CaeNumber(this.rx.value);
+    elastic.ry = CaeNumber(this.ry.value);
+    elastic.rz = CaeNumber(this.rz.value);
     elastic.secondJointName = this.secondJointName.value;
     elastic.thirdJointName = this.thirdJointName.value;
 

package/src/caeCardEditor/caeCardObjects/cardLOADCONC.ts

@@ -117,6 +117,8 @@ export class CardLOADCONC extends CardObject {
       this.jointBName.value.trimEnd()) as any;
     obj.distanceToLoad = CaeNumber(this.distanceToLoadForce.value);
     obj.concentratedForceValue = CaeNumber(this.concentratedForceValue.value);
+    obj.distanceToLoadMoment = CaeNumber(this.distanceToLoadMoment.value);
+    obj.concentratedMomentValue = CaeNumber(this.concentratedMomentValue.value);
     obj.loadCoorSystem = this.loadCorrdinateSystem.value;
     obj.loadType = this.loadType.value;
     obj.loadGroup = this.loadID.value;

package/src/caeCardEditor/caeCardObjects/cardMember.ts

@@ -1,8 +1,5 @@
-import { Process } from "../../gsDevFx/process";
 import { MemberObject } from "../../gsDevFx/objects/caeObjects/memberObject";
 import { CardObject } from "./cardObject";
-import { JointObject } from "../../gsDevFx/objects/caeObjects/jointObject";
-import { GrupObject } from "../../gsDevFx/objects/caeObjects/grupObject";
 import { CaeNumber } from "../../utility/utility";
 /**
  * 卡片编辑器的杆件对象
@@ -236,7 +233,7 @@ export class CardMember extends CardObject {
     value: "",
     range: [35, 41],
     label: "Chord Angle",
-    type: "Floationg Point",
+    type: "Floating Point",
     unit: "(deg)",
     span: 0,
   };
@@ -282,7 +279,7 @@ export class CardMember extends CardObject {
     value: "",
     range: [47, 51],
     label: "Average Joint Thickness",
-    type: "Floationg Point",
+    type: "Floating Point",
     unit: "(m)",
     span: 0,
   };
@@ -293,7 +290,7 @@ export class CardMember extends CardObject {
     value: "",
     range: [51, 55],
     label: "Overall Buckling Length Y-axis(Major)",
-    type: "Floationg Point",
+    type: "Floating Point",
     unit: "(m)",
     span: 0,
   };
@@ -304,7 +301,7 @@ export class CardMember extends CardObject {
     value: "",
     range: [55, 59],
     label: "Overall Buckling Length Z-axis(Major)",
-    type: "Floationg Point",
+    type: "Floating Point",
     unit: "(m)",
     span: 0,
   };
@@ -315,7 +312,7 @@ export class CardMember extends CardObject {
     value: "",
     range: [59, 64],
     label: "Unbraced Length or TUB Shear Modifier",
-    type: "Floationg Point",
+    type: "Floating Point",
     unit: "(m)",
     span: 0,
   };
@@ -327,12 +324,12 @@ export class CardMember extends CardObject {
     value: "",
     range: [64, 70],
     label: "Weight Density",
-    type: "Floationg Point",
+    type: "Floating Point",
     unit: "(tonne/m3)",
     span: 0,
   };
   /**
-   * 单元数量：71-72
+   * 单元数量：71-71
    */
   ucSegments = {
     value: "",
@@ -350,7 +347,7 @@ export class CardMember extends CardObject {
     value: "",
     range: [72, 78],
     label: "Effective Diameter for Added Mass",
-    type: "Floationg Point",
+    type: "Floating Point",
     unit: "(cm)",
     span: 0,
   };

package/src/caeCardEditor/caeCardObjects/cardPGrup.ts

@@ -1,3 +1,4 @@
+import { CaeNumber } from "../../utility/utility";
 import { PGrupObject } from "../../gsDevFx/objects/caeObjects/pGrupObject";
 import { CardObject } from "./cardObject";
 /**
@@ -111,13 +112,13 @@ export class CardPGrup extends CardObject {
   toPGrupObject() {
     let obj = new PGrupObject();
     obj.name = this.plateGrupLabel.value.trimEnd();
-    obj.thickness = this.plateThickness.value;
+    obj.thickness = CaeNumber(this.plateThickness.value);
     obj.plateType = this.plateType.value;
-    obj.materialData_E = this.materialData_E.value;
-    obj.poissonRatiou = this.poissonRatiou.value;
-    obj.yieldStress = this.yieldStress.value;
-    obj.plateZOffset = this.plateZOffset.value;
-    obj.weightDensity = this.weightDensity.value;
+    obj.materialData_E = CaeNumber(this.materialData_E.value);
+    obj.poissonRatiou = CaeNumber(this.poissonRatiou.value);
+    obj.yieldStress = CaeNumber(this.yieldStress.value);
+    obj.plateZOffset = CaeNumber(this.plateZOffset.value);
+    obj.weightDensity = CaeNumber(this.weightDensity.value);
 
     return obj;
   }

package/src/caeCardEditor/caeCardObjects/cardPlate.ts

@@ -3,6 +3,7 @@ import { PlateObject } from "../../gsDevFx/objects/caeObjects/plateObject";
 import { CardObject } from "./cardObject";
 import { JointObject } from "../../gsDevFx/objects/caeObjects/jointObject";
 import { PGrupObject } from "../../gsDevFx/objects/caeObjects/pGrupObject";
+import { CaeNumber } from "../../utility/utility";
 
 /**
  * 卡片编辑器的板对象
@@ -189,9 +190,9 @@ export class CardPlate extends CardObject {
     obj.pGrup = this.plateGrupLabel.value.trimEnd() as any;
     obj.offsets = null;
     obj.rpsk = this.rpsk.value;
-    obj.plateThickness = this.plateThickness.value;
+    obj.plateThickness = CaeNumber(this.plateThickness.value);
     obj.offsetOption = this.offsetOption.value;
-    obj.materialData_E = this.materialData_E.value;
+    obj.materialData_E = CaeNumber(this.materialData_E.value);
     obj.poissonRatiou = this.poissonRatiou.value;
     obj.yieldStress = this.yieldStress.value;
     obj.weightDensity = this.weightDensity.value;

package/src/caeCardEditor/caeCardObjects/cardSection.ts

@@ -1,3 +1,4 @@
+import { CaeNumber } from "../../utility/utility";
 import { SectionObject } from "../../gsDevFx/objects/caeObjects/sectionObject";
 import { CardObject } from "./cardObject";
 
@@ -92,9 +93,9 @@ export class CardSection extends CardObject {
   updateRenderObject(ro: SectionObject) {
     ro.name = this.crossSectionLabel.value.trimEnd();
     ro.crossSectionType = this.crossSectionType.value.trimEnd();
-    ro.stiffnessPro_AX = this.stiffnessPro_AX.value;
-    ro.stiffnessPro_J = this.stiffnessPro_J.value;
-    ro.stiffnessPro_IY = this.stiffnessPro_IY.value;
-    ro.stiffnessPro_IZ = this.stiffnessPro_IZ.value;
+    ro.stiffnessPro_AX = CaeNumber(this.stiffnessPro_AX.value);
+    ro.stiffnessPro_J = CaeNumber(this.stiffnessPro_J.value);
+    ro.stiffnessPro_IY = CaeNumber(this.stiffnessPro_IY.value);
+    ro.stiffnessPro_IZ = CaeNumber(this.stiffnessPro_IZ.value);
   }
 }

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

@@ -1,5 +1,6 @@
 import { CardObject } from "../cardObject";
-
+import { WindAreaObject } from "../../../gsDevFx/objects/caeObjects/pretreatment/windAreaObject";
+import { CaeNumber } from "../../../utility/utility";
 export class CardAREA extends CardObject {
   lineLabel = {
     value: "AREA",
@@ -17,56 +18,6 @@ export class CardAREA extends CardObject {
     type: 'Character',
     unit: '',
   };
-
-  totalArea = {
-    value: "",
-    range: [6, 12],
-    span: 0,
-    label: 'Total Area',
-    type: 'Floating Point',
-    unit: '(m2)',
-  };
-  horizontalAngle = {
-    value: "",
-    range: [12, 18],
-    span: 0,
-    label: "Horizontal Angle",
-    type: "Floating Point",
-    unit: "deg",
-  };
-  verticalAngle = {
-    value: "",
-    range: [18, 24],
-    span: 0,
-    label: "Vertical Angle",
-    type: "Floating Point",
-    unit: "deg",
-  }
-
-  xProjArea = {
-    value: "",
-    range: [6, 12],
-    span: 0,
-    label: "X Projected Area",
-    type: "Floating Point",
-    unit: "m2",
-  };
-  yProjArea = {
-    value: "",
-    range: [12, 18],
-    span: 0,
-    label: "Y Projected Area",
-    type: "Floating Point",
-    unit: "m2",
-  };
-  zProjArea = {
-    value: "",
-    range: [18, 24],
-    span: 0,
-    label: "z Projected Area",
-    type: "Floating Point",
-    unit: "m2",
-  };
   XCoord = {
     value: '',
     range: [24, 31],
@@ -86,19 +37,12 @@ export class CardAREA extends CardObject {
   ZCoord = {
     value: '',
     range: [38, 45],
-    span: 5,
+    span: 0,
     label: 'Centroidal Location Z Coordinate',
     type: 'Floating Point',
     unit: '(m)',
   };
-  shearFactor = {
-    value: "",
-    range: [45, 50],
-    span: 0,
-    label: "Shape Factor",
-    type: "Floating Point",
-    unit: "",
-  };
+
   jointName1 = {
     value: '',
     range: [50, 54],
@@ -168,4 +112,6 @@ export class CardAREA extends CardObject {
     super();
     this.init(line);
   }
+
+
 }

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

@@ -0,0 +1,81 @@
+import { CardAREA } from "./cardAREA";
+import { WindAreaObject } from "../../../gsDevFx/objects/caeObjects/pretreatment/windAreaObject";
+import { CaeNumber } from "../../../utility/utility";
+export class CardAREAA extends CardAREA {
+  totalArea = {
+    value: "",
+    range: [6, 12],
+    span: 0,
+    label: 'Total Area',
+    type: 'Floating Point',
+    unit: '(m2)',
+  };
+  horizontalAngle = {
+    value: "",
+    range: [12, 18],
+    span: 0,
+    label: "Horizontal Angle",
+    type: "Floating Point",
+    unit: "deg",
+  };
+  verticalAngle = {
+    value: "",
+    range: [18, 24],
+    span: 0,
+    label: "Vertical Angle",
+    type: "Floating Point",
+    unit: "deg",
+  }
+  shearFactor = {
+    value: "",
+    range: [45, 50],
+    span: 0,
+    label: "Shape Factor",
+    type: "Floating Point",
+    unit: "",
+  };
+  constructor(line?: string) {
+    super();
+    if (line) {
+      this.init(line);
+    }
+
+  }
+  toRenderObject(areaID,actionNodeList) {
+    let windAreaObject = new WindAreaObject(areaID);
+    windAreaObject.areaID =areaID;
+    windAreaObject.XCoord = CaeNumber(this.XCoord.value);
+    windAreaObject.YCoord = CaeNumber(this.YCoord.value);
+    windAreaObject.ZCoord = CaeNumber(this.ZCoord.value);
+    windAreaObject.shearFactor = CaeNumber(this.shearFactor.value);
+    windAreaObject.actionNodeList = actionNodeList
+
+    if (this.jointName1.value.trimEnd()) {
+      windAreaObject.actionNodeList.push(this.jointName1.value.trimEnd());
+    }
+    if (this.jointName2.value.trimEnd()) {
+      windAreaObject.actionNodeList.push(this.jointName2.value.trimEnd());
+    }
+    if (this.jointName3.value.trimEnd()) {
+      windAreaObject.actionNodeList.push(this.jointName3.value.trimEnd());
+    }
+    if (this.jointName4.value.trimEnd()) {
+      windAreaObject.actionNodeList.push(this.jointName4.value.trimEnd());
+    }
+    if (this.jointName5.value.trimEnd()) {
+      windAreaObject.actionNodeList.push(this.jointName5.value.trimEnd());
+    }
+    if (this.jointName6.value.trimEnd()) {
+      windAreaObject.actionNodeList.push(this.jointName6.value.trimEnd());
+    }
+    if (this.jointName7.value.trimEnd()) {
+      windAreaObject.actionNodeList.push(this.jointName7.value.trimEnd());
+    }
+    windAreaObject.areaDefinition = this.areaDefinition.value.trimEnd();
+    windAreaObject.totalArea = CaeNumber(this.totalArea.value);
+    windAreaObject.horizontalAngle = CaeNumber(this.horizontalAngle.value);
+    windAreaObject.verticalAngle = CaeNumber(this.verticalAngle.value);
+    return windAreaObject;
+
+  }
+}

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

@@ -0,0 +1,83 @@
+import { CardAREA } from "./cardAREA";
+import { WindAreaObject } from "../../../gsDevFx/objects/caeObjects/pretreatment/windAreaObject";
+import { CaeNumber } from "../../../utility/utility";
+export class CardAREAD extends CardAREA {
+  xProjArea = {
+    value: "",
+    range: [6, 12],
+    span: 0,
+    label: "X Projected Area",
+    type: "Floating Point",
+    unit: "m2",
+  };
+  yProjArea = {
+    value: "",
+    range: [12, 18],
+    span: 0,
+    label: "Y Projected Area",
+    type: "Floating Point",
+    unit: "m2",
+  };
+  zProjArea = {
+    value: "",
+    range: [18, 24],
+    span: 0,
+    label: "z Projected Area",
+    type: "Floating Point",
+    unit: "m2",
+  };
+  shearFactor = {
+    value: "",
+    range: [45, 50],
+    span: 0,
+    label: "Shape Factor",
+    type: "Floating Point",
+    unit: "",
+  };
+  constructor(line?: string) {
+     super();
+    if (line) {
+      this.init(line);
+    }
+
+  }
+  toRenderObject(areaID,actionNodeList) {
+     let windAreaObject = new WindAreaObject(areaID);
+    windAreaObject.areaID =areaID;
+    windAreaObject.areaID = this.areaID.value.trimEnd();
+    windAreaObject.XCoord = CaeNumber(this.XCoord.value);
+    windAreaObject.YCoord = CaeNumber(this.YCoord.value);
+    windAreaObject.ZCoord = CaeNumber(this.ZCoord.value);
+    windAreaObject.shearFactor = CaeNumber(this.shearFactor.value);
+    windAreaObject.actionNodeList = actionNodeList
+
+    if (this.jointName1.value.trimEnd()) {
+      windAreaObject.actionNodeList.push(this.jointName1.value.trimEnd());
+    }
+    if (this.jointName2.value.trimEnd()) {
+      windAreaObject.actionNodeList.push(this.jointName2.value.trimEnd());
+    }
+    if (this.jointName3.value.trimEnd()) {
+      windAreaObject.actionNodeList.push(this.jointName3.value.trimEnd());
+    }
+    if (this.jointName4.value.trimEnd()) {
+      windAreaObject.actionNodeList.push(this.jointName4.value.trimEnd());
+    }
+    if (this.jointName5.value.trimEnd()) {
+      windAreaObject.actionNodeList.push(this.jointName5.value.trimEnd());
+    }
+    if (this.jointName6.value.trimEnd()) {
+      windAreaObject.actionNodeList.push(this.jointName6.value.trimEnd());
+    }
+    if (this.jointName7.value.trimEnd()) {
+      windAreaObject.actionNodeList.push(this.jointName7.value.trimEnd());
+    }
+    windAreaObject.areaDefinition = this.areaDefinition.value.trimEnd();
+
+    windAreaObject.xProjArea = CaeNumber(this.xProjArea.value);
+    windAreaObject.yProjArea = CaeNumber(this.yProjArea.value);
+    windAreaObject.zProjArea = CaeNumber(this.zProjArea.value);
+    return windAreaObject;
+
+  }
+}

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

@@ -0,0 +1,90 @@
+import { CardAREA } from "./cardAREA";
+import { WindAreaObject } from "../../../gsDevFx/objects/caeObjects/pretreatment/windAreaObject";
+import { CaeNumber } from "../../../utility/utility";
+export class CardAREAFB extends CardAREA {
+  xProjArea = {
+    value: "",
+    range: [6, 12],
+    span: 0,
+    label: "X Projected Area",
+    type: "Floating Point",
+    unit: "m2",
+  };
+  yProjArea = {
+    value: "",
+    range: [12, 18],
+    span: 0,
+    label: "Y Projected Area",
+    type: "Floating Point",
+    unit: "m2",
+  };
+  zProjArea = {
+    value: "",
+    range: [18, 24],
+    span: 0,
+    label: "z Projected Area",
+    type: "Floating Point",
+    unit: "m2",
+  };
+  shearFactor = {
+    value: "",
+    range: [45, 50],
+    span: 0,
+    label: "Shape Factor",
+    type: "Floating Point",
+    unit: "",
+  };
+  constructor(line?: string) {
+    super();
+    if (line) {
+      this.init(line);
+    }
+
+  }
+
+  toRenderObject(areaID,actionNodeList) {
+    console.log('toRenderObject!!!!!!!!!!!!!!',);
+
+    let windAreaObject = new WindAreaObject(areaID);
+    windAreaObject.areaID = areaID;
+    windAreaObject.XCoord = CaeNumber(this.XCoord.value);
+    windAreaObject.YCoord = CaeNumber(this.YCoord.value);
+    windAreaObject.ZCoord = CaeNumber(this.ZCoord.value);
+    windAreaObject.areaDefinition = this.areaDefinition.value.trimEnd();
+    windAreaObject.shearFactor = CaeNumber(this.shearFactor.value);
+    windAreaObject.actionNodeList = actionNodeList
+
+    if (this.jointName1.value.trimEnd()) {
+      windAreaObject.actionNodeList.push(this.jointName1.value.trimEnd());
+    }
+    if (this.jointName2.value.trimEnd()) {
+      windAreaObject.actionNodeList.push(this.jointName2.value.trimEnd());
+    }
+    if (this.jointName3.value.trimEnd()) {
+      windAreaObject.actionNodeList.push(this.jointName3.value.trimEnd());
+    }
+    if (this.jointName4.value.trimEnd()) {
+      windAreaObject.actionNodeList.push(this.jointName4.value.trimEnd());
+    }
+    if (this.jointName5.value.trimEnd()) {
+      windAreaObject.actionNodeList.push(this.jointName5.value.trimEnd());
+    }
+    if (this.jointName6.value.trimEnd()) {
+      windAreaObject.actionNodeList.push(this.jointName6.value.trimEnd());
+    }
+    if (this.jointName7.value.trimEnd()) {
+      windAreaObject.actionNodeList.push(this.jointName7.value.trimEnd());
+    }
+
+
+    windAreaObject.xProjArea = CaeNumber(this.xProjArea.value);
+    windAreaObject.yProjArea = CaeNumber(this.yProjArea.value);
+    windAreaObject.zProjArea = CaeNumber(this.zProjArea.value);
+
+    console.log('this.xProjArea!!!!!', this.xProjArea, this.areaDefinition);
+
+
+    return windAreaObject;
+
+  }
+}

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

@@ -0,0 +1,64 @@
+import { CardAREA } from "./cardAREA";
+import { WindAreaObject } from "../../../gsDevFx/objects/caeObjects/pretreatment/windAreaObject";
+import { CaeNumber } from "../../../utility/utility";
+export class CardAREAR extends CardAREA {
+  totalArea = {
+    value: "",
+    range: [6, 12],
+    span: 12,
+    label: 'Total Area',
+    type: 'Floating Point',
+    unit: '(m2)',
+  };
+  shearFactor = {
+    value: "",
+    range: [45, 50],
+    span: 0,
+    label: "Shape Factor",
+    type: "Floating Point",
+    unit: "",
+  };
+  constructor(line?: string) {
+    super();
+    if (line) {
+      this.init(line);
+    }
+
+  }
+
+  toRenderObject(areaID, actionNodeList) {
+    let windAreaObject = new WindAreaObject(areaID);
+    windAreaObject.areaID = areaID;
+    windAreaObject.areaID = this.areaID.value.trimEnd();
+    windAreaObject.XCoord = CaeNumber(this.XCoord.value);
+    windAreaObject.YCoord = CaeNumber(this.YCoord.value);
+    windAreaObject.ZCoord = CaeNumber(this.ZCoord.value);
+    windAreaObject.shearFactor = CaeNumber(this.shearFactor.value);
+    windAreaObject.actionNodeList = actionNodeList
+
+    if (this.jointName1.value.trimEnd()) {
+      windAreaObject.actionNodeList.push(this.jointName1.value.trimEnd());
+    }
+    if (this.jointName2.value.trimEnd()) {
+      windAreaObject.actionNodeList.push(this.jointName2.value.trimEnd());
+    }
+    if (this.jointName3.value.trimEnd()) {
+      windAreaObject.actionNodeList.push(this.jointName3.value.trimEnd());
+    }
+    if (this.jointName4.value.trimEnd()) {
+      windAreaObject.actionNodeList.push(this.jointName4.value.trimEnd());
+    }
+    if (this.jointName5.value.trimEnd()) {
+      windAreaObject.actionNodeList.push(this.jointName5.value.trimEnd());
+    }
+    if (this.jointName6.value.trimEnd()) {
+      windAreaObject.actionNodeList.push(this.jointName6.value.trimEnd());
+    }
+    if (this.jointName7.value.trimEnd()) {
+      windAreaObject.actionNodeList.push(this.jointName7.value.trimEnd());
+    }
+    windAreaObject.areaDefinition = this.areaDefinition.value.trimEnd();
+    windAreaObject.totalArea = CaeNumber(this.totalArea.value);
+    return windAreaObject;
+  }
+}