Warning that the body diameter is discontinuous. */
////Discontinuity in rocket body diameter.
public static final Warning DIAMETER_DISCONTINUITY = new Other(trans.get("Warning.DISCONTINUITY"));
+
+ /** A Warning that a ComponentAssembly has an open forward end */
+ public static final Warning OPEN_AIRFRAME_FORWARD = new Other(trans.get("Warning.OPEN_AIRFRAME_FORWARD"));
/** A Warning that the fins are thick compared to the rocket body. */
////Thick fins may not be modeled accurately.
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/simulation/BasicEventSimulationEngine.java b/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
index e31fa4a98..33b39174a 100644
--- a/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
+++ b/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
@@ -396,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/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/swing/resources/datafiles/examples/Pods--powered with recovery deployment.ork b/swing/resources/datafiles/examples/Pods--powered with recovery deployment.ork
index 35b61c011..1656e5144 100644
Binary files a/swing/resources/datafiles/examples/Pods--powered with recovery deployment.ork and b/swing/resources/datafiles/examples/Pods--powered with recovery deployment.ork differ
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/configdialog/RocketComponentConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java index 4ebc60b96..f0bce09eb 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java @@ -5,7 +5,10 @@ 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.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -35,6 +38,7 @@ 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; @@ -120,6 +124,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"); @@ -672,6 +677,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); 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/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/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!