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

[#1794] Clamp IntegerModel to min and max on set

Browse Source
This commit is contained in:
SiboVG 2022-11-06 23:59:04 +01:00
parent 986b485cf6
commit 40f2994a84
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
swing/src/net/sf/openrocket/gui/adaptors/IntegerModel.java
View File

@ -13,6 +13,7 @@ import javax.swing.SpinnerNumberModel;
import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener; import javax.swing.event.ChangeListener;
import net.sf.openrocket.util.MathUtil;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -210,9 +211,16 @@ public class IntegerModel implements StateChangeListener {
* Sets the value of the variable. * Sets the value of the variable.
*/ */
public void setValue(int v) { public void setValue(int v) {
int clampedValue = MathUtil.clamp(v, minValue, maxValue);
if (clampedValue != v) {
log.debug("Clamped value " + v + " to " + clampedValue + " for " + this);
v = clampedValue;
}
log.debug("Setting value " + v + " for " + this); log.debug("Setting value " + v + " for " + this);
try { try {
setMethod.invoke(source, v); setMethod.invoke(source, v);
fireStateChanged();
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
throw new BugException(e); throw new BugException(e);
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {