From 42b2e5ca519766e37ce6941ba4faecc9691cc403 Mon Sep 17 00:00:00 2001 From: plaa Date: Sun, 16 Sep 2012 14:29:59 +0000 Subject: [PATCH] Release 12.09 git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@1026 180e2498-e6e9-4542-8430-84ac67f01cd8 --- core/README.TXT | 3 ++ core/ReleaseNotes | 19 +++++++ core/fileformat.txt | 4 +- core/resources/build.properties | 2 +- ...FNC Using Presets.ork => Preset Usage.ork} | Bin .../file/openrocket/OpenRocketSaver.java | 35 ++++++++----- .../openrocket/gui/dialogs/AboutDialog.java | 1 + core/web/html/actions/updates.php | 33 ++++++++++-- core/web/html/download.html | 47 ++++++++---------- core/web/html/index.html | 23 +++++++-- core/web/htp/download.htp | 2 +- core/web/htp/htp.def | 3 +- core/web/htp/news.htp | 28 +++++++++-- 13 files changed, 148 insertions(+), 52 deletions(-) rename core/resources/datafiles/examples/{3FNC Using Presets.ork => Preset Usage.ork} (100%) diff --git a/core/README.TXT b/core/README.TXT index b2c66f0f..1498a596 100644 --- a/core/README.TXT +++ b/core/README.TXT @@ -27,6 +27,7 @@ Contributions have been made by: Sampo Niskanen, main developer Doug Pedrick, support for RockSim designs, printing Kevin Ruland, Android version +Bill Kuker, 3D visualization Richard Graham, geodetic computations Jason Blood, freeform fin set import Boris du Reau, internationalization @@ -37,4 +38,6 @@ Tripoli Spain Stefan Lobas / ERIG Mauro Biasutti Sky Dart Team +Vladimir Beran +Polish Rocketry Society / Łukasz & Alex Kazanski diff --git a/core/ReleaseNotes b/core/ReleaseNotes index 221a6b4a..2981cb09 100644 --- a/core/ReleaseNotes +++ b/core/ReleaseNotes @@ -1,3 +1,22 @@ +OpenRocket 12.09 (2012-09-16): +------------------------------- + +Numerous new features by many contributors: + +- 3D rocket design view +- Component Presets +- Custom expressions in simulations +- Printing for centering ring and clustered centering ring components. +- Support simple arthmatic in dimension entry +- Support deploying recovery device at stage separation +- Support for fractional inches (1/64) for unit length +- Added preference for windspeed units separately +- Added "most recently used files" in File Menu. +- Improved printed accurracy in fin marking guide +- Calibration rulers added to printed templates +- Translations in Czech and Polish, numerous updates + + OpenRocket 12.03 (2012-03-17): ------------------------------- diff --git a/core/fileformat.txt b/core/fileformat.txt index 7f8fb932..b5ffe06d 100644 --- a/core/fileformat.txt +++ b/core/fileformat.txt @@ -41,7 +41,5 @@ The following file format versions exist: 1.5: Introduced with OpenRocket 12.xx. Added ComponentPresets. Added lowerstageseparation as recovery device deployment event. - -1.6 (pre): Added section for supporting datatypes other than - internal ones. Currently only supports datatypes from custom expressions. \ No newline at end of file + internal ones. Currently only supports datatypes from custom expressions. diff --git a/core/resources/build.properties b/core/resources/build.properties index 70d047e5..d4cfa891 100644 --- a/core/resources/build.properties +++ b/core/resources/build.properties @@ -1,7 +1,7 @@ # The OpenRocket build version -build.version=12.03dev +build.version=12.09 # The source of the package. When building a package for a specific diff --git a/core/resources/datafiles/examples/3FNC Using Presets.ork b/core/resources/datafiles/examples/Preset Usage.ork similarity index 100% rename from core/resources/datafiles/examples/3FNC Using Presets.ork rename to core/resources/datafiles/examples/Preset Usage.ork diff --git a/core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java b/core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java index fa1c372f..0a5e0479 100644 --- a/core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java +++ b/core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java @@ -24,12 +24,12 @@ 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; -import net.sf.openrocket.simulation.customexpression.CustomExpression; import net.sf.openrocket.simulation.FlightData; import net.sf.openrocket.simulation.FlightDataBranch; import net.sf.openrocket.simulation.FlightDataType; import net.sf.openrocket.simulation.FlightEvent; import net.sf.openrocket.simulation.SimulationOptions; +import net.sf.openrocket.simulation.customexpression.CustomExpression; import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.BugException; import net.sf.openrocket.util.BuildProperties; @@ -135,28 +135,32 @@ public class OpenRocketSaver extends RocketSaver { if (doc.getCustomExpressions().isEmpty()) return; - writeln(""); indent++; + writeln(""); + indent++; - for (CustomExpression exp : doc.getCustomExpressions()){ + for (CustomExpression exp : doc.getCustomExpressions()) { saveCustomExpressionDatatype(exp); } - indent--; writeln(""); + indent--; + writeln(""); writeln(""); } /* * Save one custom expression datatype */ - private void saveCustomExpressionDatatype(CustomExpression exp) throws IOException { + private void saveCustomExpressionDatatype(CustomExpression exp) throws IOException { // Write out custom expression - writeln(""); indent++; - writeln("" + exp.getName() + ""); - writeln("" + exp.getSymbol() + ""); - writeln("" + exp.getUnit() + ""); // auto unit type means it will be determined from string - writeln("" + exp.getExpressionString() + ""); - indent--; writeln(""); + writeln(""); + indent++; + writeln("" + exp.getName() + ""); + writeln("" + exp.getSymbol() + ""); + writeln("" + exp.getUnit() + ""); // auto unit type means it will be determined from string + writeln("" + exp.getExpressionString() + ""); + indent--; + writeln(""); } @Override @@ -223,6 +227,7 @@ public class OpenRocketSaver extends RocketSaver { * 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 @@ -251,6 +256,11 @@ public class OpenRocketSaver extends RocketSaver { } } + // Check for custom expressions + if (!document.getCustomExpressions().isEmpty()) { + return FILE_VERSION_DIVISOR + 5; + } + // Check if design has simulations defined (version 1.4) if (document.getSimulationCount() > 0) { return FILE_VERSION_DIVISOR + 4; @@ -360,7 +370,8 @@ public class OpenRocketSaver extends RocketSaver { writeln("RK4Simulator"); writeln("BarrowmanCalculator"); - writeln(""); indent++; + writeln(""); + indent++; writeElement("configid", cond.getMotorConfigurationID()); writeElement("launchrodlength", cond.getLaunchRodLength()); diff --git a/core/src/net/sf/openrocket/gui/dialogs/AboutDialog.java b/core/src/net/sf/openrocket/gui/dialogs/AboutDialog.java index c3589b7e..5b7d6cc9 100644 --- a/core/src/net/sf/openrocket/gui/dialogs/AboutDialog.java +++ b/core/src/net/sf/openrocket/gui/dialogs/AboutDialog.java @@ -31,6 +31,7 @@ public class AboutDialog extends JDialog { "Sampo Niskanen (main developer)
" + "Doug Pedrick (RockSim file format, printing)
" + "Kevin Ruland (Android version)
" + + "Bill Kuker (3D visualization)
" + "Boris du Reau (internationalization, translation lead)
" + "Richard Graham (geodetic computations)
" + "Jason Blood (finset import)

