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

Merge pull request #166 from kruland2607/master

Browse Source 
Various fixes for 13.11 release
This commit is contained in:
kruland2607 2013-11-12 07:41:56 -08:00
commit c311900570
17 changed files with 98 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/.classpath
View File

@ -18,12 +18,12 @@
<classpathentry kind="lib" path="lib/aopalliance.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.7.5.jar"/>
<classpathentry kind="lib" path="lib/annotation-detector-3.0.2.jar"/>
<classpathentry kind="lib" path="D:/Profiles/Administrator/git/openrocket/lib-test/uispec4j-2.3-jdk16.jar"/>
<classpathentry kind="lib" path="D:/Profiles/Administrator/git/openrocket/lib-test/hamcrest-core-1.3.0RC1.jar"/>
<classpathentry kind="lib" path="D:/Profiles/Administrator/git/openrocket/lib-test/hamcrest-library-1.3.0RC1.jar"/>
<classpathentry kind="lib" path="D:/Profiles/Administrator/git/openrocket/lib-test/jmock-2.6.0-RC2.jar"/>
<classpathentry kind="lib" path="D:/Profiles/Administrator/git/openrocket/lib-test/jmock-junit4-2.6.0-RC2.jar"/>
<classpathentry kind="lib" path="D:/Profiles/Administrator/git/openrocket/lib-test/junit-dep-4.8.2.jar"/>
<classpathentry kind="lib" path="D:/Profiles/Administrator/git/openrocket/lib-test/test-plugin.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/hamcrest-core-1.3.0RC1.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/hamcrest-library-1.3.0RC1.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/jmock-2.6.0-RC2.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/jmock-junit4-2.6.0-RC2.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/junit-dep-4.8.2.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/test-plugin.jar"/>
<classpathentry kind="lib" path="/OpenRocket Test Libraries/uispec4j-2.3-jdk16.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

2
core/src/net/sf/openrocket/document/OpenRocketDocument.java
View File

