gs-cae-design 1.1.56 → 1.1.58

package/src/gsDevFx/managers/interfaceManagers/commandInterfaceManager.ts

@@ -43,6 +43,8 @@ import CommandImportBoreholes from "../../../viewerWrapper/commands/pretreatment
 import CommandImportWave from "../../../viewerWrapper/commands/pretreatment/importWave/commandImportWave";
 import CommandAddJointWeight from "../../../viewerWrapper/commands/pretreatment/addJointWeight/commandAddJointWeight";
 import CommandEditJointWeight from "../../../viewerWrapper/commands/pretreatment/editJointWeight/commandEditJointWeight";
+import CommandAddMemberWeight from "../../../viewerWrapper/commands/pretreatment/addMemberWeight/commandAddMemberWeight";
+import CommandEditMemberWeight from "../../../viewerWrapper/commands/pretreatment/editMemberWeight/commandEditMemberWeight";
 import CommandViewWeightProperty from "../../../viewerWrapper/commands/pretreatment/viewWeightProperty/commandViewWeightProperty";
 import CommandSetAndShowWGTMEM from "../../../viewerWrapper/commands/pretreatment/setAndShowWGTMEM/commandSetAndShowWGTMEM";
 import CommandShowWGTMEMData from "../../../viewerWrapper/commands/pretreatment/showWGTMEMData/commandShowWGTMEMData";
@@ -50,6 +52,9 @@ import CommandAddJointLoad from "../../../viewerWrapper/commands/aftertreatment/
 import CommandAddMemberLoadConcentrated from "../../../viewerWrapper/commands/aftertreatment/addMemberLoadConcentrated/commandAddMemberLoadConcentrated";
 import CommandAddMemberLoadDistributed from "../../../viewerWrapper/commands/aftertreatment/addMemberLoadDistributed/commandAddMemberLoadDistributed";
 import CommandViewLoadProperty from "../../../viewerWrapper/commands/pretreatment/viewLoadProperty/commandViewLoadProperty";
+import CommandAddLoadCombination from "../../../viewerWrapper/commands/aftertreatment/addLoadCombination/commandAddLoadCombination";
+import CommandEditLoadCombination from "../../../viewerWrapper/commands/aftertreatment/editLoadCombination/commandEditLoadCombination";
+import CommandShowSeastateLoadOptions from '../../../viewerWrapper/commands/aftertreatment/setAndShowSeastateLoadOptions/commandSetAndShowSeastateLoadOptions'
 import CommandPostResultCloud from "../../../viewerWrapper/commands/aftertreatment/postResultCloud/commandPostResultCloud";
 import CommandDistortion from "../../../viewerWrapper/commands/aftertreatment/distortion/commandDistortion";
 import CommandShowBendingMoment from "../../../viewerWrapper/commands/aftertreatment/showBendingMoment/commandShowBendingMoment";
@@ -90,7 +95,11 @@ import CommandDeflectedShape from "../../../viewerWrapper/commands/aftertreatmen
 import CommandColorDivideByEditComponentGroup from "../../../viewerWrapper/commands/pretreatment/colorDivideByEditComponentGroup/commandColorDivideByEditComponentGroup";
 import CommandEditJointLoad from "../../../viewerWrapper/commands/aftertreatment/editJointLoad/commandEditJointLoad";
 import CommandBatchSetMemberDefPro from "../../../viewerWrapper/commands/batchSetMemberDefPro/commandBatchSetMemberDefPro";
