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

2114 Commits

Author SHA1 Message Date
Kevin Ruland
d56298d296 Instead of using Set<Manufacturer> for the backing store use ConcurrentHashMap<String,Manufacturer>. The greately reduces contention during startup with the multiple parallel calls to Manufacturer.get(String). 2012-08-23 19:55:20 +00:00
Kevin Ruland
54ea94f76b Don't use a static JAXBContext because it has some serious thread contention when creating new unmarshallers. 2012-08-23 19:53:37 +00:00
Kevin Ruland
c34d934a55 Allow the preset loading system to function if there are no orc files. 2012-08-23 19:52:39 +00:00
Kevin Ruland
de27df7c09 Remove the exp4j-rdg.jar file since we are including the source code in the project. 2012-08-23 02:42:30 +00:00
Kevin Ruland
ba1c0fd2fa Removed FIXME comment since I'm convinced the test case is correct. Recall these tests were originally in a main loop. 2012-08-23 02:37:51 +00:00
Kevin Ruland
413225b474 Tweak the pool sizes and allow for longer time to load things. This improves reliability on slower platforms. 2012-08-23 02:30:11 +00:00
Kevin Ruland
9c6191529c Replace non ascii character with UTF-8 encoded string. The build checks for non-ascii characters. 2012-08-23 02:29:26 +00:00
Kevin Ruland
8969a73600 Change FIXMEs to TODOs. Actually they might not be an issue at all. 2012-08-23 02:28:19 +00:00
Kevin Ruland
0c9db36841 Ensure we have a BufferedInputStream when loading presets. 2012-08-23 02:27:29 +00:00
Kevin Ruland
8219e5cd31 Removed fixme by logging problem. 2012-08-23 02:26:55 +00:00
Kevin Ruland
086d9b37dc Removed FIXME comment. 2012-08-23 02:26:13 +00:00
Kevin Ruland
d79793b643 Removed FIXME comment. 2012-08-23 02:25:45 +00:00
Kevin Ruland
6aac556a53 Added localization changes supplied by Russian USS. 2012-08-23 02:24:39 +00:00
Kevin Ruland
007c7d6b41 Remove FIXME by adding undo point before assigning the preset. 2012-08-23 02:23:41 +00:00
Kevin Ruland
d72a6099cf Clean up FIXME - adding more information to the warning message. 2012-08-23 02:20:21 +00:00
Boris du Reau
65168a345f updated french translation 2012-08-22 05:42:44 +00:00
Kevin Ruland
da430d3611 Applied patch for l10n supplied by Russian Uss. 2012-08-20 02:02:38 +00:00
Richard Graham
3aedbaa19f Fixed table sorting bug in custom expression variable and operator selector windows. 
Previously, correct item was not inserted if the table had been sorted by clicking on the column headers.
 2012-08-18 07:18:13 +00:00
Richard Graham
23825ec9a1 Fixed of-by-one bug in trapz integrator 2012-08-17 07:09:51 +00:00
Richard Graham
22a81bc9be Fixed negative number bug in exp4j and custom expressions. 2012-08-17 06:21:37 +00:00
Sampo Niskanen
ceeade06b4 Negative number test 2012-08-13 20:47:29 +00:00
Kevin Ruland
43b269c0f4 Change the implementation of ArrayUtils.range to include the stop value if it is a multiple of step. 2012-08-10 20:03:21 +00:00
Kevin Ruland
ead406e852 Exploded the exp4j source into our src/ directory. This allows us to more easily modify changes we make to the source. I inlined one call to Arrays.copyOf. 2012-08-10 19:13:50 +00:00
Kevin Ruland
3c4e33e355 Removed calls to String.isEmpty which is not available on Froyo. 2012-08-10 19:11:02 +00:00
Kevin Ruland
301067e301 Added unit tests and fixed rounding problem in ArrayUtils.range(). 2012-08-10 19:09:27 +00:00
Bill Kuker
7c5524f1fc Add a great amount of verbose debugging 2012-08-09 18:02:25 +00:00
Kevin Ruland
cb2a3d0e90 Fix commit from revision 953 which reverted a bunch of changes related to Froyo compatibility. 2012-08-09 15:04:36 +00:00
Kevin Ruland
91ac8deb7d Minor changes for Froyo compatibility. 2012-08-09 13:02:53 +00:00
Kevin Ruland
3cc439e490 Removed the old exp4j-0.2.9.jar and corrected the build.xml to use the new exp4j-rdg.jar. 2012-08-08 02:38:18 +00:00
Kevin Ruland
a5c3c1ac76 Rework the CustomExpression evaluation to use SimulationListeners. Removed the OpenRocketDocument member variable from the Simulation object. 2012-08-08 02:24:40 +00:00
Kevin Ruland
2b802c2f7d Make preset favorites per component type. That is, a single preset can be a favorite for Tube Couplers, but not be a favorite for Body Tubes. 2012-08-07 16:31:00 +00:00
Richard Graham
a66876049c Updated custom exp4j to a java 1.5 version 2012-08-06 18:10:24 +00:00
Kevin Ruland
18fa60f844 Rolled back previous attempt at un-localizing sample files. New approach will not use this file format. 2012-08-06 13:32:52 +00:00
Richard Graham
837d13adc0 Again fixing classpath and custom exp4j 2012-08-06 00:38:25 +00:00
Richard Graham
bf668d4604 Fixed classpath for patched exp4j in repo (hopefully) 2012-08-06 00:30:03 +00:00
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
Sampo Niskanen
48d094a1a9 Fix run.sh 2012-08-04 08:46:33 +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
8b9d866f90 Make changelog entry for material and flight data keys in ork files. 2012-08-01 19:06:22 +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
Boris du Reau
3a53e160e9 updated German translations 2012-07-29 17:58:59 +00:00
Kevin Ruland
064dd7f4fa More changes to make Froyo compatible. 2012-07-26 14:19:48 +00:00
Kevin Ruland
5f02647c6f Correct spelling in description. 2012-07-20 03:34:18 +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