Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
TULIP
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
14
Issues
14
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
NUI
TULIP
Commits
fc0ba325
Commit
fc0ba325
authored
Oct 29, 2015
by
Eric Tobias
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2.1.2 - Fixed issue with cursors and blobs not being removed from the spatial matrix correctly.
parent
e5fe468b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
12 deletions
+21
-12
TULIP/src/lu/list/itis/dkd/tui/adapter/TuioAdapter.java
TULIP/src/lu/list/itis/dkd/tui/adapter/TuioAdapter.java
+7
-1
TULIP/src/lu/list/itis/dkd/tui/space/SpatialPositioningManager.java
...lu/list/itis/dkd/tui/space/SpatialPositioningManager.java
+14
-11
No files found.
TULIP/src/lu/list/itis/dkd/tui/adapter/TuioAdapter.java
View file @
fc0ba325
...
@@ -379,8 +379,14 @@ public class TuioAdapter extends TuiAdapter implements TuioListener {
...
@@ -379,8 +379,14 @@ public class TuioAdapter extends TuiAdapter implements TuioListener {
tangibleObjectList
.
remove
(
object
.
getObjectId
(),
object
);
tangibleObjectList
.
remove
(
object
.
getObjectId
(),
object
);
logInfo
(
object
,
"up"
);
//$NON-NLS-1$
logInfo
(
object
,
"up"
);
//$NON-NLS-1$
synchronized
(
this
)
{
synchronized
(
this
)
{
objectManager
.
liftObject
(
object
);
/**
* Note that the order is important. As blobs and cursors are added even if they are not
* predefined, removing them by calling the lift function before notifying listeners
* will result in the notification to be aborted prematurely (as the associated widget
* cannot be found). This would lead to unexpected behaviour.
*/
notifyListeners
(
new
SpatialEvent
(
object
,
object
.
getPosition
(),
SpatialEventType
.
REMOVE
));
notifyListeners
(
new
SpatialEvent
(
object
,
object
.
getPosition
(),
SpatialEventType
.
REMOVE
));
objectManager
.
liftObject
(
object
);
}
}
}
}
...
...
TULIP/src/lu/list/itis/dkd/tui/space/SpatialPositioningManager.java
View file @
fc0ba325
...
@@ -43,7 +43,7 @@ import java.util.logging.Logger;
...
@@ -43,7 +43,7 @@ import java.util.logging.Logger;
*
*
* @author Eric Tobias [eric.tobias@list.lu]
* @author Eric Tobias [eric.tobias@list.lu]
* @since 2.1
* @since 2.1
* @version 2.1.
0
* @version 2.1.
2
*/
*/
public
class
SpatialPositioningManager
implements
SpatialEventListener
{
public
class
SpatialPositioningManager
implements
SpatialEventListener
{
...
@@ -127,15 +127,18 @@ public class SpatialPositioningManager implements SpatialEventListener {
...
@@ -127,15 +127,18 @@ public class SpatialPositioningManager implements SpatialEventListener {
logger
.
log
(
Level
.
SEVERE
,
"Spatial event type \""
+
event
.
getType
()
+
"\" not recognized!"
);
//$NON-NLS-1$ //$NON-NLS-2$
logger
.
log
(
Level
.
SEVERE
,
"Spatial event type \""
+
event
.
getType
()
+
"\" not recognized!"
);
//$NON-NLS-1$ //$NON-NLS-2$
break
;
break
;
}
}
// System.out.println(spatialMatrix.printLists());
System
.
out
.
println
(
spatialMatrix
.
printLists
());
// System.out.println("Left of " + event.getSource().getObjectId() + ": " +
System
.
out
.
println
(
"Left of "
+
event
.
getSource
().
getObjectId
()
+
": "
+
// spatialMatrix.leftOf(event.getSource().getObjectId())); //$NON-NLS-1$ //$NON-NLS-2$
spatialMatrix
.
leftOf
(
event
.
getSource
().
getObjectId
()));
// $NON-NLS-1$
// System.out.println("Right of " + event.getSource().getObjectId() + ": " +
// //$NON-NLS-2$
// spatialMatrix.rightOf(event.getSource().getObjectId())); //$NON-NLS-1$ //$NON-NLS-2$
System
.
out
.
println
(
"Right of "
+
event
.
getSource
().
getObjectId
()
+
": "
+
// System.out.println("Above " + event.getSource().getObjectId() + ": " +
spatialMatrix
.
rightOf
(
event
.
getSource
().
getObjectId
()));
// $NON-NLS-1$
// spatialMatrix.above(event.getSource().getObjectId())); //$NON-NLS-1$ //$NON-NLS-2$
// //$NON-NLS-2$
// System.out.println("Below " + event.getSource().getObjectId() + ": " +
System
.
out
.
println
(
"Above "
+
event
.
getSource
().
getObjectId
()
+
": "
+
// spatialMatrix.below(event.getSource().getObjectId())); //$NON-NLS-1$ //$NON-NLS-2$
spatialMatrix
.
above
(
event
.
getSource
().
getObjectId
()));
// $NON-NLS-1$
// //$NON-NLS-2$
System
.
out
.
println
(
"Below "
+
event
.
getSource
().
getObjectId
()
+
": "
+
spatialMatrix
.
below
(
event
.
getSource
().
getObjectId
()));
// $NON-NLS-1$
// //$NON-NLS-2$
}
}
}
}
\ No newline at end of file
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