From 647706ab0f8817071f9bb0cd379cae9b3204d4cc Mon Sep 17 00:00:00 2001 From: SiboVG Date: Thu, 28 Apr 2022 00:06:21 +0200 Subject: [PATCH] Implement mass object auto radius in OR save/import --- .../openrocket/file/openrocket/savers/MassObjectSaver.java | 4 ++-- core/src/net/sf/openrocket/rocketcomponent/MassObject.java | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/src/net/sf/openrocket/file/openrocket/savers/MassObjectSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/MassObjectSaver.java index 3cbf57605..cefbb9345 100644 --- a/core/src/net/sf/openrocket/file/openrocket/savers/MassObjectSaver.java +++ b/core/src/net/sf/openrocket/file/openrocket/savers/MassObjectSaver.java @@ -15,9 +15,9 @@ public class MassObjectSaver extends InternalComponentSaver { elements.add("" + mass.getLength() + ""); if (mass.isRadiusAutomatic()) { - elements.add("auto " + mass.getRadius() + ""); + elements.add("auto " + mass.getRadiusNoAuto() + ""); } else { - elements.add("" + mass.getRadius() + ""); + elements.add("" + mass.getRadiusNoAuto() + ""); } elements.add("" + mass.getRadialPosition() + ""); elements.add("" + (mass.getRadialDirection() * 180.0 / Math.PI) diff --git a/core/src/net/sf/openrocket/rocketcomponent/MassObject.java b/core/src/net/sf/openrocket/rocketcomponent/MassObject.java index 69ecdc658..4c2c30b0a 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/MassObject.java +++ b/core/src/net/sf/openrocket/rocketcomponent/MassObject.java @@ -86,7 +86,10 @@ public abstract class MassObject extends InternalComponent { } return radius; } - + + public double getRadiusNoAuto() { + return radius; + } public void setRadius(double radius) { radius = Math.max(radius, 0);