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

Support for opening recovery device on stage separation

Browse Source
This commit is contained in:
Sampo Niskanen 2012-04-19 17:24:03 +00:00
parent 74cee3dbbe
commit 1c411548a7
6 changed files with 58 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/ChangeLog
View File

@ -1,6 +1,10 @@
2012-04-19 Sampo Niskanen
* Allow opening recovery device on stage separation
2012-04-11 Doug Pedrick
* [BUG] Printed simulation did not honor launch conditions
* [BUG] Printed simulation did not honor launch conditions
2012-04-09 Sampo Niskanen
@ -17,7 +21,7 @@
2012-03-25 Doug Pedrick
* Printed rocket figure in design report now honors rotation angle of main figure; fixed bug in layout where the
* Printed rocket figure in design report now honors rotation angle of main figure; fixed bug in layout where the
figure was clipped in the page margin.
2012-03-18 Jason Blood

1
core/fileformat.txt
View File

@ -40,3 +40,4 @@ The following file format versions exist:
<separationdelay> elements to stage components (except sustainer).
1.5: Introduced with OpenRocket 12.xx. Added ComponentPresets.
Added lowerstageseparation as recovery device deployment event.

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

@ -1197,6 +1197,8 @@ RecoveryDevice.DeployEvent.LAUNCH = Launch (plus NN seconds)
RecoveryDevice.DeployEvent.EJECTION = First ejection charge of this stage
RecoveryDevice.DeployEvent.APOGEE = Apogee
RecoveryDevice.DeployEvent.ALTITUDE = Specific altitude during descent
RecoveryDevice.DeployEvent.CURRENT_STAGE_SEPARATION = Current stage separation
RecoveryDevice.DeployEvent.LOWER_STAGE_SEPARATION = Lower stage separation
RecoveryDevice.DeployEvent.NEVER = Never
! FlightEvent

36
core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java
View File

