gs-cae-design 1.1.55 → 1.1.57

package/src/gsDevFx/objects/weightObjects/memberWeightConcentratedObject.ts

@@ -0,0 +1,138 @@
+import { InstanceMemberWeightConcentratedObject } from "./instanceMemberWeightConcentratedObject";
+import { CardWGTMEMCONC } from "../../../caeCardEditor/caeCardObjects/sacinp/cardWGTMEMCONC";
+import { CaeNumber } from "../../../utility/utility";
+import { MemberObject } from "../caeObjects/memberObject";
+import { PersistenceManager } from "../../managers/persistenceManager";
+import { MemberWeightBaseObject } from './memberWeightBaseObject'
+
+/**
+ * 杆件上的点质量
+ */
+export class MemberWeightConcentratedObject extends MemberWeightBaseObject {
+  typeName = "MemberWeightConcentratedObject";
+
+  /**
+   * 杆件始点：11-14
+   */
+  memberJointA: string = "";
+  /**
+   * 杆件终点： 15-18
+   */
+  memberJointB: string = "";
+  /**
+   * 始点距离: 19-25
+   */
+  distance: number = 0;
+  /**
+   * 点质量值:26-32
+   */
+  weightValue: number = 0;
+  /**
+   * X质量系数: 47-50
+   */
+  xFactor: number = 0;
+  /**
+   * Y质量系数: 51-54
+   */
+  yFactor: number = 0;
+  /**
+   * Z质量系数: 55-58
+   */
+  zFactor: number = 0;
+  /**
+   * 质量密度: 67-72
+   */
+  density: number = 2.7;
+
+  /**
+   * 考虑附加重量的在水中的浮力和波浪对其施加的负载
+   */
+  isInclude = false;
+
+  public constructor(weightGroupID: string, weightID: string, member: MemberObject) {
+    super(weightGroupID, weightID, member);
+    this.weightType = "CONC";
+
+    this.instanceTypes.add("main", InstanceMemberWeightConcentratedObject.prototype);
+  }
+
+  serialize(): void {
+    let obj = super.serialize();
+
+    if (this.memberJointA) {
+      obj.memberJointA = this.memberJointA;
+    }
+    if (this.memberJointB) {
+      obj.memberJointB = this.memberJointB;
+    }
+    if (this.weightGroupID) {
+      obj.weightGroupID = this.weightGroupID;
+    }
+    if (this.notNullAndNotUndefined(this.weightValue)) {
+      obj.weightValue = this.weightValue;
+    }
+    if (this.weightID) {
+      obj.weightID = this.weightID;
+    }
+    if (this.notNullAndNotUndefined(this.density)) {
+      obj.density = this.density;
+    }
+    if (this.notNullAndNotUndefined(this.xFactor)) {
+      obj.xFactor = this.xFactor;
+    }
+    if (this.notNullAndNotUndefined(this.yFactor)) {
+      obj.yFactor = this.yFactor;
+    }
+    if (this.notNullAndNotUndefined(this.zFactor)) {
+      obj.zFactor = this.zFactor;
+    }
+    obj.isInclude = this.isInclude;
+
+    return obj;
+  }
+
+  deserialize(obj: any, pm?: PersistenceManager): void {
+    super.deserialize(obj, pm);
+
+    if (obj.memberJointA) {
+      this.memberJointA = obj.memberJointA;
+    }
+    if (obj.memberJointB) {
+      this.memberJointB = obj.memberJointB;
+    }
+    if (obj.weightGroupID) {
+      this.weightGroupID = obj.weightGroupID;
+    }
+    if (obj.weightID) {
+      this.weightID = obj.weightID;
+    }
+    this.weightValue = CaeNumber(obj.weightValue);
+    this.density = CaeNumber(obj.density);
+    this.xFactor = CaeNumber(obj.xFactor);
+    this.yFactor = CaeNumber(obj.yFactor);
+    this.zFactor = CaeNumber(obj.zFactor);
+    this.isInclude = obj.isInclude;
+
+    this.name = this.memberJointA +
+      "-" + this.memberJointB
+  }
+
+  serializeToCard() {
+    if(this.member && this.member.checkBusinessStateIsActive()) {
+      let cardWGTMEMCONC = new CardWGTMEMCONC();
+      cardWGTMEMCONC.lineLabel.value = "WGTMEM";
+      cardWGTMEMCONC.jointA.value = this.member.start.name;
+      cardWGTMEMCONC.jointB.value = this.member.end.name;
+      cardWGTMEMCONC.weightGroupID.value = this.weightGroupID;
+      cardWGTMEMCONC.weightValue.value = this.weightValue ? this.weightValue.toString() : "";
+      cardWGTMEMCONC.weightID.value = this.weightID;
+      cardWGTMEMCONC.density.value = this.density ? this.density.toString() : "";
+      cardWGTMEMCONC.xFactor.value = this.xFactor ? this.xFactor.toString() : "";
+      cardWGTMEMCONC.yFactor.value = this.yFactor ? this.yFactor.toString() : "";
+      cardWGTMEMCONC.zFactor.value = this.zFactor ? this.zFactor.toString() : "";
+
+      return cardWGTMEMCONC.getLine();
+    }
+    return null
+  }
+}