" + diff --git a/core/web/html/actions/updates.php b/core/web/html/actions/updates.php index 7275e6e1..83b20e5c 100644 --- a/core/web/html/actions/updates.php +++ b/core/web/html/actions/updates.php @@ -80,19 +80,30 @@ header("Content-type: text/plain"); $version = $_GET["version"]; $updates = ""; -$unstable = "12.03"; +$unstable = "12.09"; $stable = "1.0.0"; -if (preg_match("/^1\.1\.9$/", $version)) { +if (preg_match("/^12.03$/", $version)) { $updates = "Version: " . $unstable . "\n" . + "10: 3D design view\n" . + "9: Component presets\n" . + "5: Fractional inch unit\n" . + "4: Printing centering rings\n" . + "4: Translations to Czech and Polish\n" . + ""; +} else if (preg_match("/^1\.1\.9$/", $version)) { + $updates = "Version: " . $unstable . "\n" . + "10: 3D design view\n" . + "9: Component presets\n" . "8: Writing RKT files\n" . "5: Configurable stage separation\n" . - "5: Guided tours\n" . "4: Freeform fin import from images\n" . "4: Translations to Italian and Russian\n" . ""; } else if (preg_match("/^1\.1\.8$/", $version)) { $updates = "Version: " . $unstable . "\n" . + "10: 3D design view\n" . + "9: Component presets\n" . "8: Writing RKT files\n" . "6: Additional template printing\n" . "5: Geodetic computations\n" . @@ -115,6 +126,8 @@ if (preg_match("/^1\.1\.9$/", $version)) { ""; } else if (preg_match("/^1\.1\.6$/", $version)) { $updates = "Version: " . $unstable . "\n" . + "10: 3D design view\n" . + "9: Component presets\n" . "8: Writing RKT files\n" . "8: Automatic rocket design optimization\n" . "6: Additional template printing\n" . @@ -122,6 +135,8 @@ if (preg_match("/^1\.1\.9$/", $version)) { ""; } else if (preg_match("/^1\.1\.5$/", $version)) { $updates = "Version: " . $unstable . "\n" . + "10: 3D design view\n" . + "9: Component presets\n" . "8: Writing RKT files\n" . "8: Automatic rocket design optimization\n" . "6: Initial localization support\n" . @@ -132,6 +147,8 @@ if (preg_match("/^1\.1\.9$/", $version)) { ""; } else if (preg_match("/^1\.1\.4$/", $version)) { $updates = "Version: " . $unstable . "\n" . + "10: 3D design view\n" . + "9: Component presets\n" . "8: Writing RKT files\n" . "8: Automatic rocket design optimization\n" . "6: Initial localization support\n" . @@ -140,6 +157,8 @@ if (preg_match("/^1\.1\.9$/", $version)) { ""; } else if (preg_match("/^1\.1\.3$/", $version)) { $updates = "Version: " . $unstable . "\n" . + "10: 3D design view\n" . + "9: Component presets\n" . "8: Writing RKT files\n" . "8: Automatic rocket design optimization\n" . "7: Initial printing support\n" . @@ -149,6 +168,8 @@ if (preg_match("/^1\.1\.9$/", $version)) { ""; } else if (preg_match("/^1\.1\.[12]$/", $version)) { $updates = "Version: " . $unstable . "\n" . + "10: 3D design view\n" . + "9: Component presets\n" . "8: Writing RKT files\n" . "8: Automatic rocket design optimization\n" . "6: Initial printing support\n" . @@ -159,6 +180,8 @@ if (preg_match("/^1\.1\.9$/", $version)) { ""; } else if (preg_match("/^1\.1\.0$/", $version)) { $updates = "Version: " . $unstable . "\n" . + "10: 3D design view\n" . + "9: Component presets\n" . "8: Writing RKT files\n" . "8: Automatic rocket design optimization\n" . "6: Initial printing support\n" . @@ -170,12 +193,16 @@ if (preg_match("/^1\.1\.9$/", $version)) { ""; } else if (preg_match("/^0\.9\.6/", $version)) { $updates = "Version: " . $stable . "\n" . + "10: 3D design view\n" . + "9: Component presets\n" . "8: Writing RKT files\n" . "6: Hundreds of new thrustcurves\n" . "5: Bug fixes\n" . ""; } else if (preg_match("/^0\.9\.[45]/", $version)) { $updates = "Version: " . $stable . "\n" . + "10: 3D design view\n" . + "9: Component presets\n" . "8: Writing RKT files\n" . "7: Hundreds of new thrustcurves\n" . "6: Aerodynamic computation updates\n" . diff --git a/core/web/html/download.html b/core/web/html/download.html index 4418d3c5..a99f29d2 100644 --- a/core/web/html/download.html +++ b/core/web/html/download.html @@ -48,6 +48,23 @@