-
+import CommandCenterOfRoll from '../../../viewerWrapper/commands/pretreatment/centerOfRoll/commandCenterOfRoll'
+import CommandSurfaceDefinition from "../../../viewerWrapper/commands/pretreatment/surfaceDefinition/commandSurfaceDefinition";
+import CommandSurfaceDefinitionEdit from "../../../viewerWrapper/commands/pretreatment/surfaceDefinitionEdit/commandSurfaceDefinitionEdit";
+import CommandSurfaceWeightAdd from "../../../viewerWrapper/commands/pretreatment/surfaceWeightAdd/commandSurfaceWeightAdd";
+import { SectionViewer } from "../../../gsDevFx/sectionViewer";
 export class CommandInterfaceManager extends Longan.ViewerManagerBase {
   constructor(viewer: Viewer) {
     super(viewer);
@@ -99,7 +108,7 @@ export class CommandInterfaceManager extends Longan.ViewerManagerBase {
   /**
    * 进入创建截面实例的命令
    * @param sectionType 截面类型
-   * 
+   *
    *SectionType {
     wfSection,  // 工字梁
     tubSection, // 圆管
@@ -152,7 +161,7 @@ export class CommandInterfaceManager extends Longan.ViewerManagerBase {
       },
     };
     return CAEDesign.Loader({ isShareArrayBuffer: false }).then(() => {
-      let viewer = new CAEDesign.SectionViewer(options);
+      let viewer = new SectionViewer(options);
       viewer.name = "main";
       viewer.sceneSegment.camera.projection = Longan.ProjectionType.Orthographic;
       viewer.backgroundColor = [0, 0, 0, 1];
@@ -236,7 +245,7 @@ export class CommandInterfaceManager extends Longan.ViewerManagerBase {
         }
       }
     }
-    
+
     let root = new Longan.RenderObject();
     viewer.process.addRenderObject(null, root);
     viewer.renderObject = root;
@@ -1015,6 +1024,34 @@ export class CommandInterfaceManager extends Longan.ViewerManagerBase {
     return command;
   }
 
+  /**
+   * 进入添加杆件质量的命令
+   * @returns 命令的对象
+   */
+  commandAddMemberWeight() {
+    let command = new CommandAddMemberWeight();
+    (this.viewer.process.commandManager as CommandManager).multiplyExecute(
+      command
+    );
+    command = this.viewer.process.commandManager
+      .currentCommand as CommandAddMemberWeight;
+    return command;
+  }
+
+  /**
+   * 进入编辑杆件质量的命令
+   * @returns 命令的对象
+   */
+  commandEditMemberWeight() {
+    let command = new CommandEditMemberWeight();
+    (this.viewer.process.commandManager as CommandManager).multiplyExecute(
+      command
+    );
+    command = this.viewer.process.commandManager
+      .currentCommand as CommandEditMemberWeight;
+    return command;
+  }
+
   /**
    * 进入显示质量及其属性命令
    * @returns 命令的对象
@@ -1071,6 +1108,20 @@ export class CommandInterfaceManager extends Longan.ViewerManagerBase {
     return command;
   }
 
+  /**
+   * 进入海况选项命令
+   * @returns 命令的对象
+   */
+  commandShowSeastateLoadOptions() {
+    let command = new CommandShowSeastateLoadOptions();
+    (this.viewer.process.commandManager as CommandManager).multiplyExecute(
+      command
+    );
+    command = this.viewer.process.commandManager
+      .currentCommand as CommandShowSeastateLoadOptions;
+    return command;
+  }
+
   /**
    * 进入添加空间点荷载命令
    * @returns 命令的对象
@@ -1127,6 +1178,34 @@ export class CommandInterfaceManager extends Longan.ViewerManagerBase {
     return command;
   }
 
+  /**
+   * 进入添加荷载组合命令
+   * @returns 命令的对象
+   */
+  commandAddLoadCombination() {
+    let command = new CommandAddLoadCombination();
+    (this.viewer.process.commandManager as CommandManager).multiplyExecute(
+      command
+    );
+    command = this.viewer.process.commandManager
+      .currentCommand as CommandAddLoadCombination;
+    return command;
+  }
+
+  /**
+   * 进入编辑荷载组合命令
+   * @returns 命令的对象
+   */
+  commandEditLoadCombination() {
+    let command = new CommandEditLoadCombination();
+    (this.viewer.process.commandManager as CommandManager).multiplyExecute(
+      command
+    );
+    command = this.viewer.process.commandManager
+      .currentCommand as CommandEditLoadCombination;
+    return command;
+  }
+
   /**
    * 进入后处理构件计算结果云图在位显示命令
    * @returns 命令的对象
@@ -1451,7 +1530,54 @@ export class CommandInterfaceManager extends Longan.ViewerManagerBase {
       .currentCommand as CommandSetPlateToDefault;
     return command;
   }
-
+  /**
+   * 回转中心
+   * @returns
+   */
+  commandCenterOfRoll() {
+    let command = new CommandCenterOfRoll();
+    (this.viewer.process.commandManager as CommandManager).multiplyExecute(
+      command
+    );
+    command = this.viewer.process.commandManager
+      .currentCommand as CommandCenterOfRoll;
+    return command;
+  }
+   /**
+   * 表面定义 新增
+   * @returns
+   */
+  commandSurfaceDefinition() {
+    let command = new CommandSurfaceDefinition();
+    (this.viewer.process.commandManager as CommandManager).multiplyExecute(
+      command
+    );
+    command = this.viewer.process.commandManager
+      .currentCommand as CommandSurfaceDefinition;
+    return command;
+  }
+    /**
+   * 表面定义 编辑
+   * @returns
+   */
+  commandSurfaceDefinitionEdit(){
+      let command = new CommandSurfaceDefinitionEdit();
+    (this.viewer.process.commandManager as CommandManager).multiplyExecute(
+      command
+    );
+    command = this.viewer.process.commandManager
+      .currentCommand as CommandSurfaceDefinitionEdit;
+    return command;
+  }
+  commandSurfaceWeightAdd(){
+      let command = new CommandSurfaceWeightAdd();
+    (this.viewer.process.commandManager as CommandManager).multiplyExecute(
+      command
+    );
+    command = this.viewer.process.commandManager
+      .currentCommand as CommandSurfaceWeightAdd;
+    return command;
+  }
   closeAllCommand() {
     (this.viewer.process.commandManager as CommandManager).closeAllCommands();
   }

package/src/gsDevFx/managers/interfaceManagers/commonInterfaceManager.ts

@@ -1535,7 +1535,7 @@ export class CommonInterfaceManager extends Longan.ViewerManagerBase {
             } else {
               obj.inactive(viewer);
             }
-            obj.setChildVisible(viewer, on_off);
+            // obj.setChildVisible(viewer, on_off);
           }
 
           break;

package/src/gsDevFx/managers/persistenceManager.ts

@@ -8,7 +8,13 @@ import { PGrupObject } from "../objects/caeObjects/pGrupObject";
 import { PlateObject } from "../objects/caeObjects/plateObject";
 import { WeightGroupObject } from "../objects/weightObjects/weightGroupObject";
 import { WeightIdObject } from "../objects/weightObjects/weightIdObject";
+import { WeightBaseObject } from "../objects/weightObjects/weightBaseObject";
 import { JointWeightObject } from "../objects/weightObjects/jointWeightObject";
+import { MemberWeightConcentratedObject } from "../objects/weightObjects/memberWeightConcentratedObject";
+import { MemberWeightDistributedObject  } from "../objects/weightObjects/memberWeightDistributedObject";
+import { CenterRenderObject } from "../objects/caeObjects/pretreatment/centerRenderObject";
+import { SurfaceDefinitionObject } from "../objects/caeObjects/pretreatment/surfaceDefinitionObject";
+import { BoundaryJointsObject } from "../objects/caeObjects/pretreatment/boundaryJointsObject";
 import { WGTMEMObject } from "../objects/caeObjects/pretreatment/wgtmemObject";
 import { SectionObject } from "../objects/caeObjects/sectionObject";
 import { AngSectionObject } from "../objects/caeObjects/sections/angSectionObject";
@@ -27,6 +33,8 @@ import { JointLoadObject } from "../objects/loadObjects/jointLoadObject";
 import { LoadBaseObject } from "../objects/loadObjects/loadBaseObject";
 import { LoadConditionObject } from "../objects/loadObjects/loadConditionObject";
 import { LoadGroupObject } from "../objects/loadObjects/loadGroupObject";
+import { LoadCombinationGroupObject } from "../objects/loadCombinationObjects/loadCombinationGroupObject";
+import { LoadCombinationObject } from "../objects/loadCombinationObjects/loadCombinationObject";
 import { MemberLoadBaseObject } from "../objects/loadObjects/memberLoadBaseObject";
 import { MemberLoadConcentratedObject } from "../objects/loadObjects/memberLoadConcentratedObject";
 import { MemberLoadDistributedObject } from "../objects/loadObjects/memberLoadDistributedObject";
@@ -50,7 +58,6 @@ import { SeastateLcsel } from "../objects/caeObjects/optionObjects/seastateLcsel
 import { SeastateUcpart } from "../objects/caeObjects/optionObjects/seastateUcpart";
 import { SeastateFile } from "../objects/caeObjects/optionObjects/seastateFile";
 import { SeastateCdm } from "../objects/caeObjects/optionObjects/seastateCdm";
-import { ModelCenter } from "../objects/caeObjects/optionObjects/modelCenter";
 import { CorrzObject } from "../objects/caeObjects/pretreatment/corrzObject";
 import { MgrovObject } from "../objects/caeObjects/pretreatment/mgrovObject";
 import { CutlineGrupThicknessObject } from "../objects/pretreatmentObjects/cutlineGrupThicknessObject";
@@ -178,11 +185,19 @@ export class PersistenceManager extends Longan.PersistenceManager {
     this.typeList.add("WGTMEMObject", WGTMEMObject.prototype);
     this.typeList.add("WeightGroupObject", WeightGroupObject.prototype);
     this.typeList.add("WeightIdObject", WeightIdObject.prototype);
+    this.typeList.add("WeightBaseObject", WeightBaseObject.prototype);
     this.typeList.add("JointWeightObject", JointWeightObject.prototype);
+    this.typeList.add("MemberWeightConcentratedObject", MemberWeightConcentratedObject.prototype);
+    this.typeList.add("MemberWeightDistributedObject", MemberWeightDistributedObject.prototype);
+    this.typeList.add("CenterRenderObject", CenterRenderObject.prototype);
+    this.typeList.add("SurfaceDefinitionObject", SurfaceDefinitionObject.prototype);
+    this.typeList.add("BoundaryJointsObject", BoundaryJointsObject.prototype);
 
     // 荷载
     this.typeList.add("LoadConditionObject", LoadConditionObject.prototype);
     this.typeList.add("LoadGroupObject", LoadGroupObject.prototype);
+    this.typeList.add("LoadCombinationGroupObject", LoadCombinationGroupObject.prototype);
+    this.typeList.add("LoadCombinationObject", LoadCombinationObject.prototype);
 
     this.typeList.add("LoadBaseObject", LoadBaseObject.prototype);
     this.typeList.add("JointLoadObject", JointLoadObject.prototype);
@@ -200,7 +215,6 @@ export class PersistenceManager extends Longan.PersistenceManager {
     this.typeList.add("ModelTitle", ModelTitle.prototype);
     this.typeList.add("ModelOptions", ModelOptions.prototype);
     this.typeList.add("ModelCodeIs", ModelCodeIs.prototype);
-    this.typeList.add("ModelCenter", ModelCenter.prototype);
     this.typeList.add("SeastateLdopt", SeastateLdopt.prototype);
     this.typeList.add("SeastateHydro", SeastateHydro.prototype);
     this.typeList.add("SeastateHydro2", SeastateHydro2.prototype);

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

@@ -22,6 +22,17 @@ export class GrupObject extends DesignBaseObject implements IReferenceObject {
 
   text = null;
 
+  override get name() {
+    return this._name;
+  }
+
+  override set name(value) {
+    (Process.activeProcess as Process).nameMapGrup.delete(this.name);
+
+    this._name = value;
+    (Process.activeProcess as Process).nameMapGrup.set(value, this);
+  }
+
   public get viewer() {
     return this._viewer;
   }

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

@@ -18,6 +18,7 @@ import { DatObject } from "./datObject";
 import { CaeNumber } from "../../../utility/utility";
 import { ObjectColor } from "./objectColors";
 import { ColorDivComponentGroupObject } from "../pretreatmentObjects/colorDivComponentGroupObject";
+import { Process } from "../../../gsDevFx/process";
 
 /**
  * 空间点对象
@@ -58,7 +59,7 @@ export class JointObject extends PointObject implements IReferenceObject {
     return this._name;
   }
 
-  public set name(na: string) {
+  public override set name(na: string) {
     na = na.trimEnd();
 
     let reg = /^[A-Z0-9]+$/;
@@ -70,7 +71,10 @@ export class JointObject extends PointObject implements IReferenceObject {
       }, 100);
       return;
     }
+
+    (Process.activeProcess as Process).nameMapJoint.delete(this.name);
     this._name = na;
+    (Process.activeProcess as Process).nameMapJoint.set(na, this);
   }
 
   public get fixity() {

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

@@ -178,6 +178,17 @@ export class MemberObject extends LineObject implements IReferencedObject {
   //   this._layer = value;
   // }
 
+  override get name() {
+    return this._name;
+  }
+
+  override set name(value) {
+    (Process.activeProcess as Process).nameMapMember.delete(this.name);
+
+    this._name = value;
+    (Process.activeProcess as Process).nameMapMember.set(value, this);
+  }
+
   public get release_A() {
     return this._release_A;
   }

package/src/gsDevFx/objects/caeObjects/optionObjects/{modelCenter.ts → modelSurfDR.ts}

@@ -1,56 +1,56 @@
-import { PersistenceManager } from "../../../managers/persistenceManager";
-import { Longan } from "gs-bim-air";
-import { CardCENTER } from "../../../../caeCardEditor/caeCardObjects/sacinp/cardCENTER";
-import { DesignBaseObject } from "gs-ceec-design";
-/**
- * SACSInp的Center卡片数据.
- */
-export class ModelCenter extends DesignBaseObject {
-  typeName = "ModelCenter";
-
-  cardData: string = null;
-
-  cardObject: CardCENTER = null;
-
-  constructor() {
-    super();
-  }
-
-  serialize(): any {
-    let obj = super.serialize();
-
-    if (this.cardObject) {
-      obj.cardData = this.cardObject.getLine();
-    } else if (this.cardData) {
-      obj.cardData = this.cardData;
-    }
-
-    return obj;
-  }
-
-  deserialize(obj: any, pm: PersistenceManager) {
-    super.deserialize(obj, pm);
-
-    if (obj.cardData) {
-      this.cardData = obj.cardData;
-      this.cardObject = new CardCENTER(this.cardData);
-    }
-
-    this.setNeedUpdate();
-  }
-
-  protected clone(cloneObj: any, cloneManager?: Longan.CloneManager) {
-    cloneObj = super.clone(cloneObj);
-    cloneObj.cardData = this.cardData;
-
-    return cloneObj;
-  }
-
-  serializeToCard() {
-    let result = null;
-
-    result = this.cardObject.getLine();
-
-    return result;
-  }
-}
+import { DesignBaseObject } from "gs-ceec-design";
+import { PersistenceManager } from "../../../managers/persistenceManager";
+import { Longan } from "gs-bim-air";
+import { CardSURFDR } from "../../../../caeCardEditor/caeCardObjects/sacinp/cardSURFDR";
+/**
+ * SACSInp的SURFDR卡片数据.
+ */
+export class ModelSurfDR extends DesignBaseObject {
+  typeName = "ModelSurfDR";
+
+  cardData: string = null;
+
+  cardObject: CardSURFDR = null;
+
+  constructor() {
+    super();
+  }
+
+  serialize(): any {
+    let obj = super.serialize();
+
+    if (this.cardObject) {
+      obj.cardData = this.cardObject.getLine();
+    } else if (this.cardData) {
+      obj.cardData = this.cardData;
+    }
+
+    return obj;
+  }
+
+  deserialize(obj: any, pm: PersistenceManager) {
+    super.deserialize(obj, pm);
+
+    if (obj.cardData) {
+      this.cardData = obj.cardData;
+      this.cardObject = new CardSURFDR(this.cardData);
+    }
+
+    this.setNeedUpdate();
+  }
+
+  protected clone(cloneObj: any, cloneManager?: Longan.CloneManager) {
+    cloneObj = super.clone(cloneObj);
+    cloneObj.cardData = this.cardData;
+
+    return cloneObj;
+  }
+
+  serializeToCard() {
+    let result = null;
+
+    result = this.cardObject.getLine();
+
+    return result;
+  }
+}

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

@@ -22,6 +22,17 @@ export class PGrupObject extends DesignBaseObject implements IReferenceObject {
   yieldStress: number = null;
   weightDensity: number = null;
 
+  override get name() {
+    return this._name;
+  }
+  
+  override set name(value) {
+    (Process.activeProcess as Process).nameMapPGrup.delete(this.name);
+
+    this._name = value;
+    (Process.activeProcess as Process).nameMapPGrup.set(value, this);
+  }
+
   public get thickness() {
     return this._thickness;
   }

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

@@ -94,6 +94,17 @@ export class PlateObject extends PolylineObject implements IReferencedObject {
   // 有限元网格比例.
   finiteElementCoeff = 1.0;
 
+  override get name() {
+    return this._name;
+  }
+  
+  override set name(value) {
+    (Process.activeProcess as Process).nameMapPlate.delete(this.name);
+
+    this._name = value;
+    (Process.activeProcess as Process).nameMapPlate.set(value, this);
+  }
+
   get additionalProperty() {
     return this._additionalProperty;
   }