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
fb7319e9
Commit
fb7319e9
authored
Aug 26, 2020
by
Nico Mack
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added angularStepSize property
parent
2f438900
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
2 deletions
+15
-2
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
+2
-0
CPS/src/lu/list/itis/dkd/tui/widget/PositionWidget.java
CPS/src/lu/list/itis/dkd/tui/widget/PositionWidget.java
+8
-1
CPS/src/lu/list/itis/dkd/tui/widget/builder/BasePositionWidgetBuilder.java
...tis/dkd/tui/widget/builder/BasePositionWidgetBuilder.java
+4
-1
No files found.
CPS/config/CpsNamespace.properties
View file @
fb7319e9
ABOVE_ELEMENT
=
above
ABOVE_ELEMENT
=
above
ANGULAR_STEP_SIZE_NODE
=
angularStepSize
BACKGROUND_NODE
=
background
BACKGROUND_NODE
=
background
BELOW_ELEMENT
=
below
BELOW_ELEMENT
=
below
BLINK_ON_OUT_OF_RANGE_NODE
=
blinkOnOutOfRange
BLINK_ON_OUT_OF_RANGE_NODE
=
blinkOnOutOfRange
...
...
CPS/src/lu/list/itis/dkd/tui/utility/CpsNamespace.java
View file @
fb7319e9
...
@@ -27,6 +27,8 @@ public class CpsNamespace extends NLS {
...
@@ -27,6 +27,8 @@ public class CpsNamespace extends NLS {
private
static
final
String
BUNDLE_NAME
=
"CpsNamespace"
;
//$NON-NLS-1$
private
static
final
String
BUNDLE_NAME
=
"CpsNamespace"
;
//$NON-NLS-1$
public
static
String
ABOVE_ELEMENT
;
public
static
String
ABOVE_ELEMENT
;
public
static
String
ANGULAR_STEP_SIZE_NODE
;
public
static
String
BACKGROUND_NODE
;
public
static
String
BACKGROUND_NODE
;
public
static
String
BELOW_ELEMENT
;
public
static
String
BELOW_ELEMENT
;
public
static
String
BLINK_ON_OUT_OF_RANGE_NODE
;
public
static
String
BLINK_ON_OUT_OF_RANGE_NODE
;
...
...
CPS/src/lu/list/itis/dkd/tui/widget/PositionWidget.java
View file @
fb7319e9
...
@@ -50,6 +50,7 @@ public class PositionWidget extends PointingWidget implements InformationProvide
...
@@ -50,6 +50,7 @@ public class PositionWidget extends PointingWidget implements InformationProvide
protected
boolean
trackRotationContinuously
;
protected
boolean
trackRotationContinuously
;
protected
boolean
trackTranslationContinuously
;
protected
boolean
trackTranslationContinuously
;
protected
double
stepSize
;
protected
double
stepSize
;
protected
double
angularStepSize
;
// ***************************************************************************
// ***************************************************************************
// * Constants *
// * Constants *
...
@@ -80,6 +81,7 @@ public class PositionWidget extends PointingWidget implements InformationProvide
...
@@ -80,6 +81,7 @@ public class PositionWidget extends PointingWidget implements InformationProvide
this
.
trackRotationContinuously
=
builder
.
trackRotationContinuously
;
this
.
trackRotationContinuously
=
builder
.
trackRotationContinuously
;
this
.
trackTranslationContinuously
=
builder
.
trackTranslationContinuously
;
this
.
trackTranslationContinuously
=
builder
.
trackTranslationContinuously
;
this
.
stepSize
=
builder
.
stepSize
;
this
.
stepSize
=
builder
.
stepSize
;
this
.
angularStepSize
=
builder
.
angularStepSize
;
}
}
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
...
@@ -114,8 +116,13 @@ public class PositionWidget extends PointingWidget implements InformationProvide
...
@@ -114,8 +116,13 @@ public class PositionWidget extends PointingWidget implements InformationProvide
if
(
modifyValueOnRotation
&&
(!
continuous
||
trackRotationContinuously
))
{
if
(
modifyValueOnRotation
&&
(!
continuous
||
trackRotationContinuously
))
{
newPosition
.
setRotationDirection
(
convertDirection
(
direction
));
newPosition
.
setRotationDirection
(
convertDirection
(
direction
));
if
(!
Double
.
isNaN
(
this
.
angularStepSize
))
{
double
rotation
=
Math
.
abs
(
position
.
getAngle
()
-
newPosition
.
getAngle
());
doUpdate
|=
(
rotation
>=
this
.
angularStepSize
);
}
else
{
doUpdate
|=
true
;
doUpdate
|=
true
;
}
}
}
if
(
modifyValueOnTranslation
&&
(!
continuous
||
trackTranslationContinuously
))
{
if
(
modifyValueOnTranslation
&&
(!
continuous
||
trackTranslationContinuously
))
{
if
(!
Double
.
isNaN
(
this
.
stepSize
))
{
if
(!
Double
.
isNaN
(
this
.
stepSize
))
{
...
...
CPS/src/lu/list/itis/dkd/tui/widget/builder/BasePositionWidgetBuilder.java
View file @
fb7319e9
...
@@ -33,6 +33,7 @@ public abstract class BasePositionWidgetBuilder<B extends BasePositionWidgetBuil
...
@@ -33,6 +33,7 @@ public abstract class BasePositionWidgetBuilder<B extends BasePositionWidgetBuil
public
boolean
trackRotationContinuously
;
public
boolean
trackRotationContinuously
;
public
boolean
trackTranslationContinuously
;
public
boolean
trackTranslationContinuously
;
public
double
stepSize
;
public
double
stepSize
;
public
double
angularStepSize
;
// ***************************************************************************
// ***************************************************************************
// * Constants *
// * Constants *
...
@@ -44,7 +45,8 @@ public abstract class BasePositionWidgetBuilder<B extends BasePositionWidgetBuil
...
@@ -44,7 +45,8 @@ public abstract class BasePositionWidgetBuilder<B extends BasePositionWidgetBuil
// ***************************************************************************
// ***************************************************************************
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
protected
BasePositionWidgetBuilder
()
{}
protected
BasePositionWidgetBuilder
()
{
}
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
...
@@ -73,6 +75,7 @@ public abstract class BasePositionWidgetBuilder<B extends BasePositionWidgetBuil
...
@@ -73,6 +75,7 @@ public abstract class BasePositionWidgetBuilder<B extends BasePositionWidgetBuil
this
.
trackRotationContinuously
=
BootstrappingUtils
.
getContentAsBoolean
(
rootElement
,
CpsNamespace
.
TRACK_ROTATION_CONTINUOUSLY_NODE
,
BootstrappingUtils
.
OPTIONAL
,
false
,
context
);
this
.
trackRotationContinuously
=
BootstrappingUtils
.
getContentAsBoolean
(
rootElement
,
CpsNamespace
.
TRACK_ROTATION_CONTINUOUSLY_NODE
,
BootstrappingUtils
.
OPTIONAL
,
false
,
context
);
this
.
trackTranslationContinuously
=
BootstrappingUtils
.
getContentAsBoolean
(
rootElement
,
CpsNamespace
.
TRACK_TRANSLATION_CONTINUOUSLY_NODE
,
BootstrappingUtils
.
OPTIONAL
,
false
,
context
);
this
.
trackTranslationContinuously
=
BootstrappingUtils
.
getContentAsBoolean
(
rootElement
,
CpsNamespace
.
TRACK_TRANSLATION_CONTINUOUSLY_NODE
,
BootstrappingUtils
.
OPTIONAL
,
false
,
context
);
this
.
stepSize
=
BootstrappingUtils
.
getContentAsDouble
(
rootElement
,
CpsNamespace
.
STEP_SIZE_NODE
,
BootstrappingUtils
.
OPTIONAL
,
Double
.
NaN
,
context
);
this
.
stepSize
=
BootstrappingUtils
.
getContentAsDouble
(
rootElement
,
CpsNamespace
.
STEP_SIZE_NODE
,
BootstrappingUtils
.
OPTIONAL
,
Double
.
NaN
,
context
);
this
.
angularStepSize
=
BootstrappingUtils
.
getContentAsRadians
(
rootElement
,
CpsNamespace
.
ANGULAR_STEP_SIZE_NODE
,
BootstrappingUtils
.
OPTIONAL
,
Double
.
NaN
,
context
);
}
}
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
...
...
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