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

Merge pull request #365 from teyrana/rc0

Browse Source 
Bugfix Aggregation: release-candidate-0
This commit is contained in:
Wes Cravens 2017-09-28 09:21:17 -05:00 committed by GitHub
commit e5f40c375d
22 changed files with 288 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -1,5 +1,11 @@
language: java language: java
dist: trusty
sudo: false
addons:
apt:
packages:
- ant-optional
jdk: jdk:
- oraclejdk7 - openjdk7
script: script:
- "ant -buildfile build.xml clean check jar unittest" - "ant -buildfile build.xml clean check jar unittest"

2
core/build.xml
View File

@ -88,7 +88,7 @@
<target name="unittest" description="Execute unit tests" depends="build"> <target name="unittest" description="Execute unit tests" depends="build">
<echo>Building unit tests</echo> <echo>Building unit tests</echo>
<mkdir dir="${build-test.dir}"/> <mkdir dir="${build-test.dir}"/>
<javac debug="true" srcdir="${src-test.dir}" destdir="${build-test.dir}" classpathref="test-classpath"/> <javac debug="true" srcdir="${src-test.dir}" destdir="${build-test.dir}" classpathref="test-classpath" includeantruntime="false"/>
<echo>Running unit tests</echo> <echo>Running unit tests</echo>
<mkdir dir="${tmp.dir}/rawtestoutput"/> <mkdir dir="${tmp.dir}/rawtestoutput"/>

4
core/resources/l10n/messages.properties
View File

@ -830,8 +830,8 @@ RocketCompCfg.lbl.Componentname = Component name:
RocketCompCfg.ttip.Thecomponentname = The component name. RocketCompCfg.ttip.Thecomponentname = The component name.
RocketCompCfg.tab.Override = Override RocketCompCfg.tab.Override = Override
RocketCompCfg.tab.MassandCGoverride = Mass and CG override options RocketCompCfg.tab.MassandCGoverride = Mass and CG override options
RocketCompCfg.tab.Parallel = Parallel RocketCompCfg.tab.Assembly = General
RocketCompCfg.tab.ParallelComment = Options for locating stages parallel to other stages RocketCompCfg.tab.AssemblyComment = Options for locating stages parallel to other stages
RocketCompCfg.tab.Figure = Figure RocketCompCfg.tab.Figure = Figure
RocketCompCfg.tab.Figstyleopt = Figure style options RocketCompCfg.tab.Figstyleopt = Figure style options
RocketCompCfg.tab.Comment = Comment RocketCompCfg.tab.Comment = Comment

1
core/resources/l10n/messages_fr.properties
View File

@ -819,6 +819,7 @@ RocketCompCfg.but.Setforall = Appliquer \u00E0 tous
RocketCompCfg.but.ttip.Setforall = R\u00E9gler la finition pour tous les composants de la fus\u00E9e. RocketCompCfg.but.ttip.Setforall = R\u00E9gler la finition pour tous les composants de la fus\u00E9e.
RocketCompCfg.checkbox.Endcapped = Arri\u00E8re clos RocketCompCfg.checkbox.Endcapped = Arri\u00E8re clos
RocketCompCfg.checkbox.Overridecenterofgrav = Forcer le centre de gravit\u00E9: RocketCompCfg.checkbox.Overridecenterofgrav = Forcer le centre de gravit\u00E9:
RocketCompCfg.checkbox.Overridecoeffofdrag = Modifier le coefficient de trainee:
RocketCompCfg.checkbox.Overridemass = Forcer la masse: RocketCompCfg.checkbox.Overridemass = Forcer la masse:
RocketCompCfg.checkbox.OverridemassandCG = Forcer la masse et le centre de gravit\u00E9 de tous les sous composants RocketCompCfg.checkbox.OverridemassandCG = Forcer la masse et le centre de gravit\u00E9 de tous les sous composants
RocketCompCfg.checkbox.Usedefaultcolor = Utiliser la couleur par d\u00E9faut RocketCompCfg.checkbox.Usedefaultcolor = Utiliser la couleur par d\u00E9faut

1
core/resources/l10n/messages_pt.properties
View File

@ -804,6 +804,7 @@ RocketCompCfg.but.Setforall = Definir para todos
RocketCompCfg.but.ttip.Setforall = Definir este acabamento para todos os componentes do foguete. RocketCompCfg.but.ttip.Setforall = Definir este acabamento para todos os componentes do foguete.
RocketCompCfg.checkbox.Endcapped = Fim tampado RocketCompCfg.checkbox.Endcapped = Fim tampado
RocketCompCfg.checkbox.Overridecenterofgrav = Modificar o centro de gravidade: RocketCompCfg.checkbox.Overridecenterofgrav = Modificar o centro de gravidade:
RocketCompCfg.checkbox.Overridecoeffofdrag = Modificar o coeficiente de arrasto:
RocketCompCfg.checkbox.Overridemass = Modificar massa: RocketCompCfg.checkbox.Overridemass = Modificar massa:
RocketCompCfg.checkbox.OverridemassandCG = Modificar a massa e o CG de todos os subcomponentes RocketCompCfg.checkbox.OverridemassandCG = Modificar a massa e o CG de todos os subcomponentes
RocketCompCfg.checkbox.Usedefaultcolor = Use a cor padr\u00e3o RocketCompCfg.checkbox.Usedefaultcolor = Use a cor padr\u00e3o

