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

Implement mass object auto radius in OR save/import

Browse Source
This commit is contained in:
SiboVG 2022-04-28 00:06:21 +02:00
parent 15e169820d
commit 647706ab0f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,9 +15,9 @@ public class MassObjectSaver extends InternalComponentSaver {
elements.add("<packedlength>" + mass.getLength() + "</packedlength>"); elements.add("<packedlength>" + mass.getLength() + "</packedlength>");
if (mass.isRadiusAutomatic()) { if (mass.isRadiusAutomatic()) {
elements.add("<packedradius>auto " + mass.getRadius() + "</packedradius>"); elements.add("<packedradius>auto " + mass.getRadiusNoAuto() + "</packedradius>");
} else { } else {
elements.add("<packedradius>" + mass.getRadius() + "</packedradius>"); elements.add("<packedradius>" + mass.getRadiusNoAuto() + "</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)

3
core/src/net/sf/openrocket/rocketcomponent/MassObject.java
View File

@ -87,6 +87,9 @@ public abstract class MassObject extends InternalComponent {
return radius; return radius;
} }
public double getRadiusNoAuto() {
return radius;
}
public void setRadius(double radius) { public void setRadius(double radius) {
radius = Math.max(radius, 0); radius = Math.max(radius, 0);