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

Include mass object auto radius in OR save/import

Browse Source
This commit is contained in:
SiboVG 2022-04-27 21:42:56 +02:00
parent c6788c9594
commit 477096975d
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -369,7 +369,9 @@ class DocumentConfig {
setters.put("MassObject:packedlength", new DoubleSetter( setters.put("MassObject:packedlength", new DoubleSetter(
Reflection.findMethod(MassObject.class, "setLength", double.class))); Reflection.findMethod(MassObject.class, "setLength", double.class)));
setters.put("MassObject:packedradius", new DoubleSetter( setters.put("MassObject:packedradius", new DoubleSetter(
Reflection.findMethod(MassObject.class, "setRadius", double.class))); Reflection.findMethod(MassObject.class, "setRadius", double.class),
"auto", " ",
Reflection.findMethod(MassObject.class, "setRadiusAutomatic", boolean.class)));
setters.put("MassObject:radialposition", new DoubleSetter( setters.put("MassObject:radialposition", new DoubleSetter(
Reflection.findMethod(MassObject.class, "setRadialPosition", double.class))); Reflection.findMethod(MassObject.class, "setRadialPosition", double.class)));
setters.put("MassObject:radialdirection", new DoubleSetter( setters.put("MassObject:radialdirection", new DoubleSetter(

6
core/src/net/sf/openrocket/file/openrocket/savers/MassObjectSaver.java
View File

@ -14,7 +14,11 @@ public class MassObjectSaver extends InternalComponentSaver {
MassObject mass = (MassObject) c; MassObject mass = (MassObject) c;
elements.add("<packedlength>" + mass.getLength() + "</packedlength>"); elements.add("<packedlength>" + mass.getLength() + "</packedlength>");
elements.add("<packedradius>" + mass.getRadius() + "</packedradius>"); if (mass.isRadiusAutomatic()) {
elements.add("<packedradius>auto " + mass.getRadius() + "</packedradius>");
} else {
elements.add("<packedradius>" + mass.getRadius() + "</packedradius>");
}
elements.add("<radialposition>" + mass.getRadialPosition() + "</radialposition>"); elements.add("<radialposition>" + mass.getRadialPosition() + "</radialposition>");
elements.add("<radialdirection>" + (mass.getRadialDirection() * 180.0 / Math.PI) elements.add("<radialdirection>" + (mass.getRadialDirection() * 180.0 / Math.PI)
+ "</radialdirection>"); + "</radialdirection>");