deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

added faster method to move motes

Browse source
This commit is contained in:
fros4943 2007-01-29 14:30:09 +00:00
parent 7aad5bd907
commit 220fabaef6
1 changed files with 29 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
tools/cooja/java/se/sics/cooja/plugins/Visualizer2D.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: Visualizer2D.java,v 1.3 2007/01/09 09:49:24 fros4943 Exp $ * $Id: Visualizer2D.java,v 1.4 2007/01/29 14:30:09 fros4943 Exp $
*/ */
package se.sics.cooja.plugins; package se.sics.cooja.plugins;
@ -75,6 +75,7 @@ public abstract class Visualizer2D extends VisPlugin {
private static final int MOTE_RADIUS = 8; private static final int MOTE_RADIUS = 8;
private boolean moteIsBeingMoved = false; private boolean moteIsBeingMoved = false;
private long moteMoveBeginTime = -1;
private Mote moteToMove = null; private Mote moteToMove = null;
private Cursor moveCursor = new Cursor(Cursor.MOVE_CURSOR); private Cursor moveCursor = new Cursor(Cursor.MOVE_CURSOR);
@ -95,6 +96,7 @@ public abstract class Visualizer2D extends VisPlugin {
return "Move " + mote; return "Move " + mote;
} }
public void doAction(Mote mote) { public void doAction(Mote mote) {
moteMoveBeginTime = -1;
beginMoveRequest(mote); beginMoveRequest(mote);
} }
}; };
@ -175,8 +177,9 @@ public abstract class Visualizer2D extends VisPlugin {
public void mousePressed(MouseEvent e) { public void mousePressed(MouseEvent e) {
if (e.isPopupTrigger()) if (e.isPopupTrigger())
myPlugin.handlePopupRequest(e.getPoint().x, e.getPoint().y); myPlugin.handlePopupRequest(e.getPoint().x, e.getPoint().y);
else { else if (SwingUtilities.isLeftMouseButton(e)){
myPlugin.handleMoveRequest(e.getPoint().x, e.getPoint().y, false); //myPlugin.handleMoveRequest(e.getPoint().x, e.getPoint().y, false);
beginMoveRequest(e.getPoint().x, e.getPoint().y);
} }
} }
public void mouseReleased(MouseEvent e) { public void mouseReleased(MouseEvent e) {
@ -287,6 +290,15 @@ public abstract class Visualizer2D extends VisPlugin {
pickMoteMenu.setVisible(true); pickMoteMenu.setVisible(true);
} }
private void beginMoveRequest(final int x, final int y) {
final Vector<Mote> foundMotes = findMotesAtPosition(x, y);
if (foundMotes == null || foundMotes.size() == 0)
return;
moteMoveBeginTime = System.currentTimeMillis();
beginMoveRequest(foundMotes.get(0));
}
private void beginMoveRequest(Mote moteToMove) { private void beginMoveRequest(Mote moteToMove) {
moteIsBeingMoved = true; moteIsBeingMoved = true;
this.moteToMove = moteToMove; this.moteToMove = moteToMove;
@ -295,6 +307,7 @@ public abstract class Visualizer2D extends VisPlugin {
private void handleMoveRequest(final int x, final int y, private void handleMoveRequest(final int x, final int y,
boolean wasJustReleased) { boolean wasJustReleased) {
if (!moteIsBeingMoved) { if (!moteIsBeingMoved) {
return; return;
} }
@ -310,19 +323,22 @@ public abstract class Visualizer2D extends VisPlugin {
moteIsBeingMoved = false; moteIsBeingMoved = false;
Position newXYValues = transformPixelToPositon(new Point(x, y)); Position newXYValues = transformPixelToPositon(new Point(x, y));
int returnValue = JOptionPane.showConfirmDialog(myPlugin, "Mote mote to"
+ "\nX=" + newXYValues.getXCoordinate() + "\nY="
+ newXYValues.getYCoordinate() + "\nZ="
+ moteToMove.getInterfaces().getPosition().getZCoordinate());
if (returnValue == JOptionPane.OK_OPTION) { if (moteMoveBeginTime <= 0 || System.currentTimeMillis() - moteMoveBeginTime > 300) {
moteToMove.getInterfaces().getPosition().setCoordinates( int returnValue = JOptionPane.showConfirmDialog(myPlugin, "Mote mote to"
newXYValues.getXCoordinate(), newXYValues.getYCoordinate(), + "\nX=" + newXYValues.getXCoordinate() + "\nY="
moteToMove.getInterfaces().getPosition().getZCoordinate()); + newXYValues.getYCoordinate() + "\nZ="
+ moteToMove.getInterfaces().getPosition().getZCoordinate());
if (returnValue == JOptionPane.OK_OPTION) {
moteToMove.getInterfaces().getPosition().setCoordinates(
newXYValues.getXCoordinate(), newXYValues.getYCoordinate(),
moteToMove.getInterfaces().getPosition().getZCoordinate());
}
} }
moteMoveBeginTime = -1;
moteToMove = null; moteToMove = null;
repaint(); repaint();
} }
/** /**