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

114 Commits

Author SHA1 Message Date
Billy Olsen
1d0a2c8cf8 Update thrustcurves from latest Thrustcurve.org data 
Update the thrustcurves from the latest Thrustcurve.org data. This
corrects some of the case information.

Fixes #888

Signed-off-by: Billy Olsen <billy.olsen@gmail.com>
 2021-02-22 20:03:11 -07:00
JoePfeiffer
d231cb320f Get rid of a bit of duplicate code 
Handle case with no data in specified format for motor
 2020-11-05 10:41:15 -07:00
JoePfeiffer
834fb73617 Some thrust curves had two data points at the end of the curve, one with a thrust of 0. We can delete the 0-thrust point and accept the curve. 
One (KBA K1750) had a duplicate (time and thrust both equal) data point.  Delete the duplicate and accpept
 2020-05-01 10:21:33 -06:00
JoePfeiffer
6c535bff94 Modified thrustcurve serialization to be more robust in the case of 
some common (but generally not important) errors in thrustcurves, and
not enter thrustcurves that will cause simulation failures into the
database.

(1) Permits thrustcurves to start at time 0 with a nonzero thrust.
Previous code inserted a datapoint with time 0 and thrust 0; this
caused thrust interpolation code to fail while running a simulation.
If the first datapoint is at a time greater than 0 it does enter a
(0, 0) datapoint, as this is the correct documented behavior for RASP
files.

(2) Permits thrustcurves to end with a nonzero thrust.  Similarly to
the previous case, the old code entered a new datapoint at the same
time as the previous end of thrust with thrust 0, which would break
thrust interpolation.

(3) Thrustcurves that have a zero-thrust datapoint and a non-zero
thrust datapoint at time 0 have the first datapoint removed.

(4) Thrustcurves with more serious errors -- mainly multiple thrusts
at a single time -- aren't entered into the database, as they will
break thrust interpolation and there is no obvious way to guess which
of the datapoints is correct, or to see how to average them.
 2019-02-09 18:00:30 -07:00
Kevin Ruland
6532743c3f Revising previous commit to include the missing files. 2016-10-10 19:50:17 -05:00
Kevin Ruland
b415238a02 Changed Motor to support additional fields case info, prop info, and 
availability flag provided by Thrustcurve.org.  Change serialization
process to pull current files from Thrustcurve.org using the xml api,
use the corrected data for diameter and length, and use a consistent
motor designation.  Added fields to the Motor chooser - case info is a
column in the listing (replacing MotorType), the other info is in the
motor details tab.  Added toggle to hide motors which are OOP.
 2015-12-07 22:27:05 -06:00
kruland2607
13dc5289ff Updated thrustcurves. 2015-03-23 07:02:10 -05:00
kruland2607
a9ba6172a9 Update documentation for 14.11 release. 2014-11-02 12:11:49 -06:00
kruland2607
f8037614a4 Update thrustcurves. 2014-10-29 19:11:07 -05:00
kruland2607
414cd82374 Update thrustcurves. 2014-06-25 15:21:30 -05:00
kruland2607
967b6b3eeb Preparing for release 14.05. 2014-05-20 13:04:30 -05:00
kruland2607
49ddd78cbc Updated thrustcurves. 2014-05-20 10:43:58 -05:00
Sampo Niskanen
da8910a0ba Add Klima motor files 2014-05-18 12:41:34 +03:00
kruland2607
ae36404431 Changes for 14.03 Release. 2014-03-19 15:54:22 -05:00
CarVac
708323af73 Fixed an OpenGL error; just a stopgap it seems. 2014-03-18 19:17:03 -04:00
kruland2607
81739c340f Updated AT F44, G74, J170 and GR O2700 thrustcurves. 2014-03-18 13:59:09 -05:00
kruland2607
5a549495b7 Updated thrustcurve serialized file. 2014-02-27 20:42:24 -06:00
kruland2607
87d515971b Updated release information for 13.11. 2013-11-07 20:59:08 -06:00
kruland2607
9f20889688 Merge pull request #156 from openrocket/13.09dev 
Make 13.09dev master
 2013-10-11 12:14:08 -07:00
kruland2607
24a011b1e8 Manual edits to the new AeroTech C3 and D2 eng files to correct mass and 
delays.
 2013-10-03 12:27:15 -05:00
kruland2607
26fb295554 Rework source structure to separate swing gui code from core code. 
Separate swing application code from core code.  Moved a bunch of sources
and libraries around.  Created new eclipse project.

