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

282 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Kevin Ruland
85f5194c6d Correct the computation of shape mass in integrate() by computing the mass based on the integrated volume * density instead of using the super.getComponentMass(). super.getComponentMass() includes the mass of the shape as well as the shoulders. 2012-05-23 14:47:46 +00:00
Kevin Ruland
4abceb9185 Minor modification to test case which makes setting breakpoints easier. No functional or assert changes. 2012-05-23 14:38:36 +00:00
Kevin Ruland
0302130c11 My assessment of why IntegrationTest was failing was incorrect. After perusing the history I found that in repository revision 599, I introduced changes to the computation of Transition volume which accounted for the volume of the shoulders as well as the body of the transition. This change broke the computation of CG. This commit reverts IntegrationTest and adds some cg tests to SymmetricComponentVolumeTest which contains the values produced by the old code. A future commit will correct SymmetricComponent.getCG and all these tests will work again. 2012-05-23 14:23:01 +00:00
Kevin Ruland
e10ff31830 Fix IntegrationTest which was broken when the nose cone / transition volume and area computations were corrected. 2012-05-22 20:50:45 +00:00
Kevin Ruland
953082ea05 Fix BaseComponentDTOTest to point to an image file which actually exists. 2012-05-22 20:40:18 +00:00
Kevin Ruland
254e5670da Fix ComponentCompare and ComponentCompareTest. ComponentCompare needed to not verify the getMotorMounts method which was recently added. ComponentCompareTest needed to extend BaseTestCase so the materials db was initialized. 2012-05-22 20:39:29 +00:00
Kevin Ruland
32ad0c1df6 Change the textual representation of fractional units to use Unicode superscripts and subscripts. Unfortunately, the default fonts included with iText do not have these characters mapped so we needed to switch to a new true type font DejaVu. Added the DejaVuSerif font definition to the resources and modified the pdf writing process to use this font. Because this font is slightly wider, the column headings in the DesignReport had to be made smaller. Finally, had to modify the ExpressionParser to convert the unicode chars to real digits in order to have the expression parser be able to work with this representation. 2012-05-22 18:36:04 +00:00
Kevin Ruland
f42e6fa85a Remove the old FractionUtil class containing the parser since we're using exp4j now. 2012-05-22 18:32:21 +00:00
Kevin Ruland
7cba979236 Change the in/64 length unit to not allow decimal representations by constructing it with an epsilon of 0.5/64. 2012-05-22 18:29:57 +00:00
Kevin Ruland
473300fa11 Use the fonts defined in PrintUtilities instead of constructing a new font every time. 2012-05-22 18:12:47 +00:00
Sampo Niskanen
9552b2de86 Expression parser updates 2012-05-22 04:11:25 +00:00
Doug Pedrick
e3f173d83e Fix to streamer loading of materials; missing material in Giant Leaps file. 2012-05-21 04:36:20 +00:00
Doug Pedrick
798f631259 Cleanup and tweaks to unit widths. 2012-05-18 04:10:26 +00:00
Kevin Ruland
a41e6ef5a3 Change label for UNIT_WINDSPEED in pref dialog to "Wind speed". 2012-05-17 14:24:22 +00:00
Kevin Ruland
c997b7bfd3 Added imperial and SI defaults for UNITS_WINDSPEED. 2012-05-17 14:23:10 +00:00
Richard Graham
5320377719 Added ability for doublemodel to evaluate math expressions using exp4j, fixed typeover issue and made the doublemodel more robust to incorrect input. 2012-05-17 06:08:05 +00:00
Kevin Ruland
ba4ceccf26 Added convenience function RocketComponent.getMotorMounts() returning List<MotorMount>. 2012-05-16 06:49:04 +00:00
Kevin Ruland
7420f5c18b Added UNITS_WINDSPEED so the preferred units for entering wind speed can be configured separately from rocket velocities. 2012-05-16 06:36:58 +00:00
Kevin Ruland
672239535a Added clone() implementation to support the ThrustCurveMotor copy constructor. Added serialVersionUID constant from the previous implementation to provide backwards compatibility with serialzied data in the android database. 2012-05-16 06:18:54 +00:00
Kevin Ruland
34a5c097b7 Added protected copy constructor which makes a deep copy. This is used in the android application so ExtendedThrustCurveMotor can extend ThrustCurveMotor instead of use delegation. 2012-05-16 06:17:22 +00:00
Doug Pedrick
ed629bd227 Constrain preset editor on existing files to only use populated Materials; minor other cleanup. 2012-05-16 02:13:18 +00:00
Kevin Ruland
e1081d2df8 Change from ClassLoader.getSystemResourceAsStream to ClassLoader.getResourceAsStream since it is android safe. 2012-05-15 20:43:26 +00:00
Doug Pedrick
a6eda10fcc Rename to ComponentPresetEditor 2012-05-15 04:38:27 +00:00
Doug Pedrick
90ebc01268 Added ability to open *.csv files to menu. 2012-05-15 04:35:33 +00:00
Kevin Ruland
1ee93fdab0 Put the loadMotor() method back since it is useful to python bindings. 2012-05-15 04:28:14 +00:00