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

1996 Commits

Author SHA1 Message Date
Kevin Ruland
43dd248d8b Switch to a LinkedBlockingQueue in front of the loader thread pool because it eliminates RejectedExecutionExceptions. The down side is the generator will block when the queue is full. Oh well. 2012-05-11 03:21:27 +00:00
Doug Pedrick
7da68bcb1e Added delete button to preset row in table. 2012-05-11 03:02:35 +00:00
Doug Pedrick
8a5fd187b6 Refactored preset GUI for unit of measure spinners; added launch lug, parachute, and streamer editors. 2012-05-10 23:51:26 +00:00
Kevin Ruland
7681d40b76 A little refactoring of ComponentPreset xml file parsing since android does not support JAXB. 2012-05-10 14:38:36 +00:00
Jason Blood
64c3b0c83a Added PageFitPrintStrategy and related files to print multiple fins, transitions, and nosecones onto the same page(s) 2012-05-10 02:48:13 +00:00
Kevin Ruland
bd680c7e14 Added support for Unit 'in/64' which is inches with fractional representation. DoubleModel has one FIXME indicating that we need to reenable min & max in the abstract spinner model. 2012-05-10 02:48:07 +00:00
Kevin Ruland
7b093f79f8 Implement a multithreaded pipeline to load the component preset files. This greatly reduces the time to load them. 2012-05-09 02:01:57 +00:00
Kevin Ruland
692fcebb11 Give the threads names to facilitate thread performance analysis. 2012-05-09 02:00:54 +00:00
Kevin Ruland
51e2dfe6c7 Rework the ThrustCurve motor loading process to be highly parallel. This significantly reduced loading times. In order to achive this, the implementation of ZipDirectoryIterator.getNext() had to change to not close the iterator when it runs out of things. 2012-05-08 17:57:46 +00:00
Kevin Ruland
8c34d8488a Multithread the orc loading process. 2012-05-07 14:43:50 +00:00
Kevin Ruland
0ff0fe1364 Add slightly better sorting to the manufacturer and partno columns. It attempts to sort numeric portions of the strings separate from the alpha parts. However, it isn't perfect because decimals (numbers containing '.') trips it up. 2012-05-07 01:34:23 +00:00
Kevin Ruland
370dfd0e18 Change the InvalidComponentPresetException so it reports all errors found in a preset instead of just the first. Changed all the test cases to ensure the proper errors are reported. 2012-05-06 13:27:30 +00:00
Doug Pedrick
a32bfe7366 Fixes to number validation and component type combo box selectability. 2012-05-06 00:42:32 +00:00
Doug Pedrick
3d73e9d9eb Initial GUI for editing and saving component presets. See ComponentPresetPanel.main() for standalone execution. 2012-05-05 02:23:14 +00:00
Kevin Ruland
0a199d73c3 Implement MaterialHolder, a container for the Material objects loaded during processing of rocksim csv files. Added logic to streamer and parachutes so it can produce a SURFACE material if the csv file specified a BULK material and thickness. 2012-05-04 20:11:33 +00:00
Kevin Ruland
4eea3292b6 Sort the collections prior to serialization since that makes the output a little easier to search. 2012-05-04 20:08:47 +00:00
Kevin Ruland
9661b47562 Don't use the default material database when loading componentpreset files. 2012-05-04 20:07:20 +00:00
Kevin Ruland
3792528e01 Added LaunchLug, Streamer and Parachute ComponentPresets. 2012-05-01 17:40:55 +00:00
Kevin Ruland
6f653199f2 Make initializeLogging method public since it is a rather nice function to set up logging infrastructure. 2012-05-01 17:25:10 +00:00
Kevin Ruland
2de2fb8a65 Move the component preset selection box outside of the first tab and under the component name. Adjusted the MigLayout parameters to the labels align. 2012-05-01 17:18:41 +00:00
Doug Pedrick
45dae98850 Support for base64 images in .orc; performance improvement to the JAXBContext 2012-04-28 03:16:42 +00:00
Doug Pedrick
df7ab36b5a Javadoc fix 2012-04-27 22:08:58 +00:00
Kevin Ruland
42c74f71a1 Variety of changes to the orc file processing. Added unit annotations to all lengths and masses so a vendor can hand craft a file in units other than MKS system. Fixed a bug in the nose cone where the outerdiameter and shoulder diameter were flipped. 2012-04-27 20:09:27 +00:00
Kevin Ruland
573706323f Added special processing for rocksim csv component files when the mass is specified as 0. In this case, we "reject" the mass and assume it is to be computed based on density. 2012-04-27 19:06:54 +00:00
Kevin Ruland
1acc99b163 Switch component preset loading from using the temporary csv format to orc formatted files. Added orc formatted files to the resources/datafiles/presets for all vendors which have approved inclusion of their files in OpenRocket. Removed the old csv parser and the hand crafted csv files for semroc presets. 2012-04-26 21:14:38 +00:00
Kevin Ruland
2827046b15 Refactored the rocksim csv component parser system to allow for more flexible column definitions. Pulled each type of file parser into its own file. Use template pattern in the RocksimComponentFileLoader hierarchy. Change the OpenRocketComponentSaver (Jaxb driver code) to throw exceptions instead of trying to handle them on its own. 2012-04-26 21:10:34 +00:00
Kevin Ruland
f2e7cb58ab Added convience method UnitGroup.getUnit( String ) which returns the Unit corresponding to the abbreviation. Throws IllegalArgumentException if the requested unit does not exist. 2012-04-26 18:20:10 +00:00
Kevin Ruland
b990a5acb2 Added optional Thickness element/property. 2012-04-26 18:18:55 +00:00
Kevin Ruland
c71049a88d Added optional Thickness element/property. 2012-04-26 18:18:35 +00:00
Kevin Ruland
85fe891980 Added filled property. Made Filled and Mass optional by using objects instead of primitives. Changed the serialization process so only properties set in the ComponentPreset are serialized. Change the deserialization process so if properties are not specified in the xml file, they are not assigned. 2012-04-26 18:18:00 +00:00
Doug Pedrick
517207857b Cleanup 2012-04-25 20:59:35 +00:00
Doug Pedrick
250a92dbe9 unmarshal XML (*.orc) to ComponentPresets. 2012-04-25 02:26:13 +00:00
Kevin Ruland
93c7ea784c Removed FIXME. 2012-04-24 21:32:32 +00:00
Kevin Ruland
3b6cf7ea5d Removed FIXME since this seems to be the best place for it. 2012-04-24 21:32:12 +00:00
Kevin Ruland
3f4f712472 When a component preset for NOSE_CONE or TRANSITION has filled set to true, then the shoulders are assumed to be filled as well. 2012-04-24 21:21:33 +00:00
Kevin Ruland
d33792b5fc Removed fixme and settled on .001 for epsilon. 2012-04-24 19:47:33 +00:00
Kevin Ruland
c7fdf4d4bf Get rid of FIXME since it had been fixed. 2012-04-24 19:19:55 +00:00
Kevin Ruland
4731a7345d Change the implementation of Transition getComponentVolume to include the volumes of the shoulders as well as the main body. This means that Transition no longer needs to override getComponentMass since the default implementation of density * volume now works correctly. 
Added helper function to RocketComponent to compute the volume of a ring component by computing the "mass" with density of 1.0.
 2012-04-24 18:24:22 +00:00