package/src/gsDevFx/objects/weightObjects/memberWeightDistributedObject.ts

@@ -0,0 +1,156 @@
+import { InstanceMemberWeightDistributedObject } from "./instanceMemberWeightDistributedObject";
+import { CardWGTMEMUNIF } from "../../../caeCardEditor/caeCardObjects/sacinp/cardWGTMEMUNIF";
+import { CaeNumber } from "../../../utility/utility";
+import { MemberObject } from "../caeObjects/memberObject";
+import { PersistenceManager } from "../../managers/persistenceManager";
+import { MemberWeightBaseObject } from './memberWeightBaseObject'
+
+/**
+ * 杆件上的分布质量
+ */
+export class MemberWeightDistributedObject extends MemberWeightBaseObject {
+  typeName = "MemberWeightDistributedObject";
+
+  /**
+   * 杆件始点：11-14
+   */
+  memberJointA: string = "";
+  /**
+   * 杆件终点： 15-18
+   */
+  memberJointB: string = "";
+  /**
+   * 始点距离: 19-25
+   */
+  distance: number = 0;
+  /**
+   * 点质量值:26-32
+   */
+  weightValue: number = 0;
+  /**
+   * 质量分布长度:33-39
+   */
+  weightActiveLength: number = 0;
+  /**
+   * 最终质量值:41-46
+   */
+  finalDistanceWeightValue: number = 0;
+  /**
+   * X质量系数: 47-50
+   */
+  xFactor: number = 0;
+  /**
+   * Y质量系数: 51-54
+   */
+  yFactor: number = 0;
+  /**
+   * Z质量系数: 55-58
+   */
+  zFactor: number = 0;
+  /**
+   * 质量密度: 67-72
+   */
+  density: number = 2.7;
+
+  /**
+   * 考虑附加重量的在水中的浮力和波浪对其施加的负载
+   */
+  isInclude = false;
+
+  public constructor(weightGroupID: string, weightID: string, member: MemberObject) {
+    super(weightGroupID, weightID, member);
+    this.weightType = "UNIF";
+
+    this.instanceTypes.add("main", InstanceMemberWeightDistributedObject.prototype);
+  }
+
+  serialize(): void {
+    let obj = super.serialize();
+
+    if (this.memberJointA) {
+      obj.memberJointA = this.memberJointA;
+    }
+    if (this.memberJointB) {
+      obj.memberJointB = this.memberJointB;
+    }
+    if (this.weightGroupID) {
+      obj.weightGroupID = this.weightGroupID;
+    }
+    if (this.notNullAndNotUndefined(this.weightValue)) {
+      obj.weightValue = this.weightValue;
+    }
+    if (this.notNullAndNotUndefined(this.weightActiveLength)) {
+      obj.weightActiveLength = this.weightActiveLength;
+    }
+    if (this.notNullAndNotUndefined(this.finalDistanceWeightValue)) {
+      obj.finalDistanceWeightValue = this.finalDistanceWeightValue;
+    }
+    if (this.weightID) {
+      obj.weightID = this.weightID;
+    }
+    if (this.notNullAndNotUndefined(this.density)) {
+      obj.density = this.density;
+    }
+    if (this.notNullAndNotUndefined(this.xFactor)) {
+      obj.xFactor = this.xFactor;
+    }
+    if (this.notNullAndNotUndefined(this.yFactor)) {
+      obj.yFactor = this.yFactor;
+    }
+    if (this.notNullAndNotUndefined(this.zFactor)) {
+      obj.zFactor = this.zFactor;
+    }
+    obj.isInclude = this.isInclude;
+
+    return obj;
+  }
+
+  deserialize(obj: any, pm?: PersistenceManager): void {
+    super.deserialize(obj, pm);
+
+    if (obj.memberJointA) {
+      this.memberJointA = obj.memberJointA;
+    }
+    if (obj.memberJointB) {
+      this.memberJointB = obj.memberJointB;
+    }
+    if (obj.weightGroupID) {
+      this.weightGroupID = obj.weightGroupID;
+    }
+    if (obj.weightID) {
+      this.weightID = obj.weightID;
+    }
+    this.weightValue = CaeNumber(obj.weightValue);
+    this.weightActiveLength = CaeNumber(obj.weightActiveLength);
+    this.finalDistanceWeightValue = CaeNumber(obj.finalDistanceWeightValue);
+    this.density = CaeNumber(obj.density);
+    this.xFactor = CaeNumber(obj.xFactor);
+    this.yFactor = CaeNumber(obj.yFactor);
+    this.zFactor = CaeNumber(obj.zFactor);
+    this.isInclude = obj.isInclude;
+
+    this.name = this.memberJointA +
+      "-" + this.memberJointB
+  }
+
+  serializeToCard() {
+    if(this.member && this.member.checkBusinessStateIsActive()) {
+      let cardWGTMEMUNIF = new CardWGTMEMUNIF();
+      cardWGTMEMUNIF.lineLabel.value = "WGTMEM";
+      cardWGTMEMUNIF.jointA.value = this.member.start.name;
+      cardWGTMEMUNIF.jointB.value = this.member.end.name;
+      cardWGTMEMUNIF.weightGroupID.value = this.weightGroupID;
+      cardWGTMEMUNIF.weightValue.value = this.weightValue ? this.weightValue.toString() : "";
+      cardWGTMEMUNIF.weightActiveLength.value = this.weightActiveLength ? this.weightActiveLength.toString() : "";
+      cardWGTMEMUNIF.finalDistanceWeightValue.value = this.finalDistanceWeightValue ? this.finalDistanceWeightValue.toString() : "";
+      cardWGTMEMUNIF.weightID.value = this.weightID;
+      cardWGTMEMUNIF.density.value = this.density ? this.density.toString() : "";
+      cardWGTMEMUNIF.xFactor.value = this.xFactor ? this.xFactor.toString() : "";
+      cardWGTMEMUNIF.yFactor.value = this.yFactor ? this.yFactor.toString() : "";
+      cardWGTMEMUNIF.zFactor.value = this.zFactor ? this.zFactor.toString() : "";
+
+      return cardWGTMEMUNIF.getLine();
+    }
+    return null
+  }
+}

