hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,737 Commits 2 Branches 43 Tags
Commit Graph

134 Commits

Author SHA1 Message Date
Craig Earls
5e9eca3715 Merge branch 'master' into Configure-wind-direction 2014-12-21 19:00:30 -07:00
kruland2607
ea07f91f5e Merge remote-tracking branch 'cearls/Auto-run-simulations' 
Conflicts:
	swing/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java

Manually resolved.
 2014-12-21 19:32:27 -06:00
Craig Earls
a6f00ccaba Merge branch 'master' into Configure-wind-direction 2014-12-21 15:34:39 -07:00
kruland2607
eaa6c32918 Merge pull request #216 from enderw88/Configure-design-window-font-size 
RocketInfo font size now configurable in options.
 2014-12-21 15:39:32 -06:00
Craig Earls
cf7daba134 This is a simple change to help out the Mac Crowd. It just changes the name of Startup to OpenRocket so the the menu bar says OpenRocket instead of Startup. 
This gets around the very fragile OS X setup thing we have trying and failing at with the mac java client
 2014-12-21 10:55:10 -07:00
Craig Earls
4310cd4b51 RocketInfo font size now configurable in option. Small is 11, medium is 14, large is 17. 
Corrected spelling on PrefChoiseSelector name, will get the translation keys some other time.
Added LineMetrics.descent to the line height for laying out the text in RocketInfo.
 2014-12-21 10:11:06 -07:00
Craig Earls
6ce7f0c23a Added configurable wind direction in simulation options. 
- added Ground Track plot type
- changed parameter names to East-West/North-South from parallel to wind and lateral
 2014-12-20 20:55:15 -07:00
Craig Earls
6110e0f5cd Outdated simulations will now run when the simulations tab is selected. 2014-12-19 17:47:29 -07:00
Craig Earls
05242d4f81 Add option to disable flight parameter estimates in the design window. 
The plumbing was all there, but no one ever exposed the functionality to the users.
 2014-12-19 14:31:30 -07:00
Craig Earls
233117628d Added auto run simulations checkbox to preferences. 2014-12-19 06:54:43 -07:00
Craig Earls
ded4df8103 Fixed 3 issues kruland had with mass type. 
1.  Mass tooltip only displays totals for components that have children.
2.  setMassComponentType now fires NON_FUNCTIONAL change event.
3.  Label now reads "Mass Type" and default is "Unspecified".
 2014-12-15 20:34:14 -07:00
Craig Earls
8d74ea9e6f Merge branch 'mass-object-categories' 2014-12-14 12:04:10 -07:00
Craig Earls
8a8bb51f48 Added Stream and Shock cord symbology. 2014-12-14 12:03:25 -07:00
Craig Earls
c741079fd6 Restructuring and adding symbols to all MassObjects. 2014-12-14 10:27:24 -07:00
Craig Earls
77cfa2bdf2 Sum up mass of subcomponent and put in component tree tooltip. 2014-12-13 16:45:49 -07:00
Craig Earls
f0609029e8 Clean up how symbol is added to themes component shape. Ready for release. 2014-12-13 15:41:36 -07:00
Craig Earls
66eb5753e5 All mass types being drawn. 2014-12-13 13:49:48 -07:00
Craig Earls
27a372eca5 Now drawing most mass types. 2014-12-13 12:31:54 -07:00
Craig Earls
f7f3b737d4 Added MassComponentType enum to allow categorizing mass components 
This is only the data model. MassComponentType added as an Enum.  MassComponentConfig dialog updated to combobox to select.
 2014-12-12 23:32:22 -07:00
kruland2607
c9f6305154 Fix reported bug. The mass & cg override icons wouldn't appear 
immediate when a components mass was overridden.  The ComponentTreeModel
needs to update the tree on mass changes too.
 2014-10-28 20:47:48 -05:00
kruland2607
c639bd453f Fix persistant bug report which is reproduced by undoing the addition of 
a flight configuration.  Need to test if the current selection in the
flight configuration table is off the table's current size.
 2014-10-28 20:28:20 -05:00
