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

1026 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kruland2607
7db51b9b65 Always save using .zip container format. Removed the "use compression" 
option from the StorageOptionChooser.
 2012-12-16 13:45:49 -06:00
kruland2607
1bbef243ac Merge pull request #14 from bkuker/kruland-integration-decals 
Decal UI Simplification & Fixes
 2012-12-14 08:21:27 -08:00
bkuker
9d065c90e7 Cleanup Apocalypse example: 
Better decals
Non-weird flips
Moved some couplers that seemed off.
 2012-12-14 09:53:35 -05:00
bkuker
efb05a554c Add a slider model to the IntegerModel, add a spinner to shine parameter 2012-12-14 09:36:43 -05:00
bkuker
591b05d867 Set up ligiting for figure 2012-12-14 09:36:40 -05:00
bkuker
aac5fb9451 Fix bug where selection outline stayed visible after a component is 
deleted
 2012-12-14 09:36:37 -05:00
bkuker
ee95d6998a Create a simpler appearance builder for a simplified UI. 2012-12-14 09:36:34 -05:00
bkuker
5a8833738c Allow batching several changes before firing a changeEvent 2012-12-14 09:36:32 -05:00
bkuker
e97ae2f4b0 If an absolute file is missing try resolving it in the directory the 
file was loaded from
 2012-12-14 09:35:53 -05:00
kruland2607
a780b8da93 Added some FIXMEs for consideration when saving files with decals. 2012-12-13 11:01:16 -06:00
kruland2607
fbf5d3af03 Failed to add net.sf.openrocket.gui.plot.Util class to support 
SimulationPlot changes.
 2012-12-13 10:46:09 -06:00
kruland2607
2c7fcdb87c Regenerate the Apocalypse example file after changing the name of the 
ork file in the zip container.
 2012-12-12 22:27:04 -06:00
kruland2607
5d3bdd975c Forgot to remove FIXME comment in previous commit. 2012-12-12 22:23:56 -06:00
kruland2607
106a976655 Be a little smarter about generating the series names for the plot and 
drop down.  Extract algorithm into utility class for easier reuse.
 2012-12-12 22:23:11 -06:00
kruland2607
aeacbcfd18 When saving a zip file, save the main rocket ork file using the same 
filename.
 2012-12-12 22:22:11 -06:00
kruland2607
db45a48e08 Localized the Export Decal menu item. 2012-12-12 21:39:07 -06:00
kruland2607
e5ed9e166b Added localized strings for the dialog. Removed FIXME saying "add 
buttons" because there are buttons.
 2012-12-12 16:48:36 -06:00
kruland2607
1291574752 Added FIXME to indicate there are two example menu items one of which 
must be removed.
 2012-12-12 16:47:09 -06:00
kruland2607
1e51b171a4 Change FIXMEs relating to caching decal bytes to a TODO. The class 
functions correctly as is, but might benifit from caching.
 2012-12-12 16:45:59 -06:00
kruland2607
474797748d Removed FIXME. The document properties are set in the OpenFileWorker. 2012-12-11 21:51:37 -06:00
kruland2607
a046a7969c Change appearance panel scale spinners to increment by tenths since it 
seemed better than whole units.
 2012-12-11 21:36:14 -06:00
kruland2607
fab85c2918 Replaced the alternate example menu item for consideration. 2012-12-11 20:46:08 -06:00
plaa
c98f4ad21d Merge pull request #10 from bkuker/kruland-integration 
RocketRenderer fix
 2012-12-11 13:14:43 -08:00
Sampo Niskanen
041ec3b836 Remove stencil based drawing (from bkuker) 2012-12-11 23:07:30 +02:00
bkuker
5786cd1c49 Do not perform the stencil based drawing, it has been replaced by the Z 
version.
 2012-12-11 16:02:23 -05: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