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

2174 Commits

Author SHA1 Message Date
Richard Graham
3d5ae6752a Big update to custom expression feature. 
- supports range and index subexpressions and many new operators
 - switched to my patched version of exp4j to support all this.
 - expressions belong to rocket document. Accessed from analysis menu.
 - expression importing from file
 - datatypes section defined in file for storing datatypes other than internal ones
 - flightdatatype fix to forget outdated types
 - many GUI fixes to custom expressions
 - new unitgroups supported. Auto unit detection for SI units in custom expressions.

Had to carefully merge loading/saving code with Kevins recent de-localization update. Hopefully changes to materials saving kept but switched datatype access to just using symbol as the key.

Hopefully can get the changes to exp4j upstream so we don't need to keep using this patched version.
 2012-08-05 23:59:54 +00:00
Kevin Ruland
a373126c41 When creating a new user material from an existing material (ie, key), make certain to use the name associated with the material because the key might not be localizable. 2012-08-04 08:37:39 +00:00
Kevin Ruland
f9c450c79c Add factory method which constructs a user material which uses a localizable key. 2012-08-04 03:09:36 +00:00
Kevin Ruland
59ef1b0888 escape for xml the material type key and flight data type keys. 2012-08-04 03:07:44 +00:00
Kevin Ruland
b9944d1803 Changed the loader to pull *.rkt files from zip containers. 
Modified the BasicFrame so it doesn't automatically open the Rocket configuration dialog when opening a new rocket.
Unified the behavior for replacing (automatically closing) the base frame when opening a file, loading an example, or picking from the Most-recently-used list.
 2012-08-01 19:25:50 +00:00
Kevin Ruland
77e3652249 De-localize Material and FlightDataType objects when persisting in ork files. Added a String key to each of these objects which holds on to a unique identifier which is stored in the ork file. User defined Materials are given a key which is defined as "UserDefined." + name. 
The construction pattern for Material has changed so explicitly passing in the userDefined boolean is no longer required.  Instead there are two different factory methods to be used.  Direct construction of Material derived classes is no longer allowed.

The persistence mechanism for Materials in perferences has changed.  It will now persist the key and name but still supports reading old format.

The example files have been regenerated, but will need to be regenerated again prior to an official build in order to get the version string correct.
 2012-07-31 21:20:55 +00:00
Kevin Ruland
be8827c226 Fix refresh bug which sometimes happens when the plot configuration is changed. Sometimes after changing the configuration drop down (at the top), the y series combo boxes disappeared. 2012-07-31 18:03:52 +00:00
Kevin Ruland
064dd7f4fa More changes to make Froyo compatible. 2012-07-26 14:19:48 +00:00
Kevin Ruland
52f0e0cf90 Had to reimplement getValue to not use TreeMap/SortedMap apis unavailable in Froyo. Added some comments so it should be easier to read. Test cases continue to pass. 2012-07-19 14:45:48 +00:00
Kevin Ruland
492f5bdeb2 Had to implement Arrays.copyOf for doubles because froyo doesn't have that either. 2012-07-18 20:29:05 +00:00
Kevin Ruland
c6a9f17179 Merge branches/froyo_12.03 to head. 2012-07-18 14:42:27 +00:00
Kevin Ruland
0eed52de50 Comment out a bunch of System.out.printlns. 2012-07-12 02:46:30 +00:00
Kevin Ruland
357f370096 Extract Transformation.main to junit test. 2012-07-12 02:44:32 +00:00
Doug Pedrick
960555c108 Added inference of Rocksim shock cords to try to be a little more predictive when a Rocksim file uses a buggy shock 
cord from their component database.
 2012-07-11 22:06:23 +00:00
Doug Pedrick
c8f7665177 Added an AttachedPartsHandler. This should automatically utilize future OR design functionality such as attaching 
fins to a Transition with no changes required to the Rocksim parsing logic.
 2012-07-11 19:49:32 +00:00
Kevin Ruland
310e35293a Extract Quaternion.main to junit test. 2012-07-10 18:52:13 +00:00
Kevin Ruland
f08ad83e5f Extract PolyInterpolator.main into Junit test case. 2012-07-10 18:42:35 +00:00
Kevin Ruland
4bdada4aab Removed unused import. 2012-07-10 17:54:21 +00:00
Kevin Ruland
44b1593955 Pull LinearInterpolator.main() into a JUnit test. 2012-07-10 17:53:34 +00:00
Kevin Ruland
f191e47f5b Extract Base64.main() as a unit test. 2012-07-10 17:08:39 +00:00
Kevin Ruland
75ece3442f Configured the Motor ignition at delay time, parachute and streamer deploy time fields 3 characters wide. 2012-07-10 14:37:37 +00:00
Kevin Ruland
8afe72eb1e Bump out the timeouts on the Preset loader so it doesn't complain when running with debugging output enabled. 2012-07-10 03:41:58 +00:00
Kevin Ruland
3853e3e62d Use unicode letter so it will compile under winders. 2012-07-04 18:10:27 +00:00
Boris du Reau
f47a7b5b16 Added pl locale and credit 2012-06-27 20:18:47 +00:00
Kevin Ruland
9eed1653fb Added threaded loader to ComponentPresetDatabase following the pattern in ThrustCurveMotorDatabase. Moved the wait into the background thread so the UI starts much faster. Changed the ConcurrentLoadingThrustCurveMotorSetDataBase implementation to have longer timeouts and wait in the background thread. 2012-06-27 02:58:53 +00:00
Bill Kuker
26329cedec Include OSX UI elements. 
"OrangeExtensions" jar provides stubs for compilation and linking on other OSs.
 2012-06-24 19:22:07 +00:00
Bill Kuker
51433fac5f Add JOGL to the About Dialog's libraries list 2012-06-23 02:08:28 +00:00
Kevin Ruland
a2ad986a2f Print the manufacturer and part number of the preset component in the bill of materials. 2012-06-20 18:09:45 +00:00
Sampo Niskanen
660a53ec28 Potential plugin structure 2012-06-18 19:58:58 +00:00
Sampo Niskanen
723539619c Component preset updates 2012-06-18 19:48:57 +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
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
56f157a7a5 Added UnitGroup.fromUnit which delegates to UnitGroup.getDefaultUnit().fromUnit. 2012-06-04 19:17:05 +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
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