Kevin Ruland
b2d3589104 Fixed problems in computation of SymmetricComponent.integrate found by new unit tests. There were two problems with the previous code. First due to rounding errors, it was possible during the last iteration, the right end point (x+l) was beyond the overall length of the component. This resulted in a zero 0 being used for r2 throwing off the overall computation of volume. The second problem was for hollow components. The test for when to switch from using filled to hollow was incorrect because it was comparing r to thickness. However, thickness is normal to the surface of the component so this test overestimated the total volume of the component. 
After making these computation changes, the tests for the density computation in  NoseConePresetTests and TransitionPresetTests could be tightened.
 2012-04-23 17:51:50 +00:00
Doug Pedrick
9a7190f139 better logging support 2012-04-23 14:28:06 +00:00
Doug Pedrick
4f82e9e2b4 Initial XML generating code for .orc format. 2012-04-23 14:26:05 +00:00
Doug Pedrick
bdd54e07d7 Tube Coupler Description 2012-04-22 20:57:56 +00:00
Kevin Ruland
27411395f9 Change nose cone preset to use Aft Outer Diameter, Aft Shoulder Length, and Aft Shoulder Diameter to be consistent with Transitions. Added a bunch of unit tests and correct behavior of the rocketcomponent setters to clear the preset appropriately. Modified the temporary csv data files to use the "aft" specifiers. 2012-04-22 20:26:22 +00:00
Doug Pedrick
0f3d052bac Minor cleanup 2012-04-22 16:20:08 +00:00
Doug Pedrick
6544718850 Added printing support for Component Preset in Parts Detail Report. 2012-04-22 14:55:29 +00:00
Doug Pedrick
f75b03184a Initial Rocksim CSV parsing support for materials and components. 2012-04-22 03:11:13 +00:00
Kevin Ruland
d8821bcfdb Changed Unit.toString to use 0.### format for pretty small numbers ( 0.0005 < . < 0.095). Modified the unit test to have explicit tests for rounding to the correct value at the correct position (for round to even rule). 2012-04-20 18:54:47 +00:00
Kevin Ruland
b7608c3729 Fix computation of density for BULK_HEADs by using a more general way to compute the volume of a cylinder. 2012-04-20 15:42:08 +00:00
Boris du Reau
b782641e23 Added Czech locale 2012-04-20 06:41:11 +00:00
Sampo Niskanen
1c411548a7 Support for opening recovery device on stage separation 2012-04-19 17:24:03 +00:00