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

3727 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Ruland
db55191f2d Update to ActionBarSherlock 4.1.0. 2012-06-14 13:03:36 +00:00
Kevin Ruland
8b66af7441 Changed due to Simulation api change. 2012-06-13 16:41:02 +00:00
Kevin Ruland
1f0bcf6730 Change the initial screen handling and add file load to OpenRocketViewer activity. The OpenRocketLoaderActivity is now used as a base class for the OpenRocketViewer and Main activities. These activities now share the code used for loading ork files. The OpenRocketLoaderActivity no longer is registered in the manifest because it is not a real activity any more. The OpenRocketViewer activity now has a menu item for "load" to load a new model. The Main activity uses finish() when it transfers control to the OpenRocketViewer thus removing it from the back stack. Further, if the Main activity detects that the Application contains a rocket, it will automatically forward to the OpenRocketViewer. 2012-06-13 16:37:18 +00:00
Kevin Ruland
72ce4f8468 Make some usability improvements to the internal file browser. Don't cd when changing the preferred base directory (touching star). Don't put star on root & .. directories. 2012-06-13 16:28:03 +00:00
Boris du Reau
a21b3cedf5 Added credit for Czech translations 2012-06-12 18:14:25 +00:00
Bill Kuker
6695f92ab1 JOGL Based support for a 3D view of the rocket. 
Change to RocketPanel to add 3D option.
Change to build process to use a Jar-in-Jar technique, not Fat Jar, using the Eclipse projects jar-in-jar loader. (Does not require eclipse!)
 2012-06-11 20:25:41 +00:00
Richard Graham
71b36bc481 - Implemented copying of custom expressions to other simulations in expression builder dialog. Note the small changes to various files are to allow simulations access to parent document. 
- Switched to unicode char escapes
- Removed dynamic setting of flightdatatype priority
- Now hiding up down arrows in custom expression pane when unusable
- Localized custom expression operator discriptions.
 2012-06-11 04:47:49 +00:00
