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

98 Commits

Author SHA1 Message Date
Kevin Ruland
ac1b718138 Added openrocketviewer layout for xlarge portrait mode. 2012-02-05 01:49:29 +00:00
Kevin Ruland
d3b59e68cc Clean up imports. 2012-02-05 01:41:23 +00:00
Kevin Ruland
512a82f4c1 Change database name. 2012-02-03 15:02:04 +00:00
Kevin Ruland
b0f4f25ba2 Improved message provided during progress. 2012-02-03 01:38:50 +00:00
Kevin Ruland
d84e03e921 Fixed problem with logging when a single String is used for a literal not a MessageFormat template string. 2012-02-03 01:38:09 +00:00
Kevin Ruland
235cc29676 Reformat. 2012-02-02 17:37:39 +00:00
Kevin Ruland
616dd8c1a7 Fix up the unit preferences correctly. The preferences now show the current setting and when they are changed, the overview and simulations lists are updated. 2012-02-02 02:49:44 +00:00
Kevin Ruland
9e05cfeb29 Change all calls to android.util.Log to use the AndroidLogWrapper class since it provides the ability to turn off all logging - which is desirable when making a apk for distribution. 2012-02-01 02:44:37 +00:00
Kevin Ruland
d8d9f499b7 Rewrite MotorBrowser to use a fragment for the list. This is the first step in making this portion of the application look and operate better on tables. 2012-01-30 03:48:42 +00:00
Sampo Niskanen
510adee8c7 motor loading refactoring 2012-01-29 18:15:33 +00:00
Kevin Ruland
aa9259be6e Fix npe when one uses the back button to get rid of the query instead of executing a query. 2012-01-29 02:46:43 +00:00
Kevin Ruland
90f2dcadfc Rewrite the simulation graph component. It is now implemented as a fragment with a menu to configure the serieses and display a list of the flight events. 
SimulationChart now implements a flyweight pattern containing the simulationId so it can be serialized allows the os to pause the application and restore most of the state of the graph.  Currently the selected serieses are not persisted so the graph gets reset to the default.

The simulation view is operated in two different modes.  On tablets in landscape the graph appears in the right sidepane and the list on the left.  When a new simulation is selected, the old graph is pushed to the back stack.  When in portrait mode or on smaller sceens, the simluation graph is in a separate activity.
 2012-01-26 15:36:15 +00:00
Kevin Ruland
0560556ba2 Removed the title bar from the OpenRocketLoaderActivity so it looks just like the main screen. 2012-01-26 01:02:58 +00:00
Kevin Ruland
27acc364ec Rename the class OpenRocketLoader to OpenRocketLoaderActivity to prevent confusion with the core's OpenRocketLoader. 2012-01-26 00:56:18 +00:00
Kevin Ruland
787407fae4 Fix import after OpenRocketLoader was repackaged. 2012-01-26 00:55:08 +00:00
Kevin Ruland
d2fa55fb74 Refactor the Query & Download thread and progress management out of TCQueryActivity to allow for more reuse. 2012-01-25 17:58:52 +00:00
Kevin Ruland
2fc45af6e0 Define a callback interface in the Simulation list fragment which is called with the simulation id that is selected. Implement this interface in the OpenRocketViewer which then invokes the Intent for the SimulationViewer. 2012-01-25 17:35:46 +00:00
Kevin Ruland
1d127a0162 Modify the OpenRocketTask to send both the WarningSet and OpenRocketDocument back and display a dialog when there are warnings. The dialog is only partially implemented. 2012-01-25 17:33:22 +00:00
Sampo Niskanen
bd8e82c1d2 motor updates 2012-01-23 19:07:36 +00:00
Kevin Ruland
8603cbeff5 Various changes to android application. Separate the loading of an ork file into the OpenRocketLoader activity. Changed OpenRocketViewer to use Fragments for each of the tab contents. Added Component, Overview and Simulations fragments for the tabs in OpenRocketViewer. Modified the graphics on the UI. Have the PreferencesActivity pack the changed preferences into the application onStop(). 2012-01-22 02:44:17 +00:00
Kevin Ruland
c0f100e3a5 Added exclusions of the .svn directories in the linked source from OpenRocket core. 2012-01-15 03:33:15 +00:00
Kevin Ruland
398f302dfc Change handling of Motor Digests. The computed digest value is now stored as a member variable in the ThrustCurveMotor and avaliable through the getDigest() method. getDigest() was added to the Motor interface. All references to MotorDigest.digestMotor() were removed from the application. 
The android db now stores the digest.  Also changed persistance mechanism for delays to store as comma delimited string.

The TestMotorLoader is now failing because the digests have changed.
 2012-01-15 02:46:13 +00:00
