From d226fa2be4f243071bfd2e0ccbdeffd407f7cbc6 Mon Sep 17 00:00:00 2001 From: Nico Mack Date: Mon, 14 Sep 2020 14:45:19 +0200 Subject: [PATCH] Added missing stepSize bootstrapping property --- CPS/config/CpsNamespace.properties | 1 + CPS/src/lu/list/itis/dkd/tui/utility/CpsNamespace.java | 1 + CPS/src/lu/list/itis/dkd/tui/utility/RotaryEncoder.java | 8 ++++++++ 3 files changed, 10 insertions(+) diff --git a/CPS/config/CpsNamespace.properties b/CPS/config/CpsNamespace.properties index 7a6c5bb..7bb55fd 100644 --- a/CPS/config/CpsNamespace.properties +++ b/CPS/config/CpsNamespace.properties @@ -1,4 +1,5 @@ ABOVE_ELEMENT=above +AREA_NODE=area ANGULAR_STEP_SIZE_NODE=angularStepSize BACKGROUND_NODE=background BELOW_ELEMENT=below diff --git a/CPS/src/lu/list/itis/dkd/tui/utility/CpsNamespace.java b/CPS/src/lu/list/itis/dkd/tui/utility/CpsNamespace.java index a726cd4..3982f86 100644 --- a/CPS/src/lu/list/itis/dkd/tui/utility/CpsNamespace.java +++ b/CPS/src/lu/list/itis/dkd/tui/utility/CpsNamespace.java @@ -27,6 +27,7 @@ public class CpsNamespace extends NLS { private static final String BUNDLE_NAME = "CpsNamespace"; //$NON-NLS-1$ public static String ABOVE_ELEMENT; + public static String AREA_NODE; public static String ANGULAR_STEP_SIZE_NODE; public static String BACKGROUND_NODE; diff --git a/CPS/src/lu/list/itis/dkd/tui/utility/RotaryEncoder.java b/CPS/src/lu/list/itis/dkd/tui/utility/RotaryEncoder.java index 9a253f6..3830948 100644 --- a/CPS/src/lu/list/itis/dkd/tui/utility/RotaryEncoder.java +++ b/CPS/src/lu/list/itis/dkd/tui/utility/RotaryEncoder.java @@ -108,6 +108,7 @@ public class RotaryEncoder { this.value = this.initialValue; this.lowerBound = BootstrappingUtils.getContentAsDouble(rootNode, Externalization.LOWER_BOUND_NODE, BootstrappingUtils.OPTIONAL, 0d, context); this.upperBound = BootstrappingUtils.getContentAsDouble(rootNode, Externalization.UPPER_BOUND_NODE, BootstrappingUtils.MANDATORY, null, context);; + this.stepSize = BootstrappingUtils.getContentAsDouble(rootNode, CpsNamespace.STEP_SIZE_NODE, BootstrappingUtils.OPTIONAL, 1d, context); this.lowerStopAngle = BootstrappingUtils.getContentAsRadians(rootNode, CpsNamespace.LOWER_STOP_ANGLE_NODE, BootstrappingUtils.OPTIONAL, Double.NaN, context); this.upperStopAngle = BootstrappingUtils.getContentAsRadians(rootNode, CpsNamespace.UPPER_STOP_ANGLE_NODE, BootstrappingUtils.OPTIONAL, Double.NaN, context); this.multiTurn = BootstrappingUtils.getContentAsBoolean(rootNode, CpsNamespace.MULTITURN_NODE, BootstrappingUtils.OPTIONAL, Boolean.FALSE, context); @@ -133,6 +134,13 @@ public class RotaryEncoder { // *************************************************************************** // --------------------------------------------------------------------------- + public void setValue(double newValue) { + this.value = Math.max(this.lowerBound, newValue); + this.value = Math.min(this.upperBound, newValue); + } + + // --------------------------------------------------------------------------- + public void setStopAngles(double lower, double upper) { this.lowerStopAngle = Math.min(lower, upper); this.upperStopAngle = Math.max(lower, upper); -- GitLab