Release 12.09

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@1026 180e2498-e6e9-4542-8430-84ac67f01cd8

diff --git a/core/README.TXT b/core/README.TXT
index b2c66f0fe4796d0325feba5cb68571829ef04c1e..1498a596479eeaa1df81f88344e3ebf30629cc4e 100644 (file)
--- 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 221a6b4a1d67b66963c98713aa66c90257af868f..2981cb092622555d3eb08dedfa04236cd51d0171 100644 (file)
--- 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 7f8fb93219758543fad42d1860846c6a377e77b4..b5ffe06d22846076465ca026efc49b71b0465824 100644 (file)
--- 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 <datatypes> 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 70d047e53bc3fc9edede7ba0b9b912ba4d8c63d0..d4cfa89103cfb143fb991fc603392e766e69fb37 100644 (file)
--- 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/3FNC Using Presets.ork
deleted file mode 100644 (file)
index 9e78075..0000000
Binary files a/core/resources/datafiles/examples/3FNC Using Presets.ork and /dev/null differ

diff --git a/core/resources/datafiles/examples/Preset Usage.ork b/core/resources/datafiles/examples/Preset Usage.ork
new file mode 100644 (file)
index 0000000..9e78075
Binary files /dev/null and b/core/resources/datafiles/examples/Preset Usage.ork differ

diff --git a/core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java b/core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java
index fa1c372f5aae949a7e0720abc28d47bce2b82b44..0a5e04790caa407459640e5ef3d95ddd0abf59a7 100644 (file)
--- 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("<datatypes>"); indent++;
+               writeln("<datatypes>");
+               indent++;
                
-               for (CustomExpression exp : doc.getCustomExpressions()){
+               for (CustomExpression exp : doc.getCustomExpressions()) {
                        saveCustomExpressionDatatype(exp);
                }
                
-               indent--; writeln("</datatypes>");
+               indent--;
+               writeln("</datatypes>");
                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("<type source=\"customexpression\">"); indent++;
-                       writeln("<name>"                 + exp.getName()                         + "</name>");
-                       writeln("<symbol>"           + exp.getSymbol()                   + "</symbol>");
-                       writeln("<unit unittype=\"auto\">" + exp.getUnit()               + "</unit>"); // auto unit type means it will be determined from string
-                       writeln("<expression>" + exp.getExpressionString() + "</expression>");
-               indent--; writeln("</type>");
+               writeln("<type source=\"customexpression\">");
+               indent++;
+               writeln("<name>" + exp.getName() + "</name>");
+               writeln("<symbol>" + exp.getSymbol() + "</symbol>");
+               writeln("<unit unittype=\"auto\">" + exp.getUnit() + "</unit>"); // auto unit type means it will be determined from string
+               writeln("<expression>" + exp.getExpressionString() + "</expression>");
+               indent--;
+               writeln("</type>");
        }
        
        @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("<simulator>RK4Simulator</simulator>");
                writeln("<calculator>BarrowmanCalculator</calculator>");
                
-               writeln("<conditions>"); indent++;
+               writeln("<conditions>");
+               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 c3589b7ecb0b3976f6a36121fe4b6ca27e30dfda..5b7d6cc93f3bee1e84cd436aea8a9a0bbb871e7a 100644 (file)
--- 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)<br>" +
                        "Doug Pedrick (RockSim file format, printing)<br>" +
                        "Kevin Ruland (Android version)<br>" +
+                       "Bill Kuker (3D visualization)<br>" +
                        "Boris du Reau (internationalization, translation lead)<br>" +
                        "Richard Graham (geodetic computations)<br>" +
                        "Jason Blood (finset import)<br><br>" +

diff --git a/core/web/html/actions/updates.php b/core/web/html/actions/updates.php
index 7275e6e1ace6aefb0fe85a28bcadb5df29a0663d..83b20e5cfb78d7e04e5e8432d4a158ba0e479d62 100644 (file)
--- 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 4418d3c5b52b8dfbc5f40b3ec5ce15555d882fd4..a99f29d2bcbd022e1da71d48aa315844d4b00018 100644 (file)
--- a/core/web/html/download.html
+++ b/core/web/html/download.html
@@ -48,6 +48,23 @@
   <div class="content">
 <div class="news">
       <h2>Recent news:</h2>