kruland2607
73fabd01dd Added ukranian translations. 2014-10-02 20:23:51 -05:00
kruland2607
0042fb352b Protect the table header when the pointer is outside. 2014-05-22 13:44:44 -05:00
kruland2607
12c47442f3 Renamed the cg-marker.png to cg-override.png. 2014-05-08 09:08:27 -05:00
kruland2607
bef5ff4f4a Merge remote-tracking branch 'upstream/master' into override-indicators 2014-04-24 09:46:10 -05:00
kruland2607
ae64f7a7f9 CG & Mass override indicators in component tree. 2014-04-23 21:22:43 -05:00
kruland2607
a34d41d6af Implement feature to compute the optimum delay for a simulation. 2014-04-08 13:09:38 -05:00
kruland2607
9a85ba0099 Added simple mass indicator. 2014-04-08 08:31:21 -05:00
kruland2607
581ec324d9 Fix selection bug in motor selection panel. The app threw NPE when 
trying to reuse the dialog.
 2014-03-25 12:12:30 -05:00
CarVac
708323af73 Fixed an OpenGL error; just a stopgap it seems. 2014-03-18 19:17:03 -04:00
kruland2607
bd62a1ee24 Merge pull request #181 from bkuker/tumble 
Changes to Tumble Transition & Tumble Bug Fix
 2014-02-25 17:29:25 -06:00
Craig Earls
cc54a98226 Prevent NPE when an uninitialized table cell is rendered. 2014-02-25 14:58:24 -07:00
bkuker
8e063f0a64 The changes to the tumble transition discussed on or-dev 2014-02-25 15:39:12 -05:00
kruland2607
d1ea0e3e63 Fix some annoying selection issues by moving some code into the base 
class.
 2014-02-12 21:49:45 -06:00
kruland2607
b61ee0c5ab Use the selectMotor method to update the whole ui and ensure that one 
can add a new motor.
 2014-02-12 21:48:10 -06:00
kruland2607
730abea70b Fix problematic bug in motor selection which manifested as: 
java.lang.IllegalArgumentException: setSelectedIndex: 0 out of bounds
	at javax.swing.JComboBox.setSelectedIndex(Unknown Source)
	at
net.sf.openrocket.gui.dialogs.motor.thrustcurve.ThrustCurveMotorSelectionPanel.updateData(ThrustCurveMotorSelectionPanel.java:437)

The underlying problem was the MotorChooserDialog had been using the
GUIUtil.setDisposableDialogOptions call which caused all the underlying
models to be cleared when the dialog was closed with the "x" button.
This caused the reference to the models in the panel to be disassociated
with those in the swing widgets.

Since the dialog is reused, this behavior was bad.  Changed the dialog
so the 'x' button simply hides the dialog and use the
GUIUtil.installEscapeCloseOperation to wire in the ESC key.
 2014-02-12 10:31:46 -06:00
kruland2607
062dbb7a4c Merge pull request #179 from plaa/master 
Replace lake.png with lake.jpg
 2014-02-04 05:51:50 -08:00
Sampo Niskanen
d4ba3eba01 Replace lake.png with lake.jpg 2014-02-02 13:28:52 +02:00
bkuker
81f5cfee4a Store the formatted log message, with "{}"s substituted. 2014-02-01 17:15:50 -05:00
Sampo Niskanen
e2699a16ea Remove non-ascii chars from java files 2014-02-01 10:59:34 +02:00
bkuker
b7b0ca002f Turn smoke off by default. 
If shader is screwed up on someone's system they won't get the error
until they turn it on, rather than the photo just failing right away.
 2014-01-31 17:43:36 -05:00
bkuker
9f13119317 Draw flames only for bottom most stage. 2014-01-31 09:25:22 -05:00
bkuker
1d38fb93db Apply translation to photo studio 2014-01-26 16:05:57 -05:00
bkuker
ae1655e78c Fix attribution notices on images 2014-01-26 15:39:45 -05:00
bkuker
d342cb5e6a Rescale smoke opacity 2014-01-26 14:12:33 -05:00
bkuker
cae915f351 Merge remote-tracking branch 'bkuker/photobooth-split' into photobooth-split 2014-01-12 21:15:26 -05:00
bkuker
fc0e3853c8 Remember photo window positions 2014-01-12 21:12:09 -05:00
bkuker
da502ab19a Move display call from repaint to paintImmediatly() 
Allows swing's grouping of multiple repaint() calls to a single
immediate call to actually have an effect.
 2014-01-12 21:08:57 -05:00
bkuker
e2f810d3cd Make sure image save dialog happens in EDT. 2014-01-12 21:07:07 -05:00
bkuker
0e637bac10 Mouse wheel zoom 2014-01-12 12:54:27 -05:00