projects / debian / openrocket / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6930dda)
updates
authorplaa <plaa@180e2498-e6e9-4542-8430-84ac67f01cd8>
Fri, 10 Jul 2009 13:50:00 +0000 (13:50 +0000)
committerplaa <plaa@180e2498-e6e9-4542-8430-84ac67f01cd8>
Fri, 10 Jul 2009 13:50:00 +0000 (13:50 +0000)
git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@12 180e2498-e6e9-4542-8430-84ac67f01cd8

ChangeLog patch | blob | history
TODO patch | blob | history
pix-src/componenticons/engineblock.xcf.gz patch | blob | history
pix/componenticons/engineblock-large.png patch | blob | history
pix/componenticons/engineblock-small.png patch | blob | history
src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java patch | blob | history
src/net/sf/openrocket/unit/UnitGroup.java patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index c70e5c230433542c59df414efd62f4d6dbf308b3..d5a8941f5d1c9dd542009f831054812c79847ee2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-09  Sampo Niskanen
+
+       * [BUG] Fixed imperial unit conversions
+       * [BUG] Fixed engine block icon transparency
+
 2009-06-26  Sampo Niskanen
 
        * Progress dialogs for file open/save
diff --git a/TODO b/TODO
index a44b0c6b067c968fe9d6931343cba3a3ca836f34..d9d5f993c7ed352c1f28ce9c7e6d0984d14ea9ae 100644 (file)
--- a/TODO
+++ b/TODO
@@ -8,7 +8,6 @@ Must-have:
 - Store custom materials
 - Read more thrust curve formats / go through thrust curves and correct errors
 - Create application icon and take into use
-- Fix engine block icons
 - Better error/warning dialogs when reading/writing files
 
 
@@ -25,6 +24,8 @@ Maybe:
 Postponed:
 
 - Importing flight data
+- Water rocket modelling
+- Landing scatter plots
 
 
 Done:
@@ -32,4 +33,5 @@ Done:
 - Search field in motor selection dialog
 - Motor selection/editing from Edit configurations dialog
 - Change FreeformFinSet to throw checked exceptions
+- Fix engine block icons
 
