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

1002 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sampo Niskanen
041ec3b836 Remove stencil based drawing (from bkuker) 2012-12-11 23:07:30 +02:00
Sampo Niskanen
5412b8255b Merge branch 'integration' of github.com:kruland2607/openrocket 
Conflicts:
	core/.classpath
	core/3d-Test-Junk/net/sf/openrocket/startup/Quick3dMain.java
	core/src/net/sf/openrocket/gui/figure3d/RocketRenderer.java
	core/src/net/sf/openrocket/gui/main/BasicFrame.java
 2012-12-11 08:38:59 +02:00
kruland2607
011c21f54e Updated changelog. 2012-12-10 21:47:57 -06:00
Sampo Niskanen
49858f589f Update thrust curve files 2012-12-10 23:30:56 +02:00
Sampo Niskanen
ff22040df0 Refactor motor serialization/loading code 2012-12-10 22:44:06 +02:00
Sampo Niskanen
cffb77530e Merge branch 'master' of ssh://git@github.com/plaa/openrocket.git 2012-12-10 22:08:32 +02:00
plaa
399fa4e0a7 Merge pull request #8 from bkuker/no-stencil 
Replace stencil buffer with z-buffer to draw outline of selected items
 2012-12-10 12:08:14 -08:00
Sampo Niskanen
42b4eeac31 Merge branch 'feature-improvepresetloading' of 
github.com:kruland2607/openrocket

Conflicts:
	core/build.xml
	
Optimize motor loading further
 2012-12-06 12:49:00 +02:00
kruland2607
6a073af40b Reorder the zoom buttons. Added zoom reset icon and button. Fixed 
spacer in SimulationPlotDialog so close button is always properly
located.
 2012-11-14 21:14:39 -06:00
kruland2607
e6fe93c2ac Added right-click & drag zoom control contributed by Richard. 2012-11-14 21:11:56 -06:00
kruland2607
14ae26dda8 Clean up imports. 2012-11-14 09:35:02 -06:00
kruland2607
809113740b Modified event display logic so only events for the selected stage are 
displayed.
 2012-11-09 13:04:17 -06:00
kruland2607
45cabaaddf Fix condition used to display the stage combo box. 2012-11-09 11:56:52 -06:00
kruland2607
a06acb7b43 Change time limit used to make events show on the same line from .01s to 
.05s.
 2012-11-08 21:02:45 -06:00
kruland2607
c2ac8204b1 Always have the delay spinner enabled just like in the recovery tab of 
the component configuration.
 2012-11-08 20:56:55 -06:00
kruland2607
b98802ebee Refactored lots of code out of SimulationPlotDialog into SimulationPlot 
and EventGraphics to allow for easier maintenance.  Added stage
selection combo box to SimulationPlotDialog.  Removed the selectedStages
from PlotConfiguration since we are going to control which stages to
plot from the plot dialog.
 2012-11-08 10:38:48 -06:00
kruland2607
4de4d0d728 Usability enhancements to the simulation plot. 
- Made mouse wheel zoom.  alt mouse wheel zooms only domain.
- added explicit zoom buttons.  alt button zooms domain only.
- mouse drag pans the plot.
- use simulation name for window name & plot title.
 2012-11-06 20:56:42 -06:00
kruland2607
4035e711c5 Add stage number to series labels to ensure uniqueness. 2012-11-06 09:31:52 -06:00
kruland2607
c9827cd5c1 Fix bug in GeneralOptimizationDialog related to sorting the optimization 
parameters.  Switched to using a table row sorter instead of manually
sorting the array.
 2012-10-31 09:41:21 -05:00
kruland2607
1d686c88e5 Change the optimization modifiers to manipulate the "default" values. 2012-10-31 09:40:12 -05:00
kruland2607
89ff50d60c Fix whitespace and add SuppressWarnings. 2012-10-28 16:26:50 -05:00
kruland2607
bd66cc9338 Use Serializable representation of system supplied motors in jar file. 
this greatly improves startup performance.
 2012-10-28 11:26:40 -05:00
kruland2607
3b65c1d970 Reimplement Example menu item as Action List just like the MRU menu 
item.  Both the old dialog and new submenu are available in BasicFrame
to see what looks & works better.
 2012-10-26 12:09:23 -05:00
kruland2607
02c04f2bf9 Removed unused import. 2012-10-26 12:07:50 -05:00
kruland2607
4179b0d6e6 Fix localization, dialog placement, and prepopulated fields in flight 
config dialogs.
 2012-10-26 11:58:41 -05:00
