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

updates

Browse Source
This commit is contained in:
Sampo Niskanen 2009-07-10 13:50:00 +00:00
parent 9c6c1b4895
commit fc97f776fa
7 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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

4
TODO
View File

@ -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

BIN
pix-src/componenticons/engineblock.xcf.gz
View File

Binary file not shown.

BIN
pix/componenticons/engineblock-large.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
pix/componenticons/engineblock-small.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 846 B

After

Width:  |  Height:  |  Size: 751 B

8
src/net/sf/openrocket/gui/configdialog/RingComponentConfig.java
View File

@ -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");

28
src/net/sf/openrocket/unit/UnitGroup.java
View File

@ -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();