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

3311 Commits

Author SHA1 Message Date
SiboVG
c86c04bd42 Move ORPreferences to preferences package 2024-07-21 23:10:41 +02:00
SiboVG
464d42fb81 Rename Preferences to ORReferences 
To not cause confusion with java.util.prefs
 2024-07-21 22:00:48 +02:00
SiboVG
4411cb1b35 Use searchable and categorizable combobox for material panel 2024-07-21 11:26:08 +02:00
JoePfeiffer
e0ebef261c Remove store.rollAcceleration and store.lateralPitchAcceleration. That data is in store.AccelerationData 2024-07-17 18:07:14 -06:00
JoePfeiffer
e346969c24 Get rid of linearAcceleration and angularAcceleration from DataStore; that data is in AccelerationData 2024-07-15 09:45:35 -06:00
JoePfeiffer
46ed6942b2 Modify AbstractEulerStepper to use local linearAcceleration variable instead of store.linearAcceleration. 
Save acceleration data (after computation) in DataStore, not SimulationStatus
 2024-07-14 15:19:01 -06:00
JoePfeiffer
3086635f39 Merge remote-tracking branch 'origin/fix-2443' into fix-2443 2024-07-14 13:44:44 -06:00
SiboVG
8daa8838ff [#2462] Provide air density as plottable variable 2024-07-13 00:32:38 +02:00
JoePfeiffer
e07eaf7297 Don't use store.linearAcceleration and store.angularAcceleration in RK4SimulationStepper. Use local variables in calculateAcceleration, and pull values out of store.accelerationData, instead 2024-07-12 09:25:05 -06:00
JoePfeiffer
96f0985100 Remove longitudinalAcceleration field from DataStore. 
This was initialized to NaN, but never set to anything else. It (along with the atmospheric conditions) was passed to calculateThrust for possible more accurate thrust calculation in the future, but not used there at present

The entire DataStore is now passed to calculateAcceleration() to use whatever fields are useful to it -- none at present.
 2024-07-12 05:53:43 -06:00
Joe Pfeiffer
e2b69c4650
Merge pull request #2505 from JoePfeiffer/fix-2498 
Fix 2498
 2024-07-11 15:48:59 -06:00
Sibo Van Gool
47b6fa273b
Merge pull request #2503 from JoePfeiffer/update-extension-documentation 
Update simulation extensions documentation to reflect switch to gradle
 2024-07-09 23:40:17 +02:00
JoePfeiffer
90f09d9860 In Cdm example don't actually save Cdm to FlightDataBranch until after simulation step. 2024-07-09 15:16:52 -06:00
JoePfeiffer
e1490e0d3d Initialize sim extensions before adding system-defined listeners to the sim listener list. This has the effect of running the user-defined listeners before evaluating custom expressions, so custom expressions can use the results from the user-defined listeners. 2024-07-09 14:41:05 -06:00
JoePfeiffer
5da56840c8 Fix FlightDataType check for equality 2024-07-08 15:16:32 -06:00
JoePfeiffer
c5a2f52d17 Change directories to conform to gradle directory layout 
Change package and import statements to match changes since switch to gradle
Get rid of note pointing to documentation about listeners (it wasn't a valid hyperlink, and I can't find the documentation it thought it was pointing to in this documentation tree)
A little bit of rewording here and there
Get rid of src-extra/AirStart.java  file
 2024-07-05 16:12:13 -06:00
JoePfeiffer
deeed0f7e0 Move DataStore from RK4SimulationStepper to AbstractSimulationStepper and make it protected (instead of private). 
Move sim working variables for Euler steppers into DataStore.
Have DataStore store its own variables to FlightDataBranch instead of relying on code form outside
 2024-07-03 14:27:36 -06:00
JoePfeiffer
5548bf1557 Save all available data at start of simulation 2024-06-06 13:54:23 -06:00
JoePfeiffer
33fc756a3e Use SimulationStatus.storeData() to save data to FlightDataBranch 2024-06-06 13:53:24 -06:00
JoePfeiffer
6ef9197d72 Move data from RK4SimulationStatus to RK4SimulationStepper.DataStore and eliminate RK4SimulationStatus 2024-06-06 13:51:45 -06:00
JoePfeiffer
7b0637e800 Merge remote-tracking branch 'refs/remotes/origin/store-more-initial-data' into store-more-initial-data 2024-06-06 11:18:13 -06:00
Joe Pfeiffer
fd85c523e3
Merge pull request #2491 from JoePfeiffer/sort-csv 
Sort FlightDataTypes on FlightDataGroup priority first, then on FlightDataType priority
 2024-06-04 17:43:26 -06:00
SiboVG
c4942d2a48 Remove the Presets example design 2024-06-05 00:19:55 +02:00
Sibo Van Gool
ce70842204
Improve clarity of launch rod tooltip text 2024-06-04 23:32:07 +02:00
JoePfeiffer
2ee9883a2d Clean up storeData 2024-06-04 12:30:20 -06:00
JoePfeiffer
f8d6cdd628 Add SimulationStatus.storeData() method to save status data 2024-06-04 12:23:58 -06:00
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