xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #697 Fixed recycling of grid vector resource, and made cursor change when drawing and only send clear_all if session leader

Browse source 
Change-Id: I78fbb17c7513e881ddf47d0bcd0ce8333e5740ff

Former-commit-id: 74b2579091 [formerly 9d96a272ec] [formerly e10ece6081] [formerly 048484f689 [formerly e10ece6081 [formerly 08d8389ea3b23e7fe209d12ff45275f86d3c5883]]]
Former-commit-id: 048484f689
Former-commit-id: 59103a0ff7438a9a26c1fc5ba0937180579bbe64 [formerly 7df41dbc88]
Former-commit-id: 6e55d73543
This commit is contained in:
Max Schenkelberg 2012-06-07 10:25:03 -05:00
parent e215aa65cb
commit 9a15a558d4
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/telestrator/CollaborationDrawingResource.java
View file

@ -131,10 +131,12 @@ public class CollaborationDrawingResource extends
ColorableCapability colorable = getCapability(ColorableCapability.class);
colorable.setSuppressingMenuItems(true);
CollaborationDrawingEvent event = new CollaborationDrawingEvent();
event.setUserName(myUser);
event.setType(CollaborationEventType.CLEAR_ALL);
sendEvent(event);
if (isSessionLeader()) {
CollaborationDrawingEvent event = new CollaborationDrawingEvent();
event.setUserName(myUser);
event.setType(CollaborationEventType.CLEAR_ALL);
sendEvent(event);
}
}
manager = new CollaborationDrawingUIManager(this);

2
cave/com.raytheon.uf.viz.drawing/src/com/raytheon/uf/viz/drawing/DrawingToolUIManager.java
View file

@ -200,7 +200,7 @@ public class DrawingToolUIManager extends InputAdapter {
}
protected boolean canTellestrate(int mouseButton) {
return handlingInput == false && mouseButton == 1
return handlingInput == false && mouseButton <= 1
&& drawingLayer.getDrawMode() != DrawMode.NONE;
}
}

1
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/AbstractMapVectorResource.java
View file

@ -843,6 +843,7 @@ public abstract class AbstractMapVectorResource extends
}
getDataObjectMap().clear();
retrievedAllData = false;
}
/*