gs-cae-design 1.1.56 → 1.1.58

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/propertyComponents/sections/teeSectionProperty.ts

@@ -78,49 +78,49 @@ export class TeeSectionProperty extends PropertyComponent {
       ["50x50", 50, 50, 5, 7, 8],
       ["62.5x50", 62.5, 60, 6, 8, 8],
       ["75x75", 75, 75, 5, 7, 8],
-      ["87.5x90", 87.5, 89, 4, 6, 8],
-      ["87.5x90", 87.5, 90, 5, 8, 8],
-      ["100x100", 99, 99, 4.5, 7, 8],
-      ["100x100", 100, 100, 8.5, 8, 8],
-      ["125x125", 124, 124, 5, 8, 8],
-      ["125x125", 125, 125, 6, 9, 8],
-      ["150x150", 149, 149, 5.5, 8, 13],
-      ["150x150", 150, 150, 6.5, 9, 13],
-      ["175x175", 173, 174, 6, 9, 13],
-      ["175x175", 175, 175, 7, 11, 13],
-      ["200x200", 198, 199, 7, 11, 13],
-      ["200x200", 200, 200, 8, 13, 13],
-      ["225x150", 223, 150, 7, 12, 13],
-      ["225x150", 225, 151, 8, 14, 13],
-      ["225x200", 223, 199, 8, 12, 13],
-      ["225x200", 225, 200, 9, 14, 13],
-      ["237.5x150", 235, 150, 7, 13, 13],
-      ["237.5x150", 237.5, 151.5, 8.5, 15.5, 13],
-      ["237.5x150", 241, 153.5, 10.5, 19, 13],
-      ["250x150", 246, 150, 7, 12, 13],
-      ["250x150", 250, 152, 9, 16, 13],
-      ["250x150", 252, 153, 10, 18, 13],
-      ["250x200", 248, 199, 9, 14, 13],
-      ["250x200", 250, 200, 10, 16, 13],
-      ["250x200", 253, 201, 11, 19, 13],
-      ["275x200", 273, 199, 9, 14, 13],
-      ["275x200", 275, 200, 10, 16, 13],
-      ["300x200", 298, 199, 10, 15, 13],
-      ["300x200", 300, 200, 11, 17, 13],
-      ["300x200", 303, 201, 12, 20, 13],
-      ["312.5x200", 312.5, 198.5, 13.5, 17.5, 13],
-      ["312.5x200", 315, 200, 15, 20, 13],
-      ["312.5x200", 319, 202, 17, 24, 13],
-      ["325x300", 323, 299, 10, 15, 12],
-      ["325x300", 325, 300, 11, 17, 13],
-      ["325x300", 328, 301, 12, 20, 13],
-      ["350x300", 346, 300, 13, 20, 13],
-      ["350x300", 350, 300, 13, 24, 13],
-      ["400x300", 396, 300, 14, 22, 18],
-      ["400x300", 400, 300, 14, 26, 18],
-      ["450x300", 445, 299, 15, 23, 18],
-      ["450x300", 450, 300, 16, 28, 18],
-      ["450x300", 456, 302, 18, 34, 18],
+      ["87.5x90a", 87.5, 89, 4, 6, 8],
+      ["87.5x90b", 87.5, 90, 5, 8, 8],
+      ["100x100a", 99, 99, 4.5, 7, 8],
+      ["100x100b", 100, 100, 8.5, 8, 8],
+      ["125x125a", 124, 124, 5, 8, 8],
+      ["125x125b", 125, 125, 6, 9, 8],
+      ["150x150a", 149, 149, 5.5, 8, 13],
+      ["150x150b", 150, 150, 6.5, 9, 13],
+      ["175x175a", 173, 174, 6, 9, 13],
+      ["175x175b", 175, 175, 7, 11, 13],
+      ["200x200a", 198, 199, 7, 11, 13],
+      ["200x200b", 200, 200, 8, 13, 13],
+      ["225x150a", 223, 150, 7, 12, 13],
+      ["225x150b", 225, 151, 8, 14, 13],
+      ["225x200a", 223, 199, 8, 12, 13],
+      ["225x200b", 225, 200, 9, 14, 13],
+      ["237.5x150a", 235, 150, 7, 13, 13],
+      ["237.5x150b", 237.5, 151.5, 8.5, 15.5, 13],
+      ["237.5x150c", 241, 153.5, 10.5, 19, 13],
+      ["250x150a", 246, 150, 7, 12, 13],
+      ["250x150b", 250, 152, 9, 16, 13],
+      ["250x150c", 252, 153, 10, 18, 13],
+      ["250x200a", 248, 199, 9, 14, 13],
+      ["250x200b", 250, 200, 10, 16, 13],
+      ["250x200c", 253, 201, 11, 19, 13],
+      ["275x200a", 273, 199, 9, 14, 13],
+      ["275x200b", 275, 200, 10, 16, 13],
+      ["300x200a", 298, 199, 10, 15, 13],
+      ["300x200b", 300, 200, 11, 17, 13],
+      ["300x200c", 303, 201, 12, 20, 13],
+      ["312.5x200a", 312.5, 198.5, 13.5, 17.5, 13],
+      ["312.5x200b", 315, 200, 15, 20, 13],
+      ["312.5x200c", 319, 202, 17, 24, 13],
+      ["325x300a", 323, 299, 10, 15, 12],
+      ["325x300b", 325, 300, 11, 17, 13],
+      ["325x300c", 328, 301, 12, 20, 13],
+      ["350x300a", 346, 300, 13, 20, 13],
+      ["350x300b", 350, 300, 13, 24, 13],
+      ["400x300a", 396, 300, 14, 22, 18],
+      ["400x300b", 400, 300, 14, 26, 18],
+      ["450x300a", 445, 299, 15, 23, 18],
+      ["450x300b", 450, 300, 16, 28, 18],
+      ["450x300c", 456, 302, 18, 34, 18],
     ];
 
     this.standardData = [];

