hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[#2126] Apply freeform conversion to config listeners

Browse Source
This commit is contained in:
SiboVG 2023-03-20 16:45:31 +01:00
parent 98fb726c4b
commit 2822e0ec27
1 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
core/src/net/sf/openrocket/rocketcomponent/FreeformFinSet.java
View File

@ -45,15 +45,16 @@ public class FreeformFinSet extends FinSet {
* The specified fin set should not be used after the call! * The specified fin set should not be used after the call!
* *
* @param finset the fin set to convert. * @param finset the fin set to convert.
* @param freezeRocket whether to freeze the rocket before conversion.
* @return the new freeform fin set. * @return the new freeform fin set.
*/ */
public static FreeformFinSet convertFinSet(FinSet finset) { public static FreeformFinSet convertFinSet(FinSet finset, boolean freezeRocket) {
final RocketComponent root = finset.getRoot(); final RocketComponent root = finset.getRoot();
FreeformFinSet freeform; FreeformFinSet freeform;
List<RocketComponent> toInvalidate = new ArrayList<>(); List<RocketComponent> toInvalidate = new ArrayList<>();
try { try {
if (root instanceof Rocket) { if (freezeRocket && root instanceof Rocket) {
((Rocket) root).freeze(); ((Rocket) root).freeze();
} }
@ -92,8 +93,17 @@ public class FreeformFinSet extends FinSet {
parent.addChild(freeform, position); parent.addChild(freeform, position);
} }
// Convert config listeners
for (RocketComponent listener : finset.configListeners) {
if (listener instanceof FinSet) {
FreeformFinSet listenerSet = FreeformFinSet.convertFinSet((FinSet) listener, false);
freeform.addConfigListener(listenerSet);
finset.removeConfigListener(listener);
}
}
} finally { } finally {
if (root instanceof Rocket) { if (freezeRocket && root instanceof Rocket) {
((Rocket) root).thaw(); ((Rocket) root).thaw();
} }
// Invalidate components after events have been fired // Invalidate components after events have been fired
@ -101,9 +111,24 @@ public class FreeformFinSet extends FinSet {
c.invalidate(); c.invalidate();
} }
} }
return freeform; return freeform;
} }
/**
* Convert an existing fin set into a freeform fin set. The specified
* fin set is taken out of the rocket tree (if any) and the new component
* inserted in its stead.
* <p>
* The specified fin set should not be used after the call!
*
* @param finset the fin set to convert.
* @return the new freeform fin set.
*/
public static FreeformFinSet convertFinSet(FinSet finset) {
return convertFinSet(finset, true);
}
/** /**
* Converts a point of this fin set to edit into a point for a config listener to edit. * Converts a point of this fin set to edit into a point for a config listener to edit.
* *