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

[fix][file] OR now always saves files as format version 1.8

Browse Source
This commit is contained in:
Daniel_M_Williams 2018-01-21 12:16:21 -05:00
parent 85fc41d203
commit 9398331f02
1 changed files with 5 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,12 +18,8 @@ import net.sf.openrocket.document.OpenRocketDocument;
import net.sf.openrocket.document.Simulation; import net.sf.openrocket.document.Simulation;
import net.sf.openrocket.document.StorageOptions; import net.sf.openrocket.document.StorageOptions;
import net.sf.openrocket.file.RocketSaver; import net.sf.openrocket.file.RocketSaver;
import net.sf.openrocket.rocketcomponent.ParallelStage;
import net.sf.openrocket.rocketcomponent.PodSet;
import net.sf.openrocket.rocketcomponent.RailButton;
import net.sf.openrocket.rocketcomponent.Rocket; import net.sf.openrocket.rocketcomponent.Rocket;
import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.rocketcomponent.RocketComponent;
import net.sf.openrocket.rocketcomponent.TubeFinSet;
import net.sf.openrocket.simulation.FlightData; import net.sf.openrocket.simulation.FlightData;
import net.sf.openrocket.simulation.FlightDataBranch; import net.sf.openrocket.simulation.FlightDataBranch;
import net.sf.openrocket.simulation.FlightDataType; import net.sf.openrocket.simulation.FlightDataType;
@ -218,66 +214,20 @@ public class OpenRocketSaver extends RocketSaver {
* NOTE: Remember to update the supported versions in DocumentConfig as well! * NOTE: Remember to update the supported versions in DocumentConfig as well!
* *
* File version 1.8 is required for: * File version 1.8 is required for:
* - new-style positioning
* - external/parallel booster stages * - external/parallel booster stages
* - external pods * - external pods
* - Rail Buttons * - Rail Buttons
* *
* File version 1.7 is required for: * Otherwise use version 1.8.
* - simulation extensions
* - saving tube fins.
*
* File version 1.6 is required for:
* - saving files using appearances and textures, flight configurations.
*
* File version 1.5 is requires for:
* - saving designs using ComponentPrests
* - recovery device deployment on lower stage separation
* - custom expressions
*
* File version 1.4 is required for:
* - saving simulation data
* - saving motor data
*
* File version 1.1 is required for:
* - fin tabs
* - components attached to tube coupler
*
* Otherwise use version 1.0.
*/ */
///////////////// /////////////////
// Version 1.8 // // Version 1.8 //
///////////////// /////////////////
// Search the rocket for any Boosters or Pods (version 1.8) // for any new-style positioning: 'axialoffset', 'angleoffset', 'radiusoffset' tags
for (RocketComponent c : document.getRocket()) { // these tags are used for any RocketComponent child classes positioning... so... ALL the classes.
if ((c instanceof ParallelStage) || (c instanceof PodSet) || (c instanceof RailButton)) {
return FILE_VERSION_DIVISOR + 8; return FILE_VERSION_DIVISOR + 8;
}
}
/////////////////
// Version 1.7 //
/////////////////
for (Simulation sim : document.getSimulations()) {
if (!sim.getSimulationExtensions().isEmpty()) {
return FILE_VERSION_DIVISOR + 7;
}
}
// Search the rocket for any TubeFinSet objects (version 1.7)
for (RocketComponent c : document.getRocket()) {
if (c instanceof TubeFinSet) {
return FILE_VERSION_DIVISOR + 7;
}
}
/////////////////
// Version 1.6 //
/////////////////
// OpenRocket only writes back to 1.6 now.
return FILE_VERSION_DIVISOR + 6;
} }