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

2193 Commits

Author SHA1 Message Date
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
SiboVG
c156e433a3 Update beta 3 build version 2022-05-10 03:54:23 +02:00
SiboVG
25a6ec95d2 Update thrustcurves 2022-05-10 03:24:06 +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
SiboVG
f73e21f45a Use 'design info' instead of 'specs' 2022-05-05 03:00:26 +02:00
hcraigmiller
061acb8f89 Fixed icon missing error 
OR was throwing a missing icon error on startup. This fixes that issue.
 2022-05-04 17:02:17 -07:00
Joe Pfeiffer
61e71b7239
Merge pull request #1322 from hcraigmiller/NEW-Export-Feature 
NEW Changed File > Export menu format to accommodate multiple file format
 2022-05-04 17:33:21 -06:00
SiboVG
9f85681629 Use horizontal ellipsis character for ... 2022-05-04 23:49:25 +02:00
hcraigmiller
85559d6da2 Update File menu and submenu 
Improves File menu and submenus in preparation for the addition of future features.
 2022-05-04 14:14:59 -07: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
hcraigmiller
c007888172
Clean up messages 
From: main.menu.file.export_as = Export...
     To: main.menu.file.export_as = Export as...
From: main.menu.file.export_as.desc = Export model to Rocksim .rkt file
     To: main.menu.file.export_as.desc = Export model to selected file format
 2022-05-01 01:53:52 -07:00
hcraigmiller
735966de36 NEW Export Feature 
Replaces previous commit
 2022-05-01 00:12:09 -07: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
SiboVG
5d4352b666 Fix StreamerConfig import issue 2022-04-28 01:19:36 +02:00
SiboVG
647706ab0f Implement mass object auto radius in OR save/import 2022-04-28 01:19:35 +02:00
SiboVG
15e169820d Include mass object auto radius in OR save/import 2022-04-28 01:19:35 +02:00
SiboVG
c8fc18c98f Implement auto radius for all mass objects 2022-04-28 01:19:35 +02:00
SiboVG
eb50857f52 Implement auto packed diameter for parachute 
Adds an Auto checkbox in the parachute configuration dialog that automatically sets the parachute's packed diameter equal to the inner diameter of its parent
 2022-04-28 01:19:35 +02:00
SiboVG
aaaef5ab92 Clean up Parachute 2022-04-28 01:19:35 +02:00
hcraigmiller
f33babc806 Parachute configuration preset input enhancements 
Presets for selected parachute changes the Component Name to the parachute Description; input the parachute Cd; and input the override mass, checking the mass override box. The parachute packed values are also input, with the diameter of the parachute sized to the inner diameter of the parent component (where nose cones and transitions have inconsistent inner diameters, these components are sized to the largest diameter). Parachutes without a length and diameter (or without those fields) are sized using the default length and diameter. Once created, the parachute length and diameter do not automatically change if the parent diameter is changed, or the parachute is moved to a different component.
 2022-04-28 01:19:22 +02:00
JoePfeiffer
e98761c6cc remove some unused imports from TubeCalc.java 2022-04-27 15:42:12 -06:00
JoePfeiffer
784348dadd Include drag from sources other than SymmetricComponent and FinSet 2022-04-27 15:20:51 -06:00
JoePfeiffer
5d8a95d0a2 This file wasn't ever supposed to committed 2022-04-27 15:20:02 -06:00
JoePfeiffer
265a6e0b7b Create Tube parent class for LaunchLug and TubeFinSet, for use with TubeCalc 
Create TubeCalc parent class for LaunchLugCalc and TubeFinSetCalc

Replace tube drag calculation with new code, no longer using the three-fin
approximation from 15.03
 2022-04-27 15:18:45 -06:00
JoePfeiffer
68c4330fa3 Create skeleton of Tube. For the moment, this is just enough to 
make it possible to use TubeCalc.
 2022-04-24 19:22:32 -06:00
JoePfeiffer
4477d9226e commit the work-in-progress drag calculations, including creating TubeCalc for calculations common to LaunchLugs and TubeFinSets 2022-04-20 15:42:19 -06:00
SiboVG
a9dbc85a7e
Merge pull request #1282 from JoePfeiffer/generalize-automatic-tube-fin-radius 
generalize getOuterRadius() so automatic radius tubes touch for number of tubes greater than 2 (ie whenever possible)
 2022-04-19 17:39:42 +02:00
SiboVG
1fd4dffd6a
Merge pull request #1280 from JoePfeiffer/refactor-friction-drag 
Refactor friction drag
 2022-04-19 17:36:52 +02:00
JoePfeiffer
3ef3bdcbab Fix typo in FinSetCalc 2022-04-15 17:04:36 -06:00
hcraigmiller
736b1c1193 [Fixes Issue #1292] Calculates per fin mass when splitting a set of fins with a mass override. 
If a set of fins has an overriden mass, then, if the set is split into individual fins, the overridden mass is divided by the number of fins in the set and the quotient is set as the mass override for each individual fin.
 2022-04-14 03:05:29 -07:00
JoePfeiffer
45e0f40e1e Merge branch 'unstable' into refactor-friction-drag 2022-04-13 16:49:26 -06:00
JoePfeiffer
e8ae279dd3 Instead of getTubesTouching() returning a boolean telling whether tubes are touching, use getTubeSeparation() returning the actual separation between tubes. This'll work just as well for the current effort, and will be more useful when we consider tubes with separation. 2022-04-13 14:11:15 -06:00
Joe Pfeiffer
f0d7566690
Merge branch 'openrocket:unstable' into generalize-automatic-tube-fin-radius 2022-04-13 11:58:43 -06:00
JoePfeiffer
6f0a6f4127 Refer to drag coefficient consistently as CD 2022-04-13 10:22:30 -06:00
JoePfeiffer
a25cb8355e generalize getOuterRadius() to set radius so tubes touch for number of tubes greater than 2 (ie whenever possible) 
create getTubesTouching() method to determine whether tubes are touching (will also return true if they overlap)

fix several places where outerRadius was used instead of getOuterRadius()
 2022-04-06 10:49:49 -06:00
JoePfeiffer
632b48f8df Create RocketComponentCalc::calculateFrictionCD() 
Move actual friction CD calculation code into subclasses of RocketComponentCalc()

LaunchLugCalc adds so little wetted area it isn't worth bothering with, so isn't calculated (wasn't calculated before, either)

TubeFinSetCalc also doesn't calculate it; that's coming next.
 2022-04-05 19:30:10 -06:00
JoePfeiffer
56949560c4 Move component-level calculations out of instance loop 2022-04-05 17:00:19 -06:00
JoePfeiffer
5c62ad725a move Reynolds number and friction coefficient to separate methods for readability 2022-04-05 16:47:15 -06:00
JoePfeiffer
4fd3f26c9e Refer to drag coefficient consistently as CD 2022-03-31 16:04:05 -06:00