gs-cae-design 1.1.60 → 1.1.62

package/src/gsDevFx/managers/datWriterManager.ts

@@ -29,7 +29,7 @@ import { SeastateHydro2 } from "../objects/caeObjects/optionObjects/seastateHydr
 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 { CdmRenderObject } from "../objects/caeObjects/optionObjects/cdmRenderObject";
 import { ModelOptions } from "../objects/caeObjects/optionObjects/modelOptions";
 import { ModelCodeIs } from "../objects/caeObjects/optionObjects/modelCodeIs";
 import {
@@ -53,6 +53,7 @@ import { SelectorFiliter } from "./interfaceManagers/selectionInterfaceManager";
 import { PileObject } from "../objects/caeObjects/pileObject";
 import { ColorDivComponentGroupObject } from "../objects/pretreatmentObjects/colorDivComponentGroupObject";
 import { DeadLoadObject } from '../objects/caeObjects/aftertreatment/deadLoadObject'
+import {WindShieldObject} from '../objects/caeObjects/pretreatment/windShieldObject'
 export class DatWriterManager extends Longan.ViewerManagerBase {
   constructor(viewer: Viewer) {
     super(viewer);
@@ -269,7 +270,7 @@ export class DatWriterManager extends Longan.ViewerManagerBase {
     ) as SeastateFile[];
     datCardData = this.renderobjectsSerializeToCard(files, datCardData);
 
-    let cdms = process.findRenderObjectsByType("SeastateCdm") as SeastateCdm[];
+    let cdms = process.findRenderObjectsByType("CdmRenderObject") as CdmRenderObject[];
     if (cdms.length > 0) {
       datCardData += "CDM" + "\n";
     }
@@ -409,6 +410,10 @@ export class DatWriterManager extends Longan.ViewerManagerBase {
     }
     datCardData = this.renderobjectsSerializeToCard(plates, datCardData);
 
+
+
+
+
     let loadNode = process.findCaeObjectByNameInChildObject(
       process.caeRenderObjectTreeManager.postResultNode,
       "荷载工况"
@@ -461,6 +466,8 @@ export class DatWriterManager extends Longan.ViewerManagerBase {
       }
     }
 
+
+
     // 回转中心
       let cneterRollNode = process.findCaeObjectByNameInChildObject(
         process.caeRenderObjectTreeManager.pretreatmentNode,
@@ -481,6 +488,23 @@ export class DatWriterManager extends Longan.ViewerManagerBase {
         }
       }
 
+    // 风载屏蔽区域
+    let windShieldNode = process.findCaeObjectByNameInChildObject(
+      process.caeRenderObjectTreeManager.pretreatmentNode,
+      "风载屏蔽区域"
+    ) as WindShieldObject;
+    if (windShieldNode) {
+        for (let i = 0; i < windShieldNode.childObjects.length; i++) {
+          let child = windShieldNode.childObjects[i] as WindShieldObject;
+          if (
+            child.businessState === BusinessState.Deleting ||
+            child.businessState === BusinessState.Dead
+          ) {
+            continue;
+          }
+          datCardData += child.serializeToCard() + '\n';
+        }
+    }
     // 表面定义
     let SurfaceDefinitionNode = process.findCaeObjectByNameInChildObject(
       process.caeRenderObjectTreeManager.pretreatmentNode,

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

@@ -61,6 +61,7 @@ import CommandViewLoadProperty from "../../../viewerWrapper/commands/pretreatmen
 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 CommandAddCoefficientDragMass from '../../../viewerWrapper/commands/aftertreatment/addCoefficientDragMass/commandAddCoefficientDragMass'
 import CommandPostResultCloud from "../../../viewerWrapper/commands/aftertreatment/postResultCloud/commandPostResultCloud";
 import CommandDistortion from "../../../viewerWrapper/commands/aftertreatment/distortion/commandDistortion";
 import CommandShowBendingMoment from "../../../viewerWrapper/commands/aftertreatment/showBendingMoment/commandShowBendingMoment";
@@ -107,6 +108,8 @@ import CommandSurfaceDefinitionEdit from "../../../viewerWrapper/commands/pretre
 import CommandSurfaceWeightAdd from "../../../viewerWrapper/commands/pretreatment/surfaceWeightAdd/commandSurfaceWeightAdd";
 import CommandSurfaceWeightEdit from "../../../viewerWrapper/commands/pretreatment/surfaceWeightEdit/commandSurfaceWeightEdit";
 import CommandAddDeadLoad from '../../../viewerWrapper/commands/aftertreatment/addDeadLoad/commandAddDeadLoad'
+import CommandEditDeadLoad from '../../../viewerWrapper/commands/aftertreatment/editDeadLoad/commandEditDeadLoad'
+import CommandWindShield from '../../../viewerWrapper/commands/pretreatment/windShield/commandWindShield'
 import { SectionViewer } from "../../../gsDevFx/sectionViewer";
 export class CommandInterfaceManager extends Longan.ViewerManagerBase {
   constructor(viewer: Viewer) {
@@ -1214,6 +1217,20 @@ export class CommandInterfaceManager extends Longan.ViewerManagerBase {
     return command;
   }
 
+  /**
+   * 进入拖拽系数命令
+   * @returns 命令的对象
+   */
+  commandAddCoefficientDragMass() {
+    let command = new CommandAddCoefficientDragMass();
+    (this.viewer.process.commandManager as CommandManager).multiplyExecute(
+      command
+    );
+    command = this.viewer.process.commandManager
+      .currentCommand as CommandAddCoefficientDragMass;
+    return command;
+  }
+
   /**
    * 进入添加空间点荷载命令
    * @returns 命令的对象
@@ -1680,6 +1697,15 @@ export class CommandInterfaceManager extends Longan.ViewerManagerBase {
       .currentCommand as CommandSurfaceWeightEdit;
     return command;
   }
+  CommandWindShield(){
+    let command = new CommandWindShield();
+    (this.viewer.process.commandManager as CommandManager).multiplyExecute(
+      command
+    );
+    command = this.viewer.process.commandManager
+      .currentCommand as CommandWindShield;
+    return command;
+  }
   commandAddDeadLoad(){
        let command = new CommandAddDeadLoad();
     (this.viewer.process.commandManager as CommandManager).multiplyExecute(
@@ -1689,6 +1715,15 @@ export class CommandInterfaceManager extends Longan.ViewerManagerBase {
       .currentCommand as CommandAddDeadLoad;
     return command;
   }
+  commandEditDeadLoad(){
+       let command = new CommandEditDeadLoad();
+    (this.viewer.process.commandManager as CommandManager).multiplyExecute(
+      command
+    );
+    command = this.viewer.process.commandManager
+      .currentCommand as CommandEditDeadLoad;
+    return command;
+  }
   closeAllCommand() {
     (this.viewer.process.commandManager as CommandManager).closeAllCommands();
   }

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

@@ -35,6 +35,7 @@ import { LoadConditionObject } from "../../../gsDevFx/objects/loadObjects/loadCo
 import { LoadGroupObject } from "../../../gsDevFx/objects/loadObjects/loadGroupObject";
 import { JointLoadObject } from "../../../gsDevFx/objects/loadObjects/jointLoadObject";
 import { CurrLoadObject } from "../../../gsDevFx/objects/loadObjects/currLoadObject";
+import { CdmRenderObject } from "../../../gsDevFx/objects/caeObjects/optionObjects/cdmRenderObject";
 import { Message } from "element-ui";
 import { LegendManage } from "../../../viewerWrapper/module/legendManage";
 
@@ -586,7 +587,7 @@ export class CommonInterfaceManager extends Longan.ViewerManagerBase {
 
   // 导入DAT
   importDATData(content: string, overWrite: boolean = false) {
-    console.log("importDATData");
+    console.log("importDATData",content);
     (this.viewer as Viewer).datReaderManager.importDATData(content, overWrite);
 
     this.viewer.updateDisplay();
@@ -1896,6 +1897,15 @@ export class CommonInterfaceManager extends Longan.ViewerManagerBase {
     return currLoad;
   }
 
+  /**
+   * 创建拖拽系数对象
+   * @returns
+   */
+  createCdmRenderObject() {
+    let cdmObject = new CdmRenderObject();
+    return cdmObject;
+  }
+
   /**
    * 添加点荷载
    * @param loadConditionRO 工况对象

package/src/gsDevFx/managers/persistenceManager.ts

@@ -61,7 +61,7 @@ import { SeastateHydro2 } from "../objects/caeObjects/optionObjects/seastateHydr
 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 { CdmRenderObject } from "../objects/caeObjects/optionObjects/cdmRenderObject";
 import { CorrzObject } from "../objects/caeObjects/pretreatment/corrzObject";
 import { MgrovObject } from "../objects/caeObjects/pretreatment/mgrovObject";
 import { CutlineGrupThicknessObject } from "../objects/pretreatmentObjects/cutlineGrupThicknessObject";
@@ -70,6 +70,7 @@ import { SeastateWind } from "../objects/caeObjects/optionObjects/seastateWind";
 import { SeastateCurr } from "../objects/caeObjects/optionObjects/seastateCurr";
 import { SeastateLcomb } from "../objects/caeObjects/optionObjects/seastateLcomb";
 import { DeadLoadObject } from '../objects/caeObjects/aftertreatment/deadLoadObject'
+import {WindShieldObject} from "../objects/caeObjects/pretreatment/windShieldObject";
 export class PersistenceManager extends Longan.PersistenceManager {
   referenceList = new Longan.StringKeyList<IReferenceObject>();
   needReferenceList = new Longan.List<IReferencedObject>();
@@ -219,6 +220,7 @@ export class PersistenceManager extends Longan.PersistenceManager {
       MemberLoadDistributedObject.prototype
     );
     this.typeList.add('DeadLoadObject',DeadLoadObject.prototype)
+    this.typeList.add('WindShieldObject',WindShieldObject.prototype)
     // 项目配置数据.
     this.typeList.add("ModelTitle", ModelTitle.prototype);
     this.typeList.add("ModelOptions", ModelOptions.prototype);
@@ -229,7 +231,7 @@ export class PersistenceManager extends Longan.PersistenceManager {
     this.typeList.add("SeastateLcsel", SeastateLcsel.prototype);
     this.typeList.add("SeastateUcpart", SeastateUcpart.prototype);
     this.typeList.add("SeastateFile", SeastateFile.prototype);
-    this.typeList.add("SeastateCdm", SeastateCdm.prototype);
     this.typeList.add("SeastateLcomb", SeastateLcomb.prototype);
+    this.typeList.add("CdmRenderObject", CdmRenderObject.prototype);
   }
 }

package/src/gsDevFx/objects/caeObjects/aftertreatment/deadLoadObject.ts

@@ -19,9 +19,9 @@ export class DeadLoadObject extends DesignBaseObject {
   includeMarineGrowthOnly: string = "";
   dlRationalOption: string = "";
 
-  constructor(loadConditionName) {
+  constructor(loadConditionName = '') {
     super();
-    this.name = loadConditionName;
+    this.name = loadConditionName ?loadConditionName :'';
     this.instanceTypes.add("main", InstanceRenderObject.prototype);
   }
   serialize(): any {

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

@@ -1702,6 +1702,10 @@ export class MemberObject extends LineObject implements IReferencedObject {
       }
     }
 
+    if(length < 0) {
+      length = 0;
+    }
+
     return length;
   }
 

package/src/gsDevFx/objects/caeObjects/optionObjects/cdmRenderObject.ts

@@ -0,0 +1,95 @@
+import { Longan } from "gs-bim-air";
+import { CardCDM } from "../../../../caeCardEditor/caeCardObjects/seainp/cardCDM";
+import { DesignBaseObject } from "gs-ceec-design";
+import { CaeNumber } from "../../../../utility/utility";
+
+/**
+ * CDM
+ */
+export class CdmRenderObject extends DesignBaseObject {
+  typeName = "CdmRenderObject";
+
+  defaultTableSelection: string = "";
+  
+  diameter: number = 0;
+  cleanMember_normalDragCoef: number = 0;
+  cleanMember_tangentialDragCoef: number = 0;
+  cleanMember_normalInertiaCoeff: number = 0;
+  cleanMember_tangentialInertiaCoef: number = 0;
+  fouledMember_normalDragCoef: number = 0;
+  fouledMember_tangentialDragCoef: number = 0;
+  fouledMember_normalInertiaCoef: number = 0;
+  fouledMember_tangentialInertiaCoef: number = 0;
+
+  public constructor() {
+    super();
+  }
+
+  serialize(): void {
+    let obj = super.serialize();
+    if(this.defaultTableSelection) {
+      obj.defaultTableSelection = this.defaultTableSelection;
+    }
+    if(this.notNullAndNotUndefined(this.diameter)) {
+      obj.diameter = this.diameter;
+    }
+    if(this.notNullAndNotUndefined(this.cleanMember_normalDragCoef)) {
+      obj.cleanMember_normalDragCoef = this.cleanMember_normalDragCoef;
+    }
+    if(this.notNullAndNotUndefined(this.cleanMember_tangentialDragCoef)) {
+      obj.cleanMember_tangentialDragCoef = this.cleanMember_tangentialDragCoef;
+    }
+    if(this.notNullAndNotUndefined(this.cleanMember_normalInertiaCoeff)) {
+      obj.cleanMember_normalInertiaCoeff = this.cleanMember_normalInertiaCoeff;
+    }
+    if(this.notNullAndNotUndefined(this.cleanMember_tangentialInertiaCoef)) {
+      obj.cleanMember_tangentialInertiaCoef = this.cleanMember_tangentialInertiaCoef;
+    }
+    if(this.notNullAndNotUndefined(this.fouledMember_normalDragCoef)) {
+      obj.fouledMember_normalDragCoef = this.fouledMember_normalDragCoef;
+    }
+    if(this.notNullAndNotUndefined(this.fouledMember_tangentialDragCoef)) {
+      obj.fouledMember_tangentialDragCoef = this.fouledMember_tangentialDragCoef;
+    }
+    if(this.notNullAndNotUndefined(this.fouledMember_normalInertiaCoef)) {
+      obj.fouledMember_normalInertiaCoef = this.fouledMember_normalInertiaCoef;
+    }
+    if(this.notNullAndNotUndefined(this.fouledMember_tangentialInertiaCoef)) {
+      obj.fouledMember_tangentialInertiaCoef = this.fouledMember_tangentialInertiaCoef;
+    }
+
+    return obj;
+  }
+
+  deserialize(obj: any, pm?: Longan.PersistenceManager): void {
+    super.deserialize(obj);
+
+    this.defaultTableSelection = obj.defaultTableSelection;
+    this.diameter = CaeNumber(obj.diameter)
+    this.cleanMember_normalDragCoef = CaeNumber(obj.cleanMember_normalDragCoef)
+    this.cleanMember_tangentialDragCoef = CaeNumber(obj.cleanMember_tangentialDragCoef)
+    this.cleanMember_normalInertiaCoeff = CaeNumber(obj.cleanMember_normalInertiaCoeff)
+    this.cleanMember_tangentialInertiaCoef = CaeNumber(obj.cleanMember_tangentialInertiaCoef)
+    this.fouledMember_normalDragCoef = CaeNumber(obj.fouledMember_normalDragCoef)
+    this.fouledMember_tangentialDragCoef = CaeNumber(obj.fouledMember_tangentialDragCoef)
+    this.fouledMember_normalInertiaCoef = CaeNumber(obj.fouledMember_normalInertiaCoef)
+    this.fouledMember_tangentialInertiaCoef = CaeNumber(obj.fouledMember_tangentialInertiaCoef)
+  }
+
+  serializeToCard() {
+    let cardCDM = new CardCDM();
+    
+    cardCDM.defaultTableSelection.value = this.defaultTableSelection
+    cardCDM.diameter.value = this.diameter ? this.diameter.toString() : ""
+    cardCDM.cleanMember_normalDragCoef.value = this.cleanMember_normalDragCoef ? this.cleanMember_normalDragCoef.toString() : ""
+    cardCDM.cleanMember_tangentialDragCoef.value = this.cleanMember_tangentialDragCoef ? this.cleanMember_tangentialDragCoef.toString() : ""
+    cardCDM.cleanMember_normalInertiaCoeff.value = this.cleanMember_normalInertiaCoeff ? this.cleanMember_normalInertiaCoeff.toString() : ""
+    cardCDM.cleanMember_tangentialInertiaCoef.value = this.cleanMember_tangentialInertiaCoef ? this.cleanMember_tangentialInertiaCoef.toString() : ""
+    cardCDM.fouledMember_normalDragCoef.value = this.fouledMember_normalDragCoef ? this.fouledMember_normalDragCoef.toString() : ""
+    cardCDM.fouledMember_tangentialDragCoef.value = this.fouledMember_tangentialDragCoef ? this.fouledMember_tangentialDragCoef.toString() : ""
+    cardCDM.fouledMember_normalInertiaCoef.value = this.fouledMember_normalInertiaCoef ? this.fouledMember_normalInertiaCoef.toString() : ""
+    cardCDM.fouledMember_tangentialInertiaCoef.value = this.fouledMember_tangentialInertiaCoef ? this.fouledMember_tangentialInertiaCoef.toString() : ""
+
+    return cardCDM.getLine();
+  }
+}

package/src/gsDevFx/objects/caeObjects/pretreatment/centerRenderObject.ts

@@ -16,12 +16,13 @@ export class CenterRenderObject extends DesignBaseObject {
   // X坐标
   coordinatesX: string = "";
   // Y坐标
-  coordinatesY:string = "";
+  coordinatesY: string = "";
   // Z坐标
   coordinatesZ: string = "";
 
-  constructor() {
+  constructor(centerID) {
     super();
+    this.name = centerID;
     this.instanceTypes.add("main", InstanceRenderObject.prototype);
   }
   serialize(): any {
@@ -34,15 +35,9 @@ export class CenterRenderObject extends DesignBaseObject {
     if (this.centerID) {
       obj.centerID = this.centerID;
     }
-    if (this.coordinatesX) {
-      obj.coordinatesX = this.coordinatesX;
-    }
-    if (this.coordinatesY) {
-      obj.coordinatesY = this.coordinatesY;
-    }
-    if (this.coordinatesZ) {
-      obj.coordinatesZ = this.coordinatesZ;
-    }
+    obj.coordinatesX = this.coordinatesX;
+    obj.coordinatesY = this.coordinatesY;
+    obj.coordinatesZ = this.coordinatesZ;
     return obj;
   }
   deserialize(obj: any, pm: PersistenceManager) {
@@ -51,15 +46,9 @@ export class CenterRenderObject extends DesignBaseObject {
     if (obj.centerID) {
       this.centerID = obj.centerID;
     }
-    if (obj.coordinatesX) {
-      this.coordinatesX = CaeNumber(obj.coordinatesX);
-    }
-    if (obj.coordinatesY) {
-      this.coordinatesY = CaeNumber(obj.coordinatesY);
-    }
-    if (obj.coordinatesZ) {
-      this.coordinatesZ = CaeNumber(obj.coordinatesZ);
-    }
+    this.coordinatesX = CaeNumber(obj.coordinatesX);
+    this.coordinatesY = CaeNumber(obj.coordinatesY);
+    this.coordinatesZ = CaeNumber(obj.coordinatesZ);
   }
   protected clone(cloneObj: any, cloneManager?: Longan.CloneManager) {
     cloneObj = super.clone(cloneObj);
@@ -79,10 +68,16 @@ export class CenterRenderObject extends DesignBaseObject {
     let cardCENTER = new CardCENTER();
     cardCENTER.lineLabel.value = "CENTER";
     cardCENTER.centerID.value = this.centerID;
-    //  需要将数字转为字符串，卡片编辑就是处理字符串
-    cardCENTER.coordinatesX.value = this.coordinatesX ? this.coordinatesX.toString() : ""
-    cardCENTER.coordinatesY.value = this.coordinatesY ? this.coordinatesY.toString() : ""
-    cardCENTER.coordinatesZ.value = this.coordinatesZ ? this.coordinatesZ.toString() : ""
+
+    // 统一处理 XYZ
+    cardCENTER.coordinatesX.value = this.isNumber(this.coordinatesX) ? String(this.coordinatesX) : null;
+    cardCENTER.coordinatesY.value = this.isNumber(this.coordinatesY) ? String(this.coordinatesY) : null;
+    cardCENTER.coordinatesZ.value = this.isNumber(this.coordinatesZ) ? String(this.coordinatesZ) : null;
+
     return cardCENTER.getLine();
   }
+
+  isNumber(val) {
+    return val !== "" && val !== null && val !== undefined && !isNaN(val);
+  }
 }

package/src/gsDevFx/objects/caeObjects/pretreatment/windShieldObject.ts

@@ -0,0 +1,106 @@
+import { PersistenceManager } from "../../../managers/persistenceManager";
+import { InstanceRenderObject } from "../../instancesObjects/instanceRenderObject";
+import { DesignBaseObject } from "gs-ceec-design";
+import { CaeNumber } from "../../../../utility/utility";
+import { Longan } from "gs-bim-air";
+import { CardWINSHL } from "../../../../caeCardEditor/caeCardObjects/sacinp/cardWINSHL";
+
+export class WindShieldObject extends DesignBaseObject {
+  typeName = "WindShieldObject";
+  cardData: string = "";
+  cardObject: CardWINSHL = null;
+  zone1Bottom: string = "";
+  zone1Top: string = "";
+  zone2Bottom: string = "";
+  zone2Top: string = "";
+  zone3Bottom: string = "";
+  zone3Top: string = "";
+  zone4Bottom: string = "";
+  zone4Top: string = "";
+  constructor() {
+    super();
+    this.instanceTypes.add("main", InstanceRenderObject.prototype);
+  }
+  serialize(): any {
+    let obj = super.serialize();
+    if (this.cardObject) {
+      obj.cardData = this.cardObject.getLine();
+    } else if (this.cardData) {
+      obj.cardData = this.cardData;
+    }
+    if (this.zone1Bottom) {
+      obj.zone1Bottom = this.zone1Bottom;
+    }
+    if (this.zone1Top) {
+      obj.zone1Top = this.zone1Top;
+    }
+    if (this.zone2Bottom) {
+      obj.zone2Bottom = this.zone2Bottom;
+    }
+    if (this.zone2Top) {
+      obj.zone2Top = this.zone2Top;
+    }
+    if (this.zone3Bottom) {
+      obj.zone3Bottom = this.zone3Bottom;
+    }
+    if (this.zone3Top) {
+      obj.zone3Top = this.zone3Top;
+    }
+    if (this.zone4Bottom) {
+      obj.zone4Bottom = this.zone4Bottom;
+    }
+    if (this.zone4Top) {
+      obj.zone4Top = this.zone4Top;
+    }
+    return obj;
+  }
+  deserialize(obj: any, pm: PersistenceManager) {
+    super.deserialize(obj, pm);
+    if (obj.cardData) {
+      this.cardData = obj.cardData;
+    }
+    if (obj.zone1Bottom) {
+      this.zone1Bottom = CaeNumber(obj.zone1Bottom);
+    }
+    if (obj.zone1Top) {
+      this.zone1Top = CaeNumber(obj.zone1Top);
+    }
+    if (obj.zone2Bottom) {
+      this.zone2Bottom = CaeNumber(obj.zone2Bottom);
+    }
+    if (obj.zone2Top) {
+      this.zone2Top = CaeNumber(obj.zone2Top);
+    }
+    if (obj.zone3Bottom) {
+      this.zone3Bottom = CaeNumber(obj.zone3Bottom);
+    }
+    if (obj.zone3Top) {
+      this.zone3Top = CaeNumber(obj.zone3Top);
+    }
+    if (obj.zone4Bottom) {
+      this.zone4Bottom = CaeNumber(obj.zone4Bottom);
+    }
+    if (obj.zone4Top) {
+      this.zone4Top = CaeNumber(obj.zone4Top);
+    }
+  }
+  protected clone(cloneObj: any, cloneManager?: Longan.CloneManager) {
+    cloneObj = super.clone(cloneObj);
+    cloneObj.cardData = this.cardData;
+
+    return cloneObj;
+  }
+  serializeToCard() {
+    let cardWINSHL = new CardWINSHL();
+    cardWINSHL.lineLabel.value = "WINSHL";
+    cardWINSHL.zone1Bottom.value = this.zone1Bottom ?this.zone1Bottom.toString() :"";
+    cardWINSHL.zone1Top.value = this.zone1Top ?this.zone1Top.toString() :"";
+    cardWINSHL.zone2Bottom.value = this.zone2Bottom ?this.zone2Bottom.toString() :"";
+    cardWINSHL.zone2Top.value = this.zone2Top ?this.zone2Top.toString() :"";
+    cardWINSHL.zone3Bottom.value = this.zone3Bottom ?this.zone3Bottom.toString() :"";
+    cardWINSHL.zone3Top.value = this.zone3Top ?this.zone3Top.toString() :"";
+    cardWINSHL.zone4Bottom.value = this.zone4Bottom ?this.zone4Bottom.toString() :"";
+    cardWINSHL.zone4Top.value = this.zone4Top ?this.zone4Top.toString() :"";
+    return cardWINSHL.getLine();
+  }
+}

package/src/gsDevFx/objects/loadObjects/currLoadObject.ts

@@ -82,6 +82,15 @@ export class CurrLoadObject extends DesignBaseObject {
     if(this.isElevationPercentOption) {
       obj.isElevationPercentOption = this.isElevationPercentOption
     }
+    if(this.notNullAndNotUndefined(this.currentVelocity)) {
+      obj.currentVelocity = this.currentVelocity
+    }
+    if(this.notNullAndNotUndefined(this.direction)) {
+      obj.direction = this.direction
+    }
+    if(this.notNullAndNotUndefined(this.elevationAboveMudline)) {
+      obj.elevationAboveMudline = this.elevationAboveMudline
+    }
     if(this.isApparentWavePeriodOption) {
       obj.isApparentWavePeriodOption = this.isApparentWavePeriodOption
     }
@@ -119,6 +128,13 @@ export class CurrLoadObject extends DesignBaseObject {
     if(obj.isElevationPercentOption) {
       this.isElevationPercentOption = obj.isElevationPercentOption
     }
+
+    this.currentVelocity = CaeNumber(obj.currentVelocity)
+
+    this.direction = CaeNumber(obj.direction)
+
+    this.elevationAboveMudline = CaeNumber(obj.elevationAboveMudline)
+
     if(obj.isApparentWavePeriodOption) {
       this.isApparentWavePeriodOption = obj.isApparentWavePeriodOption
     }

package/src/gsDevFx/objects/loadObjects/loadConditionObject.ts

@@ -9,6 +9,7 @@ import { JointLoadObject } from "./jointLoadObject";
 import { WaveLoadObject } from "./waveLoadObject";
 import { WindLoadObject } from "./windLoadObject";
 import { CurrLoadObject } from "./currLoadObject";
+import { DeadLoadObject } from '../caeObjects/aftertreatment/deadLoadObject'
 import { SeastateWind } from "../caeObjects/optionObjects/seastateWind";
 import { SeastateWave } from "../caeObjects/optionObjects/seastateWave";
 import { SeastateCurr } from "../caeObjects/optionObjects/seastateCurr";
@@ -79,7 +80,9 @@ export class LoadConditionObject extends DesignBaseObject {
     // 绘制该工况的全部荷载.
     for (let i = 0; i < this.childObjects.length; i++) {
       let loadGroup = this.childObjects[i] as LoadGroupObject;
-      loadGroup.active(viewer);
+      if(loadGroup instanceof LoadGroupObject) {
+        loadGroup.active(viewer);
+      }
     }
   }
 
@@ -87,7 +90,9 @@ export class LoadConditionObject extends DesignBaseObject {
     // 取消该工况全部荷载的绘制.
     for (let i = 0; i < this.childObjects.length; i++) {
       let loadGroup = this.childObjects[i] as LoadGroupObject;
-      loadGroup.inactive(viewer);
+      if(loadGroup instanceof LoadGroupObject) {
+        loadGroup.inactive(viewer);
+      }
     }
   }
 
@@ -126,6 +131,8 @@ export class LoadConditionObject extends DesignBaseObject {
         text += "WAVE\n";
       } else if (child.name === "CURRLoads") {
         text += "CURR\n";
+      } else if (child.name === "DEADLoads") {
+        text += "DEAD\n";
       }
       for (let j = 0; j < child.childObjects.length; j++) {
         let grandChild = child.childObjects[j] as DesignBaseObject;
@@ -146,6 +153,9 @@ export class LoadConditionObject extends DesignBaseObject {
         } else if (grandChild instanceof CurrLoadObject) {
           let result = grandChild.serializeToCard();
           text += result + "\n";
+        } else if (grandChild instanceof DeadLoadObject) {
+          let result = grandChild.serializeToCard();
+          text += result + "\n";
         }
       }
     }

package/src/gsDevFx/objects/loadObjects/waveLoadObject.ts

@@ -59,7 +59,7 @@ export class WaveLoadObject extends DesignBaseObject {
 
   waveAngle: number = 0;
 
-  kinematFactor: number = 0;
+  kinematFactor: number = 1;
 
   orderOfStream: number = 0;
   
@@ -232,10 +232,12 @@ export class WaveLoadObject extends DesignBaseObject {
     cardWAVE.stepSize.value = this.stepSize ? this.stepSize.toString() : ""
     cardWAVE.dynSteps.value = this.notNullAndNotUndefined(this.dynSteps) ? this.dynSteps.toString() : ""
     cardWAVE.staticSteps.value = this.staticSteps ? this.staticSteps.toString() : ""
+    cardWAVE.criticalPosition.value = this.criticalPosition
     cardWAVE.stillWaterDepth.value = this.stillWaterDepth ? this.stillWaterDepth.toString() : ""
     cardWAVE.mudlineElevation.value = this.mudlineElevation ? this.mudlineElevation.toString() : ""
     cardWAVE.memberSegmentationMax.value = this.memberSegmentationMax ? this.memberSegmentationMax.toString() : ""
     cardWAVE.memberSegmentationMin.value = this.memberSegmentationMin ? this.memberSegmentationMin.toString() : ""
+    cardWAVE.printOption.value = this.printOption;
 
     return cardWAVE.getLine();
   }

package/src/gsDevFx/objects/loadObjects/windLoadObject.ts

@@ -54,7 +54,7 @@ export class WindLoadObject extends DesignBaseObject {
 
   memberLoadingOption: MemberLoadingOption = null;
 
-  isWaterDepthRatherThanOriginElevation: boolean = true;
+  isOriginElevationRatherThanWaterDepth: boolean = false;
 
   stillWaterDepthOverride: number = 0;
 
@@ -89,8 +89,8 @@ export class WindLoadObject extends DesignBaseObject {
     if(this.memberLoadingOption) {
       obj.memberLoadingOption = this.memberLoadingOption;
     }
-    if(this.isWaterDepthRatherThanOriginElevation) {
-      obj.isWaterDepthRatherThanOriginElevation = this.isWaterDepthRatherThanOriginElevation;
+    if(this.isOriginElevationRatherThanWaterDepth) {
+      obj.isOriginElevationRatherThanWaterDepth = this.isOriginElevationRatherThanWaterDepth;
     }
     if(this.notNullAndNotUndefined(this.stillWaterDepthOverride)) {
       obj.stillWaterDepthOverride = this.stillWaterDepthOverride;
@@ -122,8 +122,8 @@ export class WindLoadObject extends DesignBaseObject {
     if(this.memberLoadingOption) {
       obj.memberLoadingOption = this.memberLoadingOption;
     }
-    if(this.isWaterDepthRatherThanOriginElevation) {
-      obj.isWaterDepthRatherThanOriginElevation = this.isWaterDepthRatherThanOriginElevation;
+    if(this.isOriginElevationRatherThanWaterDepth) {
+      obj.isOriginElevationRatherThanWaterDepth = this.isOriginElevationRatherThanWaterDepth;
     }
     
     obj.stillWaterDepthOverride = CaeNumber(this.stillWaterDepthOverride);
@@ -149,7 +149,7 @@ export class WindLoadObject extends DesignBaseObject {
 
     cardWIND.memberLoadingOption.value = this.memberLoadingOption
 
-    cardWIND.waterDepthOrOriginElevation.value = this.isWaterDepthRatherThanOriginElevation ? WaterDepthRatherThanOriginElevation.Depth : WaterDepthRatherThanOriginElevation.Elevation
+    cardWIND.waterDepthOrOriginElevation.value = this.isOriginElevationRatherThanWaterDepth ? WaterDepthRatherThanOriginElevation.Elevation : WaterDepthRatherThanOriginElevation.Depth
 
     cardWIND.stillWaterDepthOverride.value = this.stillWaterDepthOverride ? this.stillWaterDepthOverride.toString() : ""