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

Allow min and max to be another DoubleModel

Browse Source
This commit is contained in:
SiboVG 2024-08-23 23:13:38 +02:00
parent 33fe5bf9c6
commit 583890a6b8
1 changed files with 83 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
swing/src/main/java/info/openrocket/swing/gui/adaptors/DoubleModel.java
View File

@ -618,7 +618,9 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat
private Unit currentUnit; private Unit currentUnit;
private final double minValue; private final double minValue;
private double maxValue; private final double maxValue;
private DoubleModel minModel;
private DoubleModel maxModel;
private String toString = null; private String toString = null;
@ -697,7 +699,7 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat
* @param max Maximum value allowed (in SI units) * @param max Maximum value allowed (in SI units)
*/ */
public DoubleModel(Object source, String valueName, double multiplier, UnitGroup unit, public DoubleModel(Object source, String valueName, double multiplier, UnitGroup unit,
double min, double max) { Object min, Object max) {
this.modelInvalidator = new ModelInvalidator(source, this); this.modelInvalidator = new ModelInvalidator(source, this);
this.source = source; this.source = source;
this.valueName = valueName; this.valueName = valueName;
@ -706,8 +708,25 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat
this.units = unit; this.units = unit;
currentUnit = units.getDefaultUnit(); currentUnit = units.getDefaultUnit();
this.minValue = min; if (min instanceof DoubleModel) {
this.maxValue = max; this.minModel = (DoubleModel) min;
this.minValue = this.minModel.getValue();
this.minModel.addChangeListener(this);
} else if (min instanceof Double) {
this.minValue = (Double) min;
} else {
this.minValue = Double.NEGATIVE_INFINITY;
}
if (max instanceof DoubleModel) {
this.maxModel = (DoubleModel) max;
this.maxValue = this.maxModel.getValue();
this.maxModel.addChangeListener(this);
} else if (max instanceof Double) {
this.maxValue = (Double) max;
} else {
this.maxValue = Double.POSITIVE_INFINITY;
}
if (RocketComponent.class.isAssignableFrom(source.getClass())) { if (RocketComponent.class.isAssignableFrom(source.getClass())) {
((RocketComponent)source).addChangeListener(this); ((RocketComponent)source).addChangeListener(this);
@ -752,6 +771,11 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat
this(source, valueName, multiplier, unit, min, Double.POSITIVE_INFINITY); this(source, valueName, multiplier, unit, min, Double.POSITIVE_INFINITY);
} }
public DoubleModel(Object source, String valueName, double multiplier, UnitGroup unit,
DoubleModel min) {
this(source, valueName, multiplier, unit, min, Double.POSITIVE_INFINITY);
}
public DoubleModel(Object source, String valueName, double multiplier, UnitGroup unit) { public DoubleModel(Object source, String valueName, double multiplier, UnitGroup unit) {
this(source, valueName, multiplier, unit, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY); this(source, valueName, multiplier, unit, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY);
} }
@ -765,6 +789,22 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat
this(source, valueName, 1.0, unit, min, Double.POSITIVE_INFINITY); this(source, valueName, 1.0, unit, min, Double.POSITIVE_INFINITY);
} }
public DoubleModel(Object source, String valueName, UnitGroup unit, DoubleModel min) {
this(source, valueName, 1.0, unit, min, Double.POSITIVE_INFINITY);
}
public DoubleModel(Object source, String valueName, UnitGroup unit, double min, DoubleModel max) {
this(source, valueName, 1.0, unit, min, max);
}
public DoubleModel(Object source, String valueName, UnitGroup unit, DoubleModel min, double max) {
this(source, valueName, 1.0, unit, min, max);
}
public DoubleModel(Object source, String valueName, UnitGroup unit, DoubleModel min, DoubleModel max) {
this(source, valueName, 1.0, unit, min, max);
}
public DoubleModel(Object source, String valueName, UnitGroup unit) { public DoubleModel(Object source, String valueName, UnitGroup unit) {
this(source, valueName, 1.0, unit, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY); this(source, valueName, 1.0, unit, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY);
} }
@ -778,10 +818,26 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat
this(source, valueName, 1.0, UnitGroup.UNITS_NONE, min, Double.POSITIVE_INFINITY); this(source, valueName, 1.0, UnitGroup.UNITS_NONE, min, Double.POSITIVE_INFINITY);
} }
public DoubleModel(Object source, String valueName, DoubleModel min) {
this(source, valueName, 1.0, UnitGroup.UNITS_NONE, min, Double.POSITIVE_INFINITY);
}
public DoubleModel(Object source, String valueName, double min, double max) { public DoubleModel(Object source, String valueName, double min, double max) {
this(source, valueName, 1.0, UnitGroup.UNITS_NONE, min, max); this(source, valueName, 1.0, UnitGroup.UNITS_NONE, min, max);
} }
public DoubleModel(Object source, String valueName, DoubleModel min, double max) {
this(source, valueName, 1.0, UnitGroup.UNITS_NONE, min, max);
}
public DoubleModel(Object source, String valueName, double min, DoubleModel max) {
this(source, valueName, 1.0, UnitGroup.UNITS_NONE, min, max);
}
public DoubleModel(Object source, String valueName, DoubleModel min, DoubleModel max) {
this(source, valueName, 1.0, UnitGroup.UNITS_NONE, min, max);
}
/** /**
* Returns the value of the variable (in SI units). * Returns the value of the variable (in SI units).
@ -806,7 +862,9 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat
public void setValue(double v) { public void setValue(double v) {
modelInvalidator.checkState(true); modelInvalidator.checkState(true);
double clampedValue = MathUtil.clamp(v, minValue, maxValue); double minVal = (minModel != null) ? minModel.getValue() : minValue;
double maxVal = (maxModel != null) ? maxModel.getValue() : maxValue;
double clampedValue = MathUtil.clamp(v, minVal, maxVal);
if (clampedValue != v) { if (clampedValue != v) {
log.debug("Clamped value " + v + " to " + clampedValue + " for " + this); log.debug("Clamped value " + v + " to " + clampedValue + " for " + this);
v = clampedValue; v = clampedValue;
@ -834,6 +892,14 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat
} }
} }
public void setMinModel(DoubleModel minModel) {
this.minModel = minModel;
}
public void setMaxModel(DoubleModel maxModel) {
this.maxModel = maxModel;
}
/** /**
* Returns whether setting the value automatically is available. * Returns whether setting the value automatically is available.
*/ */
@ -983,6 +1049,8 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat
@Override @Override
public void invalidateMe() { public void invalidateMe() {
modelInvalidator.invalidateMe(); modelInvalidator.invalidateMe();
if (minModel != null) minModel.removeChangeListener(this);
if (maxModel != null) maxModel.removeChangeListener(this);
} }
@ -1023,6 +1091,13 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat
public void stateChanged(EventObject e) { public void stateChanged(EventObject e) {
modelInvalidator.checkState(true); modelInvalidator.checkState(true);
if (e.getSource() == minModel || e.getSource() == maxModel) {
// Min or max value has changed, we need to ensure our current value is still within bounds
double currentValue = getValue();
setValue(currentValue); // This will clamp the value if necessary
return;
}
double v = getValue(); double v = getValue();
boolean b = isAutomatic(); boolean b = isAutomatic();
if (lastValue == v && lastAutomatic == b) if (lastValue == v && lastAutomatic == b)