gs-cae-design 1.1.58 → 1.1.60
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.
- package/README.md +22 -0
- package/docs/classes/Command.CommandFiniteElement.md +2 -0
- package/docs/classes/CommandInterfaceManager.md +112 -0
- package/docs/classes/CommonInterfaceManager.md +13 -0
- package/lib/.gz +0 -0
- package/lib/CAEDesign.common-report.html +2 -2
- package/lib/CAEDesign.common.js +272 -85
- package/lib/CAEDesign.umd-report.html +2 -2
- package/lib/CAEDesign.umd.js +272 -85
- package/lib/CAEDesign.umd.min-report.html +2 -2
- package/lib/CAEDesign.umd.min.js +272 -85
- package/package.json +1 -1
- package/src/caeCardEditor/caeCardObjects/sacinp/cardSURFWT.ts +6 -6
- package/src/caeCardEditor/caeCardObjects/seainp/cardCURR.ts +17 -2
- package/src/caeCardEditor/caeCardObjects/seainp/cardDEAD.ts +8 -1
- package/src/caeCardEditor/caeCardObjects/seainp/cardWAVE.ts +27 -0
- package/src/caeCardEditor/caeCardObjects/seainp/cardWIND.ts +15 -0
- package/src/gsDevFx/managers/datReaderManager.ts +38 -61
- package/src/gsDevFx/managers/datWriterManager.ts +17 -1
- package/src/gsDevFx/managers/interfaceManagers/commandInterfaceManager.ts +111 -0
- package/src/gsDevFx/managers/interfaceManagers/commonInterfaceManager.ts +10 -0
- package/src/gsDevFx/managers/persistenceManager.ts +10 -5
- package/src/gsDevFx/objects/caeObjects/aftertreatment/deadLoadObject.ts +133 -0
- package/src/gsDevFx/objects/caeObjects/grupObject.ts +22 -20
- package/src/gsDevFx/objects/caeObjects/jointObject.ts +50 -25
- package/src/gsDevFx/objects/caeObjects/memberObject.ts +47 -20
- package/src/gsDevFx/objects/caeObjects/pGrupObject.ts +9 -8
- package/src/gsDevFx/objects/caeObjects/plateObject.ts +96 -32
- package/src/gsDevFx/objects/caeObjects/pretreatment/surfaceDefinitionObject.ts +1 -1
- package/src/gsDevFx/objects/caeObjects/pretreatment/surfaceWeightObject.ts +7 -2
- package/src/gsDevFx/objects/caeObjects/sectionObject.ts +47 -25
- package/src/gsDevFx/objects/loadObjects/currLoadObject.ts +162 -0
- package/src/gsDevFx/objects/loadObjects/loadConditionObject.ts +6 -3
- package/src/gsDevFx/objects/loadObjects/waveLoadObject.ts +242 -0
- package/src/gsDevFx/objects/loadObjects/windLoadObject.ts +160 -0
- package/src/gsDevFx/objects/pretreatmentObjects/cutlineBaseObject.ts +13 -12
- package/src/gsDevFx/process.ts +61 -22
- package/src/gsDevFx/viewer.ts +3 -0
- package/src/viewerWrapper/commands/aftertreatment/addCurrentLoad/addCurrentLoadConfig.ts +99 -0
- package/src/viewerWrapper/commands/aftertreatment/addCurrentLoad/commandAddCurrentLoad.ts +269 -0
- package/src/viewerWrapper/commands/aftertreatment/addDeadLoad/addDeadLoadConfig.ts +86 -0
- package/src/viewerWrapper/commands/aftertreatment/addDeadLoad/commandAddDeadLoad.ts +195 -0
- package/src/viewerWrapper/commands/aftertreatment/addJointLoad/commandAddJointLoad.ts +25 -7
- package/src/viewerWrapper/commands/aftertreatment/addWaveLoad/addWaveLoadConfig.ts +208 -0
- package/src/viewerWrapper/commands/aftertreatment/addWaveLoad/commandAddWaveLoad.ts +309 -0
- package/src/viewerWrapper/commands/aftertreatment/addWindLoad/addWindLoadConfig.ts +143 -0
- package/src/viewerWrapper/commands/aftertreatment/addWindLoad/commandAddWindLoad.ts +279 -0
- package/src/viewerWrapper/commands/aftertreatment/editCurrentLoad/commandEditCurrentLoad.ts +286 -0
- package/src/viewerWrapper/commands/aftertreatment/editCurrentLoad/editCurrentLoadConfig.ts +129 -0
- package/src/viewerWrapper/commands/aftertreatment/editJointLoad/commandEditJointLoad.ts +1 -0
- package/src/viewerWrapper/commands/aftertreatment/editWaveLoad/commandEditWaveLoad.ts +330 -0
- package/src/viewerWrapper/commands/aftertreatment/editWaveLoad/editWaveLoadConfig.ts +243 -0
- package/src/viewerWrapper/commands/aftertreatment/editWindLoad/commandEditWindLoad.ts +296 -0
- package/src/viewerWrapper/commands/aftertreatment/editWindLoad/editWindLoadConfig.ts +176 -0
- package/src/viewerWrapper/commands/aftertreatment/postResultCloud/commandPostResultCloud.ts +9 -2
- package/src/viewerWrapper/commands/commandSplitMemberBase.ts +6 -8
- package/src/viewerWrapper/commands/commandUtilities/commandUtilities.ts +99 -91
- package/src/viewerWrapper/commands/createPlate/plateConfig.ts +22 -0
- package/src/viewerWrapper/commands/editGrup/commandEditGrup.ts +41 -26
- package/src/viewerWrapper/commands/mergeMember/commandMergeMember.ts +3 -0
- package/src/viewerWrapper/commands/pretreatment/colorDivideByEditComponentGroup/commandColorDivideByEditComponentGroup.ts +2 -2
- package/src/viewerWrapper/commands/pretreatment/editJointWeight/commandEditJointWeight.ts +8 -1
- package/src/viewerWrapper/commands/pretreatment/editMemberWeight/commandEditMemberWeight.ts +9 -1
- package/src/viewerWrapper/commands/pretreatment/finiteElement/commandFiniteElement.ts +3 -0
- package/src/viewerWrapper/commands/pretreatment/surfaceDefinition/commandSurfaceDefinition.ts +3 -2
- package/src/viewerWrapper/commands/pretreatment/surfaceDefinitionEdit/commandSurfaceDefinitionEdit.ts +1 -1
- package/src/viewerWrapper/commands/pretreatment/surfaceWeightAdd/commandSurfaceWeightAdd.ts +10 -6
- package/src/viewerWrapper/commands/pretreatment/surfaceWeightEdit/commandSurfaceWeightEdit.ts +187 -0
- package/src/viewerWrapper/commands/pretreatment/surfaceWeightEdit/surfaceWeightEditConfig.ts +72 -0
- package/src/viewerWrapper/commands/showJointProperty/commandShowJointProperty.ts +18 -15
- package/types/caeDesign/src/caeCardEditor/caeCardObjects/seainp/cardCURR.d.ts +6 -0
- package/types/caeDesign/src/caeCardEditor/caeCardObjects/seainp/cardCURR.d.ts.map +1 -1
- package/types/caeDesign/src/caeCardEditor/caeCardObjects/seainp/cardDEAD.d.ts +8 -0
- package/types/caeDesign/src/caeCardEditor/caeCardObjects/seainp/cardDEAD.d.ts.map +1 -1
- package/types/caeDesign/src/caeCardEditor/caeCardObjects/seainp/cardWAVE.d.ts +2 -0
- package/types/caeDesign/src/caeCardEditor/caeCardObjects/seainp/cardWAVE.d.ts.map +1 -1
- package/types/caeDesign/src/caeCardEditor/caeCardObjects/seainp/cardWIND.d.ts +2 -0
- package/types/caeDesign/src/caeCardEditor/caeCardObjects/seainp/cardWIND.d.ts.map +1 -1
- package/types/caeDesign/src/gsDevFx/managers/commandManager.d.ts.map +1 -1
- package/types/caeDesign/src/gsDevFx/managers/datReaderManager.d.ts +27 -29
- package/types/caeDesign/src/gsDevFx/managers/datReaderManager.d.ts.map +1 -1
- package/types/caeDesign/src/gsDevFx/managers/datWriterManager.d.ts.map +1 -1
- package/types/caeDesign/src/gsDevFx/managers/interfaceManagers/commandInterfaceManager.d.ts +16 -0
- package/types/caeDesign/src/gsDevFx/managers/interfaceManagers/commandInterfaceManager.d.ts.map +1 -1
- package/types/caeDesign/src/gsDevFx/managers/interfaceManagers/commonInterfaceManager.d.ts +3 -1
- package/types/caeDesign/src/gsDevFx/managers/interfaceManagers/commonInterfaceManager.d.ts.map +1 -1
- package/types/caeDesign/src/gsDevFx/managers/persistenceManager.d.ts.map +1 -1
- package/types/caeDesign/src/gsDevFx/objects/caeObjects/aftertreatment/deadLoadObject.d.ts +26 -0
- package/types/caeDesign/src/gsDevFx/objects/caeObjects/aftertreatment/deadLoadObject.d.ts.map +1 -0
- package/types/caeDesign/src/gsDevFx/objects/caeObjects/grupObject.d.ts.map +1 -1
- package/types/caeDesign/src/gsDevFx/objects/caeObjects/jointObject.d.ts +2 -0
- package/types/caeDesign/src/gsDevFx/objects/caeObjects/jointObject.d.ts.map +1 -1
- package/types/caeDesign/src/gsDevFx/objects/caeObjects/memberObject.d.ts.map +1 -1
- package/types/caeDesign/src/gsDevFx/objects/caeObjects/pGrupObject.d.ts.map +1 -1
- package/types/caeDesign/src/gsDevFx/objects/caeObjects/plateObject.d.ts.map +1 -1
- package/types/caeDesign/src/gsDevFx/objects/caeObjects/pretreatment/surfaceWeightObject.d.ts.map +1 -1
- package/types/caeDesign/src/gsDevFx/objects/caeObjects/sectionObject.d.ts.map +1 -1
- package/types/caeDesign/src/gsDevFx/objects/loadObjects/currLoadObject.d.ts +46 -0
- package/types/caeDesign/src/gsDevFx/objects/loadObjects/currLoadObject.d.ts.map +1 -0
- package/types/caeDesign/src/gsDevFx/objects/loadObjects/loadConditionObject.d.ts.map +1 -1
- package/types/caeDesign/src/gsDevFx/objects/loadObjects/waveLoadObject.d.ts +65 -0
- package/types/caeDesign/src/gsDevFx/objects/loadObjects/waveLoadObject.d.ts.map +1 -0
- package/types/caeDesign/src/gsDevFx/objects/loadObjects/windLoadObject.d.ts +50 -0
- package/types/caeDesign/src/gsDevFx/objects/loadObjects/windLoadObject.d.ts.map +1 -0
- package/types/caeDesign/src/gsDevFx/objects/pretreatmentObjects/cutlineBaseObject.d.ts.map +1 -1
- package/types/caeDesign/src/gsDevFx/process.d.ts.map +1 -1
- package/types/caeDesign/src/gsDevFx/propertyComponents/propertyComponent.vue.d.ts +0 -13
- package/types/caeDesign/src/gsDevFx/viewer.d.ts.map +1 -1
- package/types/caeDesign/src/viewerWrapper/commands/aftertreatment/addCurrentLoad/addCurrentLoadConfig.d.ts +7 -0
- package/types/caeDesign/src/viewerWrapper/commands/aftertreatment/addCurrentLoad/addCurrentLoadConfig.d.ts.map +1 -0
- package/types/caeDesign/src/viewerWrapper/commands/aftertreatment/addCurrentLoad/commandAddCurrentLoad.d.ts +27 -0
- package/types/caeDesign/src/viewerWrapper/commands/aftertreatment/addCurrentLoad/commandAddCurrentLoad.d.ts.map +1 -0
- package/types/caeDesign/src/viewerWrapper/commands/aftertreatment/addDeadLoad/addDeadLoadConfig.d.ts +5 -0
- package/types/caeDesign/src/viewerWrapper/commands/aftertreatment/addDeadLoad/addDeadLoadConfig.d.ts.map +1 -0
- package/types/caeDesign/src/viewerWrapper/commands/aftertreatment/addDeadLoad/commandAddDeadLoad.d.ts +15 -0
- package/types/caeDesign/src/viewerWrapper/commands/aftertreatment/addDeadLoad/commandAddDeadLoad.d.ts.map +1 -0
- package/types/caeDesign/src/viewerWrapper/commands/aftertreatment/addJointLoad/commandAddJointLoad.d.ts.map +1 -1
- package/types/caeDesign/src/viewerWrapper/commands/aftertreatment/addWaveLoad/addWaveLoadConfig.d.ts +5 -0
- package/types/caeDesign/src/viewerWrapper/commands/aftertreatment/addWaveLoad/addWaveLoadConfig.d.ts.map +1 -0
- package/types/caeDesign/src/viewerWrapper/commands/aftertreatment/addWaveLoad/commandAddWaveLoad.d.ts +27 -0
- package/types/caeDesign/src/viewerWrapper/commands/aftertreatment/addWaveLoad/commandAddWaveLoad.d.ts.map +1 -0
- package/types/caeDesign/src/viewerWrapper/commands/aftertreatment/addWindLoad/addWindLoadConfig.d.ts +5 -0
- package/types/caeDesign/src/viewerWrapper/commands/aftertreatment/addWindLoad/addWindLoadConfig.d.ts.map +1 -0
- package/types/caeDesign/src/viewerWrapper/commands/aftertreatment/addWindLoad/commandAddWindLoad.d.ts +27 -0
- package/types/caeDesign/src/viewerWrapper/commands/aftertreatment/addWindLoad/commandAddWindLoad.d.ts.map +1 -0
- package/types/caeDesign/src/viewerWrapper/commands/aftertreatment/editCurrentLoad/commandEditCurrentLoad.d.ts +26 -0
- package/types/caeDesign/src/viewerWrapper/commands/aftertreatment/editCurrentLoad/commandEditCurrentLoad.d.ts.map +1 -0
- package/types/caeDesign/src/viewerWrapper/commands/aftertreatment/editCurrentLoad/editCurrentLoadConfig.d.ts +9 -0
- package/types/caeDesign/src/viewerWrapper/commands/aftertreatment/editCurrentLoad/editCurrentLoadConfig.d.ts.map +1 -0
- package/types/caeDesign/src/viewerWrapper/commands/aftertreatment/editJointLoad/commandEditJointLoad.d.ts.map +1 -1
- package/types/caeDesign/src/viewerWrapper/commands/aftertreatment/editWaveLoad/commandEditWaveLoad.d.ts +26 -0
- package/types/caeDesign/src/viewerWrapper/commands/aftertreatment/editWaveLoad/commandEditWaveLoad.d.ts.map +1 -0
- package/types/caeDesign/src/viewerWrapper/commands/aftertreatment/editWaveLoad/editWaveLoadConfig.d.ts +7 -0
- package/types/caeDesign/src/viewerWrapper/commands/aftertreatment/editWaveLoad/editWaveLoadConfig.d.ts.map +1 -0
- package/types/caeDesign/src/viewerWrapper/commands/aftertreatment/editWindLoad/commandEditWindLoad.d.ts +26 -0
- package/types/caeDesign/src/viewerWrapper/commands/aftertreatment/editWindLoad/commandEditWindLoad.d.ts.map +1 -0
- package/types/caeDesign/src/viewerWrapper/commands/aftertreatment/editWindLoad/editWindLoadConfig.d.ts +7 -0
- package/types/caeDesign/src/viewerWrapper/commands/aftertreatment/editWindLoad/editWindLoadConfig.d.ts.map +1 -0
- package/types/caeDesign/src/viewerWrapper/commands/aftertreatment/postResultCloud/commandPostResultCloud.d.ts.map +1 -1
- package/types/caeDesign/src/viewerWrapper/commands/commandSplitMemberBase.d.ts.map +1 -1
- package/types/caeDesign/src/viewerWrapper/commands/commandUtilities/commandUtilities.d.ts.map +1 -1
- package/types/caeDesign/src/viewerWrapper/commands/createPlate/plateConfig.d.ts +1 -0
- package/types/caeDesign/src/viewerWrapper/commands/createPlate/plateConfig.d.ts.map +1 -1
- package/types/caeDesign/src/viewerWrapper/commands/editGrup/commandEditGrup.d.ts +1 -0
- package/types/caeDesign/src/viewerWrapper/commands/editGrup/commandEditGrup.d.ts.map +1 -1
- package/types/caeDesign/src/viewerWrapper/commands/mergeMember/commandMergeMember.d.ts.map +1 -1
- package/types/caeDesign/src/viewerWrapper/commands/pretreatment/editJointWeight/commandEditJointWeight.d.ts.map +1 -1
- package/types/caeDesign/src/viewerWrapper/commands/pretreatment/editMemberWeight/commandEditMemberWeight.d.ts.map +1 -1
- package/types/caeDesign/src/viewerWrapper/commands/pretreatment/finiteElement/commandFiniteElement.d.ts.map +1 -1
- package/types/caeDesign/src/viewerWrapper/commands/pretreatment/surfaceDefinition/commandSurfaceDefinition.d.ts.map +1 -1
- package/types/caeDesign/src/viewerWrapper/commands/pretreatment/surfaceWeightAdd/commandSurfaceWeightAdd.d.ts.map +1 -1
- package/types/caeDesign/src/viewerWrapper/commands/pretreatment/surfaceWeightEdit/commandSurfaceWeightEdit.d.ts +18 -0
- package/types/caeDesign/src/viewerWrapper/commands/pretreatment/surfaceWeightEdit/commandSurfaceWeightEdit.d.ts.map +1 -0
- package/types/caeDesign/src/viewerWrapper/commands/pretreatment/surfaceWeightEdit/surfaceWeightEditConfig.d.ts +13 -0
- package/types/caeDesign/src/viewerWrapper/commands/pretreatment/surfaceWeightEdit/surfaceWeightEditConfig.d.ts.map +1 -0
- package/types/caeDesign/src/viewerWrapper/commands/showJointProperty/commandShowJointProperty.d.ts.map +1 -1
- package/types/ceecDesign/src/api/gslServices.d.ts +10 -0
- package/types/ceecDesign/src/api/gslServices.d.ts.map +1 -0
- package/types/ceecDesign/src/api/renderObjectServices.d.ts +0 -15
- package/types/ceecDesign/src/api/renderObjectServices.d.ts.map +0 -1
- package/types/ceecDesign/src/gsDevFx/managers/persistenceManager.d.ts +2 -0
- package/types/ceecDesign/src/gsDevFx/managers/persistenceManager.d.ts.map +1 -1
- package/types/ceecDesign/src/gsDevFx/objects/designBaseObject/designBaseObject.d.ts +11 -0
- package/types/ceecDesign/src/gsDevFx/objects/designBaseObject/designBaseObject.d.ts.map +1 -0
- package/types/ceecDesign/src/gsDevFx/objects/designLightObject/designLightObject.d.ts +0 -18
- package/types/ceecDesign/src/gsDevFx/objects/designLightObject/designLightObject.d.ts.map +0 -1
- package/types/ceecDesign/src/gsDevFx/registerType.d.ts +2 -0
|
@@ -15,6 +15,7 @@ import { MemberWeightDistributedObject } from "../objects/weightObjects/memberW
|
|
|
15
15
|
import { CenterRenderObject } from "../objects/caeObjects/pretreatment/centerRenderObject";
|
|
16
16
|
import { SurfaceDefinitionObject } from "../objects/caeObjects/pretreatment/surfaceDefinitionObject";
|
|
17
17
|
import { BoundaryJointsObject } from "../objects/caeObjects/pretreatment/boundaryJointsObject";
|
|
18
|
+
import { SurfaceWeightObject } from "../objects/caeObjects/pretreatment/surfaceWeightObject";
|
|
18
19
|
import { WGTMEMObject } from "../objects/caeObjects/pretreatment/wgtmemObject";
|
|
19
20
|
import { SectionObject } from "../objects/caeObjects/sectionObject";
|
|
20
21
|
import { AngSectionObject } from "../objects/caeObjects/sections/angSectionObject";
|
|
@@ -38,6 +39,9 @@ import { LoadCombinationObject } from "../objects/loadCombinationObjects/loadCom
|
|
|
38
39
|
import { MemberLoadBaseObject } from "../objects/loadObjects/memberLoadBaseObject";
|
|
39
40
|
import { MemberLoadConcentratedObject } from "../objects/loadObjects/memberLoadConcentratedObject";
|
|
40
41
|
import { MemberLoadDistributedObject } from "../objects/loadObjects/memberLoadDistributedObject";
|
|
42
|
+
import { WaveLoadObject } from "../objects/loadObjects/waveLoadObject";
|
|
43
|
+
import { WindLoadObject } from "../objects/loadObjects/windLoadObject";
|
|
44
|
+
import { CurrLoadObject } from "../objects/loadObjects/currLoadObject";
|
|
41
45
|
import { BoreholesObject } from "../objects/pretreatmentObjects/boreholeObject";
|
|
42
46
|
import { ColorDivComponentGroupObject } from "../objects/pretreatmentObjects/colorDivComponentGroupObject";
|
|
43
47
|
import { ColorDivCORRZObject } from "../objects/pretreatmentObjects/colorDivCORRZObject";
|
|
@@ -65,7 +69,7 @@ import { SeastateWave } from "../objects/caeObjects/optionObjects/seastateWave";
|
|
|
65
69
|
import { SeastateWind } from "../objects/caeObjects/optionObjects/seastateWind";
|
|
66
70
|
import { SeastateCurr } from "../objects/caeObjects/optionObjects/seastateCurr";
|
|
67
71
|
import { SeastateLcomb } from "../objects/caeObjects/optionObjects/seastateLcomb";
|
|
68
|
-
|
|
72
|
+
import { DeadLoadObject } from '../objects/caeObjects/aftertreatment/deadLoadObject'
|
|
69
73
|
export class PersistenceManager extends Longan.PersistenceManager {
|
|
70
74
|
referenceList = new Longan.StringKeyList<IReferenceObject>();
|
|
71
75
|
needReferenceList = new Longan.List<IReferencedObject>();
|
|
@@ -192,6 +196,7 @@ export class PersistenceManager extends Longan.PersistenceManager {
|
|
|
192
196
|
this.typeList.add("CenterRenderObject", CenterRenderObject.prototype);
|
|
193
197
|
this.typeList.add("SurfaceDefinitionObject", SurfaceDefinitionObject.prototype);
|
|
194
198
|
this.typeList.add("BoundaryJointsObject", BoundaryJointsObject.prototype);
|
|
199
|
+
this.typeList.add("SurfaceWeightObject", SurfaceWeightObject.prototype);
|
|
195
200
|
|
|
196
201
|
// 荷载
|
|
197
202
|
this.typeList.add("LoadConditionObject", LoadConditionObject.prototype);
|
|
@@ -201,6 +206,9 @@ export class PersistenceManager extends Longan.PersistenceManager {
|
|
|
201
206
|
|
|
202
207
|
this.typeList.add("LoadBaseObject", LoadBaseObject.prototype);
|
|
203
208
|
this.typeList.add("JointLoadObject", JointLoadObject.prototype);
|
|
209
|
+
this.typeList.add("WaveLoadObject", WaveLoadObject.prototype);
|
|
210
|
+
this.typeList.add("WindLoadObject", WindLoadObject.prototype);
|
|
211
|
+
this.typeList.add("CurrLoadObject", CurrLoadObject.prototype);
|
|
204
212
|
this.typeList.add("MemberLoadBaseObject", MemberLoadBaseObject.prototype);
|
|
205
213
|
this.typeList.add(
|
|
206
214
|
"MemberLoadConcentratedObject",
|
|
@@ -210,7 +218,7 @@ export class PersistenceManager extends Longan.PersistenceManager {
|
|
|
210
218
|
"MemberLoadDistributedObject",
|
|
211
219
|
MemberLoadDistributedObject.prototype
|
|
212
220
|
);
|
|
213
|
-
|
|
221
|
+
this.typeList.add('DeadLoadObject',DeadLoadObject.prototype)
|
|
214
222
|
// 项目配置数据.
|
|
215
223
|
this.typeList.add("ModelTitle", ModelTitle.prototype);
|
|
216
224
|
this.typeList.add("ModelOptions", ModelOptions.prototype);
|
|
@@ -222,9 +230,6 @@ export class PersistenceManager extends Longan.PersistenceManager {
|
|
|
222
230
|
this.typeList.add("SeastateUcpart", SeastateUcpart.prototype);
|
|
223
231
|
this.typeList.add("SeastateFile", SeastateFile.prototype);
|
|
224
232
|
this.typeList.add("SeastateCdm", SeastateCdm.prototype);
|
|
225
|
-
this.typeList.add("SeastateWave", SeastateWave.prototype);
|
|
226
|
-
this.typeList.add("SeastateWind", SeastateWind.prototype);
|
|
227
|
-
this.typeList.add("SeastateCurr", SeastateCurr.prototype);
|
|
228
233
|
this.typeList.add("SeastateLcomb", SeastateLcomb.prototype);
|
|
229
234
|
}
|
|
230
235
|
}
|
|
@@ -0,0 +1,133 @@
|
|
|
1
|
+
import { PersistenceManager } from "../../../managers/persistenceManager";
|
|
2
|
+
import { InstanceRenderObject } from "../../instancesObjects/instanceRenderObject";
|
|
3
|
+
import { DesignBaseObject } from "gs-ceec-design";
|
|
4
|
+
import { Longan } from "gs-bim-air";
|
|
5
|
+
import { CardDEAD } from "../../../../caeCardEditor/caeCardObjects/seainp/cardDEAD";
|
|
6
|
+
import { CardLOADCN } from "../../../../caeCardEditor/caeCardObjects/seainp/cardLOADCN";
|
|
7
|
+
export class DeadLoadObject extends DesignBaseObject {
|
|
8
|
+
typeName = "DeadLoadObject";
|
|
9
|
+
cardData: string = null;
|
|
10
|
+
cardObject: CardDEAD = null;
|
|
11
|
+
loadConditionName: string = "";
|
|
12
|
+
buoyancyCalculationMethod: string = "";
|
|
13
|
+
gravityDirection: string = "";
|
|
14
|
+
floodedConditionOverride: string = "";
|
|
15
|
+
waterDepthOverride: string = "";
|
|
16
|
+
mudlineElevationOverride: string = "";
|
|
17
|
+
waterDensityOverride: string = "";
|
|
18
|
+
includeBuoyancyBelowMudline: string = "";
|
|
19
|
+
includeMarineGrowthOnly: string = "";
|
|
20
|
+
dlRationalOption: string = "";
|
|
21
|
+
|
|
22
|
+
constructor(loadConditionName) {
|
|
23
|
+
super();
|
|
24
|
+
this.name = loadConditionName;
|
|
25
|
+
this.instanceTypes.add("main", InstanceRenderObject.prototype);
|
|
26
|
+
}
|
|
27
|
+
serialize(): any {
|
|
28
|
+
let obj = super.serialize();
|
|
29
|
+
if (this.cardObject) {
|
|
30
|
+
obj.cardData = this.cardObject.getLine();
|
|
31
|
+
} else if (this.cardData) {
|
|
32
|
+
obj.cardData = this.cardData;
|
|
33
|
+
}
|
|
34
|
+
if (this.loadConditionName) {
|
|
35
|
+
obj.loadConditionName = this.loadConditionName;
|
|
36
|
+
}
|
|
37
|
+
if (this.buoyancyCalculationMethod) {
|
|
38
|
+
obj.buoyancyCalculationMethod = this.buoyancyCalculationMethod;
|
|
39
|
+
}
|
|
40
|
+
if (this.gravityDirection) {
|
|
41
|
+
obj.gravityDirection = this.gravityDirection;
|
|
42
|
+
}
|
|
43
|
+
if (this.floodedConditionOverride) {
|
|
44
|
+
obj.floodedConditionOverride = this.floodedConditionOverride;
|
|
45
|
+
}
|
|
46
|
+
if (this.waterDepthOverride) {
|
|
47
|
+
obj.waterDepthOverride = this.waterDepthOverride;
|
|
48
|
+
}
|
|
49
|
+
if (this.mudlineElevationOverride) {
|
|
50
|
+
obj.mudlineElevationOverride = this.mudlineElevationOverride;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
if (this.waterDensityOverride) {
|
|
54
|
+
obj.waterDensityOverride = this.waterDensityOverride;
|
|
55
|
+
}
|
|
56
|
+
if (this.includeBuoyancyBelowMudline) {
|
|
57
|
+
obj.includeBuoyancyBelowMudline = this.includeBuoyancyBelowMudline;
|
|
58
|
+
}
|
|
59
|
+
if (this.includeMarineGrowthOnly) {
|
|
60
|
+
obj.includeMarineGrowthOnly = this.includeMarineGrowthOnly;
|
|
61
|
+
}
|
|
62
|
+
if (this.dlRationalOption) {
|
|
63
|
+
obj.dlRationalOption = this.dlRationalOption;
|
|
64
|
+
}
|
|
65
|
+
return obj;
|
|
66
|
+
}
|
|
67
|
+
deserialize(obj: any, pm: PersistenceManager) {
|
|
68
|
+
super.deserialize(obj, pm);
|
|
69
|
+
if (obj.loadConditionName) {
|
|
70
|
+
this.loadConditionName = obj.loadConditionName;
|
|
71
|
+
}
|
|
72
|
+
if (obj.buoyancyCalculationMethod) {
|
|
73
|
+
this.buoyancyCalculationMethod = obj.buoyancyCalculationMethod;
|
|
74
|
+
}
|
|
75
|
+
if (obj.gravityDirection) {
|
|
76
|
+
this.gravityDirection = obj.gravityDirection;
|
|
77
|
+
}
|
|
78
|
+
if (obj.floodedConditionOverride) {
|
|
79
|
+
this.floodedConditionOverride = obj.floodedConditionOverride;
|
|
80
|
+
}
|
|
81
|
+
if (obj.waterDepthOverride) {
|
|
82
|
+
this.waterDepthOverride = obj.waterDepthOverride;
|
|
83
|
+
}
|
|
84
|
+
if (obj.mudlineElevationOverride) {
|
|
85
|
+
this.mudlineElevationOverride = obj.mudlineElevationOverride;
|
|
86
|
+
}
|
|
87
|
+
if (obj.waterDensityOverride) {
|
|
88
|
+
this.waterDensityOverride = obj.waterDensityOverride;
|
|
89
|
+
}
|
|
90
|
+
if (obj.includeBuoyancyBelowMudline) {
|
|
91
|
+
this.includeBuoyancyBelowMudline = obj.includeBuoyancyBelowMudline;
|
|
92
|
+
}
|
|
93
|
+
if (obj.includeMarineGrowthOnly) {
|
|
94
|
+
this.includeMarineGrowthOnly = obj.includeMarineGrowthOnly;
|
|
95
|
+
}
|
|
96
|
+
if (obj.dlRationalOption) {
|
|
97
|
+
this.dlRationalOption = obj.dlRationalOption;
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
protected clone(cloneObj: any, cloneManager?: Longan.CloneManager) {
|
|
101
|
+
cloneObj = super.clone(cloneObj);
|
|
102
|
+
cloneObj.cardData = this.cardData;
|
|
103
|
+
|
|
104
|
+
return cloneObj;
|
|
105
|
+
}
|
|
106
|
+
serializeToCard() {
|
|
107
|
+
// TODO 启用精确法压力计算选项 和 荷载工况还未处理
|
|
108
|
+
let cardDEAD = new CardDEAD();
|
|
109
|
+
cardDEAD.lineLabel.value = "DEAD";
|
|
110
|
+
cardDEAD.buoyancyCalculationMethod.value = this.buoyancyCalculationMethod;
|
|
111
|
+
// 需要将数字转为字符串,卡片编辑就是处理字符串
|
|
112
|
+
cardDEAD.gravityDirection.value = this.gravityDirection;
|
|
113
|
+
cardDEAD.floodedConditionOverride.value = this.floodedConditionOverride!=='none' ? this.floodedConditionOverride :'';
|
|
114
|
+
cardDEAD.waterDepthOverride.value = this.waterDepthOverride ? this.waterDepthOverride.toString():this.waterDepthOverride;
|
|
115
|
+
cardDEAD.mudlineElevationOverride.value =
|
|
116
|
+
this.mudlineElevationOverride ? this.mudlineElevationOverride.toString():this.mudlineElevationOverride;
|
|
117
|
+
cardDEAD.waterDensityOverride.value =this.waterDensityOverride? this.waterDensityOverride.toString():this.waterDensityOverride;
|
|
118
|
+
cardDEAD.includeBuoyancyBelowMudline.value =
|
|
119
|
+
this.includeBuoyancyBelowMudline? 'BML':'';
|
|
120
|
+
cardDEAD.includeMarineGrowthOnly.value = this.includeMarineGrowthOnly ? 'MG':'';
|
|
121
|
+
cardDEAD.dlRationalOption.value =
|
|
122
|
+
this.dlRationalOption? 'D':'';
|
|
123
|
+
return cardDEAD.getLine();
|
|
124
|
+
}
|
|
125
|
+
serializeLOADCNToCard() {
|
|
126
|
+
let cardLOADCN = new CardLOADCN();
|
|
127
|
+
cardLOADCN.lineLabel.value = "LOADCN";
|
|
128
|
+
cardLOADCN.loadConditionName.value = this.loadConditionName;
|
|
129
|
+
let text = cardLOADCN.getLine();
|
|
130
|
+
text += "\n";
|
|
131
|
+
return text
|
|
132
|
+
}
|
|
133
|
+
}
|
|
@@ -10,7 +10,6 @@ import { SectionObject } from "./sectionObject";
|
|
|
10
10
|
import { CaeNumber, CaeNumberToCard } from "../../../utility/utility";
|
|
11
11
|
import { Process } from "../../../gsDevFx/process";
|
|
12
12
|
|
|
13
|
-
|
|
14
13
|
//杆件截面组对象
|
|
15
14
|
export class GrupObject extends DesignBaseObject implements IReferenceObject {
|
|
16
15
|
typeName = "GrupObject";
|
|
@@ -27,10 +26,12 @@ export class GrupObject extends DesignBaseObject implements IReferenceObject {
|
|
|
27
26
|
}
|
|
28
27
|
|
|
29
28
|
override set name(value) {
|
|
30
|
-
(Process.activeProcess as Process).nameMapGrup.
|
|
29
|
+
if ((Process.activeProcess as Process).nameMapGrup.get(this.name)) {
|
|
30
|
+
(Process.activeProcess as Process).nameMapGrup.delete(this.name);
|
|
31
|
+
(Process.activeProcess as Process).nameMapGrup.set(value, this);
|
|
32
|
+
}
|
|
31
33
|
|
|
32
34
|
this._name = value;
|
|
33
|
-
(Process.activeProcess as Process).nameMapGrup.set(value, this);
|
|
34
35
|
}
|
|
35
36
|
|
|
36
37
|
public get viewer() {
|
|
@@ -156,22 +157,26 @@ export class GrupObject extends DesignBaseObject implements IReferenceObject {
|
|
|
156
157
|
cardGrup.grupLabel.value = this.name;
|
|
157
158
|
cardGrup.taperOption.value = grupSeg.taperOption;
|
|
158
159
|
cardGrup.sectionLabel.value = grupSeg.section ? grupSeg.section.name : "";
|
|
159
|
-
cardGrup.tubOuterDiameter.value = CaeNumberToCard(
|
|
160
|
-
|
|
160
|
+
cardGrup.tubOuterDiameter.value = CaeNumberToCard(
|
|
161
|
+
grupSeg.tubOuterDiameter
|
|
162
|
+
);
|
|
163
|
+
cardGrup.tubWallThickness.value = CaeNumberToCard(
|
|
164
|
+
grupSeg.tubWallThickness
|
|
165
|
+
);
|
|
161
166
|
if (grupSeg.section) {
|
|
162
167
|
cardGrup.tubOuterDiameter.value = "";
|
|
163
168
|
cardGrup.tubWallThickness.value = "";
|
|
164
169
|
}
|
|
165
|
-
cardGrup.elastic_E.value = grupSeg.elastic_E
|
|
166
|
-
cardGrup.elastic_G.value = grupSeg.elastic_G
|
|
167
|
-
cardGrup.elastic_SY.value = grupSeg.elastic_SY
|
|
170
|
+
cardGrup.elastic_E.value = grupSeg.elastic_E;
|
|
171
|
+
cardGrup.elastic_G.value = grupSeg.elastic_G;
|
|
172
|
+
cardGrup.elastic_SY.value = grupSeg.elastic_SY;
|
|
168
173
|
cardGrup.memberClass.value = grupSeg.memberClass;
|
|
169
174
|
cardGrup.kFactors_KY.value = grupSeg.kFactors_KY;
|
|
170
175
|
cardGrup.kFactors_KZ.value = grupSeg.kFactors_KZ;
|
|
171
|
-
cardGrup.tubShearAreaModifier.value = grupSeg.tubShearAreaModifier
|
|
176
|
+
cardGrup.tubShearAreaModifier.value = grupSeg.tubShearAreaModifier;
|
|
172
177
|
cardGrup.flooding.value = grupSeg.flooding;
|
|
173
|
-
cardGrup.weightDensity.value = grupSeg.weightDensity
|
|
174
|
-
cardGrup.segmentLength.value = CaeNumberToCard(grupSeg.segmentLength)
|
|
178
|
+
cardGrup.weightDensity.value = grupSeg.weightDensity;
|
|
179
|
+
cardGrup.segmentLength.value = CaeNumberToCard(grupSeg.segmentLength);
|
|
175
180
|
|
|
176
181
|
result += cardGrup.getLine();
|
|
177
182
|
if (i !== this.grupSegments.length - 1) {
|
|
@@ -196,12 +201,10 @@ export class GrupObject extends DesignBaseObject implements IReferenceObject {
|
|
|
196
201
|
// 更新全部用到该截面组的杆件.
|
|
197
202
|
render(viewer?: Longan.Viewer) {
|
|
198
203
|
// console.log("GrupObject render");
|
|
199
|
-
|
|
200
204
|
// if (!viewer) {
|
|
201
205
|
// viewer = Process.activeProcess.activeViewer as any;
|
|
202
206
|
// }
|
|
203
207
|
// let selectedMemberObjects = this.getReleatedMembers(viewer);
|
|
204
|
-
|
|
205
208
|
// for (let i = 0; i < selectedMemberObjects.length; i++) {
|
|
206
209
|
// selectedMemberObjects[i].render();
|
|
207
210
|
// }
|
|
@@ -213,29 +216,28 @@ export class GrupObject extends DesignBaseObject implements IReferenceObject {
|
|
|
213
216
|
|
|
214
217
|
drawSvg() {}
|
|
215
218
|
|
|
216
|
-
|
|
219
|
+
/**
|
|
217
220
|
* 获取引用了该截面组的杆件对象列表.
|
|
218
221
|
* @param viewer
|
|
219
222
|
* @returns
|
|
220
223
|
*/
|
|
221
|
-
|
|
224
|
+
getReleatedMembers(viewer: Longan.Viewer): MemberObject[] {
|
|
222
225
|
let result = new Array<MemberObject>();
|
|
223
226
|
|
|
224
227
|
let members = (viewer.process as Process).grupMapReleativeMembers.get(this);
|
|
225
|
-
if(members) {
|
|
226
|
-
for(let i = 0; i < members.count(); i++) {
|
|
228
|
+
if (members) {
|
|
229
|
+
for (let i = 0; i < members.count(); i++) {
|
|
227
230
|
result.push(members.items[i]);
|
|
228
231
|
}
|
|
229
232
|
}
|
|
230
|
-
|
|
233
|
+
|
|
231
234
|
return result;
|
|
232
235
|
}
|
|
233
236
|
|
|
234
237
|
tempDelete(viewer) {
|
|
235
|
-
|
|
236
238
|
let plates = this.getReleatedMembers(viewer);
|
|
237
239
|
plates.forEach((item) => {
|
|
238
|
-
if(item instanceof MemberObject) {
|
|
240
|
+
if (item instanceof MemberObject) {
|
|
239
241
|
item.grup = null;
|
|
240
242
|
item.setNeedUpdate();
|
|
241
243
|
}
|
|
@@ -4,10 +4,7 @@ import { PointObject } from "gs-ceec-design";
|
|
|
4
4
|
import { MemberObject } from "./memberObject";
|
|
5
5
|
import { PlateObject } from "./plateObject";
|
|
6
6
|
import { Longan } from "gs-bim-air";
|
|
7
|
-
import {
|
|
8
|
-
BusinessState,
|
|
9
|
-
DesignBaseObject,
|
|
10
|
-
} from "gs-ceec-design";
|
|
7
|
+
import { BusinessState, DesignBaseObject } from "gs-ceec-design";
|
|
11
8
|
import { SvgDraw } from "gs-ceec-design";
|
|
12
9
|
import { CardJoint } from "../../../caeCardEditor/caeCardObjects/cardJoint";
|
|
13
10
|
import { CardJointElastic } from "../../../caeCardEditor/caeCardObjects/cardJointElastic";
|
|
@@ -53,6 +50,11 @@ export class JointObject extends PointObject implements IReferenceObject {
|
|
|
53
50
|
labelRect;
|
|
54
51
|
labelText;
|
|
55
52
|
|
|
53
|
+
// 替代labelRect
|
|
54
|
+
testtLabelRect = null;
|
|
55
|
+
// 替代labelText
|
|
56
|
+
testtLabelText = null;
|
|
57
|
+
|
|
56
58
|
static jointColor = null;
|
|
57
59
|
|
|
58
60
|
public get name(): string {
|
|
@@ -72,9 +74,11 @@ export class JointObject extends PointObject implements IReferenceObject {
|
|
|
72
74
|
return;
|
|
73
75
|
}
|
|
74
76
|
|
|
75
|
-
(Process.activeProcess as Process).nameMapJoint.
|
|
77
|
+
if ((Process.activeProcess as Process).nameMapJoint.get(this.name)) {
|
|
78
|
+
(Process.activeProcess as Process).nameMapJoint.delete(this.name);
|
|
79
|
+
(Process.activeProcess as Process).nameMapJoint.set(na, this);
|
|
80
|
+
}
|
|
76
81
|
this._name = na;
|
|
77
|
-
(Process.activeProcess as Process).nameMapJoint.set(na, this);
|
|
78
82
|
}
|
|
79
83
|
|
|
80
84
|
public get fixity() {
|
|
@@ -127,13 +131,19 @@ export class JointObject extends PointObject implements IReferenceObject {
|
|
|
127
131
|
if (isDrawLabel) {
|
|
128
132
|
// this.drawLabel();
|
|
129
133
|
} else {
|
|
130
|
-
//
|
|
131
|
-
|
|
132
|
-
|
|
134
|
+
// if (this.labelRect) {
|
|
135
|
+
// this.labelRect.remove();
|
|
136
|
+
// }
|
|
137
|
+
// this.labelRect = null;
|
|
138
|
+
// this.labelText && this.labelText.clear();
|
|
139
|
+
// this.labelText = null;
|
|
140
|
+
|
|
141
|
+
if (this.testtLabelRect) {
|
|
142
|
+
this.testtLabelRect.remove();
|
|
133
143
|
}
|
|
134
|
-
this.
|
|
135
|
-
this.
|
|
136
|
-
this.
|
|
144
|
+
this.testtLabelRect = null;
|
|
145
|
+
this.testtLabelText && this.testtLabelText.clear();
|
|
146
|
+
this.testtLabelText = null;
|
|
137
147
|
}
|
|
138
148
|
}
|
|
139
149
|
|
|
@@ -388,8 +398,10 @@ export class JointObject extends PointObject implements IReferenceObject {
|
|
|
388
398
|
cardJointElastic.rx.value = this.elasticRestraint.rx;
|
|
389
399
|
cardJointElastic.ry.value = this.elasticRestraint.ry;
|
|
390
400
|
cardJointElastic.rz.value = this.elasticRestraint.rz;
|
|
391
|
-
cardJointElastic.secondJointName.value =
|
|
392
|
-
|
|
401
|
+
cardJointElastic.secondJointName.value =
|
|
402
|
+
this.elasticRestraint.secondJointName;
|
|
403
|
+
cardJointElastic.thirdJointName.value =
|
|
404
|
+
this.elasticRestraint.thirdJointName;
|
|
393
405
|
cardJointElastic.label.value = "ELASTI";
|
|
394
406
|
|
|
395
407
|
result += cardJointElastic.getLine();
|
|
@@ -666,7 +678,8 @@ export class JointObject extends PointObject implements IReferenceObject {
|
|
|
666
678
|
return;
|
|
667
679
|
}
|
|
668
680
|
|
|
669
|
-
let iro =
|
|
681
|
+
let iro =
|
|
682
|
+
Longan.Process.activeProcess.activeViewer.findInstanceObject(this);
|
|
670
683
|
if (iro && !iro.visible) {
|
|
671
684
|
this.clearSvg();
|
|
672
685
|
return;
|
|
@@ -692,11 +705,17 @@ export class JointObject extends PointObject implements IReferenceObject {
|
|
|
692
705
|
this.restraintText.clear();
|
|
693
706
|
this.restraintText = null;
|
|
694
707
|
}
|
|
695
|
-
if (this.labelText) {
|
|
696
|
-
|
|
697
|
-
|
|
698
|
-
|
|
699
|
-
|
|
708
|
+
// if (this.labelText) {
|
|
709
|
+
// this.labelText.clear();
|
|
710
|
+
// this.labelText = null;
|
|
711
|
+
// this.labelRect.remove();
|
|
712
|
+
// this.labelRect = null;
|
|
713
|
+
// }
|
|
714
|
+
if (this.testtLabelText) {
|
|
715
|
+
this.testtLabelText.clear();
|
|
716
|
+
this.testtLabelText = null;
|
|
717
|
+
this.testtLabelRect.remove();
|
|
718
|
+
this.testtLabelRect = null;
|
|
700
719
|
}
|
|
701
720
|
super.clearSvg();
|
|
702
721
|
}
|
|
@@ -780,9 +799,13 @@ export class JointObject extends PointObject implements IReferenceObject {
|
|
|
780
799
|
|
|
781
800
|
let x = position[0];
|
|
782
801
|
let y = position[1];
|
|
783
|
-
if (this.labelRect && this.labelText) {
|
|
784
|
-
|
|
785
|
-
|
|
802
|
+
// if (this.labelRect && this.labelText) {
|
|
803
|
+
// this.labelRect.move(x, y - 20);
|
|
804
|
+
// this.labelText.move(x + 5, y - 18);
|
|
805
|
+
// }
|
|
806
|
+
if (this.testtLabelRect && this.testtLabelText) {
|
|
807
|
+
this.testtLabelRect.move(x, y - 20);
|
|
808
|
+
this.testtLabelText.move(x + 5, y - 18);
|
|
786
809
|
} else {
|
|
787
810
|
let draw = SvgDraw.getInstance(viewer.container.id).draw;
|
|
788
811
|
|
|
@@ -817,8 +840,10 @@ export class JointObject extends PointObject implements IReferenceObject {
|
|
|
817
840
|
.attr("font-size", 12)
|
|
818
841
|
.move(x + 5, y - 18);
|
|
819
842
|
this._group.add(rect).add(text);
|
|
820
|
-
this.labelRect = rect;
|
|
821
|
-
this.labelText = text;
|
|
843
|
+
// this.labelRect = rect;
|
|
844
|
+
// this.labelText = text;
|
|
845
|
+
this.testtLabelRect = rect;
|
|
846
|
+
this.testtLabelText = text;
|
|
822
847
|
}
|
|
823
848
|
}
|
|
824
849
|
|
|
@@ -8,10 +8,7 @@ import { Viewer, Viewer as viewer } from "../../viewer";
|
|
|
8
8
|
import { SvgDraw } from "gs-ceec-design";
|
|
9
9
|
import { CardMember } from "../../../caeCardEditor/caeCardObjects/cardMember";
|
|
10
10
|
import { CardMemberOffsets } from "../../../caeCardEditor/caeCardObjects/cardMemberOffsets";
|
|
11
|
-
import {
|
|
12
|
-
BusinessState,
|
|
13
|
-
DesignBaseObject,
|
|
14
|
-
} from "gs-ceec-design";
|
|
11
|
+
import { BusinessState, DesignBaseObject } from "gs-ceec-design";
|
|
15
12
|
import { InstanceDesignBaseObject } from "gs-ceec-design";
|
|
16
13
|
import { WGTMEMObject } from "./pretreatment/wgtmemObject";
|
|
17
14
|
import { ObjectColor } from "./objectColors";
|
|
@@ -25,7 +22,6 @@ import {
|
|
|
25
22
|
import { Process } from "../../../gsDevFx/process";
|
|
26
23
|
import { ColorDivComponentGroupObject } from "../pretreatmentObjects/colorDivComponentGroupObject";
|
|
27
24
|
|
|
28
|
-
|
|
29
25
|
export enum BarType {
|
|
30
26
|
Default = 0, // 无类型
|
|
31
27
|
StayBar = 1, // 撑杆
|
|
@@ -183,10 +179,12 @@ export class MemberObject extends LineObject implements IReferencedObject {
|
|
|
183
179
|
}
|
|
184
180
|
|
|
185
181
|
override set name(value) {
|
|
186
|
-
(Process.activeProcess as Process).nameMapMember.
|
|
182
|
+
if ((Process.activeProcess as Process).nameMapMember.get(this.name)) {
|
|
183
|
+
(Process.activeProcess as Process).nameMapMember.delete(this.name);
|
|
184
|
+
(Process.activeProcess as Process).nameMapMember.set(value, this);
|
|
185
|
+
}
|
|
187
186
|
|
|
188
187
|
this._name = value;
|
|
189
|
-
(Process.activeProcess as Process).nameMapMember.set(value, this);
|
|
190
188
|
}
|
|
191
189
|
|
|
192
190
|
public get release_A() {
|
|
@@ -990,7 +988,11 @@ export class MemberObject extends LineObject implements IReferencedObject {
|
|
|
990
988
|
this.endPoint = resultEndPos;
|
|
991
989
|
super.render();
|
|
992
990
|
|
|
993
|
-
if(
|
|
991
|
+
if (
|
|
992
|
+
this.grup &&
|
|
993
|
+
this.grup.grupSegments &&
|
|
994
|
+
this.grup.grupSegments.length === 1
|
|
995
|
+
) {
|
|
994
996
|
this.grup.grupSegments[0].segmentLength = 0;
|
|
995
997
|
}
|
|
996
998
|
this.drawBody(resultStartPos, resultEndPos, viewer);
|
|
@@ -1100,6 +1102,7 @@ export class MemberObject extends LineObject implements IReferencedObject {
|
|
|
1100
1102
|
if (grup.grupSegments.length === 1) {
|
|
1101
1103
|
segmentLength = this.getMemberLength();
|
|
1102
1104
|
}
|
|
1105
|
+
segmentLength *= this.segmentLengthCoeff;
|
|
1103
1106
|
|
|
1104
1107
|
// 每段截面的shell
|
|
1105
1108
|
let shell_key = -1;
|
|
@@ -1122,8 +1125,13 @@ export class MemberObject extends LineObject implements IReferencedObject {
|
|
|
1122
1125
|
// 变截面终端起始点
|
|
1123
1126
|
if (!sl) {
|
|
1124
1127
|
sl = this.getUndefineSegmentLength();
|
|
1128
|
+
sl *= this.segmentLengthCoeff;
|
|
1125
1129
|
}
|
|
1126
|
-
|
|
1130
|
+
|
|
1131
|
+
let endOrigin = Longan.Point.add(
|
|
1132
|
+
origin,
|
|
1133
|
+
Longan.Vector.multiply(normal, sl)
|
|
1134
|
+
);
|
|
1127
1135
|
let polygon2 = tarperGS.getPolygon(endOrigin, yAxis, zAixs);
|
|
1128
1136
|
|
|
1129
1137
|
let shellData = this.getTarperBoxShellData(polygon1, polygon2);
|
|
@@ -1170,10 +1178,7 @@ export class MemberObject extends LineObject implements IReferencedObject {
|
|
|
1170
1178
|
);
|
|
1171
1179
|
}
|
|
1172
1180
|
|
|
1173
|
-
let offset = Longan.Vector.multiply(
|
|
1174
|
-
normal,
|
|
1175
|
-
segmentLength * this.segmentLengthCoeff
|
|
1176
|
-
);
|
|
1181
|
+
let offset = Longan.Vector.multiply(normal, segmentLength);
|
|
1177
1182
|
|
|
1178
1183
|
// 更新下一段杆件的底部截面起点
|
|
1179
1184
|
origin = Longan.Point.add(origin, offset);
|
|
@@ -1751,15 +1756,24 @@ export class MemberObject extends LineObject implements IReferencedObject {
|
|
|
1751
1756
|
let pos = new Float32Array(startPosition);
|
|
1752
1757
|
pos = Longan.Point.add(
|
|
1753
1758
|
pos,
|
|
1754
|
-
Longan.Vector.multiply(
|
|
1759
|
+
Longan.Vector.multiply(
|
|
1760
|
+
axisSystem.xAxis,
|
|
1761
|
+
this.startOffset[0] / 100
|
|
1762
|
+
)
|
|
1755
1763
|
);
|
|
1756
1764
|
pos = Longan.Point.add(
|
|
1757
1765
|
pos,
|
|
1758
|
-
Longan.Vector.multiply(
|
|
1766
|
+
Longan.Vector.multiply(
|
|
1767
|
+
axisSystem.yAxis,
|
|
1768
|
+
this.startOffset[1] / 100
|
|
1769
|
+
)
|
|
1759
1770
|
);
|
|
1760
1771
|
pos = Longan.Point.add(
|
|
1761
1772
|
pos,
|
|
1762
|
-
Longan.Vector.multiply(
|
|
1773
|
+
Longan.Vector.multiply(
|
|
1774
|
+
axisSystem.zAxis,
|
|
1775
|
+
this.startOffset[2] / 100
|
|
1776
|
+
)
|
|
1763
1777
|
);
|
|
1764
1778
|
|
|
1765
1779
|
startPosition[0] = pos[0];
|
|
@@ -1852,7 +1866,10 @@ export class MemberObject extends LineObject implements IReferencedObject {
|
|
|
1852
1866
|
let endPos = this.getEndPosition();
|
|
1853
1867
|
|
|
1854
1868
|
let length = Longan.Vector.module(
|
|
1855
|
-
Longan.Point.subtract(
|
|
1869
|
+
Longan.Point.subtract(
|
|
1870
|
+
new Float32Array(endPos),
|
|
1871
|
+
new Float32Array(startPos)
|
|
1872
|
+
)
|
|
1856
1873
|
);
|
|
1857
1874
|
|
|
1858
1875
|
return length;
|
|
@@ -1998,7 +2015,10 @@ export class MemberObject extends LineObject implements IReferencedObject {
|
|
|
1998
2015
|
return;
|
|
1999
2016
|
}
|
|
2000
2017
|
for (let i = 0; i < this.grup.grupSegments.length; i++) {
|
|
2001
|
-
let pos1 = Longan.Point.add(
|
|
2018
|
+
let pos1 = Longan.Point.add(
|
|
2019
|
+
startPos,
|
|
2020
|
+
Longan.Vector.multiply(vector, currentLen)
|
|
2021
|
+
);
|
|
2002
2022
|
let point0 = viewer.worldPointToPixelPoint([new Float64Array(pos1)])[0];
|
|
2003
2023
|
|
|
2004
2024
|
let curGrupSeg = this.grup.grupSegments[i];
|
|
@@ -2008,7 +2028,10 @@ export class MemberObject extends LineObject implements IReferencedObject {
|
|
|
2008
2028
|
currentLen += Number(curGrupSeg.segmentLength);
|
|
2009
2029
|
}
|
|
2010
2030
|
|
|
2011
|
-
let resPos = Longan.Point.add(
|
|
2031
|
+
let resPos = Longan.Point.add(
|
|
2032
|
+
startPos,
|
|
2033
|
+
Longan.Vector.multiply(vector, currentLen)
|
|
2034
|
+
);
|
|
2012
2035
|
let point1 = viewer.worldPointToPixelPoint([
|
|
2013
2036
|
new Float64Array(resPos),
|
|
2014
2037
|
])[0];
|
|
@@ -2119,7 +2142,11 @@ export class MemberObject extends LineObject implements IReferencedObject {
|
|
|
2119
2142
|
let zPoint = Longan.Point.add(origin, axis.zAxis);
|
|
2120
2143
|
|
|
2121
2144
|
let matrix = Longan.Matrix4.identity();
|
|
2122
|
-
if (
|
|
2145
|
+
if (
|
|
2146
|
+
this.segment.attributes.indexOf(
|
|
2147
|
+
Longan.LonganCore.ObjectType.TYPE_ModellingMatrix
|
|
2148
|
+
)
|
|
2149
|
+
) {
|
|
2123
2150
|
if (this.segment.modellingMatrix.matrix) {
|
|
2124
2151
|
matrix = new Float32Array(this.segment.modellingMatrix.matrix);
|
|
2125
2152
|
}
|
|
@@ -25,12 +25,14 @@ export class PGrupObject extends DesignBaseObject implements IReferenceObject {
|
|
|
25
25
|
override get name() {
|
|
26
26
|
return this._name;
|
|
27
27
|
}
|
|
28
|
-
|
|
28
|
+
|
|
29
29
|
override set name(value) {
|
|
30
|
-
(Process.activeProcess as Process).nameMapPGrup.
|
|
30
|
+
if ((Process.activeProcess as Process).nameMapPGrup.get(this.name)) {
|
|
31
|
+
(Process.activeProcess as Process).nameMapPGrup.delete(this.name);
|
|
32
|
+
(Process.activeProcess as Process).nameMapPGrup.set(value, this);
|
|
33
|
+
}
|
|
31
34
|
|
|
32
35
|
this._name = value;
|
|
33
|
-
(Process.activeProcess as Process).nameMapPGrup.set(value, this);
|
|
34
36
|
}
|
|
35
37
|
|
|
36
38
|
public get thickness() {
|
|
@@ -147,20 +149,19 @@ export class PGrupObject extends DesignBaseObject implements IReferenceObject {
|
|
|
147
149
|
let result = new Array<PlateObject>();
|
|
148
150
|
|
|
149
151
|
let plates = (viewer.process as Process).pgrupMapReleativePlates.get(this);
|
|
150
|
-
if(plates) {
|
|
151
|
-
for(let i = 0; i < plates.count(); i++) {
|
|
152
|
+
if (plates) {
|
|
153
|
+
for (let i = 0; i < plates.count(); i++) {
|
|
152
154
|
result.push(plates.items[i]);
|
|
153
155
|
}
|
|
154
156
|
}
|
|
155
|
-
|
|
157
|
+
|
|
156
158
|
return result;
|
|
157
159
|
}
|
|
158
160
|
|
|
159
161
|
tempDelete(viewer) {
|
|
160
|
-
|
|
161
162
|
let plates = this.getReleatedPlates(viewer);
|
|
162
163
|
plates.forEach((item) => {
|
|
163
|
-
if(item instanceof PlateObject) {
|
|
164
|
+
if (item instanceof PlateObject) {
|
|
164
165
|
item.pGrup = null;
|
|
165
166
|
item.setNeedUpdate();
|
|
166
167
|
}
|