Recent news:

+

16.9.2012: Version 12.09 is + released!

+

This version contains a huge number of new features by many contributors:

+
    +
  • 3D rocket design view
    • +
  • Component Presets
    • +
  • Custom expressions in simulations
    • +
  • Printing for centering ring and clustered centering ring components
    • +
  • Support simple arthmatic in dimension entry
    • +
  • Support deploying recovery device at stage separation
    • +
  • Support for fractional inches (1/64) for unit length
    • +
  • Added preference for windspeed units separately
    • +
  • Added "most recently used files" in File Menu
    • +
  • Improved printed accurracy in fin marking guide
    • +
  • Calibration rulers added to printed templates
    • +
  • Translations in Czech and Polish, numerous updates
    • +

10.3.2012: Version 12.03 for desktop and Android is released!

In this release the version numbering scheme has been changed. @@ -64,26 +81,6 @@ events, guided help tours and displaying the computed motor designation class. The application has also been translated to Italian by Mauro Biasutti and Russian by the Sky Dart Team.

-

24.11.2011: Version 1.1.9 is - released!

-

For this version Richard Graham has implemented geodetic - computation methods, which take into account the curvature of the - Earth and the coriolis effect. The computation method is selected - by the Geodetic calculations option in the simulation - options. It's not (yet) a full spherical computation model, but - should be accurate enough for almost all sub-orbital needs.