1
core/resources/l10n/messages_uk_UA.properties
View File

@ -799,6 +799,7 @@ RocketCompCfg.but.ttip.Setforall = Set this finish for all components of the roc
RocketCompCfg.lbl.Overridemassorcenter = Override the mass or center of gravity of the RocketCompCfg.lbl.Overridemassorcenter = Override the mass or center of gravity of the
RocketCompCfg.checkbox.Overridemass = Override mass: RocketCompCfg.checkbox.Overridemass = Override mass:
RocketCompCfg.checkbox.Overridecenterofgrav = Override center of gravity: RocketCompCfg.checkbox.Overridecenterofgrav = Override center of gravity:
RocketCompCfg.checkbox.Overridecoeffofdrag = Override coefficient of drag:
RocketCompCfg.checkbox.OverridemassandCG = Override mass and CG of all subcomponents RocketCompCfg.checkbox.OverridemassandCG = Override mass and CG of all subcomponents
RocketCompCfg.lbl.longB1 = <html>The overridden mass does not include motors.<br> RocketCompCfg.lbl.longB1 = <html>The overridden mass does not include motors.<br>
RocketCompCfg.lbl.longB2 = The center of gravity is measured from the front end of the RocketCompCfg.lbl.longB2 = The center of gravity is measured from the front end of the

16
core/src/net/sf/openrocket/aerodynamics/AerodynamicForces.java
View File

@ -196,6 +196,10 @@ public class AerodynamicForces implements Cloneable, Monitorable {
} }
public double getCD() { public double getCD() {
if(component == null) return CD;
if(component.isCDOverridden()) {
return component.getOverrideCD();
}
return CD; return CD;
} }
@ -205,6 +209,10 @@ public class AerodynamicForces implements Cloneable, Monitorable {
} }
public double getPressureCD() { public double getPressureCD() {
if(component == null) return pressureCD;
if(component.isCDOverridden()) {
return 0;
}
return pressureCD; return pressureCD;
} }
@ -214,6 +222,10 @@ public class AerodynamicForces implements Cloneable, Monitorable {
} }
public double getBaseCD() { public double getBaseCD() {
if(component == null) return baseCD;
if(component.isCDOverridden()) {
return component.getOverrideCD();
}
return baseCD; return baseCD;
} }
@ -223,6 +235,10 @@ public class AerodynamicForces implements Cloneable, Monitorable {
} }
public double getFrictionCD() { public double getFrictionCD() {
if(component == null) return frictionCD;
if(component.isCDOverridden()) {
return 0;
}
return frictionCD; return frictionCD;
} }

15
core/src/net/sf/openrocket/aerodynamics/BarrowmanCalculator.java
View File

