gs-cae-design 1.1.63 → 1.1.65

package/package.json

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

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

@@ -10,14 +10,39 @@ export class CardAREA extends CardObject {
     unit: "",
   };
   areaID = {
-    value: "",
+    value: '',
     range: [4, 6],
     span: 0,
-    label: "Area Group ID",
-    type: "Character",
-    unit: "",
+    label: 'Area Group ID',
+    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],
@@ -43,28 +68,28 @@ export class CardAREA extends CardObject {
     unit: "m2",
   };
   XCoord = {
-    value: "",
+    value: '',
     range: [24, 31],
     span: 0,
-    label: "X Coordinate",
-    type: "Floating Point",
-    unit: "m",
+    label: 'Centroidal Location X Coordinate',
+    type: 'Floating Point',
+    unit: '(m)',
   };
   YCoord = {
-    value: "",
+    value: '',
     range: [31, 38],
     span: 0,
-    label: "Y Coordinate",
-    type: "Floating Point",
-    unit: "m",
+    label: 'Centroidal Location Y Coordinate',
+    type: 'Floating Point',
+    unit: '(m)',
   };
   ZCoord = {
-    value: "",
+    value: '',
     range: [38, 45],
-    span: 0,
-    label: "Z Coordinate",
-    type: "Floating Point",
-    unit: "m",
+    span: 5,
+    label: 'Centroidal Location Z Coordinate',
+    type: 'Floating Point',
+    unit: '(m)',
   };
   shearFactor = {
     value: "",
@@ -75,68 +100,68 @@ export class CardAREA extends CardObject {
     unit: "",
   };
   jointName1 = {
-    value: "",
+    value: '',
     range: [50, 54],
     span: 0,
-    label: "1st Joint Name",
-    type: "Alphanumeric",
-    unit: "",
+    label: '1st Distribution Joint',
+    type: 'Alphanumeric',
+    unit: '',
   };
   jointName2 = {
-    value: "",
+    value: '',
     range: [54, 58],
     span: 0,
-    label: "2nd Joint Name",
-    type: "Alphanumeric",
-    unit: "",
+    label: '2nd Distribution Joint',
+    type: 'Alphanumeric',
+    unit: '',
   };
   jointName3 = {
-    value: "",
+    value: '',
     range: [58, 62],
     span: 0,
-    label: "3rd Joint Name",
-    type: "Alphanumeric",
-    unit: "",
+    label: '3rd Distribution Joint',
+    type: 'Alphanumeric',
+    unit: '',
   };
   jointName4 = {
-    value: "",
+    value: '',
     range: [62, 66],
     span: 0,
-    label: "4th Joint Name",
-    type: "Alphanumeric",
-    unit: "",
+    label: '4th Distribution Joint',
+    type: 'Alphanumeric',
+    unit: '',
   };
   jointName5 = {
-    value: "",
+    value: '',
     range: [66, 70],
     span: 0,
-    label: "5th Joint Name",
-    type: "Alphanumeric",
-    unit: "",
+    label: '5th Distribution Joint',
+    type: 'Alphanumeric',
+    unit: '',
   };
   jointName6 = {
-    value: "",
+    value: '',
     range: [70, 74],
     span: 0,
-    label: "6th Joint Name",
-    type: "Alphanumeric",
-    unit: "",
+    label: '6th Distribution Joint',
+    type: 'Alphanumeric',
+    unit: '',
   };
   jointName7 = {
-    value: "",
+    value: '',
     range: [74, 78],
     span: 0,
-    label: "7th Joint Name",
-    type: "Alphanumeric",
-    unit: "",
+    label: '7th Distribution Joint',
+    type: 'Alphanumeric',
+    unit: '',
   };
   areaDefinition = {
-    value: "",
+    value: '',
     range: [78, 79],
     span: 0,
-    label: "Area Definition",
-    type: "Alphanumeric",
-    unit: "",
+    label: 'Area Definition',
+    type: 'Character',
+    unit: '',
   };
 
   constructor(line?: string) {

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

@@ -0,0 +1,135 @@
+import { CardObject } from "../cardObject";
+import { LRFDFactorsObject } from '../../../gsDevFx/objects/caeObjects/aftertreatment/LRFDFactorsObject'
+import { CaeNumber } from "../../../utility/utility";
+export class CardRFLRFD extends CardObject {
+  lineLabel = {
+    value: 'RFLRFD',
+    range: [0, 6],
+    span: 1,
+    label: 'Line Label',
+    type: 'Character',
+    unit: ''
+  };
+
+  yieldStressFactor = {
+    value: '',
+    range: [7, 12],
+    span: 0,
+    label: 'Yield Stress Factor',
+    type: 'Floating Point',
+    unit: '',
+    description: 'Enter the resistance factor to be used on the yield stress'
+  };
+
+  tubularAxialTension = {
+    value: '',
+    range: [12, 17],
+    span: 0,
+    label: 'Axial Tension',
+    type: 'Floating Point',
+    unit: '',
+    description: 'Enter the Tubular Axial Tension'
+  };
+
+  tubularAxialCompression = {
+    value: '',
+    range: [17, 22],
+    span: 0,
+    label: 'Axial Compression',
+    type: 'Floating Point',
+    unit: '',
+    description: 'Enter the Tubular Axial Compression'
+  };
+
+  tubularBending = {
+    value: '',
+    range: [22, 27],
+    span: 0,
+    label: 'Bending',
+    type: 'Floating Point',
+    unit: '',
+    description: 'Enter the Tubular Bending'
+  };
+
+  tubularShear = {
+    value: '',
+    range: [27, 32],
+    span: 0,
+    label: 'Shear',
+    type: 'Floating Point',
+    unit: '',
+    description: 'Enter the Tubular Shear'
+  };
+
+  tubularHoop = {
+    value: '',
+    range: [32, 37],
+    span: 5,
+    label: 'Hoop',
+    type: 'Floating Point',
+    unit: '',
+    description: 'Enter the Tubular Hoop'
+  };
+
+  noTubularAxialTension = {
+    value: '',
+    range: [42, 47],
+    span: 0,
+    label: 'Axial Tension',
+    type: 'Floating Point',
+    unit: '',
+    description: 'Enter the Non-Tubular Axial Tension.For Canadian Code CSA-516.1,Enter the resistance factor to override default. 90'
+  };
+
+  noTubularAxialCompression = {
+    value: '',
+    range: [47, 52],
+    span: 0,
+    label: 'Axial Compression',
+    type: 'Floating Point',
+    unit: '',
+    description: 'Enter the Non-Tubular Axial Compression'
+  };
+
+  noTubularBending = {
+    value: '',
+    range: [52, 57],
+    span: 0,
+    label: 'Bending',
+    type: 'Floating Point',
+    unit: '',
+    description: 'Enter the Non-Tubular Bending'
+  };
+
+  noTubularShear = {
+    value: '',
+    range: [57, 62],
+    span: 0,
+    label: 'Shear',
+    type: 'Floating Point',
+    unit: '',
+    description: 'Enter the Non-Tubular Shear'
+  };
+
+  constructor(line?: string) {
+    super();
+    this.init(line);
+  }
+
+  toRenderObject() {
+    //  导入需要用到的
+    let lrfdfactorsObjectFactorsObject = new LRFDFactorsObject();
+    lrfdfactorsObjectFactorsObject.cardData = this.getLine();
+    lrfdfactorsObjectFactorsObject.yieldStressFactor = CaeNumber(this.yieldStressFactor.value);
+    lrfdfactorsObjectFactorsObject.tubularAxialTension = CaeNumber(this.tubularAxialTension.value);
+    lrfdfactorsObjectFactorsObject.tubularAxialCompression = CaeNumber(this.tubularAxialCompression.value);
+    lrfdfactorsObjectFactorsObject.tubularBending = CaeNumber(this.tubularBending.value);
+    lrfdfactorsObjectFactorsObject.tubularShear = CaeNumber(this.tubularShear.value);
+    lrfdfactorsObjectFactorsObject.tubularHoop = CaeNumber(this.tubularHoop.value);
+    lrfdfactorsObjectFactorsObject.noTubularAxialTension = CaeNumber(this.noTubularAxialTension.value);
+    lrfdfactorsObjectFactorsObject.noTubularAxialCompression = CaeNumber(this.noTubularAxialCompression.value);
+    lrfdfactorsObjectFactorsObject.noTubularBending = CaeNumber(this.noTubularBending.value);
+    lrfdfactorsObjectFactorsObject.noTubularShear = CaeNumber(this.noTubularShear.value);
+    return lrfdfactorsObjectFactorsObject;
+  }
+}

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

@@ -1,4 +1,6 @@
 import { CardObject } from "../cardObject";
+import { SeastateUcpart } from "../../../gsDevFx/objects/caeObjects/optionObjects/seastateUcpart";
+import { CaeNumber } from "../../../utility/utility";
 
 export class CardUCPART extends CardObject {
   lineLabel = {
@@ -62,4 +64,15 @@ export class CardUCPART extends CardObject {
     super();
     this.init(line);
   }
+
+  toRenderObject() {
+    let ro = new SeastateUcpart();
+    ro.lowerLimmit_first = CaeNumber(this.lowerLimmit_first.value) 
+    ro.upperLimmit_first = CaeNumber(this.upperLimmit_first.value) 
+    ro.lowerLimmit_second = CaeNumber(this.lowerLimmit_second.value) 
+    ro.upperLimmit_second = CaeNumber(this.upperLimmit_second.value) 
+    ro.lowerLimmit_thrid = CaeNumber(this.lowerLimmit_thrid.value) 
+    ro.upperLimmit_thrid = CaeNumber(this.upperLimmit_thrid.value)     
+    return ro
+  }
 }

package/src/gsDevFx/managers/caeRenderObjectTreeManager.ts

@@ -113,9 +113,9 @@ export class CAERenderObjectTreeManager extends Longan.ProcessManagerBase {
             "临时节点"
           );
 
-          if(!this._tempNode) {
+          if (!this._tempNode) {
             let tempNode = new DesignBaseObject();
-            tempNode.name = "临时节点"
+            tempNode.name = "临时节点";
             this.process.addRenderObject(jiheRO, tempNode);
             this._tempNode = tempNode;
           }
@@ -524,18 +524,22 @@ export class CAERenderObjectTreeManager extends Longan.ProcessManagerBase {
   // }
 
   public checkNodeChildNameRepeat(
-      map: Map<string, any>,
-      name: string
-    ): boolean {
-      let isRepeat = false;
-      let obj = map.get(name);
-      if(obj && obj instanceof DesignBaseObject && obj.checkBusinessStateIsActive()) {
-        isRepeat = true;
-      }
-
-      return isRepeat;
+    map: Map<string, any>,
+    name: string
+  ): boolean {
+    let isRepeat = false;
+    let obj = map.get(name);
+    if (
+      obj &&
+      obj instanceof DesignBaseObject &&
+      obj.checkBusinessStateIsActive()
+    ) {
+      isRepeat = true;
     }
 
+    return isRepeat;
+  }
+
   checkNameRepeat_JointObject(
     targetName: string,
     joint?: JointObject

package/src/gsDevFx/managers/datReaderManager.ts

@@ -72,6 +72,7 @@ import { CardWGTMEMCONC } from "../../caeCardEditor/caeCardObjects/sacinp/cardWG
 import { CardWGTJT } from "../../caeCardEditor/caeCardObjects/sacinp/cardWGTJT";
 import { CardWTCMB } from "../../caeCardEditor/caeCardObjects/sacinp/cardWTCMB";
 import { CardPGrup } from "../../caeCardEditor/caeCardObjects/cardPGrup";
+import { CardRFLRFD } from '../../caeCardEditor/caeCardObjects/seainp/cardRFLRFD'
 
 import { WFSectionObject } from "../objects/caeObjects/sections/wFSectionObject";
 import { CardDYNMAS } from "../../caeCardEditor/caeCardObjects/sacinp/cardDYNMAS";
@@ -127,6 +128,8 @@ import { WindShieldObject } from "../objects/caeObjects/pretreatment/windShieldO
 import { SurfaceDefinitionObject } from "../objects/caeObjects/pretreatment/surfaceDefinitionObject";
 import { SurfaceWeightObject } from '../objects/caeObjects/pretreatment/surfaceWeightObject'
 import { DeadLoadObject } from '../objects/caeObjects/aftertreatment/deadLoadObject'
+import { LRFDFactorsObject } from '../objects/caeObjects/aftertreatment/LRFDFactorsObject'
+// import { WindAreaObject } from "../objects/caeObjects/pretreatment/WindAreaObject";
 enum DatDataTypeDAT {
   // sacinp
   Title,
@@ -176,6 +179,7 @@ enum DatDataTypeDAT {
   Curr,
   Lcomb,
   Winshl,
+  Rflrfd,
   //
   Default,
 }
@@ -379,6 +383,8 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
       this._currentStateDAT = DatDataTypeDAT.Load;
     } else if (line.startsWith("WINSHL")) {
       this._currentStateDAT = DatDataTypeDAT.Winshl;
+    }else if(line.startsWith('RFLRFD')){
+      this._currentStateDAT = DatDataTypeDAT.Rflrfd;
     }
     // saeinp
     else if (line.startsWith("LDOPT")) {
@@ -729,7 +735,7 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
           loadConditionName
         ) as DesignBaseObject;
 
-      if(!loadConditionObject) {
+      if (!loadConditionObject) {
         loadConditionObject = this.getObject(
           loadConditionName,
           this._loadConditionList
@@ -1410,34 +1416,7 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
     }
   }
 
-  private readAreaData(line: string) {
-    if (line.trimEnd() === "AREA") {
-      return;
-    }
-    if (!line.startsWith("AREA")) {
-      return;
-    }
-
-    let process = Process.activeProcess as Process;
-    let ro = this.viewer.process.findRenderObjectByType(
-      "ModelArea"
-    ) as ModelArea;
-    if (!ro) {
-      ro = new ModelArea();
-      ro.businessState = BusinessState.Creating;
-      ro.cardData = line;
-      ro.cardObject = new CardAREA(line);
-      ro.name = ro.cardObject.areaID.value;
 
-      process.addRenderObject(
-        process.caeRenderObjectTreeManager.sacinpNode,
-        ro
-      );
-    } else {
-      ro.cardData = line;
-      ro.businessState = BusinessState.Editing;
-    }
-  }
   // 回转中心
   private readCenterData(line: string) {
     if (line.trimEnd() === "CENTER") return;
@@ -1490,7 +1469,7 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
 
     // 如果有数据 则不导入
     if (windShieldParent && windShieldParent?.childObjects?.length) return
-    if(!windShieldParent){
+    if (!windShieldParent) {
       windShieldParent = new DesignBaseObject();
       windShieldParent.businessState = BusinessState.Creating;
       windShieldParent.name = "风载屏蔽区域";
@@ -1508,6 +1487,29 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
     ro.cardData = line;
     process.addRenderObject(windShieldParent, ro);
   }
+  // 受风面定义
+  private readAreaData(line: string) {
+    if (line.trimEnd() === "AREA") {
+      return;
+    }
+    if (!line.startsWith("AREA")) {
+      return;
+    }
+    let process = Process.activeProcess as Process;
+    let pretreatmentRO = this.viewer.process.findRenderObjectByName(
+      "前处理可视化辅助"
+    ) as DesignBaseObject;
+
+    let areaRollParent = process.findCaeObjectByNameInChildObject(
+      pretreatmentRO,
+      "受风面定义"
+    ) as DesignBaseObject;
+
+
+
+
+  }
+
   // 表面定义
   private readSurfIDData(line: string) {
     if (!line.startsWith("SURFID")) return;
@@ -1527,7 +1529,6 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
       process.nameSurfaceDefinition,
       name
     );
-    console.log('name',name,name.length,newName,newName.length);
 
     if (name !== newName) {
       name = newName;
@@ -1568,10 +1569,41 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
       this.activeSurfIDName
     ) as SurfaceDefinitionObject;
     // 对应表面定义对象增加边界节点
-    if(surfaceIDRO) {
+    if (surfaceIDRO) {
       surfaceIDRO.boundaryJoints = ro
     }
   }
+
+      // 导入LRFD抗力系数
+  private readLRFDFactors(line: string) {
+    if (!line.startsWith("RFLRFD")) return
+    let process = Process.activeProcess as Process;
+
+    let pretreatmentRO = this.viewer.process.findRenderObjectByName(
+      "后处理计算结果"
+    ) as DesignBaseObject;
+    let lrfdParent = process.findCaeObjectByNameInChildObject(
+      pretreatmentRO,
+      "LRFD抗力系数"
+    ) as DesignBaseObject;
+      console.log('导入lrfdParent',lrfdParent,lrfdParent?.childObjects);
+
+    if (lrfdParent && lrfdParent?.childObjects?.length >0) {
+      return
+    }
+
+    let card = new CardRFLRFD(line)
+    let ro = card.toRenderObject();
+    ro.cardObject = card;
+    ro.businessState = BusinessState.Creating;
+    process.addRenderObject(
+      lrfdParent,
+      ro
+    );
+    console.log('导入lrfd',ro);
+    
+  }
+
   // 表面质量
   private readSurfWTData(line: string) {
     if (line.trimEnd() === "SURFWT") {
@@ -1637,6 +1669,7 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
       );
     }
   }
+
   // 导入自重荷载
   private readDead(block: string[]) {
     let process = Process.activeProcess as Process;
@@ -1684,6 +1717,7 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
       }
     }
   }
+
   private getAndCreateLoadGroupByLoadCondition(
     loadCondition: LoadConditionObject
   ) {
@@ -1952,6 +1986,9 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
         case DatDataTypeDAT.Winshl:
           this.readWINSHLData(line);
           break;
+        case DatDataTypeDAT.Rflrfd:
+          this.readLRFDFactors(line);
+          break;
         case DatDataTypeDAT.Dynmas:
           this.readDynmasData(line);
           break;
@@ -2913,20 +2950,14 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
       "SeastateUcpart"
     ) as SeastateUcpart;
     if (!ro) {
-      ro = new SeastateUcpart();
+      let card = new CardUCPART();
+      let ro = card.toRenderObject();
       ro.businessState = BusinessState.Creating;
-      ro.name = "UCPART";
-      ro.cardData = line;
-      ro.cardObject = new CardUCPART(line);
 
       process.addRenderObject(
         process.caeRenderObjectTreeManager.seastateNode,
         ro
       );
-    } else {
-      ro.businessState = BusinessState.Editing;
-      ro.cardData = line;
-      ro.cardObject = new CardUCPART(line);
     }
   }