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

1953 Commits

Author SHA1 Message Date
JoePfeiffer
e9b7ff8249 Divide rail button CD by instance count, since it gets multiplied by instance count up in BarrowmanCalculator. 2023-03-14 08:05:49 -06:00
SiboVG
338f9460aa Small fixes to recovery handler 2023-03-14 13:08:51 +01:00
SiboVG
1b7213e21f Ignore empty simulations in sim table export 2023-03-14 00:14:21 +01:00
SiboVG
ed59b64fd8 Use burnout for non-last stage in multi-staged rocket 2023-03-13 23:39:44 +01:00
SiboVG
00ea1c496e Update recovery device import rules 2023-03-12 23:22:33 +01:00
Joe Pfeiffer
14db274d42
Merge pull request #2110 from JoePfeiffer/fix-2058 
[#2058] Create simulation exception for zero-length stages; improve exception reporting
 2023-03-10 10:57:27 -07:00
Joe Pfeiffer
5e9cbe2706
Merge pull request #2097 from JoePfeiffer/2078-typo 
Fix error in sim loading, add unit test, refine loading a bit.
 2023-03-10 10:56:59 -07:00
Joe Pfeiffer
8d6cb3fdbc
Merge pull request #2082 from JoePfeiffer/fix-2032 
Tell user about zero-area fins and keep them from crashing simulation with NaN error
 2023-03-10 10:54:12 -07:00
JoePfeiffer
435b2bfcad update unit tests 2023-03-09 15:56:59 -07:00
JoePfeiffer
68bdd7ff2c Merge remote-tracking branch 'origin/unstable' into fix-2058 2023-03-09 13:31:54 -07:00
Sibo Van Gool
cfea331712
Merge pull request #2105 from SiboVG/issue-2103 
[#2103] Fix type in default pressure setter
 2023-03-08 21:35:54 +01:00
SiboVG
4dfe63bc69 Merge branch 'unstable' into issue-875 
# Conflicts:
#	core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
#	core/src/net/sf/openrocket/rocketcomponent/SymmetricComponent.java
#	core/test/net/sf/openrocket/rocketcomponent/SymmetricComponentVolumeTest.java
#	swing/src/net/sf/openrocket/gui/main/BasicFrame.java
#	swing/src/net/sf/openrocket/gui/util/Icons.java
 2023-03-08 21:29:05 +01:00
SiboVG
755dfc189d [#2103] Fix type in default pressure setter 2023-03-07 01:53:31 +01:00
SiboVG
9c7106a253 Create custom CSV escape method 2023-03-06 20:09:14 +01:00
SiboVG
80e33ba01b Refactor string utils to common class 2023-03-06 19:55:35 +01:00
JoePfeiffer
3571ebad68 When creating a new sim branch, copy one data point and the separation event to the new branch so we can plot it if it has an immediate exception 2023-03-05 09:20:18 -07:00
JoePfeiffer
e8be376a69 Refine simulation loading: if the data saved with a simulation is out of date, mark it out of date when loading 2023-03-03 18:40:31 -07:00
JoePfeiffer
f98a8749db Don't terminate modID update/simulation save option search loop early 2023-03-02 11:56:37 -07:00
JoePfeiffer
4c136441ff Add check for zero-length active stages 
Add geometry checks to stage separation

Add branch name to simulation exception dialog
 2023-02-28 10:19:23 -07:00
Joe Pfeiffer
7c65d71cfd
Merge pull request #2073 from SiboVG/issue-2072 
[#2072] Apply designation/common name choice to other parts
 2023-02-26 16:00:12 -07:00
JoePfeiffer
0ea93a7821 Warn that fins with zero area will not affect aerodynamics 
Keep fins with zero area from getting NaN errors
 2023-02-26 15:42:15 -07:00
JoePfeiffer
a61068e9f0 pushed to the wrong branch, sorry 
Revert "Don't let fins with zero area cause NaN exceptions."

This reverts commit 1011f2df944dbfe3e82016ea0a3a0f0954c1ca9b.

Revert "Add warning for fin with zero area"

This reverts commit 512ce78b51a2514a5e96f72d9e8946d63b291cd9.
 2023-02-26 10:22:02 -07:00
JoePfeiffer
1011f2df94 Don't let fins with zero area cause NaN exceptions. 2023-02-26 09:41:55 -07:00
SiboVG
8dbae85bc3 Update recovery device import rules 
Apparently RASAero doesn't support recovery devices in other stages
 2023-02-26 15:15:29 +01:00
JoePfeiffer
512ce78b51 Add warning for fin with zero area 
Also, put geometry checks together and add component name to warning where easy.
 2023-02-25 21:46:37 -07:00
Joe Pfeiffer
1fa82c3fef
Merge branch 'openrocket:unstable' into fix-2024 2023-02-25 17:56:01 -07:00
JoePfeiffer
367c745aaa Merge branch 'unstable' into fix-2067 2023-02-25 17:48:40 -07:00
SiboVG
eb65266fe8 Fix import issue when sim includes booster motor, but no booster present 2023-02-25 20:04:53 +01:00
SiboVG
a9746a9983 Fix import issue when sim includes booster motor, but no booster present 2023-02-25 20:03:13 +01:00
SiboVG
5ac1f71922 [#2072] Apply designation/common name choice to other parts 2023-02-24 23:28:58 +01:00
Sibo Van Gool
2c22015ec7
Merge pull request #2057 from SiboVG/issue-2055 
[#2055] Add motor manufacturers substitutor
 2023-02-24 22:12:12 +01:00
SiboVG
ea7ee41a25 Fix recovery event when first booster component is not a body tube 2023-02-24 16:00:22 +01:00
SiboVG
9557287bc1 Merge branch 'unstable' into issue-2048 2023-02-23 23:21:37 +01:00
JoePfeiffer
f0621e5790 Change simulation file loader so it always marks a simulation as LOADED if it has data, and NOT_SIMULATED if it doesn't. This is more reliable than the status attributed, as that gets saved as notsimulated when only summary data is saved. 
Also clean up logic in Simulation constructor a bit,
 2023-02-23 15:15:54 -07:00
JoePfeiffer
297ab11fe2 Don't bail on importing sim data when there is no <databranch> tag; we can 
still have summary data
 2023-02-23 14:23:31 -07:00
SiboVG
c009b23e47 Fix issue in boattail axial offset importing 2023-02-23 21:56:08 +01:00
SiboVG
a621bed20a [#2068] Use generalized motor config substitutor 2023-02-23 16:15:30 +01:00
JoePfeiffer
ffcbc7cf60 Eliminate option of saving a subset of simulation data. Choices are to save all or nothing 2023-02-22 09:48:21 -07:00
SiboVG
f26aced544 Make boat tails recessed instead of simple transition 2023-02-22 02:12:56 +01:00
SiboVG
5be3e381e7 Update geometry check for new next/prev comp behavior 2023-02-22 00:56:06 +01:00
Sibo Van Gool
9618fdb400
Merge pull request #2053 from SiboVG/issue-2040 
[#2040] Fix CM of launch lug & rail button instances
 2023-02-21 23:32:39 +01:00
Sibo Van Gool
98dccd868a
Merge pull request #2049 from SiboVG/issue-2047 
[#2047] Fix pod set & booster markers
 2023-02-21 23:32:18 +01:00
SiboVG
074fee3663 [#2048] Support inline, flush assemblies in prev/next sym comp 2023-02-21 03:15:47 +01:00
SiboVG
09918a3d22 Add clarifying comments 2023-02-21 03:13:27 +01:00
Sibo Van Gool
f63acc25fe
Merge pull request #2054 from SiboVG/issue-2051 
[#2051] Sanitize some XML content
 2023-02-16 05:12:30 +01:00
Sibo Van Gool
45604e22cf
Merge pull request #2042 from SiboVG/issue-2003 
[#2003] Increase resolution of launch temp and pressure to 2 decimals
 2023-02-16 05:11:35 +01:00
SiboVG
813f0d5fc6 Only search active stages in substitutor 2023-02-14 16:32:59 +00:00
SiboVG
ef665b4529 [#2055] Add manufacturers substitutor 2023-02-14 05:00:48 +00:00
SiboVG
f38c8a48c9 Use proper substitutor for flight config name 2023-02-14 04:59:44 +00:00
SiboVG
b158ca0ff6 Merge branch 'unstable' into issue-2040 2023-02-14 03:06:07 +00:00