gs-cae-design 1.1.67 → 1.1.68

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (47) hide show
  1. package/README.md +9 -0
  2. package/lib/.gz +0 -0
  3. package/lib/CAEDesign.common-report.html +2 -2
  4. package/lib/CAEDesign.common.js +26 -26
  5. package/lib/CAEDesign.umd-report.html +2 -2
  6. package/lib/CAEDesign.umd.js +26 -26
  7. package/lib/CAEDesign.umd.min-report.html +2 -2
  8. package/lib/CAEDesign.umd.min.js +26 -26
  9. package/package.json +1 -1
  10. package/src/caeCardEditor/caeCardObjects/cardJointElastic.ts +7 -6
  11. package/src/caeCardEditor/caeCardObjects/cardLOADCONC.ts +2 -0
  12. package/src/caeCardEditor/caeCardObjects/cardMember.ts +8 -11
  13. package/src/caeCardEditor/caeCardObjects/cardPGrup.ts +7 -6
  14. package/src/caeCardEditor/caeCardObjects/cardPlate.ts +3 -2
  15. package/src/caeCardEditor/caeCardObjects/cardSection.ts +5 -4
  16. package/src/caeCardEditor/caeCardObjects/sacinp/cardSURFID.ts +2 -2
  17. package/src/gsDevFx/managers/cloudMemberTransformManager.ts +1 -0
  18. package/src/gsDevFx/managers/datWriterManager.ts +147 -163
  19. package/src/gsDevFx/objects/pretreatmentObjects/waveItemObject.ts +3 -0
  20. package/src/gsDevFx/objects/pretreatmentObjects/waveObject.ts +3 -0
  21. package/src/viewerWrapper/commands/editSection/editSectionConfig.ts +1 -1
  22. package/types/caeDesign/src/caeCardEditor/caeCardObjects/cardJointElastic.d.ts.map +1 -1
  23. package/types/caeDesign/src/caeCardEditor/caeCardObjects/cardLOADCONC.d.ts.map +1 -1
  24. package/types/caeDesign/src/caeCardEditor/caeCardObjects/cardMember.d.ts.map +1 -1
  25. package/types/caeDesign/src/caeCardEditor/caeCardObjects/cardPGrup.d.ts.map +1 -1
  26. package/types/caeDesign/src/caeCardEditor/caeCardObjects/cardPlate.d.ts.map +1 -1
  27. package/types/caeDesign/src/caeCardEditor/caeCardObjects/cardSection.d.ts.map +1 -1
  28. package/types/caeDesign/src/gsDevFx/managers/cloudMemberTransformManager.d.ts.map +1 -1
  29. package/types/caeDesign/src/gsDevFx/managers/datWriterManager.d.ts.map +1 -1
  30. package/types/caeDesign/src/gsDevFx/objects/pretreatmentObjects/waveItemObject.d.ts.map +1 -1
  31. package/types/caeDesign/src/gsDevFx/objects/pretreatmentObjects/waveObject.d.ts.map +1 -1
  32. package/types/ceecDesign/src/api/projectServices.d.ts +8 -0
  33. package/types/ceecDesign/src/api/projectServices.d.ts.map +1 -0
  34. package/types/ceecDesign/src/gsDevFx/managers/cloneManager.d.ts +5 -0
  35. package/types/ceecDesign/src/gsDevFx/managers/persistenceManager.d.ts +0 -19
  36. package/types/ceecDesign/src/gsDevFx/objects/designBaseObject.d.ts +54 -0
  37. package/types/ceecDesign/src/gsDevFx/objects/designBaseObject.d.ts.map +1 -0
  38. package/types/ceecDesign/src/gsDevFx/objects/interfaces.d.ts +0 -8
  39. package/types/ceecDesign/src/gsDevFx/objects/interfaces.d.ts.map +0 -1
  40. package/types/ceecDesign/src/gsDevFx/operators/objectPreSelector.d.ts.map +1 -0
  41. package/types/ceecDesign/src/gsDevFx/viewer.d.ts +14 -0
  42. package/types/ceecDesign/src/gsDevFx/viewer.d.ts.map +1 -0
  43. package/types/ceecDesign/src/index.d.ts +37 -0
  44. package/types/ceecDesign/src/plugins/svgDraw/index.d.ts +17 -0
  45. package/types/ceecDesign/src/plugins/svgDraw/index.d.ts.map +1 -0
  46. package/types/ceecDesign/src/plugins/svgDraw/svgViewer.d.ts +21 -0
  47. package/types/ceecDesign/src/plugins/svgDraw/svgViewer.d.ts.map +1 -0
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "gs-cae-design",
3
- "version": "1.1.67",
3
+ "version": "1.1.68",
4
4
  "description": "广州图石科技有限公司发布的基于gs-longan的CAE图形控件",
5
5
  "main": "lib/CAEDesign.umd.min.js",
6
6
  "types": "./types/caeDesign/src/index.d.ts",
@@ -1,5 +1,6 @@
1
1
  import { JointElasticRestraint } from "../../gsDevFx/objects/caeObjects/jointObject";
2
2
  import { CardObject } from "./cardObject";
3
+ import { CaeNumber } from "../../utility/utility";
3
4
 
