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

5798 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
JoePfeiffer
eaa98af52b Move abort message to lower left; set background color to white and put a red border around it. 2024-01-07 14:37:09 -07:00
Sibo Van Gool
3a7b92c911
Update year 2024-01-07 14:10:29 +01:00
Joe Pfeiffer
b03c31f230
Merge pull request #2432 from JoePfeiffer/more-accurate-thrust 
More accurate thrust
 2024-01-04 20:27:38 -07:00
JoePfeiffer
9e63380f06 update unit tests 2024-01-04 14:03:37 -07:00
JoePfeiffer
e51b76e176 Prevent RK4 simulation timestep from extending past next scheduled event. 
Calculate thrust at sample points instead of averaged across timestep
 2024-01-04 14:03:12 -07:00
JoePfeiffer
f25bfda6f2 Missed a simulation exception on zero mass that should have been an abort event 2024-01-04 06:57:51 -07:00
JoePfeiffer
10909ccf21 Add logic to better support CHAD staging (booster with no fins). 
This will require more accurate thrust calculations to work properly.
 2024-01-03 15:30:49 -07:00
JoePfeiffer
ba0b743d4f fix typo 2024-01-03 15:30:27 -07:00
JoePfeiffer
aec15658cd Tumbling under thrust should be a sim abort, not a warning. 
Leaving the old warning in for backward compatibility.A .ork that triggered the warning will load cleanly. On rerunning the sims in the .ork the warning will go away and the sims will abort.
 2024-01-03 10:53:58 -07:00
JoePfeiffer
07e15ddaa2 Merge branch 'unstable' into SIMFAIL-flight-event 2024-01-03 07:31:13 -07:00
JoePfeiffer
3c8327ffd2 tweak display of abort in sim plot a little 2024-01-03 07:26:51 -07:00
JoePfeiffer
f9a8f59247 Add simulation aborts to .ork file load/save 2024-01-03 07:09:24 -07:00
JoePfeiffer
c5f1f011ef Add simulation abort to sim panel tooltip 2024-01-02 08:37:07 -07:00
JoePfeiffer
eb4b02bda4 Assign priorities to event images and colors based on ordinal of event types (higher ordinal means higher priority) 2024-01-02 08:05:17 -07:00
JoePfeiffer
c1b76be844 Add simulation abort title to simulation plot 2024-01-02 07:39:30 -07:00
Sibo Van Gool
6b01afcd67
Merge pull request #2429 from SiboVG/parachute-size 
Fix parachute length resizing when loading preset parachute
 2023-12-30 22:32:48 +01:00
Sibo Van Gool
93b5446e29
Merge pull request #2428 from SiboVG/snapshot 
Add snapshot version to OpenRocket versioning system
 2023-12-28 00:18:03 +01:00
Sibo Van Gool
e056e6ed07
Merge pull request #2421 from neilweinstock/texture-pulldown 
Updated texture select combobox
 2023-12-28 00:17:31 +01:00
SiboVG
f66788e618 Fix parachute length resizing when loading preset parachute 2023-12-27 23:58:58 +01:00
SiboVG
2f81d26216 Set RockSim parachute length to radius 2023-12-27 19:54:25 +01:00
SiboVG
ba7da7c4ee Add snapshot version to OpenRocket versioning system 2023-12-26 19:57:39 +01:00
JoePfeiffer
7fa9d0ba0c Save event that causes a simulation abort 2023-12-26 09:15:09 -07:00
JoePfeiffer
6a7cfefbdc This Exception class never was used! 2023-12-24 21:01:17 -07:00
JoePfeiffer
1115212317 Remove some now-unused Exception classes: MotorIgnitionException and SimulationLaunchException. 2023-12-24 20:34:34 -07:00
JoePfeiffer
a36e7f1049 Replace thrown exceptions with simulation aborts whereever possible 2023-12-24 20:34:34 -07:00
JoePfeiffer
173a3d38e2 Integrate SIM_ABORT into code across OR 2023-12-24 20:34:34 -07:00
JoePfeiffer
2123531f14 Create new SIM_ABORT FlightEvent 2023-12-24 20:34:34 -07:00
JoePfeiffer
64e999f2e2 Create new class SimulationAbort to represent reasons for sim aborts 2023-12-24 20:34:34 -07:00
Joe Pfeiffer
85bac6484e
Merge pull request #2426 from SiboVG/fin-balsa 
Set Balsa as default material for fins
 2023-12-24 13:51:28 -07:00
