gs-cae-design 1.1.59 → 1.1.61

package/package.json

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

package/src/gsDevFx/managers/caeRenderObjectTreeManager.ts

@@ -342,7 +342,7 @@ export class CAERenderObjectTreeManager extends Longan.ProcessManagerBase {
     } else {
       // 升序
       newName = this.stringAscendingOrder(name, name.length - 1);
-      console.log("newName:", newName);
+      // console.log("newName:", newName);
     }
 
     // 查重

package/src/gsDevFx/managers/datReaderManager.ts

@@ -215,18 +215,19 @@ enum DatDataTypeSEA {
 }
 
 export class DatReaderManager extends Longan.ViewerManagerBase {
-  private _modelOptionList: Longan.List<DesignBaseObject> =
+
+  private _sectList: Longan.List<DesignBaseObject> =
     new Longan.List<DesignBaseObject>();
-  private TitleObject: DesignBaseObject = null;
-  private _seastateOptionList: Longan.List<DesignBaseObject> =
+  private _grupList: Longan.List<DesignBaseObject> =
+    new Longan.List<DesignBaseObject>();
+  private _pgrupList: Longan.List<DesignBaseObject> =
+    new Longan.List<DesignBaseObject>();
+  private _jointList: Longan.List<DesignBaseObject> =
+    new Longan.List<DesignBaseObject>();
+  private _memberList: Longan.List<DesignBaseObject> =
+    new Longan.List<DesignBaseObject>();
+  private _plateList: Longan.List<DesignBaseObject> =
     new Longan.List<DesignBaseObject>();
-
-  private _sectList: Longan.List<DesignBaseObject> = new Longan.List<DesignBaseObject>();
-  private _grupList: Longan.List<DesignBaseObject> = new Longan.List<DesignBaseObject>();
-  private _pgrupList: Longan.List<DesignBaseObject> = new Longan.List<DesignBaseObject>();
-  private _jointList: Longan.List<DesignBaseObject> = new Longan.List<DesignBaseObject>();
-  private _memberList: Longan.List<DesignBaseObject> = new Longan.List<DesignBaseObject>();
-  private _plateList: Longan.List<DesignBaseObject> = new Longan.List<DesignBaseObject>();
   private _loadConditionList: Longan.List<DesignBaseObject> =
     new Longan.List<DesignBaseObject>();
   private _loadCombinationGroupList: Longan.List<DesignBaseObject> =
@@ -238,17 +239,20 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
   // 海况构件分组数据.
   private _componentGroupList: Longan.List<DesignBaseObject> =
     new Longan.List<DesignBaseObject>();
+
   // saeoci荷载数据.
   private _seaociLoadConditionList: Longan.List<DesignBaseObject> =
     new Longan.List<DesignBaseObject>();
   public _seaociJointList = new Map<string, DesignBaseObject>();
-  private _currentSeaociMember = null;
   private _seaociMemberList = new Map<string, DesignBaseObject>();
+  private _currentSeaociMember = null;
+
   // 附加质量数据.
   private _weightGroupList: Longan.List<DesignBaseObject> =
     new Longan.List<DesignBaseObject>();
   // 牺牲阳极数据.
-  private _wgtmemANODEList: Longan.List<WGTMEMObject> = new Longan.List<WGTMEMObject>();
+  private _wgtmemANODEList: Longan.List<WGTMEMObject> =
+    new Longan.List<WGTMEMObject>();
 
   // 模型文件标题
   public title = "";
@@ -288,6 +292,15 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
     super(viewer);
 
     this.registerNativeTypes();
+    this.clearRepeatList();
+  }
+
+  private clearRepeatList() {
+    this._sectInsNameRepeatList = new Array<string>();
+    this._grupNameRepeatList = new Array<string>();
+    this._pGrupNameRepeatList = new Array<string>();
+    this._jointNameRepeatList = new Array<string>();
+    this._memberNameRepeatList = new Array<string>();
   }
 
   registerNativeTypes() {
@@ -346,7 +359,7 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
       this._currentStateDAT = DatDataTypeDAT.SurfID;
     } else if (line.startsWith("SURFDR")) {
       this._currentStateDAT = DatDataTypeDAT.SurfDR;
-    }else if (line.startsWith("SURFWT")) {
+    } else if (line.startsWith("SURFWT")) {
       this._currentStateDAT = DatDataTypeDAT.SurfWT;
     } else if (line.startsWith("WGTMEM")) {
       this._currentStateDAT = DatDataTypeDAT.Wgtmem;
@@ -924,7 +937,8 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
    * @returns
    */
   private readComponentGroupData(line: string) {
-    let _componentGroupList: Longan.List<DesignBaseObject> = this._componentGroupList;
+    let _componentGroupList: Longan.List<DesignBaseObject> =
+      this._componentGroupList;
     let process = Process.activeProcess as Process;
 
     let setName = this.getDatData(line, 8, 70).trimEnd();
@@ -984,9 +998,9 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
     if (componentGroupObject instanceof ColorDivComponentGroupObject) {
       let card = new CardJOISET(line);
       let list = card.toJoiSet();
-      for(let i = 0; i < list.count(); i++) {
+      for (let i = 0; i < list.count(); i++) {
         let obj = list.items[i];
-        if(componentGroupObject.refercenJointIds.indexOf(obj) === -1) {
+        if (componentGroupObject.refercenJointIds.indexOf(obj) === -1) {
           componentGroupObject.refercenJointIds.add(obj);
         }
       }
@@ -1000,9 +1014,9 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
     if (componentGroupObject instanceof ColorDivComponentGroupObject) {
       let card = new CardMEMSET(line);
       let list = card.toMemSet();
-      for(let i = 0; i < list.count(); i++) {
+      for (let i = 0; i < list.count(); i++) {
         let obj = list.items[i];
-        if(componentGroupObject.refercenMemberIds.indexOf(obj) === -1) {
+        if (componentGroupObject.refercenMemberIds.indexOf(obj) === -1) {
           componentGroupObject.refercenMemberIds.add(obj);
         }
       }
@@ -1016,9 +1030,9 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
     if (componentGroupObject instanceof ColorDivComponentGroupObject) {
       let card = new CardPLASET(line);
       let list = card.toPlaSet();
-      for(let i = 0; i < list.count(); i++) {
+      for (let i = 0; i < list.count(); i++) {
         let obj = list.items[i];
-        if(componentGroupObject.refercenPlateIds.indexOf(obj) === -1) {
+        if (componentGroupObject.refercenPlateIds.indexOf(obj) === -1) {
           componentGroupObject.refercenPlateIds.add(obj);
         }
       }
@@ -1462,7 +1476,6 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
       ro.cardData = line;
       ro.cardObject = new CardSURFDR(line);
 
-
       process.addRenderObject(
         process.caeRenderObjectTreeManager.sacinpNode,
         ro
@@ -1528,17 +1541,20 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
 
     let process = Process.activeProcess as Process;
 
-    let isAnode = line.substring(72, 80).trimEnd() === 'ANODE';
-    if(isAnode) {
+    let isAnode = line.substring(72, 80).trimEnd() === "ANODE";
+    if (isAnode) {
       let card = new CardWGTMEMCONC(line);
       let ro = card.toRenderObject() as WGTMEMObject;
       ro.name = card.weightGroupID.value;
       ro.businessState = BusinessState.Creating;
 
       this._wgtmemANODEList.add(ro);
-    }else {
-      let weightIdObject = this.weightGroupIdChangeAndWeightIdChange(this.getDatData(line, 6, 4), this.getDatData(line, 72, 8))
-      if(weightIdObject) {
+    } else {
+      let weightIdObject = this.weightGroupIdChangeAndWeightIdChange(
+        this.getDatData(line, 6, 4),
+        this.getDatData(line, 72, 8)
+      );
+      if (weightIdObject) {
         // 杆件上的点质量
         // 创建质量
         let card = new CardWGTMEMCONC(line);
@@ -1560,8 +1576,11 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
 
     let process = Process.activeProcess as Process;
 
-    let weightIdObject = this.weightGroupIdChangeAndWeightIdChange(this.getDatData(line, 6, 4), this.getDatData(line, 72, 8))
-    if(weightIdObject) {
+    let weightIdObject = this.weightGroupIdChangeAndWeightIdChange(
+      this.getDatData(line, 6, 4),
+      this.getDatData(line, 72, 8)
+    );
+    if (weightIdObject) {
       // 杆件分布质量
       // 创建质量
       let card = new CardWGTMEMUNIF(line);
@@ -1582,20 +1601,28 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
 
     let process = Process.activeProcess as Process;
 
-    let weightIdObject = this.weightGroupIdChangeAndWeightIdChange(this.getDatData(line, 6, 4), this.getDatData(line, 17, 8))
-    if(weightIdObject) {
+    let weightIdObject = this.weightGroupIdChangeAndWeightIdChange(
+      this.getDatData(line, 6, 4),
+      this.getDatData(line, 17, 8)
+    );
+    if (weightIdObject) {
       // 空间点质量
       // 创建质量
       let card = new CardWGTJT(line);
 
-      let ro = card.toRenderObject(this._weightGroupList.get(this._weightGroupList.count() - 1).name);
+      let ro = card.toRenderObject(
+        this._weightGroupList.get(this._weightGroupList.count() - 1).name
+      );
       ro.businessState = BusinessState.Creating;
       process.addRenderObject(weightIdObject, ro);
     }
   }
 
-  private weightGroupIdChangeAndWeightIdChange(weightGroupID: string, weightID: string): WeightIdObject {
-    if(!weightGroupID || !weightID) return
+  private weightGroupIdChangeAndWeightIdChange(
+    weightGroupID: string,
+    weightID: string
+  ): WeightIdObject {
+    if (!weightGroupID || !weightID) return;
 
     let process = Process.activeProcess as Process;
 
@@ -1632,7 +1659,7 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
       process.addRenderObject(currentWeightGroupObj, weightIdObject);
     }
 
-    return weightIdObject
+    return weightIdObject;
   }
 
   private readWTCMBData(line: string) {
@@ -1750,7 +1777,7 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
   private checkNameRepeatAndGetNewName(map: Map<string, any>, name: string) {
     let process = this.viewer.process as Process;
 
-    let isRepeat = process.nameMapSection.get(name);
+    let isRepeat = map.get(name);
     if (isRepeat) {
       // 添加一个重名后处理列表.
       let newName = process.caeRenderObjectTreeManager.nameAscendingOrder(
@@ -1939,9 +1966,9 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
       let joints = new Array<JointObject>();
       for (let j = 0; j < ro.joints.length; j++) {
         if (typeof ro.joints[j] === "string") {
-          for (let j = 0; j < this._jointNameRepeatList.length; j += 2) {
-            if (ro.joints[j] === (this._jointNameRepeatList[j] as any)) {
-              ro.joints[j] = this._jointNameRepeatList[j + 1] as any;
+          for (let k = 0; k < this._jointNameRepeatList.length; k += 2) {
+            if (ro.joints[j] === (this._jointNameRepeatList[k] as any)) {
+              ro.joints[j] = this._jointNameRepeatList[k + 1] as any;
               break;
             }
           }
@@ -2030,7 +2057,9 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
     }
 
     for (let i = 0; i < this._loadCombinationGroupList.count(); i++) {
-      let ro = this._loadCombinationGroupList.items[i] as LoadCombinationGroupObject;
+      let ro = this._loadCombinationGroupList.items[
+        i
+      ] as LoadCombinationGroupObject;
       ro.businessState = BusinessState.Creating;
       let parentNode = process.findCaeObjectByNameInChildObject(
         treeMng.postResultNode,
@@ -2091,7 +2120,7 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
                 grandChild.member as any
               );
             }
-          }else if (grandChild instanceof JointWeightObject) {
+          } else if (grandChild instanceof JointWeightObject) {
             if (typeof grandChild.jointName === "string") {
               for (let k = 0; k < this._jointNameRepeatList.length; k += 2) {
                 if (
@@ -2135,14 +2164,10 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
     this._plateList.clear();
     this._loadConditionList.clear();
     this._loadCombinationGroupList.clear();
-    this._weightGroupList.clear()
+    this._weightGroupList.clear();
     this._wgtmemANODEList.clear();
 
-    this._sectInsNameRepeatList = [];
-    this._grupNameRepeatList = [];
-    this._pGrupNameRepeatList = [];
-    this._jointNameRepeatList = [];
-    this._memberNameRepeatList = [];
+    this.clearRepeatList();
   }
 
   private addSeaInpRenderObject() {
@@ -2182,9 +2207,14 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
         process.addRenderObject(parentNode, ro);
       }
     }
+
+    this._seainpLoadConditionList.clear();
+    this._componentGroupList.clear();
   }
 
-  private addSeaociRenderObject(_seaociLoadConditionList: Longan.List<DesignBaseObject>) {
+  private addSeaociRenderObject(
+    _seaociLoadConditionList: Longan.List<DesignBaseObject>
+  ) {
     let process = this.viewer.process as Process;
     let treeMng = process.caeRenderObjectTreeManager;
 
@@ -2232,6 +2262,10 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
         process.addRenderObject(parentNode, ro);
       }
     }
+
+    this._seaociMemberList.clear();
+    this._seaociLoadConditionList.clear();
+    this._seaociJointList.clear();
   }
 
   importPSIData(content: string) {
@@ -2601,11 +2635,12 @@ export class DatReaderManager extends Longan.ViewerManagerBase {
   }
 
   private readLcomb(line: string) {
-    if(line.trim() === "LCOMB") {
-      return
+    if (line.trim() === "LCOMB") {
+      return;
     }
 
-    let _loadCombinationGroupList: Longan.List<DesignBaseObject> = this._loadCombinationGroupList;
+    let _loadCombinationGroupList: Longan.List<DesignBaseObject> =
+      this._loadCombinationGroupList;
     let process = Process.activeProcess as Process;
     let treeMng = process.caeRenderObjectTreeManager;
 

package/src/gsDevFx/objects/caeObjects/grupObject.ts

@@ -10,7 +10,6 @@ import { SectionObject } from "./sectionObject";
 import { CaeNumber, CaeNumberToCard } from "../../../utility/utility";
 import { Process } from "../../../gsDevFx/process";
 
-
 //杆件截面组对象
 export class GrupObject extends DesignBaseObject implements IReferenceObject {
   typeName = "GrupObject";
@@ -27,10 +26,12 @@ export class GrupObject extends DesignBaseObject implements IReferenceObject {
   }
 
   override set name(value) {
-    (Process.activeProcess as Process).nameMapGrup.delete(this.name);
+    if ((Process.activeProcess as Process).nameMapGrup.get(this.name)) {
+      (Process.activeProcess as Process).nameMapGrup.delete(this.name);
+      (Process.activeProcess as Process).nameMapGrup.set(value, this);
+    }
 
     this._name = value;
-    (Process.activeProcess as Process).nameMapGrup.set(value, this);
   }
 
   public get viewer() {
@@ -156,22 +157,26 @@ export class GrupObject extends DesignBaseObject implements IReferenceObject {
       cardGrup.grupLabel.value = this.name;
       cardGrup.taperOption.value = grupSeg.taperOption;
       cardGrup.sectionLabel.value = grupSeg.section ? grupSeg.section.name : "";
-      cardGrup.tubOuterDiameter.value = CaeNumberToCard(grupSeg.tubOuterDiameter);
-      cardGrup.tubWallThickness.value = CaeNumberToCard(grupSeg.tubWallThickness);
+      cardGrup.tubOuterDiameter.value = CaeNumberToCard(
+        grupSeg.tubOuterDiameter
+      );
+      cardGrup.tubWallThickness.value = CaeNumberToCard(
+        grupSeg.tubWallThickness
+      );
       if (grupSeg.section) {
         cardGrup.tubOuterDiameter.value = "";
         cardGrup.tubWallThickness.value = "";
       }
-      cardGrup.elastic_E.value = grupSeg.elastic_E
-      cardGrup.elastic_G.value = grupSeg.elastic_G
-      cardGrup.elastic_SY.value = grupSeg.elastic_SY
+      cardGrup.elastic_E.value = grupSeg.elastic_E;
+      cardGrup.elastic_G.value = grupSeg.elastic_G;
+      cardGrup.elastic_SY.value = grupSeg.elastic_SY;
       cardGrup.memberClass.value = grupSeg.memberClass;
       cardGrup.kFactors_KY.value = grupSeg.kFactors_KY;
       cardGrup.kFactors_KZ.value = grupSeg.kFactors_KZ;
-      cardGrup.tubShearAreaModifier.value = grupSeg.tubShearAreaModifier
+      cardGrup.tubShearAreaModifier.value = grupSeg.tubShearAreaModifier;
       cardGrup.flooding.value = grupSeg.flooding;
-      cardGrup.weightDensity.value = grupSeg.weightDensity
-      cardGrup.segmentLength.value = CaeNumberToCard(grupSeg.segmentLength)
+      cardGrup.weightDensity.value = grupSeg.weightDensity;
+      cardGrup.segmentLength.value = CaeNumberToCard(grupSeg.segmentLength);
 
       result += cardGrup.getLine();
       if (i !== this.grupSegments.length - 1) {
@@ -196,12 +201,10 @@ export class GrupObject extends DesignBaseObject implements IReferenceObject {
   // 更新全部用到该截面组的杆件.
   render(viewer?: Longan.Viewer) {
     // console.log("GrupObject render");
-
     // if (!viewer) {
     //   viewer = Process.activeProcess.activeViewer as any;
     // }
     // let selectedMemberObjects = this.getReleatedMembers(viewer);
-
     // for (let i = 0; i < selectedMemberObjects.length; i++) {
     //   selectedMemberObjects[i].render();
     // }
@@ -213,29 +216,28 @@ export class GrupObject extends DesignBaseObject implements IReferenceObject {
 
   drawSvg() {}
 
-   /**
+  /**
    * 获取引用了该截面组的杆件对象列表.
    * @param viewer
    * @returns
    */
-   getReleatedMembers(viewer: Longan.Viewer): MemberObject[] {
+  getReleatedMembers(viewer: Longan.Viewer): MemberObject[] {
     let result = new Array<MemberObject>();
 
     let members = (viewer.process as Process).grupMapReleativeMembers.get(this);
-    if(members) {
-      for(let i = 0; i < members.count(); i++) {
+    if (members) {
+      for (let i = 0; i < members.count(); i++) {
         result.push(members.items[i]);
       }
     }
-    
+
     return result;
   }
 
   tempDelete(viewer) {
-
     let plates = this.getReleatedMembers(viewer);
     plates.forEach((item) => {
-      if(item instanceof MemberObject) {
+      if (item instanceof MemberObject) {
         item.grup = null;
         item.setNeedUpdate();
       }

package/src/gsDevFx/objects/caeObjects/jointObject.ts

@@ -74,9 +74,11 @@ export class JointObject extends PointObject implements IReferenceObject {
       return;
     }
 
-    (Process.activeProcess as Process).nameMapJoint.delete(this.name);
+    if ((Process.activeProcess as Process).nameMapJoint.get(this.name)) {
+      (Process.activeProcess as Process).nameMapJoint.delete(this.name);
+      (Process.activeProcess as Process).nameMapJoint.set(na, this);
+    }
     this._name = na;
-    (Process.activeProcess as Process).nameMapJoint.set(na, this);
   }
 
   public get fixity() {

package/src/gsDevFx/objects/caeObjects/memberObject.ts

@@ -179,10 +179,12 @@ export class MemberObject extends LineObject implements IReferencedObject {
   }
 
   override set name(value) {
-    (Process.activeProcess as Process).nameMapMember.delete(this.name);
+    if ((Process.activeProcess as Process).nameMapMember.get(this.name)) {
+      (Process.activeProcess as Process).nameMapMember.delete(this.name);
+      (Process.activeProcess as Process).nameMapMember.set(value, this);
+    }
 
     this._name = value;
-    (Process.activeProcess as Process).nameMapMember.set(value, this);
   }
 
   public get release_A() {
@@ -1101,7 +1103,7 @@ export class MemberObject extends LineObject implements IReferencedObject {
             segmentLength = this.getMemberLength();
           }
           segmentLength *= this.segmentLengthCoeff;
-          
+
           // 每段截面的shell
           let shell_key = -1;
           // 每段截面的顶点和索引.
@@ -1176,10 +1178,7 @@ export class MemberObject extends LineObject implements IReferencedObject {
               );
             }
 
-            let offset = Longan.Vector.multiply(
-              normal,
-              segmentLength
-            );
+            let offset = Longan.Vector.multiply(normal, segmentLength);
 
             // 更新下一段杆件的底部截面起点
             origin = Longan.Point.add(origin, offset);
@@ -1703,6 +1702,10 @@ export class MemberObject extends LineObject implements IReferencedObject {
       }
     }
 
+    if(length < 0) {
+      length = 0;
+    }
+
     return length;
   }
 

package/src/gsDevFx/objects/caeObjects/pGrupObject.ts

@@ -25,12 +25,14 @@ export class PGrupObject extends DesignBaseObject implements IReferenceObject {
   override get name() {
     return this._name;
   }
-  
+
   override set name(value) {
-    (Process.activeProcess as Process).nameMapPGrup.delete(this.name);
+    if ((Process.activeProcess as Process).nameMapPGrup.get(this.name)) {
+      (Process.activeProcess as Process).nameMapPGrup.delete(this.name);
+      (Process.activeProcess as Process).nameMapPGrup.set(value, this);
+    }
 
     this._name = value;
-    (Process.activeProcess as Process).nameMapPGrup.set(value, this);
   }
 
   public get thickness() {
@@ -147,20 +149,19 @@ export class PGrupObject extends DesignBaseObject implements IReferenceObject {
     let result = new Array<PlateObject>();
 
     let plates = (viewer.process as Process).pgrupMapReleativePlates.get(this);
-    if(plates) {
-      for(let i = 0; i < plates.count(); i++) {
+    if (plates) {
+      for (let i = 0; i < plates.count(); i++) {
         result.push(plates.items[i]);
       }
     }
-    
+
     return result;
   }
 
   tempDelete(viewer) {
-
     let plates = this.getReleatedPlates(viewer);
     plates.forEach((item) => {
-      if(item instanceof PlateObject) {
+      if (item instanceof PlateObject) {
         item.pGrup = null;
         item.setNeedUpdate();
       }