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

1996 Commits

Author SHA1 Message Date
SiboVG
1b9751562a [#1231] Split bounding box and length in aerodynamic and all 
Some parts of the program need only the bounding box of aerodynamic parts (most parts of the program), but a couple others need the bounding box and length of all components
 2022-06-08 22:14:19 +02:00
SiboVG
34b5729693 [#1231] Include non-aerodynamic components in bounding box calculations 2022-06-08 21:17:48 +02:00
JoePfeiffer
72ebd97eef Found another couple of instances of fins being multiplied by fincount 2022-06-07 16:37:02 -06:00
Joe Pfeiffer
ca9241f562
Merge pull request #1413 from JoePfeiffer/fix-1258 
Update tube fin stabililty calculations
 2022-06-07 15:28:54 -06:00
SiboVG
0ae7a00e3c [#1411] Show combined mass of multi-selection hover in component 2022-06-07 19:04:31 +02:00
JoePfeiffer
157fd1a5bc Merge remote-tracking branch 'origin' into fix-1258 2022-06-07 10:54:54 -06:00
JoePfeiffer
910ef69b79 Remove tube fin stability warning 2022-06-07 10:52:34 -06:00
SiboVG
6478046bcb [#1409] Remove instancecount multiplication in getSectionMass 2022-06-07 02:04:32 +02:00
JoePfeiffer
fe587d5bfc calculate tube fin Cna 2022-06-05 10:31:47 -06:00
Joe Pfeiffer
f184940715
Merge pull request #1403 from SiboVG/softwareUpdaterBeta 
Add checkbox in preferences for checking for beta updates + fixes
 2022-06-03 10:22:22 -06:00
Joe Pfeiffer
aef0b9ef7c
Merge pull request #1402 from JoePfeiffer/fix-1356 
update iteration through rocket components to account for inactive components and instances
 2022-06-03 10:21:56 -06:00
Sibo Van Gool
53026d0838 Add check beta updates checkbox in preferences 2022-06-03 00:58:20 +02:00
JoePfeiffer
98b60d1f7a update iteration through rocket components to account for inactive components and instances 2022-06-02 15:05:17 -06:00
SiboVG
8ecf888a13 [#1397] Fix streamer packed length updating strip width 2022-06-02 01:48:07 +02:00
SiboVG
35f3044aa1
Merge pull request #1385 from SiboVG/issue-1344 
[#1344] Clear preset when centering ring/bulkhead length is changed
 2022-05-29 11:07:13 +02:00
hcraigmiller
066e2c8a3b Corrected Parachute CD preset error 
Corrected error in preset which used packed length instead of the drag coefficient, and renamed/refactored variable "DragCoefficient" to "dragCoefficient".
 2022-05-28 22:16:04 -07:00
SiboVG
0def1b5c05 [#1344] Clear preset when centering ring/bulkhead length is changed 2022-05-27 14:16:53 +02:00
SiboVG
c4ffc663bf
Merge pull request #1377 from SiboVG/issue-1375 
[#1375] Fix preset not "resetting" nose cone / transition shape parameter
 2022-05-25 16:56:21 +02:00
SiboVG
a526b18626 [#1375] Fix preset not "resetting" nose cone / transition shape parameter 2022-05-25 16:54:32 +02:00
SiboVG
6b5982c6aa
Merge pull request #1371 from hcraigmiller/Cd-Code-Correction 
Improve parachute preset code/gui
 2022-05-25 03:30:18 +02:00
hcraigmiller
853bd8b1e9
Additional suggested changes 
Additional suggested changes.
 2022-05-24 18:23:39 -07:00
hcraigmiller
a9de95bafa
Implemented suggested changes. 
Changed code regarding default constants.
 2022-05-24 18:14:08 -07:00
hcraigmiller
d5e3c718aa
Corrected global Cd per SiboVG 
Corrected omission of global Cd as suggested by @SiboVG.
 2022-05-24 13:22:35 -07:00
hcraigmiller
cf7763ab6e
Remove/changed comments 
Revised comments re suggestion of SiboVG; checking on global cd change.
 2022-05-24 12:52:25 -07:00
hcraigmiller
687d460f0d Streamer changes exit preset status 
Changing a streamer characteristic exits preset status; except for streamer length. Selection of a preset streamer when not in preset status (such as re-selecting the same preset streamer after changing one of its characteristics), sets all characteristics (including Cd and automatic checkbox); previously, the Cd and automatic checkbox were not set/reset after a manual Cd change.
 2022-05-24 11:19:07 -07:00
hcraigmiller
5efab0937c
Remove preset status upon change 
A change of the Cd value removes the preset status.
 2022-05-22 23:33:15 -07:00
hcraigmiller
aa60f1307f
Remove preset upon changes 
Changes in parachute line length and material remove preset status.
 2022-05-22 23:27:14 -07:00
hcraigmiller
f1f57bf3e5 Improve parachute preset code/gui 
Corrected drag coefficient return from “DEFAULT_CD” to cd.” Condensed code related to setting parachute preset values. Added code to set parachute characteristics to default values when a particular characteristic data field either does not exist, is empty, or (when numerical) has a value that is not greater than zero.
 2022-05-22 20:34:35 -07:00
SiboVG
d36c0b79a1 Fix non-ASCII characters 2022-05-18 00:40:28 +02:00
SiboVG
b9f758b095
Merge pull request #1347 from hcraigmiller/Preparation-for-Spill-Hole-Inclusion 
Adds additional presets for use in .orc files without throwing errors
 2022-05-18 00:37:42 +02:00
JoePfeiffer
f6b30df8f9 In BasicLandingStepper, instead of basing time step on acceleration (higher acceleration => shorter time step), base it on change in acceleration (ie jerk) 2022-05-13 15:24:23 -06:00
JoePfeiffer
0910317bf6 Make MathUtil::interpolate a bit more robust in the presence of possible 
rounding errors.
 2022-05-13 11:52:22 -06:00
JoePfeiffer
fbd80f480d Modify GroundStepper to not add datapoint to simulation status 
Modify BasicLandingStepper to recalculate timestep on last step to find
actual landing data
Modify BasicEventSimulationEngine to watch for altitude less than MathUtil.EPSILON rather than 0 (since BasicLandingStepper now finds altitude exactly equal to 0)
 2022-05-13 10:32:00 -06:00
hcraigmiller
ea30ad3537
Remove comments 
Removed comments
 2022-05-10 19:54:01 -07:00
hcraigmiller
74ae3a03e0 Adds packed length and diameter to preset editor 
Adds packed length and diameter to preset editor; also adds labels and additional presets for .orc files so that spill hole data can be added to the .orc files without throwing warnings (does not change editor for spill holes).
 2022-05-10 17:33:57 -07:00
hcraigmiller
8f84d831fa Minor change in packed code 
Simplified code by replace new if statements with else statements. No change in functionality.
 2022-05-10 16:04:01 -07:00
SiboVG
c895dde4a3 Clear Transition preset on shape and type change 2022-05-10 22:58:02 +02:00
JoePfeiffer
d18d430524 Merge remote-tracking branch 'origin/unstable' into refine-tube-drag 
Use more detailed empirical formulas in tube pressure drop formulas
 2022-05-05 15:49:30 -06:00
JoePfeiffer
359e97108c Check for inner radius of tube == 0 to avoid NaN in pressure drop 
calculation
 2022-05-04 15:10:32 -06:00
JoePfeiffer
05ce7cb1f5 On second thought, I think I can do better than this. 
Revert "check for tubes with inner radius of 0; set pressure drag to 0 and set a warning"

This reverts commit 7676b9b674ffc268d8c67915b8e54f44d22449fa.
 2022-05-04 10:50:20 -06:00
JoePfeiffer
7676b9b674 check for tubes with inner radius of 0; set pressure drag to 0 and set a warning 2022-05-04 10:25:46 -06:00
JoePfeiffer
0b8276b6c8 more tubefin refinement (should be squashed with prev commit) 2022-05-04 07:22:34 -06:00
JoePfeiffer
1611fd2876 More detailed model for pressure drop in tubes. 2022-05-04 07:04:01 -06:00
JoePfeiffer
30dcdda0bf correct wetted area calculation 2022-05-03 15:51:40 -06:00
Joe Pfeiffer
1e0734ae1f
Merge pull request #1318 from JoePfeiffer/fix-1291 
consider instance count in component mass
 2022-05-03 13:51:41 -06:00
SiboVG
12cba42dca
Merge pull request #1323 from SiboVG/issue-1320 
[fixes #1320] Remove 'Custom' material option from preference's add new material
 2022-05-01 23:52:22 +02:00
SiboVG
a80bfcde14 Rearrange Material types 
This causes a more logical arrangement in the preferences' add material dropdown box
 2022-05-01 23:34:37 +02:00
JoePfeiffer
ccb7c5e714 consider instance count in component mass 2022-04-29 19:32:19 -06:00
JoePfeiffer
61e57eacb5 Left a really annoying extra line of debug in BarromanCalcualtor. 
Somehow managed to have two offseting (in the case of this rocket, anyway) typos in pressure drop calculation.
 2022-04-27 21:46:41 -06:00
SiboVG
d0348726d3
Merge pull request #1312 from JoePfeiffer/fix-1207a 
Rewrite tube fin and launch lug drag calculations
 2022-04-28 01:33:52 +02:00