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

936 Commits

Author SHA1 Message Date
kruland2607
e8dad716b3 Seems one of my merges blew away the SimExpPan.border.Stage. 2013-09-08 20:29:25 -05:00
kruland2607
788301be81 Merge pull request #135 from kruland2607/simexport 
Added ability to export different branches from simulations.  Change the ok button text based on selected tab.
 2013-09-06 07:26:43 -07:00
kruland2607
3538a3ac9a Change the ok button text to "Plot" or "Export" based on selected tab. 2013-09-06 09:25:57 -05:00
kruland2607
0bba32fb59 Added ability to export different branches from simulations. 2013-09-05 10:14:48 -05:00
kruland2607
3088ee08aa Merge pull request #134 from kruland2607/master 
Doh! forgot to add the new jfreechart libs.
 2013-09-04 19:43:23 -07:00
kruland2607
7285ce0f6e Doh! forgot to add the new jfreechart libs. 2013-09-04 21:43:04 -05:00
kruland2607
e7ff1b036b Merge pull request #133 from kruland2607/master 
Fixed build for new library version numbers.
 2013-09-04 19:39:53 -07:00
kruland2607
152662613b Fixed build for new library version numbers. 2013-09-04 21:39:34 -05:00
kruland2607
12847a1be9 Merge pull request #130 from kruland2607/jfreechart-1.0.15 
Fix for Issue #114
 2013-09-04 19:33:31 -07:00
kruland2607
faf238e61d Fix deployment event for dart's recovery. 2013-09-04 21:27:52 -05:00
kruland2607
067031db3b Fixed problem with multiple copies of the same series in a plot. Also 
bumped up to jfreechart 1.0.15 but that might not have been necessary.
 2013-09-04 21:01:40 -05:00
kruland2607
5239123f6c Merge pull request #129 from kruland2607/fixdecaldropdown 
Fix for issue #116
 2013-09-03 18:54:24 -07:00
kruland2607
45ef3064fd Improve refreshing the decal model by doing it whenever the underlying 
appearance changes.  This allows for "From file" to work correctly as
well.
 2013-09-03 20:32:55 -05:00
kruland2607
375f371702 Add a little more protection in getElementAt because Apples' LAF 
sometimes returns -1.
 2013-09-03 16:16:15 -05:00
kruland2607
0f5e784e64 Catch UnsupportedOperationExceptions from getDesktop. 2013-09-03 16:13:04 -05:00
kruland2607
4c3a16f02b Refresh the texture drop down contents when one edits a single copy of a 
decal
 2013-09-03 14:53:51 -05:00
kruland2607
54871ec674 Updated thrustcurves. 2013-09-03 14:41:34 -05:00
bkuker
11c5e072f0 Fix for Issue #122, NPE in RocketFigure3d.setType() 
This problem will only happen when the RocketFigure3d is unable to
create a GL canvas. It sets the canvas to null, but not all code that
uses canvas checks for null. This class probably should handle this
state better than it does, but this is the safe change now.
 2013-09-02 18:46:58 -04:00
bkuker
0bc139fd05 Fix issue #112, NPE in RocketFigure3d mouseDragged() 
The component can pick up a mouse drag event without a mouse press event
if the mous is clicked and dragged while a modal dialog is open. The
running simulations progress bar dialog is an example. To fix, do not
process a mouse drag if a mouse press has not been recorded.
 2013-09-02 18:29:30 -04:00
kruland2607
265fdfe05e Merge pull request #111 from bkuker/jogl-v2.0.2-RELEASE 
Upgraded JOGL to version 2.0.2
 2013-08-21 22:00:46 -07:00
bkuker
0d88fbef99 Upgraded JOGL to version 2.0.2 2013-08-18 14:27:16 -04:00
kruland2607
9e16bc8530 Added some logging to help diagnose NPE bug reports from 
ExampleDesignFileAction.
 2013-08-17 19:32:47 -05:00
kruland2607
24706294ec Remove the mysterious first element of the EdgeMode drop down. 2013-08-17 19:16:10 -05:00
kruland2607
1398fe0794 Fix issue where edited decal was lost when the appearance was modified 
again.
 2013-08-17 19:12:28 -05:00
kruland2607
79ee38f518 Fix logic used to open Plot vs Run dialog. Only plot when there is data 
which is up to date or external.
 2013-07-05 23:37:35 -05:00
Sampo Niskanen
dbcd6b5c6a Rename button to "Plot" in plot dialog 2013-06-13 22:42:15 +03:00
Sampo Niskanen
0114448ea8 Fine-tune SimulationEditDialog 2013-06-13 16:54:01 +03:00
kruland2607
a67bd1add6 If the simulation runs correctly, then switch to plot view. 2013-06-11 21:28:59 -05:00
kruland2607
58e5874832 Merge remote-tracking branch 'upstream/master' into sims 
Conflicts:
	core/src/net/sf/openrocket/gui/main/SimulationPanel.java
 2013-06-11 21:25:33 -05:00