@ -19,6 +19,8 @@ import net.sf.openrocket.file.RocketSaver;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.rocketcomponent.FinSet;
import net.sf.openrocket.rocketcomponent.MotorMount;
import net.sf.openrocket.rocketcomponent.RecoveryDevice;
import net.sf.openrocket.rocketcomponent.RecoveryDevice.DeployEvent;
import net.sf.openrocket.rocketcomponent.Rocket;
import net.sf.openrocket.rocketcomponent.RocketComponent;
import net.sf.openrocket.rocketcomponent.TubeCoupler;
@ -186,6 +188,7 @@ public class OpenRocketSaver extends RocketSaver {
/*
* File version 1.5 is requires for:
* - saving designs using ComponentPrests
* - recovery device deployment on lower stage separation
*
* File version 1.4 is required for:
* - saving simulation data
@ -198,31 +201,29 @@ public class OpenRocketSaver extends RocketSaver {
* Otherwise use version 1.0.
*/
// Search the rocket for any ComponentPrests
{
Rocket r = document.getRocket();
Iterator<RocketComponent> componentIterator = r.iterator();
boolean usesComponentPreset = false;
while ( !usesComponentPreset && componentIterator.hasNext() ) {
RocketComponent c = componentIterator.next();
if ( c.getPresetComponent() != null ) {
usesComponentPreset = true;
}
}
if ( usesComponentPreset ) {
// Search the rocket for any ComponentPresets (version 1.5)
for (RocketComponent c : document.getRocket()) {
if (c.getPresetComponent() != null) {
return FILE_VERSION_DIVISOR + 5;
}
}
// Search for recovery device deployment type LOWER_STAGE_SEPARATION (version 1.5)
for (RocketComponent c : document.getRocket()) {
if (c instanceof RecoveryDevice) {
if (((RecoveryDevice) c).getDeployEvent() == DeployEvent.LOWER_STAGE_SEPARATION) {
return FILE_VERSION_DIVISOR + 5;
}
}
}
// Check if design has simulations defined (version 1.4)
if (document.getSimulationCount() > 0) {
return FILE_VERSION_DIVISOR + 4;
}
// Check for motor definitions (version 1.4)
Iterator<RocketComponent> iterator = document.getRocket().iterator();
while (iterator.hasNext()) {
RocketComponent c = iterator.next();
for (RocketComponent c : document.getRocket()) {
if (!(c instanceof MotorMount))
continue;
@ -235,10 +236,7 @@ public class OpenRocketSaver extends RocketSaver {
}
// Check for fin tabs (version 1.1)
iterator = document.getRocket().iterator();
while (iterator.hasNext()) {
RocketComponent c = iterator.next();
for (RocketComponent c : document.getRocket()) {
// Check for fin tabs
if (c instanceof FinSet) {
FinSet fin = (FinSet) c;

2
core/src/net/sf/openrocket/file/openrocket/savers/RecoveryDeviceSaver.java
View File

@ -19,7 +19,7 @@ public class RecoveryDeviceSaver extends MassObjectSaver {
else
elements.add("<cd>" + dev.getCD() + "</cd>");
elements.add("<deployevent>" + dev.getDeployEvent().name().toLowerCase(Locale.ENGLISH) + "</deployevent>");
elements.add("<deployevent>" + dev.getDeployEvent().name().toLowerCase(Locale.ENGLISH).replace("_", "") + "</deployevent>");
elements.add("<deployaltitude>" + dev.getDeployAltitude() + "</deployaltitude>");
elements.add("<deploydelay>" + dev.getDeployDelay() + "</deploydelay>");
elements.add(materialParam(dev.getMaterial()));

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

@ -24,14 +24,12 @@ public abstract class RecoveryDevice extends MassObject {
private static final Translator trans = Application.getTranslator();
public static enum DeployEvent {
//// Launch (plus NN seconds)
LAUNCH(trans.get("RecoveryDevice.DeployEvent.LAUNCH")) {
@Override
public boolean isActivationEvent(FlightEvent e, RocketComponent source) {
return e.getType() == FlightEvent.Type.LAUNCH;
}
},
//// First ejection charge of this stage
EJECTION(trans.get("RecoveryDevice.DeployEvent.EJECTION")) {
@Override
public boolean isActivationEvent(FlightEvent e, RocketComponent source) {
@ -41,14 +39,12 @@ public abstract class RecoveryDevice extends MassObject {
return charge.getStageNumber() == source.getStageNumber();
}
},
//// Apogee
APOGEE(trans.get("RecoveryDevice.DeployEvent.APOGEE")) {
@Override
public boolean isActivationEvent(FlightEvent e, RocketComponent source) {
return e.getType() == FlightEvent.Type.APOGEE;
}
},
//// Specific altitude during descent
ALTITUDE(trans.get("RecoveryDevice.DeployEvent.ALTITUDE")) {
@SuppressWarnings("unchecked")
@Override
@ -56,20 +52,29 @@ public abstract class RecoveryDevice extends MassObject {
if (e.getType() != FlightEvent.Type.ALTITUDE)
return false;
double alt = ((RecoveryDevice)source).getDeployAltitude();
Pair<Double,Double> altitude = (Pair<Double,Double>)e.getData();
double alt = ((RecoveryDevice) source).getDeployAltitude();
Pair<Double, Double> altitude = (Pair<Double, Double>) e.getData();
return (altitude.getU() >= alt) && (altitude.getV() <= alt);
}
},
//// Never
LOWER_STAGE_SEPARATION(trans.get("RecoveryDevice.DeployEvent.LOWER_STAGE_SEPARATION")) {
@Override
public boolean isActivationEvent(FlightEvent e, RocketComponent source) {
if (e.getType() != FlightEvent.Type.STAGE_SEPARATION)
return false;
int separation = e.getSource().getStageNumber();
int current = source.getStageNumber();
return (current + 1 == separation);
}
},
NEVER(trans.get("RecoveryDevice.DeployEvent.NEVER")) {
@Override
public boolean isActivationEvent(FlightEvent e, RocketComponent source) {
return false;
}
}
;
};
private final String description;
@ -159,11 +164,11 @@ public abstract class RecoveryDevice extends MassObject {
public final void setMaterial(Material mat) {
if (!(mat instanceof Material.Surface)) {
throw new IllegalArgumentException("Attempted to set non-surface material "+mat);
throw new IllegalArgumentException("Attempted to set non-surface material " + mat);
}
if (mat.equals(material))
return;
this.material = (Material.Surface)mat;
this.material = (Material.Surface) mat;
fireComponentChangeEvent(ComponentChangeEvent.MASS_CHANGE);
}