Kevin Ruland
225d502896 Bump version number in prep for a round of testing. 2012-06-10 01:39:13 +00:00
Kevin Ruland
1fcf661ff3 Added fliskits component catalog. Collected by hand entry from web and submitted by bill carpenter. 2012-06-06 20:19:20 +00:00
Kevin Ruland
909aa211d0 Change OpenRocketComponentSaver unmarshal function to return the whole OpenRocketComponentDTO instead of just the contained components. This gives the ComponentPresetEditor a change to grab the Materials in the file for use in the ui. 2012-06-06 18:03:43 +00:00
Kevin Ruland
00dfe40706 Change MaterialDTO.asMaterial() to convert the current object into a Material object. It no longer attempts to look it up in the database. 2012-06-06 18:02:01 +00:00
Kevin Ruland
1c0f70806d When validating the xml we don't need the returned value so don't bother assigning it to anything. 2012-06-06 18:00:57 +00:00
Kevin Ruland
90afd989f3 Add method to extract the List<Materials> from the parsed file. 2012-06-06 17:58:49 +00:00
Kevin Ruland
e49c6a1481 Added conversion constructor from List<Material>. 2012-06-06 17:56:32 +00:00
Kevin Ruland
5667442265 Populate the Materials section of the output file with those materials referenced from the presets being saved. 2012-06-06 12:10:38 +00:00
Kevin Ruland
1a6b3e471b Change the semantics of MaterialHolder.getXXXMaterial( Material ), instead of returning the material used as the argument if the material is not in the map, it returns null. This make the methods more similar to standard hash collections. 2012-06-06 12:09:39 +00:00
Kevin Ruland
89ff888c27 Explicitly create the writerThread to be an executor with an unbounded linked blocking queue. I have sometimes seen rejected exceptions (which should never happen) using the Executors.newSingleThreadExecutor which makes me doubt the documentation. 2012-06-06 12:07:18 +00:00
Doug Pedrick
17fa9ae55d Added most recently used design file list to File menu. 2012-06-06 02:22:19 +00:00
Kevin Ruland
540097aed4 Fixed two bugs. When the data in the table was sorted, the incorrect row in the model was being manipulated. Fixed the problem where the derived materials (based on component's mass value) were being placed in the materials list. 2012-06-05 18:13:20 +00:00
Kevin Ruland
fb1262897d Discovered a couple more shape parameter values used in RockSim csv files. 2012-06-05 18:10:04 +00:00
Kevin Ruland
274f646124 Tweak the style for the main and loader activities so the action bar is transparent expect for the overflow button. This looks much nicer on ICS. 2012-06-05 13:57:37 +00:00
Kevin Ruland
ad265733bd Change to inherit from Sherlock classes. 2012-06-05 13:47:15 +00:00
Bill Kuker
4ca77ba513 Delete file with problematic name, "staged." 
It can not exist on windows while the identical file "staged" also exists.
This file is unreferenced.
It must be here by mistake.
 2012-06-04 22:50:16 +00:00
Kevin Ruland
56f157a7a5 Added UnitGroup.fromUnit which delegates to UnitGroup.getDefaultUnit().fromUnit. 2012-06-04 19:17:05 +00:00
Kevin Ruland
0250f29f26 Added local foreground service which runs simulations. Wired into the SimulationEditFragment. 2012-06-04 19:16:27 +00:00
Kevin Ruland
63290b98e4 Use sendMessage instead of dispatchMessage so the message can be sent from a different thread. 2012-06-04 19:12:57 +00:00
Kevin Ruland
5faec59816 Make separate method for notifySimsChanged since this is useful without creating or deleting a simulation (for example when a simulation is done executing). 2012-06-04 19:02:56 +00:00
Kevin Ruland
bedcf4ecb5 Fix a bug where the motor configuration was not being pulled correctly. It is stored in the options. 2012-06-04 18:59:45 +00:00
Kevin Ruland
88a365ea6e Added exp4j and ExpressionParser to the android build. These are now required because of the changes in core for expressions in simulations. 2012-06-04 15:57:58 +00:00
Richard Graham
fcc243a986 Removed some debugging junk and fixed a null pointer exception. 2012-06-04 05:56:24 +00:00
Richard Graham
d4c4242c7f Fixed issue where symbols / units for FlightDataTypes would not be defined after loading a .ork file with data defined. Data types now figured out from the name when loading .ork file. 
Also changed the priority of the data types so that custom expressions show up first.
 2012-06-04 03:08:29 +00:00
Kevin Ruland
50f3fc39a6 Remove dependency on awt.Window from CustomExpression since this makes the android app very upset. 2012-06-02 23:43:36 +00:00
Richard Graham
16eed9a30b Added new feature : user configurable custom expression evaluation for the simulation, driven by exp4j. 2012-06-02 17:58:47 +00:00
Kevin Ruland
d103ac1d05 Refactor the RocketDocument and corresponding data and methods out of Application and into CurrentRocketHolder and CurrentRocket. 2012-06-02 04:47:18 +00:00
Kevin Ruland
192637f189 Delete empty directories after making TreeViewList a library. 2012-06-02 04:18:33 +00:00
Kevin Ruland
cb8faf376e Checkpoint commit with many different changes. Made the Configuration and Simulation "add" buttons to be action bar items. Added Handler to act as a listener mechansims so the OpenRocketViewer can update fragments when the rocket is modified. Added MotorConfigSpinner as custom View which is more usable than MotorConfigSpinnerAdapter. 2012-06-02 04:06:02 +00:00
Doug Pedrick
4b109f74f8 More accurate fin marking guide circumference computation - taking into account paper thickness and rounding up on 
fractional print points.
 2012-05-31 20:10:46 +00:00
Doug Pedrick
661b16bbda Support for different size clusters in centering ring template. 2012-05-31 03:06:22 +00:00
Doug Pedrick
dbd72738c5 Print support for clustered centering rings. 2012-05-30 22:41:01 +00:00
Doug Pedrick
eb0cfe141e Added ruler graphic to printed output; improvements to layout and margins in printing; bug fix in PrintUnit; other 
minor printing related cleanup.
 2012-05-28 04:28:26 +00:00
Kevin Ruland
905c7f740a Pull TreeListView from main source and include from library instead. 2012-05-27 12:57:57 +00:00
Kevin Ruland
100b54ae8f Added support library for TreeViewList. Previously this code was subsumed in the android app. 2012-05-27 12:48:32 +00:00
Kevin Ruland
af01c8482b Share project "TreeViewList" into "https://openrocket.svn.sourceforge.net/svnroot/openrocket" 2012-05-27 12:46:31 +00:00
Kevin Ruland
8d8ef35835 Remove unused imports. 2012-05-26 01:50:14 +00:00
Kevin Ruland
62fe67faa0 Use the dialog theme for the file browser because it looks better on tablets. 2012-05-25 20:46:00 +00:00
Kevin Ruland
a6a5eff5b6 Simplify the spinner styling. 2012-05-25 20:45:13 +00:00
Kevin Ruland
f7b883a4ce Removed another file not needed after moving to ActionBarSherlock. 2012-05-25 20:44:22 +00:00
Kevin Ruland
9a54fbdb88 Correctly change configurations without changing the default configuration id. Also, select in the spinner the default configuration when constructed. 2012-05-25 18:41:53 +00:00
Doug Pedrick
134031de24 Updated for centering rings. 2012-05-24 23:31:11 +00:00
Doug Pedrick
c89c927e0c Printable Centering Ring templates. 2012-05-24 23:28:58 +00:00