package/src/gsDevFx/objects/weightObjects/weightBaseObject.ts

@@ -0,0 +1,87 @@
+import { DesignBaseObject } from "gs-ceec-design";
+import { Longan } from "gs-bim-air";
+import { InstanceRenderObject } from "../instancesObjects/instanceRenderObject";
+
+export class WeightBaseObject extends DesignBaseObject {
+  public typeName = "WeightBaseObject";
+
+  private _weightGroupID: string;
+  private _weightID: string;
+  private _weightType: string;
+
+  get weightGroupID() {
+    return this._weightGroupID;
+  }
+
+  set weightGroupID(value) {
+    this._weightGroupID = value;
+  }
+
+  get weightID() {
+    return this._weightID;
+  }
+
+  set weightID(value) {
+    this._weightID = value;
+  }
+
+  get weightType() {
+    return this._weightType;
+  }
+
+  set weightType(value) {
+    this._weightType = value;
+  }
+
+  public constructor(weightGroupID: string, weightID: string) {
+    super();
+    this._weightGroupID = weightGroupID;
+    this._weightID = weightID;
+
+    this.instanceTypes.add("main", InstanceRenderObject.prototype);
+  }
+
+  serialize() {
+    let obj = super.serialize();
+
+    if (this.weightGroupID) {
+      obj.weightGroupID = this.weightGroupID;
+    }
+
+    if (this.weightID) {
+      obj.weightID = this.weightID;
+    }
+
+    if (this._weightType) {
+      obj.weightType = this._weightType;
+    }
+
+    return obj;
+  }
+
+  deserialize(obj: any, pm?: Longan.PersistenceManager): void {
+    super.deserialize(obj, pm);
+
+    if (obj.weightGroupID) {
+      this._weightGroupID = obj.weightGroupID;
+    }
+
+    if (obj.weightID) {
+      this._weightID = obj.weightID;
+    }
+
+    if (obj.weightType) {
+      this._weightType = obj.weightType;
+    }
+  }
+
+  active() {
+    //
+  }
+
+  inactive() {
+    //
+  }
+
+  serializeToCard() {}
+}

package/src/gsDevFx/objects/weightObjects/weightGroupObject.ts

@@ -2,8 +2,10 @@ import { DesignBaseObject } from "gs-ceec-design";
 import { Longan } from "gs-bim-air";
 import { InstanceRenderObject } from "../instancesObjects/instanceRenderObject";
 import { WeightIdObject } from "./weightIdObject";
-// import { WeightBaseObject } from "./weightBaseObject";
+import { WeightBaseObject } from "./weightBaseObject";
 import { JointWeightObject } from "./jointWeightObject";
+import { MemberWeightDistributedObject } from "./memberWeightDistributedObject";
+import { MemberWeightConcentratedObject } from "./memberWeightConcentratedObject";
 
 export class WeightGroupObject extends DesignBaseObject {
   public typeName = "WeightGroupObject";
@@ -79,7 +81,17 @@ export class WeightGroupObject extends DesignBaseObject {
       for (let j = 0; j < child.childObjects.length; j++) {
         let grandChild = child.childObjects[j];
         if (grandChild instanceof JointWeightObject) {
-          let result = (grandChild as JointWeightObject).serializeToCard();
+          let result = (grandChild as WeightBaseObject).serializeToCard();
+          if(result !== null) {
+            text += result + "\n";
+          }
+        }else if (grandChild instanceof MemberWeightDistributedObject) {
+          let result = (grandChild as WeightBaseObject).serializeToCard();
+          if(result !== null) {
+            text += result + "\n";
+          }
+        }else if (grandChild instanceof MemberWeightConcentratedObject) {
+          let result = (grandChild as WeightBaseObject).serializeToCard();
           if(result !== null) {
             text += result + "\n";
           }

package/src/gsDevFx/objects/weightObjects/weightIdObject.ts

@@ -2,8 +2,7 @@ import { DesignBaseObject } from "gs-ceec-design";
 import { Longan } from "gs-bim-air";
 import { InstanceRenderObject } from "../instancesObjects/instanceRenderObject";
 import { InstanceWeightBaseObject } from "./instanceWeightBaseObject";
-// import { WeightBaseObject } from "./weightBaseObject";
-import { JointWeightObject } from "./jointWeightObject";
+import { WeightBaseObject } from "./weightBaseObject";
 
 export class WeightIdObject extends DesignBaseObject {
   public typeName = "WeightIdObject";
@@ -46,7 +45,7 @@ export class WeightIdObject extends DesignBaseObject {
   active(viewer: Longan.Viewer) {
     // 绘制该质量Id的全部质量.
     for (let i = 0; i < this.childObjects.length; i++) {
-      let weight = this.childObjects[i] as JointWeightObject;
+      let weight = this.childObjects[i] as WeightBaseObject;
       if(weight.checkBusinessStateIsActive()) {
         (viewer.findInstanceObject(weight) as InstanceWeightBaseObject).initSvg();
       }
@@ -56,7 +55,7 @@ export class WeightIdObject extends DesignBaseObject {
   inactive(viewer: Longan.Viewer) {
     // 取消该质量Id的绘制.
     for (let i = 0; i < this.childObjects.length; i++) {
-      let weight = this.childObjects[i] as JointWeightObject;
+      let weight = this.childObjects[i] as WeightBaseObject;
       (viewer.findInstanceObject(weight) as InstanceWeightBaseObject).removeSvg();
     }
   }

package/src/gsDevFx/viewer.ts

@@ -405,7 +405,7 @@ export class Viewer extends CEECViewer {
       } else if (ev.ctrlKey == true && key === "v") {
         // console.log("paste");
         // this.pasteComponents();
-      } else if(ev.keyCode === 27) {
+      } else if (ev.keyCode === 27) {
         console.log("esc");
         let camera = this.operatorManager.find("CameraMouse");
         if (camera instanceof CameraMouse) {
@@ -445,9 +445,8 @@ export class Viewer extends CEECViewer {
       let selectedObjs = caeObjectSelector.selectedRenderObjects;
       this.copyedObjects.clear();
 
-
-      if(selectedObjs.count() > 0) {
-        if(this.commonInterfaceManager.copyedExternalEvent) {
+      if (selectedObjs.count() > 0) {
+        if (this.commonInterfaceManager.copyedExternalEvent) {
           this.commonInterfaceManager.copyedExternalEvent();
         }
         console.log("copy success");
@@ -528,7 +527,7 @@ export class Viewer extends CEECViewer {
             this.process.caeRenderObjectTreeManager.nameAscendingOrder(
               neWMember.name,
               1,
-              this.process.nameMapMember,
+              this.process.nameMapMember
             )[0];
 
           let newStart = jointNameMapNewJoint[neWMember.start.name];
@@ -746,9 +745,11 @@ export class Viewer extends CEECViewer {
     deltaName?: string
   ) {
     let stateItem = new Longan.StateItem(oldObj, newObj);
-    stateItem.afterRoll.add((process: Longan.Process, rollType: Longan.RollType) => {
-      afterRoll(stateItem, process, rollType);
-    });
+    stateItem.afterRoll.add(
+      (process: Longan.Process, rollType: Longan.RollType) => {
+        afterRoll(stateItem, process, rollType);
+      }
+    );
 
     let statePack = new Longan.StatePack();
     statePack.add(stateItem);
@@ -797,13 +798,12 @@ export class Viewer extends CEECViewer {
     //注册特有的RenderObject
     return new Promise((resolve, reject) => {
       axios(`/cae-service/projects/${id}/data`).then((modelData: any) => {
-        if(modelData === false) {
+        if (modelData === false) {
           reject("请求模型文件失败：" + id);
         }
 
         if (modelData != null) {
-
-          if(isReplace) {
+          if (isReplace) {
             this.disposeAllRenderObjects();
             this.reset();
           }
@@ -834,10 +834,23 @@ export class Viewer extends CEECViewer {
   disposeAllRenderObjects() {
     let process = this.process;
     let ros = process.renderObjects;
-    ros.forEach((key, value)=>{
+    ros.forEach((key, value) => {
       value.delete();
-    })
+    });
+
+    console.log(
+      "clear all renderObjects---count:",
+      this.process.renderObjects.count()
+    );
+  }
+
+  dispose(): void {
+    if (this.container) {
+      let viewerContainerId = this.container.id;
+      SvgDraw.instance[viewerContainerId] = null;
+      console.log("dispose viewerContainerId:", viewerContainerId);
+    }
 
-    console.log("clear all renderObjects---count:", this.process.renderObjects.count());
+    super.dispose();
   }
 }

package/src/index.ts

@@ -9,7 +9,7 @@ import { Loader } from "gs-bim-air";
 // import SelectorFiliter
 
 const config = require("../package.json");
-console.log(`%c${config.name}: v${config.version}`, "color: #ff8000");
+console.info(`%c${config.name}: v${config.version}`, "color: #ff8000");
 
 const CAEDesign = {
   ViewerWrapper,

package/src/viewerWrapper/commands/aftertreatment/addLoadCombination/addLoadCombinationConfig.ts

@@ -0,0 +1,77 @@
+import { DesignBaseObject } from "gs-ceec-design";
+import { Process } from "../../../../gsDevFx/process";
+import { Config } from "../../../../gsDevFx/propertyComponents/config";
+import { PropertyComponent } from "../../../../gsDevFx/propertyComponents/propertyComponent";
+
+export default class AddLoadCombinationConfig extends Config {
+  constructor() {
+    super();
+
+    let property = new PropertyComponent();
+    property.name = "添加荷载组合";
+
+    property.data = {
+      combinationName: {
+        value: null,
+        name: "荷载组合名",
+      },
+      groupLoadConditions: {
+        value: null,
+        name: "选择的荷载工况",
+        type: "list",
+        listOptions: {
+          list: []
+        }
+      },
+      allLoadConditions: {
+        value: null,
+        name: "荷载工况列表",
+        type: "list",
+        listOptions: {
+          list: []
+        },
+      },
+      tip: {
+        name: "提示",
+        value: null,
+      },
+    };
+
+    this.properties.add(property);
+
+    this.refreshAllLoadConditions()
+  }
+  
+  refreshAllLoadConditions() {
+    let data = this.properties.items[0].data;
+
+    data.allLoadConditions.listOptions.list = [];
+    let loadObjectGroup =
+      Process.activeProcess.findRenderObjectByName("荷载工况");
+    if (loadObjectGroup) {
+        loadObjectGroup.childObjects.map((item) => {
+          if((item as DesignBaseObject).checkBusinessStateIsActive()) {
+            data.allLoadConditions.listOptions.list.push({
+              label: item.name,
+              value: item.name
+            });
+          }
+        });
+    }
+
+    let loadObjectGroup2 =
+      Process.activeProcess.findRenderObjectByName("荷载组合");
+    if (loadObjectGroup2) {
+        loadObjectGroup2.childObjects.map((item) => {
+          if((item as DesignBaseObject).checkBusinessStateIsActive()) {
+            data.allLoadConditions.listOptions.list.push({
+              label: item.name,
+              value: item.name
+            });
+          }
+        });
+    }
+  }
+
+  resetConfigData() {}
+}