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

Merge pull request #201 from kruland2607/master

Browse Source 
Bug fix, added knots to windspeed and velocity, added Klima motor texture.
This commit is contained in:
kruland2607 2014-06-25 11:30:21 -05:00
commit ab6880fd50
4 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/net/sf/openrocket/appearance/defaults/DefaultAppearance.java
View File

@ -62,6 +62,7 @@ public class DefaultAppearance {
private static Appearance ESTES_MOTOR = simple("/datafiles/textures/motors/estes.jpg"); private static Appearance ESTES_MOTOR = simple("/datafiles/textures/motors/estes.jpg");
private static Appearance AEROTECH_MOTOR = simple("/datafiles/textures/motors/aerotech.png"); private static Appearance AEROTECH_MOTOR = simple("/datafiles/textures/motors/aerotech.png");
private static Appearance KLIMA_MOTOR = simple("/datafiles/textures/motors/klima.jpg");
private static Appearance REUSABLE_MOTOR = simpleAlpha(new Color(195, 60, 50), .6f, "/datafiles/textures/motors/reusable.png"); private static Appearance REUSABLE_MOTOR = simpleAlpha(new Color(195, 60, 50), .6f, "/datafiles/textures/motors/reusable.png");
private static HashMap<Color, Appearance> plastics = new HashMap<Color, Appearance>(); private static HashMap<Color, Appearance> plastics = new HashMap<Color, Appearance>();
@ -105,6 +106,9 @@ public class DefaultAppearance {
if ("AeroTech".equals(tcm.getManufacturer().getSimpleName())) { if ("AeroTech".equals(tcm.getManufacturer().getSimpleName())) {
return AEROTECH_MOTOR; return AEROTECH_MOTOR;
} }
if ("Klima".equals(tcm.getManufacturer().getSimpleName())) {
return KLIMA_MOTOR;
}
} }
return REUSABLE_MOTOR; return REUSABLE_MOTOR;
} }

2
core/src/net/sf/openrocket/unit/UnitGroup.java
View File

@ -189,6 +189,7 @@ public class UnitGroup {
UNITS_VELOCITY.addUnit(new GeneralUnit(1 / 3.6, "km/h")); UNITS_VELOCITY.addUnit(new GeneralUnit(1 / 3.6, "km/h"));
UNITS_VELOCITY.addUnit(new GeneralUnit(0.3048, "ft/s")); UNITS_VELOCITY.addUnit(new GeneralUnit(0.3048, "ft/s"));
UNITS_VELOCITY.addUnit(new GeneralUnit(0.44704, "mph")); UNITS_VELOCITY.addUnit(new GeneralUnit(0.44704, "mph"));
UNITS_VELOCITY.addUnit(new GeneralUnit(0.51444445, "kt"));
UNITS_VELOCITY.setDefaultUnit(0); UNITS_VELOCITY.setDefaultUnit(0);
UNITS_WINDSPEED = new UnitGroup(); UNITS_WINDSPEED = new UnitGroup();
@ -196,6 +197,7 @@ public class UnitGroup {
UNITS_WINDSPEED.addUnit(new GeneralUnit(1 / 3.6, "km/h")); UNITS_WINDSPEED.addUnit(new GeneralUnit(1 / 3.6, "km/h"));
UNITS_WINDSPEED.addUnit(new GeneralUnit(0.3048, "ft/s")); UNITS_WINDSPEED.addUnit(new GeneralUnit(0.3048, "ft/s"));
UNITS_WINDSPEED.addUnit(new GeneralUnit(0.44704, "mph")); UNITS_WINDSPEED.addUnit(new GeneralUnit(0.44704, "mph"));
UNITS_WINDSPEED.addUnit(new GeneralUnit(0.51444445, "kt"));
UNITS_WINDSPEED.setDefaultUnit(0); UNITS_WINDSPEED.setDefaultUnit(0);
UNITS_ACCELERATION = new UnitGroup(); UNITS_ACCELERATION = new UnitGroup();

BIN
swing/resources/datafiles/textures/motors/klima.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 19 KiB

3
swing/src/net/sf/openrocket/gui/adaptors/ColumnTable.java
View File

@ -18,6 +18,9 @@ public class ColumnTable extends JTable {
String tip = null; String tip = null;
java.awt.Point p = e.getPoint(); java.awt.Point p = e.getPoint();
int index = columnModel.getColumnIndexAtX(p.x); int index = columnModel.getColumnIndexAtX(p.x);
if ( index < 0 ) {
return null;
}
int realIndex = columnModel.getColumn(index).getModelIndex(); int realIndex = columnModel.getColumn(index).getModelIndex();
tip = ((ColumnTableModel) getModel()).getColumn(realIndex).getToolTip(); tip = ((ColumnTableModel) getModel()).getColumn(realIndex).getToolTip();
return tip; return tip;