-

Doug Pedrick has also enhanced the printing system with the - ability to print fin positioning guides, transition templates and - nose cone profiles. Other smaller enhancements and bug fixes are - also included.

-

25.8.2011: Version 1.1.8 is - released!

-

This release contains bug fixes to the optimization methods. - It also contains a workaround to a JRE bug that prevents running - OpenRocket on some builds of Java 7.

-

The web pages have also been somewhat updated and Boris du Reau has - created a separate site - for coordinating the localization efforts for OpenRocket.

Ready packages

@@ -104,20 +101,20 @@ Support This Project
- + Download now! - OpenRocket-12.03.jar + OpenRocket-12.09.jar - Release notes | - Source code + Release notes | + Source code

OpenRocket can be started in most graphical environments (including Windows) by double-clicking the package icon. No installation is required.

From the command line OpenRocket can be started by - java -jar OpenRocket-12.03.jar

+ java -jar OpenRocket-12.09.jar

Android version

The Android version allows opening OpenRocket files, viewing simulations and motors. Later versions will allow running diff --git a/core/web/html/index.html b/core/web/html/index.html index c42a1b1b..f2bfdce5 100644 --- a/core/web/html/index.html +++ b/core/web/html/index.html @@ -49,12 +49,12 @@

Introduction

- + Download now! - OpenRocket-12.03.jar + OpenRocket-12.09.jar - Release notes | + Release notes | Other versions
@@ -96,6 +96,23 @@

News

+

16.9.2012: Version 12.09 is + released!

+

This version contains a huge number of new features by many contributors:

+
    +
  • 3D rocket design view
    • +
  • Component Presets
    • +
  • Custom expressions in simulations
    • +
  • Printing for centering ring and clustered centering ring components
    • +
  • Support simple arthmatic in dimension entry
    • +
  • Support deploying recovery device at stage separation
    • +
  • Support for fractional inches (1/64) for unit length
    • +
  • Added preference for windspeed units separately
    • +
  • Added "most recently used files" in File Menu
    • +
  • Improved printed accurracy in fin marking guide
    • +
  • Calibration rulers added to printed templates
    • +
  • Translations in Czech and Polish, numerous updates
    • +

10.3.2012: Version 12.03 for desktop and Android is released!

In this release the version numbering scheme has been changed. diff --git a/core/web/htp/download.htp b/core/web/htp/download.htp index 336b8b5f..aed535f1 100644 --- a/core/web/htp/download.htp +++ b/core/web/htp/download.htp @@ -62,7 +62,7 @@

  1. Go to Settings → Applications and check Unknown sources.
    2. -
  2. Download OpenRocket-Android-.apk +
  3. Download OpenRocket-Android-.apk on your device and accept installation.
diff --git a/core/web/htp/htp.def b/core/web/htp/htp.def index d2aedaa1..5e6d4bcc 100644 --- a/core/web/htp/htp.def +++ b/core/web/htp/htp.def @@ -1,4 +1,5 @@ - + +
diff --git a/core/web/htp/news.htp b/core/web/htp/news.htp index be4153e2..538c9136 100644 --- a/core/web/htp/news.htp +++ b/core/web/htp/news.htp @@ -9,6 +9,27 @@ +

16.9.2012: Version 12.09 is + released!

+ +

This version contains a huge number of new features by many contributors:

+ +
    +
  • 3D rocket design view
    • +
  • Component Presets
    • +
  • Custom expressions in simulations
    • +
  • Printing for centering ring and clustered centering ring components
    • +
  • Support simple arthmatic in dimension entry
    • +
  • Support deploying recovery device at stage separation
    • +
  • Support for fractional inches (1/64) for unit length
    • +
  • Added preference for windspeed units separately
    • +
  • Added "most recently used files" in File Menu
    • +
  • Improved printed accurracy in fin marking guide
    • +
  • Calibration rulers added to printed templates
    • +
  • Translations in Czech and Polish, numerous updates
    • +
+ +

10.3.2012: Version 12.03 for desktop and Android is released!

@@ -29,6 +50,10 @@ designation class. The application has also been translated to Italian by Mauro Biasutti and Russian by the Sky Dart Team.

+ + + +

24.11.2011: Version 1.1.9 is released!

@@ -56,9 +81,6 @@ for coordinating the localization efforts for OpenRocket.

- - -

12.8.2011: Version 1.1.7 is released!

-- 2.30.2