gs-cae-design 1.1.68 → 1.1.69

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gs-cae-design",
-  "version": "1.1.68",
+  "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/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;
+  }
+}

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

@@ -1,76 +1,97 @@
 import { CardObject } from "../cardObject";
-
+import { CaeNumber } from "../../../utility/utility";
+import { AnlysisOptionsObject } from "../../../gsDevFx/objects/caeObjects/aftertreatment/anlysisOptionsObject";
 export class CardCODEIS extends CardObject {
   lineLabel = {
     value: "CODE  IS",
     range: [0, 8],
-    span: 0,
+    span: 2,
     label: "Line Label",
     type: "Character",
     unit: "",
   };
-  blank1 = { value: "", range: [8, 10], span: 0 };
-  nonTubCodeOption = {
-    value: "",
+    nonTubCodeOption = {
+    value: '5L',
     range: [10, 12],
-    span: 0,
-    label: "Non-Tub Code Option",
-    type: "Character",
-    unit: "",
+    span: 2,
+    label: 'Non-Tub Code Option',
+    type: 'Character',
+    unit: '',
+    selections:[{"label":"AISC 第15版 / 2016年版","value":"5L"}],
+    description: 'Select from the following:'
   };
-  blank2 = { value: "", range: [12, 14], span: 0 };
-  nonTubCodeCorrFactorValue = {
-    value: "",
+  nonTubCorrespondenceFactor = {
+    value: '',
     range: [14, 20],
     span: 0,
-    label: "Non-Tub Code Correspondence Factor",
-    type: "Floating Point",
-    unit: "",
+    label: 'Non-Tub Code Correspondence Factor',
+    type: 'Floating Point',
+    unit: '',
+    description: 'Enter Building Code Correspondence Factor, KC, as specified in Annex B in ISO 19901-3:2010(E)'
   };
-  tensionRFValue = {
-    value: "",
+
+  tensionResistanceFactor = {
+    value: '',
     range: [20, 26],
     span: 0,
-    label: "Tension RF",
-    type: "Floating Point",
-    unit: "",
+    label: 'Tension Resistance Factor',
+    type: 'Floating Point',
+    unit: '',
+    description: 'Enter the Resistance Factor of Tension'
   };
-  CompressionRFValue = {
-    value: "",
+
+  compressionResistanceFactor = {
+    value: '',
     range: [26, 32],
     span: 0,
-    label: "Compression RF",
-    type: "Floating Point",
-    unit: "",
+    label: 'Compression Resistance Factor',
+    type: 'Floating Point',
+    unit: '',
+    description: 'Enter the Resistance Factor of Compression'
   };
-  BendingRFValue = {
-    value: "",
+
+  bendingResistanceFactor = {
+    value: '',
     range: [32, 38],
     span: 0,
-    label: "Bending RF",
-    type: "Floating Point",
-    unit: "",
+    label: 'Bending Resistance Factor',
+    type: 'Floating Point',
+    unit: '',
+    description: 'Enter the Resistance Factor of Bending'
   };
-  ShearRFValue = {
-    value: "",
+
+  shearResistanceFactor = {
+    value: '',
     range: [38, 44],
     span: 0,
-    label: "Shear RF",
-    type: "Floating Point",
-    unit: "",
+    label: 'Shear Resistance Factor',
+    type: 'Floating Point',
+    unit: '',
+    description: 'Enter the Resistance Factor of Shear'
   };
-  HoopRFValue = {
-    value: "",
+
+  hoopResistanceFactor = {
+    value: '',
     range: [44, 50],
     span: 0,
-    label: "Hoop Buckling RF",
-    type: "Floating Point",
-    unit: "",
+    label: 'Hoop Resistance Factor',
+    type: 'Floating Point',
+    unit: '',
+    description: 'Enter the Resistance Factor of Hoop Buckling'
   };
-  leaveBlank = { value: "", range: [50, 80], span: 0 };
 
   constructor(line?: string) {
     super();
     this.init(line);
   }
+  toRenderObject() {
+    let anlysisOptionsObject = new AnlysisOptionsObject();
+    anlysisOptionsObject.nonTubCorrespondenceFactor = CaeNumber(this.nonTubCorrespondenceFactor.value);
+    anlysisOptionsObject.tensionResistanceFactor = CaeNumber(this.tensionResistanceFactor.value);
+    anlysisOptionsObject.compressionResistanceFactor = CaeNumber(this.compressionResistanceFactor.value);
+    anlysisOptionsObject.bendingResistanceFactor = CaeNumber(this.bendingResistanceFactor.value);
+    anlysisOptionsObject.shearResistanceFactor = CaeNumber(this.shearResistanceFactor.value);
+    anlysisOptionsObject.hoopResistanceFactor = CaeNumber(this.hoopResistanceFactor.value);
+    return anlysisOptionsObject;
+  }
 }