@ -463,6 +463,10 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator {
} }
//Handle Overriden CD for Whole Rocket
if(c.isCDOverridden()) {
continue;
}
// Calculate the friction drag: // Calculate the friction drag:
@ -497,6 +501,8 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator {
} }
} }
// fB may be POSITIVE_INFINITY, but that's ok for us // fB may be POSITIVE_INFINITY, but that's ok for us
double fB = (len + 0.0001) / maxR; double fB = (len + 0.0001) / maxR;
@ -511,6 +517,8 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator {
} }
} }
return (finFriction + correction * bodyFriction) / conditions.getRefArea(); return (finFriction + correction * bodyFriction) / conditions.getRefArea();
} }
@ -550,6 +558,8 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator {
map.get(c).setPressureCD(cd); map.get(c).setPressureCD(cd);
} }
if(c.isCDOverridden()) continue;
// Stagnation drag // Stagnation drag
if (c instanceof SymmetricComponent) { if (c instanceof SymmetricComponent) {
@ -600,6 +610,11 @@ public class BarrowmanCalculator extends AbstractAerodynamicCalculator {
SymmetricComponent s = (SymmetricComponent) c; SymmetricComponent s = (SymmetricComponent) c;
if(c.isCDOverridden()) {
total += c.getOverrideCD();
continue;
}
if (radius > s.getForeRadius()) { if (radius > s.getForeRadius()) {
double area = Math.PI * (pow2(radius) - pow2(s.getForeRadius())); double area = Math.PI * (pow2(radius) - pow2(s.getForeRadius()));
double cd = base * area / conditions.getRefArea(); double cd = base * area / conditions.getRefArea();

3
core/src/net/sf/openrocket/file/openrocket/importt/DocumentConfig.java
View File

@ -125,6 +125,9 @@ class DocumentConfig {
setters.put("RocketComponent:overridecg", new OverrideSetter( setters.put("RocketComponent:overridecg", new OverrideSetter(
Reflection.findMethod(RocketComponent.class, "setOverrideCGX", double.class), Reflection.findMethod(RocketComponent.class, "setOverrideCGX", double.class),
Reflection.findMethod(RocketComponent.class, "setCGOverridden", boolean.class))); Reflection.findMethod(RocketComponent.class, "setCGOverridden", boolean.class)));
setters.put("RocketComponent:overridecd", new OverrideSetter(
Reflection.findMethod(RocketComponent.class, "setOverrideCD", double.class),
Reflection.findMethod(RocketComponent.class, "setCDOverridden", boolean.class)));
setters.put("RocketComponent:overridesubcomponents", new BooleanSetter( setters.put("RocketComponent:overridesubcomponents", new BooleanSetter(
Reflection.findMethod(RocketComponent.class, "setOverrideSubcomponents", boolean.class))); Reflection.findMethod(RocketComponent.class, "setOverrideSubcomponents", boolean.class)));
setters.put("RocketComponent:comment", new StringSetter( setters.put("RocketComponent:comment", new StringSetter(

4
core/src/net/sf/openrocket/file/openrocket/savers/RocketComponentSaver.java
View File

@ -125,6 +125,10 @@ public class RocketComponentSaver {
elements.add("<overridecg>" + c.getOverrideCGX() + "</overridecg>"); elements.add("<overridecg>" + c.getOverrideCGX() + "</overridecg>");
overridden = true; overridden = true;
} }
if (c.isCDOverridden()) {
elements.add("<overridecd>" + c.getOverrideCD() + "</overridecd>");
overridden = true;
}
if (overridden) { if (overridden) {
elements.add("<overridesubcomponents>" + c.getOverrideSubcomponents() elements.add("<overridesubcomponents>" + c.getOverrideSubcomponents()
+ "</overridesubcomponents>"); + "</overridesubcomponents>");

6
core/src/net/sf/openrocket/optimization/services/DefaultSimulationModifierService.java
View File

@ -215,7 +215,7 @@ public class DefaultSimulationModifierService implements SimulationModifierServi
trans.get("optimization.modifier.internalcomponent.position"), trans.get("optimization.modifier.internalcomponent.position"),
trans.get("optimization.modifier.internalcomponent.position.desc"), trans.get("optimization.modifier.internalcomponent.position.desc"),
c, UnitGroup.UNITS_LENGTH, c, UnitGroup.UNITS_LENGTH,
1.0, c.getClass(), c.getID(), "PositionValue"); 1.0, c.getClass(), c.getID(), "RelativePosition");
mod.setMinValue(0); mod.setMinValue(0);
mod.setMaxValue(parent.getLength()); mod.setMaxValue(parent.getLength());
modifiers.add(mod); modifiers.add(mod);
@ -229,7 +229,7 @@ public class DefaultSimulationModifierService implements SimulationModifierServi
trans.get("optimization.modifier.finset.position"), trans.get("optimization.modifier.finset.position"),
trans.get("optimization.modifier.finset.position.desc"), trans.get("optimization.modifier.finset.position.desc"),
c, UnitGroup.UNITS_LENGTH, c, UnitGroup.UNITS_LENGTH,
1.0, c.getClass(), c.getID(), "PositionValue"); 1.0, c.getClass(), c.getID(), "RelativePosition");
mod.setMinValue(0); mod.setMinValue(0);
mod.setMaxValue(parent.getLength()); mod.setMaxValue(parent.getLength());
modifiers.add(mod); modifiers.add(mod);
@ -243,7 +243,7 @@ public class DefaultSimulationModifierService implements SimulationModifierServi
trans.get("optimization.modifier.launchlug.position"), trans.get("optimization.modifier.launchlug.position"),
trans.get("optimization.modifier.launchlug.position.desc"), trans.get("optimization.modifier.launchlug.position.desc"),
c, UnitGroup.UNITS_LENGTH, c, UnitGroup.UNITS_LENGTH,
1.0, c.getClass(), c.getID(), "PositionValue"); 1.0, c.getClass(), c.getID(), "RelativePosition");
mod.setMinValue(0); mod.setMinValue(0);
mod.setMaxValue(parent.getLength()); mod.setMaxValue(parent.getLength());
modifiers.add(mod); modifiers.add(mod);

6
core/src/net/sf/openrocket/rocketcomponent/ParallelStage.java
View File

@ -218,11 +218,11 @@ public class ParallelStage extends AxialStage implements FlightConfigurableCompo
super.update(); super.update();
if( this.autoRadialPosition ){ if( this.autoRadialPosition ){
AxialStage parentStage = (AxialStage)this.parent; ComponentAssembly parentAssembly = (ComponentAssembly)this.parent;
if( null == parentStage ){ if( null == parentAssembly ){
this.radialPosition_m = this.getOuterRadius(); this.radialPosition_m = this.getOuterRadius();
}else{ }else{
this.radialPosition_m = this.getOuterRadius() + parentStage.getOuterRadius(); this.radialPosition_m = this.getOuterRadius() + parentAssembly.getOuterRadius();
} }
} }
} }

27
core/src/net/sf/openrocket/rocketcomponent/PodSet.java
View File

@ -17,6 +17,7 @@ public class PodSet extends ComponentAssembly implements RingInstanceable {
protected double angularSeparation = Math.PI; protected double angularSeparation = Math.PI;
protected double angularPosition_rad = 0; protected double angularPosition_rad = 0;
protected boolean autoRadialPosition = false;
protected double radialPosition_m = 0; protected double radialPosition_m = 0;
public PodSet() { public PodSet() {
@ -175,18 +176,21 @@ public class PodSet extends ComponentAssembly implements RingInstanceable {
return (this.getInstanceCount() + "-ring"); return (this.getInstanceCount() + "-ring");
} }
@Override
public boolean getAutoRadialOffset(){
return this.autoRadialPosition;
}
public void setAutoRadialOffset( final boolean enabled ){
this.autoRadialPosition = enabled;
fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE);
}
@Override @Override
public double getRadialOffset() { public double getRadialOffset() {
return this.radialPosition_m; return this.radialPosition_m;
} }
@Override
public boolean getAutoRadialOffset(){
return false;
}
@Override @Override
public int getInstanceCount() { public int getInstanceCount() {
return this.count; return this.count;
@ -234,4 +238,17 @@ public class PodSet extends ComponentAssembly implements RingInstanceable {
fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE); fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE);
} }
@Override
protected void update(){
super.update();
if( this.autoRadialPosition){
ComponentAssembly parentAssembly = (ComponentAssembly)this.parent;
if( null == parentAssembly ){
this.radialPosition_m = this.getOuterRadius();
}else{
this.radialPosition_m = this.getOuterRadius() + parentAssembly.getOuterRadius();
}
}
}
} }

56
core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
View File

@ -133,6 +133,8 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
private boolean massOverriden = false; private boolean massOverriden = false;
private double overrideCGX = 0; private double overrideCGX = 0;
private boolean cgOverriden = false; private boolean cgOverriden = false;
private double overrideCD = 0;
private boolean cdOverriden = false;
private boolean overrideSubcomponents = false; private boolean overrideSubcomponents = false;
@ -638,6 +640,60 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab
/** Return the current override CD. The CD is not neccesarily overriden.
*
* @return the override CG.
*/
public final double getOverrideCD() {
mutex.verify();
return overrideCD;
}
/**
* Set the current override CD to x.
*
* @param x the override CD to set.
*/
public final void setOverrideCD(double x) {
if (MathUtil.equals(overrideCD, x))
return;
checkState();
this.overrideCD = x;
if (isCDOverridden())
fireComponentChangeEvent(ComponentChangeEvent.MASS_CHANGE);
else
fireComponentChangeEvent(ComponentChangeEvent.NONFUNCTIONAL_CHANGE);
}
/**
* Return whether the CD is currently overriden.
*
* @return whether the CD is overridden
*/
public final boolean isCDOverridden() {
mutex.verify();
return cdOverriden;
}
/**
* Set whether the CD is currently overriden.
*
* @param o whether the CD is overriden
*/
public final void setCDOverridden(boolean o) {
if(cdOverriden == o) {
return;
}
checkState();
cdOverriden = o;
fireComponentChangeEvent(ComponentChangeEvent.MASS_CHANGE);
}
/** /**
* Return whether the mass and/or CG override overrides all subcomponent values * Return whether the mass and/or CG override overrides all subcomponent values
* as well. The default implementation is a normal getter/setter implementation, * as well. The default implementation is a normal getter/setter implementation,

2
core/src/net/sf/openrocket/simulation/AbstractSimulationStepper.java
View File

@ -174,7 +174,7 @@ public abstract class AbstractSimulationStepper implements SimulationStepper {
* @param stepMotors whether to step the motors forward or work on a clone object * @param stepMotors whether to step the motors forward or work on a clone object
* @return the average thrust during the time step. * @return the average thrust during the time step.
*/ */
protected double calculateAvrageThrust(SimulationStatus status, double timestep, protected double calculateAverageThrust(SimulationStatus status, double timestep,
double acceleration, AtmosphericConditions atmosphericConditions, double acceleration, AtmosphericConditions atmosphericConditions,
boolean stepMotors) throws SimulationException { boolean stepMotors) throws SimulationException {
double thrust; double thrust;

4
core/src/net/sf/openrocket/simulation/MotorClusterState.java
View File

@ -129,7 +129,9 @@ public class MotorClusterState {
if( this.currentState.isThrusting() ) { if( this.currentState.isThrusting() ) {
double motorStartTime = this.getMotorTime( startSimulationTime); double motorStartTime = this.getMotorTime( startSimulationTime);
double motorEndTime = this.getMotorTime( endSimulationTime); double motorEndTime = this.getMotorTime( endSimulationTime);
return this.motorCount * motor.getAverageThrust( motorStartTime, motorEndTime );
int instanceCount = this.config.getMount().getLocations().length;
return instanceCount * motor.getAverageThrust( motorStartTime, motorEndTime );
}else{ }else{
return 0.00; return 0.00;
} }

4
core/src/net/sf/openrocket/simulation/RK4SimulationStepper.java
View File

@ -111,7 +111,7 @@ public class RK4SimulationStepper extends AbstractSimulationStepper {
/* /*
* Compute the initial thrust estimate. This is used for the first time step computation. * Compute the initial thrust estimate. This is used for the first time step computation.
*/ */
store.thrustForce = calculateAvrageThrust(status, store.timestep, status.getPreviousAcceleration(), store.thrustForce = calculateAverageThrust(status, store.timestep, status.getPreviousAcceleration(),
status.getPreviousAtmosphericConditions(), false); status.getPreviousAtmosphericConditions(), false);
@ -180,7 +180,7 @@ public class RK4SimulationStepper extends AbstractSimulationStepper {
* diminished by it affecting only 1/6th of the total, so it's an acceptable error. * diminished by it affecting only 1/6th of the total, so it's an acceptable error.
*/ */
double thrustEstimate = store.thrustForce; double thrustEstimate = store.thrustForce;
store.thrustForce = calculateAvrageThrust(status, store.timestep, store.longitudinalAcceleration, store.thrustForce = calculateAverageThrust(status, store.timestep, store.longitudinalAcceleration,
store.atmosphericConditions, true); store.atmosphericConditions, true);
log.trace("Thrust at time " + store.timestep + " thrustForce = " + store.thrustForce); log.trace("Thrust at time " + store.timestep + " thrustForce = " + store.thrustForce);
double thrustDiff = Math.abs(store.thrustForce - thrustEstimate); double thrustDiff = Math.abs(store.thrustForce - thrustEstimate);

106
swing/src/net/sf/openrocket/gui/configdialog/ComponentAssemblyConfig.java
View File

@ -1,14 +1,114 @@
package net.sf.openrocket.gui.configdialog; package net.sf.openrocket.gui.configdialog;
import net.sf.openrocket.document.OpenRocketDocument; import javax.swing.ComboBoxModel;
import net.sf.openrocket.rocketcomponent.RocketComponent; import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
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.BooleanModel;
import net.sf.openrocket.gui.adaptors.DoubleModel;
import net.sf.openrocket.gui.adaptors.EnumModel;
import net.sf.openrocket.gui.adaptors.IntegerModel;
import net.sf.openrocket.gui.components.UnitSelector;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.rocketcomponent.ComponentAssembly;
import net.sf.openrocket.rocketcomponent.ParallelStage;
import net.sf.openrocket.rocketcomponent.PodSet;
import net.sf.openrocket.rocketcomponent.RocketComponent;
import net.sf.openrocket.startup.Application;
import net.sf.openrocket.unit.UnitGroup;
@SuppressWarnings("serial")
public class ComponentAssemblyConfig extends RocketComponentConfig { public class ComponentAssemblyConfig extends RocketComponentConfig {
private static final long serialVersionUID = -5153592258788614257L;
private static final Translator trans = Application.getTranslator();
public ComponentAssemblyConfig(OpenRocketDocument document, RocketComponent component) { public ComponentAssemblyConfig(OpenRocketDocument document, RocketComponent component) {
super(document, component); super(document, component);
// only stages which are actually off-centerline will get the dialog here:
if( ParallelStage.class.isAssignableFrom( component.getClass()) || PodSet.class.isAssignableFrom( component.getClass())){
tabbedPane.insertTab( trans.get("RocketCompCfg.tab.Assembly"), null, parallelTab( (ComponentAssembly)component ), trans.get("RocketCompCfg.tab.AssemblyComment"), 0);
tabbedPane.setSelectedIndex(0);
}
} }
private JPanel parallelTab( final ComponentAssembly boosters ){
JPanel motherPanel = new JPanel( new MigLayout("fill"));
// auto radial distance
BooleanModel autoRadOffsModel = new BooleanModel( boosters, "AutoRadialOffset");
JCheckBox autoRadCheckBox = new JCheckBox( autoRadOffsModel );
autoRadCheckBox.setText( trans.get("StageConfig.parallel.autoradius"));
motherPanel.add( autoRadCheckBox, "align left, wrap");
// set radial distance
JLabel radiusLabel = new JLabel(trans.get("StageConfig.parallel.radius"));
motherPanel.add( radiusLabel , "align left");
autoRadOffsModel.addEnableComponent(radiusLabel, false);
DoubleModel radiusModel = new DoubleModel( boosters, "RadialOffset", UnitGroup.UNITS_LENGTH, 0);
JSpinner radiusSpinner = new JSpinner( radiusModel.getSpinnerModel());
radiusSpinner.setEditor(new SpinnerEditor(radiusSpinner ));
motherPanel.add(radiusSpinner , "growx 1, align right");
autoRadOffsModel.addEnableComponent(radiusSpinner, false);
UnitSelector radiusUnitSelector = new UnitSelector(radiusModel);
motherPanel.add(radiusUnitSelector, "growx 1, wrap");
autoRadOffsModel.addEnableComponent(radiusUnitSelector, false);
// set location angle around the primary stage
JLabel angleLabel = new JLabel(trans.get("StageConfig.parallel.angle"));
motherPanel.add( angleLabel, "align left");
DoubleModel angleModel = new DoubleModel( boosters, "AngularOffset", 1.0, UnitGroup.UNITS_ANGLE, 0.0, Math.PI*2);
JSpinner angleSpinner = new JSpinner(angleModel.getSpinnerModel());
angleSpinner.setEditor(new SpinnerEditor(angleSpinner));
motherPanel.add(angleSpinner, "growx 1");
UnitSelector angleUnitSelector = new UnitSelector(angleModel);
motherPanel.add( angleUnitSelector, "growx 1, wrap");
// set multiplicity
JLabel countLabel = new JLabel(trans.get("StageConfig.parallel.count"));
motherPanel.add( countLabel, "align left");
IntegerModel countModel = new IntegerModel( boosters, "InstanceCount", 2);
JSpinner countSpinner = new JSpinner(countModel.getSpinnerModel());
countSpinner.setEditor(new SpinnerEditor(countSpinner));
motherPanel.add(countSpinner, "growx 1, wrap");
// setPositions relative to parent component
JLabel positionLabel = new JLabel(trans.get("LaunchLugCfg.lbl.Posrelativeto"));
motherPanel.add( positionLabel);
ComboBoxModel<RocketComponent.Position> relativePositionMethodModel = new EnumModel<RocketComponent.Position>(component, "RelativePositionMethod",
new RocketComponent.Position[] {
RocketComponent.Position.TOP,
RocketComponent.Position.MIDDLE,
RocketComponent.Position.BOTTOM,
RocketComponent.Position.ABSOLUTE
});
JComboBox<?> positionMethodCombo = new JComboBox<RocketComponent.Position>( relativePositionMethodModel );
motherPanel.add(positionMethodCombo, "spanx 2, growx, wrap");
// relative offset labels
JLabel positionPlusLabel = new JLabel(trans.get("StageConfig.parallel.offset"));
motherPanel.add( positionPlusLabel );
DoubleModel axialOffsetModel = new DoubleModel( boosters, "AxialOffset", UnitGroup.UNITS_LENGTH);
JSpinner axPosSpin= new JSpinner( axialOffsetModel.getSpinnerModel());
axPosSpin.setEditor(new SpinnerEditor(axPosSpin));
motherPanel.add(axPosSpin, "growx");
UnitSelector axialOffsetUnitSelector = new UnitSelector(axialOffsetModel);
motherPanel.add(axialOffsetUnitSelector, "growx 1, wrap");
// For DEBUG purposes
//System.err.println(assembly.getRocket().toDebugTree());
return motherPanel;
}
} }

110
swing/src/net/sf/openrocket/gui/configdialog/ParallelStageConfig.java
View File

@ -1,110 +0,0 @@
package net.sf.openrocket.gui.configdialog;
import javax.swing.ComboBoxModel;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
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.BooleanModel;
import net.sf.openrocket.gui.adaptors.DoubleModel;
import net.sf.openrocket.gui.adaptors.EnumModel;
import net.sf.openrocket.gui.adaptors.IntegerModel;
import net.sf.openrocket.gui.components.UnitSelector;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.rocketcomponent.ParallelStage;
import net.sf.openrocket.rocketcomponent.RocketComponent;
import net.sf.openrocket.startup.Application;
import net.sf.openrocket.unit.UnitGroup;
public class ParallelStageConfig extends AxialStageConfig {
private static final long serialVersionUID = -944969957186522471L;
private static final Translator trans = Application.getTranslator();
public ParallelStageConfig(OpenRocketDocument document, RocketComponent component) {
super(document, component);
// only stages which are actually off-centerline will get the dialog here:
tabbedPane.insertTab( trans.get("RocketCompCfg.tab.Parallel"), null, parallelTab( (ParallelStage)component ), trans.get("RocketCompCfg.tab.ParallelComment"), 1);
}
private JPanel parallelTab( final ParallelStage boosters ){
JPanel motherPanel = new JPanel( new MigLayout("fill"));
// auto radial distance
BooleanModel autoRadOffsModel = new BooleanModel( boosters, "AutoRadialOffset");
JCheckBox autoRadCheckBox = new JCheckBox( autoRadOffsModel );
autoRadCheckBox.setText( trans.get("StageConfig.parallel.autoradius"));
motherPanel.add( autoRadCheckBox, "align left, wrap");
// set radial distance
JLabel radiusLabel = new JLabel(trans.get("StageConfig.parallel.radius"));
motherPanel.add( radiusLabel , "align left");
autoRadOffsModel.addEnableComponent(radiusLabel, false);
DoubleModel radiusModel = new DoubleModel( boosters, "RadialOffset", UnitGroup.UNITS_LENGTH, 0);
JSpinner radiusSpinner = new JSpinner( radiusModel.getSpinnerModel());
radiusSpinner.setEditor(new SpinnerEditor(radiusSpinner ));
motherPanel.add(radiusSpinner , "growx 1, align right");
autoRadOffsModel.addEnableComponent(radiusSpinner, false);
UnitSelector radiusUnitSelector = new UnitSelector(radiusModel);
motherPanel.add(radiusUnitSelector, "growx 1, wrap");
autoRadOffsModel.addEnableComponent(radiusUnitSelector, false);
// set location angle around the primary stage
JLabel angleLabel = new JLabel(trans.get("StageConfig.parallel.angle"));
motherPanel.add( angleLabel, "align left");
DoubleModel angleModel = new DoubleModel( boosters, "AngularOffset", 1.0, UnitGroup.UNITS_ANGLE, 0.0, Math.PI*2);
JSpinner angleSpinner = new JSpinner(angleModel.getSpinnerModel());
angleSpinner.setEditor(new SpinnerEditor(angleSpinner));
motherPanel.add(angleSpinner, "growx 1");
UnitSelector angleUnitSelector = new UnitSelector(angleModel);
motherPanel.add( angleUnitSelector, "growx 1, wrap");
// set multiplicity
JLabel countLabel = new JLabel(trans.get("StageConfig.parallel.count"));
motherPanel.add( countLabel, "align left");
IntegerModel countModel = new IntegerModel( boosters, "InstanceCount", 2);
JSpinner countSpinner = new JSpinner(countModel.getSpinnerModel());
countSpinner.setEditor(new SpinnerEditor(countSpinner));
motherPanel.add(countSpinner, "growx 1, wrap");
// setPositions relative to parent component
JLabel positionLabel = new JLabel(trans.get("LaunchLugCfg.lbl.Posrelativeto"));
motherPanel.add( positionLabel);
// EnumModel(ChangeSource source, String valueName, Enum<T>[] values) {
@SuppressWarnings("unchecked")
ComboBoxModel<RocketComponent.Position> relativePositionMethodModel = new EnumModel<RocketComponent.Position>(component, "RelativePositionMethod",
new RocketComponent.Position[] {
RocketComponent.Position.TOP,
RocketComponent.Position.MIDDLE,
RocketComponent.Position.BOTTOM,
RocketComponent.Position.ABSOLUTE
});
JComboBox<?> positionMethodCombo = new JComboBox<RocketComponent.Position>( relativePositionMethodModel );
motherPanel.add(positionMethodCombo, "spanx 2, growx, wrap");
// relative offset labels
JLabel positionPlusLabel = new JLabel(trans.get("StageConfig.parallel.offset"));
motherPanel.add( positionPlusLabel );
DoubleModel axialOffsetModel = new DoubleModel( boosters, "AxialOffset", UnitGroup.UNITS_LENGTH);
JSpinner axPosSpin= new JSpinner( axialOffsetModel.getSpinnerModel());
axPosSpin.setEditor(new SpinnerEditor(axPosSpin));
motherPanel.add(axPosSpin, "growx");
UnitSelector axialOffsetUnitSelector = new UnitSelector(axialOffsetModel);
motherPanel.add(axialOffsetUnitSelector, "growx 1, wrap");
// For DEBUG purposes
//System.err.println(assembly.getRocket().toDebugTree());
return motherPanel;
}
}

100
swing/src/net/sf/openrocket/gui/configdialog/PodSetConfig.java
View File

@ -1,100 +0,0 @@
package net.sf.openrocket.gui.configdialog;
import javax.swing.ComboBoxModel;
import javax.swing.JComboBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
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.DoubleModel;
import net.sf.openrocket.gui.adaptors.EnumModel;
import net.sf.openrocket.gui.adaptors.IntegerModel;
import net.sf.openrocket.gui.components.UnitSelector;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.rocketcomponent.ComponentAssembly;
import net.sf.openrocket.rocketcomponent.RocketComponent;
import net.sf.openrocket.startup.Application;
import net.sf.openrocket.unit.UnitGroup;
@SuppressWarnings("serial")
public class PodSetConfig extends RocketComponentConfig {
private static final Translator trans = Application.getTranslator();
public PodSetConfig(OpenRocketDocument document, RocketComponent component) {
super(document, component);
// only stages which are actually off-centerline will get the dialog here:
tabbedPane.insertTab( trans.get("RocketCompCfg.tab.Parallel"), null, parallelTab( (ComponentAssembly) component ), trans.get("RocketCompCfg.tab.ParallelComment"), 1);
}
private JPanel parallelTab( final ComponentAssembly assembly ){
JPanel motherPanel = new JPanel( new MigLayout("fill"));
// set radial distance
JLabel radiusLabel = new JLabel(trans.get("StageConfig.parallel.radius"));
motherPanel.add( radiusLabel , "align left");
DoubleModel radiusModel = new DoubleModel( assembly, "RadialOffset", UnitGroup.UNITS_LENGTH, 0);
JSpinner radiusSpinner = new JSpinner( radiusModel.getSpinnerModel());
radiusSpinner.setEditor(new SpinnerEditor(radiusSpinner ));
motherPanel.add(radiusSpinner , "growx 1, align right");
UnitSelector radiusUnitSelector = new UnitSelector(radiusModel);
motherPanel.add(radiusUnitSelector, "growx 1, wrap");
// set location angle around the primary stage
JLabel angleLabel = new JLabel(trans.get("StageConfig.parallel.angle"));
motherPanel.add( angleLabel, "align left");
DoubleModel angleModel = new DoubleModel( assembly, "AngularOffset", 1.0, UnitGroup.UNITS_ANGLE, 0.0, Math.PI*2);
JSpinner angleSpinner = new JSpinner(angleModel.getSpinnerModel());
angleSpinner.setEditor(new SpinnerEditor(angleSpinner));
motherPanel.add(angleSpinner, "growx 1");
UnitSelector angleUnitSelector = new UnitSelector(angleModel);
motherPanel.add( angleUnitSelector, "growx 1, wrap");
// set multiplicity
JLabel countLabel = new JLabel(trans.get("StageConfig.parallel.count"));
motherPanel.add( countLabel, "align left");
IntegerModel countModel = new IntegerModel( assembly, "InstanceCount", 2);
JSpinner countSpinner = new JSpinner(countModel.getSpinnerModel());
countSpinner.setEditor(new SpinnerEditor(countSpinner));
motherPanel.add(countSpinner, "growx 1, wrap");
// setPositions relative to parent component
JLabel positionLabel = new JLabel(trans.get("LaunchLugCfg.lbl.Posrelativeto"));
motherPanel.add( positionLabel);
// EnumModel(ChangeSource source, String valueName, Enum<T>[] values) {
ComboBoxModel<RocketComponent.Position> relativePositionMethodModel = new EnumModel<RocketComponent.Position>(component, "RelativePositionMethod",
new RocketComponent.Position[] {
RocketComponent.Position.TOP,
RocketComponent.Position.MIDDLE,
RocketComponent.Position.BOTTOM,
RocketComponent.Position.ABSOLUTE
});
JComboBox<?> positionMethodCombo = new JComboBox<RocketComponent.Position>( relativePositionMethodModel );
motherPanel.add(positionMethodCombo, "spanx 2, growx, wrap");
// relative offset labels
JLabel positionPlusLabel = new JLabel(trans.get("StageConfig.parallel.offset"));
motherPanel.add( positionPlusLabel );
DoubleModel axialOffsetModel = new DoubleModel( assembly, "AxialOffset", UnitGroup.UNITS_LENGTH);
JSpinner axPosSpin= new JSpinner( axialOffsetModel.getSpinnerModel());
axPosSpin.setEditor(new SpinnerEditor(axPosSpin));
motherPanel.add(axPosSpin, "growx");
UnitSelector axialOffsetUnitSelector = new UnitSelector(axialOffsetModel);
motherPanel.add(axialOffsetUnitSelector, "growx 1, wrap");
// For DEBUG purposes
//System.err.println(assembly.getRocket().toDebugTree());
return motherPanel;
}
}

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

@ -24,6 +24,8 @@ import javax.swing.JTabbedPane;
import javax.swing.JTextArea; import javax.swing.JTextArea;
import javax.swing.JTextField; import javax.swing.JTextField;
import java.text.DecimalFormat;
import net.miginfocom.swing.MigLayout; import net.miginfocom.swing.MigLayout;
import net.sf.openrocket.database.ComponentPresetDatabase; import net.sf.openrocket.database.ComponentPresetDatabase;
import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.OpenRocketDocument;
@ -331,6 +333,8 @@ public class RocketComponentConfig extends JPanel {
panel.add(bs, "growx 5, w 100lp, wrap"); panel.add(bs, "growx 5, w 100lp, wrap");
//OVERRIDES CG ----------------------------------
//// CG override //// CG override
bm = new BooleanModel(component, "CGOverridden"); bm = new BooleanModel(component, "CGOverridden");
check = new JCheckBox(bm); check = new JCheckBox(bm);
@ -369,6 +373,37 @@ public class RocketComponentConfig extends JPanel {
panel.add(bs, "growx 5, w 100lp, wrap 35lp"); panel.add(bs, "growx 5, w 100lp, wrap 35lp");
//END OVERRIDES CG ---------------------------------------------------
//BEGIN OVERRIDES CD ---------------------------------------------------
bm = new BooleanModel(component, "CDOverridden");
check = new JCheckBox(bm);
//// Override mass:
check.setText("Set coefficient of drag:");
panel.add(check, "growx 1, gapright 20lp");
m = new DoubleModel(component, "OverrideCD", UnitGroup.UNITS_NONE, 0);
spin = new JSpinner(m.getSpinnerModel());
spin.setEditor(new SpinnerEditor(spin));
bm.addEnableComponent(spin, true);
panel.add(spin, "growx 1");
bs = new BasicSlider(m.getSliderModel(0, 0.01, 1.0));
bm.addEnableComponent(bs);
panel.add(bs, "growx 5, w 100lp, wrap");
//END OVERRIDES CP --------------------------------------------------
// Override subcomponents checkbox // Override subcomponents checkbox
bm = new BooleanModel(component, "OverrideSubcomponents"); bm = new BooleanModel(component, "OverrideSubcomponents");
check = new JCheckBox(bm); check = new JCheckBox(bm);
@ -596,6 +631,7 @@ public class RocketComponentConfig extends JPanel {
} }
protected static void setDeepEnabled(Component component, boolean enabled) { protected static void setDeepEnabled(Component component, boolean enabled) {
component.setEnabled(enabled); component.setEnabled(enabled);
if (component instanceof Container) { if (component instanceof Container) {

4
swing/src/net/sf/openrocket/gui/dialogs/ScaleDialog.java
View File

@ -82,7 +82,7 @@ public class ScaleDialog extends JDialog {
List<Scaler> list; List<Scaler> list;
// RocketComponent // RocketComponent
addScaler(RocketComponent.class, "PositionValue"); addScaler(RocketComponent.class, "RelativePosition");
SCALERS.get(RocketComponent.class).add(new OverrideScaler()); SCALERS.get(RocketComponent.class).add(new OverrideScaler());
// BodyComponent // BodyComponent
@ -589,6 +589,8 @@ public class ScaleDialog extends JDialog {
mass = mass * MathUtil.pow3(multiplier); mass = mass * MathUtil.pow3(multiplier);
component.setOverrideMass(mass); component.setOverrideMass(mass);
} }
//TODO: Fix overridden pressure!
} }
} }