package/src/gsDevFx/propertyComponents/sections/wfSectionProperty.ts

@@ -82,129 +82,129 @@ export class WFSectionProperty extends PropertyComponent {
         ["125x125", 125, 125, 6.5, 9, 8],
         ["150x150", 150, 150, 7, 10, 8],
         ["175x175", 175, 175, 7.5, 11, 13],
-        ["200x200", 200, 200, 8, 12, 13],
-        ["200x200", 200, 204, 12, 12, 13],
-        ["250x250", 244, 252, 11, 11, 13],
-        ["250x250", 250, 250, 9, 14, 13],
-        ["250x250", 250, 255, 14, 14, 13],
-        ["300x300", 294, 302, 12, 12, 13],
-        ["300x300", 300, 300, 10, 15, 13],
-        ["300x300", 300, 305, 15, 15, 13],
-        ["350x350", 338, 351, 13, 13, 13],
-        ["350x350", 344, 348, 10, 16, 13],
-        ["350x350", 344, 354, 16, 16, 13],
-        ["350x350", 350, 350, 12, 19, 13],
-        ["350x350", 350, 357, 19, 19, 13],
-        ["400x400", 388, 402, 15, 15, 22],
-        ["400x400", 394, 398, 11, 18, 22],
-        ["400x400", 394, 405, 18, 18, 22],
-        ["400x400", 400, 400, 13, 21, 22],
-        ["400x400", 400, 408, 21, 21, 22],
-        ["400x400", 414, 405, 18, 28, 22],
-        ["400x400", 428, 407, 20, 35, 22],
-        ["400x400", 458, 417, 30, 50, 22],
-        ["400x400", 498, 432, 45, 70, 22],
-        ["500x500", 492, 465, 15, 20, 22],
-        ["500x500", 502, 465, 15, 25, 22],
-        ["500x500", 502, 470, 20, 25, 22],
+        ["200x200a", 200, 200, 8, 12, 13],
+        ["200x200b", 200, 204, 12, 12, 13],
+        ["250x250a", 244, 252, 11, 11, 13],
+        ["250x250b", 250, 250, 9, 14, 13],
+        ["250x250c", 250, 255, 14, 14, 13],
+        ["300x300a", 294, 302, 12, 12, 13],
+        ["300x300b", 300, 300, 10, 15, 13],
+        ["300x300c", 300, 305, 15, 15, 13],
+        ["350x350a", 338, 351, 13, 13, 13],
+        ["350x350b", 344, 348, 10, 16, 13],
+        ["350x350c", 344, 354, 16, 16, 13],
+        ["350x350d", 350, 350, 12, 19, 13],
+        ["350x350e", 350, 357, 19, 19, 13],
+        ["400x400a", 388, 402, 15, 15, 22],
+        ["400x400b", 394, 398, 11, 18, 22],
+        ["400x400c", 394, 405, 18, 18, 22],
+        ["400x400d", 400, 400, 13, 21, 22],
+        ["400x400e", 400, 408, 21, 21, 22],
+        ["400x400f", 414, 405, 18, 28, 22],
+        ["400x400g", 428, 407, 20, 35, 22],
+        ["400x400h", 458, 417, 30, 50, 22],
+        ["400x400i", 498, 432, 45, 70, 22],
+        ["500x500a", 492, 465, 15, 20, 22],
+        ["500x500b", 502, 465, 15, 25, 22],
+        ["500x500c", 502, 470, 20, 25, 22],
       ],
       [
         ["150x100", 148, 100, 6, 9, 8],
         ["200x150", 194, 150, 6, 9, 8],
         ["250x175", 194, 150, 7, 11, 13],
-        ["300x200", 294, 200, 8, 12, 13],
-        ["300x200", 298, 201, 9, 14, 13],
+        ["300x200a", 294, 200, 8, 12, 13],
+        ["300x200b", 298, 201, 9, 14, 13],
         ["350x250", 340, 250, 9, 14, 13],
         ["400x300", 390, 300, 10, 16, 13],
         ["450x300", 440, 300, 11, 18, 13],
-        ["500x300", 482, 300, 11, 15, 13],
-        ["500x300", 488, 300, 11, 18, 13],
-        ["550x300", 544, 300, 11, 15, 13],
-        ["550x300", 550, 300, 11, 18, 13],
-        ["600x300", 582, 300, 12, 17, 13],
-        ["600x300", 588, 300, 12, 20, 13],
-        ["600x300", 594, 300, 14, 23, 13],
+        ["500x300a", 482, 300, 11, 15, 13],
+        ["500x300b", 488, 300, 11, 18, 13],
+        ["550x300a", 544, 300, 11, 15, 13],
+        ["550x300b", 550, 300, 11, 18, 13],
+        ["600x300a", 582, 300, 12, 17, 13],
+        ["600x300b", 588, 300, 12, 20, 13],
+        ["600x300c", 594, 300, 14, 23, 13],
       ],
       [
         ["100x50", 100, 50, 5, 7, 8],
         ["125x60", 125, 60, 6, 8, 8],
         ["150x75", 150, 75, 5, 7, 8],
         ["175x90", 175, 90, 5, 8, 8],
-        ["200x100", 198, 99, 4.5, 7, 8],
-        ["200x100", 200, 100, 5.5, 8, 8],
-        ["250x125", 248, 124, 5, 8, 8],
-        ["250x125", 250, 125, 6, 9, 8],
-        ["300x150", 298, 149, 5.5, 8, 13],
-        ["300x150", 300, 150, 6.5, 9, 13],
-        ["350x175", 346, 174, 6, 9, 13],
-        ["350x175", 350, 175, 7, 11, 13],
+        ["200x100a", 198, 99, 4.5, 7, 8],
+        ["200x100b", 200, 100, 5.5, 8, 8],
+        ["250x125a", 248, 124, 5, 8, 8],
+        ["250x125b", 250, 125, 6, 9, 8],
+        ["300x150a", 298, 149, 5.5, 8, 13],
+        ["300x150b", 300, 150, 6.5, 9, 13],
+        ["350x175a", 346, 174, 6, 9, 13],
+        ["350x175b", 350, 175, 7, 11, 13],
         ["400x150", 400, 150, 8, 13, 13],
-        ["400x200", 396, 199, 7, 11, 13],
-        ["400x200", 400, 200, 8, 13, 13],
-        ["450x150", 446, 150, 7, 12, 13],
-        ["450x150", 450, 151, 8, 14, 13],
-        ["450x200", 446, 199, 8, 12, 13],
-        ["450x200", 450, 200, 9, 14, 13],
-        ["475x150", 470, 150, 7, 13, 13],
-        ["475x150", 470, 151.5, 8.5, 15.5, 13],
-        ["475x150", 482, 153.5, 10.5, 19, 13],
-        ["500x150", 492, 150, 7, 12, 13],
-        ["500x150", 500, 152, 9, 16, 13],
-        ["500x150", 504, 153, 10, 18, 13],
-        ["500x200", 496, 199, 9, 14, 13],
-        ["500x200", 500, 200, 10, 16, 13],
-        ["500x200", 506, 201, 11, 19, 13],
-        ["550x200", 546, 199, 9, 14, 13],
-        ["550x200", 550, 200, 10, 16, 13],
-        ["600x200", 596, 199, 10, 15, 13],
-        ["600x200", 600, 200, 11, 17, 13],
-        ["600x200", 606, 201, 12, 20, 13],
-        ["625x200", 625, 198.5, 13.5, 17.5, 13],
-        ["625x200", 630, 200, 15, 20, 13],
-        ["625x200", 638, 202, 17, 24, 13],
-        ["650x300", 646, 299, 10, 15, 13],
-        ["650x300", 650, 300, 11, 17, 13],
-        ["650x300", 656, 301, 12, 20, 13],
-        ["700x300", 692, 300, 13, 20, 18],
-        ["700x300", 700, 300, 13, 24, 18],
-        ["750x300", 734, 299, 12, 16, 18],
-        ["750x300", 742, 300, 13, 20, 18],
-        ["750x300", 750, 300, 13, 24, 18],
-        ["750x300", 758, 303, 16, 28, 18],
-        ["800x300", 792, 300, 14, 22, 18],
-        ["800x300", 800, 300, 14, 26, 18],
-        ["850x300", 834, 298, 14, 19, 18],
-        ["850x300", 842, 299, 15, 23, 18],
-        ["850x300", 850, 300, 16, 27, 18],
-        ["850x300", 858, 301, 17, 31, 18],
-        ["900x300", 890, 299, 15, 23, 18],
-        ["900x300", 900, 300, 16, 28, 18],
-        ["900x300", 912, 302, 18, 34, 18],
-        ["1000x300", 970, 297, 16, 21, 18],
-        ["1000x300", 980, 298, 17, 26, 18],
-        ["1000x300", 990, 298, 17, 31, 18],
-        ["1000x300", 1000, 300, 19, 36, 18],
-        ["1000x300", 1008, 302, 21, 40, 18],
+        ["400x200a", 396, 199, 7, 11, 13],
+        ["400x200b", 400, 200, 8, 13, 13],
+        ["450x150a", 446, 150, 7, 12, 13],
+        ["450x150b", 450, 151, 8, 14, 13],
+        ["450x200a", 446, 199, 8, 12, 13],
+        ["450x200b", 450, 200, 9, 14, 13],
+        ["475x150a", 470, 150, 7, 13, 13],
+        ["475x150b", 470, 151.5, 8.5, 15.5, 13],
+        ["475x150c", 482, 153.5, 10.5, 19, 13],
+        ["500x150a", 492, 150, 7, 12, 13],
+        ["500x150b", 500, 152, 9, 16, 13],
+        ["500x150c", 504, 153, 10, 18, 13],
+        ["500x200a", 496, 199, 9, 14, 13],
+        ["500x200b", 500, 200, 10, 16, 13],
+        ["500x200c", 506, 201, 11, 19, 13],
+        ["550x200a", 546, 199, 9, 14, 13],
+        ["550x200b", 550, 200, 10, 16, 13],
+        ["600x200a", 596, 199, 10, 15, 13],
+        ["600x200b", 600, 200, 11, 17, 13],
+        ["600x200c", 606, 201, 12, 20, 13],
+        ["625x200a", 625, 198.5, 13.5, 17.5, 13],
+        ["625x200b", 630, 200, 15, 20, 13],
+        ["625x200c", 638, 202, 17, 24, 13],
+        ["650x300a", 646, 299, 10, 15, 13],
+        ["650x300b", 650, 300, 11, 17, 13],
+        ["650x300c", 656, 301, 12, 20, 13],
+        ["700x300a", 692, 300, 13, 20, 18],
+        ["700x300b", 700, 300, 13, 24, 18],
+        ["750x300a", 734, 299, 12, 16, 18],
+        ["750x300b", 742, 300, 13, 20, 18],
+        ["750x300c", 750, 300, 13, 24, 18],
+        ["750x300d", 758, 303, 16, 28, 18],
+        ["800x300a", 792, 300, 14, 22, 18],
+        ["800x300b", 800, 300, 14, 26, 18],
+        ["850x300a", 834, 298, 14, 19, 18],
+        ["850x300b", 842, 299, 15, 23, 18],
+        ["850x300c", 850, 300, 16, 27, 18],
+        ["850x300d", 858, 301, 17, 31, 18],
+        ["900x300a", 890, 299, 15, 23, 18],
+        ["900x300b", 900, 300, 16, 28, 18],
+        ["900x300c", 912, 302, 18, 34, 18],
+        ["1000x300a", 970, 297, 16, 21, 18],
+        ["1000x300b", 980, 298, 17, 26, 18],
+        ["1000x300c", 990, 298, 17, 31, 18],
+        ["1000x300d", 1000, 300, 19, 36, 18],
+        ["1000x300e", 1008, 302, 21, 40, 18],
       ],
       [
-        ["100x50", 95, 48, 3.2, 4.5, 8],
-        ["100x50", 97, 49, 4, 5.5, 8],
+        ["100x50a", 95, 48, 3.2, 4.5, 8],
+        ["100x50b", 97, 49, 4, 5.5, 8],
         ["100x100", 96, 99, 4.5, 6, 8],
-        ["125x60", 118, 58, 3.2, 4.5, 8],
-        ["125x60", 120, 59, 4, 5.5, 8],
+        ["125x60a", 118, 58, 3.2, 4.5, 8],
+        ["125x60b", 120, 59, 4, 5.5, 8],
         ["125x125", 119, 123, 4.5, 6, 8],
-        ["150x75", 145, 73, 3.2, 4.5, 8],
-        ["150x75", 147, 74, 4, 5.5, 8],
-        ["150x100", 139, 97, 3.2, 4.5, 8],
-        ["150x100", 142, 99, 4.5, 6, 8],
-        ["150x150", 144, 148, 5, 7, 8],
-        ["150x150", 147, 149, 6, 8.5, 8],
-        ["175x90", 168, 88, 3.2, 4.5, 8],
-        ["175x90", 171, 89, 4, 6, 8],
-        ["175x175", 167, 173, 5, 7, 13],
-        ["175x175", 172, 175, 6.5, 9.5, 13],
-        ["200x100", 193, 98, 3.2, 4.5, 8],
-        ["200x100", 196, 99, 4, 6, 8],
+        ["150x75a", 145, 73, 3.2, 4.5, 8],
+        ["150x75b", 147, 74, 4, 5.5, 8],
+        ["150x100a", 139, 97, 3.2, 4.5, 8],
+        ["150x100b", 142, 99, 4.5, 6, 8],
+        ["150x150a", 144, 148, 5, 7, 8],
+        ["150x150b", 147, 149, 6, 8.5, 8],
+        ["175x90a", 168, 88, 3.2, 4.5, 8],
+        ["175x90b", 171, 89, 4, 6, 8],
+        ["175x175a", 167, 173, 5, 7, 13],
+        ["175x175b", 172, 175, 6.5, 9.5, 13],
+        ["200x100a", 193, 98, 3.2, 4.5, 8],
+        ["200x100b", 196, 99, 4, 6, 8],
         ["200x150", 188, 149, 4.5, 6, 8],
         ["200x200", 192, 198, 6, 8, 13],
         ["250x125", 244, 124, 4.5, 6, 8],