From 3ea50e1fad4002a5176b80b7820ca2d81a36622e Mon Sep 17 00:00:00 2001 From: kruland2607 Date: Tue, 20 May 2014 21:17:00 -0500 Subject: [PATCH 1/4] Added knots to windspeed unit group. --- core/src/net/sf/openrocket/unit/UnitGroup.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/net/sf/openrocket/unit/UnitGroup.java b/core/src/net/sf/openrocket/unit/UnitGroup.java index 19de190c3..396cd6b55 100644 --- a/core/src/net/sf/openrocket/unit/UnitGroup.java +++ b/core/src/net/sf/openrocket/unit/UnitGroup.java @@ -196,6 +196,7 @@ public class UnitGroup { 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.44704, "mph")); + UNITS_WINDSPEED.addUnit(new GeneralUnit(0.51444445, "kt")); UNITS_WINDSPEED.setDefaultUnit(0); UNITS_ACCELERATION = new UnitGroup(); From 0e984d51f02c557191f0f7ffc7baf889958efa49 Mon Sep 17 00:00:00 2001 From: kruland2607 Date: Wed, 21 May 2014 12:47:34 -0500 Subject: [PATCH 2/4] Add knots to velocity group. --- core/src/net/sf/openrocket/unit/UnitGroup.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/net/sf/openrocket/unit/UnitGroup.java b/core/src/net/sf/openrocket/unit/UnitGroup.java index 396cd6b55..1acf0a6ae 100644 --- a/core/src/net/sf/openrocket/unit/UnitGroup.java +++ b/core/src/net/sf/openrocket/unit/UnitGroup.java @@ -189,6 +189,7 @@ public class UnitGroup { 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.44704, "mph")); + UNITS_VELOCITY.addUnit(new GeneralUnit(0.51444445, "kt")); UNITS_VELOCITY.setDefaultUnit(0); UNITS_WINDSPEED = new UnitGroup(); From 35f9ae384e515f8607d6677626c4db0952eed5fc Mon Sep 17 00:00:00 2001 From: kruland2607 Date: Wed, 21 May 2014 15:11:31 -0500 Subject: [PATCH 3/4] Added motor texture for Klima motors. --- .../appearance/defaults/DefaultAppearance.java | 4 ++++ .../datafiles/textures/motors/klima.jpg | Bin 0 -> 19834 bytes 2 files changed, 4 insertions(+) create mode 100644 swing/resources/datafiles/textures/motors/klima.jpg diff --git a/core/src/net/sf/openrocket/appearance/defaults/DefaultAppearance.java b/core/src/net/sf/openrocket/appearance/defaults/DefaultAppearance.java index 576580d1c..d0ca34ef2 100644 --- a/core/src/net/sf/openrocket/appearance/defaults/DefaultAppearance.java +++ b/core/src/net/sf/openrocket/appearance/defaults/DefaultAppearance.java @@ -62,6 +62,7 @@ public class DefaultAppearance { 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 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 HashMap plastics = new HashMap(); @@ -105,6 +106,9 @@ public class DefaultAppearance { if ("AeroTech".equals(tcm.getManufacturer().getSimpleName())) { return AEROTECH_MOTOR; } + if ("Klima".equals(tcm.getManufacturer().getSimpleName())) { + return KLIMA_MOTOR; + } } return REUSABLE_MOTOR; } diff --git a/swing/resources/datafiles/textures/motors/klima.jpg b/swing/resources/datafiles/textures/motors/klima.jpg new file mode 100644 index 0000000000000000000000000000000000000000..c5be2761c3b8e12fc67b630d0e4e9796a1421b26 GIT binary patch literal 19834 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≷gIvat`t(;> zPan^81z!X2oM2z)U6J#pm*q4k_FpwGyB(!>XLUeeLY-ujQOC^`XWn;IqU+D zaI51rAJs%Ts8{>=;hbtT``fCvz%SIf9#^%NM+Y+ruUi(8HS%Yaix>P3Af#TK4&+rm zL_eSlSv`hS6hTr&>h(bls~{%>ug>4>Kz=eyuUOrG6L|KIhg7N^dReWk&1!o5Y$sH#h~i)sN;5UdwhIGyhk@` z(k?-`@Xk2y_GgGZQqZ0LBx#551K~o;o5Dv=H^TnZV6`Ff@c3R%2f{AxR%ExC=X4ib zFu4U@P9+8;oR0K{&8RktghbU z?siXtHLIhS_x|>nE)GgV;ILkb< zKQf(kID0mVo<=++gnz8B?n#G!Hv92Te)I2|goOl5Zs8yA9-aSD<0^%-_jtSXe$CME z-*Cb}IBv%y<v4^C=Z=j>$(=9c++*Opd9UIw2zOFsGFTnkNym)>7k zc{vMsT9coEmUhPu^e4f;g5C$O{yv24aflWB3}hO69PjsODrk2C$(> zG&ClF%*y51W{(7c>Xu>Sr}K_iD zuK`jg(aR}FtLc7WCRS~_`NVgDVP~tvmg>?7ETFC*gSJ=lMKgYO*9;X(M0LqJlbOcH z_rE|NtE#s4Cgp_Z5$U8gL+%NtT*~i@(y{t}#+`X{W zphEIUx=I`VR)GD%q~NyLgy2@*qsgB?cVYa5w%nf*sD6YSi4SH8?@0%?wEiWCv0wQ- zhROX2wVU~z#)pK#cq_U=lZb((E4(f?>hA0Vx6YrFhrbD+`3&7RGShuH7LA7P`&VUc zy2btd%E%R-ymI@-4dh2~CGfku`Z5>(sv>nu7O@ZO(BnUlP?n_$d#`~5%CS(4!ClEe zvcW#JvcA0UC$j5M-JQuSj|(%sDVUmX>vmJ)xdnsOjq$mDH!Fi)|D>%4E>w0pEL~rZ zhS#w&C-Wxat!R_B7*F5cSHpRl!|N=G@d@(t_h3P;0UWPj$}_{k7ku4nKaqmJUCrS$ zcK@FCaR6^}lAC*uw7CE0#wO+|WeM~AP}(Qd&U4GCPp<)ppK)*CpviM7-r+VYCrkCY z&V{Q2x67+nYqDFbQ?C175hk(|f&)c(d3CJlNWrsoH+R))%Kfy^N5Nl@7F5jwuiWOp zr}IOYnlTz;kIW)LcVlW^HvFD1OwA;-r_Bnfdhe=B7`Q^-FG}~!p+sW-U=FS ze|Zfo+=pB~pc|F!*fao_Y#xNC8kbCj4Tj=tA%GuzX;1Lq!CwNq!;h)wO-*- zvm()D!H;?EZRng-aTF5vi}xCMzWZtZh}W+5l=#LJtS-UzJPmsGzca*jV+dRx{1=8A zKtnwL&kXTNgWhYs!a6d�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 literal 0 HcmV?d00001 From 0042fb352b915e6f196a4eaf13d2659725ca4756 Mon Sep 17 00:00:00 2001 From: kruland2607 Date: Thu, 22 May 2014 13:44:44 -0500 Subject: [PATCH 4/4] Protect the table header when the pointer is outside. --- swing/src/net/sf/openrocket/gui/adaptors/ColumnTable.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/swing/src/net/sf/openrocket/gui/adaptors/ColumnTable.java b/swing/src/net/sf/openrocket/gui/adaptors/ColumnTable.java index a1c54c2f7..f0e937345 100644 --- a/swing/src/net/sf/openrocket/gui/adaptors/ColumnTable.java +++ b/swing/src/net/sf/openrocket/gui/adaptors/ColumnTable.java @@ -18,6 +18,9 @@ public class ColumnTable extends JTable { String tip = null; java.awt.Point p = e.getPoint(); int index = columnModel.getColumnIndexAtX(p.x); + if ( index < 0 ) { + return null; + } int realIndex = columnModel.getColumn(index).getModelIndex(); tip = ((ColumnTableModel) getModel()).getColumn(realIndex).getToolTip(); return tip;