+  <p><span class="date">16.9.2012:</span> Version 12.09 is
+   <a href="download.html">released</a>!</p>
+  <p>This version contains a huge number of new features by many contributors:</p>
+  <ul>
+    <li>3D rocket design view</li>
+    <li>Component Presets</li>
+    <li>Custom expressions in simulations</li>
+    <li>Printing for centering ring and clustered centering ring components</li>
+    <li>Support simple arthmatic in dimension entry</li>
+    <li>Support deploying recovery device at stage separation</li>
+    <li>Support for fractional inches (1/64) for unit length</li>
+    <li>Added preference for windspeed units separately</li>
+    <li>Added "most recently used files" in File Menu</li>
+    <li>Improved printed accurracy in fin marking guide</li>
+    <li>Calibration rulers added to printed templates</li>
+    <li>Translations in Czech and Polish, numerous updates</li>
+  </ul>
   <p><span class="date">10.3.2012:</span> Version 12.03 for desktop
     and Android is <a href="download.html">released</a>!</p>
   <p>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.</p>
-  <p><span class="date">24.11.2011:</span> Version 1.1.9 is
-    <a href="download.html">released</a>!</p>
-  <p>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 <em>Geodetic calculations</em> option in the simulation
-    options.  It's not <em>(yet)</em> a full spherical computation model, but
-    should be accurate enough for almost all sub-orbital needs.</p>
-  <p>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.</p>
-  <p><span class="date">25.8.2011:</span> Version 1.1.8 is
-    <a href="download.html">released</a>!</p>
-  <p>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.</p>
-  <p>The web pages have also been somewhat updated and Boris du Reau has
-    created <a href="http://openrocket.trans.free.fr/">a separate site</a>
-    for coordinating the localization efforts for OpenRocket.</p>
 </div>
     <div class="contentholder">
       <h2>Ready packages</h2>
@@ -104,20 +101,20 @@
         <a href="http://sourceforge.net/donate/index.php?group_id=260357"><img src="project-support.jpg" width="88" height="32" alt="Support This Project" /></a>
       </div>
         <div class="downloadbox">
-    <a class="main" href="https://sourceforge.net/projects/openrocket/files/openrocket/12.03/OpenRocket-12.03.jar/download">
+    <a class="main" href="https://sourceforge.net/projects/openrocket/files/openrocket/12.09/OpenRocket-12.09.jar/download">
       <strong>Download now!</strong>
-      <span>OpenRocket-12.03.jar</span>
+      <span>OpenRocket-12.09.jar</span>
     </a>
     <span class="alternative">
-      <a href="https://sourceforge.net/projects/openrocket/files/openrocket/12.03/ReleaseNotes/view">Release notes</a> |
-            <a href="https://sourceforge.net/projects/openrocket/files/openrocket/12.03/OpenRocket-12.03-src.zip/download">Source code</a>
+      <a href="https://sourceforge.net/projects/openrocket/files/openrocket/12.09/ReleaseNotes/view">Release notes</a> |
+            <a href="https://sourceforge.net/projects/openrocket/files/openrocket/12.09/OpenRocket-12.09-src.zip/download">Source code</a>
     </span>
   </div>
       <p>OpenRocket can be started in most graphical environments (including
        Windows) by double-clicking the package icon.  No installation is
        required.</p>
       <p>From the command line OpenRocket can be started by
-      <span class="command">java -jar OpenRocket-12.03.jar</span></p>
+      <span class="command">java -jar OpenRocket-12.09.jar</span></p>
       <h3>Android version</h3>
       <p>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 c42a1b1bf99319f3eae2ea39eb37827203973571..f2bfdce5c9e1365c397304899016cfb05df80fe1 100644 (file)
--- a/core/web/html/index.html
+++ b/core/web/html/index.html
@@ -49,12 +49,12 @@
     <h2>Introduction</h2>
     <div class="rightpane">
         <div class="downloadbox">
-    <a class="main" href="https://sourceforge.net/projects/openrocket/files/openrocket/12.03/OpenRocket-12.03.jar/download">
+    <a class="main" href="https://sourceforge.net/projects/openrocket/files/openrocket/12.09/OpenRocket-12.09.jar/download">
       <strong>Download now!</strong>
-      <span>OpenRocket-12.03.jar</span>
+      <span>OpenRocket-12.09.jar</span>
     </a>
     <span class="alternative">
-      <a href="https://sourceforge.net/projects/openrocket/files/openrocket/12.03/ReleaseNotes/view">Release notes</a> |
+      <a href="https://sourceforge.net/projects/openrocket/files/openrocket/12.09/ReleaseNotes/view">Release notes</a> |
             <a href="download.html">Other versions</a>
     </span>
   </div>
@@ -96,6 +96,23 @@
     <div class="clear"></div>
 <div class="news">
       <h2>News</h2>