4
5
  /**
5
6
  * 卡片编辑器的空间点对象
@@ -124,12 +125,12 @@ export class CardJointElastic extends CardObject {
124
125
 
125
126
  toElastic() {
126
127
  let elastic = new JointElasticRestraint();
127
- elastic.dx = this.dx.value;
128
- elastic.dy = this.dy.value;
129
- elastic.dz = this.dz.value;
130
- elastic.rx = this.rx.value;
131
- elastic.ry = this.ry.value;
132
- elastic.rz = this.rz.value;
128
+ elastic.dx = CaeNumber(this.dx.value);
129
+ elastic.dy = CaeNumber(this.dy.value);
130
+ elastic.dz = CaeNumber(this.dz.value);
131
+ elastic.rx = CaeNumber(this.rx.value);
132
+ elastic.ry = CaeNumber(this.ry.value);
133
+ elastic.rz = CaeNumber(this.rz.value);
133
134
  elastic.secondJointName = this.secondJointName.value;
134
135
  elastic.thirdJointName = this.thirdJointName.value;
135
136
 
@@ -117,6 +117,8 @@ export class CardLOADCONC extends CardObject {
117
117
  this.jointBName.value.trimEnd()) as any;
118
118
  obj.distanceToLoad = CaeNumber(this.distanceToLoadForce.value);
119
119
  obj.concentratedForceValue = CaeNumber(this.concentratedForceValue.value);
120
+ obj.distanceToLoadMoment = CaeNumber(this.distanceToLoadMoment.value);
121
+ obj.concentratedMomentValue = CaeNumber(this.concentratedMomentValue.value);
120
122
  obj.loadCoorSystem = this.loadCorrdinateSystem.value;
121
123
  obj.loadType = this.loadType.value;
122
124
  obj.loadGroup = this.loadID.value;
@@ -1,8 +1,5 @@
1
- import { Process } from "../../gsDevFx/process";
2
1
  import { MemberObject } from "../../gsDevFx/objects/caeObjects/memberObject";
3
2
  import { CardObject } from "./cardObject";
4
- import { JointObject } from "../../gsDevFx/objects/caeObjects/jointObject";
5
- import { GrupObject } from "../../gsDevFx/objects/caeObjects/grupObject";
6
3
  import { CaeNumber } from "../../utility/utility";
7
4
  /**
8
5
  * 卡片编辑器的杆件对象
@@ -236,7 +233,7 @@ export class CardMember extends CardObject {
236
233
  value: "",
237
234
  range: [35, 41],
238
235
  label: "Chord Angle",
239
- type: "Floationg Point",
236
+ type: "Floating Point",
240
237
  unit: "(deg)",
241
238
  span: 0,
242
239
  };
@@ -282,7 +279,7 @@ export class CardMember extends CardObject {
282
279
  value: "",
283
280
  range: [47, 51],
284
281
  label: "Average Joint Thickness",
285
- type: "Floationg Point",
282
+ type: "Floating Point",
286
283
  unit: "(m)",
287
284
  span: 0,
288
285
  };
@@ -293,7 +290,7 @@ export class CardMember extends CardObject {
293
290
  value: "",
294
291
  range: [51, 55],
295
292
  label: "Overall Buckling Length Y-axis(Major)",
296
- type: "Floationg Point",
293
+ type: "Floating Point",
297
294
  unit: "(m)",
298
295
  span: 0,
299
296
  };
@@ -304,7 +301,7 @@ export class CardMember extends CardObject {
304
301
  value: "",
305
302
  range: [55, 59],
306
303
  label: "Overall Buckling Length Z-axis(Major)",
307
- type: "Floationg Point",
304
+ type: "Floating Point",
308
305
  unit: "(m)",
309
306
  span: 0,
310
307
  };
@@ -315,7 +312,7 @@ export class CardMember extends CardObject {
315
312
  value: "",
316
313
  range: [59, 64],
317
314
  label: "Unbraced Length or TUB Shear Modifier",
318
- type: "Floationg Point",
315
+ type: "Floating Point",
319
316
  unit: "(m)",
320
317
  span: 0,
321
318
  };
@@ -327,12 +324,12 @@ export class CardMember extends CardObject {
327
324
  value: "",
328
325
  range: [64, 70],
329
326
  label: "Weight Density",
330
- type: "Floationg Point",
327
+ type: "Floating Point",
331
328
  unit: "(tonne/m3)",
332
329
  span: 0,
333
330
  };
334
331
  /**
335
- * 单元数量:71-72
332
+ * 单元数量:71-71
336
333
  */