kruland2607
eb20d0e72e Added descriptions, author and rocket names to new examples. 2012-10-26 11:57:36 -05:00
kruland2607
e73211e2cf Fixed but motor selected label was not changing when the combo box value 
changed.  I don't know when this was introduced.
 2012-10-25 20:46:50 -05:00
kruland2607
dbf8fa77d1 Fix implementation of BredthFirstRecursiveVisitor. 2012-10-25 20:21:03 -05:00
kruland2607
87e968690b Change labels and add explicit Edit buttons to all places where the 
flight configuration list is presented.
 2012-10-25 20:17:46 -05:00
kruland2607
cda4281475 Changed the management of the SimulationStatus WarningSet so it is not 
copied by the copy constructor.  Management of the warning set is
controlled by the BasicEventSimulationEngine.

Cleaned up some warnings: removed unused includes, changed annotations,
removed unused local variables.
 2012-10-25 12:10:28 -05:00
kruland2607
ee11816828 RK4SimulationStatus needs to implement Cloneable. 2012-10-25 09:39:28 -05:00
kruland2607
36558e60a2 Updated the Boosted Dart example to have two different stage 
separations.
 2012-10-24 22:29:10 -05:00
kruland2607
27d6322f09 Refactored the initialization and copying of SimulationStatus objects. 
Initialization is now done in the constructor instead of
BasicEventSimulationEngine.  Copying SimulationStatus is implemented in
copy constructors instead of using SimulationStatus.copyFrom().
 2012-10-24 22:28:40 -05:00
kruland2607
6d8b27068f Clean up warnings. 2012-10-24 21:49:07 -05:00
kruland2607
f161a2dca6 Refactor OpenRocketLoader moving all the internal classes to their own 
files.
 2012-10-24 21:43:21 -05:00
batwings
564010974b Merge branch 'feature-rocketconfig' into integration 
Conflicts:
	core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketLoader.java
 2012-10-24 16:48:19 -05:00
batwings
b32be42092 Added full support for per flight-config stage separation: simulation, 
ork file, and gui configuration.
 2012-10-24 16:32:38 -05:00
batwings
4490a6c1cb Prepare stages to be configurable by creating a 
StageSeparationConfiguration object and renaming the current methods on
Stage to be for the default configuration.
 2012-10-24 14:06:34 -05:00
batwings
d45b68a78e Change name of class SupportsFlightConfiguration to FlightConfigurable. 2012-10-24 13:42:09 -05:00
bkuker
0569ca17bf Replace stencil buffer with z-buffer to draw outline of selected items 2012-10-24 13:34:34 -04:00
batwings
fc2fd2a011 Merge branch 'feature-stagerecovery' into integration 
Conflicts:
	core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
 2012-10-24 10:22:48 -05:00
batwings
5d65b591e1 Merge branch 'feature-rocketconfig' into integration 
Conflicts:
	core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketLoader.java
	core/src/net/sf/openrocket/file/openrocket/savers/RocketComponentSaver.java
 2012-10-24 09:26:29 -05:00
kruland2607
5deae1d3db Found the missing pieces to make decals work. 2012-10-23 22:13:22 -05:00
kruland2607
04ee758e6a Fix up failures from the previous merges. 2012-10-23 21:56:35 -05:00
Kevin Ruland
4466bc3f8a Added FIXME for overwriting. Fixed warnings. 2012-10-23 16:25:47 -05:00
Kevin Ruland
207a768ded If the exported file can no longer be found, fall back to other means of loading the decal. 2012-10-23 16:25:40 -05:00
Kevin Ruland
03bc001bbd Implement simple export mechanism for decals. The 3d view will pull from the exported file for the duration of the editing session. 2012-10-23 16:25:33 -05:00
Kevin Ruland
a73358bd27 Added isExportable which tests if a decal is currently available from the container file. Refactored the code some. Use the FileUtils readBytes[] method. 2012-10-23 16:25:24 -05:00
Kevin Ruland
c9212c2b40 Added a couple of handy stream utilities. copy copies the contents of an InputStream to an OutputStream. readBytes returns the contents of an InputStream as a byte[]. 2012-10-23 16:25:14 -05:00
Kevin Ruland
6cf525467c Fix bug in base function - need to use the StorageOptions passed in instead of those stored in the OpenRocketDocument. 2012-10-23 16:25:07 -05:00