From 5480b966523da8e2a78c2e7fe02e90f4902265e7 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Sat, 27 Aug 2022 12:48:16 +0200 Subject: [PATCH] Use MathUtil.clamp for DoubleModel set clamping --- .../net/sf/openrocket/gui/adaptors/DoubleModel.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/adaptors/DoubleModel.java b/swing/src/net/sf/openrocket/gui/adaptors/DoubleModel.java index f605d0d0c..d7c58e352 100644 --- a/swing/src/net/sf/openrocket/gui/adaptors/DoubleModel.java +++ b/swing/src/net/sf/openrocket/gui/adaptors/DoubleModel.java @@ -774,12 +774,10 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat public void setValue(double v) { checkState(true); - if (v > maxValue) { - log.debug("Clipping value " + v + " to maximum " + maxValue + " for " + this); - v = maxValue; - } else if (v < minValue) { - log.debug("Clipping value " + v + " to minimum " + minValue + " for " + this); - v = minValue; + double 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);