[#875] Implement RASAero II importing #2123

SiboVG · 2023-03-19T20:02:35Z

This PR fixes #875 and implements RASAero II file (.CDX1) importing. Almost all RASAero components are compatible with OR, although sometimes through the use of inline pods), except for some special stuff like special fin cross sections (see #1626) and protrusions on body tubes. RASAero also uses per-simulation based rocket weight and CG (override).

In short, the following information is imported:

Rocket components
- Surface finished are also imported
Recovery devices
Simulations
- Launch site settings are also imported for each sim
- Motors found in the OR database are also imported
Comments of the rocket

An immense shoutout to @hcraigmiller for very thorough testing of this PR, and also for doing some preliminary coding in the past (e.g. creating the icons).

Importing can be done in a dedicated menu item:

or in the File > Open menu:

Demo:

Screen.Recording.2023-03-19.at.20.53.32.mp4

I have written some basic unit tests, but haven't implemented parameter checking for every imported component type, or checking e.g. each possible combination of recovery device importing (there are edge cases). As said before, @hcraigmiller has already done a great deal of testing, so I'm fairly confident that the importing should be stable and correct. So, I will just created a new issue request for extending the unit tests after this PR is merged. (Remind me to do so in case I forget)

If you want additional information on the importing, I advise you to ask @hcraigmiller, as I'm a bit busy at work right now.

Useful later for using the file name as the rocket name

Could probably be elaborated more for the separate handlers... I'm just sick of RASAero importing at this point

Apparently RASAero doesn't support recovery devices in other stages

# 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

hcraigmiller · 2023-03-21T18:07:44Z

@SiboVG, consensus reached:

With corrections by @JoePfeiffer due to my continuous brain fart as to the vent band rule...

SiboVG · 2023-03-21T21:27:12Z

@SiboVG, consensus reached:

With corrections by @JoePfeiffer due to my continuous brain fart as to the vent band rule...

Alright, thanks! Will correct it soon.

JoePfeiffer · 2023-03-21T22:00:20Z

Almost! If there are exactly three body tubes (ie no payload section and no vent band) and two recovery devices, device 1 is in tube 2 and device 2 is in tube 1.

hcraigmiller · 2023-03-21T22:29:46Z

Addition requested by @JoePfeiffer:

That should be it ... in your court @SiboVG.

SiboVG · 2023-03-21T22:31:42Z

Phew, I'm gonna have a beer once this PR is merged.

JoePfeiffer · 2023-03-22T00:40:05Z

Looks good! Thanks for your patience with my nit picking @hcraigmiller and @SiboVG .

Is it waiting on anything else?

SiboVG · 2023-03-22T18:20:40Z

The new rules should be in place now.

hcraigmiller · 2023-03-22T20:10:52Z

Errors:

VBC = Vent Band Count
VBP = Vent Band Position (BT count from top)

1 RECOVERY DEVICE

1 Body Tubes, VBC=0: Correct.

2 Body Tubes, VBC=0: Recovery Device 1 is positioned in BT-2 (Recovery Device 1 should be in BT-1).

3 Body Tubes, VBC=0: Correct.

4+ Body Tubes, VBC=0: Recovery Device 1 is positioned in BT-3 (Recovery Device 1 should be in BT-2).

3+ Body Tubes, VBC=1, VBP=2: Recovery Device 1 is positioned below the vent band (it should be above the vent band).

2 RECOVERY DEVICES

1 Body Tubes, VBC=0: Correct.

2 Body Tubes, VBC=0: Recovery Device 1 (deployment at apogee) is positioned over the top of Recovery Device 2 near the top of the first body tube (Recovery Device 1 should be in the second body tube).

3 Body Tubes, VBC=0: Recovery Device 1 (deployment at apogee) is positioned over the top of Recovery Device 2 near the top of the first body tube (Recovery Device 1 should be in the second body tube).

4 Body Tubes, VBC=0: Correct.

5 Body Tubes, VBC=0: Correct.

6 Body Tubes, VBC=0: Correct.

3 Body Tubes, VBC=1, VBP=2: Recovery Device 1 (deployment at apogee) is positioned over the top of Recovery Device 2 near the top of the body tube immediately above (Recovery Device 1 should be below) the first body tube of less than .8 calibers.

4 Body Tubes, VBC=1, VBP=2: Recovery Device 1 (deployment at apogee) is positioned over the top of Recovery Device 2 near the top of the body tube immediately above (Recovery Device 1 should be below) the first body tube of less than .8 calibers.

IF BTC=>5 then (incorrectly) Recovery Device 1 is always placed in BT-2 and Recovery Device 2 is always placed in BT-3.

5 Body Tubes, VBC=1, VBP=2: Recovery Device 2 is positioned in BT-2 the vent band (should be BT-1 above the vent band).

5 Body Tubes, VBC=1, VBP=3: Recovery Device 1 is positioned in BT-3 the vent band (it should be below the vent band).

5 Body Tubes, VBC=1, VBP=4: Recovery Device 1 is positioned in BT-2 (should be BT-3) and the vent band Recovery Device 1 is positioned in BT-3 (should be BT-4)

SiboVG · 2023-03-22T22:37:10Z

Sorry, there was a small logic error that cause issues with recovery device 1.

5 Body Tubes, VBC=1, VBP=2: Recovery Device 2 is positioned in BT-2 the vent band (should be BT-1 above the vent band).

5 Body Tubes, VBC=1, VBP=3: Recovery Device 1 is positioned in BT-3 the vent band (it should be below the vent band).

5 Body Tubes, VBC=1, VBP=4: Recovery Device 1 is positioned in BT-2 (should be BT-3) and the vent band Recovery Device 1 is positioned in BT-3 (should be BT-4)

Okay, I thought from your image that once you have 4+ body tubes, I should ignore the VB. I'll adjust it.

SiboVG · 2023-03-22T22:50:27Z

I hope it's correct this time.

hcraigmiller · 2023-03-22T23:56:02Z

Errors:

SiboVG · 2023-03-23T00:41:23Z

Errors:

That's a bit odd, the logical appears to be correct at first sight. Could you maybe send me the .CDX1 file of one of the faulty tests @hcraigmiller?

hcraigmiller · 2023-03-23T00:47:24Z

Here are all of the files. the file names are shown on the spreadsheet (correct and incorrect).

RASAero2.RecoveryDevicePlacement.zip

SiboVG · 2023-03-23T00:51:39Z

Okay, I actually think my previous commit fixed the issue. I used an ArrayList, which can sometimes mess up the ordering of the items. Care to try again @hcraigmiller?

SiboVG · 2023-03-23T00:52:19Z

Oh yeah, and I love how organized you are 😍.

hcraigmiller · 2023-03-23T01:23:58Z

One more time:

Not sure what happened, went from correct to ncorrect.

SiboVG · 2023-03-23T01:59:47Z

One more time:

Not sure what happened, went from correct to ncorrect.

Ah, that was a typo in the code... Should be done now.

hcraigmiller · 2023-03-23T03:27:10Z

Alright, that merge was accidental. All of the placements are correct. Should the merge be left or reverted?

SiboVG · 2023-03-23T03:32:50Z

Alright, that merge was accidental. All of the placements are correct. Should the merge be left or reverted?

Recovery device placement was the final check for this PR, so it's okay to leave it.

hcraigmiller · 2023-03-23T03:34:41Z

I hit the revert button before I asked. How do I clear it?

SiboVG · 2023-03-23T03:46:42Z

I hit the revert button before I asked. How do I clear it?

I deleted the revert branch, it's fine now. I went to the openrocket repo (not your own), then clicked on the branches

and there you can delete the revert branch:

SiboVG added 30 commits February 11, 2023 03:22

Reorganize BasicFrame file menu

dad762c

Add filename information to file/rocket loading

b5de534

Useful later for using the file name as the rocket name

Rename get/setType to get/setShapeType

8a779cf

[openrocket#875] Implement RASAero importing

ec9bfa8

Merge branch 'issue-2003' into issue-875

79090ee

Minor fixes to RASAero importing

c831ee8

Merge branch 'issue-2035' into issue-875

0d36fd3

Use rail guide/launch lug instances instead of separate components

7774ac2

Add RASAero motor files

3d1b519

Fix fin count import issue

ad39670

Refine parachute creation

23cca5a

Fix incorrect data of RASAero motors

7a72a30

Implement simulation importing from RASAero

357cae2

Extend getNextSymmetricComponent to component assemblies

eca160f

Fix translation key for RASAero import

ecc1368

Fix transition and body tube aft radius import

3625abb

Fix separation setting

33c4ad0

Select the first flight config by default

7101aa4

Change default stage separation event

0917c01

Give myself some credit 🙃

8c6ffd3

Make boat tails recessed instead of simple transition

f26aced

Add unit-tests for RASAero import

dfac4c6

Could probably be elaborated more for the separate handlers... I'm just sick of RASAero importing at this point

Fix issue in boattail axial offset importing

c009b23

Fix recovery event when first booster component is not a body tube

ea7ee41

Fix import issue when sim includes booster motor, but no booster present

a9746a9

Fix import issue when sim includes booster motor, but no booster present

eb65266

Update recovery device import rules

8dbae85

Apparently RASAero doesn't support recovery devices in other stages

Add extra rocket test

2252a31

Fix some merge conflicts

5e6abcf

Implement new recovery device position rules (hopefully final)

fadff98

GitHub can't handle Non-ASCII characters, boohoo...

636f8e7

Fix small logic error

61fc13b

Use VB rules for more than 3 body tubes

158fa2f

Use LinkedList instead of ArrayList to keep body tube order

52c8fac

Final one...

7431fa8

hcraigmiller merged commit 2fb29cb into openrocket:unstable Mar 23, 2023

SiboVG deleted the issue-875 branch March 23, 2023 03:18

SiboVG mentioned this pull request Mar 23, 2023

Write unit tests for RASAero importing #2136

Open

4 tasks

Uh oh!

[#875] Implement RASAero II importing #2123

[#875] Implement RASAero II importing #2123

Uh oh!

Conversation

SiboVG commented Mar 19, 2023

Uh oh!

hcraigmiller commented Mar 21, 2023

Uh oh!

SiboVG commented Mar 21, 2023

Uh oh!

JoePfeiffer commented Mar 21, 2023

Uh oh!

hcraigmiller commented Mar 21, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

SiboVG commented Mar 21, 2023

Uh oh!

JoePfeiffer commented Mar 22, 2023

Uh oh!

SiboVG commented Mar 22, 2023

Uh oh!

hcraigmiller commented Mar 22, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

SiboVG commented Mar 22, 2023

Uh oh!

SiboVG commented Mar 22, 2023

Uh oh!

hcraigmiller commented Mar 22, 2023

Uh oh!

SiboVG commented Mar 23, 2023

Uh oh!

hcraigmiller commented Mar 23, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

SiboVG commented Mar 23, 2023

Uh oh!

SiboVG commented Mar 23, 2023

Uh oh!

hcraigmiller commented Mar 23, 2023

Uh oh!

SiboVG commented Mar 23, 2023

Uh oh!

hcraigmiller commented Mar 23, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

SiboVG commented Mar 23, 2023

Uh oh!

hcraigmiller commented Mar 23, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

SiboVG commented Mar 23, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

hcraigmiller commented Mar 21, 2023 •

edited

Loading

hcraigmiller commented Mar 22, 2023 •

edited

Loading

hcraigmiller commented Mar 23, 2023 •

edited

Loading

hcraigmiller commented Mar 23, 2023 •

edited

Loading

hcraigmiller commented Mar 23, 2023 •

edited

Loading