Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
NUI
TULIP-CPS
Commits
7441654b
Commit
7441654b
authored
Sep 14, 2020
by
Nico Mack
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added Bootstrapping capabilities to RotaryEncoder class
parent
fb7319e9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
35 additions
and
0 deletions
+35
-0
CPS/config/CpsNamespace.properties
CPS/config/CpsNamespace.properties
+1
-0
CPS/src/lu/list/itis/dkd/tui/utility/CpsNamespace.java
CPS/src/lu/list/itis/dkd/tui/utility/CpsNamespace.java
+1
-0
CPS/src/lu/list/itis/dkd/tui/utility/RotaryEncoder.java
CPS/src/lu/list/itis/dkd/tui/utility/RotaryEncoder.java
+33
-0
No files found.
CPS/config/CpsNamespace.properties
View file @
7441654b
...
@@ -10,6 +10,7 @@ DISPLAY_MODE_NODE=displayMode
...
@@ -10,6 +10,7 @@ DISPLAY_MODE_NODE=displayMode
FACE_IS_TOUCHABLE_NODE
=
faceIsTouchable
FACE_IS_TOUCHABLE_NODE
=
faceIsTouchable
FOREGROUND_NODE
=
foreground
FOREGROUND_NODE
=
foreground
ITEMS_VARIABLE_NODE
=
itemsVariable
ITEMS_VARIABLE_NODE
=
itemsVariable
INITIAL_VALUE_NODE
=
initialValue
HTML_TEMPLATE_NODE
=
htmlTemplate
HTML_TEMPLATE_NODE
=
htmlTemplate
LABEL_TRANSLATION_NODE
=
labelTranslation
LABEL_TRANSLATION_NODE
=
labelTranslation
LANDING_LINE_LENGTH_NODE
=
landingLineLength
LANDING_LINE_LENGTH_NODE
=
landingLineLength
...
...
CPS/src/lu/list/itis/dkd/tui/utility/CpsNamespace.java
View file @
7441654b
...
@@ -43,6 +43,7 @@ public class CpsNamespace extends NLS {
...
@@ -43,6 +43,7 @@ public class CpsNamespace extends NLS {
public
static
String
HTML_TEMPLATE_NODE
;
public
static
String
HTML_TEMPLATE_NODE
;
public
static
String
INITIAL_VALUE_NODE
;
public
static
String
ITEMS_VARIABLE_NODE
;
public
static
String
ITEMS_VARIABLE_NODE
;
public
static
String
LABEL_TRANSLATION_NODE
;
public
static
String
LABEL_TRANSLATION_NODE
;
...
...
CPS/src/lu/list/itis/dkd/tui/utility/RotaryEncoder.java
View file @
7441654b
...
@@ -13,8 +13,15 @@
...
@@ -13,8 +13,15 @@
*/
*/
package
lu.list.itis.dkd.tui.utility
;
package
lu.list.itis.dkd.tui.utility
;
import
lu.list.itis.dkd.dbc.annotation.Nullable
;
import
lu.list.itis.dkd.tui.bootstrapping.BootstrapCallback
;
import
lu.list.itis.dkd.tui.bootstrapping.BootstrapContext
;
import
lu.list.itis.dkd.tui.bootstrapping.BootstrappingUtils
;
import
lu.list.itis.dkd.tui.exception.BuildException
;
import
lu.list.itis.dkd.tui.widget.state.StateManager.Direction
;
import
lu.list.itis.dkd.tui.widget.state.StateManager.Direction
;
import
org.jdom2.Element
;
/**
/**
* @author Nico Mack [nico.mack@list.lu]
* @author Nico Mack [nico.mack@list.lu]
* @since 1.8
* @since 1.8
...
@@ -76,12 +83,38 @@ public class RotaryEncoder {
...
@@ -76,12 +83,38 @@ public class RotaryEncoder {
this
.
buildFromProperties
();
this
.
buildFromProperties
();
}
}
// ---------------------------------------------------------------------------
public
RotaryEncoder
(
Element
rootNode
)
throws
BuildException
{
this
.
buildFromBootstrap
(
rootNode
,
null
,
null
);
this
.
buildFromProperties
();
}
// ---------------------------------------------------------------------------
public
RotaryEncoder
(
@Nullable
Element
rootNode
,
BootstrapContext
context
,
BootstrapCallback
callback
)
throws
BuildException
{
this
.
buildFromBootstrap
(
rootNode
,
context
,
callback
);
this
.
buildFromProperties
();
}
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
// ***************************************************************************
// ***************************************************************************
// * Primitive(s) *
// * Primitive(s) *
// ***************************************************************************
// ***************************************************************************
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
private
void
buildFromBootstrap
(
@Nullable
Element
rootNode
,
BootstrapContext
context
,
BootstrapCallback
callback
)
throws
BuildException
{
this
.
initialValue
=
BootstrappingUtils
.
getContentAsDouble
(
rootNode
,
CpsNamespace
.
INITIAL_VALUE_NODE
,
BootstrappingUtils
.
OPTIONAL
,
0
d
,
context
);
this
.
value
=
this
.
initialValue
;
this
.
lowerBound
=
BootstrappingUtils
.
getContentAsDouble
(
rootNode
,
Externalization
.
LOWER_BOUND_NODE
,
BootstrappingUtils
.
OPTIONAL
,
0
d
,
context
);
this
.
upperBound
=
BootstrappingUtils
.
getContentAsDouble
(
rootNode
,
Externalization
.
UPPER_BOUND_NODE
,
BootstrappingUtils
.
MANDATORY
,
null
,
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
);
}
// ---------------------------------------------------------------------------
private
void
buildFromProperties
()
{
private
void
buildFromProperties
()
{
lastAngle
=
Double
.
NaN
;
lastAngle
=
Double
.
NaN
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment