gs-cae-design 1.1.55 → 1.1.57

package/src/viewerWrapper/commands/pretreatment/viewWeightProperty/commandViewWeightProperty.ts

@@ -7,12 +7,15 @@ import ViewWeightPropertyConfig from "./viewWeightPropertyConfig";
 import { Longan } from "gs-bim-air";
 import { WeightIdObject } from "../../../../gsDevFx/objects/weightObjects/weightIdObject";
 import { WeightGroupObject } from "../../../../gsDevFx/objects/weightObjects/weightGroupObject";
-import { LoadBaseObject } from "../../../../gsDevFx/objects/loadObjects/loadBaseObject";
+import { WeightBaseObject } from "../../../../gsDevFx/objects/weightObjects/weightBaseObject";
 import { JointWeightObject } from "../../../../gsDevFx/objects/weightObjects/jointWeightObject";
+import { MemberWeightConcentratedObject } from "../../../../gsDevFx/objects/weightObjects/memberWeightConcentratedObject";
+import { MemberWeightDistributedObject } from "../../../../gsDevFx/objects/weightObjects/memberWeightDistributedObject";
+import { WGTMEMObject } from "../../../../gsDevFx/objects/caeObjects/pretreatment/wgtmemObject";
 import store from "../../../../store";
 import { JointObject } from "../../../../gsDevFx/objects/caeObjects/jointObject";
 import { MemberObject } from "../../../../gsDevFx/objects/caeObjects/memberObject";
-import { MemberLoadBaseObject } from "../../../../gsDevFx/objects/loadObjects/memberLoadBaseObject";
+import { MemberWeightBaseObject } from "../../../../gsDevFx/objects/weightObjects/memberWeightBaseObject";
 import { DesignBaseObject } from "gs-ceec-design";
 import { InstanceWeightBaseObject } from "../../../../gsDevFx/objects/weightObjects/instanceWeightBaseObject";
 import { ObjectColor } from "../../../../gsDevFx/objects/caeObjects/objectColors";
@@ -28,6 +31,8 @@ export default class CommandViewWeightProperty extends CommandComponent {
 
   currentHighlightWeights = new Array<InstanceWeightBaseObject>();
 
+  _showWgtmemList = new Array<WGTMEMObject>();
+
   constructor() {
     super();
     // this.bindComponent = () => import("../propertyComponent.vue");
@@ -83,8 +88,34 @@ export default class CommandViewWeightProperty extends CommandComponent {
           }
         }
 
+        this._showWgtmemList = [];
+        let wgtmemParent = this.process.findRenderObjectByName("牺牲阳极定义与显示");
+        for(let i = 0; i < wgtmemParent.childObjects.length; i++) {
+          let child = wgtmemParent.childObjects[i] as WGTMEMObject;
+          if(child.weightGroupID === data.weightGroups.value && child.checkBusinessStateIsActive()) {
+            this._showWgtmemList.push(child)
+          }
+        }
+        if(this._showWgtmemList.length) {
+          data.weightIds.selectOptions.selections.push({
+            label: "ANODE",
+            value: "ANODE",
+          })
+        }
+
+        let result = this.sumWeightGroupForce(
+          self.selectedWeightGroupObject
+        );
         data.status.value =
-          "Sum of Forces: -"
+          "Wx: " +
+          result.x +
+          '(kN)' +
+          "\nWy: " +
+          result.y +
+          '(kN)' +
+          " \nWz: " +
+          result.z +
+          '(kN)'
       }
 
       self.viewer.exeSceneCameraChanged(Longan.LonganCore.CameraChangeType.Rotate);
@@ -127,22 +158,55 @@ export default class CommandViewWeightProperty extends CommandComponent {
                   label: "Joint:" + item.jointName,
                   value: item.name,
                 });
-              } 
-              ///
-              // else if () {
-              //   /// 杆件重量
-              // } else {
-              // }
+              } else if (item instanceof MemberWeightBaseObject) {
+                data.singleWeights.selectOptions.selections.push({
+                  label:
+                    "Member:" +
+                    item.member.start.name +
+                    "-" +
+                    item.member.end.name,
+                  value: item.name,
+                });
+              } else {
+                data.singleWeights.selectOptions.selections.push({
+                  label: "Member:" + item.name,
+                  value: item.name,
+                });
+              }
             }
           }
-        }
-      }
 
-      self.viewer.exeSceneCameraChanged(Longan.LonganCore.CameraChangeType.Rotate);
-      self.viewer.updateDisplay();
+          self.viewer.exeSceneCameraChanged(Longan.LonganCore.CameraChangeType.Rotate);
+          self.viewer.updateDisplay();
 
-      data.status.value =
-        "Sum of Forces: -"
+          let result = this.sumWeightForce(self.selectedWeightIdObject);
+          data.status.value =
+            "Wx: " +
+            result.x +
+            '(kN)' +
+            "\nWy: " +
+            result.y +
+            '(kN)' +
+            " \nWz: " +
+            result.z +
+            '(kN)'
+        }else {
+          self.viewer.exeSceneCameraChanged(Longan.LonganCore.CameraChangeType.Rotate);
+          self.viewer.updateDisplay();
+
+          for(let i = 0; i < this._showWgtmemList.length; i++) {
+            let child = this._showWgtmemList[i] as WGTMEMObject;
+            if(child.checkBusinessStateIsActive()) {
+              data.singleWeights.selectOptions.selections.push({
+                label: "ANODE:" + child.id,
+                value: child.id,
+              });
+            }
+          }
+
+          data.status.value = "Sum weight: " + this.sumAllAnode() + '(kN)'
+        }
+      }
     };
 
     this.config.singleWeightsChangeData = () => {
@@ -166,7 +230,7 @@ export default class CommandViewWeightProperty extends CommandComponent {
         let weightObject = self.process.findCaeObjectByNameInChildObject(
           self.selectedWeightIdObject,
           selectedWeightName
-        ) as JointWeightObject;
+        ) as WeightBaseObject;
 
         if(weightObject) {
           let weightInstance = this.viewer.findInstanceObject(weightObject);
@@ -177,35 +241,104 @@ export default class CommandViewWeightProperty extends CommandComponent {
             weightInstance.weightLabelColor = ObjectColor.loadRedColor;
           }
 
-          let xFactor = Number((weightObject as JointWeightObject).xFactor);
-          let yFactor = Number((weightObject as JointWeightObject).yFactor);
-          let zFactor = Number((weightObject as JointWeightObject).zFactor);
-          
-          let fac = 1000000;
-          xFactor = Math.round(xFactor * fac) / fac;
-          yFactor = Math.round(yFactor * fac) / fac;
-          zFactor = Math.round(zFactor * fac) / fac;
-
-          data.status.value =
-            "Joint weight, Sum of Forces:\nxFactor:" +
-            xFactor +
-            "\nyFactor:" +
-            yFactor +
-            " \nzFactor:" +
-            zFactor;
-
-          let jointName = (weightObject as JointWeightObject).jointName;
-          let jointObj = this.viewer.process.findCaeObjectByNameInChildObject(
-            this.process.caeRenderObjectTreeManager.jointNode,
-            jointName
-          );
-          if (jointObj) {
+          if(weightObject instanceof JointWeightObject) {
+            let weightValue = Number(weightObject.weight);
+            let xFactor = Number(weightObject.xFactor);
+            let yFactor = Number(weightObject.yFactor);
+            let zFactor = Number(weightObject.zFactor);
+            
+            let fac = 1000000;
+            let x = Math.round(xFactor * weightValue * fac) / fac;
+            let y = Math.round(yFactor * weightValue * fac) / fac;
+            let z = Math.round(zFactor * weightValue * fac) / fac;
+
+            data.status.value =
+              "Wx: " +
+              x +
+              '(kN)' +
+              "\nWy: " +
+              y +
+              '(kN)' +
+              " \nWz: " +
+              z +
+              '(kN)';
+
+            let jointName = (weightObject as JointWeightObject).jointName;
+            let jointObj = this.viewer.process.findCaeObjectByNameInChildObject(
+              this.process.caeRenderObjectTreeManager.jointNode,
+              jointName
+            );
+            if (jointObj) {
+              // this.viewer.selectionManager.selectAndHighlightKeys(
+              //   [jointObj.segment.key],
+              //   [jointObj.segment.path]
+              // );
+            }
+          } else if (weightObject instanceof MemberWeightConcentratedObject) {
+            let weightValue = Number(weightObject.weightValue);
+            let xFactor = Number(weightObject.xFactor);
+            let yFactor = Number(weightObject.yFactor);
+            let zFactor = Number(weightObject.zFactor);
+            
+            let fac = 1000000;
+            let x = Math.round(xFactor * weightValue * fac) / fac;
+            let y = Math.round(yFactor * weightValue * fac) / fac;
+            let z = Math.round(zFactor * weightValue * fac) / fac;
+
+            data.status.value = 'Wx: ' + 
+              x +
+              '(kN)' +
+              "\nWy: " +
+              y +
+              '(kN)' +
+              " \nWz: " +
+              z +
+              '(kN)';
+
+            let member = (weightObject as MemberWeightConcentratedObject).member;
+            // this.viewer.selectionManager.selectAndHighlightKeys(
+            //   [member.segment.key],
+            //   [member.segment.path]
+            // );
+          } else if (weightObject instanceof MemberWeightDistributedObject) {
+            //
+            let distance = Number(weightObject.distance);
+            let weightValue = Number(weightObject.weightValue);
+            let weightActiveLength = Number(weightObject.weightActiveLength);
+            let finalDistanceWeightValue = Number(weightObject.finalDistanceWeightValue);
+
+            data.status.value =
+              "distance = " + 
+              distance + 
+              "(m)" +
+              "\nweightValue = " +
+              weightValue +
+              "(kN/m)" +
+              "\nweightActiveLength = " +
+              weightActiveLength + 
+              "(m)" +
+              "\nfinalDistanceWeightValue = " +
+              finalDistanceWeightValue + 
+              "(kN/m)"
+
+            // let member = (weightObject as MemberWeightConcentratedObject).member;
             // this.viewer.selectionManager.selectAndHighlightKeys(
-            //   [jointObj.segment.key],
-            //   [jointObj.segment.path]
+            //   [member.segment.key],
+            //   [member.segment.path]
             // );
           }
         }
+      }else {
+        this.viewer.selectionManager.clearAllSelectionAndHighlight()
+
+        let weightObject: WGTMEMObject = null;
+        for(let i = 0; i < this._showWgtmemList.length; i++) {
+          if(this._showWgtmemList[i].id === this.config.properties.items[0].data.singleWeights.value) {
+            weightObject = this._showWgtmemList[i]
+          }
+        }
+        
+        if(weightObject) data.status.value = 'Weight: ' +  weightObject.weightValue + '(kN)';
       }
 
       this.viewer.exeSceneCameraChanged(Longan.LonganCore.CameraChangeType.Rotate);
@@ -261,12 +394,92 @@ export default class CommandViewWeightProperty extends CommandComponent {
       this.process.findRenderObjectsByType("WeightIdObject");
   }
 
-  private sumWeightIdForce(weightId: WeightIdObject) {
-  }
+  private sumAllAnode() {
+    let result = 0;
+    for(let i = 0; i < this._showWgtmemList.length; i++) {
+      let child = this._showWgtmemList[i] as WGTMEMObject;
+      result += Number(child.weightValue)
+    }
 
-  private sumWeightGroupForce(weightGroup: WeightGroupObject) {
+    return result
   }
 
+  private sumWeightForce(weightId: WeightIdObject) {
+      let x = 0;
+      let y = 0;
+      let z = 0;
+      for (let i = 0; i < weightId.childObjects.length; i++) {
+        let weightObject = weightId.childObjects[i] as WeightBaseObject;
+  
+        if (weightObject.checkBusinessStateIsActive()) {
+          let type = weightObject.weightType;
+          if (type.toLowerCase() === "join") {
+            if (weightObject instanceof JointWeightObject) {
+              let weightValue = Number(weightObject.weight);
+              let xFactor = Number(weightObject.xFactor);
+              let yFactor = Number(weightObject.yFactor);
+              let zFactor = Number(weightObject.zFactor);
+              x += weightValue * xFactor;
+              y += weightValue * yFactor;
+              z += weightValue * zFactor;
+            }
+          } else if (type.toLowerCase() === "conc") {
+            if (weightObject instanceof MemberWeightConcentratedObject) {
+              let weightValue = Number(weightObject.weightValue);
+              let xFactor = Number(weightObject.xFactor);
+              let yFactor = Number(weightObject.yFactor);
+              let zFactor = Number(weightObject.zFactor);
+              x += weightValue * xFactor;
+              y += weightValue * yFactor;
+              z += weightValue * zFactor;
+            }
+          } else if (type.toLowerCase() === "unif") {
+            if (weightObject instanceof MemberWeightDistributedObject) {
+              let distance = Number(weightObject.distance);
+              let weightActiveLength = Number(weightObject.weightActiveLength);
+              let xFactor = Number(weightObject.xFactor);
+              let yFactor = Number(weightObject.yFactor);
+              let zFactor = Number(weightObject.zFactor);
+              x += (distance * weightActiveLength) * xFactor;
+              y += (distance * weightActiveLength) * yFactor;
+              z += (distance * weightActiveLength) * zFactor;
+            }
+          }
+        }
+      }
+
+      let fac = 1000000;
+      return {
+        x: Math.round(x * fac) / fac,
+        y: Math.round(y * fac) / fac,
+        z: Math.round(z * fac) / fac,
+      };
+    }
+  
+    private sumWeightGroupForce(weightGroup: WeightGroupObject) {
+      let x = 0;
+      let y = 0;
+      let z = 0;
+      for (let i = 0; i < weightGroup.childObjects.length; i++) {
+        let weightId = weightGroup.childObjects[i] as WeightIdObject;
+        if (weightId.checkBusinessStateIsActive()) {
+          let weightForce = this.sumWeightForce(weightId);
+          x += weightForce.x;
+          y += weightForce.y;
+          z += weightForce.z;
+        }
+      }
+
+      z += this.sumAllAnode();
+  
+      let fac = 1000000;
+      return {
+        x: Math.round(x * fac) / fac,
+        y: Math.round(y * fac) / fac,
+        z: Math.round(z * fac) / fac,
+      };
+    }
+
   end(): void {
     // this.config.hide();
     super.end();

package/src/viewerWrapper/commands/splitMember/commandSplitMember.ts

@@ -106,7 +106,7 @@ export default class CommandSplitMember extends CommandSplitMemberBase {
         memberName
       ) as MemberObject;
       if (member) {
-        if (member.grup) {
+        if (member.grup && member.grup.grupSegments) {
           if (member.grup.grupSegments.length > 1) {
             grupSegmentOverFlag = true;
           }

package/src/viewerWrapper/viewerWrapper.ts

@@ -7,6 +7,7 @@ import { Loading, Message } from "element-ui";
 import { defaultOptions } from "../gsDevFx/options";
 import { Viewer } from "../gsDevFx/viewer";
 import PanelBindComponent from "./panel/panelBindComponent.vue";
+import { SvgDraw } from "gs-ceec-design";
 
 Vue.use(Loading.directive);
 Vue.prototype.$loading = Loading.service;
@@ -76,7 +77,7 @@ export default class ViewerWrapper extends Vue {
       // store.commit("command/hideAllCommandComponent", viewerContainerId);
 
       // this.viewer.process.dispose();
-
+      SvgDraw.instance[viewerContainerId] = null;
       store.commit("viewerDispose", viewerContainerId);
     }
   }

package/types/caeDesign/src/caeCardEditor/caeCardObjects/ftginp/cardEXTRACTHEAD.d.ts

@@ -0,0 +1,29 @@
+import { CardObject } from "../cardObject";
+export declare class cardEXTRACTHEAD extends CardObject {
+    lineLabel: {
+        value: string;
+        range: number[];
+        span: number;
+        label: string;
+        type: string;
+        unit: string;
+    };
+    AE: {
+        value: string;
+        range: number[];
+        span: number;
+        label: string;
+        type: string;
+        unit: string;
+    };
+    damageLevel: {
+        value: string;
+        range: number[];
+        span: number;
+        label: string;
+        type: string;
+        unit: string;
+    };
+    constructor(line?: string);
+}
+//# sourceMappingURL=cardEXTRACTHEAD.d.ts.map

package/types/caeDesign/src/caeCardEditor/caeCardObjects/ftginp/cardEXTRACTHEAD.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cardEXTRACTHEAD.d.ts","sourceRoot":"","sources":["../../../../../../src/caeCardEditor/caeCardObjects/ftginp/cardEXTRACTHEAD.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,qBAAa,eAAgB,SAAQ,UAAU;IAC7C,SAAS;;;;;;;MAOP;IACF,EAAE;;;;;;;MAOA;IACF,WAAW;;;;;;;MAOT;gBAGU,IAAI,CAAC,EAAE,MAAM;CAI1B"}

package/types/caeDesign/src/caeCardEditor/caeCardObjects/ftginp/cardFTCASE.d.ts

@@ -0,0 +1,45 @@
+import { CardObject } from "../cardObject";
+export declare class cardFTCASE extends CardObject {
+    lineLabel: {
+        value: string;
+        range: number[];
+        span: number;
+        label: string;
+        type: string;
+        unit: string;
+    };
+    FEN: {
+        value: string;
+        range: number[];
+        span: number;
+        label: string;
+        type: string;
+        unit: string;
+    };
+    NoO: {
+        value: string;
+        range: number[];
+        span: number;
+        label: string;
+        type: string;
+        unit: string;
+    };
+    DAF: {
+        value: string;
+        range: number[];
+        span: number;
+        label: string;
+        type: string;
+        unit: string;
+    };
+    SCT: {
+        value: string;
+        range: number[];
+        span: number;
+        label: string;
+        type: string;
+        unit: string;
+    };
+    constructor(line?: string);
+}
+//# sourceMappingURL=cardFTCASE.d.ts.map

package/types/caeDesign/src/caeCardEditor/caeCardObjects/ftginp/cardFTCASE.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cardFTCASE.d.ts","sourceRoot":"","sources":["../../../../../../src/caeCardEditor/caeCardObjects/ftginp/cardFTCASE.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,qBAAa,UAAW,SAAQ,UAAU;IACxC,SAAS;;;;;;;MAOP;IACF,GAAG;;;;;;;MAOD;IACF,GAAG;;;;;;;MAOD;IACF,GAAG;;;;;;;MAOD;IACF,GAAG;;;;;;;MAOD;gBAEU,IAAI,CAAC,EAAE,MAAM;CAI1B"}

package/types/caeDesign/src/caeCardEditor/caeCardObjects/ftginp/cardFTCOMB.d.ts

@@ -0,0 +1,125 @@
+import { CardObject } from "../cardObject";
+export declare class cardFTCOMB extends CardObject {
+    lineLabel: {
+        value: string;
+        range: number[];
+        span: number;
+        label: string;
+        type: string;
+        unit: string;
+    };
+    SACSLC1: {
+        value: string;
+        range: number[];
+        span: number;
+        label: string;
+        type: string;
+        unit: string;
+    };
+    factor1: {
+        value: string;
+        range: number[];
+        span: number;
+        label: string;
+        type: string;
+        unit: string;
+    };
+    SACSLC2: {
+        value: string;
+        range: number[];
+        span: number;
+        label: string;
+        type: string;
+        unit: string;
+    };
+    factor2: {
+        value: string;
+        range: number[];
+        span: number;
+        label: string;
+        type: string;
+        unit: string;
+    };
+    SACSLC3: {
+        value: string;
+        range: number[];
+        span: number;
+        label: string;
+        type: string;
+        unit: string;
+    };
+    factor3: {
+        value: string;
+        range: number[];
+        span: number;
+        label: string;
+        type: string;
+        unit: string;
+    };
+    SACSLC4: {
+        value: string;
+        range: number[];
+        span: number;
+        label: string;
+        type: string;
+        unit: string;
+    };
+    factor4: {
+        value: string;
+        range: number[];
+        span: number;
+        label: string;
+        type: string;
+        unit: string;
+    };
+    SACSLC5: {
+        value: string;
+        range: number[];
+        span: number;
+        label: string;
+        type: string;
+        unit: string;
+    };
+    factor5: {
+        value: string;
+        range: number[];
+        span: number;
+        label: string;
+        type: string;
+        unit: string;
+    };
+    SACSLC6: {
+        value: string;
+        range: number[];
+        span: number;
+        label: string;
+        type: string;
+        unit: string;
+    };
+    factor6: {
+        value: string;
+        range: number[];
+        span: number;
+        label: string;
+        type: string;
+        unit: string;
+    };
+    SACSLC7: {
+        value: string;
+        range: number[];
+        span: number;
+        label: string;
+        type: string;
+        unit: string;
+    };
+    factor7: {
+        value: string;
+        range: number[];
+        span: number;
+        label: string;
+        type: string;
+        unit: string;
+    };
+    constructor(line?: string);
+}
+//# sourceMappingURL=cardFTCOMB.d.ts.map

package/types/caeDesign/src/caeCardEditor/caeCardObjects/ftginp/cardFTCOMB.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cardFTCOMB.d.ts","sourceRoot":"","sources":["../../../../../../src/caeCardEditor/caeCardObjects/ftginp/cardFTCOMB.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,qBAAa,UAAW,SAAQ,UAAU;IACxC,SAAS;;;;;;;MAOP;IACF,OAAO;;;;;;;MAOL;IACF,OAAO;;;;;;;MAOL;IACF,OAAO;;;;;;;MAOL;IACF,OAAO;;;;;;;MAOL;IACF,OAAO;;;;;;;MAOL;IACF,OAAO;;;;;;;MAOL;IACF,OAAO;;;;;;;MAOL;IACF,OAAO;;;;;;;MAOL;IACF,OAAO;;;;;;;MAOL;IACF,OAAO;;;;;;;MAOL;IACF,OAAO;;;;;;;MAOL;IACF,OAAO;;;;;;;MAOL;IACF,OAAO;;;;;;;MAOL;IACF,OAAO;;;;;;;MAOL;gBAEU,IAAI,CAAC,EAAE,MAAM;CAI1B"}