SiboVG
78593a6749 Improve default materials for fins and nose cone 2023-12-24 14:35:51 +01:00
Joe Pfeiffer
5d3bb50f9e
Merge pull request #2412 from JoePfeiffer/fix-2403 
Improve accuracy of SymmetricComponent calculations; consider shoulders in Transition moment of inertia calculations
 2023-12-22 07:26:18 -07:00
Joe Pfeiffer
1ab0f4344b
Merge pull request #2352 from JoePfeiffer/fix-acceleration-status 
Bug fixes in RK4SimulationStepper and RK4SimulationStatus
 2023-12-20 06:03:34 -07:00
Joe Pfeiffer
8c348ee2b0
Merge branch 'openrocket:unstable' into fix-acceleration-status 2023-12-20 06:00:28 -07:00
JoePfeiffer
42019237bf Merge branch 'unstable' into fix-2403 2023-12-19 14:32:59 -07:00
JoePfeiffer
a34a22aa5d Modify unit tests so we'll pass. 
There's no sign that these tests were written using anything other than the existing code, and declaring it correct. That's how I updated them; their usefulness as test data is suspect at best
 2023-12-19 14:27:36 -07:00
JoePfeiffer
bb8ee40693 Update unit tests to check surface properties (surface area, planform area, planform centroid) of cones 2023-12-19 14:26:24 -07:00
JoePfeiffer
6af25c3f4a Update SymmetricComponentVolumeTest to check moments of inertia 2023-12-19 09:04:00 -07:00
JoePfeiffer
5b18f73da0 Consider shoulders in moment of inertia calculations 2023-12-19 09:02:23 -07:00
Joe Pfeiffer
8ec63ef8db
Merge pull request #2425 from JoePfeiffer/update-thrustcurves 
update thrustcurve data
 2023-12-16 17:46:11 -07:00
JoePfeiffer
52e8106ea6 update thrustcurve data 2023-12-16 17:41:55 -07:00
JoePfeiffer
b5b3ac2b3d Create Transition::calculateProperties() to update component properties as needed instead of recalculating for shoulders every time they're called. 2023-12-13 09:57:35 -07:00
JoePfeiffer
4dd2c3a86a Update unit tests for SymmetricComponent. This is another pretty big rewrite -- the old code had a lot of references to numbers transcribed from an unnamed 2D CAD package, and also expected values that were just presented without derivation. New code has the trig functions to calculate the numbers, has helper functios for the comparisons, and puts a much tighter bound on results. 2023-12-13 09:12:21 -07:00
JoePfeiffer
9f13635357 Moved calculation of all body tube properties into BodyTube instead of punting some to SymmetricComponent. This is both a little faster and will let me compare the results from the two in unit tests. 2023-12-13 08:42:05 -07:00
JoePfeiffer
3e1341271c Modified integrate() to use geometry of actual frustums in geometric calculations instead of cylinder approximations. This turned into a pretty complete rewrite of integrate(), and the creation of several helper functions. 
Changed the name of integrate() to calculateProperties() to better express the purpose rather than the method of calculation. It's looking forward to a future PR when I'll be modifying BodyTube to use SymmetricComponent's variable caching.
 2023-12-13 08:41:11 -07:00
neil.weinstock@gmail.com
05e9758f36 texture select combobox: show 20 items, change "From file..." to "Select file..." 2023-12-10 20:48:28 -05:00
Sibo Van Gool
c136436284
Merge pull request #2416 from SiboVG/issue-2178 
[#2178] Add South/West unit for latitude/longitude
 2023-12-09 02:03:15 +01:00
Sibo Van Gool
5746aa1350
Merge pull request #2406 from SiboVG/refactor-warnings 
Add Warning component source to Warning
 2023-12-09 02:02:41 +01:00
SiboVG
757a2ab006 Re-add lat and long to unit prefs panel 2023-12-01 19:30:33 +01:00
SiboVG
52f33a3429 Merge branch 'unstable' into issue-2178 
# Conflicts:
#	core/src/net/sf/openrocket/simulation/FlightDataType.java
#	core/src/net/sf/openrocket/unit/UnitGroup.java
#	swing/src/net/sf/openrocket/gui/dialogs/preferences/LaunchPreferencesPanel.java
#	swing/src/net/sf/openrocket/gui/dialogs/preferences/UnitsPreferencesPanel.java
#	swing/src/net/sf/openrocket/gui/simulation/SimulationConditionsPanel.java
 2023-12-01 19:28:40 +01:00
Joe Pfeiffer
5938f08145
Merge pull request #2413 from SiboVG/issue-2338 
[#2338] Organize axis plot types selector in categories + add search function
 2023-11-26 12:57:15 -07:00