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

3335 Commits

Author SHA1 Message Date
Joe Pfeiffer
fb42c40c15
Merge pull request #2488 from JoePfeiffer/delete-file-config-dir 
Delete dead code
 2024-06-02 08:47:47 -06:00
JoePfeiffer
eb055cfeec Sort FlightDataTypes on group priority first, then on priority of FlightDataType. Don't sort on name 2024-06-01 18:02:17 -06:00
JoePfeiffer
92edd7b40f No longer used for CSV export 2024-06-01 17:24:27 -06:00
Sibo Van Gool
d2a460d2a3
Rename beta releases to pre-releases 2024-06-01 13:47:48 +02:00
JoePfeiffer
b10556d42a Delete dead code 
I can find no sign that the code in these files is used for anything anywhere
 2024-05-29 05:56:14 -06:00
JoePfeiffer
98a931120a include LICENSE and README.md files with parts database 2024-05-10 05:51:07 -06:00
JoePfeiffer
596943a423 Correct comments in ComponentPresetDatabaseLoader to eliminate reference to presets directory 2024-05-09 07:10:29 -06:00
JoePfeiffer
013579faa9 Add LOC/Precision to Manufacturer list so it will appear as LOC/Precison no matter what order the parts databases are loaded. 
Replace string equals with Manufacturer match method when searching for parts in the database
 2024-05-09 07:02:19 -06:00
JoePfeiffer
6dedf180bc Move internal and external (ie database) parts to .../components/internal and .../components/database respectively for better organization 2024-05-06 09:01:33 -06:00
JoePfeiffer
a4f9779c96 The core/src/main/resources/datafiles/presets directory contained a mix of 
the legacy components (which are also present in core/src/main/resources/datafiles/components-openrocket/) and obsolete versions of files from the database
 2024-05-03 15:17:40 -06:00
JoePfeiffer
37ffdf2f69 Comment out exception test code 2024-04-23 09:25:03 -06:00
JoePfeiffer
9a06464afe Move calculation of summary data to a "finally" block so we display what we can, even if there was an exception during the simulation. In particular, if the exception happened in a branch other than the sustainer branch we still get all our summary data. 
Added a commented-out bit of code forcing an exception for testing purposes. Since many former exceptions are now sim aborts, there isn't a reliable way to create a broken rocket design to test exception behavior -- which is a good thing!
 2024-04-23 08:47:36 -06:00
JoePfeiffer
64832fe8d6 Move FlightDataBranch from SimulationException to SimulationCalculationException (since those are the only SimulationExceptions that make use of it). 
Require FlightDataBranch when throwing SimulationCalculationException

Don't allow setting FlightDataBranch in SimulationCalculationException when exception is rethrown.
 2024-04-22 15:13:42 -06:00
JoePfeiffer
bcfa73eb21 Don't have SimulationEngine return flight data. Add getFlightData() method 
to obtain that after simulation completes
 2024-04-22 09:01:59 -06:00
JoePfeiffer
51af956330 Add data branch to flight data before branch is simulated, not after. 
simulateLoop() no longer returns a FlightDataBranch; it just adds to the FlightDataBranch it is simulating
 2024-04-20 08:14:47 -06:00
JoePfeiffer
523fce1a4c Instead of attempting to calculate interesting values for flight data every time a data branch is added and only succeeding the first time, wait until the simulation is complete and calculate them at that time. 2024-04-20 07:56:02 -06:00
JoePfeiffer
872de38b8d It's confusing to have types FlightData and FlightDataBranch, with many variables of type FlightDataBranch named flightData. This commit changes these to be named flightDataBranch (and also changes a few other similarly named variables, so for instance data becomes dataBranch). 
Also, FlightDataBranch.getBranchName() is renamed FlightDataBranch.getName(). I suspect the reason for the old method name was to clarify code in the presence of the confusion described above.
 2024-04-20 07:47:54 -06:00
