JoePfeiffer
12f8802cd3
Load and store SIM_WARN flight events
...
This requires substantial changes to Warnings in .ork files. Instead of Warnings consisting of a text string with id and priority as attributes, it is now a mixed content element with id, priority, description, and possibly sources as subelements and the original text string still present to provide backward compatibility.
If a .ork file with a warning is saved with this PR and then loaded also with this PR, the warning is reconstructed from the subelements and is available if there is a SIM_WARN flight event. If at some point we want to highlight the components referenced in a Warning, we now have references to them.
If a .ork file with a warning is saved with 23.09 and then loaded with this PR, none of the subelements are present, so the Warning is reconstructed from the text. It won't have actual references to the components mentioned in the Warning, and there won't be a SIM_WARN event needing reference the Warning.
If a .ork file with a warning is saved with this PR and then loaded in 23.09, there will be .ork loading warnings for all the elements defined in this PR, and then the Warning will be constructed from the text content just as for a .ork saved in 23.09.
2024-09-09 08:51:51 -06:00
JoePfeiffer
fad20af879
Refer to Warning UUID as ID for consistency with other code
2024-08-30 20:26:19 -06:00
JoePfeiffer
1d4ef4383a
SIM_WARN events take a null source. The Warning being passed in includes a set of sources; in case of a SIM_WARN event we'll look the source up there
2024-08-22 16:50:43 -06:00
JoePfeiffer
1c0710e240
Merge branch 'unstable' into flight-warning-event
2024-08-19 15:51:57 -06:00
JoePfeiffer
3be67960a4
Merge branch 'unstable' into flight-warning-event
2024-08-18 19:07:41 -06:00
Sibo Van Gool
29598ef1b1
Merge pull request #2530 from NCoppola25/issue-2521
...
[fixes #2521 ]
2024-08-18 13:26:39 +02:00
SiboVG
17813cfec6
Urgh, gradle snap really does not work?
2024-08-17 00:05:48 +02:00
SiboVG
d43f023f04
Revert back to core18, because gradle isn't supported elsewhere...
2024-08-16 21:49:46 +02:00
SiboVG
772faf73d5
Try to fix snap gradle
2024-08-16 21:33:41 +02:00
SiboVG
8e0a9fc1a4
Update snap for gradle build
2024-08-16 19:01:58 +02:00
Sibo Van Gool
7f8049c73d
Merge pull request #2538 from SiboVG/issue-2537
...
[#2537 ] Allow for reconfiguration of the default flight config name
2024-08-14 12:36:43 +02:00
Sibo Van Gool
79a2998ae2
Merge pull request #2534 from SiboVG/issue-2531
...
[#2531 ] Don't close edit sim dialog after plotting or exporting
2024-08-14 12:34:20 +02:00
SiboVG
f4e9d0db45
Return DEFAULT_CONFIG_NAME if default name cannot be found in prefs
2024-08-13 21:28:28 +02:00
SiboVG
c598004ba0
[ #2537 ] Allow for reconfiguration of the default flight config name
2024-08-13 19:39:26 +02:00
NickC25
928f56e308
Fix broken plot when selecting a specific stage
2024-08-12 21:30:26 -05:00
Sibo Van Gool
7e995f2ace
Merge pull request #2536 from SiboVG/remove-selectcolor
...
Remove SelectColorButton and SelectColorToggleButton
2024-08-12 23:55:49 +02:00
SiboVG
ac520e7148
Remove SelectColorButton and SelectColorToggleButton
...
Not needed anymore thanks to FlatLaf
2024-08-12 23:54:27 +02:00
Sibo Van Gool
4c8abd14bd
Merge pull request #2535 from SiboVG/ui-improvements
...
Small UI improvements
2024-08-12 22:27:31 +02:00
SiboVG
594db6ad10
Ensure OSX appearance setting is definitely called
2024-08-12 22:26:37 +02:00
SiboVG
cc738bbeaf
Also set OSX properties on main thread, so settings apply properly
...
(still doesn't work though...)
2024-08-12 22:23:12 +02:00
SiboVG
fe162d4abf
Improve colors for borderColor
2024-08-12 21:39:16 +02:00
SiboVG
6e247b273d
[ #2531 ] Don't close edit sim dialog after plotting or exporting
2024-08-12 21:12:28 +02:00
Joe Pfeiffer
1d13bdc593
Merge pull request #2529 from JoePfeiffer/fix-852
...
Add more stage separation options for deployable payloads and a deployable payload example
2024-08-12 12:19:00 -06:00
JoePfeiffer
ae17468daa
Merge branch 'unstable' into fix-852
2024-08-12 12:08:42 -06:00
Sibo Van Gool
c188f1cc96
Merge pull request #2533 from SiboVG/fix-simplot-vars
...
Fix simplot vars
2024-08-12 17:20:59 +02:00
SiboVG
1f6df48d97
Ensure new model uses the selected item from the old model
2024-08-12 17:20:06 +02:00
SiboVG
3f47259bf5
Remove unnecessary code
2024-08-12 16:59:38 +02:00
Nick Coppola
1fbbea5736
Merge branch 'openrocket:unstable' into issue-2521
2024-08-11 16:28:55 -05:00
NickC25
43eb329e46
[ #2521 ] Add stage description to sim plot tooltips for the main rocket, including the sustainer
2024-08-11 16:24:57 -05:00
Joe Pfeiffer
42f38ad749
Merge pull request #2527 from SiboVG/material-groups
...
Introduce material groups, document materials, and document preferences + Refactor material panel to use searchable and groupable combobox
2024-08-11 09:56:44 -06:00
SiboVG
bc60e30c72
Ensure Material Combobox closes when using buttons
2024-08-11 16:25:59 +02:00
SiboVG
4dbbc0f4fd
Fix JMenu deselection issue
2024-08-11 12:14:25 +02:00
SiboVG
a38230a05e
Merge branch 'refs/heads/unstable' into material-groups
...
# Conflicts:
# core/src/main/java/info/openrocket/core/database/Databases.java
# core/src/main/java/info/openrocket/core/file/openrocket/importt/ConfigHandler.java
# core/src/main/java/info/openrocket/core/material/Material.java
# swing/src/main/java/info/openrocket/swing/gui/configdialog/ParachuteConfig.java
# swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/DesignPreferencesPanel.java
# swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/DisplayPreferencesPanel.java
# swing/src/main/java/info/openrocket/swing/gui/dialogs/preferences/MaterialEditPanel.java
# swing/src/main/java/info/openrocket/swing/gui/util/GUIUtil.java
# swing/src/main/java/info/openrocket/swing/gui/widgets/SearchableAndCategorizableComboBox.java
2024-08-09 20:46:55 +02:00
JoePfeiffer
b183a571c4
Merge branch 'unstable' into fix-852
2024-08-09 11:47:52 -06:00
Joe Pfeiffer
e52374c6e4
Merge pull request #2528 from SiboVG/code-cleanup
...
Code cleanup
2024-08-09 11:34:54 -06:00
SiboVG
9f247a6ef9
Also use MaterialComboBox for other material widgets
2024-08-09 19:05:58 +02:00
SiboVG
c963d8104c
Merge branch 'refs/heads/unstable' into material-groups
...
# Conflicts:
# core/src/main/java/info/openrocket/core/document/OpenRocketDocument.java
# core/src/main/java/info/openrocket/core/rocketcomponent/RocketComponent.java
2024-08-09 18:30:18 +02:00
SiboVG
d6cb2e84cc
Refactor to GroupableAndSearchableComboBox
2024-08-09 18:24:31 +02:00
SiboVG
383bb4e4bb
Use JCheckBoxMenuItem instead of custom painting
2024-08-09 18:16:53 +02:00
SiboVG
cb86446b22
Revert "fix" for going outside menu group
2024-08-09 18:07:24 +02:00
JoePfeiffer
ae501caab4
Merge branch 'unstable' into fix-852
2024-08-09 10:03:24 -06:00
JoePfeiffer
29a6c05035
Add deployable payload example
2024-08-09 10:00:34 -06:00
SiboVG
29aa71f397
Replace old package name with new one for simulation extensions
2024-08-09 06:12:12 +02:00
SiboVG
5e77e3670a
Fix range because of GM scale 2
2024-08-09 06:03:06 +02:00
SiboVG
bf0e5eaeaf
Forgot assertsame import
2024-08-09 06:02:52 +02:00
SiboVG
d311ee6cc0
Use assertSame
2024-08-09 05:48:23 +02:00
SiboVG
b5d9343ff0
Add missing Test annotations
2024-08-09 05:47:07 +02:00
SiboVG
7d2c3c0676
Use String equals
2024-08-09 05:44:46 +02:00
SiboVG
1c5bddf54b
Fix small numerical issues
2024-08-09 05:37:47 +02:00
SiboVG
64b2b9a40e
Fix combobox infer
2024-08-09 05:31:17 +02:00
