1777 Commits

Author SHA1 Message Date
SiboVG
1d8ba75382 Fix merge conflict 2023-03-24 12:00:20 +01:00
Sibo Van Gool
a43d11966d
Merge pull request #2128 from SiboVG/issue-2108
[#2108] Don't dispose config dialog when no components selected in 3D view
2023-03-24 11:38:50 +01:00
Sibo Van Gool
52988bf31e
Merge pull request #2129 from SiboVG/issue-2102
[#2102] Add "Select components of same color" and "Select none" option
2023-03-24 11:38:28 +01:00
Sibo Van Gool
193eb6db23
Merge pull request #2133 from SiboVG/issue-2104
[#2104] Display ISA values in temp & pressure fields
2023-03-24 11:38:11 +01:00
Sibo Van Gool
a93a20611b
Merge pull request #2135 from SiboVG/issue-2131
[#2131] Throw warning message when save filename contains illegal characters
2023-03-24 11:37:36 +01:00
Joe Pfeiffer
39ebe49329
Merge pull request #2127 from SiboVG/issue-2126
[#2126] Apply freeform conversion to config listeners
2023-03-23 20:59:01 -06:00
Joe Pfeiffer
f5fa5fabdf
Merge pull request #2124 from SiboVG/issue-2107
[#2107] Don't render decals on component edges
2023-03-23 20:58:23 -06:00
SiboVG
3d9792cafa Merge branch 'unstable' into issue-2131
# Conflicts:
#	swing/src/net/sf/openrocket/gui/main/DesignFileSaveAsFileChooser.java
2023-03-23 11:16:18 +01:00
SiboVG
f4ea3275eb Fix some small bugs 2023-03-23 11:14:33 +01:00
H Craig Miller
2fb29cb3dc
Merge pull request #2123 from SiboVG/issue-875
[#875] Implement RASAero II importing
2023-03-22 20:12:25 -07:00
SiboVG
24de589f69 Ensure proper file name is parsed to character checker 2023-03-23 03:35:32 +01:00
SiboVG
ea05bc5001 Rename "Select none" to "Deselect all" 2023-03-23 03:16:37 +01:00
SiboVG
805ea919dc Only enable select color for components that have an appearance 2023-03-23 03:04:41 +01:00
SiboVG
e3d83eafb7 Only activate same color selection when one component selected 2023-03-23 01:54:32 +01:00
SiboVG
605c92b325 Use SaveFileChooser in other parts of OR 2023-03-23 01:27:55 +01:00
SiboVG
e1c86f6a74 [#2131] Throw warning message when design filename contains illegal characters 2023-03-23 01:20:58 +01:00
SiboVG
4257bb2777 [#2104] Display ISAA values in temp & pressure fields 2023-03-22 22:28:21 +01:00
SiboVG
47731a41fc Add ChangeListener to BooleanModel 2023-03-22 22:12:14 +01:00
SiboVG
4b525611ce Fix split not working on config listeners 2023-03-21 23:06:01 +01:00
SiboVG
ee8dbffd98 Dispose dialog before splitting fins
This fixes a NullPointerException (see #2127)
2023-03-21 22:58:21 +01:00
SiboVG
6402f78b2c [#2094] Display CD override with 3 decimals 2023-03-21 01:48:49 +01:00
SiboVG
0e93ca7c25 Use multi-comp fin splitting 2023-03-20 23:48:03 +01:00
SiboVG
84689df283 Add select None action 2023-03-20 22:52:42 +01:00
SiboVG
daf6189c8f [#2102] Add "Select components of same color" option 2023-03-20 22:44:23 +01:00
SiboVG
2286fd0830 [#2108] Don't dispose config dialog when no components selected in 3D view 2023-03-20 16:52:01 +01:00
SiboVG
2dc4a0fd39 Merge branch 'unstable' into issue-875 2023-03-20 12:41:12 +01:00
SiboVG
55c153ba24 [#2107] Don't render decals on component edges 2023-03-19 22:48:27 +01:00
SiboVG
40c4e1b70f Set marker color to invisible just to be sure 2023-03-19 13:00:34 +01:00
Joe Pfeiffer
ff7887d6fe
Merge pull request #2121 from hcraigmiller/unstable
[#2111] Update examples to include plugged motors
2023-03-18 11:19:03 -06:00
H Craig Miller
1eb2e1ccf9 Update examples to include plugged motors
Update examples to include plugged motors
2023-03-17 00:26:19 -07:00
SiboVG
47837287e5 Account for exponential notation in CSV export 2023-03-14 23:32:36 +01:00
SiboVG
d02b8fc431 Use selection-specific sim exporting in context menu 2023-03-14 23:29:10 +01:00
SiboVG
05561b2872 Confirm file overwrite 2023-03-14 00:20:16 +01:00
SiboVG
1b7213e21f Ignore empty simulations in sim table export 2023-03-14 00:14:21 +01:00
SiboVG
5e6abcffa7 Fix some merge conflicts 2023-03-11 15:34:04 +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
46df6b501d
Merge pull request #2091 from SiboVG/issue-2090
[#2090] Add plugged option to charge delay combobox if it wasn't present yet
2023-03-10 10:55:41 -07:00
JoePfeiffer
68bdd7ff2c Merge remote-tracking branch 'origin/unstable' into fix-2058 2023-03-09 13:31:54 -07: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
Sibo Van Gool
79b8d8b506
Merge pull request #2087 from jppetrakis/dev/jppetrakis/unstable/or_csv_from_simtable
Issue #2077 [Feature Request] Add context menu ability for the simulation table to export all run simulation table rows to a CSV file
2023-03-08 19:52:01 +01:00
SiboVG
fcb77082c6 Disable delay box when no motor selected 2023-03-08 19:49:58 +01:00
SiboVG
da15c59673 Remove some references to None and replace with Plugged 2023-03-08 19:19:39 +01:00
SiboVG
1c292f7b65 Merge remote-tracking branch 'origin/dev/jppetrakis/unstable/or_csv_from_simtable' into dev/jppetrakis/unstable/or_csv_from_simtable 2023-03-08 19:13:09 +01:00
SiboVG
ed62a91bc3 Fix file chooser size issue with accessory 2023-03-08 19:02:03 +01:00
jppetrakis
78b75c23fa make sure to get value in current units! 2023-03-08 12:18:25 -05:00
SiboVG
9b69e7dea5 Update file chooser dimensions 2023-03-06 20:43:17 +01:00
SiboVG
887e38b637 Refactor to better use export Action 2023-03-06 20:35:47 +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
SiboVG
ccdd54f64a Don't need trans anymore 2023-03-06 19:49:43 +01:00