337
334
  ucSegments = {
338
335
  value: "",
@@ -350,7 +347,7 @@ export class CardMember extends CardObject {
350
347
  value: "",
351
348
  range: [72, 78],
352
349
  label: "Effective Diameter for Added Mass",
353
- type: "Floationg Point",
350
+ type: "Floating Point",
354
351
  unit: "(cm)",
355
352
  span: 0,
356
353
  };
@@ -1,3 +1,4 @@
1
+ import { CaeNumber } from "../../utility/utility";
1
2
  import { PGrupObject } from "../../gsDevFx/objects/caeObjects/pGrupObject";
2
3
  import { CardObject } from "./cardObject";
3
4
  /**
@@ -111,13 +112,13 @@ export class CardPGrup extends CardObject {
111
112
  toPGrupObject() {
112
113
  let obj = new PGrupObject();
113
114
  obj.name = this.plateGrupLabel.value.trimEnd();
114
- obj.thickness = this.plateThickness.value;
115
+ obj.thickness = CaeNumber(this.plateThickness.value);
115
116
  obj.plateType = this.plateType.value;
116
- obj.materialData_E = this.materialData_E.value;
117
- obj.poissonRatiou = this.poissonRatiou.value;
118
- obj.yieldStress = this.yieldStress.value;
119
- obj.plateZOffset = this.plateZOffset.value;
120
- obj.weightDensity = this.weightDensity.value;
117
+ obj.materialData_E = CaeNumber(this.materialData_E.value);
118
+ obj.poissonRatiou = CaeNumber(this.poissonRatiou.value);
119
+ obj.yieldStress = CaeNumber(this.yieldStress.value);
120
+ obj.plateZOffset = CaeNumber(this.plateZOffset.value);
121
+ obj.weightDensity = CaeNumber(this.weightDensity.value);
121
122
 
122
123
  return obj;
123
124
  }
@@ -3,6 +3,7 @@ import { PlateObject } from "../../gsDevFx/objects/caeObjects/plateObject";
3
3
  import { CardObject } from "./cardObject";
4
4
  import { JointObject } from "../../gsDevFx/objects/caeObjects/jointObject";
5
5
  import { PGrupObject } from "../../gsDevFx/objects/caeObjects/pGrupObject";
6
+ import { CaeNumber } from "../../utility/utility";
6
7
 
7
8
  /**
8
9
  * 卡片编辑器的板对象
@@ -189,9 +190,9 @@ export class CardPlate extends CardObject {
189
190
  obj.pGrup = this.plateGrupLabel.value.trimEnd() as any;
190
191
  obj.offsets = null;
191
192
  obj.rpsk = this.rpsk.value;
192
- obj.plateThickness = this.plateThickness.value;
193
+ obj.plateThickness = CaeNumber(this.plateThickness.value);
193
194
  obj.offsetOption = this.offsetOption.value;
194
- obj.materialData_E = this.materialData_E.value;
195
+ obj.materialData_E = CaeNumber(this.materialData_E.value);
195
196
  obj.poissonRatiou = this.poissonRatiou.value;
196
197
  obj.yieldStress = this.yieldStress.value;
197
198
  obj.weightDensity = this.weightDensity.value;
@@ -1,3 +1,4 @@
1
+ import { CaeNumber } from "../../utility/utility";
1
2
  import { SectionObject } from "../../gsDevFx/objects/caeObjects/sectionObject";
2
3
  import { CardObject } from "./cardObject";
3
4
 
@@ -92,9 +93,9 @@ export class CardSection extends CardObject {
92
93
  updateRenderObject(ro: SectionObject) {
93
94
  ro.name = this.crossSectionLabel.value.trimEnd();
94
95
  ro.crossSectionType = this.crossSectionType.value.trimEnd();
95
- ro.stiffnessPro_AX = this.stiffnessPro_AX.value;
96
- ro.stiffnessPro_J = this.stiffnessPro_J.value;
97
- ro.stiffnessPro_IY = this.stiffnessPro_IY.value;
98
- ro.stiffnessPro_IZ = this.stiffnessPro_IZ.value;
96
+ ro.stiffnessPro_AX = CaeNumber(this.stiffnessPro_AX.value);
97
+ ro.stiffnessPro_J = CaeNumber(this.stiffnessPro_J.value);
98
+ ro.stiffnessPro_IY = CaeNumber(this.stiffnessPro_IY.value);
99
+ ro.stiffnessPro_IZ = CaeNumber(this.stiffnessPro_IZ.value);
99
100
  }
100
101
  }
@@ -45,7 +45,7 @@ export class CardSURFID extends CardObject {
45
45
  };
46
46
  localYJointName = {
47
47
  value: "",
48
- range: [27, 32],
48
+ range: [28, 32],
49
49
  span: 1,
50
50
  label: "Local Y Joint ID",
51
51
  type: "Alphanumeric",
@@ -53,7 +53,7 @@ export class CardSURFID extends CardObject {
53
53
  };
54
54
  outOfPlaneTolerance = {
55
55
  value: "",
56
- range: [33, 42],
56
+ range: [33, 40],
57
57
  span: 0,
58
58
  label: "Out-of-Plane Tolerance",
59
59
  type: "Floating Point",
@@ -392,6 +392,7 @@ export class CloudMemberTransformManager extends Longan.ProcessManagerBase {
392
392
  ) as ConSectionObject;
393
393
  newSection._businessState = BusinessState.Living;
394
394
  newSection.name = uuid();
395
+ newSection.isTemp = true;
395
396
  let largeOD = Number(newSection.largeOD);
396
397
  let smallOD = Number(newSection.smallOD);
397
398
  if (afterOD != -1) {
@@ -247,6 +247,16 @@ export class DatWriterManager extends Longan.ViewerManagerBase {
247
247
  ) as SeastateLdopt[];
248
248
  datCardData = this.renderobjectsSerializeToCard(ldopts, datCardData);
249
249
 
250
+ let lcsels = process.findRenderObjectsByType(
251
+ "SeastateLcsel"
252
+ ) as SeastateLcsel[];
253
+ datCardData = this.renderobjectsSerializeToCard(lcsels, datCardData);
254
+
255
+ let files = process.findRenderObjectsByType(
256
+ "SeastateFile"
257
+ ) as SeastateFile[];
258
+ datCardData = this.renderobjectsSerializeToCard(files, datCardData);
259
+
250
260
  let hydros = process.findRenderObjectsByType(
251
261
  "SeastateHydro"
252
262
  ) as SeastateHydro[];
@@ -257,21 +267,11 @@ export class DatWriterManager extends Longan.ViewerManagerBase {
257
267
  ) as SeastateHydro2[];
258
268
  datCardData = this.renderobjectsSerializeToCard(hydro2s, datCardData);
259
269
 
260
- let lcsels = process.findRenderObjectsByType(
261
- "SeastateLcsel"
262
- ) as SeastateLcsel[];
263
- datCardData = this.renderobjectsSerializeToCard(lcsels, datCardData);
264
-
265
270
  let ucparts = process.findRenderObjectsByType(
266
271
  "SeastateUcpart"
267
272
  ) as SeastateUcpart[];
268
273
  datCardData = this.renderobjectsSerializeToCard(ucparts, datCardData);
269
274
 
270
- let files = process.findRenderObjectsByType(
271
- "SeastateFile"
272
- ) as SeastateFile[];
273
- datCardData = this.renderobjectsSerializeToCard(files, datCardData);
274
-
275
275
  let SeastateCdmNode = process.findCaeObjectByNameInChildObject(
276
276
  process.caeRenderObjectTreeManager.postResultNode,
277
277
  "拖曳和惯性系数"
@@ -282,39 +282,6 @@ export class DatWriterManager extends Longan.ViewerManagerBase {
282
282
  datCardData = this.renderobjectsSerializeToCard(cdms, datCardData);
283
283
  }
284
284
 
285
- //mgrov
286
- let mgrovDivideRO = process.findRenderObjectByName(
287
- "海生物厚度按高程分色"
288
- ) as ColorDivMGROVObject;
289
- if (mgrovDivideRO) {
290
- datCardData += "MGROV" + "\n";
291
- let mgrovs = mgrovDivideRO.mgrovList;
292
- datCardData = this.renderobjectsSerializeToCard(mgrovs, datCardData);
293
- }
294
- //corrz
295
- let corrzDivideRO = process.findRenderObjectByName(
296
- "腐蚀余量按高程分色"
297
- ) as ColorDivCORRZObject;
298
- if (corrzDivideRO) {
299
- datCardData += "CORRZ" + "\n";
300
- let corrzs = corrzDivideRO.corrzList;
301
- datCardData = this.renderobjectsSerializeToCard(corrzs, datCardData);
302
- }
303
- // //incwgt
304
- // let incwgts = process.findRenderObjectsByType(
305
- // "SeastateIncwgt"
306
- // ) as SeastateIncwgt[];
307
- // datCardData = this.renderobjectsSerializeToCard(incwgts, datCardData);
308
- // //accel
309
- // let accels = process.findRenderObjectsByType(
310
- // "SeastateAccel"
311
- // ) as SeastateAccel[];
312
- // datCardData = this.renderobjectsSerializeToCard(accels, datCardData);
313
- // //dead
314
- // let deads = process.findRenderObjectsByType(
315
- // "SeastateDead"
316
- // ) as SeastateDead[];
317
- // datCardData = this.renderobjectsSerializeToCard(deads, datCardData);
318
285
  //load
319
286
  let loadNode = process.findCaeObjectByNameInChildObject(
320
287
  process.caeRenderObjectTreeManager.postResultNode,
@@ -335,6 +302,27 @@ export class DatWriterManager extends Longan.ViewerManagerBase {
335
302
  datCardData += loadCondition.serializeToCardSeaInp();
336
303
  }
337
304
  }
305
+
306
+ //mgrov
307
+ let mgrovDivideRO = process.findRenderObjectByName(
308
+ "海生物厚度按高程分色"
309
+ ) as ColorDivMGROVObject;
310
+ if (mgrovDivideRO) {
311
+ datCardData += "MGROV" + "\n";
312
+ let mgrovs = mgrovDivideRO.mgrovList;
313
+ datCardData = this.renderobjectsSerializeToCard(mgrovs, datCardData);
314
+ }
315
+
316
+ //corrz
317
+ let corrzDivideRO = process.findRenderObjectByName(
318
+ "腐蚀余量按高程分色"
319
+ ) as ColorDivCORRZObject;
320
+ if (corrzDivideRO) {
321
+ datCardData += "CORRZ" + "\n";
322
+ let corrzs = corrzDivideRO.corrzList;
323
+ datCardData = this.renderobjectsSerializeToCard(corrzs, datCardData);
324
+ }
325
+
338
326
  let lcombNode = process.findCaeObjectByNameInChildObject(
339
327
  process.caeRenderObjectTreeManager.postResultNode,
340
328
  "荷载组合"
@@ -386,6 +374,25 @@ export class DatWriterManager extends Longan.ViewerManagerBase {
386
374
  let codes = process.findRenderObjectsByType("ModelCodeIs") as ModelCodeIs[];
387
375
  datCardData = this.renderobjectsSerializeToCard(codes, datCardData);
388
376
 
377
+ // lrfd
378
+ let lrfdFactorsNode = process.findCaeObjectByNameInChildObject(
379
+ process.caeRenderObjectTreeManager.postResultNode,
380
+ "LRFD抗力系数"
381
+ );
382
+ if (lrfdFactorsNode) {
383
+ datCardData += '\n'
384
+ for (let i = 0; i < lrfdFactorsNode.childObjects.length; i++) {
385
+ let child = lrfdFactorsNode.childObjects[i] as LRFDFactorsObject;
386
+ if (
387
+ child.businessState === BusinessState.Deleting ||
388
+ child.businessState === BusinessState.Dead
389
+ ) {
390
+ continue;
391
+ }
392
+ datCardData += child.serializeToCard() + '\n';
393
+ }
394
+ }
395
+
389
396
  datCardData += "SECT\n";
390
397
  datCardData = this.exportSectionData(datCardData);
391
398
 
@@ -395,12 +402,6 @@ export class DatWriterManager extends Longan.ViewerManagerBase {
395
402
  }
396
403
  datCardData = this.renderobjectsSerializeToCard(grups, datCardData);
397
404
 
398
- let joints = this.viewer.process.findRenderObjectsByType("JointObject");
399
- if (joints.length > 0) {
400
- datCardData += "JOINT\n";
401
- }
402
- datCardData = this.renderobjectsSerializeToCard(joints, datCardData);
403
-
404
405
  let members = this.viewer.process.findRenderObjectsByType("MemberObject");
405
406
  if (members.length > 0) {
406
407
  datCardData += "MEMBER\n";
@@ -419,122 +420,32 @@ export class DatWriterManager extends Longan.ViewerManagerBase {
419
420
  }
420
421
  datCardData = this.renderobjectsSerializeToCard(plates, datCardData);
421
422
 
422
-
423
-
424
-
425
-
426
- let loadNode = process.findCaeObjectByNameInChildObject(
427
- process.caeRenderObjectTreeManager.postResultNode,
428
- "荷载工况"
429
- );
430
- if (loadNode) {
431
- if (loadNode.childObjects.length > 0) {
432
- datCardData += "LOAD\n";
433
- }
434
- for (let i = 0; i < loadNode.childObjects.length; i++) {
435
- let loadCondition = loadNode.childObjects[i] as LoadConditionObject;
436
- if(!loadCondition.checkBusinessStateIsActive()) {
437
- continue;
438
- }
439
- for (let j = 0; j < loadCondition.childObjects.length; j++) {
440
- let loadGroup = loadCondition.childObjects[j] as LoadGroupObject;
441
- if(!loadGroup.checkBusinessStateIsActive()) {
442
- continue;
443
- }
444
- if (loadGroup instanceof LoadGroupObject) {
445
- datCardData += loadGroup.serializeToCardSacInp();
446
- }
447
- }
448
- }
449
- }
450
-
451
- let lcombNode = process.findCaeObjectByNameInChildObject(
452
- process.caeRenderObjectTreeManager.postResultNode,
453
- "荷载组合"
454
- );
455
- if (lcombNode) {
456
- for (let i = 0; i < lcombNode.childObjects.length; i++) {
457
- let loadCombinationGroup = lcombNode.childObjects[i] as LoadCombinationGroupObject;
458
- if(!loadCombinationGroup.checkBusinessStateIsActive()) {
459
- continue
460
- }
461
- datCardData += loadCombinationGroup.serializeToCardSacInp();
462
- }
463
- }
464
- // 自重荷载
465
- let deadLoadNode = process.findRenderObjectByName(
466
- "自重荷载"
467
- ) as DeadLoadObject;
468
- if (deadLoadNode) {
469
- datCardData += "\n";
470
- console.log('deadLoadNode.childObjects',deadLoadNode.childObjects);
471
-
472
- for (let i = 0; i < deadLoadNode.childObjects.length; i++) {
473
- let child = deadLoadNode.childObjects[i] as DeadLoadObject;
474
- console.log('自重荷载child',child);
475
- datCardData += child.serializeLOADCNToCard()
476
- datCardData += "DEAD\n";
477
- datCardData += child.serializeToCard()+ "\n"
478
- }
423
+ let joints = this.viewer.process.findRenderObjectsByType("JointObject");
424
+ if (joints.length > 0) {
425
+ datCardData += "JOINT\n";
479
426
  }
480
-
481
-
427
+ datCardData = this.renderobjectsSerializeToCard(joints, datCardData);
482
428
 
483
429
  // 回转中心
484
- let cneterRollNode = process.findCaeObjectByNameInChildObject(
485
- process.caeRenderObjectTreeManager.pretreatmentNode,
486
- "回转中心"
487
- );
488
- if (cneterRollNode) {
489
- datCardData += '\n'
490
- for (let i = 0; i < cneterRollNode.childObjects.length; i++) {
491
- let child = cneterRollNode.childObjects[i] as CenterRenderObject;
492
- if (
493
- child.businessState === BusinessState.Deleting ||
494
- child.businessState === BusinessState.Dead
495
- ) {
496
-
497
- continue;
498
- }
499
- datCardData += child.serializeToCard() + '\n';
500
- }
501
- }
502
- // lrfd
503
- let lrfdFactorsNode = process.findCaeObjectByNameInChildObject(
504
- process.caeRenderObjectTreeManager.postResultNode,
505
- "LRFD抗力系数"
430
+ let cneterRollNode = process.findCaeObjectByNameInChildObject(
431
+ process.caeRenderObjectTreeManager.pretreatmentNode,
432
+ "回转中心"
506
433
  );
507
- if (lrfdFactorsNode) {
434
+ if (cneterRollNode) {
508
435
  datCardData += '\n'
509
- for (let i = 0; i < lrfdFactorsNode.childObjects.length; i++) {
510
- let child = lrfdFactorsNode.childObjects[i] as LRFDFactorsObject;
436
+ for (let i = 0; i < cneterRollNode.childObjects.length; i++) {
437
+ let child = cneterRollNode.childObjects[i] as CenterRenderObject;
511
438
  if (
512
439
  child.businessState === BusinessState.Deleting ||
513
440
  child.businessState === BusinessState.Dead
514
441
  ) {
442
+
515
443
  continue;
516
444
  }
517
445
  datCardData += child.serializeToCard() + '\n';
518
446
  }
519
447
  }
520
448
 
521
- // 风载屏蔽区域
522
- let windShieldNode = process.findCaeObjectByNameInChildObject(
523
- process.caeRenderObjectTreeManager.pretreatmentNode,
524
- "风载屏蔽区域"
525
- );
526
- if (windShieldNode) {
527
- for (let i = 0; i < windShieldNode.childObjects.length; i++) {
528
- let child = windShieldNode.childObjects[i] as WindShieldObject;
529
- if (
530
- child.businessState === BusinessState.Deleting ||
531
- child.businessState === BusinessState.Dead
532
- ) {
533
- continue;
534
- }
535
- datCardData += child.serializeToCard() + '\n';
536
- }
537
- }
538
449
  // 表面定义
539
450
  let SurfaceDefinitionNode = process.findCaeObjectByNameInChildObject(
540
451
  process.caeRenderObjectTreeManager.pretreatmentNode,
@@ -584,12 +495,84 @@ export class DatWriterManager extends Longan.ViewerManagerBase {
584
495
  }
585
496
  datCardData = this.renderobjectsSerializeToCard(wgtmems, datCardData);
586
497
 
498
+ // weight
499
+ let weightNode = process.findCaeObjectByNameInChildObject(
500
+ process.caeRenderObjectTreeManager.pretreatmentNode,
501
+ "附加质量"
502
+ );
503
+ if (weightNode) {
504
+ for (let i = 0; i < weightNode.childObjects.length; i++) {
505
+ let weightGroup = weightNode.childObjects[i] as WeightGroupObject;
506
+ if(!weightGroup.checkBusinessStateIsActive()) {
507
+ continue
508
+ }
509
+ datCardData += weightGroup.serializeToCardSacInp();
510
+ }
511
+ }
512
+
513
+
514
+ let loadNode = process.findCaeObjectByNameInChildObject(
515
+ process.caeRenderObjectTreeManager.postResultNode,
516
+ "荷载工况"
517
+ );
518
+ if (loadNode) {
519
+ if (loadNode.childObjects.length > 0) {
520
+ datCardData += "LOAD\n";
521
+ }
522
+ for (let i = 0; i < loadNode.childObjects.length; i++) {
523
+ let loadCondition = loadNode.childObjects[i] as LoadConditionObject;
524
+ if(!loadCondition.checkBusinessStateIsActive()) {
525
+ continue;
526
+ }
527
+ for (let j = 0; j < loadCondition.childObjects.length; j++) {
528
+ let loadGroup = loadCondition.childObjects[j] as LoadGroupObject;
529
+ if(!loadGroup.checkBusinessStateIsActive()) {
530
+ continue;
531
+ }
532
+ if (loadGroup instanceof LoadGroupObject) {
533
+ datCardData += loadGroup.serializeToCardSacInp();
534
+ }
535
+ }
536
+ }
537
+ }
538
+
539
+ let lcombNode = process.findCaeObjectByNameInChildObject(
540
+ process.caeRenderObjectTreeManager.postResultNode,
541
+ "荷载组合"
542
+ );
543
+ if (lcombNode) {
544
+ for (let i = 0; i < lcombNode.childObjects.length; i++) {
545
+ let loadCombinationGroup = lcombNode.childObjects[i] as LoadCombinationGroupObject;
546
+ if(!loadCombinationGroup.checkBusinessStateIsActive()) {
547
+ continue
548
+ }
549
+ datCardData += loadCombinationGroup.serializeToCardSacInp();
550
+ }
551
+ }
552
+
553
+ // 风载屏蔽区域
554
+ let windShieldNode = process.findCaeObjectByNameInChildObject(
555
+ process.caeRenderObjectTreeManager.pretreatmentNode,
556
+ "风载屏蔽区域"
557
+ );
558
+ if (windShieldNode) {
559
+ for (let i = 0; i < windShieldNode.childObjects.length; i++) {
560
+ let child = windShieldNode.childObjects[i] as WindShieldObject;
561
+ if (
562
+ child.businessState === BusinessState.Deleting ||
563
+ child.businessState === BusinessState.Dead
564
+ ) {
565
+ continue;
566
+ }
567
+ datCardData += child.serializeToCard() + '\n';
568
+ }
569
+ }
570
+
587
571
  // 受风面定义 WindAreaObject
588
572
  let WindAreaObjectNode = process.findCaeObjectByNameInChildObject(
589
573
  process.caeRenderObjectTreeManager.pretreatmentNode,
590
574
  "受风面定义"
591
575
  );
592
-
593
576
  if (WindAreaObjectNode) {
594
577
  datCardData += "AREA\n";
595
578
 
@@ -613,19 +596,20 @@ export class DatWriterManager extends Longan.ViewerManagerBase {
613
596
  }
614
597
  }
615
598
 
599
+ // 自重荷载
600
+ let deadLoadNode = process.findRenderObjectByName(
601
+ "自重荷载"
602
+ ) as DeadLoadObject;
603
+ if (deadLoadNode) {
604
+ datCardData += "\n";
605
+ console.log('deadLoadNode.childObjects',deadLoadNode.childObjects);
616
606
 
617
- // weight
618
- let weightNode = process.findCaeObjectByNameInChildObject(
619
- process.caeRenderObjectTreeManager.pretreatmentNode,
620
- "附加质量"
621
- );
622
- if (weightNode) {
623
- for (let i = 0; i < weightNode.childObjects.length; i++) {
624
- let weightGroup = weightNode.childObjects[i] as WeightGroupObject;
625
- if(!weightGroup.checkBusinessStateIsActive()) {
626
- continue
627
- }
628
- datCardData += weightGroup.serializeToCardSacInp();
607
+ for (let i = 0; i < deadLoadNode.childObjects.length; i++) {
608
+ let child = deadLoadNode.childObjects[i] as DeadLoadObject;
609
+ console.log('自重荷载child',child);
610
+ datCardData += child.serializeLOADCNToCard()
611
+ datCardData += "DEAD\n";
612
+ datCardData += child.serializeToCard()+ "\n"
629
613
  }
630
614
  }
631
615
 
@@ -3,6 +3,9 @@ import { DesignBaseObject } from "gs-ceec-design";
3
3
  import { InstanceRenderObject } from "../instancesObjects/instanceRenderObject";
4
4
  import { Longan } from "gs-bim-air";
5
5
 
6
+ /**
7
+ * 单个波面对象.
8
+ */
6
9
  export class WaveItemObject extends DesignBaseObject {
7
10
  public typeName = "WaveItemObject";
8
11
 
@@ -4,6 +4,9 @@ import { Longan } from "gs-bim-air";
4
4
  import { InstanceRenderObject } from "../instancesObjects/instanceRenderObject";
5
5
  import { WaveItemObject } from "./waveItemObject";
6
6
 
7
+ /**
8
+ * 波面对象的根节点.
9
+ */
7
10
  export class WaveObject extends DesignBaseObject {
8
11
  public typeName = "WaveObject";
9
12
 
@@ -125,7 +125,7 @@ export default class EditSectionConfig extends Config {
125
125
  data.definedSecitons.selectOptions.selections = [];
126
126
  for (let i = 0; i < sectionInsNode.childObjects.length; i++) {
127
127
  let item = sectionInsNode.childObjects[i];
128
- if ((item as DesignBaseObject).checkBusinessStateIsActive()) {
128
+ if ((item as DesignBaseObject).checkBusinessStateIsActive() && !item.isTemp) {
129
129
  data.definedSecitons.selectOptions.selections.push({
130
130
  label: item.name,
131
131
  value: item.name,
@@ -1 +1 @@
1
- {"version":3,"file":"cardJointElastic.d.ts","sourceRoot":"","sources":["../../../../../src/caeCardEditor/caeCardObjects/cardJointElastic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,8CAA8C,CAAC;AACrF,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAK1C,qBAAa,gBAAiB,SAAQ,UAAU;IAI9C,SAAS;;;;;;;MAOP;IAIF,SAAS;;;;;;;MAOP;IAIF,EAAE;;;;;;MAMA;IAIF,EAAE;;;;;;MAMA;IAKF,EAAE;;;;;;MAMA;IAKF,EAAE;;;;;;MAMA;IAKF,EAAE;;;;;;MAMA;IAKF,EAAE;;;;;;;MAOA;IAKF,KAAK;;;;MAAkD;IAEvD,eAAe;;;;;;;MAOb;IAEF,cAAc;;;;;;;MAOZ;gBAGU,IAAI,CAAC,EAAE,MAAM;IAKzB,SAAS;CAaV"}
1
+ {"version":3,"file":"cardJointElastic.d.ts","sourceRoot":"","sources":["../../../../../src/caeCardEditor/caeCardObjects/cardJointElastic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,8CAA8C,CAAC;AACrF,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAM1C,qBAAa,gBAAiB,SAAQ,UAAU;IAI9C,SAAS;;;;;;;MAOP;IAIF,SAAS;;;;;;;MAOP;IAIF,EAAE;;;;;;MAMA;IAIF,EAAE;;;;;;MAMA;IAKF,EAAE;;;;;;MAMA;IAKF,EAAE;;;;;;MAMA;IAKF,EAAE;;;;;;MAMA;IAKF,EAAE;;;;;;;MAOA;IAKF,KAAK;;;;MAAkD;IAEvD,eAAe;;;;;;;MAOb;IAEF,cAAc;;;;;;;MAOZ;gBAGU,IAAI,CAAC,EAAE,MAAM;IAKzB,SAAS;CAaV"}
@@ -1 +1 @@
1
- {"version":3,"file":"cardLOADCONC.d.ts","sourceRoot":"","sources":["../../../../../src/caeCardEditor/caeCardObjects/cardLOADCONC.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,4BAA4B,EAAE,MAAM,gEAAgE,CAAC;AAM9G,qBAAa,YAAa,SAAQ,UAAU;IAC1C,SAAS;;;;;;;MAOP;IACF,aAAa;;;;;;;MAOX;IACF,UAAU;;;;;;;MAOR;IACF,UAAU;;;;;;;MAOR;IACF,mBAAmB;;;;;;;MAOjB;IACF,sBAAsB;;;;;;;MAOpB;IACF,oBAAoB;;;;;;;MAOlB;IACF,uBAAuB;;;;;;;MAOrB;IACF,oBAAoB;;;;;;;MAOlB;IACF,QAAQ;;;;;;;MAON;IACF,MAAM;;;;;;;MAOJ;gBAEU,IAAI,CAAC,EAAE,MAAM;IAKzB,cAAc,CAAC,iBAAiB,EAAE,MAAM;CAsBzC"}
1
+ {"version":3,"file":"cardLOADCONC.d.ts","sourceRoot":"","sources":["../../../../../src/caeCardEditor/caeCardObjects/cardLOADCONC.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,4BAA4B,EAAE,MAAM,gEAAgE,CAAC;AAM9G,qBAAa,YAAa,SAAQ,UAAU;IAC1C,SAAS;;;;;;;MAOP;IACF,aAAa;;;;;;;MAOX;IACF,UAAU;;;;;;;MAOR;IACF,UAAU;;;;;;;MAOR;IACF,mBAAmB;;;;;;;MAOjB;IACF,sBAAsB;;;;;;;MAOpB;IACF,oBAAoB;;;;;;;MAOlB;IACF,uBAAuB;;;;;;;MAOrB;IACF,oBAAoB;;;;;;;MAOlB;IACF,QAAQ;;;;;;;MAON;IACF,MAAM;;;;;;;MAOJ;gBAEU,IAAI,CAAC,EAAE,MAAM;IAKzB,cAAc,CAAC,iBAAiB,EAAE,MAAM;CAwBzC"}
@@ -1 +1 @@
1
- {"version":3,"file":"cardMember.d.ts","sourceRoot":"","sources":["../../../../../src/caeCardEditor/caeCardObjects/cardMember.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,+CAA+C,CAAC;AAC7E,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAO1C,qBAAa,UAAW,SAAQ,UAAU;IAIxC,SAAS;;;;;;;MAOP;IAIF,YAAY;;;;;;;MAOV;IAIF,WAAW;;;;;;;MAOT;IAIF,WAAW;;;;;;;MAOT;IAIF,OAAO;;;;;;;MAOL;IAIF,SAAS;;;;;;;MAOP;IAIF,YAAY;;;;;;;MAOV;IAIF,cAAc;;;;;;;MAOZ;IAIF,gBAAgB;;;;;;;MAOd;IAIF,gBAAgB;;;;;;;MAOd;IAIF,gBAAgB;;;;;;;MAOd;IAIF,gBAAgB;;;;;;;MAOd;IAIF,gBAAgB;;;;;;;MAOd;IAIF,gBAAgB;;;;;;;MAOd;IAIF,gBAAgB;;;;;;;MAOd;IAIF,gBAAgB;;;;;;;MAOd;IAIF,gBAAgB;;;;;;;MAOd;IAIF,gBAAgB;;;;;;;MAOd;IAIF,gBAAgB;;;;;;;MAOd;IAIF,gBAAgB;;;;;;;MAOd;IAKF,UAAU;;;;;;;MAOR;IAKF,UAAU;;;;;;;MAOR;IAIF,cAAc;;;;;;;MAOZ;IAIF,UAAU;;;;;;;MAOR;IAKF,iBAAiB;;;;;;;MAOf;IAIF,UAAU;;;;;;;MAOR;IAIF,UAAU;;;;;;;MAOR;IAIF,aAAa;;;;;;;MAOX;IAKF,OAAO;;;;;;;MAOL;IAIF,UAAU;;;;;;;MAOR;IAKF,iBAAiB;;;;;;;MAOf;gBAEU,IAAI,CAAC,EAAE,MAAM;IAKzB,WAAW;IAWX,WAAW;IAWX,cAAc;CA0Bf"}
1
+ {"version":3,"file":"cardMember.d.ts","sourceRoot":"","sources":["../../../../../src/caeCardEditor/caeCardObjects/cardMember.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,+CAA+C,CAAC;AAC7E,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAK1C,qBAAa,UAAW,SAAQ,UAAU;IAIxC,SAAS;;;;;;;MAOP;IAIF,YAAY;;;;;;;MAOV;IAIF,WAAW;;;;;;;MAOT;IAIF,WAAW;;;;;;;MAOT;IAIF,OAAO;;;;;;;MAOL;IAIF,SAAS;;;;;;;MAOP;IAIF,YAAY;;;;;;;MAOV;IAIF,cAAc;;;;;;;MAOZ;IAIF,gBAAgB;;;;;;;MAOd;IAIF,gBAAgB;;;;;;;MAOd;IAIF,gBAAgB;;;;;;;MAOd;IAIF,gBAAgB;;;;;;;MAOd;IAIF,gBAAgB;;;;;;;MAOd;IAIF,gBAAgB;;;;;;;MAOd;IAIF,gBAAgB;;;;;;;MAOd;IAIF,gBAAgB;;;;;;;MAOd;IAIF,gBAAgB;;;;;;;MAOd;IAIF,gBAAgB;;;;;;;MAOd;IAIF,gBAAgB;;;;;;;MAOd;IAIF,gBAAgB;;;;;;;MAOd;IAKF,UAAU;;;;;;;MAOR;IAKF,UAAU;;;;;;;MAOR;IAIF,cAAc;;;;;;;MAOZ;IAIF,UAAU;;;;;;;MAOR;IAKF,iBAAiB;;;;;;;MAOf;IAIF,UAAU;;;;;;;MAOR;IAIF,UAAU;;;;;;;MAOR;IAIF,aAAa;;;;;;;MAOX;IAKF,OAAO;;;;;;;MAOL;IAIF,UAAU;;;;;;;MAOR;IAKF,iBAAiB;;;;;;;MAOf;gBAEU,IAAI,CAAC,EAAE,MAAM;IAKzB,WAAW;IAWX,WAAW;IAWX,cAAc;CA0Bf"}
@@ -1 +1 @@
1
- {"version":3,"file":"cardPGrup.d.ts","sourceRoot":"","sources":["../../../../../src/caeCardEditor/caeCardObjects/cardPGrup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,8CAA8C,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAI1C,qBAAa,SAAU,SAAQ,UAAU;IAIvC,SAAS;;;;;;;MAOP;IAIF,cAAc;;;;;;;MAOZ;IAKF,cAAc;;;;;;MAMZ;IAIF,SAAS;;;;;;;MAOP;IAKF,cAAc;;;;;;MAMZ;IAKF,aAAa;;;;;;MAMX;IAKF,WAAW;;;;;;MAMT;IAMF,YAAY;;;;;;;MAOV;IAEF,aAAa;;;;;;MAMX;gBAEU,IAAI,CAAC,EAAE,MAAM;IAKzB,aAAa;CAad"}
1
+ {"version":3,"file":"cardPGrup.d.ts","sourceRoot":"","sources":["../../../../../src/caeCardEditor/caeCardObjects/cardPGrup.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,8CAA8C,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAI1C,qBAAa,SAAU,SAAQ,UAAU;IAIvC,SAAS;;;;;;;MAOP;IAIF,cAAc;;;;;;;MAOZ;IAKF,cAAc;;;;;;MAMZ;IAIF,SAAS;;;;;;;MAOP;IAKF,cAAc;;;;;;MAMZ;IAKF,aAAa;;;;;;MAMX;IAKF,WAAW;;;;;;MAMT;IAMF,YAAY;;;;;;;MAOV;IAEF,aAAa;;;;;;MAMX;gBAEU,IAAI,CAAC,EAAE,MAAM;IAKzB,aAAa;CAad"}