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

731 Commits

Author SHA1 Message Date
kruland
28d970cad6 When importing a rkt file, if we cannot find the decal image file on the 
local disk, we just ignore it.
 2013-12-01 18:22:45 -06:00
kruland2607
25c1ba2307 Protect against NPE when simulations are not properly set up. 2013-11-11 09:51:52 -06:00
kruland2607
a1944b765f Added workaround for problem introduced in Java 1.7.0_45-b18 with 
DataFlavor being loaded in a different classloader.  We cannot refer to
singletons in the RocketComponent class.
 2013-11-04 14:49:20 -06:00
kruland2607
ec5dfbd4e6 Remove dependency on SwingPreferences. 2013-10-11 15:35:11 -05:00
kruland2607
6cd1bffc82 Merge pull request #158 from kruland2607/l10nReport 
Added little l10n properties analysis tool, and fixed some obvious errors in cs & it localizations.
 2013-10-11 13:25:55 -07:00
kruland2607
0e8adeaf1f When deleting a flight configuration, delete corresponding simulations 
as well.
 2013-10-11 14:40:15 -05:00
kruland2607
1d36ab5eaf Merge branch '13.09dev' into feature-configtab 2013-10-10 11:35:41 -05:00
kruland2607
6641f959c5 When deleting a flight configuration, first change the configuration to 
a different one.
 2013-10-09 16:06:30 -05:00
kruland2607
a601788dcd Fixed integer test value. Thank goodness for unit tests. 2013-10-09 14:52:36 -05:00
kruland2607
3e57ef205d Be smart about displaying decimals. 2013-10-07 22:18:22 -05:00
kruland2607
246b9a6823 Relocate the swing files into the swing/ project. They were misplaced with the rebase. 2013-09-27 21:54:05 -05:00
kruland2607
ea6aa3e414 Added manufacturer selection boxes and exclude motors currently used 
filters.
 2013-09-27 21:51:17 -05:00
kruland2607
84af78ccf4 Extract the MotorRowFilter out of the ThrustCurveMotorSelectionPanel to 
facilitate adding more filters.
 2013-09-27 21:51:10 -05:00
kruland2607
26fb295554 Rework source structure to separate swing gui code from core code. 
Separate swing application code from core code.  Moved a bunch of sources
and libraries around.  Created new eclipse project.

Further refinements to make it build.

Update gitignore.
 2013-09-27 11:34:46 -05:00
kruland2607
d00e70c0a9 Added some logging and an additional mechanism to try to find the jar 
file URL.
 2013-09-26 11:08:13 -05:00
bkuker
de2e2e6bd5 I10n for the GL preferences 2013-09-24 16:59:59 -04:00
bkuker
321761cf0f Wire in prefs dialog to Preferences and RocketFigure3d 2013-09-24 13:12:14 -04:00
bkuker
d16d1c4a13 Add a mocked out GL preferences tab 2013-09-24 12:57:49 -04:00
bkuker
a4c0b3bb56 Clean up calls to invoke / display. 
I misread the JOGL javadoc and thought that these methods did not come
from a common superclass, for some reason they are listed under class
methods, not inherited methods.
 2013-09-24 09:14:48 -04:00
bkuker
b2b05ce0b3 Choose between panel and canvas with hardcoded boolean 2013-09-23 19:46:53 -04:00
bkuker
e9e98e3634 Work with GLCanvas or GLJPanel. Picking broken with Panel 2013-09-23 19:46:51 -04:00
bkuker
9c607dfb03 Improve pick()'s debuggability 
Let you call it with a null point without dying.
Trace out the picked color.
 2013-09-23 19:46:51 -04:00
bkuker
a3c44f220b Texparameters need to be set while texture is bound. 
This was causing the GLSL Fast-flip code in GLJPanel to die, I think it
was trying to mipmap the FBO.
 2013-09-23 19:46:50 -04:00
kruland2607
ac6623aa32 Fix for Issue #143. Null pointer in warnings dialog when there is no 
simulation data.
 2013-09-23 10:18:49 -05:00
kruland2607
4421b0ef85 Added more protection around getDesktop calls. First test 
Desktop.isDesktopSupported() and fail fast.
 2013-09-16 10:04:19 -05:00
kruland2607
ee38ef2d3d Fix the "Simulate & Plot" button in the Simulation Dialog when multiple 
simulations are selected.  In this case, it now says "Simulate" and the
dialog closes when finished.
 2013-09-13 19:37:58 -05:00
kruland2607
7763af389e Added little l10n properties analysis tool, and fixed some obvious 
errors in cs & it localizations.
 2013-09-13 10:46:35 -05:00
Sampo Niskanen
10dbc856ee Remove unnecessary FIXMEs 2013-09-08 22:20:38 +03: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
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
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
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
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