hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fix][ork][load] Bulkheads may now load instanced components

Browse Source 
- moved 'instancecount' and 'instanceseparation' loading from CenteringRing to RadiusRingComponent
  - enables both Bulkhead and CenteringRing to load those tags from .ork file
This commit is contained in:
Daniel_M_Williams 2017-10-20 14:26:06 -04:00
parent 015437d335
commit 0a85188c12
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/net/sf/openrocket/file/openrocket/importt/DocumentConfig.java
View File

@ -345,6 +345,10 @@ class DocumentConfig {
Math.PI / 180.0)); Math.PI / 180.0));
// RadiusRingComponent // RadiusRingComponent
setters.put("RadiusRingComponent:instancecount", new IntSetter(
Reflection.findMethod( RadiusRingComponent.class, "setInstanceCount",int.class)));
setters.put("RadiusRingComponent:instanceseparation", new DoubleSetter(
Reflection.findMethod( RadiusRingComponent.class, "setInstanceSeparation", double.class)));
// Bulkhead // Bulkhead
setters.put("RadiusRingComponent:innerradius", new DoubleSetter( setters.put("RadiusRingComponent:innerradius", new DoubleSetter(
@ -363,12 +367,6 @@ class DocumentConfig {
Reflection.findMethod(CenteringRing.class, "setOuterRadius", double.class), Reflection.findMethod(CenteringRing.class, "setOuterRadius", double.class),
"auto", "auto",
Reflection.findMethod(CenteringRing.class, "setOuterRadiusAutomatic", boolean.class))); Reflection.findMethod(CenteringRing.class, "setOuterRadiusAutomatic", boolean.class)));
setters.put("CenteringRing:instancecount", new IntSetter(
Reflection.findMethod(CenteringRing.class, "setInstanceCount",int.class)));
setters.put("CenteringRing:instanceseparation", new DoubleSetter(
Reflection.findMethod( CenteringRing.class, "setInstanceSeparation", double.class)));
// MassObject // MassObject
setters.put("MassObject:packedlength", new DoubleSetter( setters.put("MassObject:packedlength", new DoubleSetter(