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

554 Commits

Author SHA1 Message Date
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
bkuker
0d31819648 Limit some setting values to sensible ranges 2014-01-12 12:54:04 -05:00
bkuker
8e98ab42f6 Make File menu appear sans Open item when used as part of OR app 2014-01-12 12:34:33 -05:00
bkuker
2dd457b245 Clear a todo to delete commented out code 2014-01-12 12:26:32 -05:00
bkuker
6c570d7eaf Add a Save, refactored Copy. 2014-01-12 12:23:56 -05:00
bkuker
f4cc2f6382 Lower the bar for mouse movement on the photo renderer. 
Map X & Y to view alt & az. It gimble locks, it inverts when you are
upside down, but it actually mostly works.
 2014-01-11 17:22:48 -05:00
bkuker
007f760782 Make test main method load a rocket 2014-01-11 17:07:06 -05:00
bkuker
651b9d6418 Rename analysis meny to tools and move photo item there 2014-01-11 17:01:19 -05:00
bkuker
0c6cf5a6ce Merge branch 'master' into photobooth-split 2014-01-11 15:59:44 -05:00
kruland
96960ce930 Added start to turkish translations. 2013-12-31 20:28:29 -06:00
kruland
db69efc420 Listen for table changes so the help text will be removed when the user 
adds a motor tube in the edit body tube dialog.
 2013-12-29 20:05:44 -06:00
kruland2607
305ad36103 Simplify the RocketComponentVisitor by removing the generic interfaces. 
Added functionality to the RocketComponentVisitor by providing a
templated return value.

Modified the Configuration tab UI to disable recovery & staging tabs
when they are not appropriate and adding some help text to the motor
table when there are no motor mounts defined.
 2013-12-19 10:40:11 -06:00
kruland2607
f334fa1ec1 Ensure the selection is cleared when there is no motor. 2013-12-18 14:27:55 -06:00
kruland
635c8bf143 Update the tab indexes. Fix a problem where copying on the simulation 
tab switched to the configuration tab
 2013-12-12 20:05:36 -06:00
kruland2607
cbb9a48435 Ignore the NPE which happens when dropping a rocket component as the 
last component in the previous child element.  I can't seem to find a
better solution than to just eat the npe.
 2013-12-05 13:02:33 -06:00
kruland2607
c2d8314282 Improve layout of component tree buttons after updating miglayout. 2013-12-05 11:00:01 -06:00
bkuker
736ba96b26 Add menu option to open photo window 2013-12-04 18:25:48 -05:00
bkuker
830fe96115 Make photo more suitable for launching from OR UI 2013-12-04 16:19:46 -05:00
bkuker
e9a75b1111 Add light from flame to smoke. 2013-12-04 12:33:35 -05:00
bkuker
ba037a1b2c Add spark concentration & weight options 
Weight does not work great, lines are not the right thing to use.
 2013-12-03 19:08:11 -05:00
bkuker
c83b16b385 Simplify flame functions by breaking settings into a separate interface 
Will also be cleaner to do per-motor flame someday.
 2013-12-03 18:31:16 -05:00
kruland2607
e2575bca12 Added new startup flag openrocket.debug.layout which when set, shows 
boxes around all the components in miglayout.  Hopefully this will help
fix various layout issues in the applicaiton.
 2013-12-01 21:07:46 -06:00
bkuker
909a12ef15 Slightly improved sparks 2013-11-30 22:39:47 -05:00
bkuker
9069277573 Give smoke quads random rotation to reduce artifacts from repitition 2013-11-27 19:36:43 -05:00
bkuker
857f978504 Fix GL invalid state error in sparks - can't change point size there! 2013-11-27 17:56:05 -05:00
bkuker
77d9d1745e Clear some warnings 2013-11-27 17:53:49 -05:00
bkuker
63570880e3 Photo-booth files copied to the split version of OR. 
I HOPE I didn't miss anything!
 2013-11-27 17:52:28 -05:00
kruland2607
d542a261a9 Protect against possible NPEs. 2013-11-15 16:09:52 -06:00
kruland2607
36d290a85e Fix layout issues. 2013-11-15 16:09:31 -06:00
kruland2607
ac4ecc9285 Remove unused imports 2013-11-15 15:16:04 -06:00
kruland2607
b64bcd791b Fix layout in plot dialog introduced with new MigLayout library. 2013-11-15 14:14:31 -06:00