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

3167 Commits

Author SHA1 Message Date
bkuker
657592e119 Replace all client calls with SLF calls 2012-10-26 14:47:40 -04:00
bkuker
a1fe1adf06 Remove unused Application imports 2012-10-26 14:25:14 -04:00
bkuker
e1457ca2a1 Change calls to log.user() to log.info(). 
Use the USER_MARKER for any log.user() calls.
Now you'll be able to log.error(USER_MARKER, "whatever...")
 2012-10-26 14:25:09 -04:00
bkuker
7fb5a7ad81 Replace calls to verbose() with trace() 2012-10-26 14:25:02 -04:00
bkuker
4c84b3dad7 Provide Markers class 2012-10-26 14:24:00 -04:00
bkuker
d58c089673 Replace LogHelper with SLF4J Logger anywhere it is possible without an 
error.
 2012-10-26 14:23:00 -04:00
bkuker
ee3aae6c8b Include SLF libs, Logback libs, and Logback config 2012-10-26 14:07:01 -04: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
Kevin Ruland
fddf6cc0c7 Modified the AppearancePanel decal selector to have a combo box which follows the ComponentPreset pattern. The first entry in the combo box contains "none" entry which clears the decal associated with the component. The last entry in the combo box is "choose from file" which opens a file picker to select an image from the file system. The entries in between contain all the decals currently used by components in the document which facilitates reusing decals on the model. 2012-10-23 16:24:58 -05:00
Kevin Ruland
4cdf1e8e87 Modified the AppearancePanel decal selector to have a combo box which follows the ComponentPreset pattern. The first entry in the combo box contains "none" entry which clears the decal associated with the component. The last entry in the combo box is "choose from file" which opens a file picker to select an image from the file system. The entries in between contain all the decals currently used by components in the document which facilitates reusing decals on the model. 2012-10-23 16:24:50 -05:00
Kevin Ruland
bdca67fb7a Added method to list all the decals currently used by the components in the document. 2012-10-23 16:24:42 -05:00
Kevin Ruland
82679233f9 Rework GeneralRocketSaver to allow for proper behavior when overwriting container files. The problem was that the SaveFileWorker was opening the container file for writing before the saver was able to extract all the decals contained in it. This resulted in a failure and the output file had zero length. To fix this issue, the saver will first write to a new temporary file, then if the write is successful, it will copy the old file out of the way, copy the temporary file over it, then finally remove the old file. This results in a much more failure resistant writing process in all scenarios (even when not saving with decals). 
In order to make this change, the SaveFileWorker could no longer pass in an OutputStream (since it shouldn't have to worry about all the file copies).  The progress update mechanism had to be reworked to use an explict callback object instead of being built into the OutputStream.
 2012-10-23 16:23:47 -05:00
Kevin Ruland
d40a36d09b We need to pull the bytes out of the input stream so we can close the input stream. It seems the Jogl Texture loader does not close the input stream. When loading textures from a zip file, this leaves the zip file open and prevents saving/ moving the file. 2012-10-23 16:23:40 -05:00
Kevin Ruland
3195b8d5df If reading from an ork container format, change the StorageOptions to reflect IncludeDecals = true. 2012-10-23 16:23:31 -05:00
Kevin Ruland
4757ce82f2 Update comments in saveAsRocksim(File) method noting that the saved state flag in OpenRocketDocument should not be switched to true after a successful save. 2012-10-23 16:23:23 -05:00
Kevin Ruland
3c7afcc2fb Update the state of the Include Decals button based on the current StorageOptions. 2012-10-23 16:23:16 -05:00
Kevin Ruland
e78f5b27f1 Added example file with decals. 2012-10-23 16:23:09 -05:00
Kevin Ruland
26370cd416 Change name of output file. 2012-10-23 16:23:02 -05:00
Kevin Ruland
f92cb2c8d6 Some refactoring: changed name of variable "filename" to "displayName" in BasicFrame to indicate that the string is used for presentation in the opening dialog and not as the name of a File to option. Moved the call to OpenRocketDocument.setFile() and setSaved() into OpenFileWorker instead of BasicFrame so the File object doesn't need to get passed around so much. Modified the RocketSaver interface to not require the filename since it doesn't need it anymore. 2012-10-23 16:22:47 -05:00
Kevin Ruland
e9060272e4 Created a GeneralRocketSaver object which is analogous to GeneralRocketLoader. Based on the StorageOptions, it determines how to save the file using a RocksimSaver or OpenRocketSaver as appropriate. Modified RocksimSaver and OpenRocketSaver so they only operate on OutputStreams. Removed methods from RocketSaver interface which operated on File. Fixed bug in DecalRegistry where it wouldn't handle absolute filenames. Fixed bug in BasicFrame where it would display ugly stuff for the filename. 2012-10-23 16:19:37 -05:00
Bill Kuker
4fe9dc4eef Fix to provide a FileInfo to the GeneralRocketLoader 2012-10-23 16:13:49 -05:00
Kevin Ruland
d0569e5759 Fixed loading decals from example file. Added FileInfo class which is used to describe data about the file - what the URL is to it and it's parent directory (if appropriate). The FileInfo class is pushed into the DecalRegistry to facilitate loading decals from the correct location. Added the Apocalypse with decals as an example file. 2012-10-23 16:13:35 -05:00
Kevin Ruland
05d1b91d90 Sizable commit with lots of changes to support decals in openrocket files. Added support for zip container support. Changed Decal to hold a String instead of URL. Refactored GeneralRocketLoader out of the RocketLoader hierarchy so the GeneralRocketLoader knows about files and RocketLoader only knows about streams. Changed the OpenRocket file format to 1.6 and added <appearance> and it's children for ambient light and decals. Implemented a DecalRegistry which is a member of the OpenRocketDocument. This class is used to get InputStreams for decals by their names. 2012-10-23 15:54:45 -05:00