From 1470a846739e303a42933baed42d5165143aaa65 Mon Sep 17 00:00:00 2001 From: Daniel_M_Williams Date: Sun, 11 Feb 2018 09:46:50 -0500 Subject: [PATCH 1/6] [debug] removed unnecessary printlns in unit tests --- swing/test/net/sf/openrocket/IntegrationTest.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/swing/test/net/sf/openrocket/IntegrationTest.java b/swing/test/net/sf/openrocket/IntegrationTest.java index 570d545a6..2c0fd17c2 100644 --- a/swing/test/net/sf/openrocket/IntegrationTest.java +++ b/swing/test/net/sf/openrocket/IntegrationTest.java @@ -120,10 +120,7 @@ public class IntegrationTest { checkUndoState(null, null); InnerTube mmt = (InnerTube)config.getRocket().getChild(0).getChild(1).getChild(2); - System.err.println(String.format("IntegrationTest::testSimpleRocket(...)....")); - System.err.println(String.format(" Config: %s", config.toDebug() )); - System.err.println(String.format(" motor config: %s", mmt.getMotorConfig( config.getId() ).toDescription() )); - + // Compute cg+cp + altitude // double cgx, double mass, double cpx, double cna) checkCgCp(0.248, 0.0645, 0.320, 12.0); From d859337e12f3b2467f840a67de51ea9ef876fa8e Mon Sep 17 00:00:00 2001 From: Daniel_M_Williams Date: Sun, 25 Feb 2018 14:02:47 -0500 Subject: [PATCH 2/6] [fix] prevent a NPE if openrocket does not detect the example files --- .../net/sf/openrocket/gui/main/ExampleDesignFile.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/main/ExampleDesignFile.java b/swing/src/net/sf/openrocket/gui/main/ExampleDesignFile.java index d697f042b..e7fa03d33 100644 --- a/swing/src/net/sf/openrocket/gui/main/ExampleDesignFile.java +++ b/swing/src/net/sf/openrocket/gui/main/ExampleDesignFile.java @@ -50,11 +50,14 @@ public class ExampleDesignFile implements Comparable { logger.debug("Cannot find jar file, trying to load from directory"); designs = getDirFileNames(); } - if (designs == null || designs.length == 0) { - return null; + + if (designs == null ){ + return new ExampleDesignFile[0]; + } + + if( 0 < designs.length ) { + Arrays.sort(designs); } - - Arrays.sort(designs); return designs; } From 28bdfac5503b507badfbd41cad0bfe3be4ccb1d9 Mon Sep 17 00:00:00 2001 From: Daniel_M_Williams Date: Sat, 3 Mar 2018 16:43:18 -0500 Subject: [PATCH 3/6] [fix][Resolves #330] Rocket size now updates on main screen after scaling rocket --- .../net/sf/openrocket/gui/dialogs/ScaleDialog.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/dialogs/ScaleDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/ScaleDialog.java index 362a8dca1..90216f366 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/ScaleDialog.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/ScaleDialog.java @@ -33,6 +33,7 @@ import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.logging.Markers; import net.sf.openrocket.rocketcomponent.BodyComponent; import net.sf.openrocket.rocketcomponent.BodyTube; +import net.sf.openrocket.rocketcomponent.ComponentChangeEvent; import net.sf.openrocket.rocketcomponent.EllipticalFinSet; import net.sf.openrocket.rocketcomponent.FinSet; import net.sf.openrocket.rocketcomponent.FreeformFinSet; @@ -400,18 +401,22 @@ public class ScaleDialog extends JDialog { panel.add(scaleMassValues, "span, wrap para*3"); - // Buttons - + // Scale / Accept Buttons JButton scale = new JButton(trans.get("button.scale")); scale.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { doScale(); + + ScaleDialog.this.document.getRocket().fireComponentChangeEvent( ComponentChangeEvent.AEROMASS_CHANGE); + ScaleDialog.this.setVisible(false); } }); + panel.add(scale, "span, split, right, gap para"); - + + // Cancel Button JButton cancel = new JButton(trans.get("button.cancel")); cancel.addActionListener(new ActionListener() { @Override From 786ca55c45806efd653906d79a9e0c8a19d55aac Mon Sep 17 00:00:00 2001 From: Daniel_M_Williams Date: Sat, 3 Mar 2018 17:00:28 -0500 Subject: [PATCH 4/6] [fix][Resolves #378] Component Preset Dialog has an appropriately sized search bar --- .../gui/dialogs/preset/ComponentPresetChooserDialog.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 c30968130..31b16d956 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java @@ -106,7 +106,7 @@ public class ComponentPresetChooserDialog extends JDialog { sub.add(filterLabel, "gapright para"); filterText = new JTextField(); - sub.add(filterText, "growx"); + sub.add(filterText, "width 50:320, growx"); filterText.getDocument().addDocumentListener(new DocumentListener() { @Override public void changedUpdate(DocumentEvent e) { @@ -174,7 +174,7 @@ public class ComponentPresetChooserDialog extends JDialog { private JPanel getFilterCheckboxes() { SymmetricComponent sc; - JPanel panel = new JPanel(new MigLayout("fill, ins 0")); + JPanel panel = new JPanel(new MigLayout("ins 0")); /* * Add show all compatible check box. From 0b1e01137a6828f09e494a50c37e61824c220d55 Mon Sep 17 00:00:00 2001 From: Daniel_M_Williams Date: Sun, 8 Apr 2018 11:25:48 -0400 Subject: [PATCH 5/6] [Resolves #397][Workaround] Hides the Component Analysis Dialog until it can be fixed. --- .../sf/openrocket/gui/main/BasicFrame.java | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java index 4d64eb138..53a169e77 100644 --- a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java +++ b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java @@ -684,18 +684,20 @@ public class BasicFrame extends JFrame { menu.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.analyze.desc")); menubar.add(menu); - //// Component analysis - item = new JMenuItem(trans.get("main.menu.analyze.componentAnalysis"), KeyEvent.VK_C); - //// Analyze the rocket components separately - item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.analyze.componentAnalysis.desc")); - item.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - log.info(Markers.USER_MARKER, "Component analysis selected"); - ComponentAnalysisDialog.showDialog(rocketpanel); - } - }); - menu.add(item); + +// TODO: reimplement this +// //// Component analysis +// item = new JMenuItem(trans.get("main.menu.analyze.componentAnalysis"), KeyEvent.VK_C); +// //// Analyze the rocket components separately +// item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.analyze.componentAnalysis.desc")); +// item.addActionListener(new ActionListener() { +// @Override +// public void actionPerformed(ActionEvent e) { +// log.info(Markers.USER_MARKER, "Component analysis selected"); +// ComponentAnalysisDialog.showDialog(rocketpanel); +// } +// }); +// menu.add(item); //// Optimize item = new JMenuItem(trans.get("main.menu.analyze.optimization"), KeyEvent.VK_O); From 32aa32da15a9866b1021672e512e417e29525af1 Mon Sep 17 00:00:00 2001 From: Daniel_M_Williams Date: Sun, 8 Apr 2018 11:29:46 -0400 Subject: [PATCH 6/6] [Workaround] Hides the Optimization Dialog until it can be fixed --- .../sf/openrocket/gui/main/BasicFrame.java | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java index 53a169e77..b4b100f2c 100644 --- a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java +++ b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java @@ -699,17 +699,18 @@ public class BasicFrame extends JFrame { // }); // menu.add(item); - //// Optimize - item = new JMenuItem(trans.get("main.menu.analyze.optimization"), KeyEvent.VK_O); - item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.analyze.optimization.desc")); - item.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - log.info(Markers.USER_MARKER, "Rocket optimization selected"); - new GeneralOptimizationDialog(document, BasicFrame.this).setVisible(true); - } - }); - menu.add(item); +// TODO: reimplement this dialog +// //// Optimize +// item = new JMenuItem(trans.get("main.menu.analyze.optimization"), KeyEvent.VK_O); +// item.getAccessibleContext().setAccessibleDescription(trans.get("main.menu.analyze.optimization.desc")); +// item.addActionListener(new ActionListener() { +// @Override +// public void actionPerformed(ActionEvent e) { +// log.info(Markers.USER_MARKER, "Rocket optimization selected"); +// new GeneralOptimizationDialog(document, BasicFrame.this).setVisible(true); +// } +// }); +// menu.add(item); //// Custom expressions item = new JMenuItem(trans.get("main.menu.analyze.customExpressions"), KeyEvent.VK_E);