Jeff Davis
5a9ead35cb Merge pull request #100 from kruland2607/locpresets 
Added presets for LocPrecision contributed by Doug.
 2013-06-08 19:58:52 -07:00
Jeff Davis
2adfcd27a0 Merge pull request #99 from kruland2607/motorselectorbug 
The motors in the motor selector are not sorted by default.
 2013-06-08 19:47:06 -07:00
soupwizard
df85d0ee53 Added unittests saving and loading rockets to/from tmp in various file versions. 
Added @Ignore  and FIXME to failing LogLevelBufferLoggerTest
Fixed failing unitest IntegrationTest.java
Added test rockets for the various file versions of .ork
Changed TestMutex.java to write  messages to log saying that certain exceptions
that appear in log during unittests are ok because the test can't catch them.
 2013-06-08 19:09:36 -07:00
soupwizard
98635d7c9b Merge remote-tracking branch 'upstream/master' 2013-06-08 18:15:16 -07:00
Jeff Davis
911ad653fa Merge pull request #101 from dneelyep/openrocket-dev 
Added a dialog box warning when users try to run a simulation with no simulations selected.
 2013-06-08 17:23:09 -07:00
Daniel
cd255e1828 Added a dialog box that displays when no simulations are selected. 2013-06-08 12:34:47 -04:00
kruland2607
b5a191eb8d Added presets for LocPrecision contributed by Doug. 2013-06-07 06:38:24 -05:00
soupwizard
d57b132b51 Added tests for OR file versions. Added test rockets for each version number that is implemented. 2013-06-05 20:10:25 -07:00
kruland2607
7d30bcb67b I like it better when the close button copies the SimulationOptions. 
Only SimulationOptions needs to be a little bit smarter about when to
fire the change event.
 2013-06-05 21:20:50 -05:00
kruland2607
4cfc65fbe2 Make the simulation edit dialog operate a little more friendly. When 
the Run Simulation button is pressed, the simulations are executed and
the edit dialog changes to support plotting (when not in multi-edit
mode).  The edit dialog will not close in any case.  When the user
presses close, the dialog is closed.  The close button no longer copies
the changed simulation conditions to the other selected simulations.
 2013-06-05 15:49:09 -05:00
kruland2607
4b9fb6b2fc Open the SimulationEditDialog in the correct mode based on button press 
only try to infer it when double clicking.
 2013-06-04 10:06:31 -05:00
kruland2607
be62cc243e When creating a simulation use the DefaultSimulationOptionFactory. 2013-06-04 10:05:18 -05:00
soupwizard
845780a2bc Fixed unittest failure in LogLevelTest. Added config dir with logback 
config file that set logging to stdout and level to Error.  Modified
unittest target used by travis-ci to use new logback config file to
reduce clutter in unittest output.  Commented out superfluous
System.println's from various unit tests to also reduce clutter.
 2013-06-03 17:55:32 -07:00
kruland2607
d9c5bf6b1b Added total impulse column to motor selector dialog. When the dialog is 
first displayed, sort the data in a reasonable way.
 2013-06-03 09:59:32 -05:00
kruland2607
f70454792d Create a simulation when a flight configuration is copied or created. 2013-05-31 06:35:07 -05:00
kruland2607
c53a7e4c05 Consolidated the SimulationEditDialog and SimulationPlotExportDialog 
into a single dialog which uses CardLayout to switch between contents.
The new SimulationEditDialog is pretty smart about when it can support
the plot view and continues to support multi-edit.  Double-click in the
SimulationPanel is a little smarter - it opens either the dialog in plot
mode when appropriate.  Fixed but in SimulationPanel where the status
icon was not updated after running a simulation when plot button is
pressed.
 2013-05-30 15:46:47 -05:00
kruland2607
02f3f48f3a Added buttons to the edit and plot dialogs to switch to the other one. 2013-05-27 16:54:09 -05:00
kruland2607
9a43a01663 Don't display warning dialog when simulation ends. 2013-05-24 14:57:32 -05:00
kruland2607
ff39e0ea63 Don't dismiss the plot/export dialog when the plot is displayed. 2013-05-24 14:38:56 -05:00
kruland2607
4716030d1b Explicitly create the plot with a parent window so the configuration 
window can be dismissed automatically.
 2013-05-23 16:19:56 -05:00
kruland2607
9107566b38 Fix bug where plotted series were not labelled correctly in the legend. 2013-05-23 16:18:38 -05:00