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

1780 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kruland2607
24a011b1e8 Manual edits to the new AeroTech C3 and D2 eng files to correct mass and 
delays.
 2013-10-03 12:27:15 -05:00
kruland2607
5913fb2533 Merge branch '13.09dev' into feature-motorfilter 2013-10-02 20:48:47 -05:00
kruland2607
e44c87029b Fix eclipse classpath after moving the lib-test stuff. 2013-10-02 20:48:13 -05:00
kruland2607
444035442f scroll to selection on opening. 2013-10-02 13:45:54 -05:00
kruland2607
24bba56059 Merge branch '13.09dev' into feature-motorfilter 2013-10-02 13:05:27 -05:00
kruland2607
59e75d5c83 Rework BodyTubeConfig and InnerTubeConfig removing the motor 
configuration stuff.  The motormount checkbox and default ignition
configuration is now on the General tab.  Removed
ThicknessRingComponentConfig since that was only used by
InnerTubeConfig.  Moved the radialPanel from RingComponentConfig to
InnerTubeConfig for now.
 2013-10-02 12:51:59 -05:00
kruland2607
ed0444a909 Move buttons to top. 2013-10-02 08:55:55 -05:00
kruland2607
6abcda7abd Don't show the sustainer stage in the stage configuration panel. 2013-10-01 16:12:05 -05:00
kruland2607
dca6c31241 Move ownership of the table to the base class. 2013-10-01 15:47:28 -05:00
kruland2607
60a7014ca3 Fix button layout. 2013-10-01 15:37:17 -05:00
kruland2607
f433c640e2 Fixed motor table so it only shows motor mounts. Extracted the table cell renderer code into abstract base class. 2013-10-01 13:26:44 -05:00
kruland2607
c8f71fcc94 Refactored the table models into a common base class FlightConfigurableTableModel. 2013-10-01 12:12:30 -05:00
kruland2607
fa7916f7b0 Localized column heading and added rocket listener to update columns. 2013-10-01 11:34:57 -05:00
kruland2607
e36a90adfc Improved common base of configuration panels. 2013-10-01 10:20:44 -05:00
kruland2607
9e01ff4e76 Refactor Recovery and Separation panels to derive from 
FlightConfigurablePanel.  Added DefaultConfiguration listener to the
FlightConfigurablePanel to keep the RocketFigure in sync.
 2013-09-30 21:59:37 -05:00
kruland2607
43187b2b2c Implement Configuration tab in BasicFrame next to Design and Simulation tabs. Provides functionality to configure motors, recovery and stages. Todo - verify functionality, add listeners to the table contents change when the design is updated, add listener so the configuration is highlighed to reflect selection in RocketFigure. 2013-09-30 21:12:52 -05:00
kruland2607
393850a367 Change case in core jar name. 2013-09-30 12:03:15 -05:00
kruland2607
fc5faf2285 Update travis to use base build. 2013-09-30 11:57:34 -05:00
kruland2607
d692288f68 Added build.xml driver in root directory. Moved a few files around to support 
unittest.
 2013-09-30 11:38:54 -05:00
kruland2607
572b14de13 Localize motor popup and new fields in ThrustCurveMotorSelectionPanel. 2013-09-28 22:16:31 -05:00
kruland2607
bae9d38a51 Further refinements to motor filter. Moved diameter configuration into 
popup.  Added impulse class filters.  Improved interface to CheckList and
removed the double-click functionality from CheckListEditor.
 2013-09-28 22:01:14 -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
64015d72be Refactor the api so the motor mount goes into the 
ThrustCurveMotorSelectionPanel.  This allows greater flexibility in
filter functionality.
 2013-09-27 21:51:13 -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
5e27ea578f Added core/resources and swing/resources to classpath. 2013-09-27 21:37:46 -05:00
kruland2607
f3bcdfcfc2 Changed eclipse project name to OpenRocket Core. 2013-09-27 20:59:35 -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
f300c3a6be Merge pull request #147 from kruland2607/master 
Added some logging and an additional mechanism to try to find the jar file URL.
 2013-09-26 09:25:52 -07: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
Bill Kuker
0a4ca9fe54 Merge pull request #146 from bkuker/bugfix-osx-java7 
GL Preferences for compatibility - specifically with Java 7 on OSX.
 2013-09-26 08:23:58 -07:00
bkuker
6ba311d7ed Reference the correct jogl sourcepath 2013-09-24 17:00:43 -04: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
kruland2607
d9a32556dc Merge pull request #145 from kruland2607/master 
Added C3 and D2 thrustcurves and fixed the Loki J175.
 2013-09-24 09:11:41 -07:00
kruland2607
bba83fc795 Regenerate thrustcurve.ser again. 2013-09-24 11:12:19 -05:00
kruland2607
cece53c476 Added preliminary thrustcurves for AT C3 and D2. Removed the 
Loki_J175.rse provided by thrustcurve.org because it lists the wrong
type.
 2013-09-24 10:57:30 -05: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
1db67037b1 Correct jogl sources p2 2013-09-23 19:46:54 -04:00
bkuker
b2b05ce0b3 Choose between panel and canvas with hardcoded boolean 2013-09-23 19:46:53 -04:00
bkuker
2f39fab80c Correct version of sources for JOGL 2013-09-23 19:46:52 -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
7d289b3daa Merge pull request #144 from kruland2607/master 
Fix for Issue #143.  Null pointer in warnings dialog when there is no simulation data.
 2013-09-23 08:35:59 -07: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
1931a6f11e Merge pull request #142 from kruland2607/master 
Added more protection around getDesktop calls.  First test Desktop.isDesktopSupported() and fail fast.
 2013-09-16 08:27:51 -07: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
12b2f5e72c Merge pull request #141 from kruland2607/master 
Fix the "Simulate & Plot" button in the Simulation Dialog when multiple simulations are selected.
 2013-09-13 17:38:51 -07:00