Further refinements to make it build.

Update gitignore.
 2013-09-27 11:34:46 -05:00
kruland2607
bba83fc795 Regenerate thrustcurve.ser again. 2013-09-24 11:12:19 -05:00
kruland2607
cece53c476 Added preliminary thrustcurves for AT C3 and D2. Removed the 
Loki_J175.rse provided by thrustcurve.org because it lists the wrong
type.
 2013-09-24 10:57:30 -05:00
Sampo Niskanen
f59c8012fb Release 13.09 2013-09-08 22:22:03 +03:00
kruland2607
faf238e61d Fix deployment event for dart's recovery. 2013-09-04 21:27:52 -05:00
kruland2607
54871ec674 Updated thrustcurves. 2013-09-03 14:41:34 -05:00
kruland2607
58e5874832 Merge remote-tracking branch 'upstream/master' into sims 
Conflicts:
	core/src/net/sf/openrocket/gui/main/SimulationPanel.java
 2013-06-11 21:25:33 -05:00
kruland2607
b5a191eb8d Added presets for LocPrecision contributed by Doug. 2013-06-07 06:38:24 -05:00
Sampo Niskanen
6b00c0a1e1 Version 13.05 2013-05-04 21:11:35 +03:00
kruland2607
c00a451704 Update the preset usage example. It has lost it's presets because it 
had been edited with a developer version of OR quite some time ago when
presets were broken.
 2013-05-03 12:06:00 -05:00
kruland2607
1e2c64b6f0 Fixed major problem with preset serialized database. They need to have 
a translator set correctly or else the material types will not match and
presets used in models will be cleared when the document is loaded.
 2013-04-25 21:51:43 -05:00
bkuker
3e57b36ffb Reduce built-in image sizes 2013-04-24 15:06:34 -04:00
bkuker
a649695423 Smaller simple sample 2013-04-24 14:47:19 -04:00
bkuker
6d12d265ac Smaller Examples 2013-04-24 14:41:08 -04:00
kruland2607
3212beb27c Merge remote-tracking branch 'upstream/master' into kruland-integration 
Conflicts:
	core/.classpath
 2013-04-03 20:09:12 -05:00
kruland2607
e25bb9b079 Updated apocalypse by moving motor tube to end of tail cone and adding 
rear centering right with appearance.  Added a motor and simulation.
 2013-04-01 15:16:45 -05:00
kruland2607
af7ef8360f Decorate the bottoms of all examples. 2013-03-29 00:22:18 -05:00
kruland2607
4362896139 Fixed the deployment of the booster chute and named the recovery 
devices.
 2013-03-27 00:24:57 -05:00
kruland2607
d6c4a0948d Updated database source files for presets and thrustcurves. 2013-03-13 23:31:50 -05:00
kruland2607
2cfd46760d Since it was decaled like a patriot, the dimensions were changed to more 
closely match a 1/2 scale rocket.
 2013-03-13 23:12:14 -05:00
kruland2607
c19a12b3b5 Rerun simulations on Three-stage rocket example so it the boosters use 
tumble recovery.
 2013-03-13 16:29:14 -05:00
bkuker
4d9b691a39 Update all of the examples with some nice decals & paint. 2013-03-13 16:44:20 -04:00
kruland2607
15f39a1d24 Update example with data branches for all stages. 2013-02-05 15:15:22 -06:00
kruland2607
055daf6786 Change ork format for ignition and motor configurations. Make them 
different xml elements preparing for an alternative api allowing them to
be more independent.
 2013-02-05 14:26:41 -06:00
Sampo Niskanen
8c0c9bb10d Plugin system 2013-01-23 08:32:09 +02:00
bkuker
05263e5056 An ok reusable motor appearance 2013-01-10 20:03:31 -05:00
bkuker
c1c4f99992 Trying out an "Unfinished" view... Jury is out 2013-01-10 15:36:08 -05:00
bkuker
03c9e24705 More appearances 2013-01-10 14:17:30 -05:00
bkuker
25a3fc1d05 Merge branch 'kruland-integration-motor' into 
kruland-integration-defaults

Conflicts:
	core/src/net/sf/openrocket/appearance/defaults/ResourceDecalImage.java
	core/src/net/sf/openrocket/gui/figure3d/RealisticRenderer.java
 2013-01-10 08:46:20 -05:00
bkuker
28127b122d Simplify the default appearances. I am not ready to organize them into 
classes or factories or what have you, yet.
 2013-01-09 16:43:01 -05:00