@ -287,7 +287,7 @@ public class OpenRocketDocument implements ComponentChangeListener {
}
for (Simulation s : getSimulations()) {
// Assumes modifiable collection - which it is
if (s.getConfiguration().getFlightConfigurationID().equals(configId)) {
if (configId.equals(s.getConfiguration().getFlightConfigurationID())) {
removeSimulation(s);
}
}

12
lib-test/.classpath Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="lib" path="hamcrest-core-1.3.0RC1.jar"/>
<classpathentry kind="lib" path="hamcrest-library-1.3.0RC1.jar"/>
<classpathentry kind="lib" path="jmock-2.6.0-RC2.jar"/>
<classpathentry kind="lib" path="jmock-junit4-2.6.0-RC2.jar"/>
<classpathentry kind="lib" path="junit-dep-4.8.2.jar"/>
<classpathentry kind="lib" path="test-plugin.jar"/>
<classpathentry kind="lib" path="uispec4j-2.3-jdk16.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>

1
lib-test/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/bin

17
lib-test/.project Normal file
View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>OpenRocket Test Libraries</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>

2
swing/.classpath
View File

@ -6,7 +6,6 @@
<classpathentry kind="lib" path="lib/iText-5.0.2.jar"/>
<classpathentry kind="lib" path="lib/jcommon-1.0.18.jar"/>
<classpathentry kind="lib" path="lib/jfreechart-1.0.15.jar"/>
<classpathentry kind="lib" path="lib/miglayout15-swing.jar"/>
<classpathentry kind="lib" path="lib/OrangeExtensions-1.2.jar"/>
<classpathentry kind="lib" path="lib/jogl/gluegen-rt.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/OpenRocket Core"/>
@ -21,5 +20,6 @@
<classpathentry kind="lib" path="/OpenRocket Core/resources"/>
<classpathentry kind="lib" path="resources"/>
<classpathentry kind="lib" path="/OpenRocket Core/lib/annotation-detector-3.0.2.jar"/>
<classpathentry kind="lib" path="lib/miglayout-4.0-swing.jar" sourcepath="reference/miglayout-4.0-sources.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

5
swing/build.xml
View File

@ -29,8 +29,6 @@
<!-- The main class of the application -->
<property name="main-class" value="net.sf.openrocket.startup.Startup"/>
<property name="expanded-libs" value="${lib.dir}/miglayout15-swing.jar"/>
<!-- Classpath definitions -->
<path id="classpath">
<fileset dir="${lib.dir}" includes="**/*.jar"/>
@ -93,7 +91,7 @@
<!-- Libraries to extract into base JAR -->
<zipfileset src="${core.dir}/build/jar/OpenRocket-Core.jar" />
<zipfileset src="${lib.dir}/miglayout15-swing.jar" />
<zipfileset src="${lib.dir}/miglayout-4.0-swing.jar" />
<zipfileset src="${core.dir}/lib/guice-3.0.jar" />
<zipfileset src="${core.dir}/lib/aopalliance.jar"/>
<zipfileset src="${core.dir}/lib/guice-multibindings-3.0.jar"/>
@ -101,7 +99,6 @@
<zipfileset src="${core.dir}/lib/javax.inject.jar"/>
<zipfileset src="${lib.dir}/jcommon-1.0.18.jar"/>
<zipfileset src="${lib.dir}/jfreechart-1.0.15.jar"/>
<zipfileset src="${lib.dir}/miglayout15-swing.jar"/>
<zipfileset src="${core.dir}/lib/opencsv-2.3.jar"/>
<zipfileset src="${lib.dir}/OrangeExtensions-1.2.jar"/>
<zipfileset src="${core.dir}/lib/annotation-detector-3.0.2.jar"/>

BIN
swing/lib/miglayout-4.0-swing.jar Normal file
View File

Binary file not shown.

BIN
swing/lib/miglayout15-swing.jar
View File

Binary file not shown.

BIN
swing/reference/miglayout-4.0-sources.jar Normal file
View File

Binary file not shown.

10
swing/src/net/sf/openrocket/gui/configdialog/BodyTubeConfig.java
View File

@ -15,7 +15,6 @@ import net.sf.openrocket.gui.components.BasicSlider;
import net.sf.openrocket.gui.components.UnitSelector;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.material.Material;
import net.sf.openrocket.rocketcomponent.BodyTube;
import net.sf.openrocket.rocketcomponent.MotorMount;
import net.sf.openrocket.rocketcomponent.RocketComponent;
import net.sf.openrocket.startup.Application;
@ -98,10 +97,6 @@ public class BodyTubeConfig extends RocketComponentConfig {
check.setText(trans.get("BodyTubecfg.checkbox.Filled"));
panel.add(check, "skip, span 2, wrap");
MotorConfig motorConfig = new MotorConfig((MotorMount)c);
panel.add(motorConfig,"spanx, growx");
//// Material
panel.add(materialPanel(new JPanel(new MigLayout()), Material.Type.BULK),
"cell 4 0, gapleft paragraph, aligny 0%, spany");
@ -112,6 +107,11 @@ public class BodyTubeConfig extends RocketComponentConfig {
tabbedPane.setSelectedIndex(0);
MotorConfig motorConfig = new MotorConfig((MotorMount)c);
tabbedPane.insertTab(trans.get("BodyTubecfg.tab.Motor"), null, motorConfig,
trans.get("BodyTubecfg.tab.Motormountconf"), 1);
}

10
swing/src/net/sf/openrocket/gui/configdialog/InnerTubeConfig.java
View File

@ -39,7 +39,6 @@ import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.material.Material;
import net.sf.openrocket.rocketcomponent.ClusterConfiguration;
import net.sf.openrocket.rocketcomponent.Clusterable;
import net.sf.openrocket.rocketcomponent.EngineBlock;
import net.sf.openrocket.rocketcomponent.InnerTube;
import net.sf.openrocket.rocketcomponent.MotorMount;
import net.sf.openrocket.rocketcomponent.RingComponent;
@ -168,10 +167,6 @@ public class InnerTubeConfig extends RocketComponentConfig {
new DoubleModel(component.getParent(), "Length"))),
"w 100lp, wrap");
MotorConfig motorConfig = new MotorConfig((MotorMount)c);
panel.add(motorConfig,"spanx, growx");
//// Material
panel.add(materialPanel(new JPanel(new MigLayout()), Material.Type.BULK),
"cell 4 0, gapleft paragraph, aligny 0%, spany");
@ -179,6 +174,11 @@ public class InnerTubeConfig extends RocketComponentConfig {
tabbedPane.insertTab(trans.get("ThicknessRingCompCfg.tab.General"), null, panel,
trans.get("ThicknessRingCompCfg.tab.Generalprop"), 0);
MotorConfig motorConfig = new MotorConfig((MotorMount)c);
tabbedPane.insertTab(trans.get("InnerTubeCfg.tab.Motor"), null, motorConfig,
trans.get("InnerTubeCfg.tab.ttip.Motor"), 1);
JPanel tab = clusterTab();
//// Cluster and Cluster configuration
tabbedPane.insertTab(trans.get("InnerTubeCfg.tab.Cluster"), null, tab,

1
swing/src/net/sf/openrocket/gui/configdialog/MotorConfig.java
View File

@ -39,7 +39,6 @@ public class MotorConfig extends JPanel {
this.mount = motorMount;
this.setBorder( BorderFactory.createLineBorder(Color.BLACK,1) );
BooleanModel model;
model = new BooleanModel(motorMount, "MotorMount");

4
swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java
View File

@ -352,7 +352,7 @@ public class RocketComponentConfig extends JPanel {
private JPanel commentTab() {
JPanel panel = new JPanel(new MigLayout("fill"));
JPanel panel = new JPanel(new MigLayout("fill","[]","[][grow]"));
//// Comments on the
panel.add(new StyledLabel(trans.get("RocketCompCfg.lbl.Commentsonthe") + " " + component.getComponentName() + ":",
@ -366,7 +366,7 @@ public class RocketComponentConfig extends JPanel {
GUIUtil.setTabToFocusing(commentTextArea);
commentTextArea.addFocusListener(textFieldListener);
panel.add(new JScrollPane(commentTextArea), "width 10px, height 10px, growx, growy");
panel.add(new JScrollPane(commentTextArea), "grow");
return panel;
}

34
swing/src/net/sf/openrocket/gui/configdialog/ThicknessRingComponentConfig.java Normal file
View File

@ -0,0 +1,34 @@
package net.sf.openrocket.gui.configdialog;
import javax.swing.JPanel;
import net.sf.openrocket.document.OpenRocketDocument;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.rocketcomponent.RocketComponent;
import net.sf.openrocket.startup.Application;
public class ThicknessRingComponentConfig extends RingComponentConfig {
private static final Translator trans = Application.getTranslator();
public ThicknessRingComponentConfig(OpenRocketDocument d, RocketComponent c) {
super(d, c);
JPanel tab;
//// Outer diameter:
//// Inner diameter:
//// Wall thickness:
//// Length:
tab = generalTab(trans.get("ThicknessRingCompCfg.tab.Outerdiam"),
trans.get("ThicknessRingCompCfg.tab.Innerdiam"),
trans.get("ThicknessRingCompCfg.tab.Wallthickness"), trans.get("ThicknessRingCompCfg.tab.Length"));
//// General and General properties
tabbedPane.insertTab(trans.get("ThicknessRingCompCfg.tab.General"), null, tab,
trans.get("ThicknessRingCompCfg.tab.Generalprop"), 0);
tabbedPane.setSelectedIndex(0);
}
}

4
swing/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/MotorFilterPanel.java
View File

@ -344,8 +344,6 @@ public abstract class MotorFilterPanel extends JPanel {
((SwingPreferences) Application.getPreferences()).putBoolean("motorFilterLimitLength", limitLength);
if ( mountLength != null & limitLength ) {
lengthSlider.setValueAt(1, (int) Math.min(1000,Math.round(1000*mountLength)));
} else {
lengthSlider.setValueAt(1, 1000);
}
}
@ -363,8 +361,6 @@ public abstract class MotorFilterPanel extends JPanel {
i--;
}
diameterSlider.setValueAt(1, i-1);
} else {
diameterSlider.setValueAt(1, diameterValues.length-1);
}
}

21
swing/src/net/sf/openrocket/gui/main/flightconfigpanel/MotorConfigurationPanel.java
View File

@ -49,11 +49,15 @@ public class MotorConfigurationPanel extends FlightConfigurablePanel<MotorMount>
private final JButton selectMotorButton, removeMotorButton, selectIgnitionButton, resetIgnitionButton;
private final MotorChooserDialog motorChooserDialog;
protected FlightConfigurableTableModel<MotorMount> configurationTableModel;
MotorConfigurationPanel(final FlightConfigurationPanel flightConfigurationPanel, Rocket rocket) {
super(flightConfigurationPanel,rocket);
motorChooserDialog = new MotorChooserDialog(SwingUtilities.getWindowAncestor(flightConfigurationPanel));
{
//// Select motor mounts
JPanel subpanel = new JPanel(new MigLayout(""));
@ -177,13 +181,12 @@ public class MotorConfigurationPanel extends FlightConfigurablePanel<MotorMount>
MotorConfiguration config = mount.getMotorConfiguration().get(id);
MotorChooserDialog dialog = new MotorChooserDialog(
mount,
id,
SwingUtilities.getWindowAncestor(flightConfigurationPanel));
dialog.setVisible(true);
Motor m = dialog.getSelectedMotor();
double d = dialog.getSelectedDelay();
motorChooserDialog.setMotorMountAndConfig(mount, id);
motorChooserDialog.setVisible(true);
Motor m = motorChooserDialog.getSelectedMotor();
double d = motorChooserDialog.getSelectedDelay();
if (m != null) {
config = new MotorConfiguration();
@ -257,7 +260,7 @@ public class MotorConfigurationPanel extends FlightConfigurablePanel<MotorMount>
}
c.setBorder(b);
}
@Override
public Component getTableCellRendererComponent(JTable table,Object value, boolean isSelected, boolean hasFocus, int row,int column) {
switch (column) {
@ -289,7 +292,7 @@ public class MotorConfigurationPanel extends FlightConfigurablePanel<MotorMount>
label.add(ignitionLabel);
label.validate();
return label;
// label.setText(motorString + " " + ignitionString);
// label.setText(motorString + " " + ignitionString);
}
private String getMotorSpecification(MotorMount mount, MotorConfiguration motorConfig) {