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

1504 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kruland2607
30b89a54cf Add a little fuzz to the motor diameter detection. 2013-10-10 19:30:54 -05:00
kruland2607
1d36ab5eaf Merge branch '13.09dev' into feature-configtab 2013-10-10 11:35:41 -05:00
kruland2607
86a273272b Rework the motor table entry. 2013-10-10 11:01:21 -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
2a7cc37d25 Added in plain junit formatter to get output from travis. 2013-10-09 14:35:23 -05:00
kruland2607
1e0ac22592 Removed the old FlightConfigurationDialog. 2013-10-09 14:20:38 -05:00
kruland2607
e04478bb94 Merge remote-tracking branch 'origin/13.09dev' into feature-configtab 2013-10-09 14:03:50 -05:00
kruland2607
e4afa7961e Fixed jdk7 problem in Multislider and NPE when there is no motor in the 
ThrustCurveMotorSelectionPanel.
 2013-10-09 14:00:33 -05:00
kruland2607
d6b19eb4b6 Add motor mount selection table to the Flight Configuration tab. 2013-10-09 13:53:05 -05:00
kruland2607
e091f3341a Refactor MotorMountTable UI currently used in flight configuration 
dialog in order to provide reuse.
 2013-10-09 12:26:35 -05:00
kruland2607
88ddb86758 Update flight configuration buttons to have better names. 2013-10-09 12:25:12 -05:00
kruland2607
4daebfde5a Merge remote-tracking branch 'upstream/13.09dev' into feature-configtab 2013-10-08 21:15:36 -05:00
kruland2607
7687568f81 Merge pull request #151 from kruland2607/feature-motorfilter 
Improve MotorSelectionDialog box by having more sophisticated filtering.
 2013-10-08 19:06:10 -07:00
kruland2607
9420390ea8 Final tweaking of motor filter in the MotorChooserPanel. 2013-10-08 21:08:05 -05:00
kruland2607
fbc7cf69f5 Merge remote-tracking branch 'upstream/13.09dev' into feature-motorfilter 2013-10-08 20:55:21 -05:00
kruland2607
2368455d2d Merge pull request #150 from kruland2607/13.09dev 
Fix eclipse classpath after moving the lib-test stuff.
 2013-10-08 18:47:03 -07:00
kruland2607
2127908b2a Wire up motor length filter using ChangeListener and DoubleModel. 2013-10-07 22:19:07 -05:00
kruland2607
3e57ef205d Be smart about displaying decimals. 2013-10-07 22:18:22 -05:00
kruland2607
e5679259fa Rework the impulse and diameter to use a two thumbed slider. 2013-10-07 18:47:10 -05:00
kruland2607
afcedf90f1 Remove the show details button now that it's available in a tab. 2013-10-05 15:43:12 -05:00
kruland2607
7221b6558e More cleanup. 2013-10-04 21:33:46 -05:00
kruland2607
e6755e0e84 Rework the thrustcurve motor filter and information. They now share 
tabs on the MotorSelectionPanel.  Added Minimum Motor diameter to the
motor filter.
 2013-10-04 20:36:30 -05:00
kruland2607
cf08cd77b8 Merge pull request #149 from soupwizard/13.09dev 
Swing build depends on core jar already being built, added dependency
 2013-10-04 06:51:01 -07:00
soupwizard
71e3e76493 Swing build depends on core jar already being built, added that dependency. 2013-10-03 21:25:55 -07:00
kruland2607
32817f2cb1 Reworked the ThrustCurveMotorSelectionPanel so a single instance can be 
reused for different searches.  This means the MotorRowFilter has an
easier time remembering its settings on a per rocket basis.
 2013-10-03 21:00:50 -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