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

Merge pull request #1657 from SiboVG/issue-1653

Browse Source 
[#1653] Scale RadiusRingComponent according to scale direction
This commit is contained in:
SiboVG 2022-09-10 23:04:20 +02:00 committed by GitHub
commit e1128d0bf4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
swing/src/net/sf/openrocket/gui/dialogs/ScaleDialog.java
View File

@ -122,7 +122,7 @@ public class ScaleDialog extends JDialog {
addScaler(EllipticalFinSet.class, "Height", SCALERS_NO_OFFSET);
// FreeformFinSet
list = new ArrayList<ScaleDialog.Scaler>(1);
list = new ArrayList<>(1);
list.add(new FreeformFinSetScaler());
SCALERS_NO_OFFSET.put(FreeformFinSet.class, list);
@ -135,7 +135,7 @@ public class ScaleDialog extends JDialog {
addScaler(MassObject.class, "RadialPosition", SCALERS_OFFSET);
// MassComponent
list = new ArrayList<ScaleDialog.Scaler>(1);
list = new ArrayList<>(1);
list.add(new MassComponentScaler());
SCALERS_NO_OFFSET.put(MassComponent.class, list);
@ -162,8 +162,9 @@ public class ScaleDialog extends JDialog {
addScaler(InnerTube.class, "MotorOverhang", SCALERS_NO_OFFSET);
// RadiusRingComponent
addScaler(RadiusRingComponent.class, "OuterRadius", "isOuterRadiusAutomatic", SCALERS_NO_OFFSET);
addScaler(RadiusRingComponent.class, "InnerRadius", "isInnerRadiusAutomatic", SCALERS_NO_OFFSET);
list = new ArrayList<>(1);
list.add(new RadiusRingComponentScaler());
SCALERS_NO_OFFSET.put(RadiusRingComponent.class, list);
}
private static void addScaler(Class<? extends RocketComponent> componentClass, String methodName,
@ -745,5 +746,29 @@ public class ScaleDialog extends JDialog {
}
}
private static class RadiusRingComponentScaler implements Scaler {
@Override
public void scale(RocketComponent component, double multiplier, boolean scaleMass) {
final Map<Class<? extends RocketComponent>, List<Scaler>> scalers = new HashMap<>();
RadiusRingComponent ring = (RadiusRingComponent) component;
// We need to specify this particular order, otherwise scale the inner/outer radius may clip the dimensions of the other outer/inner radius
if (multiplier >= 1) {
addScaler(RadiusRingComponent.class, "OuterRadius", "isOuterRadiusAutomatic", scalers);
addScaler(RadiusRingComponent.class, "InnerRadius", "isInnerRadiusAutomatic", scalers);
} else {
addScaler(RadiusRingComponent.class, "InnerRadius", "isInnerRadiusAutomatic", scalers);
addScaler(RadiusRingComponent.class, "OuterRadius", "isOuterRadiusAutomatic", scalers);
}
for (List<Scaler> foo : scalers.values()) {
for (Scaler s : foo) {
s.scale(component, multiplier, scaleMass);
}
}
}
}
}