diff --git a/pix-src/componenticons/engineblock.xcf.gz b/pix-src/componenticons/engineblock.xcf.gz
index 03a018c19bc21f9f06cf92e08bae50650c8272ab..9d8f1012d11bcc7c0b841d064fd0244a5922aa51 100644 (file)
Binary files a/pix-src/componenticons/engineblock.xcf.gz and b/pix-src/componenticons/engineblock.xcf.gz differ
diff --git a/pix/componenticons/engineblock-large.png b/pix/componenticons/engineblock-large.png
index 2fc7549bb3ae441de86281b9fc97e6c851ce592e..e58795c5e4b5dff319419cee1f6ec72201e325d9 100644 (file)
Binary files a/pix/componenticons/engineblock-large.png and b/pix/componenticons/engineblock-large.png differ
diff --git a/pix/componenticons/engineblock-small.png b/pix/componenticons/engineblock-small.png
index fbda45e91e4b82ab11fc034fd9a414470b1d1b75..ec689da8d281cf602edef88eaff2fe64cd3141d9 100644 (file)
Binary files a/pix/componenticons/engineblock-small.png and b/pix/componenticons/engineblock-small.png differ
diff --git a/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java b/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java
index dedd09eadbb3c0c25b29af38cf787aea21173646..c658de9103fc1be277216a4ee34d0032e5cfec39 100644 (file)
--- a/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java
+++ b/src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java
@@ -148,10 +148,10 @@ public class RingComponentConfig extends RocketComponentConfig {
                
                if (component instanceof EngineBlock) {
                        DescriptionArea desc = new DescriptionArea(6,-1);
-                       desc.setText("<html>An engine block stops the motor from moving forwards in " +
-                                       "the motor mount tube.<br><br>In order to add a motor, create a body tube " +
-                                       "or inner tube and mark it as a motor mount in the <em>Motor</em> " +
-                                       "tab.");
+                       desc.setText("<html>An <b>engine block</b> stops the motor from moving forwards " +
+                                       "in the motor mount tube.<br><br>In order to add a motor, create a " +
+                                       "<b>body tube</b> or <b>inner tube</b> and mark it as a motor mount in " +
+                                       "the <em>Motor</em> tab.");
                        sub.add(desc, "growx");
                }
                panel.add(sub,"cell 4 0, gapleft paragraph, aligny 0%, spany");
diff --git a/src/net/sf/openrocket/unit/UnitGroup.java b/src/net/sf/openrocket/unit/UnitGroup.java
index 091a25e69d89117a50b1e92202d4ffb580343bd2..7e0c52190ecec196bfaef8635d1403fcc612a24c 100644 (file)
--- a/src/net/sf/openrocket/unit/UnitGroup.java
+++ b/src/net/sf/openrocket/unit/UnitGroup.java
@@ -107,19 +107,19 @@ public class UnitGroup {
                UNITS_VELOCITY = new UnitGroup();
                UNITS_VELOCITY.addUnit(new GeneralUnit(1, "m/s"));
                UNITS_VELOCITY.addUnit(new GeneralUnit(1/3.6, "km/h"));
-               UNITS_VELOCITY.addUnit(new GeneralUnit(1/0.3048, "ft/s"));
+               UNITS_VELOCITY.addUnit(new GeneralUnit(0.3048, "ft/s"));
                UNITS_VELOCITY.addUnit(new GeneralUnit(0.44704, "mph"));
                
                UNITS_ACCELERATION = new UnitGroup();
                UNITS_ACCELERATION.addUnit(new GeneralUnit(1, "m/s\u00b2"));
-               UNITS_ACCELERATION.addUnit(new GeneralUnit(1/0.3048, "ft/s\00b2"));
+               UNITS_ACCELERATION.addUnit(new GeneralUnit(0.3048, "ft/s\00b2"));
                
 
                UNITS_MASS = new UnitGroup();
                UNITS_MASS.addUnit(new GeneralUnit(0.001,"g"));
                UNITS_MASS.addUnit(new GeneralUnit(1,"kg"));
-               UNITS_MASS.addUnit(new GeneralUnit(0.0283495,"oz"));
-               UNITS_MASS.addUnit(new GeneralUnit(0.0453592,"lb"));
+               UNITS_MASS.addUnit(new GeneralUnit(0.0283495231,"oz"));
+               UNITS_MASS.addUnit(new GeneralUnit(0.45359237,"lb"));
                
                UNITS_ANGLE = new UnitGroup();
                UNITS_ANGLE.addUnit(new DegreeUnit());
@@ -128,31 +128,31 @@ public class UnitGroup {
                UNITS_DENSITY_BULK = new UnitGroup();
                UNITS_DENSITY_BULK.addUnit(new GeneralUnit(1000,"g/cm\u00b3"));
                UNITS_DENSITY_BULK.addUnit(new GeneralUnit(1,"kg/m\u00b3"));
-               UNITS_DENSITY_BULK.addUnit(new GeneralUnit(1729.004,"oz/in\u00b3"));
-               UNITS_DENSITY_BULK.addUnit(new GeneralUnit(16.01846,"lb/ft\u00b3"));
+               UNITS_DENSITY_BULK.addUnit(new GeneralUnit(1729.99404,"oz/in\u00b3"));
+               UNITS_DENSITY_BULK.addUnit(new GeneralUnit(16.0184634,"lb/ft\u00b3"));
 
                UNITS_DENSITY_SURFACE = new UnitGroup();
                UNITS_DENSITY_SURFACE.addUnit(new GeneralUnit(10,"g/cm\u00b2"));
                UNITS_DENSITY_SURFACE.addUnit(new GeneralUnit(0.001,"g/m\u00b2"));
                UNITS_DENSITY_SURFACE.addUnit(new GeneralUnit(1,"kg/m\u00b2"));
-               UNITS_DENSITY_SURFACE.addUnit(new GeneralUnit(43.9418,"oz/in\u00b2"));
-               UNITS_DENSITY_SURFACE.addUnit(new GeneralUnit(0.30515173,"oz/ft\u00b2"));
-               UNITS_DENSITY_SURFACE.addUnit(new GeneralUnit(4.88243,"lb/ft\u00b2"));
+               UNITS_DENSITY_SURFACE.addUnit(new GeneralUnit(43.9418487,"oz/in\u00b2"));
+               UNITS_DENSITY_SURFACE.addUnit(new GeneralUnit(0.305151727,"oz/ft\u00b2"));
+               UNITS_DENSITY_SURFACE.addUnit(new GeneralUnit(4.88242764,"lb/ft\u00b2"));
                UNITS_DENSITY_SURFACE.setDefaultUnit(1);
 
                UNITS_DENSITY_LINE = new UnitGroup();
                UNITS_DENSITY_LINE.addUnit(new GeneralUnit(0.001,"g/m"));
                UNITS_DENSITY_LINE.addUnit(new GeneralUnit(1,"kg/m"));
-               UNITS_DENSITY_LINE.addUnit(new GeneralUnit(0.0930102,"oz/ft"));
+               UNITS_DENSITY_LINE.addUnit(new GeneralUnit(0.0930102465,"oz/ft"));
 
                UNITS_FORCE = new UnitGroup();
                UNITS_FORCE.addUnit(new GeneralUnit(1,"N"));
-               UNITS_FORCE.addUnit(new GeneralUnit(4.448222,"lbf"));
+               UNITS_FORCE.addUnit(new GeneralUnit(4.44822162,"lbf"));
                UNITS_FORCE.addUnit(new GeneralUnit(9.80665,"kgf"));
 
                UNITS_IMPULSE = new UnitGroup();
                UNITS_IMPULSE.addUnit(new GeneralUnit(1,"Ns"));
-               UNITS_IMPULSE.addUnit(new GeneralUnit(4.448222, "lbf\u00b7s"));
+               UNITS_IMPULSE.addUnit(new GeneralUnit(4.44822162, "lbf\u00b7s"));
 
                UNITS_TIME_STEP = new UnitGroup();
                UNITS_TIME_STEP.addUnit(new FixedPrecisionUnit("ms", 1, 0.001));
@@ -182,9 +182,9 @@ public class UnitGroup {
                UNITS_PRESSURE.addUnit(new FixedPrecisionUnit("mbar", 1, 1.0e2));
                UNITS_PRESSURE.addUnit(new FixedPrecisionUnit("bar", 0.001, 1.0e5));
                UNITS_PRESSURE.addUnit(new FixedPrecisionUnit("atm", 0.001, 1.01325e5));
-               UNITS_PRESSURE.addUnit(new GeneralUnit(133.322, "mmHg"));
+               UNITS_PRESSURE.addUnit(new GeneralUnit(101325.0/760.0, "mmHg"));
                UNITS_PRESSURE.addUnit(new GeneralUnit(3386.389, "inHg"));
-               UNITS_PRESSURE.addUnit(new GeneralUnit(6894.757, "psi"));
+               UNITS_PRESSURE.addUnit(new GeneralUnit(6894.75729, "psi"));
                UNITS_PRESSURE.addUnit(new GeneralUnit(1, "Pa"));
 
                UNITS_RELATIVE = new UnitGroup();
Debian packaging of openrocket