+  <p><span class="date">16.9.2012:</span> Version 12.09 is
+   <a href="download.html">released</a>!</p>
+  <p>This version contains a huge number of new features by many contributors:</p>
+  <ul>
+    <li>3D rocket design view</li>
+    <li>Component Presets</li>
+    <li>Custom expressions in simulations</li>
+    <li>Printing for centering ring and clustered centering ring components</li>
+    <li>Support simple arthmatic in dimension entry</li>
+    <li>Support deploying recovery device at stage separation</li>
+    <li>Support for fractional inches (1/64) for unit length</li>
+    <li>Added preference for windspeed units separately</li>
+    <li>Added "most recently used files" in File Menu</li>
+    <li>Improved printed accurracy in fin marking guide</li>
+    <li>Calibration rulers added to printed templates</li>
+    <li>Translations in Czech and Polish, numerous updates</li>
+  </ul>
   <p><span class="date">10.3.2012:</span> Version 12.03 for desktop
     and Android is <a href="download.html">released</a>!</p>
   <p>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 336b8b5f723f6a96df0a37f7cdd41d0e7ea61adc..aed535f127305ff863feeb6498a39592b319cacd 100644 (file)
--- a/core/web/htp/download.htp
+++ b/core/web/htp/download.htp
@@ -62,7 +62,7 @@
         <ol>
           <li>Go to <em>Settings</em> &rarr; <em>Applications</em> and
             check <em>Unknown sources</em>.</li>
-         <li>Download <a href="https://sourceforge.net/projects/openrocket/files/openrocket/${version}/OpenRocket-Android-${version}.apk/download">OpenRocket-Android-<use version>.apk</a>
+         <li>Download <a href="https://sourceforge.net/projects/openrocket/files/openrocket/${androidversion}/OpenRocket-Android-${androidversion}.apk/download">OpenRocket-Android-<use androidversion>.apk</a>
            on your device and accept installation.</li>
 
         </ol>

diff --git a/core/web/htp/htp.def b/core/web/htp/htp.def
index d2aedaa14115d9afb26c1dfe561057a7c440d842..5e6d4bccb16afb79451b4c454459848a76bfacf3 100644 (file)
--- a/core/web/htp/htp.def
+++ b/core/web/htp/htp.def
@@ -1,4 +1,5 @@
-<set version="12.03">
+<set version="12.09">
+<set androidversion="12.03">
 
 <def name="downloadbox">
   <div class="downloadbox">

diff --git a/core/web/htp/news.htp b/core/web/htp/news.htp
index be4153e21ef800766931d54604d289cd0b364511..538c9136d4dfd7ed1bb7117926551ef7796210d1 100644 (file)
--- a/core/web/htp/news.htp
+++ b/core/web/htp/news.htp
@@ -9,6 +9,27 @@
 
   <!--- Remember to move the position of "onlyrecent" below! --->
 
+  <p><span class="date">16.9.2012:</span> Version 12.09 is
+   <a href="download.html">released</a>!</p>
+
+  <p>This version contains a huge number of new features by many contributors:</p>
+
+  <ul>
+    <li>3D rocket design view</li>
+    <li>Component Presets</li>
+    <li>Custom expressions in simulations</li>
+    <li>Printing for centering ring and clustered centering ring components</li>
+    <li>Support simple arthmatic in dimension entry</li>
+    <li>Support deploying recovery device at stage separation</li>
+    <li>Support for fractional inches (1/64) for unit length</li>
+    <li>Added preference for windspeed units separately</li>
+    <li>Added "most recently used files" in File Menu</li>
+    <li>Improved printed accurracy in fin marking guide</li>
+    <li>Calibration rulers added to printed templates</li>
+    <li>Translations in Czech and Polish, numerous updates</li>
+  </ul>
+
+
   <p><span class="date">10.3.2012:</span> Version 12.03 for desktop
     and Android is <a href="download.html">released</a>!</p>
 
@@ -29,6 +50,10 @@
     designation class.  The application has also been translated to
     Italian by Mauro Biasutti and Russian by the Sky Dart Team.</p>
 
+
+  <if not onlyrecent><!--- Older items not shown on download page:  --->
+
+
   <p><span class="date">24.11.2011:</span> Version 1.1.9 is 
     <a href="download.html">released</a>!</p>
 
@@ -56,9 +81,6 @@
     for coordinating the localization efforts for OpenRocket.</p>
   
 
-  <if not onlyrecent><!--- Older items not shown on download page:  --->
-
-
   <p><span class="date">12.8.2011:</span> Version 1.1.7 is 
     <a href="download.html">released</a>!</p>