Kevin Ruland
dc2690df2f Fix NPE caused when the FlightEvent List was made non-selectable. 2012-01-14 02:44:13 +00:00
Kevin Ruland
44d390272c Convert apogee and simulation plot values to configured units. 2012-01-14 02:43:21 +00:00
Kevin Ruland
6e849bcf30 Add preference selection for Distance and Velocity. 2012-01-14 02:42:21 +00:00
Kevin Ruland
966ab18b07 Added simple file browser functionality used when there are no applications installed to handle this task. 2012-01-13 21:02:12 +00:00
Kevin Ruland
b7ac4b2133 Wired up computation of CP, CG, liftoff weight and stability to the configuration spinner. 2012-01-13 18:30:46 +00:00
Kevin Ruland
e2cc085bab Show the simulation name as the chart title. Made some UI concessions because drawing the events in the graph is not currently available: Moved "draw" button to series tab, changed the list entry for the events to non-selectable simple text items. 2012-01-13 18:29:16 +00:00
Kevin Ruland
fe5a8eccfb Reimplement motor handling so the android application relies more heavily on the OR core ThrustCurveMotor class. This involved changing the database schema and querying mechanisms. Rewriting the thrust curve download logic in net.sf.openrocket.android.thrustcurve. Fixing the motor browser, motor details, and burn plot activities. The file parsing now uses the RSE and RSP parsers from OR core. 
ExtendedThrustCurveMotor class was created to hold the additional data required by the db ( the id in particular) along with the data which is useful to the browser (case info and impulse class).
 2012-01-12 19:51:28 +00:00
Kevin Ruland
4900b84551 Switch minimum sdk to 9 since OR core uses ArrayDeque which is only available in Android API 9. Note API 9 is Android 2.3 / Gingerbread, but there are no emulators available for this api version. 2012-01-12 19:41:16 +00:00
Kevin Ruland
e766449e15 Modified RocketUtils.getCG to take a MassCalcType parameter. In the OpenRocketViewer, calculate mass empty. Changed the order of the fields in the openrocketviewer layout. Added a spinner for the configurations stored in the ork file - though this still needs to have motors wired in. 2012-01-11 14:56:40 +00:00
Kevin Ruland
16334ca53a Added couple of comments and executed eclipse's autoformat. 2012-01-11 14:54:00 +00:00
Kevin Ruland
fcc49f821e Use Eclipse source link to WORKSPACE/OpenRocket/resources to include core-resources/ in project. 2012-01-11 03:36:49 +00:00
Kevin Ruland
851865e54f Using pl.polidea.treeview for the component tree list. This code is under 2-clause BSD and available from code.google.com/p/tree-view-list-android. Unfortunately, the only way to effectively use this code is to include the source within the project (instead of jar) because it was poorly written and depends on a bunch of resources. 2012-01-10 15:48:19 +00:00
Kevin Ruland
3845508f21 Removed the splashscreen.png since we no longer have a splash. 2012-01-09 19:10:25 +00:00
Kevin Ruland
329ebb5900 Move the or_launcher icon to drawable since it is the only one we have. 2012-01-09 19:08:54 +00:00
Kevin Ruland
41daafa8e3 Get rid of timed splash and display a better welcome screen. 2012-01-09 19:00:19 +00:00
Kevin Ruland
a31ab4e099 Set up Eclipse source links to have access to core/src in android project. 2012-01-08 22:26:19 +00:00
Kevin Ruland
df9a43aef8 Move the android package from the main trunk/src directory to trunk/android/src. 2012-01-08 01:51:02 +00:00
Kevin Ruland
10dd89f569 Change OpenRocketViewer to tab layout with three tabs: overview, components, and simulations. Overview is populated with some high level data about the rocket - length, mass, cg, etc. Components will be populated with the tree of rocket components. Simulations contains the list of stored simulations. 
Added length and mass preferences and wired into the application object initialization of the OpenRocket UnitGroup statics.

There is currently an issue in the Simulation list in that the motors are not being displayed.  This is because currently the motor dao is not wired into the application.
 2012-01-08 00:53:35 +00:00
Kevin Ruland
d1df3dd35f Change Simulation plotting functionality to use AChartEngine instead of AndroidPlot. AChartEngine has built in zoom and pan though they are currently not used (because they are a little buggy). AChartEngine supports mulitple series plotted on same graph. However, it does not support the plotting of events. 
Removed the sliding drawer from the configuration.  Instead a new activity is launched containing the plot.
 2012-01-06 03:12:27 +00:00
Kevin Ruland
9e35f023f4 Use a nice pretty icon for the launcher pulled from the pix/icons/ directory. 2012-01-04 05:31:40 +00:00
Kevin Ruland
e9fec4ea37 Fixup the intent filters for the OpenRocketViewer activity. It's not pretty but it was the only way I could find which would convince the file browser to show the OR icon with the file and be able to launch the activity correctly. 2012-01-04 05:30:50 +00:00
Kevin Ruland
2e41cbb5ff Added progress dialog when loading a file. Removed some default text from the view. Added safety net to launch the file browser when no file is specified. This last piece of functionality might be replaced with a dialog and better error handling in the future. 2012-01-03 18:58:10 +00:00
Kevin Ruland
c546dba066 Added some functionality to Main activity. Splash screen is displayed for a little bit, then the user is presented with two buttons - one to open a file browser to find ork files, the other to start the motor browser. 2012-01-03 18:56:38 +00:00
Kevin Ruland
0970409101 Added custom launcher icon for application. 2012-01-03 18:44:48 +00:00
Kevin Ruland
dc488e2f58 Checkpoint commit of android functionality. Application currently consists of simple Main activity which does nothing but allows for bootstrapping of debugger. In future Main activity will go away. OpenRocketViewer activity which loads an ork file and displays a list of the simulations. And Simulation activity which is used to plot simulation results. 
Also included is a Motor sqlite database which is populated from thrustcurve downloads.  Includes primitive thrustcurve plotting system.  This will soon be wired into the openrocket application to supply motors for simulation execution.
 2012-01-03 02:20:10 +00:00
Kevin Ruland
a10bfbe72d Added android project baggage. Using svn:external on the android directory for pulling in the main source directory ../src 2011-12-24 00:38:22 +00:00