gs-cae-design 1.1.57 → 1.1.59
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 +23 -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 +275 -88
- package/lib/CAEDesign.umd-report.html +2 -2
- package/lib/CAEDesign.umd.js +275 -88
- package/lib/CAEDesign.umd.min-report.html +2 -2
- package/lib/CAEDesign.umd.min.js +275 -88
- 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 +37 -60
- package/src/gsDevFx/managers/datWriterManager.ts +17 -1
- package/src/gsDevFx/managers/interfaceManagers/commandInterfaceManager.ts +113 -1
- package/src/gsDevFx/managers/interfaceManagers/commonInterfaceManager.ts +11 -1
- 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 +11 -0
- package/src/gsDevFx/objects/caeObjects/jointObject.ts +51 -24
- package/src/gsDevFx/objects/caeObjects/memberObject.ts +55 -16
- package/src/gsDevFx/objects/caeObjects/pGrupObject.ts +11 -0
- package/src/gsDevFx/objects/caeObjects/plateObject.ts +11 -0
- 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 +11 -0
- 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/propertyComponents/sections/teeSectionProperty.ts +43 -43
- package/src/gsDevFx/propertyComponents/sections/wfSectionProperty.ts +104 -104
- 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 +93 -15
- 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/commandSplitMemberBase.ts +6 -8
- package/src/viewerWrapper/commands/createPlate/plateConfig.ts +22 -0
- package/src/viewerWrapper/commands/createPlatesInRange/commandCreatePlatesInRange.ts +203 -73
- package/src/viewerWrapper/commands/createPlatesInRange/createPlatesInRangeConfig.ts +6 -0
- package/src/viewerWrapper/commands/editGrup/commandEditGrup.ts +36 -26
- 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/splitMemberByCoordinate/commandSplitMemberByCoordinate.ts +6 -2
- package/src/viewerWrapper/commands/splitMemberByEqualPatrs/commandSplitMemberByEqualPatrs.ts +6 -2
- package/src/viewerWrapper/commands/splitMemberByExistingJoint/commandSplitMemberByExistingJoint.ts +6 -2
- package/src/viewerWrapper/commands/splitMemberByIntersection/commandSplitMemberByIntersection.ts +6 -2
- package/src/viewerWrapper/commands/splitMemberByLength/commandSplitMemberByLength.ts +8 -4
- package/src/viewerWrapper/commands/splitMemberByPerpendicular/commandSplitMemberByPerpendicular.ts +51 -6
- package/types/caeDesign/src/caeCardEditor/caeCardObjects/sacinp/cardWGTMEMCONC.d.ts +1 -1
- 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/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 +18 -1
- package/types/caeDesign/src/gsDevFx/managers/interfaceManagers/commandInterfaceManager.d.ts.map +1 -1
- package/types/caeDesign/src/gsDevFx/managers/interfaceManagers/commonInterfaceManager.d.ts +2 -0
- 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 +2 -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 +2 -0
- package/types/caeDesign/src/gsDevFx/objects/caeObjects/memberObject.d.ts.map +1 -1
- package/types/caeDesign/src/gsDevFx/objects/caeObjects/pGrupObject.d.ts +2 -0
- package/types/caeDesign/src/gsDevFx/objects/caeObjects/pGrupObject.d.ts.map +1 -1
- package/types/caeDesign/src/gsDevFx/objects/caeObjects/plateObject.d.ts +2 -0
- 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 +2 -0
- 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/operators/cAEObjectPreSelector.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 +2 -1
- 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/commandSplitMemberBase.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/createPlatesInRange/commandCreatePlatesInRange.d.ts.map +1 -1
- package/types/caeDesign/src/viewerWrapper/commands/createPlatesInRange/createPlatesInRangeConfig.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/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/splitMemberByCoordinate/commandSplitMemberByCoordinate.d.ts.map +1 -1
- package/types/caeDesign/src/viewerWrapper/commands/splitMemberByEqualPatrs/commandSplitMemberByEqualPatrs.d.ts.map +1 -1
- package/types/caeDesign/src/viewerWrapper/commands/splitMemberByExistingJoint/commandSplitMemberByExistingJoint.d.ts.map +1 -1
- package/types/caeDesign/src/viewerWrapper/commands/splitMemberByIntersection/commandSplitMemberByIntersection.d.ts.map +1 -1
- package/types/caeDesign/src/viewerWrapper/commands/splitMemberByLength/commandSplitMemberByLength.d.ts.map +1 -1
- package/types/caeDesign/src/viewerWrapper/commands/splitMemberByPerpendicular/commandSplitMemberByPerpendicular.d.ts.map +1 -1
- package/types/caeDesign/src/viewerWrapper/module/createMenu.d.ts.map +0 -1
- package/types/caeDesign/src/viewerWrapper/panel/viewPoint/viewPointPanel.d.ts +0 -36
- 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.d.ts +53 -0
- package/types/ceecDesign/src/gsDevFx/objects/designBaseObject.d.ts.map +1 -0
- package/types/ceecDesign/src/gsDevFx/viewer.d.ts.map +1 -0
- package/types/ceecDesign/src/utils/cookie.d.ts +0 -38
- package/types/ceecDesign/src/utils/cookie.d.ts.map +0 -1
|
@@ -34,6 +34,7 @@ import { SectionViewer } from "../../../gsDevFx/sectionViewer";
|
|
|
34
34
|
import { LoadConditionObject } from "../../../gsDevFx/objects/loadObjects/loadConditionObject";
|
|
35
35
|
import { LoadGroupObject } from "../../../gsDevFx/objects/loadObjects/loadGroupObject";
|
|
36
36
|
import { JointLoadObject } from "../../../gsDevFx/objects/loadObjects/jointLoadObject";
|
|
37
|
+
import { CurrLoadObject } from "../../../gsDevFx/objects/loadObjects/currLoadObject";
|
|
37
38
|
import { Message } from "element-ui";
|
|
38
39
|
import { LegendManage } from "../../../viewerWrapper/module/legendManage";
|
|
39
40
|
|
|
@@ -1535,7 +1536,7 @@ export class CommonInterfaceManager extends Longan.ViewerManagerBase {
|
|
|
1535
1536
|
} else {
|
|
1536
1537
|
obj.inactive(viewer);
|
|
1537
1538
|
}
|
|
1538
|
-
obj.setChildVisible(viewer, on_off);
|
|
1539
|
+
// obj.setChildVisible(viewer, on_off);
|
|
1539
1540
|
}
|
|
1540
1541
|
|
|
1541
1542
|
break;
|
|
@@ -1886,6 +1887,15 @@ export class CommonInterfaceManager extends Longan.ViewerManagerBase {
|
|
|
1886
1887
|
this.viewer.process.clearRenderObjects(true);
|
|
1887
1888
|
}
|
|
1888
1889
|
|
|
1890
|
+
/**
|
|
1891
|
+
* 创建波流荷载对象
|
|
1892
|
+
* @returns
|
|
1893
|
+
*/
|
|
1894
|
+
createCurrLoadObject() {
|
|
1895
|
+
let currLoad = new CurrLoadObject();
|
|
1896
|
+
return currLoad;
|
|
1897
|
+
}
|
|
1898
|
+
|
|
1889
1899
|
/**
|
|
1890
1900
|
* 添加点荷载
|
|
1891
1901
|
* @param loadConditionRO 工况对象
|
|
@@ -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
|
+
}
|
|
@@ -22,6 +22,17 @@ export class GrupObject extends DesignBaseObject implements IReferenceObject {
|
|
|
22
22
|
|
|
23
23
|
text = null;
|
|
24
24
|
|
|
25
|
+
override get name() {
|
|
26
|
+
return this._name;
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
override set name(value) {
|
|
30
|
+
(Process.activeProcess as Process).nameMapGrup.delete(this.name);
|
|
31
|
+
|
|
32
|
+
this._name = value;
|
|
33
|
+
(Process.activeProcess as Process).nameMapGrup.set(value, this);
|
|
34
|
+
}
|
|
35
|
+
|
|
25
36
|
public get viewer() {
|
|
26
37
|
return this._viewer;
|
|
27
38
|
}
|
|
@@ -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";
|
|
@@ -18,6 +15,7 @@ import { DatObject } from "./datObject";
|
|
|
18
15
|
import { CaeNumber } from "../../../utility/utility";
|
|
19
16
|
import { ObjectColor } from "./objectColors";
|
|
20
17
|
import { ColorDivComponentGroupObject } from "../pretreatmentObjects/colorDivComponentGroupObject";
|
|
18
|
+
import { Process } from "../../../gsDevFx/process";
|
|
21
19
|
|
|
22
20
|
/**
|
|
23
21
|
* 空间点对象
|
|
@@ -52,13 +50,18 @@ export class JointObject extends PointObject implements IReferenceObject {
|
|
|
52
50
|
labelRect;
|
|
53
51
|
labelText;
|
|
54
52
|
|
|
53
|
+
// 替代labelRect
|
|
54
|
+
testtLabelRect = null;
|
|
55
|
+
// 替代labelText
|
|
56
|
+
testtLabelText = null;
|
|
57
|
+
|
|
55
58
|
static jointColor = null;
|
|
56
59
|
|
|
57
60
|
public get name(): string {
|
|
58
61
|
return this._name;
|
|
59
62
|
}
|
|
60
63
|
|
|
61
|
-
public set name(na: string) {
|
|
64
|
+
public override set name(na: string) {
|
|
62
65
|
na = na.trimEnd();
|
|
63
66
|
|
|
64
67
|
let reg = /^[A-Z0-9]+$/;
|
|
@@ -70,7 +73,10 @@ export class JointObject extends PointObject implements IReferenceObject {
|
|
|
70
73
|
}, 100);
|
|
71
74
|
return;
|
|
72
75
|
}
|
|
76
|
+
|
|
77
|
+
(Process.activeProcess as Process).nameMapJoint.delete(this.name);
|
|
73
78
|
this._name = na;
|
|
79
|
+
(Process.activeProcess as Process).nameMapJoint.set(na, this);
|
|
74
80
|
}
|
|
75
81
|
|
|
76
82
|
public get fixity() {
|
|
@@ -123,13 +129,19 @@ export class JointObject extends PointObject implements IReferenceObject {
|
|
|
123
129
|
if (isDrawLabel) {
|
|
124
130
|
// this.drawLabel();
|
|
125
131
|
} else {
|
|
126
|
-
//
|
|
127
|
-
|
|
128
|
-
|
|
132
|
+
// if (this.labelRect) {
|
|
133
|
+
// this.labelRect.remove();
|
|
134
|
+
// }
|
|
135
|
+
// this.labelRect = null;
|
|
136
|
+
// this.labelText && this.labelText.clear();
|
|
137
|
+
// this.labelText = null;
|
|
138
|
+
|
|
139
|
+
if (this.testtLabelRect) {
|
|
140
|
+
this.testtLabelRect.remove();
|
|
129
141
|
}
|
|
130
|
-
this.
|
|
131
|
-
this.
|
|
132
|
-
this.
|
|
142
|
+
this.testtLabelRect = null;
|
|
143
|
+
this.testtLabelText && this.testtLabelText.clear();
|
|
144
|
+
this.testtLabelText = null;
|
|
133
145
|
}
|
|
134
146
|
}
|
|
135
147
|
|
|
@@ -384,8 +396,10 @@ export class JointObject extends PointObject implements IReferenceObject {
|
|
|
384
396
|
cardJointElastic.rx.value = this.elasticRestraint.rx;
|
|
385
397
|
cardJointElastic.ry.value = this.elasticRestraint.ry;
|
|
386
398
|
cardJointElastic.rz.value = this.elasticRestraint.rz;
|
|
387
|
-
cardJointElastic.secondJointName.value =
|
|
388
|
-
|
|
399
|
+
cardJointElastic.secondJointName.value =
|
|
400
|
+
this.elasticRestraint.secondJointName;
|
|
401
|
+
cardJointElastic.thirdJointName.value =
|
|
402
|
+
this.elasticRestraint.thirdJointName;
|
|
389
403
|
cardJointElastic.label.value = "ELASTI";
|
|
390
404
|
|
|
391
405
|
result += cardJointElastic.getLine();
|
|
@@ -662,7 +676,8 @@ export class JointObject extends PointObject implements IReferenceObject {
|
|
|
662
676
|
return;
|
|
663
677
|
}
|
|
664
678
|
|
|
665
|
-
let iro =
|
|
679
|
+
let iro =
|
|
680
|
+
Longan.Process.activeProcess.activeViewer.findInstanceObject(this);
|
|
666
681
|
if (iro && !iro.visible) {
|
|
667
682
|
this.clearSvg();
|
|
668
683
|
return;
|
|
@@ -688,11 +703,17 @@ export class JointObject extends PointObject implements IReferenceObject {
|
|
|
688
703
|
this.restraintText.clear();
|
|
689
704
|
this.restraintText = null;
|
|
690
705
|
}
|
|
691
|
-
if (this.labelText) {
|
|
692
|
-
|
|
693
|
-
|
|
694
|
-
|
|
695
|
-
|
|
706
|
+
// if (this.labelText) {
|
|
707
|
+
// this.labelText.clear();
|
|
708
|
+
// this.labelText = null;
|
|
709
|
+
// this.labelRect.remove();
|
|
710
|
+
// this.labelRect = null;
|
|
711
|
+
// }
|
|
712
|
+
if (this.testtLabelText) {
|
|
713
|
+
this.testtLabelText.clear();
|
|
714
|
+
this.testtLabelText = null;
|
|
715
|
+
this.testtLabelRect.remove();
|
|
716
|
+
this.testtLabelRect = null;
|
|
696
717
|
}
|
|
697
718
|
super.clearSvg();
|
|
698
719
|
}
|
|
@@ -776,9 +797,13 @@ export class JointObject extends PointObject implements IReferenceObject {
|
|
|
776
797
|
|
|
777
798
|
let x = position[0];
|
|
778
799
|
let y = position[1];
|
|
779
|
-
if (this.labelRect && this.labelText) {
|
|
780
|
-
|
|
781
|
-
|
|
800
|
+
// if (this.labelRect && this.labelText) {
|
|
801
|
+
// this.labelRect.move(x, y - 20);
|
|
802
|
+
// this.labelText.move(x + 5, y - 18);
|
|
803
|
+
// }
|
|
804
|
+
if (this.testtLabelRect && this.testtLabelText) {
|
|
805
|
+
this.testtLabelRect.move(x, y - 20);
|
|
806
|
+
this.testtLabelText.move(x + 5, y - 18);
|
|
782
807
|
} else {
|
|
783
808
|
let draw = SvgDraw.getInstance(viewer.container.id).draw;
|
|
784
809
|
|
|
@@ -813,8 +838,10 @@ export class JointObject extends PointObject implements IReferenceObject {
|
|
|
813
838
|
.attr("font-size", 12)
|
|
814
839
|
.move(x + 5, y - 18);
|
|
815
840
|
this._group.add(rect).add(text);
|
|
816
|
-
this.labelRect = rect;
|
|
817
|
-
this.labelText = text;
|
|
841
|
+
// this.labelRect = rect;
|
|
842
|
+
// this.labelText = text;
|
|
843
|
+
this.testtLabelRect = rect;
|
|
844
|
+
this.testtLabelText = text;
|
|
818
845
|
}
|
|
819
846
|
}
|
|
820
847
|
|
|
@@ -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, // 撑杆
|
|
@@ -178,6 +174,17 @@ export class MemberObject extends LineObject implements IReferencedObject {
|
|
|
178
174
|
// this._layer = value;
|
|
179
175
|
// }
|
|
180
176
|
|
|
177
|
+
override get name() {
|
|
178
|
+
return this._name;
|
|
179
|
+
}
|
|
180
|
+
|
|
181
|
+
override set name(value) {
|
|
182
|
+
(Process.activeProcess as Process).nameMapMember.delete(this.name);
|
|
183
|
+
|
|
184
|
+
this._name = value;
|
|
185
|
+
(Process.activeProcess as Process).nameMapMember.set(value, this);
|
|
186
|
+
}
|
|
187
|
+
|
|
181
188
|
public get release_A() {
|
|
182
189
|
return this._release_A;
|
|
183
190
|
}
|
|
@@ -979,7 +986,11 @@ export class MemberObject extends LineObject implements IReferencedObject {
|
|
|
979
986
|
this.endPoint = resultEndPos;
|
|
980
987
|
super.render();
|
|
981
988
|
|
|
982
|
-
if(
|
|
989
|
+
if (
|
|
990
|
+
this.grup &&
|
|
991
|
+
this.grup.grupSegments &&
|
|
992
|
+
this.grup.grupSegments.length === 1
|
|
993
|
+
) {
|
|
983
994
|
this.grup.grupSegments[0].segmentLength = 0;
|
|
984
995
|
}
|
|
985
996
|
this.drawBody(resultStartPos, resultEndPos, viewer);
|
|
@@ -1089,7 +1100,8 @@ export class MemberObject extends LineObject implements IReferencedObject {
|
|
|
1089
1100
|
if (grup.grupSegments.length === 1) {
|
|
1090
1101
|
segmentLength = this.getMemberLength();
|
|
1091
1102
|
}
|
|
1092
|
-
|
|
1103
|
+
segmentLength *= this.segmentLengthCoeff;
|
|
1104
|
+
|
|
1093
1105
|
// 每段截面的shell
|
|
1094
1106
|
let shell_key = -1;
|
|
1095
1107
|
// 每段截面的顶点和索引.
|
|
@@ -1111,8 +1123,13 @@ export class MemberObject extends LineObject implements IReferencedObject {
|
|
|
1111
1123
|
// 变截面终端起始点
|
|
1112
1124
|
if (!sl) {
|
|
1113
1125
|
sl = this.getUndefineSegmentLength();
|
|
1126
|
+
sl *= this.segmentLengthCoeff;
|
|
1114
1127
|
}
|
|
1115
|
-
|
|
1128
|
+
|
|
1129
|
+
let endOrigin = Longan.Point.add(
|
|
1130
|
+
origin,
|
|
1131
|
+
Longan.Vector.multiply(normal, sl)
|
|
1132
|
+
);
|
|
1116
1133
|
let polygon2 = tarperGS.getPolygon(endOrigin, yAxis, zAixs);
|
|
1117
1134
|
|
|
1118
1135
|
let shellData = this.getTarperBoxShellData(polygon1, polygon2);
|
|
@@ -1161,7 +1178,7 @@ export class MemberObject extends LineObject implements IReferencedObject {
|
|
|
1161
1178
|
|
|
1162
1179
|
let offset = Longan.Vector.multiply(
|
|
1163
1180
|
normal,
|
|
1164
|
-
segmentLength
|
|
1181
|
+
segmentLength
|
|
1165
1182
|
);
|
|
1166
1183
|
|
|
1167
1184
|
// 更新下一段杆件的底部截面起点
|
|
@@ -1740,15 +1757,24 @@ export class MemberObject extends LineObject implements IReferencedObject {
|
|
|
1740
1757
|
let pos = new Float32Array(startPosition);
|
|
1741
1758
|
pos = Longan.Point.add(
|
|
1742
1759
|
pos,
|
|
1743
|
-
Longan.Vector.multiply(
|
|
1760
|
+
Longan.Vector.multiply(
|
|
1761
|
+
axisSystem.xAxis,
|
|
1762
|
+
this.startOffset[0] / 100
|
|
1763
|
+
)
|
|
1744
1764
|
);
|
|
1745
1765
|
pos = Longan.Point.add(
|
|
1746
1766
|
pos,
|
|
1747
|
-
Longan.Vector.multiply(
|
|
1767
|
+
Longan.Vector.multiply(
|
|
1768
|
+
axisSystem.yAxis,
|
|
1769
|
+
this.startOffset[1] / 100
|
|
1770
|
+
)
|
|
1748
1771
|
);
|
|
1749
1772
|
pos = Longan.Point.add(
|
|
1750
1773
|
pos,
|
|
1751
|
-
Longan.Vector.multiply(
|
|
1774
|
+
Longan.Vector.multiply(
|
|
1775
|
+
axisSystem.zAxis,
|
|
1776
|
+
this.startOffset[2] / 100
|
|
1777
|
+
)
|
|
1752
1778
|
);
|
|
1753
1779
|
|
|
1754
1780
|
startPosition[0] = pos[0];
|
|
@@ -1841,7 +1867,10 @@ export class MemberObject extends LineObject implements IReferencedObject {
|
|
|
1841
1867
|
let endPos = this.getEndPosition();
|
|
1842
1868
|
|
|
1843
1869
|
let length = Longan.Vector.module(
|
|
1844
|
-
Longan.Point.subtract(
|
|
1870
|
+
Longan.Point.subtract(
|
|
1871
|
+
new Float32Array(endPos),
|
|
1872
|
+
new Float32Array(startPos)
|
|
1873
|
+
)
|
|
1845
1874
|
);
|
|
1846
1875
|
|
|
1847
1876
|
return length;
|
|
@@ -1987,7 +2016,10 @@ export class MemberObject extends LineObject implements IReferencedObject {
|
|
|
1987
2016
|
return;
|
|
1988
2017
|
}
|
|
1989
2018
|
for (let i = 0; i < this.grup.grupSegments.length; i++) {
|
|
1990
|
-
let pos1 = Longan.Point.add(
|
|
2019
|
+
let pos1 = Longan.Point.add(
|
|
2020
|
+
startPos,
|
|
2021
|
+
Longan.Vector.multiply(vector, currentLen)
|
|
2022
|
+
);
|
|
1991
2023
|
let point0 = viewer.worldPointToPixelPoint([new Float64Array(pos1)])[0];
|
|
1992
2024
|
|
|
1993
2025
|
let curGrupSeg = this.grup.grupSegments[i];
|
|
@@ -1997,7 +2029,10 @@ export class MemberObject extends LineObject implements IReferencedObject {
|
|
|
1997
2029
|
currentLen += Number(curGrupSeg.segmentLength);
|
|
1998
2030
|
}
|
|
1999
2031
|
|
|
2000
|
-
let resPos = Longan.Point.add(
|
|
2032
|
+
let resPos = Longan.Point.add(
|
|
2033
|
+
startPos,
|
|
2034
|
+
Longan.Vector.multiply(vector, currentLen)
|
|
2035
|
+
);
|
|
2001
2036
|
let point1 = viewer.worldPointToPixelPoint([
|
|
2002
2037
|
new Float64Array(resPos),
|
|
2003
2038
|
])[0];
|
|
@@ -2108,7 +2143,11 @@ export class MemberObject extends LineObject implements IReferencedObject {
|
|
|
2108
2143
|
let zPoint = Longan.Point.add(origin, axis.zAxis);
|
|
2109
2144
|
|
|
2110
2145
|
let matrix = Longan.Matrix4.identity();
|
|
2111
|
-
if (
|
|
2146
|
+
if (
|
|
2147
|
+
this.segment.attributes.indexOf(
|
|
2148
|
+
Longan.LonganCore.ObjectType.TYPE_ModellingMatrix
|
|
2149
|
+
)
|
|
2150
|
+
) {
|
|
2112
2151
|
if (this.segment.modellingMatrix.matrix) {
|
|
2113
2152
|
matrix = new Float32Array(this.segment.modellingMatrix.matrix);
|
|
2114
2153
|
}
|
|
@@ -22,6 +22,17 @@ export class PGrupObject extends DesignBaseObject implements IReferenceObject {
|
|
|
22
22
|
yieldStress: number = null;
|
|
23
23
|
weightDensity: number = null;
|
|
24
24
|
|
|
25
|
+
override get name() {
|
|
26
|
+
return this._name;
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
override set name(value) {
|
|
30
|
+
(Process.activeProcess as Process).nameMapPGrup.delete(this.name);
|
|
31
|
+
|
|
32
|
+
this._name = value;
|
|
33
|
+
(Process.activeProcess as Process).nameMapPGrup.set(value, this);
|
|
34
|
+
}
|
|
35
|
+
|
|
25
36
|
public get thickness() {
|
|
26
37
|
return this._thickness;
|
|
27
38
|
}
|
|
@@ -94,6 +94,17 @@ export class PlateObject extends PolylineObject implements IReferencedObject {
|
|
|
94
94
|
// 有限元网格比例.
|
|
95
95
|
finiteElementCoeff = 1.0;
|
|
96
96
|
|
|
97
|
+
override get name() {
|
|
98
|
+
return this._name;
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
override set name(value) {
|
|
102
|
+
(Process.activeProcess as Process).nameMapPlate.delete(this.name);
|
|
103
|
+
|
|
104
|
+
this._name = value;
|
|
105
|
+
(Process.activeProcess as Process).nameMapPlate.set(value, this);
|
|
106
|
+
}
|
|
107
|
+
|
|
97
108
|
get additionalProperty() {
|
|
98
109
|
return this._additionalProperty;
|
|
99
110
|
}
|
|
@@ -119,7 +119,7 @@ export class SurfaceDefinitionObject extends DesignBaseObject {
|
|
|
119
119
|
}
|
|
120
120
|
static checkName(name: string): boolean {
|
|
121
121
|
let reg = /^[A-Z0-9]*$/;
|
|
122
|
-
if (!reg.test(name) || name.trimEnd().length >
|
|
122
|
+
if (!reg.test(name) || name.trimEnd().length > 8) {
|
|
123
123
|
console.log("表面id不符合规范");
|
|
124
124
|
return false;
|
|
125
125
|
}
|
|
@@ -56,7 +56,9 @@ export class SurfaceWeightObject extends DesignBaseObject {
|
|
|
56
56
|
if (this.zFactor) {
|
|
57
57
|
obj.zFactor = CaeNumber(this.zFactor);
|
|
58
58
|
}
|
|
59
|
-
|
|
59
|
+
if (this.surfaceIDfirst) {
|
|
60
|
+
obj.surfaceIDfirst = this.surfaceIDfirst;
|
|
61
|
+
}
|
|
60
62
|
if (this.surfaceIDSecond) {
|
|
61
63
|
obj.surfaceIDSecond = this.surfaceIDSecond;
|
|
62
64
|
}
|
|
@@ -93,6 +95,9 @@ export class SurfaceWeightObject extends DesignBaseObject {
|
|
|
93
95
|
}
|
|
94
96
|
if (obj.zFactor) {
|
|
95
97
|
this.zFactor = CaeNumber(obj.zFactor);
|
|
98
|
+
}
|
|
99
|
+
if (obj.surfaceIDfirst) {
|
|
100
|
+
this.surfaceIDfirst = obj.surfaceIDfirst;
|
|
96
101
|
}
|
|
97
102
|
if (obj.surfaceIDSecond) {
|
|
98
103
|
this.surfaceIDSecond = obj.surfaceIDSecond;
|
|
@@ -135,7 +140,7 @@ export class SurfaceWeightObject extends DesignBaseObject {
|
|
|
135
140
|
}
|
|
136
141
|
static checkName(name: string): boolean {
|
|
137
142
|
let reg = /^[A-Z0-9]*$/;
|
|
138
|
-
if (!reg.test(name) || name.trimEnd().length >
|
|
143
|
+
if (!reg.test(name) || name.trimEnd().length > 8) {
|
|
139
144
|
return false;
|
|
140
145
|
}
|
|
141
146
|
return true;
|
|
@@ -56,6 +56,17 @@ export class SectionObject
|
|
|
56
56
|
stiffnessPro_IZ: string = null;
|
|
57
57
|
|
|
58
58
|
standardSize: string = null;
|
|
59
|
+
|
|
60
|
+
override get name() {
|
|
61
|
+
return this._name;
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
override set name(value) {
|
|
65
|
+
(Process.activeProcess as Process).nameMapSection.delete(this.name);
|
|
66
|
+
|
|
67
|
+
this._name = value;
|
|
68
|
+
(Process.activeProcess as Process).nameMapSection.set(value, this);
|
|
69
|
+
}
|
|
59
70
|
|
|
60
71
|
get disable() {
|
|
61
72
|
return this._disable;
|