SiboVG
c272a140ee Fix some mistakes in merge conflicts 2024-04-07 01:23:24 +02:00
SiboVG
69c995b829 Fix material not being set when loading recovery device from preset 2024-04-06 02:24:15 +02:00
SiboVG
a590bdc299 Fix merge conflicts 2024-04-06 02:23:58 +02:00
Joe Pfeiffer
6f4d11447c
Merge pull request #2461 from SiboVG/issue-2456-1 
[#2456] Overhaul of sim table GUI
 2024-03-23 19:21:55 -06:00
SiboVG
dbf2838cae Clean up gradle build 2024-03-23 14:45:43 +01:00
SiboVG
d32faea6c6 Use jakarta.xml instead of javax.xml 2024-03-23 02:13:09 +01:00
SiboVG
4475bf47b0 Add missing VCS components 2024-03-21 22:21:30 +00:00
SiboVG
34fac46e1a Move database components from swing to core 2024-03-21 22:20:30 +00:00
JoePfeiffer
504062a853 slight tweak -- end a timestep just before scheduled events to better capture their effect 2024-03-08 08:44:44 -07:00
JoePfeiffer
c7f496eb7b update flight events test for more accurate tumble and parachute simulations 2024-03-08 07:52:06 -07:00
JoePfeiffer
0b6a3e54b0 Remove previous time step from simulation status 2024-03-08 07:51:45 -07:00
JoePfeiffer
bf9fc29bcd Refine timestep 
1. Solve for 0-crossing in vertical velocity, vertical acceleration
2. Limit timestep to next event
3. Revert to using acceleration instead of jerk to limit timestep
4. Save calculations (eg calculate acceleration) in FlightData at start of timestep, results (eg velocity, position) at end of timestep
 2024-03-08 07:39:53 -07:00
SiboVG
b168f09906 Also include service implementations in meta-inf 2024-02-29 01:14:43 +01:00
SiboVG
90c195b05f THE JAVA SCRIPTING ERROR IS FINALLY GONE!!! 2024-02-28 23:30:52 +01:00
SiboVG
5e315c55da Some more gradle debugging... 2024-02-27 05:54:31 +01:00
SiboVG
538710c55b Fix unit test bugs leftover from bump to JUnit 5 
I had to rewrite the unit tests using regex and a Python script (because of the scale of the unit test). That code still contained errors...
 2024-02-27 03:18:55 +01:00
SiboVG
46849e14e1 Fix Plugin dynamic injection 2024-02-27 02:54:27 +01:00
SiboVG
84a897525f Declare service providers in modules 2024-02-27 02:53:13 +01:00
JoePfeiffer
e6e92d6a7b Move actual Euler integration into a separate method, to avoid code duplication when it has to be recalculated. 2024-02-25 09:21:34 -07:00
SiboVG
9a8bfc0c37 Bump unit testing from JUnit 4 to 5 2024-02-25 05:55:27 +01:00
SiboVG
f728357655 Some more cleaning up 2024-02-25 04:11:37 +01:00
JoePfeiffer
b285de1c49 0 mass should be an abort, not an exception 2024-02-24 06:39:29 -07:00
JoePfeiffer
7f7e4018ad Add a bunch of data to the FlightData branch 
Lots of calculated data hadn't been getting logged. There's still a bunch more that could be, but it isn't clear what use pitch rate (for instance) would be so not logging those
 2024-02-23 20:49:15 -07:00
SiboVG
4d597715f4 Some more fixups of JPMS 2024-02-24 01:37:07 +01:00
JoePfeiffer
14cf635bba Flight data reflecting conditions at the start of the simulation step should be placed in the flight log at that time; new data created during the simulation step should be placed after. 2024-02-23 10:51:28 -07:00
JoePfeiffer
4b497b0cd3 cleanup: variables that are only assigned once should be marked "final" 2024-02-23 10:34:31 -07:00
SiboVG
101530a5df Remove unnecessary resources from core module 2024-02-22 23:00:10 +01:00
SiboVG
323b3d9ba6 Modularize codebase to JPMS 2024-02-22 19:49:55 +01:00
SiboVG
1f14382988 Upgrade Guice for proper Java 17 support 2024-02-21 15:41:12 +01:00
SiboVG
bab6b55f9f Update unit test file version 2024-02-20 16:21:18 +01:00
SiboVG
cbc392ca70 [#2456] Fix sim no data issues 2024-02-20 15:51:20 +01:00
SiboVG
80d82ad99d [#2456] Add sim warnings tab to sim config 2024-02-20 15:32:03 +01:00
Sibo Van Gool
7c246e7144
Merge pull request #2457 from JoePfeiffer/allow-sustainer-tumble 
Allow sustainer tumble before apogee
 2024-02-19 17:11:13 +01:00