elements) {
super.addParams(c, elements);
net.sf.openrocket.rocketcomponent.Transition trans = (net.sf.openrocket.rocketcomponent.Transition) c;
- boolean nosecone = (trans instanceof NoseCone);
-
Transition.Shape shape = trans.getType();
elements.add("" + shape.name().toLowerCase(Locale.ENGLISH) + "");
@@ -41,14 +39,16 @@ public class TransitionSaver extends SymmetricComponentSaver {
if (shape.usesParameter()) {
elements.add("" + trans.getShapeParameter() + "");
}
-
-
- if (!nosecone) {
- if (trans.isForeRadiusAutomatic())
- elements.add("auto " + trans.getForeRadiusNoAutomatic() + "");
- else
- elements.add("" + trans.getForeRadius() + "");
+
+ // Nose cones need other parameter saving, due to the isFlipped() parameter
+ if (trans instanceof NoseCone) {
+ return;
}
+
+ if (trans.isForeRadiusAutomatic())
+ elements.add("auto " + trans.getForeRadiusNoAutomatic() + "");
+ else
+ elements.add("" + trans.getForeRadius() + "");
if (trans.isAftRadiusAutomatic())
elements.add("auto " + trans.getAftRadiusNoAutomatic() + "");
@@ -56,16 +56,14 @@ public class TransitionSaver extends SymmetricComponentSaver {
elements.add("" + trans.getAftRadius() + "");
- if (!nosecone) {
- elements.add("" + trans.getForeShoulderRadius()
- + "");
- elements.add("" + trans.getForeShoulderLength()
- + "");
- elements.add("" + trans.getForeShoulderThickness()
- + "");
- elements.add("" + trans.isForeShoulderCapped()
- + "");
- }
+ elements.add("" + trans.getForeShoulderRadius()
+ + "");
+ elements.add("" + trans.getForeShoulderLength()
+ + "");
+ elements.add("" + trans.getForeShoulderThickness()
+ + "");
+ elements.add("" + trans.isForeShoulderCapped()
+ + "");
elements.add("" + trans.getAftShoulderRadius()
+ "");
diff --git a/core/src/net/sf/openrocket/file/rocksim/export/PodSetDTO.java b/core/src/net/sf/openrocket/file/rocksim/export/PodSetDTO.java
index 7baa9b56f..d2be13493 100644
--- a/core/src/net/sf/openrocket/file/rocksim/export/PodSetDTO.java
+++ b/core/src/net/sf/openrocket/file/rocksim/export/PodSetDTO.java
@@ -65,7 +65,11 @@ public class PodSetDTO extends BasePartDTO implements AttachableParts {
} else if (child instanceof BodyTube) {
addAttachedPart(new BodyTubeDTO((BodyTube) child));
} else if (child instanceof NoseCone) {
- addAttachedPart(new NoseConeDTO((NoseCone) child));
+ if (((NoseCone) child).isFlipped()) {
+ addAttachedPart(new TransitionDTO((NoseCone) child));
+ } else {
+ addAttachedPart(new NoseConeDTO((NoseCone) child));
+ }
} else if (child instanceof Transition) {
addAttachedPart(new TransitionDTO((Transition) child));
}
diff --git a/core/src/net/sf/openrocket/file/rocksim/export/StageDTO.java b/core/src/net/sf/openrocket/file/rocksim/export/StageDTO.java
index 7cbe4a7cf..f0c167966 100644
--- a/core/src/net/sf/openrocket/file/rocksim/export/StageDTO.java
+++ b/core/src/net/sf/openrocket/file/rocksim/export/StageDTO.java
@@ -93,8 +93,12 @@ public class StageDTO {
externalPart.add(theExternalPartDTO);
}
- private NoseConeDTO toNoseConeDTO(NoseCone nc) {
- return new NoseConeDTO(nc);
+ private AbstractTransitionDTO toNoseConeDTO(NoseCone nc) {
+ if (nc.isFlipped()) {
+ return new TransitionDTO(nc);
+ } else {
+ return new NoseConeDTO(nc);
+ }
}
private BodyTubeDTO toBodyTubeDTO(BodyTube bt) {
diff --git a/core/src/net/sf/openrocket/l10n/ClassBasedTranslator.java b/core/src/net/sf/openrocket/l10n/ClassBasedTranslator.java
index 65589df06..a62e00f65 100644
--- a/core/src/net/sf/openrocket/l10n/ClassBasedTranslator.java
+++ b/core/src/net/sf/openrocket/l10n/ClassBasedTranslator.java
@@ -78,8 +78,16 @@ public class ClassBasedTranslator implements Translator {
public String getBaseText(String base, String translation) {
return translator.getBaseText(base, translation);
}
-
-
+
+ @Override
+ public boolean checkIfKeyExists(String key) {
+ try {
+ get(key);
+ return true;
+ } catch (MissingResourceException e) {
+ return false;
+ }
+ }
private String findClassName() {
Throwable trace = new Throwable();
diff --git a/core/src/net/sf/openrocket/l10n/DebugTranslator.java b/core/src/net/sf/openrocket/l10n/DebugTranslator.java
index ccf72e58b..bbc9baea2 100644
--- a/core/src/net/sf/openrocket/l10n/DebugTranslator.java
+++ b/core/src/net/sf/openrocket/l10n/DebugTranslator.java
@@ -1,5 +1,7 @@
package net.sf.openrocket.l10n;
+import java.util.MissingResourceException;
+
/**
* A translator implementation that returns the logical key in brackets instead
* of an actual translation. The class optionally verifies that the translation
@@ -47,6 +49,15 @@ public class DebugTranslator implements Translator {
}
return translation;
}
-
+
+ @Override
+ public boolean checkIfKeyExists(String key) {
+ try {
+ translator.get(key);
+ return true;
+ } catch (MissingResourceException e) {
+ return false;
+ }
+ }
}
diff --git a/core/src/net/sf/openrocket/l10n/ExceptionSuppressingTranslator.java b/core/src/net/sf/openrocket/l10n/ExceptionSuppressingTranslator.java
index 1287822cc..0a80427a1 100644
--- a/core/src/net/sf/openrocket/l10n/ExceptionSuppressingTranslator.java
+++ b/core/src/net/sf/openrocket/l10n/ExceptionSuppressingTranslator.java
@@ -52,7 +52,16 @@ public class ExceptionSuppressingTranslator implements Translator {
public String getBaseText(String base, String translation) {
return translator.getBaseText(base, translation);
}
-
+
+ @Override
+ public boolean checkIfKeyExists(String key) {
+ try {
+ translator.get(key);
+ return true;
+ } catch (MissingResourceException e) {
+ return false;
+ }
+ }
private static synchronized void handleError(String key, MissingResourceException e) {
if (!errorReported) {
diff --git a/core/src/net/sf/openrocket/l10n/ResourceBundleTranslator.java b/core/src/net/sf/openrocket/l10n/ResourceBundleTranslator.java
index d210e01e9..1ce14ae1f 100644
--- a/core/src/net/sf/openrocket/l10n/ResourceBundleTranslator.java
+++ b/core/src/net/sf/openrocket/l10n/ResourceBundleTranslator.java
@@ -66,4 +66,14 @@ public class ResourceBundleTranslator implements Translator {
}
return translation;
}
+
+ @Override
+ public boolean checkIfKeyExists(String key) {
+ try {
+ get(key);
+ return true;
+ } catch (MissingResourceException e) {
+ return false;
+ }
+ }
}
diff --git a/core/src/net/sf/openrocket/l10n/Translator.java b/core/src/net/sf/openrocket/l10n/Translator.java
index 5211ed730..7fd2957c8 100644
--- a/core/src/net/sf/openrocket/l10n/Translator.java
+++ b/core/src/net/sf/openrocket/l10n/Translator.java
@@ -50,5 +50,12 @@ public interface Translator {
* @return the base text, or the translation if not found.
*/
public String getBaseText(String base, String translation);
+
+ /**
+ * Checks whether a certain translation key exists.
+ * @param key the key to check
+ * @return true if it exists, false otherwise
+ */
+ public boolean checkIfKeyExists(String key);
}
diff --git a/core/src/net/sf/openrocket/optimization/services/DefaultSimulationModifierService.java b/core/src/net/sf/openrocket/optimization/services/DefaultSimulationModifierService.java
index 47a122811..79f6e3ef8 100644
--- a/core/src/net/sf/openrocket/optimization/services/DefaultSimulationModifierService.java
+++ b/core/src/net/sf/openrocket/optimization/services/DefaultSimulationModifierService.java
@@ -56,7 +56,7 @@ public class DefaultSimulationModifierService implements SimulationModifierServi
*/
addModifier("optimization.modifier.nosecone.length", UnitGroup.UNITS_LENGTH, 1.0, NoseCone.class, "Length");
- addModifier("optimization.modifier.nosecone.diameter", UnitGroup.UNITS_LENGTH, 2.0, NoseCone.class, "AftRadius", "isAftRadiusAutomatic");
+ addModifier("optimization.modifier.nosecone.diameter", UnitGroup.UNITS_LENGTH, 2.0, NoseCone.class, "BaseRadius", "isBaseRadiusAutomatic");
addModifier("optimization.modifier.nosecone.thickness", UnitGroup.UNITS_LENGTH, 1.0, NoseCone.class, "Thickness", "isFilled");
addModifier("optimization.modifier.transition.length", UnitGroup.UNITS_LENGTH, 1.0, Transition.class, "Length");
diff --git a/core/src/net/sf/openrocket/rocketcomponent/AxialStage.java b/core/src/net/sf/openrocket/rocketcomponent/AxialStage.java
index df2285c37..504969e27 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/AxialStage.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/AxialStage.java
@@ -241,6 +241,7 @@ public class AxialStage extends ComponentAssembly implements FlightConfigurableC
@Override
public void clearConfigListeners() {
super.clearConfigListeners();
+ // StageSeparationConfiguration also has config listeners, so clear them as well
StageSeparationConfiguration thisConfig = getSeparationConfiguration();
thisConfig.clearConfigListeners();
}
diff --git a/core/src/net/sf/openrocket/rocketcomponent/BodyTube.java b/core/src/net/sf/openrocket/rocketcomponent/BodyTube.java
index 212aadd48..40b292044 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/BodyTube.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/BodyTube.java
@@ -549,6 +549,7 @@ public class BodyTube extends SymmetricComponent implements BoxBounded, MotorMou
@Override
public void clearConfigListeners() {
super.clearConfigListeners();
+ // The motor config also has listeners, so clear them as well
getDefaultMotorConfig().clearConfigListeners();
}
}
diff --git a/core/src/net/sf/openrocket/rocketcomponent/InnerTube.java b/core/src/net/sf/openrocket/rocketcomponent/InnerTube.java
index 272de11ac..581d8583c 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/InnerTube.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/InnerTube.java
@@ -482,6 +482,7 @@ public class InnerTube extends ThicknessRingComponent implements AxialPositionab
@Override
public void clearConfigListeners() {
super.clearConfigListeners();
+ // The motor config also has listeners, so clear them as well
getDefaultMotorConfig().clearConfigListeners();
}
diff --git a/core/src/net/sf/openrocket/rocketcomponent/NoseCone.java b/core/src/net/sf/openrocket/rocketcomponent/NoseCone.java
index ed436981d..d35f1928d 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/NoseCone.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/NoseCone.java
@@ -1,18 +1,16 @@
package net.sf.openrocket.rocketcomponent;
-import net.sf.openrocket.appearance.Appearance;
-import net.sf.openrocket.appearance.Decal;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.preset.ComponentPreset;
import net.sf.openrocket.preset.ComponentPreset.Type;
import net.sf.openrocket.startup.Application;
-import net.sf.openrocket.util.StateChangeListener;
-
-import java.util.EventObject;
/**
* Rocket nose cones of various types. Implemented as a transition with the
* fore radius == 0.
+ *
+ * The normal nose cone can be converted to a tail cone by setting the {@link #isFlipped} parameter.
+ * This will flip all the aft side dimensions with the fore side dimensions.
*
* @author Sampo Niskanen
*/
@@ -21,6 +19,7 @@ public class NoseCone extends Transition implements InsideColorComponent {
private static final Translator trans = Application.getTranslator();
private InsideColorComponentHandler insideColorComponentHandler = new InsideColorComponentHandler(this);
+ private boolean isFlipped; // If true, the nose cone is converted to a tail cone
/********* Constructors **********/
public NoseCone() {
@@ -29,16 +28,12 @@ public class NoseCone extends Transition implements InsideColorComponent {
public NoseCone(Transition.Shape type, double length, double radius) {
super();
+ this.isFlipped = false;
super.setType(type);
- super.setForeRadiusAutomatic(false);
- super.setForeRadius(0);
- super.setForeShoulderLength(0);
- super.setForeShoulderRadius(0.9 * radius);
- super.setForeShoulderThickness(0);
- super.setForeShoulderCapped(filled);
super.setThickness(0.002);
super.setLength(length);
super.setClipped(false);
+ resetForeRadius();
super.setAftRadiusAutomatic(false);
super.setAftRadius(radius);
@@ -46,86 +41,227 @@ public class NoseCone extends Transition implements InsideColorComponent {
super.displayOrder_side = 1; // Order for displaying the component in the 2D side view
super.displayOrder_back = 0; // Order for displaying the component in the 2D back view
}
-
-
- /********** Get/set methods for component parameters **********/
-
- @Override
- public double getForeRadius() {
- return 0;
- }
-
- @Override
- public void setForeRadius(double r) {
- // No-op
- }
-
- @Override
- public boolean isForeRadiusAutomatic() {
- return false;
- }
-
- @Override
- public void setForeRadiusAutomatic(boolean b) {
- // No-op
+
+ /********** Nose cone dimensions **********/
+
+ /**
+ * Returns the base radius of the nose cone (independent of whether the nose cone is flipped or not).
+ * This method should be used over {@link #getAftRadius()} because it works for both normal and flipped nose cones.
+ */
+ public double getBaseRadius() {
+ return isFlipped ? getForeRadius() : getAftRadius();
}
- @Override
- public boolean usesPreviousCompAutomatic() {
- return false;
+ /**
+ * Returns the raw base radius of the nose cone (independent of whether the nose cone is flipped or not).
+ * This method should be used over {@link #getAftRadiusNoAutomatic()} because it works for both normal and flipped nose cones.
+ */
+ public double getBaseRadiusNoAutomatic() {
+ return isFlipped ? getForeRadiusNoAutomatic() : getAftRadiusNoAutomatic();
}
- @Override
- public double getForeShoulderLength() {
- return 0;
+ /**
+ * Sets the base radius of the nose cone (independent of whether the nose cone is flipped or not).
+ * This method should be used over {@link #setAftRadius(double)} because it works for both normal and flipped nose cones.
+ */
+ public void setBaseRadius(double radius) {
+ if (isFlipped) {
+ setForeRadius(radius);
+ } else {
+ setAftRadius(radius);
+ }
}
-
- @Override
- public double getForeShoulderRadius() {
- return 0;
+
+ /**
+ * Returns whether the base radius of the nose cone takes it settings from the previous/next component
+ * (independent of whether the nose cone is flipped or not).
+ * This method should be used over {@link #isAftRadiusAutomatic()} because it works for both normal and flipped nose cones.
+ */
+ public boolean isBaseRadiusAutomatic() {
+ return isFlipped ? isForeRadiusAutomatic() : isAftRadiusAutomatic();
}
-
- @Override
- public double getForeShoulderThickness() {
- return 0;
+
+ /**
+ * Sets whether the base radius of the nose cone takes it settings from the previous/next component
+ * (independent of whether the nose cone is flipped or not).
+ * This method should be used over {@link #setAftRadiusAutomatic(boolean)} because it works for both normal and flipped nose cones.
+ */
+ public void setBaseRadiusAutomatic(boolean auto) {
+ if (isFlipped) {
+ setForeRadiusAutomatic(auto);
+ } else {
+ setAftRadiusAutomatic(auto);
+ }
+
}
-
- @Override
- public boolean isForeShoulderCapped() {
- return false;
+
+ /**
+ * Returns the shoulder length, regardless of how the nose cone is flipped (independent of whether the nose cone is flipped or not).
+ * This method should be used over {@link #getAftShoulderLength()} because it works for both normal and flipped nose cones.
+ */
+ public double getShoulderLength() {
+ return isFlipped ? getForeShoulderLength() : getAftShoulderLength();
}
-
- @Override
- public void setForeShoulderCapped(boolean capped) {
- // No-op
+
+ /**
+ * Sets the shoulder length (independent of whether the nose cone is flipped or not).
+ * This method should be used over {@link #setAftShoulderLength(double)} because it works for both normal and flipped nose cones.
+ */
+ public void setShoulderLength(double length) {
+ if (isFlipped) {
+ setForeShoulderLength(length);
+ } else {
+ setAftShoulderLength(length);
+ }
}
-
- @Override
- public void setForeShoulderLength(double foreShoulderLength) {
- // No-op
+
+ /**
+ * Returns the shoulder radius (independent of whether the nose cone is flipped or not).
+ * This method should be used over {@link #getAftShoulderRadius()} because it works for both normal and flipped nose cones.
+ */
+ public double getShoulderRadius() {
+ return isFlipped ? getForeShoulderRadius() : getAftShoulderRadius();
}
-
- @Override
- public void setForeShoulderRadius(double foreShoulderRadius) {
- // No-op
+
+ /**
+ * Sets the shoulder radius (independent of whether the nose cone is flipped or not).
+ * This method should be used over {@link #setAftShoulderRadius(double)} because it works for both normal and flipped nose cones.
+ */
+ public void setShoulderRadius(double radius) {
+ if (isFlipped) {
+ setForeShoulderRadius(radius);
+ } else {
+ setAftShoulderRadius(radius);
+ }
}
-
- @Override
- public void setForeShoulderThickness(double foreShoulderThickness) {
- // No-op
+
+ /**
+ * Returns the shoulder thickness (independent of whether the nose cone is flipped or not).
+ * This method should be used over {@link #getAftShoulderThickness()} because it works for both normal and flipped nose cones.
+ */
+ public double getShoulderThickness() {
+ return isFlipped ? getForeShoulderThickness() : getAftShoulderThickness();
}
-
+
+ /**
+ * Sets the shoulder thickness (independent of whether the nose cone is flipped or not).
+ * This method should be used over {@link #setAftShoulderRadius(double)} because it works for both normal and flipped nose cones.
+ */
+ public void setShoulderThickness(double thickness) {
+ if (isFlipped) {
+ setForeShoulderThickness(thickness);
+ } else {
+ setAftShoulderThickness(thickness);
+ }
+ }
+
+ /**
+ * Returns the shoulder cap (independent of whether the nose cone is flipped or not).
+ * This method should be used over {@link #isAftShoulderCapped()} because it works for both normal and flipped nose cones.
+ */
+ public boolean isShoulderCapped() {
+ return isFlipped ? isForeShoulderCapped() : isAftShoulderCapped();
+ }
+
+ /**
+ * Sets the shoulder cap (independent of whether the nose cone is flipped or not).
+ * This method should be used over {@link #setAftShoulderCapped(boolean)} because it works for both normal and flipped nose cones.
+ */
+ public void setShoulderCapped(boolean capped) {
+ if (isFlipped) {
+ setForeShoulderCapped(capped);
+ } else {
+ setAftShoulderCapped(capped);
+ }
+ }
+
+ /********** Other **********/
+
+ /**
+ * Return true if the nose cone is flipped, i.e. converted to a tail cone, false if it is a regular nose cone.
+ */
+ public boolean isFlipped() {
+ return isFlipped;
+ }
+
+ /**
+ * Set the nose cone to be flipped, i.e. converted to a tail cone, or set it to be a regular nose cone.
+ * @param flipped if true, the nose cone is converted to a tail cone, if false it is a regular nose cone.
+ * @param sanityCheck whether to check if the auto radius parameter can be used for the new nose cone orientation
+ */
+ public void setFlipped(boolean flipped, boolean sanityCheck) {
+ for (RocketComponent listener : configListeners) {
+ if (listener instanceof NoseCone) {
+ ((NoseCone) listener).setFlipped(flipped, sanityCheck);
+ }
+ }
+
+ if (isFlipped == flipped) {
+ return;
+ }
+
+ boolean previousByPass = isBypassComponentChangeEvent();
+ setBypassChangeEvent(true);
+ if (flipped) {
+ setForeRadius(getAftRadiusNoAutomatic());
+ setForeRadiusAutomatic(isAftRadiusAutomatic(), sanityCheck);
+ setForeShoulderLength(getAftShoulderLength());
+ setForeShoulderRadius(getAftShoulderRadius());
+ setForeShoulderThickness(getAftShoulderThickness());
+ setForeShoulderCapped(isAftShoulderCapped());
+
+ resetAftRadius();
+ } else {
+ setAftRadius(getForeRadiusNoAutomatic());
+ setAftRadiusAutomatic(isForeRadiusAutomatic(), sanityCheck);
+ setAftShoulderLength(getForeShoulderLength());
+ setAftShoulderRadius(getForeShoulderRadius());
+ setAftShoulderThickness(getForeShoulderThickness());
+ setAftShoulderCapped(isForeShoulderCapped());
+
+ resetForeRadius();
+ }
+ setBypassChangeEvent(previousByPass);
+
+ isFlipped = flipped;
+ fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE);
+ }
+
+ /**
+ * Set the nose cone to be flipped, i.e. converted to a tail cone, or set it to be a regular nose cone.
+ * @param flipped if true, the nose cone is converted to a tail cone, if false it is a regular nose cone.
+ */
+ public void setFlipped(boolean flipped) {
+ setFlipped(flipped, true);
+ }
+
+ private void resetForeRadius() {
+ setForeRadius(0);
+ setForeRadiusAutomatic(false);
+ setForeShoulderLength(0);
+ setForeShoulderRadius(0);
+ setForeShoulderThickness(0);
+ setForeShoulderCapped(false);
+ }
+
+ private void resetAftRadius() {
+ setAftRadius(0);
+ setAftRadiusAutomatic(false);
+ setAftShoulderLength(0);
+ setAftShoulderRadius(0);
+ setAftShoulderThickness(0);
+ setAftShoulderCapped(false);
+ }
+
@Override
public boolean isClipped() {
return false;
}
-
+
@Override
public void setClipped(boolean b) {
// No-op
}
-
-
/********** RocketComponent methods **********/
@@ -136,9 +272,12 @@ public class NoseCone extends Transition implements InsideColorComponent {
@Override
protected void loadFromPreset(ComponentPreset preset) {
-
+ // We first need to unflip, because the preset loading always applies settings for a normal nose cone (e.g. aft diameter)
+ boolean flipped = isFlipped;
+ setFlipped(false);
//Many parameters are handled by the super class Transition.loadFromPreset
super.loadFromPreset(preset);
+ setFlipped(flipped);
}
/**
diff --git a/core/src/net/sf/openrocket/rocketcomponent/RailButton.java b/core/src/net/sf/openrocket/rocketcomponent/RailButton.java
index 504de01e3..a25e616a0 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/RailButton.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/RailButton.java
@@ -207,12 +207,6 @@ public class RailButton extends ExternalComponent implements AnglePositionable,
clearPreset();
fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE);
}
-
- @Override
- public boolean isAerodynamic(){
- // TODO: implement aerodynamics
- return false;
- }
@Override
public double getAngleOffset(){
diff --git a/core/src/net/sf/openrocket/rocketcomponent/RecoveryDevice.java b/core/src/net/sf/openrocket/rocketcomponent/RecoveryDevice.java
index 3b0c0bbde..9fc15a8e4 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/RecoveryDevice.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/RecoveryDevice.java
@@ -177,6 +177,7 @@ public abstract class RecoveryDevice extends MassObject implements FlightConfigu
@Override
public void clearConfigListeners() {
super.clearConfigListeners();
+ // The DeploymentConfiguration also has listeners, so clear them as well
DeploymentConfiguration thisConfig = getDeploymentConfigurations().getDefault();
thisConfig.clearConfigListeners();
}
diff --git a/core/src/net/sf/openrocket/rocketcomponent/Rocket.java b/core/src/net/sf/openrocket/rocketcomponent/Rocket.java
index ae6dfe554..f1363f25f 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/Rocket.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/Rocket.java
@@ -406,37 +406,37 @@ public class Rocket extends ComponentAssembly {
* and therefore fires an UNDO_EVENT, masked with all applicable mass/aerodynamic/tree
* changes.
*/
- public void loadFrom(Rocket r) {
+ public void loadFrom(Rocket source) {
// Store list of components to invalidate after event has been fired
- List toInvalidate = this.copyFrom(r);
+ List toInvalidate = this.copyFrom(source);
int type = ComponentChangeEvent.UNDO_CHANGE | ComponentChangeEvent.NONFUNCTIONAL_CHANGE;
- if (this.massModID != r.massModID)
+ if (this.massModID != source.massModID)
type |= ComponentChangeEvent.MASS_CHANGE;
- if (this.aeroModID != r.aeroModID)
+ if (this.aeroModID != source.aeroModID)
type |= ComponentChangeEvent.AERODYNAMIC_CHANGE;
// Loading a rocket is always a tree change since the component objects change
type |= ComponentChangeEvent.TREE_CHANGE;
- this.modID = r.modID;
- this.massModID = r.massModID;
- this.aeroModID = r.aeroModID;
- this.treeModID = r.treeModID;
- this.functionalModID = r.functionalModID;
- this.refType = r.refType;
- this.customReferenceLength = r.customReferenceLength;
- this.stageMap = r.stageMap;
+ this.modID = source.modID;
+ this.massModID = source.massModID;
+ this.aeroModID = source.aeroModID;
+ this.treeModID = source.treeModID;
+ this.functionalModID = source.functionalModID;
+ this.refType = source.refType;
+ this.customReferenceLength = source.customReferenceLength;
+ this.stageMap = source.stageMap;
// these flight configurations need to reference the _this_ Rocket:
this.configSet.reset();
this.configSet.setDefault(new FlightConfiguration(this));
- for (FlightConfigurationId key : r.configSet.map.keySet()) {
+ for (FlightConfigurationId key : source.configSet.map.keySet()) {
this.configSet.set(key, new FlightConfiguration(this, key));
}
- this.selectedConfiguration = this.configSet.get(r.getSelectedConfiguration().getId());
+ this.selectedConfiguration = this.configSet.get(source.getSelectedConfiguration().getId());
- this.perfectFinish = r.perfectFinish;
+ this.perfectFinish = source.perfectFinish;
this.checkComponentStructure();
@@ -453,25 +453,6 @@ public class Rocket extends ComponentAssembly {
/////// Implement the ComponentChangeListener lists
- /**
- * Creates a new EventListenerList for this component. This is necessary when cloning
- * the structure.
- */
- public void resetListeners() {
- // System.out.println("RESETTING LISTENER LIST of Rocket "+this);
- listenerList = new HashSet();
- }
-
-
- public void printListeners() {
- System.out.println("" + this + " has " + listenerList.size() + " listeners:");
- int i = 0;
- for (EventListener l : listenerList) {
- System.out.println(" " + (i) + ": " + l);
- i++;
- }
- }
-
@Override
public void addComponentChangeListener(ComponentChangeListener l) {
checkState();
@@ -497,10 +478,6 @@ public class Rocket extends ComponentAssembly {
try {
checkState();
- { // vvvv DEVEL vvvv
- //System.err.println("fireEvent@rocket.");
- } // ^^^^ DEVEL ^^^^
-
// Update modification ID's only for normal (not undo/redo) events
if (!cce.isUndoChange()) {
modID = UniqueID.next();
diff --git a/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java b/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
index df7e618c6..e3f1cdcd4 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
@@ -448,6 +448,7 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
}
// Make sure the config listeners aren't cloned
clone.configListeners = new LinkedList<>();
+ clone.bypassComponentChangeEvent = false;
return clone;
}
@@ -603,7 +604,7 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
for (RocketComponent listener : configListeners) {
listener.setBypassChangeEvent(false);
listener.setMassOverridden(o);
- listener.setBypassChangeEvent(false);
+ listener.setBypassChangeEvent(true);
}
if (massOverridden == o) {
@@ -2277,7 +2278,11 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
this.bypassComponentChangeEvent = newValue;
}
- public boolean getBypassComponentChangeEvent() {
+ /**
+ * Returns whether the current component if ignoring ComponentChangeEvents.
+ * @return true if the component is ignoring ComponentChangeEvents.
+ */
+ public boolean isBypassComponentChangeEvent() {
return this.bypassComponentChangeEvent;
}
@@ -2287,7 +2292,18 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
* @return true if listener was successfully added, false if not
*/
public boolean addConfigListener(RocketComponent listener) {
- if (listener == null || configListeners.contains(listener) || listener == this) {
+ if (isBypassComponentChangeEvent()) {
+ // This is a precaution. If you are multi-comp editing and the current component is bypassing events,
+ // the editing will be REALLY weird, see GitHub issue #1956.
+ throw new IllegalStateException("Cannot add config listener while bypassing events");
+ }
+ if (listener == null) {
+ return false;
+ }
+ if (listener.getConfigListeners().size() > 0) {
+ throw new IllegalArgumentException("Listener already has config listeners");
+ }
+ if (configListeners.contains(listener) || listener == this) {
return false;
}
configListeners.add(listener);
@@ -2555,6 +2571,7 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
this.displayOrder_side = src.displayOrder_side;
this.displayOrder_back = src.displayOrder_back;
this.configListeners = new LinkedList<>();
+ this.bypassComponentChangeEvent = false;
if (this instanceof InsideColorComponent && src instanceof InsideColorComponent) {
InsideColorComponentHandler icch = new InsideColorComponentHandler(this);
icch.copyFrom(((InsideColorComponent) src).getInsideColorComponentHandler());
diff --git a/core/src/net/sf/openrocket/rocketcomponent/SymmetricComponent.java b/core/src/net/sf/openrocket/rocketcomponent/SymmetricComponent.java
index bb76e77ce..f3152ef96 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/SymmetricComponent.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/SymmetricComponent.java
@@ -10,7 +10,7 @@ import net.sf.openrocket.preset.ComponentPreset;
import net.sf.openrocket.util.BoundingBox;
import net.sf.openrocket.util.Coordinate;
import net.sf.openrocket.util.MathUtil;
-
+import net.sf.openrocket.rocketcomponent.position.RadiusMethod;
/**
* Class for an axially symmetric rocket component generated by rotating
@@ -621,7 +621,11 @@ public abstract class SymmetricComponent extends BodyComponent implements BoxBou
while (0 <= searchSiblingIndex) {
final RocketComponent searchSibling = searchParent.getChild(searchSiblingIndex);
if (searchSibling instanceof SymmetricComponent) {
- return (SymmetricComponent) searchSibling;
+ SymmetricComponent candidate = (SymmetricComponent) searchSibling;
+ if (inline(candidate)) {
+ return candidate;
+ }
+ return null;
}
--searchSiblingIndex;
}
@@ -658,9 +662,12 @@ public abstract class SymmetricComponent extends BodyComponent implements BoxBou
if(searchParent instanceof ComponentAssembly){
while (searchSiblingIndex < searchParent.getChildCount()) {
final RocketComponent searchSibling = searchParent.getChild(searchSiblingIndex);
-
if (searchSibling instanceof SymmetricComponent) {
- return (SymmetricComponent) searchSibling;
+ SymmetricComponent candidate = (SymmetricComponent) searchSibling;
+ if (inline(candidate)) {
+ return candidate;
+ }
+ return null;
}
++searchSiblingIndex;
}
@@ -671,6 +678,29 @@ public abstract class SymmetricComponent extends BodyComponent implements BoxBou
return null;
}
+ /***
+ * Determine whether a candidate symmetric component is in line with us
+ *
+ */
+ private boolean inline(final SymmetricComponent candidate) {
+ // if we share a parent, we are in line
+ if (this.parent == candidate.parent)
+ return true;
+
+ // if both of our parents are either not ring instanceable, or
+ // have a radial offset of 0 from their centerline, we are in line.
+
+ if ((this.parent instanceof RingInstanceable) &&
+ (!MathUtil.equals(this.parent.getRadiusMethod().getRadius(this.parent.parent, this, this.parent.getRadiusOffset()), 0)))
+ return false;
+
+ if ((candidate.parent instanceof RingInstanceable) &&
+ (!MathUtil.equals(candidate.parent.getRadiusMethod().getRadius(candidate.parent.parent, candidate, candidate.parent.getRadiusOffset()), 0)))
+ return false;
+
+ return true;
+ }
+
/**
* Checks whether the component uses the previous symmetric component for its auto diameter.
*/
diff --git a/core/src/net/sf/openrocket/rocketcomponent/Transition.java b/core/src/net/sf/openrocket/rocketcomponent/Transition.java
index 9fd78a378..76c56b477 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/Transition.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/Transition.java
@@ -5,17 +5,13 @@ import static net.sf.openrocket.util.MathUtil.pow2;
import static net.sf.openrocket.util.MathUtil.pow3;
import java.util.Collection;
-import java.util.EventObject;
-import net.sf.openrocket.appearance.Appearance;
-import net.sf.openrocket.appearance.Decal;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.preset.ComponentPreset;
import net.sf.openrocket.preset.ComponentPreset.Type;
import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.Coordinate;
import net.sf.openrocket.util.MathUtil;
-import net.sf.openrocket.util.StateChangeListener;
public class Transition extends SymmetricComponent implements InsideColorComponent {
@@ -27,8 +23,8 @@ public class Transition extends SymmetricComponent implements InsideColorCompone
private double shapeParameter;
private boolean clipped; // Not to be read - use isClipped(), which may be overridden
- private double foreRadius, aftRadius;
- private boolean autoForeRadius, autoAftRadius2; // Whether the start radius is automatic
+ protected double foreRadius, aftRadius; // Warning: avoid using these directly, use getForeRadius() and getAftRadius() instead (because the definition of the two can change for flipped nose cones)
+ protected boolean autoForeRadius, autoAftRadius; // Whether the start radius is automatic
private double foreShoulderRadius;
@@ -53,7 +49,7 @@ public class Transition extends SymmetricComponent implements InsideColorCompone
this.aftRadius = DEFAULT_RADIUS;
this.length = DEFAULT_RADIUS * 3;
this.autoForeRadius = true;
- this.autoAftRadius2 = true;
+ this.autoAftRadius = true;
this.type = Shape.CONICAL;
this.shapeParameter = 0;
@@ -81,19 +77,24 @@ public class Transition extends SymmetricComponent implements InsideColorCompone
@Override
public double getForeRadius() {
if (isForeRadiusAutomatic()) {
- // Get the automatic radius from the front
- double r = -1;
- SymmetricComponent c = this.getPreviousSymmetricComponent();
- if (c != null) {
- r = c.getFrontAutoRadius();
- }
- if (r < 0)
- r = DEFAULT_RADIUS;
- return r;
+ return getAutoForeRadius();
}
return foreRadius;
}
+ /**
+ * Returns the automatic radius from the front, taken from the previous component. Returns the default radius if there
+ * is no previous component.
+ */
+ protected double getAutoForeRadius() {
+ SymmetricComponent c = this.getPreviousSymmetricComponent();
+ if (c != null) {
+ return c.getFrontAutoRadius();
+ } else {
+ return DEFAULT_RADIUS;
+ }
+ }
+
/**
* Return the fore radius that was manually entered, so not the value that the component received from automatic
* fore radius.
@@ -136,13 +137,24 @@ public class Transition extends SymmetricComponent implements InsideColorCompone
return autoForeRadius;
}
- public void setForeRadiusAutomatic(boolean auto) {
+ /**
+ * Set the fore radius to automatic mode (takes its value from the previous symmetric component's radius).
+ *
+ * @param auto whether to set the fore radius to automatic mode
+ * @param sanityCheck whether to sanity check auto mode for whether there is a previous component of which you can take the radius
+ */
+ public void setForeRadiusAutomatic(boolean auto, boolean sanityCheck) {
for (RocketComponent listener : configListeners) {
if (listener instanceof Transition) {
((Transition) listener).setForeRadiusAutomatic(auto);
}
}
+ // You can only set the auto fore radius if it is possible
+ if (sanityCheck) {
+ auto = auto && canUsePreviousCompAutomatic();
+ }
+
if (autoForeRadius == auto)
return;
@@ -152,25 +164,34 @@ public class Transition extends SymmetricComponent implements InsideColorCompone
fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE);
}
+ public void setForeRadiusAutomatic(boolean auto) {
+ setForeRadiusAutomatic(auto, false);
+ }
+
//////// Aft radius /////////
@Override
public double getAftRadius() {
if (isAftRadiusAutomatic()) {
- // Return the auto radius from the rear
- double r = -1;
- SymmetricComponent c = this.getNextSymmetricComponent();
- if (c != null) {
- r = c.getRearAutoRadius();
- }
- if (r < 0)
- r = DEFAULT_RADIUS;
- return r;
+ return getAutoAftRadius();
}
return aftRadius;
}
+ /**
+ * Returns the automatic radius from the rear, taken from the next component. Returns the default radius if there
+ * is no next component.
+ */
+ protected double getAutoAftRadius() {
+ SymmetricComponent c = this.getNextSymmetricComponent();
+ if (c != null) {
+ return c.getRearAutoRadius();
+ } else {
+ return DEFAULT_RADIUS;
+ }
+ }
+
/**
* Return the aft radius that was manually entered, so not the value that the component received from automatic
* zft radius.
@@ -191,10 +212,10 @@ public class Transition extends SymmetricComponent implements InsideColorCompone
}
}
- if ((this.aftRadius == radius) && (autoAftRadius2 == false))
+ if ((this.aftRadius == radius) && (autoAftRadius == false))
return;
- this.autoAftRadius2 = false;
+ this.autoAftRadius = false;
this.aftRadius = Math.max(radius, 0);
if (doClamping && this.thickness > this.foreRadius && this.thickness > this.aftRadius)
@@ -210,25 +231,40 @@ public class Transition extends SymmetricComponent implements InsideColorCompone
@Override
public boolean isAftRadiusAutomatic() {
- return autoAftRadius2;
+ return autoAftRadius;
}
- public void setAftRadiusAutomatic(boolean auto) {
+ /**
+ * Set the aft radius to automatic mode (takes its value from the next symmetric component's radius).
+ *
+ * @param auto whether to set the aft radius to automatic mode
+ * @param sanityCheck whether to sanity check auto mode for whether there is a next component of which you can take the radius
+ */
+ public void setAftRadiusAutomatic(boolean auto, boolean sanityCheck) {
for (RocketComponent listener : configListeners) {
if (listener instanceof Transition) {
((Transition) listener).setAftRadiusAutomatic(auto);
}
}
- if (autoAftRadius2 == auto)
+ // You can only set the auto aft radius if it is possible
+ if (sanityCheck) {
+ auto = auto && canUseNextCompAutomatic();
+ }
+
+ if (autoAftRadius == auto)
return;
- autoAftRadius2 = auto;
+ autoAftRadius = auto;
clearPreset();
fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE);
}
+ public void setAftRadiusAutomatic(boolean auto) {
+ setAftRadiusAutomatic(auto, false);
+ }
+
//// Radius automatics
@@ -257,6 +293,32 @@ public class Transition extends SymmetricComponent implements InsideColorCompone
return isAftRadiusAutomatic();
}
+ /**
+ * Checks whether this component can use the automatic radius of the previous symmetric component.
+ * @return false if there is no previous symmetric component, or if the previous component already has this component
+ * as its auto dimension reference
+ */
+ public boolean canUsePreviousCompAutomatic() {
+ SymmetricComponent referenceComp = getPreviousSymmetricComponent();
+ if (referenceComp == null) {
+ return false;
+ }
+ return !referenceComp.usesNextCompAutomatic();
+ }
+
+ /**
+ * Checks whether this component can use the automatic radius of the next symmetric component.
+ * @return false if there is no next symmetric component, or if the next component already has this component
+ * as its auto dimension reference
+ */
+ public boolean canUseNextCompAutomatic() {
+ SymmetricComponent referenceComp = getNextSymmetricComponent();
+ if (referenceComp == null) {
+ return false;
+ }
+ return !referenceComp.usesPreviousCompAutomatic();
+ }
+
//////// Type & shape /////////
diff --git a/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java b/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
index 682b21b94..33b39174a 100644
--- a/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
+++ b/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
@@ -7,7 +7,9 @@ import java.util.Deque;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import net.sf.openrocket.aerodynamics.FlightConditions;
import net.sf.openrocket.aerodynamics.Warning;
+import net.sf.openrocket.aerodynamics.WarningSet;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.motor.IgnitionEvent;
import net.sf.openrocket.motor.MotorConfiguration;
@@ -58,12 +60,14 @@ public class BasicEventSimulationEngine implements SimulationEngine {
// this is just a list of simulation branches to
Deque toSimulate = new ArrayDeque();
+
+ FlightData flightData;
@Override
public FlightData simulate(SimulationConditions simulationConditions) throws SimulationException {
// Set up flight data
- FlightData flightData = new FlightData();
+ flightData = new FlightData();
// Set up rocket configuration
this.fcid = simulationConditions.getFlightConfigurationID();
@@ -82,6 +86,13 @@ public class BasicEventSimulationEngine implements SimulationEngine {
throw new MotorIgnitionException(trans.get("BasicEventSimulationEngine.error.noMotorsDefined"));
}
+ // Can't calculate stability
+ if (currentStatus.getSimulationConditions().getAerodynamicCalculator()
+ .getCP(currentStatus.getConfiguration(),
+ new FlightConditions(currentStatus.getConfiguration()),
+ new WarningSet()).weight < MathUtil.EPSILON)
+ throw new SimulationException(trans.get("BasicEventSimulationEngine.error.cantCalculateStability"));
+
// Problems that let us simulate, but result is likely bad
// No recovery device
@@ -268,6 +279,11 @@ public class BasicEventSimulationEngine implements SimulationEngine {
// Add FlightEvent for Abort.
currentStatus.getFlightData().addEvent(new FlightEvent(FlightEvent.Type.EXCEPTION, currentStatus.getSimulationTime(), currentStatus.getConfiguration().getRocket(), e.getLocalizedMessage()));
+
+ flightData.addBranch(currentStatus.getFlightData());
+ flightData.getWarningSet().addAll(currentStatus.getWarnings());
+
+ e.setFlightData(flightData);
throw e;
}
@@ -380,7 +396,13 @@ public class BasicEventSimulationEngine implements SimulationEngine {
case IGNITION: {
MotorClusterState motorState = (MotorClusterState) event.getData();
-
+
+ // If there are multiple ignition events (as is the case if the preceding stage has several burnout events, for instance)
+ // We get multiple ignition events for the upper stage motor. Ignore are all after the first.
+ if (motorState.getIgnitionTime() < currentStatus.getSimulationTime()) {
+ log.info("Ignoring motor " +motorState.toDescription()+" ignition event @"+currentStatus.getSimulationTime());
+ continue;
+ }
log.info(" Igniting motor: "+motorState.toDescription()+" @"+currentStatus.getSimulationTime());
motorState.ignite( event.getTime());
diff --git a/core/src/net/sf/openrocket/simulation/BasicLandingStepper.java b/core/src/net/sf/openrocket/simulation/BasicLandingStepper.java
index 51fa56c4f..de7db0bab 100644
--- a/core/src/net/sf/openrocket/simulation/BasicLandingStepper.java
+++ b/core/src/net/sf/openrocket/simulation/BasicLandingStepper.java
@@ -1,6 +1,7 @@
package net.sf.openrocket.simulation;
import net.sf.openrocket.models.atmosphere.AtmosphericConditions;
+import net.sf.openrocket.rocketcomponent.InstanceMap;
import net.sf.openrocket.rocketcomponent.RecoveryDevice;
import net.sf.openrocket.simulation.exception.SimulationException;
import net.sf.openrocket.util.Coordinate;
@@ -35,8 +36,10 @@ public class BasicLandingStepper extends AbstractSimulationStepper {
// Get total CD
double mach = airSpeed.length() / atmosphere.getMachSpeed();
+
+ final InstanceMap imap = status.getConfiguration().getActiveInstances();
for (RecoveryDevice c : status.getDeployedRecoveryDevices()) {
- totalCD += c.getCD(mach) * c.getArea() / refArea;
+ totalCD += imap.count(c) * c.getCD(mach) * c.getArea() / refArea;
}
// Compute drag force
diff --git a/core/src/net/sf/openrocket/simulation/BasicTumbleStepper.java b/core/src/net/sf/openrocket/simulation/BasicTumbleStepper.java
index 65c37d4d7..cd8750e23 100644
--- a/core/src/net/sf/openrocket/simulation/BasicTumbleStepper.java
+++ b/core/src/net/sf/openrocket/simulation/BasicTumbleStepper.java
@@ -69,6 +69,27 @@ public class BasicTumbleStepper extends AbstractSimulationStepper {
double timeStep = MathUtil.min(0.5 / linearAcceleration.length(), RECOVERY_TIME_STEP);
// Perform Euler integration
+ Coordinate newPosition = status.getRocketPosition().add(status.getRocketVelocity().multiply(timeStep)).
+ add(linearAcceleration.multiply(MathUtil.pow2(timeStep) / 2));
+
+ // If I've hit the ground, recalculate time step and position
+ if (newPosition.z < 0) {
+
+ final double a = linearAcceleration.z;
+ final double v = status.getRocketVelocity().z;
+ final double z0 = status.getRocketPosition().z;
+
+ // The new timestep is the solution of
+ // 1/2 at^2 + vt + z0 = 0
+ timeStep = (-v - Math.sqrt(v*v - 2*a*z0))/a;
+
+ newPosition = status.getRocketPosition().add(status.getRocketVelocity().multiply(timeStep)).
+ add(linearAcceleration.multiply(MathUtil.pow2(timeStep) / 2));
+
+ // avoid rounding error in new altitude
+ newPosition = newPosition.setZ(0);
+ }
+
status.setRocketPosition(status.getRocketPosition().add(status.getRocketVelocity().multiply(timeStep)).
add(linearAcceleration.multiply(MathUtil.pow2(timeStep) / 2)));
status.setRocketVelocity(status.getRocketVelocity().add(linearAcceleration.multiply(timeStep)));
diff --git a/core/src/net/sf/openrocket/simulation/exception/SimulationException.java b/core/src/net/sf/openrocket/simulation/exception/SimulationException.java
index f180f892c..e0e8ee8ec 100644
--- a/core/src/net/sf/openrocket/simulation/exception/SimulationException.java
+++ b/core/src/net/sf/openrocket/simulation/exception/SimulationException.java
@@ -1,7 +1,11 @@
package net.sf.openrocket.simulation.exception;
+import net.sf.openrocket.simulation.FlightData;
+
public class SimulationException extends Exception {
+ private FlightData flightData = null;
+
public SimulationException() {
}
@@ -18,4 +22,11 @@ public class SimulationException extends Exception {
super(message, cause);
}
+ public void setFlightData(FlightData f) {
+ flightData = f;
+ }
+
+ public FlightData getFlightData() {
+ return flightData;
+ }
}
diff --git a/core/src/net/sf/openrocket/startup/Preferences.java b/core/src/net/sf/openrocket/startup/Preferences.java
index 26b9b1095..f9c31bd82 100644
--- a/core/src/net/sf/openrocket/startup/Preferences.java
+++ b/core/src/net/sf/openrocket/startup/Preferences.java
@@ -76,6 +76,7 @@ public abstract class Preferences implements ChangeSource {
public static final String PREFERRED_THRUST_CURVE_MOTOR_NODE = "preferredThrustCurveMotors";
private static final String AUTO_OPEN_LAST_DESIGN = "AUTO_OPEN_LAST_DESIGN";
private static final String OPEN_LEFTMOST_DESIGN_TAB = "OPEN_LEFTMOST_DESIGN_TAB";
+ public static final String MARKER_STYLE_ICON = "MARKER_STYLE_ICON";
private static final String SHOW_MARKERS = "SHOW_MARKERS";
private static final String SHOW_ROCKSIM_FORMAT_WARNING = "SHOW_ROCKSIM_FORMAT_WARNING";
diff --git a/core/src/net/sf/openrocket/thrustcurve/SerializeThrustcurveMotors.java b/core/src/net/sf/openrocket/thrustcurve/SerializeThrustcurveMotors.java
index e1154d4c2..79b71f65a 100644
--- a/core/src/net/sf/openrocket/thrustcurve/SerializeThrustcurveMotors.java
+++ b/core/src/net/sf/openrocket/thrustcurve/SerializeThrustcurveMotors.java
@@ -185,8 +185,8 @@ public class SerializeThrustcurveMotors {
System.exit(1);
} else {
while (iterator.hasNext()) {
- Pair f = iterator.next();
- String fileName = f.getU();
+ Pair f = iterator.next();
+ String fileName = f.getU().getName();
InputStream is = f.getV();
List motors = loader.load(is, fileName);
diff --git a/core/src/net/sf/openrocket/unit/Unit.java b/core/src/net/sf/openrocket/unit/Unit.java
index 4c4195b15..fd0f97ac6 100644
--- a/core/src/net/sf/openrocket/unit/Unit.java
+++ b/core/src/net/sf/openrocket/unit/Unit.java
@@ -90,8 +90,11 @@ public abstract class Unit {
* @return A string representation of the number in these units.
*/
public String toString(double value) {
- double val = toUnit(value);
+ if (Double.isNaN(value))
+ return "N/A";
+ double val = toUnit(value);
+
if (Math.abs(val) > 1E6) {
return expFormat.format(val);
}
diff --git a/core/src/net/sf/openrocket/util/LinearInterpolator.java b/core/src/net/sf/openrocket/util/LinearInterpolator.java
index e16726bb5..8a9e786ac 100644
--- a/core/src/net/sf/openrocket/util/LinearInterpolator.java
+++ b/core/src/net/sf/openrocket/util/LinearInterpolator.java
@@ -82,7 +82,7 @@ public class LinearInterpolator implements Cloneable {
if ( y1 != null ) {
// Wow, x was a key in the map. Such luck.
- return y1.doubleValue();
+ return y1;
}
// we now know that x is not in the map, so we need to find the lower and higher keys.
@@ -96,16 +96,16 @@ public class LinearInterpolator implements Cloneable {
Double firstKey = sortMap.firstKey();
// x is smaller than the first entry in the map.
- if ( x < firstKey.doubleValue() ) {
+ if ( x < firstKey) {
y1 = sortMap.get(firstKey);
- return y1.doubleValue();
+ return y1;
}
// floor key is the largest key smaller than x - since we have at least one key,
// and x>=firstKey, we know that floorKey != null.
Double floorKey = sortMap.subMap(firstKey, x).lastKey();
- x1 = floorKey.doubleValue();
+ x1 = floorKey;
y1 = sortMap.get(floorKey);
// Now we need to find the key that is greater or equal to x
@@ -113,16 +113,16 @@ public class LinearInterpolator implements Cloneable {
// Check if x is bigger than all the entries.
if ( tailMap.isEmpty() ) {
- return y1.doubleValue();
+ return y1;
}
Double ceilKey = tailMap.firstKey();
// Check if x is bigger than all the entries.
if ( ceilKey == null ) {
- return y1.doubleValue();
+ return y1;
}
- x2 = ceilKey.doubleValue();
+ x2 = ceilKey;
y2 = sortMap.get(ceilKey);
return (x - x1)/(x2-x1) * (y2-y1) + y1;
diff --git a/core/test/net/sf/openrocket/aerodynamics/BarrowmanCalculatorTest.java b/core/test/net/sf/openrocket/aerodynamics/BarrowmanCalculatorTest.java
index d113cf003..2acd0f49c 100644
--- a/core/test/net/sf/openrocket/aerodynamics/BarrowmanCalculatorTest.java
+++ b/core/test/net/sf/openrocket/aerodynamics/BarrowmanCalculatorTest.java
@@ -290,7 +290,7 @@ public class BarrowmanCalculatorTest {
FlightConfiguration configuration = rocket.getSelectedConfiguration();
WarningSet warnings = new WarningSet();
- calc.testIsContinuous(configuration, rocket, warnings);
+ calc.checkGeometry(configuration, rocket, warnings);
assertTrue("Estes Alpha III should be continuous: ", warnings.isEmpty());
}
@@ -301,7 +301,7 @@ public class BarrowmanCalculatorTest {
FlightConfiguration configuration = rocket.getSelectedConfiguration();
WarningSet warnings = new WarningSet();
- calc.testIsContinuous(configuration, rocket, warnings);
+ calc.checkGeometry(configuration, rocket, warnings);
assertTrue("F9H should be continuous: ", warnings.isEmpty());
}
@@ -319,7 +319,7 @@ public class BarrowmanCalculatorTest {
body.setOuterRadius( 0.012 );
body.setName( body.getName()+" << discontinuous");
- calc.testIsContinuous(configuration, rocket, warnings);
+ calc.checkGeometry(configuration, rocket, warnings);
assertFalse(" Estes Alpha III has an undetected discontinuity:", warnings.isEmpty());
}
@@ -340,7 +340,7 @@ public class BarrowmanCalculatorTest {
body.setOuterRadius( 0.012 );
body.setName( body.getName()+" << discontinuous");
- calc.testIsContinuous(configuration, rocket, warnings);
+ calc.checkGeometry(configuration, rocket, warnings);
assertFalse(" Missed discontinuity in Falcon 9 Heavy:" , warnings.isEmpty());
}
diff --git a/core/test/net/sf/openrocket/aerodynamics/RailButtonCalcTest.java b/core/test/net/sf/openrocket/aerodynamics/RailButtonCalcTest.java
new file mode 100644
index 000000000..513b0c922
--- /dev/null
+++ b/core/test/net/sf/openrocket/aerodynamics/RailButtonCalcTest.java
@@ -0,0 +1,101 @@
+package net.sf.openrocket.aerodynamics;
+
+import static org.junit.Assert.assertEquals;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.Module;
+
+import net.sf.openrocket.ServicesForTesting;
+import net.sf.openrocket.aerodynamics.BarrowmanCalculator;
+import net.sf.openrocket.aerodynamics.barrowman.RailButtonCalc;
+import net.sf.openrocket.plugin.PluginModule;
+import net.sf.openrocket.rocketcomponent.FlightConfiguration;
+import net.sf.openrocket.rocketcomponent.BodyTube;
+import net.sf.openrocket.rocketcomponent.RailButton;
+import net.sf.openrocket.rocketcomponent.LaunchLug;
+import net.sf.openrocket.rocketcomponent.Rocket;
+import net.sf.openrocket.rocketcomponent.position.AxialMethod;
+import net.sf.openrocket.startup.Application;
+import net.sf.openrocket.util.MathUtil;
+import net.sf.openrocket.util.TestRockets;
+import net.sf.openrocket.util.Transformation;
+
+public class RailButtonCalcTest {
+ protected final double EPSILON = 0.0001;
+
+ private static Injector injector;
+ @BeforeClass
+ public static void setup() {
+ Module applicationModule = new ServicesForTesting();
+ Module pluginModule = new PluginModule();
+
+ injector = Guice.createInjector( applicationModule, pluginModule);
+ Application.setInjector(injector);
+ }
+
+ @Test
+ public void testRailButtons() {
+
+ Rocket rocket = TestRockets.makeEstesAlphaIII();
+ FlightConfiguration config = rocket.getSelectedConfiguration();
+
+ // Get the body tube...
+ BodyTube tube = (BodyTube)rocket.getChild(0).getChild(1);
+
+ // Replace the launch lug with a (single) railbutton
+ LaunchLug lug = (LaunchLug)tube.getChild(1);
+ rocket.removeChild(lug);
+
+ RailButton button = new RailButton();
+ tube.addChild(button);
+
+ // Button parameters from Binder Design standard 1010
+ button.setOuterDiameter(0.011);
+ button.setInnerDiameter(0.006);
+
+ button.setBaseHeight(0.002);
+ button.setFlangeHeight(0.002);
+ button.setTotalHeight(0.008);
+
+ button.setAxialMethod(AxialMethod.ABSOLUTE);
+ button.setAxialOffset(1.0);
+
+ // Set up flight conditions
+ FlightConditions conditions = new FlightConditions(config);
+ conditions.setMach(1.0);
+
+ BarrowmanCalculator barrowmanObj = new BarrowmanCalculator();
+ RailButtonCalc calcObj = new RailButtonCalc(button);
+
+ // Calculate effective CD for rail button
+ // Boundary layer height
+ double rex = calcObj.calculateReynoldsNumber(1.0, conditions); // Reynolds number of button location
+ double del = 0.37 * 1.0 / Math.pow(rex, 0.2); // Boundary layer height
+
+ // Interpolate velocity at midpoint of railbutton
+ double mach = MathUtil.map(0.008/2.0, 0, del, 0, 1.0);
+
+ // Interpolate to get CD
+ double cd = MathUtil.map(mach, 0.2, 0.3, 1.22, 1.25);
+
+ // Reference area of rail button
+ final double outerArea = button.getTotalHeight() * button.getOuterDiameter();
+ final double notchArea = (button.getOuterDiameter() - button.getInnerDiameter()) * button.getInnerHeight();
+ final double refArea = outerArea - notchArea;
+
+ // Get "effective" CD
+ double calccd = cd * MathUtil.pow2(mach) * barrowmanObj.calculateStagnationCD(conditions.getMach()) * refArea / conditions.getRefArea() ;
+
+ // Now compare with value from RailButtonCalc
+ WarningSet warnings = new WarningSet();
+ AerodynamicForces assemblyForces = new AerodynamicForces().zero();
+ AerodynamicForces componentForces = new AerodynamicForces();
+
+ double testcd = calcObj.calculatePressureCD(conditions, barrowmanObj.calculateStagnationCD(conditions.getMach()), 0, warnings);
+
+ assertEquals("Calculated rail button CD incorrect", calccd, testcd, EPSILON);
+ }
+}
diff --git a/core/test/net/sf/openrocket/database/ThrustCurveMotorSetTest.java b/core/test/net/sf/openrocket/database/ThrustCurveMotorSetTest.java
index 572b9a823..1c2d3306c 100644
--- a/core/test/net/sf/openrocket/database/ThrustCurveMotorSetTest.java
+++ b/core/test/net/sf/openrocket/database/ThrustCurveMotorSetTest.java
@@ -23,7 +23,7 @@ public class ThrustCurveMotorSetTest {
private static final ThrustCurveMotor motor1 = new ThrustCurveMotor.Builder()
.setManufacturer(Manufacturer.getManufacturer("A"))
.setCommonName("F12")
- .setDesignation("F12X")
+ .setDesignation("F12")
.setDescription("Desc")
.setMotorType(Motor.Type.UNKNOWN)
.setStandardDelays(new double[] {})
@@ -38,7 +38,7 @@ public class ThrustCurveMotorSetTest {
private static final ThrustCurveMotor motor2 = new ThrustCurveMotor.Builder()
.setManufacturer(Manufacturer.getManufacturer("A"))
.setCommonName("F12")
- .setDesignation("F12H")
+ .setDesignation("F12")
.setDescription("Desc")
.setMotorType(Motor.Type.SINGLE)
.setStandardDelays(new double[] { 5 })
@@ -51,20 +51,6 @@ public class ThrustCurveMotorSetTest {
.build();
private static final ThrustCurveMotor motor3 = new ThrustCurveMotor.Builder()
- .setManufacturer(Manufacturer.getManufacturer("A"))
- .setCode("F12")
- .setDescription("Desc")
- .setMotorType(Motor.Type.UNKNOWN)
- .setStandardDelays(new double[] { 0, Motor.PLUGGED_DELAY })
- .setDiameter(0.024)
- .setLength(0.07)
- .setTimePoints(new double[] { 0, 1, 2 })
- .setThrustPoints(new double[] { 0, 2, 0 })
- .setCGPoints(new Coordinate[] { Coordinate.NUL, Coordinate.NUL, Coordinate.NUL })
- .setDigest("digestC")
- .build();
-
- private static final ThrustCurveMotor motor4 = new ThrustCurveMotor.Builder()
.setManufacturer(Manufacturer.getManufacturer("A"))
.setDesignation("F12")
.setDescription("Desc")
@@ -113,39 +99,20 @@ public class ThrustCurveMotorSetTest {
// Add motor2
assertTrue(set.matches(motor2));
set.addMotor(motor2);
- assertEquals(motor1.getManufacturer(), set.getManufacturer());
- assertEquals(motor3.getCommonName(), set.getCommonName());
+ assertEquals(motor2.getManufacturer(), set.getManufacturer());
+ assertEquals(motor2.getCommonName(), set.getCommonName());
assertEquals(Motor.Type.SINGLE, set.getType());
- assertEquals(motor1.getDiameter(), set.getDiameter(), 0.00001);
- assertEquals(motor1.getLength(), set.getLength(), 0.00001);
+ assertEquals(motor2.getDiameter(), set.getDiameter(), 0.00001);
+ assertEquals(motor2.getLength(), set.getLength(), 0.00001);
assertEquals(2, set.getMotors().size());
- assertEquals(motor2, set.getMotors().get(0));
- assertEquals(motor1, set.getMotors().get(1));
+ assertEquals(motor1, set.getMotors().get(0));
+ assertEquals(motor2, set.getMotors().get(1));
assertEquals(Arrays.asList(5.0), set.getDelays());
- // Add motor3
- assertTrue(set.matches(motor3));
- set.addMotor(motor3);
- assertEquals(motor1.getManufacturer(), set.getManufacturer());
- assertEquals(motor3.getCommonName(), set.getCommonName());
- assertEquals(Motor.Type.SINGLE, set.getType());
- assertEquals(motor1.getDiameter(), set.getDiameter(), 0.00001);
- assertEquals(motor1.getLength(), set.getLength(), 0.00001);
- assertEquals(3, set.getMotors().size());
- System.out.println("motor set");
- System.out.println(set.getMotors());
- System.out.println(motor3);
- System.out.println(motor2);
- System.out.println(motor1);
- assertEquals(motor3, set.getMotors().get(0));
- assertEquals(motor2, set.getMotors().get(1));
- assertEquals(motor1, set.getMotors().get(2));
- assertEquals(Arrays.asList(0.0, 5.0, Motor.PLUGGED_DELAY), set.getDelays());
-
- // Test that adding motor4 fails
- assertFalse(set.matches(motor4));
+ // Test that adding motor3 fails
+ assertFalse(set.matches(motor3));
try {
- set.addMotor(motor4);
+ set.addMotor(motor3);
fail("Did not throw exception");
} catch (IllegalArgumentException e) {
}
diff --git a/core/test/net/sf/openrocket/file/iterator/TestFileIterator.java b/core/test/net/sf/openrocket/file/iterator/TestFileIterator.java
index c3e424ee0..9c59585bd 100644
--- a/core/test/net/sf/openrocket/file/iterator/TestFileIterator.java
+++ b/core/test/net/sf/openrocket/file/iterator/TestFileIterator.java
@@ -3,6 +3,7 @@ package net.sf.openrocket.file.iterator;
import static org.junit.Assert.*;
import java.io.ByteArrayInputStream;
+import java.io.File;
import java.io.InputStream;
import net.sf.openrocket.util.Pair;
@@ -13,14 +14,14 @@ public class TestFileIterator {
@Test
public void testFileIterator() {
- final Pair one = new Pair("one", new ByteArrayInputStream(new byte[] { 1 }));
- final Pair two = new Pair("two", new ByteArrayInputStream(new byte[] { 2 }));
+ final Pair one = new Pair<>(new File("one"), new ByteArrayInputStream(new byte[] { 1 }));
+ final Pair two = new Pair<>(new File("two"), new ByteArrayInputStream(new byte[] { 2 }));
FileIterator iterator = new FileIterator() {
private int count = 0;
@Override
- protected Pair findNext() {
+ protected Pair findNext() {
count++;
switch (count) {
case 1:
diff --git a/core/test/net/sf/openrocket/rocketcomponent/NoseConeTest.java b/core/test/net/sf/openrocket/rocketcomponent/NoseConeTest.java
new file mode 100644
index 000000000..e02e8ce3a
--- /dev/null
+++ b/core/test/net/sf/openrocket/rocketcomponent/NoseConeTest.java
@@ -0,0 +1,398 @@
+package net.sf.openrocket.rocketcomponent;
+
+import net.sf.openrocket.document.OpenRocketDocumentFactory;
+import net.sf.openrocket.util.BaseTestCase.BaseTestCase;
+import net.sf.openrocket.util.MathUtil;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
+public class NoseConeTest extends BaseTestCase {
+ private final double EPSILON = MathUtil.EPSILON * 1000;
+
+ @Test
+ public void testNormalNoseCone() {
+ NoseCone noseCone = new NoseCone();
+
+ // First set the parameters using the normal transition setters (i.e. using AftRadius and AftShoulder instead of Base and Shoulder)
+ noseCone.setType(Transition.Shape.OGIVE);
+ noseCone.setLength(0.06);
+ noseCone.setAftRadius(0.1);
+ noseCone.setAftShoulderLength(0.01);
+ noseCone.setAftShoulderRadius(0.05);
+ noseCone.setAftShoulderCapped(false);
+ noseCone.setAftShoulderThickness(0.001);
+
+ assertEquals(Transition.Shape.OGIVE, noseCone.getType());
+ assertEquals(0.06, noseCone.getLength(), EPSILON);
+ assertEquals(0.1, noseCone.getAftRadius(), EPSILON);
+ assertEquals(0.1, noseCone.getBaseRadius(), EPSILON);
+ assertEquals(0.1, noseCone.getAftRadiusNoAutomatic(), EPSILON);
+ assertEquals(0.1, noseCone.getBaseRadiusNoAutomatic(), EPSILON);
+ assertEquals(0.01, noseCone.getAftShoulderLength(), EPSILON);
+ assertEquals(0.01, noseCone.getShoulderLength(), EPSILON);
+ assertEquals(0.05, noseCone.getAftShoulderRadius(), EPSILON);
+ assertEquals(0.05, noseCone.getShoulderRadius(), EPSILON);
+ assertFalse(noseCone.isAftShoulderCapped());
+ assertFalse(noseCone.isShoulderCapped());
+ assertEquals(0.001, noseCone.getAftShoulderThickness(), EPSILON);
+ assertEquals(0.001, noseCone.getShoulderThickness(), EPSILON);
+ assertFalse(noseCone.isAftRadiusAutomatic());
+
+ assertEquals(0, noseCone.getForeRadius(), EPSILON);
+ assertEquals(0, noseCone.getForeRadiusNoAutomatic(), EPSILON);
+ assertEquals(0, noseCone.getForeShoulderLength(), EPSILON);
+ assertEquals(0, noseCone.getForeShoulderRadius(), EPSILON);
+ assertEquals(0, noseCone.getForeShoulderThickness(), EPSILON);
+ assertFalse(noseCone.isForeShoulderCapped());
+ assertFalse(noseCone.isForeRadiusAutomatic());
+
+ // Test setting the specific nose cone setters
+ noseCone.setBaseRadius(0.2);
+ noseCone.setShoulderLength(0.03);
+ noseCone.setShoulderRadius(0.04);
+ noseCone.setShoulderCapped(true);
+ noseCone.setShoulderThickness(0.005);
+
+ assertEquals(0.2, noseCone.getAftRadius(), EPSILON);
+ assertEquals(0.2, noseCone.getBaseRadius(), EPSILON);
+ assertEquals(0.2, noseCone.getAftRadiusNoAutomatic(), EPSILON);
+ assertEquals(0.2, noseCone.getBaseRadiusNoAutomatic(), EPSILON);
+ assertEquals(0.03, noseCone.getAftShoulderLength(), EPSILON);
+ assertEquals(0.03, noseCone.getShoulderLength(), EPSILON);
+ assertEquals(0.04, noseCone.getAftShoulderRadius(), EPSILON);
+ assertEquals(0.04, noseCone.getShoulderRadius(), EPSILON);
+ assertTrue(noseCone.isAftShoulderCapped());
+ assertTrue(noseCone.isShoulderCapped());
+ assertEquals(0.005, noseCone.getAftShoulderThickness(), EPSILON);
+ assertEquals(0.005, noseCone.getShoulderThickness(), EPSILON);
+ assertFalse(noseCone.isAftRadiusAutomatic());
+
+ assertEquals(0, noseCone.getForeRadius(), EPSILON);
+ assertEquals(0, noseCone.getForeRadiusNoAutomatic(), EPSILON);
+ assertEquals(0, noseCone.getForeShoulderLength(), EPSILON);
+ assertEquals(0, noseCone.getForeShoulderRadius(), EPSILON);
+ assertEquals(0, noseCone.getForeShoulderThickness(), EPSILON);
+ assertFalse(noseCone.isForeShoulderCapped());
+ assertFalse(noseCone.isForeRadiusAutomatic());
+ }
+
+ @Test
+ public void testFlippedNoseCone() {
+ NoseCone noseCone = new NoseCone();
+
+ // First set the parameters using the normal transition setters (i.e. using AftRadius and AftShoulder instead of Base and Shoulder)
+ noseCone.setType(Transition.Shape.OGIVE);
+ noseCone.setLength(0.06);
+ noseCone.setAftRadius(0.1);
+ noseCone.setAftShoulderLength(0.01);
+ noseCone.setAftShoulderRadius(0.05);
+ noseCone.setAftShoulderCapped(false);
+ noseCone.setAftShoulderThickness(0.001);
+ noseCone.setFlipped(true);
+
+ assertEquals(Transition.Shape.OGIVE, noseCone.getType());
+ assertEquals(0.06, noseCone.getLength(), EPSILON);
+ assertEquals(0.1, noseCone.getForeRadius(), EPSILON);
+ assertEquals(0.1, noseCone.getBaseRadius(), EPSILON);
+ assertEquals(0.1, noseCone.getForeRadiusNoAutomatic(), EPSILON);
+ assertEquals(0.1, noseCone.getBaseRadiusNoAutomatic(), EPSILON);
+ assertEquals(0.01, noseCone.getForeShoulderLength(), EPSILON);
+ assertEquals(0.01, noseCone.getShoulderLength(), EPSILON);
+ assertEquals(0.05, noseCone.getForeShoulderRadius(), EPSILON);
+ assertEquals(0.05, noseCone.getShoulderRadius(), EPSILON);
+ assertFalse(noseCone.isForeShoulderCapped());
+ assertFalse(noseCone.isShoulderCapped());
+ assertEquals(0.001, noseCone.getForeShoulderThickness(), EPSILON);
+ assertEquals(0.001, noseCone.getShoulderThickness(), EPSILON);
+ assertFalse(noseCone.isForeRadiusAutomatic());
+
+ assertEquals(0, noseCone.getAftRadius(), EPSILON);
+ assertEquals(0, noseCone.getAftRadiusNoAutomatic(), EPSILON);
+ assertEquals(0, noseCone.getAftShoulderLength(), EPSILON);
+ assertEquals(0, noseCone.getAftShoulderRadius(), EPSILON);
+ assertEquals(0, noseCone.getAftShoulderThickness(), EPSILON);
+ assertFalse(noseCone.isAftShoulderCapped());
+ assertFalse(noseCone.isAftRadiusAutomatic());
+
+ // Test setting the specific nose cone setters
+ noseCone.setBaseRadius(0.2);
+ noseCone.setShoulderLength(0.03);
+ noseCone.setShoulderRadius(0.04);
+ noseCone.setShoulderCapped(true);
+ noseCone.setShoulderThickness(0.005);
+
+ assertEquals(0.2, noseCone.getForeRadius(), EPSILON);
+ assertEquals(0.2, noseCone.getBaseRadius(), EPSILON);
+ assertEquals(0.2, noseCone.getForeRadiusNoAutomatic(), EPSILON);
+ assertEquals(0.2, noseCone.getBaseRadiusNoAutomatic(), EPSILON);
+ assertEquals(0.03, noseCone.getForeShoulderLength(), EPSILON);
+ assertEquals(0.03, noseCone.getShoulderLength(), EPSILON);
+ assertEquals(0.04, noseCone.getForeShoulderRadius(), EPSILON);
+ assertEquals(0.04, noseCone.getShoulderRadius(), EPSILON);
+ assertTrue(noseCone.isForeShoulderCapped());
+ assertTrue(noseCone.isShoulderCapped());
+ assertEquals(0.005, noseCone.getForeShoulderThickness(), EPSILON);
+ assertEquals(0.005, noseCone.getShoulderThickness(), EPSILON);
+ assertFalse(noseCone.isForeRadiusAutomatic());
+
+ assertEquals(0, noseCone.getAftRadius(), EPSILON);
+ assertEquals(0, noseCone.getAftRadiusNoAutomatic(), EPSILON);
+ assertEquals(0, noseCone.getAftShoulderLength(), EPSILON);
+ assertEquals(0, noseCone.getAftShoulderRadius(), EPSILON);
+ assertEquals(0, noseCone.getAftShoulderThickness(), EPSILON);
+ assertFalse(noseCone.isAftShoulderCapped());
+ assertFalse(noseCone.isAftRadiusAutomatic());
+
+ // Flip back to normal
+ noseCone.setFlipped(false);
+
+ assertEquals(0.2, noseCone.getAftRadius(), EPSILON);
+ assertEquals(0.2, noseCone.getBaseRadius(), EPSILON);
+ assertEquals(0.2, noseCone.getAftRadiusNoAutomatic(), EPSILON);
+ assertEquals(0.2, noseCone.getBaseRadiusNoAutomatic(), EPSILON);
+ assertEquals(0.03, noseCone.getAftShoulderLength(), EPSILON);
+ assertEquals(0.03, noseCone.getShoulderLength(), EPSILON);
+ assertEquals(0.04, noseCone.getAftShoulderRadius(), EPSILON);
+ assertEquals(0.04, noseCone.getShoulderRadius(), EPSILON);
+ assertTrue(noseCone.isAftShoulderCapped());
+ assertTrue(noseCone.isShoulderCapped());
+ assertEquals(0.005, noseCone.getAftShoulderThickness(), EPSILON);
+ assertEquals(0.005, noseCone.getShoulderThickness(), EPSILON);
+ assertFalse(noseCone.isAftRadiusAutomatic());
+
+ assertEquals(0, noseCone.getForeRadius(), EPSILON);
+ assertEquals(0, noseCone.getForeRadiusNoAutomatic(), EPSILON);
+ assertEquals(0, noseCone.getForeShoulderLength(), EPSILON);
+ assertEquals(0, noseCone.getForeShoulderRadius(), EPSILON);
+ assertEquals(0, noseCone.getForeShoulderThickness(), EPSILON);
+ assertFalse(noseCone.isForeShoulderCapped());
+ assertFalse(noseCone.isForeRadiusAutomatic());
+ }
+
+ @Test
+ public void testNormalNoseConeRadiusAutomatic() {
+ Rocket rocket = OpenRocketDocumentFactory.createNewRocket().getRocket();
+ AxialStage stage = rocket.getStage(0);
+
+ NoseCone noseCone = new NoseCone(Transition.Shape.CONICAL, 0.06, 0.01);
+ BodyTube tube1 = new BodyTube(0.06, 0.02);
+ tube1.setOuterRadiusAutomatic(false);
+ BodyTube tube2 = new BodyTube(0.06, 0.03);
+ tube2.setOuterRadiusAutomatic(false);
+
+ // Test no previous or next component
+ stage.addChild(noseCone);
+
+ assertFalse(noseCone.usesPreviousCompAutomatic());
+ assertFalse(noseCone.usesNextCompAutomatic());
+ assertSame(stage, noseCone.getPreviousComponent());
+ assertNull(noseCone.getPreviousSymmetricComponent());
+ assertNull(noseCone.getNextComponent());
+ assertNull(noseCone.getNextSymmetricComponent());
+ assertFalse(noseCone.isAftRadiusAutomatic());
+ assertFalse(noseCone.isBaseRadiusAutomatic());
+ assertFalse(noseCone.isForeRadiusAutomatic());
+ assertEquals(noseCone.getAftRadius(), noseCone.getAftRadiusNoAutomatic(), EPSILON);
+ assertEquals(noseCone.getBaseRadius(), noseCone.getBaseRadiusNoAutomatic(), EPSILON);
+ assertEquals(noseCone.getForeRadius(), noseCone.getForeRadiusNoAutomatic(), EPSILON);
+ assertEquals(0.01, noseCone.getAftRadiusNoAutomatic(), EPSILON);
+ assertEquals(0, noseCone.getForeRadiusNoAutomatic(), EPSILON);
+
+ noseCone.setAftRadiusAutomatic(true, true);
+ assertFalse(noseCone.isAftRadiusAutomatic());
+ assertFalse(noseCone.isBaseRadiusAutomatic());
+ noseCone.setForeRadiusAutomatic(true, true);
+ assertFalse(noseCone.isForeRadiusAutomatic());
+ assertFalse(noseCone.isBaseRadiusAutomatic());
+
+ // Test with next component
+ stage.addChild(tube1);
+
+ assertFalse(noseCone.usesPreviousCompAutomatic());
+ assertFalse(noseCone.usesNextCompAutomatic());
+ assertSame(stage, noseCone.getPreviousComponent());
+ assertNull(noseCone.getPreviousSymmetricComponent());
+ assertSame(tube1, noseCone.getNextComponent());
+ assertSame(tube1, noseCone.getNextSymmetricComponent());
+ assertFalse(noseCone.isAftRadiusAutomatic());
+ assertFalse(noseCone.isBaseRadiusAutomatic());
+ assertFalse(noseCone.isForeRadiusAutomatic());
+ assertEquals(noseCone.getAftRadius(), noseCone.getAftRadiusNoAutomatic(), EPSILON);
+ assertEquals(noseCone.getBaseRadius(), noseCone.getBaseRadiusNoAutomatic(), EPSILON);
+ assertEquals(noseCone.getForeRadius(), noseCone.getForeRadiusNoAutomatic(), EPSILON);
+ assertEquals(0, noseCone.getForeRadiusNoAutomatic(), EPSILON);
+
+ noseCone.setAftRadiusAutomatic(true, true);
+ assertFalse(noseCone.usesPreviousCompAutomatic());
+ assertTrue(noseCone.usesNextCompAutomatic());
+ assertSame(stage, noseCone.getPreviousComponent());
+ assertNull(noseCone.getPreviousSymmetricComponent());
+ assertSame(tube1, noseCone.getNextComponent());
+ assertSame(tube1, noseCone.getNextSymmetricComponent());
+ assertTrue(noseCone.isAftRadiusAutomatic());
+ assertTrue(noseCone.isBaseRadiusAutomatic());
+ assertFalse(noseCone.isForeRadiusAutomatic());
+ assertEquals(tube1.getForeRadius(), noseCone.getAftRadius(), EPSILON);
+ assertEquals(0.01, noseCone.getAftRadiusNoAutomatic(), EPSILON);
+ assertEquals(tube1.getForeRadius(), noseCone.getBaseRadius(), EPSILON);
+ assertEquals(0.01, noseCone.getBaseRadiusNoAutomatic(), EPSILON);
+ assertEquals(noseCone.getForeRadius(), noseCone.getForeRadiusNoAutomatic(), EPSILON);
+ assertEquals(0, noseCone.getForeRadiusNoAutomatic(), EPSILON);
+
+ noseCone.setAftRadiusAutomatic(false, true);
+ assertEquals(noseCone.getAftRadius(), noseCone.getAftRadiusNoAutomatic(), EPSILON);
+ assertEquals(noseCone.getBaseRadius(), noseCone.getBaseRadiusNoAutomatic(), EPSILON);
+ assertEquals(noseCone.getForeRadius(), noseCone.getForeRadiusNoAutomatic(), EPSILON);
+ assertEquals(0, noseCone.getForeRadiusNoAutomatic(), EPSILON);
+
+ noseCone.setBaseRadiusAutomatic(true);
+ assertEquals(0.01, noseCone.getAftRadiusNoAutomatic(), EPSILON);
+ assertEquals(tube1.getForeRadius(), noseCone.getBaseRadius(), EPSILON);
+ assertEquals(0.01, noseCone.getBaseRadiusNoAutomatic(), EPSILON);
+ assertEquals(noseCone.getForeRadius(), noseCone.getForeRadiusNoAutomatic(), EPSILON);
+ assertEquals(0, noseCone.getForeRadiusNoAutomatic(), EPSILON);
+
+ noseCone.setForeRadiusAutomatic(true, true);
+ assertFalse(noseCone.isForeRadiusAutomatic());
+ assertTrue(noseCone.isBaseRadiusAutomatic());
+
+ // Test with previous component
+ stage.addChild(tube2, 0);
+
+ assertFalse(noseCone.usesPreviousCompAutomatic());
+ assertTrue(noseCone.usesNextCompAutomatic());
+ assertSame(tube2, noseCone.getPreviousComponent());
+ assertSame(tube2, noseCone.getPreviousSymmetricComponent());
+ assertSame(tube1, noseCone.getNextComponent());
+ assertSame(tube1, noseCone.getNextSymmetricComponent());
+ assertTrue(noseCone.isAftRadiusAutomatic());
+ assertTrue(noseCone.isBaseRadiusAutomatic());
+ assertFalse(noseCone.isForeRadiusAutomatic());
+ assertEquals(tube1.getForeRadius(), noseCone.getAftRadius(), EPSILON);
+ assertEquals(0.01, noseCone.getAftRadiusNoAutomatic(), EPSILON);
+ assertEquals(tube1.getForeRadius(), noseCone.getBaseRadius(), EPSILON);
+ assertEquals(0.01, noseCone.getBaseRadiusNoAutomatic(), EPSILON);
+ assertEquals(noseCone.getForeRadius(), noseCone.getForeRadiusNoAutomatic(), EPSILON);
+ assertEquals(0, noseCone.getForeRadiusNoAutomatic(), EPSILON);
+
+ // Do a flip
+ noseCone.setFlipped(true);
+ assertTrue(noseCone.isForeRadiusAutomatic());
+ assertTrue(noseCone.isBaseRadiusAutomatic());
+ assertFalse(noseCone.isAftRadiusAutomatic());
+ }
+
+ @Test
+ public void testFlippedNoseConeRadiusAutomatic() {
+ Rocket rocket = OpenRocketDocumentFactory.createNewRocket().getRocket();
+ AxialStage stage = rocket.getStage(0);
+
+ NoseCone noseCone = new NoseCone(Transition.Shape.CONICAL, 0.06, 0.01);
+ noseCone.setFlipped(true);
+ BodyTube tube1 = new BodyTube(0.06, 0.02);
+ tube1.setOuterRadiusAutomatic(false);
+ BodyTube tube2 = new BodyTube(0.06, 0.03);
+ tube2.setOuterRadiusAutomatic(false);
+
+ // Test no previous or next component
+ stage.addChild(noseCone);
+
+ assertFalse(noseCone.usesPreviousCompAutomatic());
+ assertFalse(noseCone.usesNextCompAutomatic());
+ assertSame(stage, noseCone.getPreviousComponent());
+ assertNull(noseCone.getPreviousSymmetricComponent());
+ assertNull(noseCone.getNextComponent());
+ assertNull(noseCone.getNextSymmetricComponent());
+ assertFalse(noseCone.isAftRadiusAutomatic());
+ assertFalse(noseCone.isBaseRadiusAutomatic());
+ assertFalse(noseCone.isForeRadiusAutomatic());
+ assertEquals(noseCone.getAftRadius(), noseCone.getAftRadiusNoAutomatic(), EPSILON);
+ assertEquals(noseCone.getBaseRadius(), noseCone.getBaseRadiusNoAutomatic(), EPSILON);
+ assertEquals(noseCone.getForeRadius(), noseCone.getForeRadiusNoAutomatic(), EPSILON);
+ assertEquals(0, noseCone.getAftRadiusNoAutomatic(), EPSILON);
+ assertEquals(0.01, noseCone.getForeRadiusNoAutomatic(), EPSILON);
+
+ noseCone.setAftRadiusAutomatic(true, true);
+ assertFalse(noseCone.isAftRadiusAutomatic());
+ assertFalse(noseCone.isBaseRadiusAutomatic());
+ noseCone.setForeRadiusAutomatic(true, true);
+ assertFalse(noseCone.isForeRadiusAutomatic());
+ assertFalse(noseCone.isBaseRadiusAutomatic());
+
+ // Test with previous component
+ stage.addChild(tube1, 0);
+
+ assertFalse(noseCone.usesPreviousCompAutomatic());
+ assertFalse(noseCone.usesNextCompAutomatic());
+ assertSame(tube1, noseCone.getPreviousComponent());
+ assertSame(tube1, noseCone.getPreviousSymmetricComponent());
+ assertNull(noseCone.getNextComponent());
+ assertNull(noseCone.getNextSymmetricComponent());
+ assertFalse(noseCone.isAftRadiusAutomatic());
+ assertFalse(noseCone.isBaseRadiusAutomatic());
+ assertFalse(noseCone.isForeRadiusAutomatic());
+ assertEquals(noseCone.getAftRadius(), noseCone.getAftRadiusNoAutomatic(), EPSILON);
+ assertEquals(noseCone.getBaseRadius(), noseCone.getBaseRadiusNoAutomatic(), EPSILON);
+ assertEquals(noseCone.getForeRadius(), noseCone.getForeRadiusNoAutomatic(), EPSILON);
+ assertEquals(0, noseCone.getAftRadiusNoAutomatic(), EPSILON);
+
+ noseCone.setBaseRadiusAutomatic(true);
+ assertTrue(noseCone.usesPreviousCompAutomatic());
+ assertFalse(noseCone.usesNextCompAutomatic());
+ assertSame(tube1, noseCone.getPreviousComponent());
+ assertSame(tube1, noseCone.getPreviousSymmetricComponent());
+ assertNull(noseCone.getNextComponent());
+ assertNull(noseCone.getNextSymmetricComponent());
+ assertFalse(noseCone.isAftRadiusAutomatic());
+ assertTrue(noseCone.isBaseRadiusAutomatic());
+ assertTrue(noseCone.isForeRadiusAutomatic());
+ assertEquals(tube1.getAftRadius(), noseCone.getForeRadius(), EPSILON);
+ assertEquals(0.01, noseCone.getForeRadiusNoAutomatic(), EPSILON);
+ assertEquals(tube1.getAftRadius(), noseCone.getBaseRadius(), EPSILON);
+ assertEquals(0.01, noseCone.getBaseRadiusNoAutomatic(), EPSILON);
+ assertEquals(noseCone.getAftRadius(), noseCone.getAftRadiusNoAutomatic(), EPSILON);
+ assertEquals(0, noseCone.getAftRadiusNoAutomatic(), EPSILON);
+
+ noseCone.setForeRadiusAutomatic(false, true);
+ assertEquals(noseCone.getAftRadius(), noseCone.getAftRadiusNoAutomatic(), EPSILON);
+ assertEquals(noseCone.getBaseRadius(), noseCone.getBaseRadiusNoAutomatic(), EPSILON);
+ assertEquals(noseCone.getForeRadius(), noseCone.getForeRadiusNoAutomatic(), EPSILON);
+ assertEquals(0.01, noseCone.getForeRadiusNoAutomatic(), EPSILON);
+
+ noseCone.setBaseRadiusAutomatic(true);
+ assertEquals(tube1.getAftRadius(), noseCone.getForeRadius(), EPSILON);
+ assertEquals(0.01, noseCone.getForeRadiusNoAutomatic(), EPSILON);
+ assertEquals(tube1.getAftRadius(), noseCone.getBaseRadius(), EPSILON);
+ assertEquals(0.01, noseCone.getBaseRadiusNoAutomatic(), EPSILON);
+ assertEquals(noseCone.getAftRadius(), noseCone.getAftRadiusNoAutomatic(), EPSILON);
+ assertEquals(0, noseCone.getAftRadiusNoAutomatic(), EPSILON);
+
+ assertTrue(noseCone.isForeRadiusAutomatic());
+ assertTrue(noseCone.isBaseRadiusAutomatic());
+ assertFalse(noseCone.isAftRadiusAutomatic());
+
+ // Test with next component
+ stage.addChild(tube2);
+
+ assertTrue(noseCone.usesPreviousCompAutomatic());
+ assertFalse(noseCone.usesNextCompAutomatic());
+ assertSame(tube1, noseCone.getPreviousComponent());
+ assertSame(tube1, noseCone.getPreviousSymmetricComponent());
+ assertSame(tube2, noseCone.getNextComponent());
+ assertSame(tube2, noseCone.getNextSymmetricComponent());
+ assertFalse(noseCone.isAftRadiusAutomatic());
+ assertTrue(noseCone.isBaseRadiusAutomatic());
+ assertTrue(noseCone.isForeRadiusAutomatic());
+ assertEquals(tube1.getAftRadius(), noseCone.getForeRadius(), EPSILON);
+ assertEquals(0.01, noseCone.getForeRadiusNoAutomatic(), EPSILON);
+ assertEquals(tube1.getForeRadius(), noseCone.getBaseRadius(), EPSILON);
+ assertEquals(0.01, noseCone.getBaseRadiusNoAutomatic(), EPSILON);
+ assertEquals(noseCone.getAftRadius(), noseCone.getAftRadiusNoAutomatic(), EPSILON);
+ assertEquals(0, noseCone.getAftRadius(), EPSILON);
+ }
+}
diff --git a/core/test/net/sf/openrocket/simulation/FlightEventsTest.java b/core/test/net/sf/openrocket/simulation/FlightEventsTest.java
index 2dc047a22..1069d67f5 100644
--- a/core/test/net/sf/openrocket/simulation/FlightEventsTest.java
+++ b/core/test/net/sf/openrocket/simulation/FlightEventsTest.java
@@ -24,6 +24,8 @@ import static org.junit.Assert.assertSame;
* Tests to verify that simulations contain all the expected flight events.
*/
public class FlightEventsTest extends BaseTestCase {
+ private static final double EPSILON = 0.005;
+
/**
* Tests for a single stage design.
*/
@@ -66,7 +68,7 @@ public class FlightEventsTest extends BaseTestCase {
// Test that the event times are correct
for (int i = 0; i < expectedEventTimes.length; i++) {
assertEquals(" Flight type " + expectedEventTypes[i] + " has wrong time",
- expectedEventTimes[i], eventList.get(i).getTime(), 0.001);
+ expectedEventTimes[i], eventList.get(i).getTime(), EPSILON);
}
@@ -142,7 +144,7 @@ public class FlightEventsTest extends BaseTestCase {
// Test that the event times are correct
for (int i = 0; i < expectedEventTimes.length; i++) {
assertEquals(" Flight type " + expectedEventTypes[i] + " has wrong time",
- expectedEventTimes[i], eventList.get(i).getTime(), 0.001);
+ expectedEventTimes[i], eventList.get(i).getTime(), EPSILON);
}
// Test that the event sources are correct
diff --git a/fileformat.txt b/fileformat.txt
index 2a488f6cc..dafe8745a 100644
--- a/fileformat.txt
+++ b/fileformat.txt
@@ -58,6 +58,7 @@ The following file format versions exist:
Added PhotoStudio settings saving ()
Added override CD parameter ()
Added stage activeness remembrance ( under )
+ Added parameter for Nose Cones
Separated into individual parameters for mass, CG, and CD.
Rename to ( remains for backward compatibility)
Rename to ( remains for backward compatibility)
diff --git a/swing/.classpath b/swing/.classpath
index 4cb3e712c..e2bf65e9a 100644
--- a/swing/.classpath
+++ b/swing/.classpath
@@ -19,7 +19,7 @@
-
+
diff --git a/swing/lib/jogl/gluegen-rt-natives-macosx-universal.jar b/swing/lib/jogl/gluegen-rt-natives-macosx-universal.jar
index a47411ec9..33e73ee5b 100644
Binary files a/swing/lib/jogl/gluegen-rt-natives-macosx-universal.jar and b/swing/lib/jogl/gluegen-rt-natives-macosx-universal.jar differ
diff --git a/swing/lib/jogl/jogl-all-natives-macosx-universal.jar b/swing/lib/jogl/jogl-all-natives-macosx-universal.jar
index a95f52455..1798a558e 100644
Binary files a/swing/lib/jogl/jogl-all-natives-macosx-universal.jar and b/swing/lib/jogl/jogl-all-natives-macosx-universal.jar differ
diff --git a/swing/resources/datafiles/examples/A simple model rocket.ork b/swing/resources/datafiles/examples/A simple model rocket.ork
index b20c1d91e..e56383db5 100644
Binary files a/swing/resources/datafiles/examples/A simple model rocket.ork and b/swing/resources/datafiles/examples/A simple model rocket.ork differ
diff --git a/swing/resources/datafiles/examples/Airstart timing.ork b/swing/resources/datafiles/examples/Airstart timing.ork
new file mode 100644
index 000000000..d2542d766
Binary files /dev/null and b/swing/resources/datafiles/examples/Airstart timing.ork differ
diff --git a/swing/resources/datafiles/examples/Apocalypse with decals.ork b/swing/resources/datafiles/examples/Apocalypse with decals.ork
deleted file mode 100644
index e059b4a4e..000000000
Binary files a/swing/resources/datafiles/examples/Apocalypse with decals.ork and /dev/null differ
diff --git a/swing/resources/datafiles/examples/Boosted Dart.ork b/swing/resources/datafiles/examples/Boosted Dart.ork
deleted file mode 100644
index b56c868d6..000000000
Binary files a/swing/resources/datafiles/examples/Boosted Dart.ork and /dev/null differ
diff --git a/swing/resources/datafiles/examples/Chute release.ork b/swing/resources/datafiles/examples/Chute release.ork
new file mode 100644
index 000000000..aa6705928
Binary files /dev/null and b/swing/resources/datafiles/examples/Chute release.ork differ
diff --git a/swing/resources/datafiles/examples/Clustered motors.ork b/swing/resources/datafiles/examples/Clustered motors.ork
new file mode 100644
index 000000000..16fdd59a5
Binary files /dev/null and b/swing/resources/datafiles/examples/Clustered motors.ork differ
diff --git a/swing/resources/datafiles/examples/Clustered rocket design.ork b/swing/resources/datafiles/examples/Clustered rocket design.ork
deleted file mode 100644
index 6cc2f28c9..000000000
Binary files a/swing/resources/datafiles/examples/Clustered rocket design.ork and /dev/null differ
diff --git a/swing/resources/datafiles/examples/Dual Deploy.ork b/swing/resources/datafiles/examples/Dual Deploy.ork
deleted file mode 100644
index 0d2821e93..000000000
Binary files a/swing/resources/datafiles/examples/Dual Deploy.ork and /dev/null differ
diff --git a/swing/resources/datafiles/examples/Dual parachute deployment.ork b/swing/resources/datafiles/examples/Dual parachute deployment.ork
new file mode 100644
index 000000000..d23bf96cd
Binary files /dev/null and b/swing/resources/datafiles/examples/Dual parachute deployment.ork differ
diff --git a/swing/resources/datafiles/examples/High Power Airstart.ork b/swing/resources/datafiles/examples/High Power Airstart.ork
deleted file mode 100644
index 479880efb..000000000
Binary files a/swing/resources/datafiles/examples/High Power Airstart.ork and /dev/null differ
diff --git a/swing/resources/datafiles/examples/Hybrid rocket with dual parachute deployment.ork b/swing/resources/datafiles/examples/Hybrid rocket with dual parachute deployment.ork
deleted file mode 100644
index 574c89c57..000000000
Binary files a/swing/resources/datafiles/examples/Hybrid rocket with dual parachute deployment.ork and /dev/null differ
diff --git a/swing/resources/datafiles/examples/Parallel Staging Example.ork b/swing/resources/datafiles/examples/Parallel Staging Example.ork
deleted file mode 100644
index 9b4ea51f1..000000000
Binary files a/swing/resources/datafiles/examples/Parallel Staging Example.ork and /dev/null differ
diff --git a/swing/resources/datafiles/examples/Parallel booster staging.ork b/swing/resources/datafiles/examples/Parallel booster staging.ork
new file mode 100644
index 000000000..7543c2951
Binary files /dev/null and b/swing/resources/datafiles/examples/Parallel booster staging.ork differ
diff --git a/swing/resources/datafiles/examples/Pods Example.ork b/swing/resources/datafiles/examples/Pods Example.ork
deleted file mode 100644
index 1d0d3f7fc..000000000
Binary files a/swing/resources/datafiles/examples/Pods Example.ork and /dev/null differ
diff --git a/swing/resources/datafiles/examples/Pods--airframes and winglets.ork b/swing/resources/datafiles/examples/Pods--airframes and winglets.ork
new file mode 100644
index 000000000..ca940caf3
Binary files /dev/null and b/swing/resources/datafiles/examples/Pods--airframes and winglets.ork differ
diff --git a/swing/resources/datafiles/examples/Pods--powered with recovery deployment.ork b/swing/resources/datafiles/examples/Pods--powered with recovery deployment.ork
new file mode 100644
index 000000000..1656e5144
Binary files /dev/null and b/swing/resources/datafiles/examples/Pods--powered with recovery deployment.ork differ
diff --git a/swing/resources/datafiles/examples/Preset Usage.ork b/swing/resources/datafiles/examples/Preset Usage.ork
deleted file mode 100644
index afb1cfb00..000000000
Binary files a/swing/resources/datafiles/examples/Preset Usage.ork and /dev/null differ
diff --git a/swing/resources/datafiles/examples/Presets.ork b/swing/resources/datafiles/examples/Presets.ork
new file mode 100644
index 000000000..5812e0d38
Binary files /dev/null and b/swing/resources/datafiles/examples/Presets.ork differ
diff --git a/swing/resources/datafiles/examples/Simulation Extension.ork b/swing/resources/datafiles/examples/Simulation Extension.ork
deleted file mode 100644
index 6f8243e9d..000000000
Binary files a/swing/resources/datafiles/examples/Simulation Extension.ork and /dev/null differ
diff --git a/swing/resources/datafiles/examples/Simulation extensions and scripting.ork b/swing/resources/datafiles/examples/Simulation extensions and scripting.ork
index e84fc0d9d..dc0d416b1 100644
Binary files a/swing/resources/datafiles/examples/Simulation extensions and scripting.ork and b/swing/resources/datafiles/examples/Simulation extensions and scripting.ork differ
diff --git a/swing/resources/datafiles/examples/Simulation extensions.ork b/swing/resources/datafiles/examples/Simulation extensions.ork
new file mode 100644
index 000000000..1ba1d3c06
Binary files /dev/null and b/swing/resources/datafiles/examples/Simulation extensions.ork differ
diff --git a/swing/resources/datafiles/examples/TARC Payloader.ork b/swing/resources/datafiles/examples/TARC Payloader.ork
deleted file mode 100644
index 0482ad09a..000000000
Binary files a/swing/resources/datafiles/examples/TARC Payloader.ork and /dev/null differ
diff --git a/swing/resources/datafiles/examples/TARC payload rocket.ork b/swing/resources/datafiles/examples/TARC payload rocket.ork
new file mode 100644
index 000000000..56731d94f
Binary files /dev/null and b/swing/resources/datafiles/examples/TARC payload rocket.ork differ
diff --git a/swing/resources/datafiles/examples/Three-stage rocket.ork b/swing/resources/datafiles/examples/Three-stage rocket.ork
index e8cb67662..3d90fce6e 100644
Binary files a/swing/resources/datafiles/examples/Three-stage rocket.ork and b/swing/resources/datafiles/examples/Three-stage rocket.ork differ
diff --git a/swing/resources/datafiles/examples/Tube Fin.ork b/swing/resources/datafiles/examples/Tube Fin.ork
deleted file mode 100644
index c176ce02c..000000000
Binary files a/swing/resources/datafiles/examples/Tube Fin.ork and /dev/null differ
diff --git a/swing/resources/datafiles/examples/Tube fin rocket.ork b/swing/resources/datafiles/examples/Tube fin rocket.ork
new file mode 100644
index 000000000..e6a56ba32
Binary files /dev/null and b/swing/resources/datafiles/examples/Tube fin rocket.ork differ
diff --git a/swing/resources/datafiles/examples/Two-stage rocket.ork b/swing/resources/datafiles/examples/Two-stage rocket.ork
new file mode 100644
index 000000000..142cbbbac
Binary files /dev/null and b/swing/resources/datafiles/examples/Two-stage rocket.ork differ
diff --git a/swing/src/net/sf/openrocket/database/ComponentPresetDatabaseLoader.java b/swing/src/net/sf/openrocket/database/ComponentPresetDatabaseLoader.java
index 7ba2ee72f..ea0961462 100644
--- a/swing/src/net/sf/openrocket/database/ComponentPresetDatabaseLoader.java
+++ b/swing/src/net/sf/openrocket/database/ComponentPresetDatabaseLoader.java
@@ -1,5 +1,6 @@
package net.sf.openrocket.database;
+import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectInputStream;
@@ -77,8 +78,8 @@ public class ComponentPresetDatabaseLoader extends AsynchronousDatabaseLoader {
return;
}
while (iterator.hasNext()) {
- Pair f = iterator.next();
- Collection presets = loadFile(f.getU(), f.getV());
+ Pair f = iterator.next();
+ Collection presets = loadFile(f.getU().getName(), f.getV());
componentPresetDao.addAll(presets);
fileCount++;
presetCount += presets.size();
@@ -97,8 +98,8 @@ public class ComponentPresetDatabaseLoader extends AsynchronousDatabaseLoader {
return;
while (iterator.hasNext()) {
- Pair f = iterator.next();
- Collection presets = loadFile(f.getU(), f.getV());
+ Pair f = iterator.next();
+ Collection presets = loadFile(f.getU().getName(), f.getV());
componentPresetDao.addAll(presets);
fileCount++;
presetCount += presets.size();
diff --git a/swing/src/net/sf/openrocket/database/MotorDatabaseLoader.java b/swing/src/net/sf/openrocket/database/MotorDatabaseLoader.java
index b073aee89..279f0cf92 100644
--- a/swing/src/net/sf/openrocket/database/MotorDatabaseLoader.java
+++ b/swing/src/net/sf/openrocket/database/MotorDatabaseLoader.java
@@ -89,7 +89,7 @@ public class MotorDatabaseLoader extends AsynchronousDatabaseLoader {
log.info("Starting reading serialized motor database");
FileIterator iterator = DirectoryIterator.findDirectory(THRUSTCURVE_DIRECTORY, new SimpleFileFilter("", false, "ser"));
while (iterator.hasNext()) {
- Pair f = iterator.next();
+ Pair f = iterator.next();
loadSerialized(f);
}
log.info("Ending reading serialized motor database, motorCount=" + motorCount);
@@ -99,12 +99,12 @@ public class MotorDatabaseLoader extends AsynchronousDatabaseLoader {
/**
* loads a serailized motor data from an stream
*
- * @param f the pair of a String with the filename (for logging) and the input stream
+ * @param f the pair of a File (for logging) and the input stream
*/
@SuppressWarnings("unchecked")
- private void loadSerialized(Pair f) {
+ private void loadSerialized(Pair f) {
try {
- log.debug("Reading motors from file " + f.getU());
+ log.debug("Reading motors from file " + f.getU().getPath());
ObjectInputStream ois = new ObjectInputStream(f.getV());
List motors = (List) ois.readObject();
addMotors(motors);
@@ -124,11 +124,11 @@ public class MotorDatabaseLoader extends AsynchronousDatabaseLoader {
log.debug("Loading motors from file " + file);
loadFile(
loader,
- new Pair(
- file.getName(),
+ new Pair<>(
+ file,
new BufferedInputStream(new FileInputStream(file))));
- } catch (IOException e) {
- log.warn("IOException while reading " + file + ": " + e, e);
+ } catch (Exception e) {
+ log.warn("Exception while reading " + file + ": " + e, e);
}
}
@@ -138,18 +138,17 @@ public class MotorDatabaseLoader extends AsynchronousDatabaseLoader {
* @param loader an object to handle the loading
* @param f the pair of File name and its input stream
*/
- private void loadFile(GeneralMotorLoader loader, Pair f) {
+ private void loadFile(GeneralMotorLoader loader, Pair f) {
try {
- List motors = loader.load(f.getV(), f.getU());
+ List motors = loader.load(f.getV(), f.getU().getName());
try {
addMotorsFromBuilders(motors);
}
catch (IllegalArgumentException e) {
Translator trans = Application.getTranslator();
- File thrustCurveDir = ((SwingPreferences) Application.getPreferences()).getDefaultUserThrustCurveFile();
- File fullPath = new File(thrustCurveDir, f.getU());
+ String fullPath = f.getU().getPath();
String message = "" + e.getMessage() +
- ".
" + MessageFormat.format( trans.get("MotorDbLoaderDlg.message1"), fullPath.getPath()) +
+ ".
" + MessageFormat.format( trans.get("MotorDbLoaderDlg.message1"), fullPath) +
"
" + trans.get("MotorDbLoaderDlg.message2") + "
";
JOptionPane pane = new JOptionPane(message, JOptionPane.WARNING_MESSAGE);
JDialog dialog = pane.createDialog(null, trans.get("MotorDbLoaderDlg.title"));
@@ -158,8 +157,8 @@ public class MotorDatabaseLoader extends AsynchronousDatabaseLoader {
dialog.setVisible(true);
}
f.getV().close();
- } catch (IOException e) {
- log.warn("IOException while loading file " + f.getU() + ": " + e, e);
+ } catch (Exception e) {
+ log.warn("Exception while loading file " + f.getU() + ": " + e, e);
try {
f.getV().close();
} catch (IOException e1) {
@@ -178,7 +177,7 @@ public class MotorDatabaseLoader extends AsynchronousDatabaseLoader {
FileIterator iterator;
try {
iterator = new DirectoryIterator(file, fileFilter, true);
- } catch (IOException e) {
+ } catch (Exception e) {
log.warn("Unable to read directory " + file + ": " + e, e);
return;
}
diff --git a/swing/src/net/sf/openrocket/file/motor/MotorLoaderHelper.java b/swing/src/net/sf/openrocket/file/motor/MotorLoaderHelper.java
index deacaad41..0719b8c11 100644
--- a/swing/src/net/sf/openrocket/file/motor/MotorLoaderHelper.java
+++ b/swing/src/net/sf/openrocket/file/motor/MotorLoaderHelper.java
@@ -95,10 +95,10 @@ public final class MotorLoaderHelper {
List list = new ArrayList();
while (iterator.hasNext()) {
- final Pair input = iterator.next();
+ final Pair input = iterator.next();
log.debug("Loading motors from file " + input.getU());
try {
- List motors = load(input.getV(), input.getU());
+ List motors = load(input.getV(), input.getU().getName());
for (ThrustCurveMotor.Builder m : motors) {
list.add(m);
}
diff --git a/swing/src/net/sf/openrocket/gui/SpinnerEditor.java b/swing/src/net/sf/openrocket/gui/SpinnerEditor.java
index d02997e3d..fe6956b71 100644
--- a/swing/src/net/sf/openrocket/gui/SpinnerEditor.java
+++ b/swing/src/net/sf/openrocket/gui/SpinnerEditor.java
@@ -1,5 +1,7 @@
package net.sf.openrocket.gui;
+import net.sf.openrocket.gui.adaptors.TextComponentSelectionKeyListener;
+
import javax.swing.JSpinner;
import javax.swing.JTextField;
import javax.swing.SwingUtilities;
@@ -7,8 +9,8 @@ import javax.swing.text.DefaultFormatter;
import javax.swing.text.DefaultFormatterFactory;
import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
+import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
/**
* Editable editor for a JSpinner. Simply uses JSpinner.DefaultEditor, which has been made
@@ -29,58 +31,7 @@ public class SpinnerEditor extends JSpinner.DefaultEditor {
DefaultFormatter formatter = (DefaultFormatter) dff.getDefaultFormatter();
formatter.setOverwriteMode(false);
-
- // Add listeners to select all the text when the field is focussed
- {
- getTextField().addFocusListener(new FocusListener() {
- @Override
- public void focusGained(FocusEvent e) {
- selectAllText();
- }
-
- @Override
- public void focusLost(FocusEvent e) {
- }
- });
-
- getTextField().addMouseListener(new MouseListener() {
- private boolean isFocussed = false; // Checks whether the text field was focussed when it was clicked upon
-
- @Override
- public void mouseClicked(MouseEvent e) {
- // If the text field was focussed when it was clicked upon instead of e.g. tab-switching to gain focus,
- // then the select all action from the focus listener is ignored (it is replaced by a cursor-click event).
- // So if we detect such a focus change, then redo the select all action.
- if (!isFocussed) {
- SwingUtilities.invokeLater(new Runnable() {
- @Override
- public void run() {
- JTextField tf = (JTextField) e.getSource();
- tf.selectAll();
- }
- });
- }
- }
-
- @Override
- public void mousePressed(MouseEvent e) {
- JTextField tf = (JTextField) e.getSource();
- isFocussed = tf.hasFocus();
- }
-
- @Override
- public void mouseReleased(MouseEvent e) {
- }
-
- @Override
- public void mouseEntered(MouseEvent e) {
- }
-
- @Override
- public void mouseExited(MouseEvent e) {
- }
- });
- }
+ addListeners();
}
/**
@@ -93,14 +44,54 @@ public class SpinnerEditor extends JSpinner.DefaultEditor {
getTextField().setColumns(cols);
}
+ private void addListeners() {
+ // Select all the text when the field is focussed
+ getTextField().addFocusListener(new FocusListener() {
+ @Override
+ public void focusGained(FocusEvent e) {
+ selectAllText(getTextField());
+ }
+
+ @Override
+ public void focusLost(FocusEvent e) {
+ }
+ });
+
+ // Select all the text when the field is first clicked upon
+ getTextField().addMouseListener(new MouseAdapter() {
+ private boolean isFocussed = false; // Checks whether the text field was focussed when it was clicked upon
+
+ @Override
+ public void mouseClicked(MouseEvent e) {
+ /*
+ If the text field was focussed when it was clicked upon instead of e.g. tab-switching to gain focus,
+ then the select all action from the focus listener is ignored (it is replaced by a cursor-click event).
+ So if we detect such a focus change, then redo the select all action.
+ */
+ if (!isFocussed) {
+ selectAllText((JTextField) e.getSource());
+ }
+ }
+
+ @Override
+ public void mousePressed(MouseEvent e) {
+ JTextField tf = (JTextField) e.getSource();
+ isFocussed = tf.hasFocus();
+ }
+ });
+
+ // Fix key behavior on text selection
+ getTextField().addKeyListener(new TextComponentSelectionKeyListener(getTextField()));
+ }
+
/**
* Highlights all the text in the text field.
*/
- private void selectAllText() {
+ private void selectAllText(JTextField tf) {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
- getTextField().selectAll();
+ tf.selectAll();
}
});
}
diff --git a/swing/src/net/sf/openrocket/gui/adaptors/TextComponentSelectionKeyListener.java b/swing/src/net/sf/openrocket/gui/adaptors/TextComponentSelectionKeyListener.java
new file mode 100644
index 000000000..3d0addbf2
--- /dev/null
+++ b/swing/src/net/sf/openrocket/gui/adaptors/TextComponentSelectionKeyListener.java
@@ -0,0 +1,43 @@
+package net.sf.openrocket.gui.adaptors;
+
+import javax.swing.text.JTextComponent;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+
+/**
+ * This key listener fixes a default behavior by Java Swing text components, where if you select a text, pressing the
+ * left or right arrow key would not bring the text cursor to the beginning or the end of the selection
+ * (@Java, please fix...).
+ *
+ * This listener's behavior:
+ * If some text of the editor is selected, set the caret position to:
+ * - the end of the selection if the user presses the right arrow key
+ * - the beginning of the selection if the user presses the left arrow key
+ */
+public class TextComponentSelectionKeyListener extends KeyAdapter {
+ private final JTextComponent textField;
+
+ public TextComponentSelectionKeyListener(JTextComponent textField) {
+ this.textField = textField;
+ }
+
+ @Override
+ public void keyPressed(KeyEvent e) {
+ if (e.isShiftDown()) {
+ return;
+ }
+ if (e.getKeyCode() == KeyEvent.VK_LEFT || e.getKeyCode() == KeyEvent.VK_KP_LEFT) {
+ int start = textField.getSelectionStart();
+ int end = textField.getSelectionEnd();
+ if (end > start) {
+ textField.setCaretPosition(start + 1);
+ }
+ } else if (e.getKeyCode() == KeyEvent.VK_RIGHT || e.getKeyCode() == KeyEvent.VK_KP_RIGHT) {
+ int start = textField.getSelectionStart();
+ int end = textField.getSelectionEnd();
+ if (end > start) {
+ textField.setCaretPosition(end - 1);
+ }
+ }
+ }
+}
diff --git a/swing/src/net/sf/openrocket/gui/components/DescriptionArea.java b/swing/src/net/sf/openrocket/gui/components/DescriptionArea.java
index 844c4909d..4061e2ba1 100644
--- a/swing/src/net/sf/openrocket/gui/components/DescriptionArea.java
+++ b/swing/src/net/sf/openrocket/gui/components/DescriptionArea.java
@@ -58,7 +58,17 @@ public class DescriptionArea extends JScrollPane {
public DescriptionArea(String text, int rows, float size) {
this(text, rows, size, true);
}
-
+
+ /**
+ * Construct an opaque description area with the specified number of rows, size and text, being opaque.
+ *
+ * @param text the initial text.
+ * @param rows the number of rows.
+ */
+ public DescriptionArea(String text, int rows) {
+ this(text, rows, -1);
+ }
+
/**
* Constructor with all options.
*
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java b/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java
index f19076c96..f72b616ae 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/AppearancePanel.java
@@ -436,6 +436,8 @@ public class AppearancePanel extends JPanel {
remove(outsideInsidePane);
add(outsidePanel, "span 4, growx, wrap");
}
+
+ // Repaint to fit to the new size
if (parent != null) {
parent.pack();
} else {
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/AxialStageConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/AxialStageConfig.java
index 611e67920..56d89d8fc 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/AxialStageConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/AxialStageConfig.java
@@ -16,7 +16,6 @@ import net.sf.openrocket.gui.components.StyledLabel;
import net.sf.openrocket.gui.components.StyledLabel.Style;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.rocketcomponent.AxialStage;
-import net.sf.openrocket.rocketcomponent.FlightConfiguration;
import net.sf.openrocket.rocketcomponent.RocketComponent;
import net.sf.openrocket.rocketcomponent.StageSeparationConfiguration;
import net.sf.openrocket.rocketcomponent.StageSeparationConfiguration.SeparationEvent;
@@ -38,7 +37,9 @@ public class AxialStageConfig extends ComponentAssemblyConfig {
}
// Apply the custom focus travel policy to this config dialog
- order.add(closeButton); // Make sure the close button is the last component
+ //// Make sure the cancel & ok button is the last component
+ order.add(cancelButton);
+ order.add(okButton);
CustomFocusTraversalPolicy policy = new CustomFocusTraversalPolicy(order);
parent.setFocusTraversalPolicy(policy);
}
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/BodyTubeConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/BodyTubeConfig.java
index 58835dec6..128bde727 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/BodyTubeConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/BodyTubeConfig.java
@@ -121,7 +121,9 @@ public class BodyTubeConfig extends RocketComponentConfig {
trans.get("BodyTubecfg.tab.Motormountconf"), 1);
// Apply the custom focus travel policy to this config dialog
- order.add(closeButton); // Make sure the close button is the last component
+ //// Make sure the cancel & ok button is the last component
+ order.add(cancelButton);
+ order.add(okButton);
CustomFocusTraversalPolicy policy = new CustomFocusTraversalPolicy(order);
parent.setFocusTraversalPolicy(policy);
}
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/BulkheadConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/BulkheadConfig.java
index 1659a721c..d1bdb5e63 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/BulkheadConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/BulkheadConfig.java
@@ -29,7 +29,9 @@ public class BulkheadConfig extends RingComponentConfig {
tabbedPane.setSelectedIndex(0);
// Apply the custom focus travel policy to this panel
- order.add(closeButton); // Make sure the close button is the last component
+ //// Make sure the cancel & ok button is the last component
+ order.add(cancelButton);
+ order.add(okButton);
CustomFocusTraversalPolicy policy = new CustomFocusTraversalPolicy(order);
parent.setFocusTraversalPolicy(policy);
}
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/CenteringRingConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/CenteringRingConfig.java
index 548bf4b86..5ac0bcc75 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/CenteringRingConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/CenteringRingConfig.java
@@ -31,7 +31,9 @@ public class CenteringRingConfig extends RingComponentConfig {
tabbedPane.setSelectedIndex(0);
// Apply the custom focus travel policy to this panel
- order.add(closeButton); // Make sure the close button is the last component
+ //// Make sure the cancel & ok button is the last component
+ order.add(cancelButton);
+ order.add(okButton);
CustomFocusTraversalPolicy policy = new CustomFocusTraversalPolicy(order);
parent.setFocusTraversalPolicy(policy);
}
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/ComponentConfigDialog.java b/swing/src/net/sf/openrocket/gui/configdialog/ComponentConfigDialog.java
index e71f0f1c4..c3c953faf 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/ComponentConfigDialog.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/ComponentConfigDialog.java
@@ -1,15 +1,11 @@
package net.sf.openrocket.gui.configdialog;
-import java.awt.GraphicsDevice;
-import java.awt.GraphicsEnvironment;
-import java.awt.Rectangle;
import java.awt.Window;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
import java.util.List;
import javax.swing.JDialog;
@@ -48,16 +44,19 @@ public class ComponentConfigDialog extends JDialog implements ComponentChangeLis
private OpenRocketDocument document = null;
protected RocketComponent component = null;
private RocketComponentConfig configurator = null;
- protected static boolean clearConfigListeners = true;
+ private boolean isModified = false;
+ private final boolean isNewComponent;
+ public static boolean clearConfigListeners = true;
private static String previousSelectedTab = null; // Name of the previous selected tab
private final Window parent;
private static final Translator trans = Application.getTranslator();
- private ComponentConfigDialog(Window parent, OpenRocketDocument document, RocketComponent component) {
+ private ComponentConfigDialog(Window parent, OpenRocketDocument document, RocketComponent component, boolean isNewComponent) {
super(parent);
this.parent = parent;
+ this.isNewComponent = isNewComponent;
setComponent(document, component);
@@ -104,8 +103,10 @@ public class ComponentConfigDialog extends JDialog implements ComponentChangeLis
this.document = document;
this.component = component;
this.document.getRocket().addComponentChangeListener(this);
+ this.isModified = false;
configurator = getDialogContents();
+ configurator.setNewComponent(isNewComponent);
this.setContentPane(configurator);
configurator.updateFields();
@@ -172,10 +173,8 @@ public class ComponentConfigDialog extends JDialog implements ComponentChangeLis
@Override
public void componentChanged(ComponentChangeEvent e) {
if (e.isTreeChange() || e.isUndoChange()) {
-
// Hide dialog in case of tree or undo change
disposeDialog();
-
} else {
/*
* TODO: HIGH: The line below has caused a NullPointerException (without null check)
@@ -183,8 +182,13 @@ public class ComponentConfigDialog extends JDialog implements ComponentChangeLis
* root cause should be analyzed.
* [Openrocket-bugs] 2009-12-12 19:23:22 Automatic bug report for OpenRocket 0.9.5
*/
- if (configurator != null)
+ if (configurator != null) {
configurator.updateFields();
+ }
+ if (!this.isModified) {
+ setTitle("*" + getTitle());
+ this.isModified = true;
+ }
}
}
@@ -261,7 +265,7 @@ public class ComponentConfigDialog extends JDialog implements ComponentChangeLis
previousSelectedTab = null;
}
- dialog = new ComponentConfigDialog(parent, document, component);
+ dialog = new ComponentConfigDialog(parent, document, component, isNewComponent);
dialog.setVisible(true);
if (parent instanceof BasicFrame && BasicFrame.getStartupFrame() == parent) {
WindowLocationUtil.moveIfOutsideOfParentMonitor(dialog, parent);
@@ -335,6 +339,13 @@ public class ComponentConfigDialog extends JDialog implements ComponentChangeLis
return (dialog != null) && (dialog.isVisible());
}
+ /**
+ * Returns true if the current component has been modified or not.
+ */
+ public boolean isModified() {
+ return isModified;
+ }
+
public int getSelectedTabIndex() {
return configurator.getSelectedTabIndex();
}
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/EllipticalFinSetConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/EllipticalFinSetConfig.java
index add84adfb..6d765b36f 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/EllipticalFinSetConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/EllipticalFinSetConfig.java
@@ -201,7 +201,9 @@ public class EllipticalFinSetConfig extends FinSetConfig {
tabbedPane.setSelectedIndex(0);
// Apply the custom focus travel policy to this config dialog
- order.add(closeButton); // Make sure the close button is the last component
+ //// Make sure the cancel & ok button is the last component
+ order.add(cancelButton);
+ order.add(okButton);
CustomFocusTraversalPolicy policy = new CustomFocusTraversalPolicy(order);
parent.setFocusTraversalPolicy(policy);
}
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java
index 5bae5b08f..d83c8470d 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java
@@ -107,7 +107,9 @@ public class FreeformFinSetConfig extends FinSetConfig {
addFinSetButtons();
// Apply the custom focus travel policy to this panel
- order.add(closeButton); // Make sure the close button is the last component
+ //// Make sure the cancel & ok button is the last component
+ order.add(cancelButton);
+ order.add(okButton);
CustomFocusTraversalPolicy policy = new CustomFocusTraversalPolicy(order);
parent.setFocusTraversalPolicy(policy);
}
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/InnerTubeConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/InnerTubeConfig.java
index 45c984dd5..669b816e7 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/InnerTubeConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/InnerTubeConfig.java
@@ -207,7 +207,9 @@ public class InnerTubeConfig extends RocketComponentConfig {
tabbedPane.setSelectedIndex(0);
// Apply the custom focus travel policy to this config dialog
- order.add(closeButton); // Make sure the close button is the last component
+ //// Make sure the cancel & ok button is the last component
+ order.add(cancelButton);
+ order.add(okButton);
CustomFocusTraversalPolicy policy = new CustomFocusTraversalPolicy(order);
parent.setFocusTraversalPolicy(policy);
}
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/LaunchLugConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/LaunchLugConfig.java
index 37d93a0fd..22f062436 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/LaunchLugConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/LaunchLugConfig.java
@@ -162,7 +162,9 @@ public class LaunchLugConfig extends RocketComponentConfig {
tabbedPane.setSelectedIndex(0);
// Apply the custom focus travel policy to this config dialog
- order.add(closeButton); // Make sure the close button is the last component
+ //// Make sure the cancel & ok button is the last component
+ order.add(cancelButton);
+ order.add(okButton);
CustomFocusTraversalPolicy policy = new CustomFocusTraversalPolicy(order);
parent.setFocusTraversalPolicy(policy);
}
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/MassComponentConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/MassComponentConfig.java
index 5bb30f602..3934ee940 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/MassComponentConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/MassComponentConfig.java
@@ -166,7 +166,9 @@ public class MassComponentConfig extends RocketComponentConfig {
tabbedPane.setSelectedIndex(0);
// Apply the custom focus travel policy to this config dialog
- order.add(closeButton); // Make sure the close button is the last component
+ //// Make sure the cancel & ok button is the last component
+ order.add(cancelButton);
+ order.add(okButton);
CustomFocusTraversalPolicy policy = new CustomFocusTraversalPolicy(order);
parent.setFocusTraversalPolicy(policy);
}
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java
index 9587d4760..828cc96a1 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java
@@ -3,6 +3,8 @@ package net.sf.openrocket.gui.configdialog;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
@@ -40,7 +42,7 @@ public class NoseConeConfig extends RocketComponentConfig {
private JLabel shapeLabel;
private JSpinner shapeSpinner;
private JSlider shapeSlider;
- private final JCheckBox checkAutoAftRadius;
+ private final JCheckBox checkAutoBaseRadius;
private static final Translator trans = Application.getTranslator();
// Prepended to the description from NoseCone.DESCRIPTIONS
@@ -106,21 +108,21 @@ public class NoseConeConfig extends RocketComponentConfig {
panel.add(new JLabel(trans.get("NoseConeCfg.lbl.Basediam")));
- final DoubleModel aftRadiusModel = new DoubleModel(component, "AftRadius", 2.0, UnitGroup.UNITS_LENGTH, 0); // Diameter = 2*Radius
- final JSpinner radiusSpinner = new JSpinner(aftRadiusModel.getSpinnerModel());
+ final DoubleModel baseRadius = new DoubleModel(component, "BaseRadius", 2.0, UnitGroup.UNITS_LENGTH, 0); // Diameter = 2*Radius
+ final JSpinner radiusSpinner = new JSpinner(baseRadius.getSpinnerModel());
radiusSpinner.setEditor(new SpinnerEditor(radiusSpinner));
panel.add(radiusSpinner, "growx");
order.add(((SpinnerEditor) radiusSpinner.getEditor()).getTextField());
- panel.add(new UnitSelector(aftRadiusModel), "growx");
- panel.add(new BasicSlider(aftRadiusModel.getSliderModel(0, 0.04, 0.2)), "w 100lp, wrap 0px");
+ panel.add(new UnitSelector(baseRadius), "growx");
+ panel.add(new BasicSlider(baseRadius.getSliderModel(0, 0.04, 0.2)), "w 100lp, wrap 0px");
- checkAutoAftRadius = new JCheckBox(aftRadiusModel.getAutomaticAction());
+ checkAutoBaseRadius = new JCheckBox(baseRadius.getAutomaticAction());
//// Automatic
- checkAutoAftRadius.setText(trans.get("NoseConeCfg.checkbox.Automatic"));
- panel.add(checkAutoAftRadius, "skip, span 2, wrap");
- order.add(checkAutoAftRadius);
- updateCheckboxAutoAftRadius();
+ checkAutoBaseRadius.setText(trans.get("NoseConeCfg.checkbox.Automatic"));
+ panel.add(checkAutoBaseRadius, "skip, span 2, wrap");
+ order.add(checkAutoBaseRadius);
+ updateCheckboxAutoBaseRadius(((NoseCone) component).isFlipped());
}
{//// Wall thickness:
@@ -142,10 +144,24 @@ public class NoseConeConfig extends RocketComponentConfig {
//// Filled
filledCheckbox.setText(trans.get("NoseConeCfg.checkbox.Filled"));
filledCheckbox.setToolTipText(trans.get("NoseConeCfg.checkbox.Filled.ttip"));
- panel.add(filledCheckbox, "skip, span 2, wrap");
+ panel.add(filledCheckbox, "skip, span 2, wrap para");
order.add(filledCheckbox);
}
+ {//// Flip to tail cone:
+ final JCheckBox flipCheckbox = new JCheckBox(new BooleanModel(component, "Flipped"));
+ flipCheckbox.setText(trans.get("NoseConeCfg.checkbox.Flip"));
+ flipCheckbox.setToolTipText(trans.get("NoseConeCfg.checkbox.Flip.ttip"));
+ panel.add(flipCheckbox, "spanx, wrap");
+ order.add(flipCheckbox);
+ flipCheckbox.addItemListener(new ItemListener() {
+ @Override
+ public void itemStateChanged(ItemEvent e) {
+ updateCheckboxAutoBaseRadius(e.getStateChange() == ItemEvent.SELECTED);
+ }
+ });
+ }
+
panel.add(new JLabel(""), "growy");
//// Description
@@ -172,7 +188,9 @@ public class NoseConeConfig extends RocketComponentConfig {
tabbedPane.setSelectedIndex(0);
// Apply the custom focus travel policy to this config dialog
- order.add(closeButton); // Make sure the close button is the last component
+ //// Make sure the cancel & ok button is the last component
+ order.add(cancelButton);
+ order.add(okButton);
CustomFocusTraversalPolicy policy = new CustomFocusTraversalPolicy(order);
parent.setFocusTraversalPolicy(policy);
}
@@ -189,25 +207,29 @@ public class NoseConeConfig extends RocketComponentConfig {
* Sets the checkAutoAftRadius checkbox's enabled state and tooltip text, based on the state of its next component.
* If there is no next symmetric component or if that component already has its auto checkbox checked, the
* checkAutoAftRadius checkbox is disabled.
+ *
+ * @param isFlipped whether the nose cone is flipped
*/
- private void updateCheckboxAutoAftRadius() {
- if (component == null || checkAutoAftRadius == null) return;
+ private void updateCheckboxAutoBaseRadius(boolean isFlipped) {
+ if (component == null || checkAutoBaseRadius == null) return;
// Disable check button if there is no component to get the diameter from
- SymmetricComponent nextComp = ((NoseCone) component).getNextSymmetricComponent();
- if (nextComp == null) {
- checkAutoAftRadius.setEnabled(false);
- ((NoseCone) component).setAftRadiusAutomatic(false);
- checkAutoAftRadius.setToolTipText(trans.get("NoseConeCfg.checkbox.ttip.Automatic_noReferenceComponent"));
+ NoseCone noseCone = ((NoseCone) component);
+ SymmetricComponent referenceComp = isFlipped ? noseCone.getPreviousSymmetricComponent() : noseCone.getNextSymmetricComponent();
+ if (referenceComp == null) {
+ checkAutoBaseRadius.setEnabled(false);
+ ((NoseCone) component).setBaseRadiusAutomatic(false);
+ checkAutoBaseRadius.setToolTipText(trans.get("NoseConeCfg.checkbox.ttip.Automatic_noReferenceComponent"));
return;
}
- if (!nextComp.usesPreviousCompAutomatic()) {
- checkAutoAftRadius.setEnabled(true);
- checkAutoAftRadius.setToolTipText(trans.get("NoseConeCfg.checkbox.ttip.Automatic"));
+ if ((!isFlipped&& !referenceComp.usesPreviousCompAutomatic()) ||
+ isFlipped && !referenceComp.usesNextCompAutomatic()) {
+ checkAutoBaseRadius.setEnabled(true);
+ checkAutoBaseRadius.setToolTipText(trans.get("NoseConeCfg.checkbox.ttip.Automatic"));
} else {
- checkAutoAftRadius.setEnabled(false);
- ((NoseCone) component).setAftRadiusAutomatic(false);
- checkAutoAftRadius.setToolTipText(trans.get("NoseConeCfg.checkbox.ttip.Automatic_alreadyAuto"));
+ checkAutoBaseRadius.setEnabled(false);
+ ((NoseCone) component).setBaseRadiusAutomatic(false);
+ checkAutoBaseRadius.setToolTipText(trans.get("NoseConeCfg.checkbox.ttip.Automatic_alreadyAuto"));
}
}
}
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java
index 74f9f85e6..62259f074 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java
@@ -290,7 +290,9 @@ public class ParachuteConfig extends RecoveryDeviceConfig {
tabbedPane.setSelectedIndex(0);
// Apply the custom focus travel policy to this config dialog
- order.add(closeButton); // Make sure the close button is the last component
+ //// Make sure the cancel & ok button is the last component
+ order.add(cancelButton);
+ order.add(okButton);
CustomFocusTraversalPolicy policy = new CustomFocusTraversalPolicy(order);
parent.setFocusTraversalPolicy(policy);
}
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/RailButtonConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/RailButtonConfig.java
index da9c6af8c..1f9b25eef 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/RailButtonConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/RailButtonConfig.java
@@ -35,7 +35,9 @@ public class RailButtonConfig extends RocketComponentConfig {
tabbedPane.setSelectedIndex(0);
// Apply the custom focus travel policy to this panel
- order.add(closeButton); // Make sure the close button is the last component
+ //// Make sure the cancel & ok button is the last component
+ order.add(cancelButton);
+ order.add(okButton);
CustomFocusTraversalPolicy policy = new CustomFocusTraversalPolicy(order);
parent.setFocusTraversalPolicy(policy);
}
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java
index da346f88a..35c313483 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java
@@ -11,15 +11,12 @@ import javax.swing.JSpinner;
import net.miginfocom.swing.MigLayout;
import net.sf.openrocket.document.OpenRocketDocument;
import net.sf.openrocket.gui.SpinnerEditor;
-import net.sf.openrocket.gui.adaptors.CustomFocusTraversalPolicy;
import net.sf.openrocket.gui.adaptors.DoubleModel;
import net.sf.openrocket.gui.adaptors.EnumModel;
import net.sf.openrocket.gui.components.BasicSlider;
-import net.sf.openrocket.gui.components.DescriptionArea;
import net.sf.openrocket.gui.components.UnitSelector;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.material.Material;
-import net.sf.openrocket.rocketcomponent.EngineBlock;
import net.sf.openrocket.rocketcomponent.RocketComponent;
import net.sf.openrocket.rocketcomponent.ThicknessRingComponent;
import net.sf.openrocket.rocketcomponent.position.AxialMethod;
@@ -168,13 +165,6 @@ public class RingComponentConfig extends RocketComponentConfig {
//// Material
MaterialPanel materialPanel = new MaterialPanel(component, document, Material.Type.BULK, order);
-
- if (component instanceof EngineBlock) {
- final DescriptionArea desc = new DescriptionArea(6);
- //// An engine block stops the motor from moving forwards in the motor mount tube.
In order to add a motor, create a body tube or inner tube and mark it as a motor mount in the Motor tab.
- desc.setText(trans.get("ringcompcfg.EngineBlock.desc"));
- materialPanel.add(desc, "width 1px, growx, wrap");
- }
panel.add(materialPanel, "cell 4 0, gapleft paragraph, aligny 0%, spany");
return panel;
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java
index a174f317f..697d9b8fe 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java
@@ -5,7 +5,12 @@ import java.awt.Color;
import java.awt.Component;
import java.awt.Container;
import java.awt.Font;
-import java.awt.event.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -17,6 +22,7 @@ import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JDialog;
import javax.swing.JLabel;
+import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JSpinner;
@@ -35,30 +41,40 @@ import net.sf.openrocket.gui.adaptors.BooleanModel;
import net.sf.openrocket.gui.adaptors.DoubleModel;
import net.sf.openrocket.gui.adaptors.IntegerModel;
import net.sf.openrocket.gui.adaptors.PresetModel;
+import net.sf.openrocket.gui.adaptors.TextComponentSelectionKeyListener;
import net.sf.openrocket.gui.components.BasicSlider;
+import net.sf.openrocket.gui.components.DescriptionArea;
import net.sf.openrocket.gui.components.StyledLabel;
import net.sf.openrocket.gui.components.StyledLabel.Style;
import net.sf.openrocket.gui.components.UnitSelector;
import net.sf.openrocket.gui.dialogs.preset.ComponentPresetChooserDialog;
import net.sf.openrocket.gui.util.GUIUtil;
+import net.sf.openrocket.gui.util.Icons;
+import net.sf.openrocket.gui.widgets.IconToggleButton;
import net.sf.openrocket.gui.widgets.SelectColorButton;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.preset.ComponentPreset;
import net.sf.openrocket.rocketcomponent.*;
import net.sf.openrocket.rocketcomponent.position.AxialMethod;
import net.sf.openrocket.startup.Application;
+import net.sf.openrocket.startup.Preferences;
import net.sf.openrocket.unit.UnitGroup;
import net.sf.openrocket.util.Invalidatable;
public class RocketComponentConfig extends JPanel {
private static final long serialVersionUID = -2925484062132243982L;
+ // Preference key
+ private static final String IGNORE_DISCARD_EDITING_WARNING = "IgnoreDiscardEditingWarning";
+
private static final Translator trans = Application.getTranslator();
+ private static final Preferences preferences = Application.getPreferences();
protected final OpenRocketDocument document;
protected final RocketComponent component;
protected final JTabbedPane tabbedPane;
- protected final JDialog parent;
+ protected final ComponentConfigDialog parent;
+ protected boolean isNewComponent = false; // Checks whether this config dialog is editing an existing component, or a new one
private final List invalidatables = new ArrayList();
protected final List order = new ArrayList<>(); // Component traversal order
@@ -70,9 +86,13 @@ public class RocketComponentConfig extends JPanel {
protected final JTextField componentNameField;
protected JTextArea commentTextArea;
private final TextFieldListener textFieldListener;
-
+
+ private DescriptionArea componentInfo;
+ private IconToggleButton infoBtn;
+
private JPanel buttonPanel;
- protected JButton closeButton;
+ protected JButton okButton;
+ protected JButton cancelButton;
private AppearancePanel appearancePanel = null;
private JLabel infoLabel;
@@ -82,11 +102,15 @@ public class RocketComponentConfig extends JPanel {
private boolean allMassive; // Checks whether all listener components, and this component, are massive
public RocketComponentConfig(OpenRocketDocument document, RocketComponent component, JDialog parent) {
- setLayout(new MigLayout("fill, gap 4!, ins panel", "[]:5[]", "[growprio 5]5![fill, grow, growprio 500]5![growprio 5]"));
+ setLayout(new MigLayout("fill, gap 4!, ins panel, hidemode 3", "[]:5[]", "[growprio 5]5![fill, grow, growprio 500]5![growprio 5]"));
this.document = document;
this.component = component;
- this.parent = parent;
+ if (parent instanceof ComponentConfigDialog) {
+ this.parent = (ComponentConfigDialog) parent;
+ } else {
+ this.parent = null;
+ }
// Check the listeners for the same type and massive status
allSameType = true;
@@ -114,6 +138,7 @@ public class RocketComponentConfig extends JPanel {
textFieldListener = new TextFieldListener();
componentNameField.addActionListener(textFieldListener);
componentNameField.addFocusListener(textFieldListener);
+ componentNameField.addKeyListener(new TextComponentSelectionKeyListener(componentNameField));
//// The component name.
componentNameField.setToolTipText(trans.get("RocketCompCfg.lbl.Componentname.ttip"));
this.add(componentNameField, "growx");
@@ -169,18 +194,71 @@ public class RocketComponentConfig extends JPanel {
updateFields();
}
-
+
+ /**
+ * Add a section to the component configuration dialog that displays information about the component.
+ */
+ private void addComponentInfo(JPanel buttonPanel) {
+ // Don't add the info panel if this is a multi-comp edit
+ List listeners = component.getConfigListeners();
+ if (listeners != null && listeners.size() > 0) {
+ return;
+ }
+
+ final String helpText;
+ final String key = "ComponentInfo." + component.getClass().getSimpleName();
+ if (!trans.checkIfKeyExists(key)) {
+ return;
+ }
+ helpText = "" + trans.get(key) + "";
+
+ // Component info
+ componentInfo = new DescriptionArea(helpText, 5);
+ componentInfo.setTextFont(null);
+ componentInfo.setVisible(false);
+ this.add(componentInfo, "gapleft 10, gapright 10, growx, spanx, wrap");
+
+ // Component info toggle button
+ infoBtn = new IconToggleButton();
+ infoBtn.setToolTipText(trans.get("RocketCompCfg.btn.ComponentInfo.ttip"));
+ infoBtn.setIconScale(1.2f);
+ infoBtn.setSelectedIcon(Icons.HELP_ABOUT);
+ buttonPanel.add(infoBtn, "split 3, gapright para");
+
+ infoBtn.addItemListener(new ItemListener() {
+ @Override
+ public void itemStateChanged(ItemEvent e) {
+ // Note: we will display the help text if the infoButton is not selected, and hide it if it is selected.
+ // This way, the info button is displayed as "enabled" to draw attention to it.
+ componentInfo.setVisible(e.getStateChange() != ItemEvent.SELECTED);
+
+ // Repaint to fit to the new size
+ if (parent != null) {
+ parent.pack();
+ } else {
+ updateUI();
+ }
+ }
+ });
+
+ infoBtn.setSelected(true);
+ }
protected void addButtons(JButton... buttons) {
+ if (componentInfo != null) {
+ this.remove(componentInfo);
+ }
if (buttonPanel != null) {
this.remove(buttonPanel);
}
- buttonPanel = new JPanel(new MigLayout("fillx, ins 5"));
+ buttonPanel = new JPanel(new MigLayout("fill, ins 5, hidemode 3"));
+
+ //// Component info
+ addComponentInfo(buttonPanel);
//// Multi-comp edit label
multiCompEditLabel = new StyledLabel(" ", -1, Style.BOLD);
- //multiCompEditLabel.setFontColor(new Color(0, 0, 239));
multiCompEditLabel.setFontColor(new Color(170, 0, 100));
buttonPanel.add(multiCompEditLabel, "split 2");
@@ -191,21 +269,75 @@ public class RocketComponentConfig extends JPanel {
for (JButton b : buttons) {
buttonPanel.add(b, "right, gap para");
}
-
- //// Close button
- this.closeButton = new SelectColorButton(trans.get("dlg.but.close"));
- closeButton.addActionListener(new ActionListener() {
+
+ //// Cancel button
+ this.cancelButton = new SelectColorButton(trans.get("dlg.but.cancel"));
+ this.cancelButton.setToolTipText(trans.get("RocketCompCfg.btn.Cancel.ttip"));
+ cancelButton.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent arg0) {
+ if (preferences.getBoolean(IGNORE_DISCARD_EDITING_WARNING, false)) {
+ ComponentConfigDialog.clearConfigListeners = false; // Undo action => config listeners of new component will be cleared
+ ComponentConfigDialog.disposeDialog();
+ document.undo();
+ return;
+ }
+ if (!isNewComponent && parent != null && !parent.isModified()) {
+ ComponentConfigDialog.disposeDialog();
+ return;
+ }
+
+ // Yes/No dialog: Are you sure you want to discard your changes?
+ JPanel msg = createCancelOperationContent();
+ int resultYesNo = JOptionPane.showConfirmDialog(RocketComponentConfig.this, msg,
+ trans.get("RocketCompCfg.CancelOperation.title"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE);
+ if (resultYesNo == JOptionPane.YES_OPTION) {
+ ComponentConfigDialog.clearConfigListeners = false; // Undo action => config listeners of new component will be cleared
+ ComponentConfigDialog.disposeDialog();
+ document.undo();
+ }
+ }
+ });
+ buttonPanel.add(cancelButton, "split 2, right, gapleft 30lp");
+
+ //// Ok button
+ this.okButton = new SelectColorButton(trans.get("dlg.but.ok"));
+ this.okButton.setToolTipText(trans.get("RocketCompCfg.btn.OK.ttip"));
+ okButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent arg0) {
ComponentConfigDialog.disposeDialog();
}
});
- buttonPanel.add(closeButton, "right, gap 30lp");
-
+ buttonPanel.add(okButton);
+
updateFields();
this.add(buttonPanel, "newline, spanx, growx");
}
+
+ private JPanel createCancelOperationContent() {
+ JPanel panel = new JPanel(new MigLayout());
+ String msg = isNewComponent ? trans.get("RocketCompCfg.CancelOperation.msg.undoAdd") :
+ trans.get("RocketCompCfg.CancelOperation.msg.discardChanges");
+ JLabel msgLabel = new JLabel(msg);
+ JCheckBox dontAskAgain = new JCheckBox(trans.get("RocketCompCfg.CancelOperation.checkbox.dontAskAgain"));
+ dontAskAgain.setSelected(false);
+ dontAskAgain.addItemListener(new ItemListener() {
+ @Override
+ public void itemStateChanged(ItemEvent e) {
+ if (e.getStateChange() == ItemEvent.SELECTED) {
+ preferences.putBoolean(IGNORE_DISCARD_EDITING_WARNING, true);
+ }
+ // Unselected state should be impossible
+ }
+ });
+
+ panel.add(msgLabel, "left, wrap");
+ panel.add(dontAskAgain, "left, gaptop para");
+
+ return panel;
+ }
/**
@@ -251,6 +383,11 @@ public class RocketComponentConfig extends JPanel {
// Multi-comp edit label
if (listeners != null && listeners.size() > 0) {
+ if (infoBtn != null) {
+ componentInfo.setVisible(false);
+ infoBtn.setVisible(false);
+ }
+
multiCompEditLabel.setText(trans.get("ComponentCfgDlg.MultiComponentEdit"));
StringBuilder components = new StringBuilder(trans.get("ComponentCfgDlg.MultiComponentEdit.ttip"));
@@ -264,6 +401,11 @@ public class RocketComponentConfig extends JPanel {
}
multiCompEditLabel.setToolTipText(components.toString());
} else {
+ if (infoBtn != null) {
+ componentInfo.setVisible(false);
+ infoBtn.setSelected(true);
+ infoBtn.setVisible(true);
+ }
multiCompEditLabel.setText("");
}
}
@@ -603,6 +745,7 @@ public class RocketComponentConfig extends JPanel {
commentTextArea.setEditable(true);
GUIUtil.setTabToFocusing(commentTextArea);
commentTextArea.addFocusListener(textFieldListener);
+ commentTextArea.addKeyListener(new TextComponentSelectionKeyListener(commentTextArea));
panel.add(new JScrollPane(commentTextArea), "grow");
order.add(commentTextArea);
@@ -613,157 +756,178 @@ public class RocketComponentConfig extends JPanel {
protected JPanel shoulderTab() {
JPanel panel = new JPanel(new MigLayout("fill"));
- JPanel sub;
- DoubleModel m, m2;
DoubleModel m0 = new DoubleModel(0);
- BooleanModel bm;
- JCheckBox check;
- JSpinner spin;
-
//// Fore shoulder, not for NoseCone
-
if (!(component instanceof NoseCone)) {
- sub = new JPanel(new MigLayout("gap rel unrel", "[][65lp::][30lp::]", ""));
-
- //// Fore shoulder
- sub.setBorder(BorderFactory.createTitledBorder(trans.get("RocketCompCfg.border.Foreshoulder")));
-
-
- //// Radius
- //// Diameter:
- sub.add(new JLabel(trans.get("RocketCompCfg.lbl.Diameter")));
-
- m = new DoubleModel(component, "ForeShoulderRadius", 2, UnitGroup.UNITS_LENGTH, 0);
- m2 = new DoubleModel(component, "ForeRadius", 2, UnitGroup.UNITS_LENGTH);
-
- spin = new JSpinner(m.getSpinnerModel());
- spin.setEditor(new SpinnerEditor(spin));
- sub.add(spin, "growx");
- order.add(((SpinnerEditor) spin.getEditor()).getTextField());
-
- sub.add(new UnitSelector(m), "growx");
- sub.add(new BasicSlider(m.getSliderModel(m0, m2)), "w 100lp, wrap");
-
-
- //// Length:
- sub.add(new JLabel(trans.get("RocketCompCfg.lbl.Length")));
-
- m = new DoubleModel(component, "ForeShoulderLength", UnitGroup.UNITS_LENGTH, 0);
-
- spin = new JSpinner(m.getSpinnerModel());
- spin.setEditor(new SpinnerEditor(spin));
- sub.add(spin, "growx");
- order.add(((SpinnerEditor) spin.getEditor()).getTextField());
-
- sub.add(new UnitSelector(m), "growx");
- sub.add(new BasicSlider(m.getSliderModel(0, 0.02, 0.2)), "w 100lp, wrap");
-
-
- //// Thickness:
- sub.add(new JLabel(trans.get("RocketCompCfg.lbl.Thickness")));
-
- m = new DoubleModel(component, "ForeShoulderThickness", UnitGroup.UNITS_LENGTH, 0);
- m2 = new DoubleModel(component, "ForeShoulderRadius", UnitGroup.UNITS_LENGTH);
-
- spin = new JSpinner(m.getSpinnerModel());
- spin.setEditor(new SpinnerEditor(spin));
- sub.add(spin, "growx");
- order.add(((SpinnerEditor) spin.getEditor()).getTextField());
-
- sub.add(new UnitSelector(m), "growx");
- sub.add(new BasicSlider(m.getSliderModel(m0, m2)), "w 100lp, wrap");
-
-
- //// Capped
- bm = new BooleanModel(component, "ForeShoulderCapped");
- check = new JCheckBox(bm);
- //// End capped
- check.setText(trans.get("RocketCompCfg.checkbox.Endcapped"));
- check.setToolTipText(trans.get("RocketCompCfg.checkbox.Endcapped.ttip"));
- sub.add(check, "spanx");
- order.add(check);
-
-
- panel.add(sub);
+ addForeShoulderSection(panel, m0);
}
-
-
+
//// Aft shoulder
+ addAftShoulderSection(panel, m0);
+
+ return panel;
+ }
+
+ private void addForeShoulderSection(JPanel panel, DoubleModel m0) {
+ DoubleModel m;
+ JCheckBox check;
+ JPanel sub;
+ DoubleModel m2;
+ JSpinner spin;
+ BooleanModel bm;
sub = new JPanel(new MigLayout("gap rel unrel", "[][65lp::][30lp::]", ""));
-
- if (component instanceof NoseCone)
- //// Nose cone shoulder
- sub.setBorder(BorderFactory.createTitledBorder(trans.get("RocketCompCfg.title.Noseconeshoulder")));
- else
- //// Aft shoulder
- sub.setBorder(BorderFactory.createTitledBorder(trans.get("RocketCompCfg.title.Aftshoulder")));
-
-
+
+ //// Fore shoulder
+ sub.setBorder(BorderFactory.createTitledBorder(trans.get("RocketCompCfg.border.Foreshoulder")));
+
+
//// Radius
//// Diameter:
sub.add(new JLabel(trans.get("RocketCompCfg.lbl.Diameter")));
-
- m = new DoubleModel(component, "AftShoulderRadius", 2, UnitGroup.UNITS_LENGTH, 0);
- m2 = new DoubleModel(component, "AftRadius", 2, UnitGroup.UNITS_LENGTH);
-
+
+ m = new DoubleModel(component, "ForeShoulderRadius", 2, UnitGroup.UNITS_LENGTH, 0);
+ m2 = new DoubleModel(component, "ForeRadius", 2, UnitGroup.UNITS_LENGTH);
+
spin = new JSpinner(m.getSpinnerModel());
spin.setEditor(new SpinnerEditor(spin));
sub.add(spin, "growx");
order.add(((SpinnerEditor) spin.getEditor()).getTextField());
-
+
sub.add(new UnitSelector(m), "growx");
sub.add(new BasicSlider(m.getSliderModel(m0, m2)), "w 100lp, wrap");
-
-
+
+
//// Length:
sub.add(new JLabel(trans.get("RocketCompCfg.lbl.Length")));
-
- m = new DoubleModel(component, "AftShoulderLength", UnitGroup.UNITS_LENGTH, 0);
-
+
+ m = new DoubleModel(component, "ForeShoulderLength", UnitGroup.UNITS_LENGTH, 0);
+
spin = new JSpinner(m.getSpinnerModel());
spin.setEditor(new SpinnerEditor(spin));
sub.add(spin, "growx");
order.add(((SpinnerEditor) spin.getEditor()).getTextField());
-
+
sub.add(new UnitSelector(m), "growx");
sub.add(new BasicSlider(m.getSliderModel(0, 0.02, 0.2)), "w 100lp, wrap");
-
-
+
+
//// Thickness:
sub.add(new JLabel(trans.get("RocketCompCfg.lbl.Thickness")));
-
- m = new DoubleModel(component, "AftShoulderThickness", UnitGroup.UNITS_LENGTH, 0);
- m2 = new DoubleModel(component, "AftShoulderRadius", UnitGroup.UNITS_LENGTH);
-
+
+ m = new DoubleModel(component, "ForeShoulderThickness", UnitGroup.UNITS_LENGTH, 0);
+ m2 = new DoubleModel(component, "ForeShoulderRadius", UnitGroup.UNITS_LENGTH);
+
spin = new JSpinner(m.getSpinnerModel());
spin.setEditor(new SpinnerEditor(spin));
sub.add(spin, "growx");
order.add(((SpinnerEditor) spin.getEditor()).getTextField());
-
+
sub.add(new UnitSelector(m), "growx");
sub.add(new BasicSlider(m.getSliderModel(m0, m2)), "w 100lp, wrap");
-
-
+
+
//// Capped
- bm = new BooleanModel(component, "AftShoulderCapped");
+ bm = new BooleanModel(component, "ForeShoulderCapped");
check = new JCheckBox(bm);
//// End capped
check.setText(trans.get("RocketCompCfg.checkbox.Endcapped"));
check.setToolTipText(trans.get("RocketCompCfg.checkbox.Endcapped.ttip"));
sub.add(check, "spanx");
order.add(check);
-
-
+
panel.add(sub);
-
-
- return panel;
}
-
-
-
-
+
+ private void addAftShoulderSection(JPanel panel, DoubleModel m0) {
+ JSpinner spin;
+ JCheckBox check;
+ DoubleModel m;
+ DoubleModel m2;
+ JPanel sub;
+ BooleanModel bm;
+ sub = new JPanel(new MigLayout("gap rel unrel", "[][65lp::][30lp::]", ""));
+
+ String valueNameShoulder = "AftShoulder";
+ String valueNameRadius = "AftRadius";
+
+ if (component instanceof NoseCone) {
+ // Nose cones have a special shoulder method to cope with flipped nose cones
+ valueNameShoulder = "Shoulder";
+ valueNameRadius = "BaseRadius";
+ //// Nose cone shoulder
+ sub.setBorder(BorderFactory.createTitledBorder(trans.get("RocketCompCfg.title.Noseconeshoulder")));
+ } else {
+ //// Aft shoulder
+ sub.setBorder(BorderFactory.createTitledBorder(trans.get("RocketCompCfg.title.Aftshoulder")));
+ }
+
+
+ //// Radius
+ //// Diameter:
+ sub.add(new JLabel(trans.get("RocketCompCfg.lbl.Diameter")));
+
+ m = new DoubleModel(component, valueNameShoulder+"Radius", 2, UnitGroup.UNITS_LENGTH, 0);
+ m2 = new DoubleModel(component, valueNameRadius, 2, UnitGroup.UNITS_LENGTH);
+
+ spin = new JSpinner(m.getSpinnerModel());
+ spin.setEditor(new SpinnerEditor(spin));
+ sub.add(spin, "growx");
+ order.add(((SpinnerEditor) spin.getEditor()).getTextField());
+
+ sub.add(new UnitSelector(m), "growx");
+ sub.add(new BasicSlider(m.getSliderModel(m0, m2)), "w 100lp, wrap");
+
+
+ //// Length:
+ sub.add(new JLabel(trans.get("RocketCompCfg.lbl.Length")));
+
+ m = new DoubleModel(component, valueNameShoulder+"Length", UnitGroup.UNITS_LENGTH, 0);
+
+ spin = new JSpinner(m.getSpinnerModel());
+ spin.setEditor(new SpinnerEditor(spin));
+ sub.add(spin, "growx");
+ order.add(((SpinnerEditor) spin.getEditor()).getTextField());
+
+ sub.add(new UnitSelector(m), "growx");
+ sub.add(new BasicSlider(m.getSliderModel(0, 0.02, 0.2)), "w 100lp, wrap");
+
+
+ //// Thickness:
+ sub.add(new JLabel(trans.get("RocketCompCfg.lbl.Thickness")));
+
+ m = new DoubleModel(component, valueNameShoulder+"Thickness", UnitGroup.UNITS_LENGTH, 0);
+ m2 = new DoubleModel(component, valueNameShoulder+"Radius", UnitGroup.UNITS_LENGTH);
+
+ spin = new JSpinner(m.getSpinnerModel());
+ spin.setEditor(new SpinnerEditor(spin));
+ sub.add(spin, "growx");
+ order.add(((SpinnerEditor) spin.getEditor()).getTextField());
+
+ sub.add(new UnitSelector(m), "growx");
+ sub.add(new BasicSlider(m.getSliderModel(m0, m2)), "w 100lp, wrap");
+
+
+ //// Capped
+ bm = new BooleanModel(component, valueNameShoulder+"Capped");
+ check = new JCheckBox(bm);
+ //// End capped
+ check.setText(trans.get("RocketCompCfg.checkbox.Endcapped"));
+ check.setToolTipText(trans.get("RocketCompCfg.checkbox.Endcapped.ttip"));
+ sub.add(check, "spanx");
+ order.add(check);
+
+ panel.add(sub);
+ }
+
+ /**
+ * Sets whether this dialog is editing a new component (true), or an existing one (false).
+ * @param newComponent true if this dialog is editing a new component.
+ */
+ public void setNewComponent(boolean newComponent) {
+ isNewComponent = newComponent;
+ }
+
/*
* Private inner class to handle events in componentNameField.
*/
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/RocketConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/RocketConfig.java
index a740bcec8..7ad61a171 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/RocketConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/RocketConfig.java
@@ -35,7 +35,7 @@ public class RocketConfig extends RocketComponentConfig {
rocket = (Rocket) c;
this.removeAll();
- setLayout(new MigLayout("fill"));
+ setLayout(new MigLayout("fill, hideMode 3"));
//// Design name:
this.add(new JLabel(trans.get("RocketCfg.lbl.Designname")), "top, pad 4lp, gapright 10lp");
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/ShockCordConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/ShockCordConfig.java
index 40222576f..752d7995e 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/ShockCordConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/ShockCordConfig.java
@@ -142,7 +142,9 @@ public class ShockCordConfig extends RocketComponentConfig {
tabbedPane.setSelectedIndex(0);
// Apply the custom focus travel policy to this config dialog
- order.add(closeButton); // Make sure the close button is the last component
+ //// Make sure the cancel & ok button is the last component
+ order.add(cancelButton);
+ order.add(okButton);
CustomFocusTraversalPolicy policy = new CustomFocusTraversalPolicy(order);
parent.setFocusTraversalPolicy(policy);
}
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/SleeveConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/SleeveConfig.java
index 4545660c9..d2261dfd6 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/SleeveConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/SleeveConfig.java
@@ -31,7 +31,9 @@ public class SleeveConfig extends RingComponentConfig {
tabbedPane.setSelectedIndex(0);
// Apply the custom focus travel policy to this panel
- order.add(closeButton); // Make sure the close button is the last component
+ //// Make sure the cancel & ok button is the last component
+ order.add(cancelButton);
+ order.add(okButton);
CustomFocusTraversalPolicy policy = new CustomFocusTraversalPolicy(order);
parent.setFocusTraversalPolicy(policy);
}
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java
index e05cc0f6f..d3519c75d 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java
@@ -277,7 +277,9 @@ public class StreamerConfig extends RecoveryDeviceConfig {
tabbedPane.setSelectedIndex(0);
// Apply the custom focus travel policy to this config dialog
- order.add(closeButton); // Make sure the close button is the last component
+ //// Make sure the cancel & ok button is the last component
+ order.add(cancelButton);
+ order.add(okButton);
CustomFocusTraversalPolicy policy = new CustomFocusTraversalPolicy(order);
parent.setFocusTraversalPolicy(policy);
}
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/ThicknessRingComponentConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/ThicknessRingComponentConfig.java
index b204435a3..66ce8703e 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/ThicknessRingComponentConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/ThicknessRingComponentConfig.java
@@ -33,7 +33,9 @@ public class ThicknessRingComponentConfig extends RingComponentConfig {
tabbedPane.setSelectedIndex(0);
// Apply the custom focus travel policy to this panel
- order.add(closeButton); // Make sure the close button is the last component
+ //// Make sure the cancel & ok button is the last component
+ order.add(cancelButton);
+ order.add(okButton);
CustomFocusTraversalPolicy policy = new CustomFocusTraversalPolicy(order);
parent.setFocusTraversalPolicy(policy);
}
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/TransitionConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/TransitionConfig.java
index 6487e5059..f9050d396 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/TransitionConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/TransitionConfig.java
@@ -24,7 +24,6 @@ import net.sf.openrocket.gui.components.UnitSelector;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.material.Material;
import net.sf.openrocket.rocketcomponent.RocketComponent;
-import net.sf.openrocket.rocketcomponent.SymmetricComponent;
import net.sf.openrocket.rocketcomponent.Transition;
import net.sf.openrocket.startup.Application;
import net.sf.openrocket.unit.UnitGroup;
@@ -206,7 +205,9 @@ public class TransitionConfig extends RocketComponentConfig {
tabbedPane.setSelectedIndex(0);
// Apply the custom focus travel policy to this config dialog
- order.add(closeButton); // Make sure the close button is the last component
+ //// Make sure the cancel & ok button is the last component
+ order.add(cancelButton);
+ order.add(okButton);
CustomFocusTraversalPolicy policy = new CustomFocusTraversalPolicy(order);
parent.setFocusTraversalPolicy(policy);
}
@@ -228,18 +229,16 @@ public class TransitionConfig extends RocketComponentConfig {
private void updateCheckboxAutoAftRadius() {
if (component == null || checkAutoAftRadius == null) return;
- // Disable check button if there is no component to get the diameter from
- SymmetricComponent nextComp = ((Transition) component).getNextSymmetricComponent();
- if (nextComp == null) {
+ Transition transition = (Transition) component;
+ boolean enabled = transition.canUseNextCompAutomatic();
+ if (enabled) { // Can use auto radius
+ checkAutoAftRadius.setEnabled(true);
+ checkAutoAftRadius.setToolTipText(trans.get("TransitionCfg.checkbox.ttip.Automatic"));
+ } else if (transition.getNextSymmetricComponent() == null) { // No next component to take the auto radius from
checkAutoAftRadius.setEnabled(false);
((Transition) component).setAftRadiusAutomatic(false);
checkAutoAftRadius.setToolTipText(trans.get("TransitionCfg.checkbox.ttip.Automatic_noReferenceComponent"));
- return;
- }
- if (!nextComp.usesPreviousCompAutomatic()) {
- checkAutoAftRadius.setEnabled(true);
- checkAutoAftRadius.setToolTipText(trans.get("TransitionCfg.checkbox.ttip.Automatic"));
- } else {
+ } else { // Next component already has its auto radius checked
checkAutoAftRadius.setEnabled(false);
((Transition) component).setAftRadiusAutomatic(false);
checkAutoAftRadius.setToolTipText(trans.get("TransitionCfg.checkbox.ttip.Automatic_alreadyAuto"));
@@ -254,18 +253,16 @@ public class TransitionConfig extends RocketComponentConfig {
private void updateCheckboxAutoForeRadius() {
if (component == null || checkAutoForeRadius == null) return;
- // Disable check button if there is no component to get the diameter from
- SymmetricComponent prevComp = ((Transition) component).getPreviousSymmetricComponent();
- if (prevComp == null) {
+ Transition transition = (Transition) component;
+ boolean enabled = transition.canUsePreviousCompAutomatic();
+ if (enabled) { // Can use auto radius
+ checkAutoForeRadius.setEnabled(true);
+ checkAutoForeRadius.setToolTipText(trans.get("TransitionCfg.checkbox.ttip.Automatic"));
+ } else if (transition.getPreviousSymmetricComponent() == null) { // No next component to take the auto radius from
checkAutoForeRadius.setEnabled(false);
((Transition) component).setForeRadiusAutomatic(false);
checkAutoForeRadius.setToolTipText(trans.get("TransitionCfg.checkbox.ttip.Automatic_noReferenceComponent"));
- return;
- }
- if (!prevComp.usesNextCompAutomatic()) {
- checkAutoForeRadius.setEnabled(true);
- checkAutoForeRadius.setToolTipText(trans.get("TransitionCfg.checkbox.ttip.Automatic"));
- } else {
+ } else { // Next component already has its auto radius checked
checkAutoForeRadius.setEnabled(false);
((Transition) component).setForeRadiusAutomatic(false);
checkAutoForeRadius.setToolTipText(trans.get("TransitionCfg.checkbox.ttip.Automatic_alreadyAuto"));
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/TrapezoidFinSetConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/TrapezoidFinSetConfig.java
index df54e7f2f..0744aa169 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/TrapezoidFinSetConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/TrapezoidFinSetConfig.java
@@ -252,7 +252,9 @@ public class TrapezoidFinSetConfig extends FinSetConfig {
addFinSetButtons();
// Apply the custom focus travel policy to this config dialog
- order.add(closeButton); // Make sure the close button is the last component
+ //// Make sure the cancel & ok button is the last component
+ order.add(cancelButton);
+ order.add(okButton);
CustomFocusTraversalPolicy policy = new CustomFocusTraversalPolicy(order);
parent.setFocusTraversalPolicy(policy);
}
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/TubeFinSetConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/TubeFinSetConfig.java
index 9ce17a3a9..e0ea77134 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/TubeFinSetConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/TubeFinSetConfig.java
@@ -179,7 +179,9 @@ public class TubeFinSetConfig extends RocketComponentConfig {
tabbedPane.setSelectedIndex(0);
// Apply the custom focus travel policy to this config dialog
- order.add(closeButton); // Make sure the close button is the last component
+ //// Make sure the cancel & ok button is the last component
+ order.add(cancelButton);
+ order.add(okButton);
CustomFocusTraversalPolicy policy = new CustomFocusTraversalPolicy(order);
parent.setFocusTraversalPolicy(policy);
}
diff --git a/swing/src/net/sf/openrocket/gui/customexpression/VariableTableModel.java b/swing/src/net/sf/openrocket/gui/customexpression/VariableTableModel.java
index 490b8e68f..21147e703 100644
--- a/swing/src/net/sf/openrocket/gui/customexpression/VariableTableModel.java
+++ b/swing/src/net/sf/openrocket/gui/customexpression/VariableTableModel.java
@@ -31,7 +31,7 @@ public class VariableTableModel extends AbstractTableModel {
//Collections.addAll(types, FlightDataType.ALL_TYPES);
//for (CustomExpression expression : doc.getCustomExpressions()){
- // types.add(expression.getType());
+ // types.add(expression.getCurrentViewType());
//}
}
diff --git a/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java
index a6683e2c4..e7d713080 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java
@@ -94,7 +94,7 @@ public class AboutDialog extends JDialog {
// OpenRocket logo
- panel.add(new JLabel(Icons.loadImageIcon("pix/icon/icon-about.png", "OpenRocket")), "top");
+ panel.add(new JLabel(Icons.loadImageIcon("pix/icon/icon-128.png", "OpenRocket")), "top");
// OpenRocket version info + copyright
diff --git a/swing/src/net/sf/openrocket/gui/dialogs/BugReportDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/BugReportDialog.java
index 4683a6a15..763f873b0 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/BugReportDialog.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/BugReportDialog.java
@@ -27,6 +27,7 @@ import net.miginfocom.swing.MigLayout;
import net.sf.openrocket.gui.components.StyledLabel;
import net.sf.openrocket.gui.components.URLLabel;
import net.sf.openrocket.gui.util.GUIUtil;
+import net.sf.openrocket.gui.util.SwingPreferences;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.logging.LogLevelBufferLogger;
import net.sf.openrocket.logging.LogLine;
@@ -44,6 +45,7 @@ public class BugReportDialog extends JDialog {
private static final String REPORT_EMAIL_URL = "mailto:" + REPORT_EMAIL;
private static final Translator trans = Application.getTranslator();
+ private static final SwingPreferences preferences = (SwingPreferences) Application.getPreferences();
public BugReportDialog(Window parent, String labelText, final String message, final boolean sendIfUnchanged) {
@@ -108,31 +110,10 @@ public class BugReportDialog extends JDialog {
* @param parent the parent window (may be null).
*/
public static void showBugReportDialog(Window parent) {
-
StringBuilder sb = new StringBuilder();
-
- sb.append("---------- Bug report ----------\n");
- sb.append('\n');
- sb.append("Include detailed steps on how to trigger the bug:\n");
- sb.append("(You can edit text directly in this window)\n");
- sb.append('\n');
- sb.append("1. \n");
- sb.append("2. \n");
- sb.append("3. \n");
- sb.append('\n');
-
- sb.append("What does the software do and what in your opinion should it do in the " +
- "case described above:\n");
- sb.append('\n');
- sb.append('\n');
- sb.append('\n');
-
- sb.append("Include your email address (optional; it helps if we can " +
- "contact you in case we need additional information):\n");
- sb.append('\n');
- sb.append('\n');
- sb.append('\n');
-
+
+ // ---------- Bug report ----------
+ addBugReportInformation(sb);
sb.append("(Do not modify anything below this line.)\n");
sb.append("---------- System information ----------\n");
@@ -157,28 +138,9 @@ public class BugReportDialog extends JDialog {
*/
public static void showExceptionDialog(Window parent, Thread t, Throwable e) {
StringBuilder sb = new StringBuilder();
-
- sb.append("---------- Bug report ----------\n");
- sb.append('\n');
- sb.append("Please include a description about what actions you were " +
- "performing when the exception occurred:\n");
- sb.append("(You can edit text directly in this window)\n");
- sb.append('\n');
- sb.append("1. \n");
- sb.append("2. \n");
- sb.append("3. \n");
- sb.append("\n");
- sb.append("If possible, please send us the .ork file that caused the bug.\n");
- sb.append('\n');
-
-
- sb.append("Include your email address (optional; it helps if we can " +
- "contact you in case we need additional information):\n");
- sb.append('\n');
- sb.append('\n');
- sb.append('\n');
- sb.append('\n');
+ // ---------- Bug report ----------
+ addBugReportInformation(sb);
sb.append("(Do not modify anything below this line.)\n");
sb.append("---------- Exception stack trace ----------\n");
@@ -211,12 +173,37 @@ public class BugReportDialog extends JDialog {
new BugReportDialog(parent, trans.get("bugreport.reportDialog.txt2"), sb.toString(), true);
reportDialog.setVisible(true);
}
+
+ private static void addBugReportInformation(StringBuilder sb) {
+ sb.append("---------- Bug report ----------\n");
+ sb.append('\n');
+ sb.append("Please include a description about what actions you were " +
+ "performing when the exception occurred:\n");
+ sb.append("(You can edit text directly in this window)\n");
+ sb.append('\n');
+ sb.append("1. \n");
+ sb.append("2. \n");
+ sb.append("3. \n");
+
+ sb.append("\n");
+ sb.append("If possible, please send us the .ork file that caused the bug.\n");
+ sb.append('\n');
+
+
+ sb.append("Include your email address (optional; it helps if we can " +
+ "contact you in case we need additional information):\n");
+ sb.append('\n');
+ sb.append('\n');
+ sb.append('\n');
+ sb.append('\n');
+ }
private static void addSystemInformation(StringBuilder sb) {
StringBuilder sbTemp = new StringBuilder();
sbTemp.append("OpenRocket version: " + BuildProperties.getVersion() + "\n");
sbTemp.append("OpenRocket source: " + BuildProperties.getBuildSource() + "\n");
sbTemp.append("OpenRocket location: " + JarUtil.getCurrentJarFile() + "\n");
+ sbTemp.append("User-defined thrust curves location: " + preferences.getUserThrustCurveFilesAsString() + "\n");
sbTemp.append("JOGL version: " + JoglVersion.getInstance().getImplementationVersion() + "\n");
sbTemp.append("Current default locale: " + Locale.getDefault() + "\n");
sbTemp.append("System properties:\n");
diff --git a/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java
index b0b120c82..d05c0b039 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/ComponentAnalysisDialog.java
@@ -571,7 +571,12 @@ public class ComponentAnalysisDialog extends JDialog implements StateChangeListe
}
if (forces.getCP() != null) {
- row.cpx = forces.getCP().x;
+ if ((comp instanceof Rocket) &&
+ (forces.getCP().weight < MathUtil.EPSILON)) {
+ row.cpx = Double.NaN;
+ } else {
+ row.cpx = forces.getCP().x;
+ }
row.cna = forces.getCNa();
}
diff --git a/swing/src/net/sf/openrocket/gui/dialogs/LicenseDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/LicenseDialog.java
index 31fc47290..831ab6d42 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/LicenseDialog.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/LicenseDialog.java
@@ -30,7 +30,7 @@ public class LicenseDialog extends JDialog {
JPanel panel = new JPanel(new MigLayout("fill"));
// OpenRocket logo
- panel.add(new JLabel(Icons.loadImageIcon("pix/icon/icon-about.png", "OpenRocket")), "top");
+ panel.add(new JLabel(Icons.loadImageIcon("pix/icon/icon-128.png", "OpenRocket")), "top");
panel.add(new StyledLabel("Software Licenses", 10), "ax 50%, pushx, wrap para");
diff --git a/swing/src/net/sf/openrocket/gui/dialogs/ScaleDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/ScaleDialog.java
index 0fd20a25d..111f16378 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/ScaleDialog.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/ScaleDialog.java
@@ -83,7 +83,7 @@ public class ScaleDialog extends JDialog {
// SymmetricComponent
addScaler(SymmetricComponent.class, "Thickness", "isFilled", SCALERS_NO_OFFSET);
- // Transition + Nose cone
+ // Transition
addScaler(Transition.class, "ForeRadius", "isForeRadiusAutomatic", SCALERS_NO_OFFSET);
addScaler(Transition.class, "AftRadius", "isAftRadiusAutomatic", SCALERS_NO_OFFSET);
addScaler(Transition.class, "ForeShoulderRadius", SCALERS_NO_OFFSET);
@@ -92,6 +92,12 @@ public class ScaleDialog extends JDialog {
addScaler(Transition.class, "AftShoulderRadius", SCALERS_NO_OFFSET);
addScaler(Transition.class, "AftShoulderThickness", SCALERS_NO_OFFSET);
addScaler(Transition.class, "AftShoulderLength", SCALERS_NO_OFFSET);
+
+ // Nose cone
+ addScaler(NoseCone.class, "BaseRadius", "isBaseRadiusAutomatic", SCALERS_NO_OFFSET);
+ addScaler(NoseCone.class, "ShoulderRadius", SCALERS_NO_OFFSET);
+ addScaler(NoseCone.class, "ShoulderThickness", SCALERS_NO_OFFSET);
+ addScaler(NoseCone.class, "ShoulderLength", SCALERS_NO_OFFSET);
// Body tube
addScaler(BodyTube.class, "OuterRadius", "isOuterRadiusAutomatic", SCALERS_NO_OFFSET);
@@ -559,6 +565,10 @@ public class ScaleDialog extends JDialog {
}
Collections.reverse(classes); // Always do the super component scales first (can cause problems otherwise in the scale order)
for (Class cl : classes) {
+ // Don't use the super-class methods of transitions for nose cones
+ if (cl == Transition.class && component instanceof NoseCone) {
+ continue;
+ }
List list = SCALERS_NO_OFFSET.get(cl);
if (list != null && list.size() > 0) {
for (Scaler s : list) {
diff --git a/swing/src/net/sf/openrocket/gui/dialogs/UpdateInfoDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/UpdateInfoDialog.java
index 50b0ee066..d6eda56df 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/UpdateInfoDialog.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/UpdateInfoDialog.java
@@ -58,7 +58,7 @@ public class UpdateInfoDialog extends JDialog {
JPanel panel = new JPanel(new MigLayout("insets n n 8px n, fill"));
// OpenRocket logo on the left
- panel.add(new JLabel(Icons.getScaledIcon(Icons.loadImageIcon("pix/icon/icon-about.png", "OpenRocket"), 0.6)),
+ panel.add(new JLabel(Icons.loadImageIcon("pix/icon/icon-128.png", "OpenRocket")),
"spany, top, gapright 20px, cell 0 0");
// OpenRocket version available!
diff --git a/swing/src/net/sf/openrocket/gui/dialogs/WelcomeDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/WelcomeDialog.java
index db19183c1..4e4119188 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/WelcomeDialog.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/WelcomeDialog.java
@@ -43,7 +43,7 @@ public class WelcomeDialog extends JDialog {
JPanel panel = new JPanel(new MigLayout("insets n n 8px n, fill"));
// OpenRocket logo on the left
- panel.add(new JLabel(Icons.getScaledIcon(Icons.loadImageIcon("pix/icon/icon-about.png", "OpenRocket"), 0.6)),
+ panel.add(new JLabel(Icons.loadImageIcon("pix/icon/icon-128.png", "OpenRocket")),
"spany, top, gapright 20px, cell 0 0");
// Thank you for downloading!
diff --git a/swing/src/net/sf/openrocket/gui/dialogs/preferences/GeneralPreferencesPanel.java b/swing/src/net/sf/openrocket/gui/dialogs/preferences/GeneralPreferencesPanel.java
index 9631603a1..de73270f9 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/preferences/GeneralPreferencesPanel.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/preferences/GeneralPreferencesPanel.java
@@ -86,14 +86,7 @@ public class GeneralPreferencesPanel extends PreferencesPanel {
//// User-defined thrust curves:
this.add(new JLabel(trans.get("pref.dlg.lbl.User-definedthrust")), "spanx, wrap");
final JTextField field = new JTextField();
- List files = preferences.getUserThrustCurveFiles();
- String str = "";
- for (File file : files) {
- if (str.length() > 0) {
- str += ";";
- }
- str += file.getAbsolutePath();
- }
+ String str = preferences.getUserThrustCurveFilesAsString();
field.setText(str);
field.getDocument().addDocumentListener(new DocumentListener() {
@Override
diff --git a/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java
index 9c0854d24..bdc5230a1 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java
@@ -35,6 +35,7 @@ import net.sf.openrocket.gui.util.SwingPreferences;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.preset.ComponentPreset;
import net.sf.openrocket.preset.TypedKey;
+import net.sf.openrocket.rocketcomponent.NoseCone;
import net.sf.openrocket.rocketcomponent.RocketComponent;
import net.sf.openrocket.rocketcomponent.SymmetricComponent;
import net.sf.openrocket.startup.Application;
@@ -257,6 +258,7 @@ public class ComponentPresetChooserDialog extends JDialog {
* Add filter by fore diameter
*/
foreDiameterFilterCheckBox = new JCheckBox(trans.get("ComponentPresetChooserDialog.checkbox.filterForeDiameter"));
+ foreDiameterFilterCheckBox.setToolTipText(trans.get("ComponentPresetChooserDialog.checkbox.filterForeDiameter.ttip"));
final SymmetricComponent prevSym = curSym.getPreviousSymmetricComponent();
if (prevSym != null && foreDiameterColumnIndex >= 0) {
foreDiameterFilterCheckBox.setSelected(preferences.isMatchForeDiameter());
@@ -274,8 +276,16 @@ public class ComponentPresetChooserDialog extends JDialog {
/*
* Add filter by aft diameter
*/
- aftDiameterFilterCheckBox = new JCheckBox(trans.get("ComponentPresetChooserDialog.checkbox.filterAftDiameter"));
- final SymmetricComponent nextSym = curSym.getNextSymmetricComponent();
+ final SymmetricComponent nextSym;
+ if (curSym instanceof NoseCone && ((NoseCone) curSym).isFlipped()) {
+ aftDiameterFilterCheckBox = new JCheckBox(trans.get("ComponentPresetChooserDialog.checkbox.filterForeDiameter"));
+ aftDiameterFilterCheckBox.setToolTipText(trans.get("ComponentPresetChooserDialog.checkbox.filterForeDiameter.ttip"));
+ nextSym = curSym.getPreviousSymmetricComponent();
+ } else {
+ aftDiameterFilterCheckBox = new JCheckBox(trans.get("ComponentPresetChooserDialog.checkbox.filterAftDiameter"));
+ aftDiameterFilterCheckBox.setToolTipText(trans.get("ComponentPresetChooserDialog.checkbox.filterAftDiameter.ttip"));
+ nextSym = curSym.getNextSymmetricComponent();
+ }
if (nextSym != null && aftDiameterColumnIndex >= 0) {
aftDiameterFilterCheckBox.setSelected(preferences.isMatchAftDiameter());
aftDiameterFilter = new ComponentPresetRowFilter(nextSym.getForeRadius() * 2.0, aftDiameterColumnIndex);
diff --git a/swing/src/net/sf/openrocket/gui/figureelements/RocketInfo.java b/swing/src/net/sf/openrocket/gui/figureelements/RocketInfo.java
index 763f759c8..bd0e37bd0 100644
--- a/swing/src/net/sf/openrocket/gui/figureelements/RocketInfo.java
+++ b/swing/src/net/sf/openrocket/gui/figureelements/RocketInfo.java
@@ -348,7 +348,7 @@ public class RocketInfo implements FigureElement {
float y = y2 - line * warnings.size();
- g2.setColor(new Color(255,0,0,130));
+ g2.setColor(Color.RED);
for (GlyphVector v: texts) {
Rectangle2D rect = v.getVisualBounds();
diff --git a/swing/src/net/sf/openrocket/gui/main/DesignPanel.java b/swing/src/net/sf/openrocket/gui/main/DesignPanel.java
index dcb300261..b30a605ce 100644
--- a/swing/src/net/sf/openrocket/gui/main/DesignPanel.java
+++ b/swing/src/net/sf/openrocket/gui/main/DesignPanel.java
@@ -105,6 +105,7 @@ public class DesignPanel extends JSplitPane {
// Double-click
if ((e.getButton() == MouseEvent.BUTTON1) && (e.getClickCount() == 2) && !ComponentConfigDialog.isDialogVisible()) {
RocketComponent component = (RocketComponent) selPath.getLastPathComponent();
+ component.clearConfigListeners();
// Multi-component edit if shift/meta key is pressed
if ((e.isShiftDown() || e.isMetaDown()) && tree.getSelectionPaths() != null) {
diff --git a/swing/src/net/sf/openrocket/gui/main/ExampleDesignFileAction.java b/swing/src/net/sf/openrocket/gui/main/ExampleDesignFileAction.java
index 6fc0f39a2..64abf6dc0 100644
--- a/swing/src/net/sf/openrocket/gui/main/ExampleDesignFileAction.java
+++ b/swing/src/net/sf/openrocket/gui/main/ExampleDesignFileAction.java
@@ -1,6 +1,8 @@
package net.sf.openrocket.gui.main;
import java.awt.event.ActionEvent;
+import java.util.ArrayList;
+import java.util.List;
import javax.swing.AbstractAction;
import javax.swing.Action;
@@ -18,6 +20,35 @@ public final class ExampleDesignFileAction extends JMenu {
*/
private final BasicFrame parent;
+ /**
+ * Order in which the example files should be displayed in the menu.
+ * A null items means there should be a separator.
+ *
+ * NOTE: update this list if you add a new example file, or update the name of an existing one!!.
+ */
+ private static final String[] exampleFileOrder = {
+ // Examples of basic rockets
+ "A simple model rocket",
+ "Two-stage rocket",
+ "Three-stage rocket",
+ "TARC payload rocket",
+ "Tube fin rocket",
+ null,
+ // Examples demonstrating complex rocket features
+ "Airstart timing",
+ "Chute release",
+ "Dual parachute deployment",
+ "Clustered motors",
+ "Parallel booster staging",
+ "Pods--airframes and winglets",
+ "Pods--powered with recovery deployment",
+ null,
+ // Examples demonstrating customized functionality
+ "Presets",
+ "Simulation extensions",
+ "Simulation extensions and scripting"
+ };
+
/**
* Constructor.
*
@@ -38,11 +69,37 @@ public final class ExampleDesignFileAction extends JMenu {
private void updateMenu() {
removeAll();
ExampleDesignFile[] examples = ExampleDesignFile.getExampleDesigns();
+ List itemList = new ArrayList<>();
+
+ // First create the menu items
for (ExampleDesignFile file : examples) {
Action action = createAction(file);
action.putValue(Action.NAME, file.toString());
JMenuItem menuItem = new JMenuItem(action);
- add(menuItem);
+ itemList.add(menuItem);
+ }
+
+ // Then add them according to their order
+ for (String s : exampleFileOrder) {
+ if (s == null) {
+ addSeparator();
+ } else {
+ for (JMenuItem item : itemList) {
+ if (item.getText().equals(s)) {
+ add(item);
+ itemList.remove(item);
+ break;
+ }
+ }
+ }
+ }
+
+ // Add the remaining (unordered) items to the end
+ if (itemList.size() > 0) {
+ addSeparator();
+ for (JMenuItem item : itemList) {
+ add(item);
+ }
}
}
diff --git a/swing/src/net/sf/openrocket/gui/main/RocketActions.java b/swing/src/net/sf/openrocket/gui/main/RocketActions.java
index 6bce6fbd7..497f30bcb 100644
--- a/swing/src/net/sf/openrocket/gui/main/RocketActions.java
+++ b/swing/src/net/sf/openrocket/gui/main/RocketActions.java
@@ -25,7 +25,6 @@ import net.sf.openrocket.gui.components.StyledLabel;
import net.sf.openrocket.gui.configdialog.ComponentConfigDialog;
import net.sf.openrocket.gui.dialogs.ScaleDialog;
import net.sf.openrocket.gui.util.Icons;
-import net.sf.openrocket.gui.widgets.IconButton;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.logging.Markers;
import net.sf.openrocket.rocketcomponent.ComponentChangeEvent;
@@ -985,6 +984,7 @@ public class RocketActions {
ComponentConfigDialog.disposeDialog();
RocketComponent component = components.get(0);
+ component.clearConfigListeners();
if (components.size() > 1) {
for (int i = 1; i < components.size(); i++) {
RocketComponent listener = components.get(i);
diff --git a/swing/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeRenderer.java b/swing/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeRenderer.java
index 2dad7795d..a852e94b7 100644
--- a/swing/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeRenderer.java
+++ b/swing/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeRenderer.java
@@ -1,7 +1,9 @@
package net.sf.openrocket.gui.main.componenttree;
import java.awt.Component;
+import java.awt.Dimension;
import java.awt.FlowLayout;
+import java.awt.Font;
import java.util.List;
import javax.swing.JLabel;
@@ -80,6 +82,8 @@ public class ComponentTreeRenderer extends DefaultTreeCellRenderer {
p.setToolTipText(getToolTipSingleComponent(c));
}
+ Font originalFont = tree.getFont();
+ p.setFont(originalFont);
comp = p;
}
diff --git a/swing/src/net/sf/openrocket/gui/plot/SimulationPlot.java b/swing/src/net/sf/openrocket/gui/plot/SimulationPlot.java
index 1714fbd6f..57f45c09c 100644
--- a/swing/src/net/sf/openrocket/gui/plot/SimulationPlot.java
+++ b/swing/src/net/sf/openrocket/gui/plot/SimulationPlot.java
@@ -20,9 +20,12 @@ import java.util.regex.Pattern;
import net.sf.openrocket.document.Simulation;
import net.sf.openrocket.gui.simulation.SimulationPlotPanel;
+import net.sf.openrocket.gui.util.SwingPreferences;
import net.sf.openrocket.simulation.FlightDataBranch;
import net.sf.openrocket.simulation.FlightDataType;
import net.sf.openrocket.simulation.FlightEvent;
+import net.sf.openrocket.startup.Application;
+import net.sf.openrocket.startup.Preferences;
import net.sf.openrocket.unit.Unit;
import net.sf.openrocket.unit.UnitGroup;
import net.sf.openrocket.util.LinearInterpolator;
@@ -65,6 +68,8 @@ import org.jfree.ui.TextAnchor;
*/
@SuppressWarnings("serial")
public class SimulationPlot {
+ private static final SwingPreferences preferences = (SwingPreferences) Application.getPreferences();
+
private static final float PLOT_STROKE_WIDTH = 1.5f;
@@ -79,7 +84,7 @@ public class SimulationPlot {
private final LegendItems legendItems;
- int branchCount;
+ private int branchCount;
void setShowPoints(boolean showPoints) {
for (ModifiedXYItemRenderer r : renderers) {
@@ -286,32 +291,19 @@ public class SimulationPlot {
}
XYSeries ser = collection.getSeries(series);
String name = ser.getDescription();
+
// Extract the unit from the last part of the series description, between parenthesis
Matcher m = Pattern.compile(".*\\((.*?)\\)").matcher(name);
- String unit_y = "";
+ String unitY = "";
if (m.find()) {
- unit_y = m.group(1);
+ unitY = m.group(1);
}
- String unit_x = domainUnit.getUnit();
- String ord_end = "th"; // Ordinal number ending (1'st', 2'nd'...)
- if (item % 10 == 1)
- ord_end = "st";
- else if (item % 10 == 2)
- ord_end = "nd";
- else if (item % 10 == 3)
- ord_end = "rd";
- double data_y = dataset.getYValue(series, item);
- double data_x = dataset.getXValue(series, item);
- DecimalFormat df_y = DecimalFormatter.df(data_y, 2, false);
- DecimalFormat df_x = DecimalFormatter.df(data_x, 2, false);
- return String.format("" +
- "%s
" +
- "Y: %s %s
" +
- "X: %s %s
" +
- "%d%s sample" +
- "",
- name, df_y.format(data_y), unit_y,
- df_x.format(data_x), unit_x, item, ord_end);
+ String unitX = domainUnit.getUnit();
+
+ double dataY = dataset.getYValue(series, item);
+ double dataX = dataset.getXValue(series, item);
+
+ return formatSampleTooltip(name, dataX, unitX, dataY, unitY, item);
}
};
@@ -364,6 +356,42 @@ public class SimulationPlot {
return chart;
}
+ private String formatSampleTooltip(String dataName, double dataX, String unitX, double dataY, String unitY, int sampleIdx, boolean addYValue) {
+ String ord_end = "th"; // Ordinal number ending (1'st', 2'nd'...)
+ if (sampleIdx % 10 == 1) {
+ ord_end = "st";
+ } else if (sampleIdx % 10 == 2) {
+ ord_end = "nd";
+ } else if (sampleIdx % 10 == 3) {
+ ord_end = "rd";
+ }
+
+ DecimalFormat df_y = DecimalFormatter.df(dataY, 2, false);
+ DecimalFormat df_x = DecimalFormatter.df(dataX, 2, false);
+
+ StringBuilder sb = new StringBuilder();
+ sb.append(String.format("" +
+ "%s
", dataName));
+
+ if (addYValue) {
+ sb.append(String.format("Y: %s %s
", df_y.format(dataY), unitY));
+ }
+
+ sb.append(String.format("X: %s %s
" +
+ "%d%s sample" +
+ "", df_x.format(dataX), unitX, sampleIdx, ord_end));
+
+ return sb.toString();
+ }
+
+ private String formatSampleTooltip(String dataName, double dataX, String unitX, double dataY, String unitY, int sampleIdx) {
+ return formatSampleTooltip(dataName, dataX, unitX, dataY, unitY, sampleIdx, true);
+ }
+
+ private String formatSampleTooltip(String dataName, double dataX, String unitX, int sampleIdx) {
+ return formatSampleTooltip(dataName, dataX, unitX, 0, "", sampleIdx, false);
+ }
+
private String getLabel(FlightDataType type, Unit unit) {
String name = type.getName();
if (unit != null && !UnitGroup.UNITS_NONE.contains(unit) &&
@@ -372,129 +400,166 @@ public class SimulationPlot {
return name;
}
- private void drawDomainMarkers(int stage) {
+ /**
+ * Draw the domain markers for a certain branch. Draws all the markers if the branch is -1.
+ * @param branch branch to draw, or -1 to draw all
+ */
+ private void drawDomainMarkers(int branch) {
XYPlot plot = chart.getXYPlot();
- FlightDataBranch mainBranch = simulation.getSimulatedData().getBranch(0);
+ FlightDataBranch dataBranch = simulation.getSimulatedData().getBranch(Math.max(branch, 0));
- // Clear existing domain markers
+ // Clear existing domain markers and annotations
plot.clearDomainMarkers();
+ plot.clearAnnotations();
- // Construct domain marker lists collapsing based on time.
+ // Store flight event information
+ List eventTimes = new ArrayList<>();
+ List eventLabels = new ArrayList<>();
+ List eventColors = new ArrayList<>();
+ List eventImages = new ArrayList<>();
- List eventTimes = new ArrayList();
- List eventLabels = new ArrayList();
- List eventColors = new ArrayList();
- List eventImages = new ArrayList();
- {
- HashSet typeSet = new HashSet();
- double prevTime = -100;
- String text = null;
- Color color = null;
- Image image = null;
- for (EventDisplayInfo info : eventList) {
- if (stage >= 0 && stage != info.stage) {
- continue;
+ // Plot the markers
+ if (config.getDomainAxisType() == FlightDataType.TYPE_TIME && !preferences.getBoolean(Preferences.MARKER_STYLE_ICON, false)) {
+ fillEventLists(branch, eventTimes, eventLabels, eventColors, eventImages);
+ plotVerticalLineMarkers(plot, eventTimes, eventLabels, eventColors);
+
+ } else { // Other domains are plotted as image annotations
+ if (branch == -1) {
+ // For icon markers, we need to do the plotting separately, otherwise you can have icon markers from e.g.
+ // branch 1 be plotted on branch 0
+ for (int b = 0; b < simulation.getSimulatedData().getBranchCount(); b++) {
+ fillEventLists(b, eventTimes, eventLabels, eventColors, eventImages);
+ dataBranch = simulation.getSimulatedData().getBranch(b);
+ plotIconMarkers(plot, dataBranch, eventTimes, eventLabels, eventImages);
+ eventTimes.clear();
+ eventLabels.clear();
+ eventColors.clear();
+ eventImages.clear();
}
+ } else {
+ fillEventLists(branch, eventTimes, eventLabels, eventColors, eventImages);
+ plotIconMarkers(plot, dataBranch, eventTimes, eventLabels, eventImages);
+ }
+ }
+ }
- double t = info.time;
- FlightEvent.Type type = info.event.getType();
+ private void fillEventLists(int branch, List eventTimes, List eventLabels,
+ List eventColors, List eventImages) {
+ HashSet typeSet = new HashSet<>();
+ double prevTime = -100;
+ String text = null;
+ Color color = null;
+ Image image = null;
+ for (EventDisplayInfo info : eventList) {
+ if (branch >= 0 && branch != info.stage) {
+ continue;
+ }
- if (Math.abs(t - prevTime) <= 0.05) {
+ double t = info.time;
+ FlightEvent.Type type = info.event.getType();
- if (!typeSet.contains(type)) {
- text = text + ", " + type.toString();
- color = EventGraphics.getEventColor(type);
- image = EventGraphics.getEventImage(type);
- typeSet.add(type);
- }
-
- } else {
-
- if (text != null) {
- eventTimes.add(prevTime);
- eventLabels.add(text);
- eventColors.add(color);
- eventImages.add(image);
- }
- prevTime = t;
- text = type.toString();
+ if (Math.abs(t - prevTime) <= 0.05) {
+ if (!typeSet.contains(type)) {
+ text = text + ", " + type.toString();
color = EventGraphics.getEventColor(type);
image = EventGraphics.getEventImage(type);
- typeSet.clear();
typeSet.add(type);
}
+ } else {
+ if (text != null) {
+ eventTimes.add(prevTime);
+ eventLabels.add(text);
+ eventColors.add(color);
+ eventImages.add(image);
+ }
+ prevTime = t;
+ text = type.toString();
+ color = EventGraphics.getEventColor(type);
+ image = EventGraphics.getEventImage(type);
+ typeSet.clear();
+ typeSet.add(type);
}
- if (text != null) {
- eventTimes.add(prevTime);
- eventLabels.add(text);
- eventColors.add(color);
- eventImages.add(image);
+
+ }
+ if (text != null) {
+ eventTimes.add(prevTime);
+ eventLabels.add(text);
+ eventColors.add(color);
+ eventImages.add(image);
+ }
+ }
+
+ private static void plotVerticalLineMarkers(XYPlot plot, List eventTimes, List eventLabels, List eventColors) {
+ double markerWidth = 0.01 * plot.getDomainAxis().getUpperBound();
+
+ // Domain time is plotted as vertical lines
+ for (int i = 0; i < eventTimes.size(); i++) {
+ double t = eventTimes.get(i);
+ String event = eventLabels.get(i);
+ Color color = eventColors.get(i);
+
+ ValueMarker m = new ValueMarker(t);
+ m.setLabel(event);
+ m.setPaint(color);
+ m.setLabelPaint(color);
+ m.setAlpha(0.7f);
+ m.setLabelFont(new Font("Dialog", Font.PLAIN, 13));
+ plot.addDomainMarker(m);
+
+ if (t > plot.getDomainAxis().getUpperBound() - markerWidth) {
+ plot.setDomainAxis(new PresetNumberAxis(plot.getDomainAxis().getLowerBound(), t + markerWidth));
}
}
+ }
- // Plot the markers
- if (config.getDomainAxisType() == FlightDataType.TYPE_TIME) {
- double markerWidth = 0.01 * plot.getDomainAxis().getUpperBound();
+ private void plotIconMarkers(XYPlot plot, FlightDataBranch dataBranch, List eventTimes,
+ List eventLabels, List eventImages) {
+ List time = dataBranch.get(FlightDataType.TYPE_TIME);
+ List domain = dataBranch.get(config.getDomainAxisType());
- // Domain time is plotted as vertical markers
- for (int i = 0; i < eventTimes.size(); i++) {
- double t = eventTimes.get(i);
- String event = eventLabels.get(i);
- Color color = eventColors.get(i);
+ LinearInterpolator domainInterpolator = new LinearInterpolator(time, domain);
- ValueMarker m = new ValueMarker(t);
- m.setLabel(event);
- m.setPaint(color);
- m.setLabelPaint(color);
- m.setAlpha(0.7f);
- m.setLabelFont(new Font("Dialog", Font.PLAIN, 13));
- plot.addDomainMarker(m);
+ for (int i = 0; i < eventTimes.size(); i++) {
+ double t = eventTimes.get(i);
+ Image image = eventImages.get(i);
- if (t > plot.getDomainAxis().getUpperBound() - markerWidth) {
- plot.setDomainAxis(new PresetNumberAxis(plot.getDomainAxis().getLowerBound(), t + markerWidth));
- }
+ if (image == null) {
+ continue;
}
- } else {
+ double xcoord = domainInterpolator.getValue(t);
- // Other domains are plotted as image annotations
- List time = mainBranch.get(FlightDataType.TYPE_TIME);
- List domain = mainBranch.get(config.getDomainAxisType());
+ for (int index = 0; index < config.getTypeCount(); index++) {
+ FlightDataType type = config.getType(index);
+ List range = dataBranch.get(type);
- LinearInterpolator domainInterpolator = new LinearInterpolator(time, domain);
-
- for (int i = 0; i < eventTimes.size(); i++) {
- double t = eventTimes.get(i);
- String event = eventLabels.get(i);
- Image image = eventImages.get(i);
-
- if (image == null)
+ LinearInterpolator rangeInterpolator = new LinearInterpolator(time, range);
+ // Image annotations are not supported on the right-side axis
+ // TODO: LOW: Can this be achieved by JFreeChart?
+ if (filled.getAxis(index) != SimulationPlotPanel.LEFT) {
continue;
-
- double xcoord = domainInterpolator.getValue(t);
- for (int index = 0; index < config.getTypeCount(); index++) {
- FlightDataType type = config.getType(index);
- List range = mainBranch.get(type);
-
- LinearInterpolator rangeInterpolator = new LinearInterpolator(time, range);
- // Image annotations are not supported on the right-side axis
- // TODO: LOW: Can this be achieved by JFreeChart?
- if (filled.getAxis(index) != SimulationPlotPanel.LEFT) {
- continue;
- }
-
- double ycoord = rangeInterpolator.getValue(t);
-
- // Convert units
- xcoord = config.getDomainAxisUnit().toUnit(xcoord);
- ycoord = config.getUnit(index).toUnit(ycoord);
-
- XYImageAnnotation annotation =
- new XYImageAnnotation(xcoord, ycoord, image, RectangleAnchor.CENTER);
- annotation.setToolTipText(event);
- plot.addAnnotation(annotation);
}
+
+ double ycoord = rangeInterpolator.getValue(t);
+
+ // Convert units
+ xcoord = config.getDomainAxisUnit().toUnit(xcoord);
+ ycoord = config.getUnit(index).toUnit(ycoord);
+
+ // Get the sample index of the flight event. Because this can be an interpolation between two samples,
+ // take the closest sample.
+ final int sampleIdx;
+ Optional closestSample = time.stream()
+ .min(Comparator.comparingDouble(sample -> Math.abs(sample - t)));
+ sampleIdx = closestSample.map(time::indexOf).orElse(-1);
+
+ String tooltipText = formatSampleTooltip(eventLabels.get(i), xcoord, config.getDomainAxisUnit().getUnit(), sampleIdx) ;
+
+ XYImageAnnotation annotation =
+ new XYImageAnnotation(xcoord, ycoord, image, RectangleAnchor.CENTER);
+ annotation.setToolTipText(tooltipText);
+ plot.addAnnotation(annotation);
}
}
}
diff --git a/swing/src/net/sf/openrocket/gui/scalefigure/RocketFigure.java b/swing/src/net/sf/openrocket/gui/scalefigure/RocketFigure.java
index 1c0925ed6..0f62a28f7 100644
--- a/swing/src/net/sf/openrocket/gui/scalefigure/RocketFigure.java
+++ b/swing/src/net/sf/openrocket/gui/scalefigure/RocketFigure.java
@@ -58,9 +58,10 @@ public class RocketFigure extends AbstractScaleFigure {
private static final String ROCKET_FIGURE_PACKAGE = "net.sf.openrocket.gui.rocketfigure";
private static final String ROCKET_FIGURE_SUFFIX = "Shapes";
-
- public static final int VIEW_SIDE=0;
- public static final int VIEW_BACK=1;
+
+ public static final int VIEW_TOP = 0;
+ public static final int VIEW_SIDE = 1;
+ public static final int VIEW_BACK = 2;
// Width for drawing normal and selected components
public static final double NORMAL_WIDTH = 1.0;
@@ -130,10 +131,6 @@ public class RocketFigure extends AbstractScaleFigure {
return rotation;
}
- public Transformation getRotateTransformation() {
- return axialRotation;
- }
-
public void setRotation(double rot) {
if (MathUtil.equals(rotation, rot))
return;
@@ -142,14 +139,22 @@ public class RocketFigure extends AbstractScaleFigure {
updateFigure();
fireChangeEvent();
}
+
+ private Transformation getFigureRotation() {
+ if (currentViewType == RocketPanel.VIEW_TYPE.TopView) {
+ return this.axialRotation.applyTransformation(Transformation.rotate_x(-Math.PI / 2));
+ } else {
+ return this.axialRotation;
+ }
+ }
- public RocketPanel.VIEW_TYPE getType() {
+ public RocketPanel.VIEW_TYPE getCurrentViewType() {
return currentViewType;
}
public void setType(final RocketPanel.VIEW_TYPE type) {
- if (type != RocketPanel.VIEW_TYPE.BackView && type != RocketPanel.VIEW_TYPE.SideView) {
+ if (type != RocketPanel.VIEW_TYPE.BackView && type != RocketPanel.VIEW_TYPE.SideView && type != RocketPanel.VIEW_TYPE.TopView) {
throw new IllegalArgumentException("Illegal type: " + type);
}
if (this.currentViewType == type)
@@ -201,7 +206,7 @@ public class RocketFigure extends AbstractScaleFigure {
AffineTransform baseTransform = g2.getTransform();
PriorityQueue figureShapes;
- if (currentViewType == RocketPanel.VIEW_TYPE.SideView)
+ if (currentViewType == RocketPanel.VIEW_TYPE.SideView || currentViewType == RocketPanel.VIEW_TYPE.TopView)
figureShapes = figureShapes_side;
else if (currentViewType == RocketPanel.VIEW_TYPE.BackView)
figureShapes = figureShapes_back;
@@ -300,11 +305,11 @@ public class RocketFigure extends AbstractScaleFigure {
// System.err.println(String.format(" mount instance: %s => %s", curMountLocation.toString(), curMotorLocation.toString() ));
// rotate by figure's axial rotation:
- curMotorLocation = this.axialRotation.transform(curMotorLocation);
+ curMotorLocation = getFigureRotation().transform(curMotorLocation);
{
Shape s;
- if (currentViewType == RocketPanel.VIEW_TYPE.SideView) {
+ if (currentViewType == RocketPanel.VIEW_TYPE.SideView || currentViewType == RocketPanel.VIEW_TYPE.TopView) {
s = new Rectangle2D.Double(curMotorLocation.x,
(curMotorLocation.y - motorRadius),
motorLength,
@@ -354,7 +359,7 @@ public class RocketFigure extends AbstractScaleFigure {
LinkedHashSet l = new LinkedHashSet();
PriorityQueue figureShapes;
- if (currentViewType == RocketPanel.VIEW_TYPE.SideView)
+ if (currentViewType == RocketPanel.VIEW_TYPE.SideView || currentViewType == RocketPanel.VIEW_TYPE.TopView)
figureShapes = figureShapes_side;
else if (currentViewType == RocketPanel.VIEW_TYPE.BackView)
figureShapes = figureShapes_back;
@@ -399,7 +404,7 @@ public class RocketFigure extends AbstractScaleFigure {
final ArrayList contextList = entry.getValue();
for (InstanceContext context : contextList) {
- final Transformation currentTransform = this.axialRotation.applyTransformation(context.transform);
+ final Transformation currentTransform = getFigureRotation().applyTransformation(context.transform);
allShapes = addThisShape(allShapes, this.currentViewType, comp, currentTransform);
}
}
@@ -432,9 +437,10 @@ public class RocketFigure extends AbstractScaleFigure {
// Find the appropriate method
switch (viewType) {
case SideView:
+ case TopView:
m = Reflection.findMethod(ROCKET_FIGURE_PACKAGE, component, ROCKET_FIGURE_SUFFIX, "getShapesSide",
RocketComponent.class, Transformation.class);
- break;
+ break;
case BackView:
m = Reflection.findMethod(ROCKET_FIGURE_PACKAGE, component, ROCKET_FIGURE_SUFFIX, "getShapesBack",
@@ -503,6 +509,7 @@ public class RocketFigure extends AbstractScaleFigure {
switch (currentViewType) {
case SideView:
+ case TopView:
subjectBounds_m = new Rectangle2D.Double(bounds.min.x, -maxR, bounds.span().x, 2 * maxR);
break;
case BackView:
@@ -528,9 +535,8 @@ public class RocketFigure extends AbstractScaleFigure {
if (currentViewType == RocketPanel.VIEW_TYPE.BackView){
final int newOriginX = mid_x;
final int newOriginY = borderThickness_px.height + getHeight() / 2;
-
originLocation_px = new Point(newOriginX, newOriginY);
- }else if (currentViewType == RocketPanel.VIEW_TYPE.SideView){
+ } else if (currentViewType == RocketPanel.VIEW_TYPE.SideView || currentViewType == RocketPanel.VIEW_TYPE.TopView) {
final int newOriginX = mid_x - (subjectWidth / 2) - (int)(subjectBounds_m.getMinX() * scale);
final int newOriginY = Math.max(getHeight(), subjectHeight + 2*borderThickness_px.height )/ 2;
originLocation_px = new Point(newOriginX, newOriginY);
diff --git a/swing/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java b/swing/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java
index 5a61fd46e..aa7ef052e 100644
--- a/swing/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java
+++ b/swing/src/net/sf/openrocket/gui/scalefigure/RocketPanel.java
@@ -2,6 +2,7 @@ package net.sf.openrocket.gui.scalefigure;
import java.awt.BorderLayout;
+import java.awt.Component;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.Point;
@@ -91,9 +92,12 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change
private static final Translator trans = Application.getTranslator();
private static final Logger log = LoggerFactory.getLogger(RocketPanel.class);
+ private static final String VIEW_TYPE_SEPARATOR = "__SEPARATOR__"; // Dummy string to indicate a horizontal separator item in the view type combobox
public enum VIEW_TYPE {
+ TopView(false, RocketFigure.VIEW_TOP),
SideView(false, RocketFigure.VIEW_SIDE),
BackView(false, RocketFigure.VIEW_BACK),
+ SEPARATOR(false, -248), // Horizontal combobox separator dummy item
Figure3D(true, RocketFigure3d.TYPE_FIGURE),
Unfinished(true, RocketFigure3d.TYPE_UNFINISHED),
Finished(true, RocketFigure3d.TYPE_FINISHED);
@@ -108,9 +112,16 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change
@Override
public String toString() {
+ if (type == -248) {
+ return VIEW_TYPE_SEPARATOR;
+ }
return trans.get("RocketPanel.FigTypeAct." + super.toString());
}
+ public static VIEW_TYPE getDefaultViewType() {
+ return SideView;
+ }
+
}
private boolean is3d;
@@ -308,12 +319,16 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change
JPanel ribbon = new JPanel(new MigLayout("insets 0, fill"));
// View Type drop-down
- ComboBoxModel cm = new DefaultComboBoxModel(VIEW_TYPE.values()) {
+ ComboBoxModel cm = new ViewTypeComboBoxModel(VIEW_TYPE.values(), VIEW_TYPE.getDefaultViewType()) {
@Override
public void setSelectedItem(Object o) {
- super.setSelectedItem(o);
VIEW_TYPE v = (VIEW_TYPE) o;
+ if (v == VIEW_TYPE.SEPARATOR) {
+ return;
+ }
+
+ super.setSelectedItem(o);
if (v.is3d) {
figure3d.setType(v.type);
go3D();
@@ -325,7 +340,9 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change
}
};
ribbon.add(new JLabel(trans.get("RocketPanel.lbl.ViewType")), "cell 0 0");
- ribbon.add(new JComboBox(cm), "cell 0 1");
+ final JComboBox viewSelector = new JComboBox(cm);
+ viewSelector.setRenderer(new SeparatorComboBoxRenderer(viewSelector.getRenderer()));
+ ribbon.add(viewSelector, "cell 0 1");
// Zoom level selector
scaleSelector = new ScaleSelector(scrollPane);
@@ -619,6 +636,7 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change
if (event.isShiftDown() || event.isMetaDown()) {
List paths = new ArrayList<>(Arrays.asList(selectionModel.getSelectionPaths()));
RocketComponent component = selectedComponents.get(selectedComponents.size() - 1);
+ component.clearConfigListeners();
// Make sure the clicked component is selected
for (RocketComponent c : clicked) {
@@ -773,7 +791,8 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change
figure3d.setCP(new Coordinate(Double.NaN, Double.NaN));
}
- if (figure.getType() == RocketPanel.VIEW_TYPE.SideView && length > 0) {
+ if (length > 0 &&
+ ((figure.getCurrentViewType() == RocketPanel.VIEW_TYPE.TopView) || (figure.getCurrentViewType() == RocketPanel.VIEW_TYPE.SideView))) {
extraCP.setPosition(cpx, cpy);
extraCG.setPosition(cgx, cgy);
} else {
@@ -1061,40 +1080,34 @@ public class RocketPanel extends JPanel implements TreeSelectionListener, Change
figure3d.setSelection(components);
}
- // /**
- // * An Action that shows whether the figure type is the
- // type
- // * given in the constructor.
- // *
- // * @author Sampo Niskanen
- // */
- // private class FigureTypeAction extends AbstractAction implements
- // StateChangeListener {
- // private static final long serialVersionUID = 1L;
- // private final VIEW_TYPE type;
- //
- // public FigureTypeAction(VIEW_TYPE type) {
- // this.type = type;
- // stateChanged(null);
- // figure.addChangeListener(this);
- // }
- //
- // @Override
- // public void actionPerformed(ActionEvent e) {
- // boolean state = (Boolean) getValue(Action.SELECTED_KEY);
- // if (state == true) {
- // // This view has been selected
- // figure.setType(type);
- // go2D();
- // updateExtras();
- // }
- // stateChanged(null);
- // }
- //
- // @Override
- // public void stateChanged(EventObject e) {
- // putValue(Action.SELECTED_KEY, figure.getType() == type && !is3d);
- // }
- // }
+ private static class ViewTypeComboBoxModel extends DefaultComboBoxModel {
+ public ViewTypeComboBoxModel(VIEW_TYPE[] items, VIEW_TYPE initialItem) {
+ super(items);
+ super.setSelectedItem(initialItem);
+ }
+ }
+
+ /**
+ * Custom combobox renderer that supports the display of horizontal separators between items.
+ * ComboBox objects with the text {@link VIEW_TYPE_SEPARATOR} objects in the combobox are replaced by a separator object.
+ */
+ private static class SeparatorComboBoxRenderer extends JLabel implements ListCellRenderer {
+ private final JSeparator separator;
+ private final ListCellRenderer defaultRenderer;
+
+ public SeparatorComboBoxRenderer(ListCellRenderer defaultRenderer) {
+ this.defaultRenderer = defaultRenderer;
+ this.separator = new JSeparator(JSeparator.HORIZONTAL);
+ }
+
+ public Component getListCellRendererComponent(JList list, Object value,
+ int index, boolean isSelected, boolean cellHasFocus) {
+ String str = (value == null) ? "" : value.toString();
+ if (VIEW_TYPE_SEPARATOR.equals(str)) {
+ return separator;
+ };
+ return defaultRenderer.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+ }
+ }
}
diff --git a/swing/src/net/sf/openrocket/gui/simulation/SimulationPlotPanel.java b/swing/src/net/sf/openrocket/gui/simulation/SimulationPlotPanel.java
index da516379c..c28cc606c 100644
--- a/swing/src/net/sf/openrocket/gui/simulation/SimulationPlotPanel.java
+++ b/swing/src/net/sf/openrocket/gui/simulation/SimulationPlotPanel.java
@@ -9,12 +9,15 @@ import java.util.Arrays;
import java.util.EnumSet;
import javax.swing.BorderFactory;
+import javax.swing.ButtonGroup;
import javax.swing.JButton;
import javax.swing.JComboBox;
+import javax.swing.JComponent;
import javax.swing.JDialog;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
+import javax.swing.JRadioButton;
import javax.swing.JScrollPane;
import javax.swing.JTable;
import javax.swing.table.AbstractTableModel;
@@ -29,11 +32,13 @@ import net.sf.openrocket.gui.plot.PlotConfiguration;
import net.sf.openrocket.gui.plot.SimulationPlotDialog;
import net.sf.openrocket.gui.util.GUIUtil;
import net.sf.openrocket.gui.util.Icons;
+import net.sf.openrocket.gui.util.SwingPreferences;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.simulation.FlightDataBranch;
import net.sf.openrocket.simulation.FlightDataType;
import net.sf.openrocket.simulation.FlightEvent;
import net.sf.openrocket.startup.Application;
+import net.sf.openrocket.startup.Preferences;
import net.sf.openrocket.unit.Unit;
import net.sf.openrocket.util.Utils;
import net.sf.openrocket.gui.widgets.SelectColorButton;
@@ -47,6 +52,7 @@ public class SimulationPlotPanel extends JPanel {
private static final long serialVersionUID = -2227129713185477998L;
private static final Translator trans = Application.getTranslator();
+ private static final SwingPreferences preferences = (SwingPreferences) Application.getPreferences();
// TODO: LOW: Should these be somewhere else?
public static final int AUTO = -1;
@@ -201,7 +207,7 @@ public class SimulationPlotPanel extends JPanel {
typeSelectorPanel = new JPanel(new MigLayout("gapy rel"));
JScrollPane scroll = new JScrollPane(typeSelectorPanel);
- this.add(scroll, "spany 2, height 10px, wmin 400lp, grow 100, gapright para");
+ this.add(scroll, "spany 3, height 10px, wmin 400lp, grow 100, gapright para");
//// Flight events
@@ -244,10 +250,46 @@ public class SimulationPlotPanel extends JPanel {
eventTableModel.fireTableDataChanged();
}
});
- this.add(button, "gapleft para, gapright para, growx, sizegroup buttons, wrap para");
-
-
+ this.add(button, "gapleft para, gapright para, growx, sizegroup buttons, wrap");
+
+ //// Style event marker
+ JLabel styleEventMarker = new JLabel(trans.get("simplotpanel.MarkerStyle.lbl.MarkerStyle"));
+ JRadioButton radioVerticalMarker = new JRadioButton(trans.get("simplotpanel.MarkerStyle.btn.VerticalMarker"));
+ JRadioButton radioIcon = new JRadioButton(trans.get("simplotpanel.MarkerStyle.btn.Icon"));
+ ButtonGroup bg = new ButtonGroup();
+ bg.add(radioVerticalMarker);
+ bg.add(radioIcon);
+
+ boolean useIcon = preferences.getBoolean(Preferences.MARKER_STYLE_ICON, false);
+ if (useIcon) {
+ radioIcon.setSelected(true);
+ } else {
+ radioVerticalMarker.setSelected(true);
+ }
+
+ radioIcon.addItemListener(new ItemListener() {
+ @Override
+ public void itemStateChanged(ItemEvent e) {
+ if (modifying > 0)
+ return;
+ preferences.putBoolean(Preferences.MARKER_STYLE_ICON, radioIcon.isSelected());
+ }
+ });
+
+ domainTypeSelector.addItemListener(new ItemListener() {
+ @Override
+ public void itemStateChanged(ItemEvent e) {
+ updateStyleEventWidgets(styleEventMarker, radioVerticalMarker, radioIcon);
+ }
+ });
+ updateStyleEventWidgets(styleEventMarker, radioVerticalMarker, radioIcon);
+
+ this.add(styleEventMarker, "split 3, growx");
+ this.add(radioVerticalMarker);
+ this.add(radioIcon, "wrap para");
+
+
//// New Y axis plot type
button = new SelectColorButton(trans.get("simplotpanel.but.NewYaxisplottype"));
button.addActionListener(new ActionListener() {
@@ -322,6 +364,19 @@ public class SimulationPlotPanel extends JPanel {
*/
updatePlots();
}
+
+ private void updateStyleEventWidgets(JLabel styleEventMarker, JRadioButton radioVerticalMarker, JRadioButton radioIcon) {
+ if (modifying > 0)
+ return;
+ FlightDataType type = (FlightDataType) domainTypeSelector.getSelectedItem();
+ boolean isTime = type == FlightDataType.TYPE_TIME;
+ styleEventMarker.setEnabled(isTime);
+ radioVerticalMarker.setEnabled(isTime);
+ radioIcon.setEnabled(isTime);
+ styleEventMarker.setToolTipText(isTime ? trans.get("simplotpanel.MarkerStyle.lbl.MarkerStyle.ttip") : trans.get("simplotpanel.MarkerStyle.OnlyInTime"));
+ radioVerticalMarker.setToolTipText(isTime ? null : trans.get("simplotpanel.MarkerStyle.OnlyInTime"));
+ radioIcon.setToolTipText(isTime ? null : trans.get("simplotpanel.MarkerStyle.OnlyInTime"));
+ }
public JDialog doPlot(Window parent) {
if (configuration.getTypeCount() == 0) {
diff --git a/swing/src/net/sf/openrocket/gui/util/SwingPreferences.java b/swing/src/net/sf/openrocket/gui/util/SwingPreferences.java
index 4a42ffdb9..45c5ce476 100644
--- a/swing/src/net/sf/openrocket/gui/util/SwingPreferences.java
+++ b/swing/src/net/sf/openrocket/gui/util/SwingPreferences.java
@@ -304,6 +304,24 @@ public class SwingPreferences extends net.sf.openrocket.startup.Preferences {
return list;
}
+
+ /**
+ * Returns the files/directories to be loaded as custom thrust curves, formatting as a string. If there are multiple
+ * locations, they are separated by a semicolon.
+ *
+ * @return a list of files to load as thrust curves, formatted as a semicolon separated string.
+ */
+ public String getUserThrustCurveFilesAsString() {
+ List files = getUserThrustCurveFiles();
+ StringBuilder sb = new StringBuilder();
+ for (File file : files) {
+ if (sb.length() > 0) {
+ sb.append(";");
+ }
+ sb.append(file.getAbsolutePath());
+ }
+ return sb.toString();
+ }
public File getDefaultUserThrustCurveFile() {
File appdir = SystemInfo.getUserApplicationDirectory();
diff --git a/swing/src/net/sf/openrocket/gui/widgets/IconToggleButton.java b/swing/src/net/sf/openrocket/gui/widgets/IconToggleButton.java
new file mode 100644
index 000000000..55e779f28
--- /dev/null
+++ b/swing/src/net/sf/openrocket/gui/widgets/IconToggleButton.java
@@ -0,0 +1,119 @@
+package net.sf.openrocket.gui.widgets;
+
+import net.sf.openrocket.gui.util.Icons;
+
+import javax.swing.Action;
+import javax.swing.Icon;
+import javax.swing.UIManager;
+import java.awt.Insets;
+
+/**
+ * Toggle button specifically for displaying an icon.
+ * The button does not have any borders and only displays the icon.
+ * When setting the selected icon, the button will automatically generate a version of that icon
+ * for the unselected state (a greyed out version).
+ * You can also set the scale of the icon using the ICON_SCALE variable.
+ *
+ * @author Sibo Van Gool
+ */
+public class IconToggleButton extends SelectColorToggleButton {
+ private double ICON_SCALE = 1;
+
+ public IconToggleButton(Action a) {
+ super(a);
+ initSettings();
+ }
+
+ public IconToggleButton(String text) {
+ super(text);
+ initSettings();
+ }
+
+ public IconToggleButton() {
+ initSettings();
+ }
+
+ public IconToggleButton(Icon icon) {
+ super(icon);
+ initSettings();
+ }
+
+ public IconToggleButton(Icon icon, boolean selected) {
+ super(icon, selected);
+ initSettings();
+ }
+
+ public IconToggleButton(String text, boolean selected) {
+ super(text, selected);
+ initSettings();
+ }
+
+ public IconToggleButton(String text, Icon icon) {
+ super(text, icon);
+ initSettings();
+ }
+
+ public IconToggleButton(String text, Icon icon, boolean selected) {
+ super(text, icon, selected);
+ initSettings();
+ }
+
+ public void setIconScale(double iconScale) {
+ ICON_SCALE = iconScale;
+ }
+
+ private void initSettings() {
+ setBorderPainted(false);
+ setBorder(null);
+ setFocusable(false);
+ setMargin(new Insets(0, 0, 0, 0));
+ setContentAreaFilled(false);
+ }
+
+ @Override
+ public void setSelectedIcon(Icon selectedIcon) {
+ super.setSelectedIcon(selectedIcon);
+ setUnselectedIcon(selectedIcon);
+ // There is a bug where the normal override of the pressed icon does not work, so we have to assign it here.
+ setPressedIcon(Icons.getScaledIcon(selectedIcon, ICON_SCALE));
+ }
+
+ /**
+ * Generates and sets an unselected icon based on the current icon.
+ * @param icon the icon of the button when it is selected
+ */
+ private void setUnselectedIcon(Icon icon) {
+ Icon unselectedIcon = UIManager.getLookAndFeel().getDisabledIcon(null, icon);
+ setIcon(unselectedIcon);
+ }
+
+ @Override
+ public Icon getIcon() {
+ return Icons.getScaledIcon(super.getIcon(), ICON_SCALE);
+ }
+
+ @Override
+ public Icon getSelectedIcon() {
+ return Icons.getScaledIcon(super.getSelectedIcon(), ICON_SCALE);
+ }
+
+ @Override
+ public Icon getDisabledIcon() {
+ return Icons.getScaledIcon(super.getDisabledIcon(), ICON_SCALE);
+ }
+
+ @Override
+ public Icon getDisabledSelectedIcon() {
+ return Icons.getScaledIcon(super.getDisabledSelectedIcon(), ICON_SCALE);
+ }
+
+ @Override
+ public Icon getRolloverIcon() {
+ return Icons.getScaledIcon(super.getRolloverIcon(), ICON_SCALE);
+ }
+
+ @Override
+ public Icon getRolloverSelectedIcon() {
+ return Icons.getScaledIcon(super.getRolloverSelectedIcon(), ICON_SCALE);
+ }
+}
diff --git a/swing/src/net/sf/openrocket/utils/SerializePresets.java b/swing/src/net/sf/openrocket/utils/SerializePresets.java
index d872fc223..a47e7d768 100644
--- a/swing/src/net/sf/openrocket/utils/SerializePresets.java
+++ b/swing/src/net/sf/openrocket/utils/SerializePresets.java
@@ -50,8 +50,8 @@ public class SerializePresets extends BasicApplication {
}
while (iterator.hasNext()) {
- Pair f = iterator.next();
- String fileName = f.getU();
+ Pair f = iterator.next();
+ String fileName = f.getU().getName();
InputStream is = f.getV();
OpenRocketComponentLoader loader = new OpenRocketComponentLoader();
diff --git a/swing/test/net/sf/openrocket/IntegrationTest.java b/swing/test/net/sf/openrocket/IntegrationTest.java
index e0a280f09..a1fd04a58 100644
--- a/swing/test/net/sf/openrocket/IntegrationTest.java
+++ b/swing/test/net/sf/openrocket/IntegrationTest.java
@@ -122,7 +122,7 @@ public class IntegrationTest {
// Compute cg+cp + altitude
// double cgx, double mass, double cpx, double cna)
checkCgCp(0.248, 0.0645, 0.320, 12.0);
- checkAlt(49.0);
+ checkAlt(48.8);
// Mass modification
document.addUndoPosition("Modify mass");
@@ -132,7 +132,7 @@ public class IntegrationTest {
// Check cg+cp + altitude
checkCgCp(0.230, 0.0745, 0.320, 12.0);
- checkAlt(37.2);
+ checkAlt(37.4);
// Non-change
document.addUndoPosition("No change");
@@ -164,7 +164,7 @@ public class IntegrationTest {
// Check cg+cp + altitude
checkCgCp(0.230, 0.0745, 0.320, 12.0);
- checkAlt(37.2);
+ checkAlt(37.4);
// Undo "Name change" change
undoAction.actionPerformed(new ActionEvent(this, 0, "foo"));
@@ -190,7 +190,7 @@ public class IntegrationTest {
// Check cg+cp + altitude
checkCgCp(0.230, 0.0745, 0.320, 12.0);
- checkAlt(37.2);
+ checkAlt(37.4);
// Mass modification
document.addUndoPosition("Modify mass2");
@@ -200,7 +200,7 @@ public class IntegrationTest {
// Check cg+cp + altitude
checkCgCp(0.223, 0.0795, 0.320, 12.0);
- checkAlt(32.7);
+ checkAlt(33);
// Perform component movement
document.startUndo("Move component");
@@ -217,7 +217,7 @@ public class IntegrationTest {
// Check cg+cp + altitude
checkCgCp(0.221, 0.0797, 0.320, 12.0);
- checkAlt(32.7);
+ checkAlt(33);
// Modify mass without setting undo description
massComponent().setComponentMass(0.020);
@@ -234,7 +234,7 @@ public class IntegrationTest {
// Check cg+cp + altitude
checkCgCp(0.221, 0.0797, 0.320, 12.0);
- checkAlt(32.7);
+ checkAlt(33);
// Undo "Move component" change
undoAction.actionPerformed(new ActionEvent(this, 0, "foo"));
@@ -243,7 +243,7 @@ public class IntegrationTest {
// Check cg+cp + altitude
checkCgCp(0.223, 0.0795, 0.320, 12.0);
- checkAlt(32.7);
+ checkAlt(33);
// Redo "Move component" change
redoAction.actionPerformed(new ActionEvent(this, 0, "foo"));
@@ -252,7 +252,7 @@ public class IntegrationTest {
// Check cg+cp + altitude
checkCgCp(0.221, 0.0797, 0.320, 12.0);
- checkAlt(32.7);
+ checkAlt(33);
}