Changeset 1042 for trunk

Timestamp:

01/24/13 18:20:26 (12 years ago)

Author:

pharms

Message:

• added detection of double clicks

Location:

trunk

Files:

• autoquest-core-events-test/src/test/java/de/ugoe/cs/autoquest/eventcore/gui/MouseClickCondenserTest.java (modified) (4 diffs)
• autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/gui/MouseClickCondenser.java (modified) (9 diffs)

trunk/autoquest-core-events-test/src/test/java/de/ugoe/cs/autoquest/eventcore/gui/MouseClickCondenserTest.java

@@ -161 +161 @@
 
         simulateEvent(new MouseButtonDown(leftBtn, 0, 0), element1);
-        simulateEvent(new MouseButtonUp(leftBtn, 1, 0), element1);
+        simulateEvent(new MouseButtonUp(leftBtn, 5, 0), element1);
         assertCondensedMouseClicks("drag left elem1");
 
         simulateEvent(new MouseButtonDown(leftBtn, 0, 0), element1);
-        simulateEvent(new MouseButtonUp(leftBtn, 1, 1), element1);
+        simulateEvent(new MouseButtonUp(leftBtn, 5, 5), element1);
         assertCondensedMouseClicks("drag left elem1", "drag left elem1");
 
         simulateEvent(new MouseButtonDown(leftBtn, 0, 0), element1);
-        simulateEvent(new MouseButtonUp(leftBtn, 0, 1), element1);
+        simulateEvent(new MouseButtonUp(leftBtn, 0, 5), element1);
         simulateEvent(new MouseClick(leftBtn, 0, 0), element1);
         assertCondensedMouseClicks("drag left elem1", "drag left elem1", "drag left elem1",
                                    "click left elem1");
 
-        simulateEvent(new MouseButtonDown(middleBtn, 1, 0), element1);
+        simulateEvent(new MouseButtonDown(middleBtn, 5, 0), element1);
         simulateEvent(new MouseButtonUp(middleBtn, 0, 0), element1);
         simulateEvent(new MouseClick(middleBtn, 0, 0), element1);
@@ -180 +180 @@
                                    "click left elem1", "", "", "click middle elem1");
 
-        simulateEvent(new MouseButtonDown(rightBtn, 0, 1), element1);
+        simulateEvent(new MouseButtonDown(rightBtn, 0, 5), element1);
         simulateEvent(new MouseButtonUp(rightBtn, 0, 0), element1);
         simulateEvent(new MouseClick(rightBtn, 0, 0), element1);
@@ -191 +191 @@
      *
      */
+    @Test
+    public void testDoubleClick() {
+        MouseButtonInteraction.Button leftBtn = MouseButtonInteraction.Button.LEFT;
+        MouseButtonInteraction.Button rightBtn = MouseButtonInteraction.Button.RIGHT;
+
+        IGUIElement element1 = new DummyGUIElement("elem1");
+
+        simulateEventWithTimestamp(new MouseClick(leftBtn, 0, 0), element1);
+        simulateEventWithTimestamp(new MouseClick(leftBtn, 0, 0), element1);
+        assertCondensedMouseClicks("dblclick left elem1");
+
+        simulateEventWithTimestamp(new MouseButtonDown(leftBtn, 5, 5), element1);
+        simulateEventWithTimestamp(new MouseButtonUp(leftBtn, 5, 5), element1);
+        simulateEventWithTimestamp(new MouseButtonDown(leftBtn, 5, 5), element1);
+        simulateEventWithTimestamp(new MouseButtonUp(leftBtn, 5, 5), element1);
+        assertCondensedMouseClicks("dblclick left elem1", "dblclick left elem1");
+
+        simulateEventWithTimestamp(new MouseClick(leftBtn, 0, 0), element1);
+        simulateEventWithTimestamp(new MouseClick(leftBtn, 5, 5), element1);
+        assertCondensedMouseClicks("dblclick left elem1", "dblclick left elem1",
+                                   "click left elem1", "click left elem1");
+
+        simulateEventWithTimestamp(new MouseButtonDown(leftBtn, 0, 0), element1);
+        simulateEventWithTimestamp(new MouseButtonUp(leftBtn, 0, 0), element1);
+        simulateEventWithTimestamp(new MouseButtonDown(leftBtn, 5, 5), element1);
+        simulateEventWithTimestamp(new MouseButtonUp(leftBtn, 5, 5), element1);
+        assertCondensedMouseClicks("dblclick left elem1", "dblclick left elem1",
+                                   "click left elem1", "click left elem1",
+                                   "click left elem1", "click left elem1");
+
+        simulateEventWithTimestamp(new MouseClick(rightBtn, 0, 0), element1);
+        simulateEventWithTimestamp(new MouseClick(rightBtn, 5, 5), element1);
+        assertCondensedMouseClicks("dblclick left elem1", "dblclick left elem1",
+                                   "click left elem1", "click left elem1",
+                                   "click left elem1", "click left elem1",
+                                   "click right elem1", "click right elem1");
+
+        simulateEventWithTimestamp(new MouseButtonDown(rightBtn, 0, 0), element1);
+        simulateEventWithTimestamp(new MouseButtonUp(rightBtn, 0, 0), element1);
+        simulateEventWithTimestamp(new MouseButtonDown(rightBtn, 5, 5), element1);
+        simulateEventWithTimestamp(new MouseButtonUp(rightBtn, 5, 5), element1);
+        assertCondensedMouseClicks("dblclick left elem1", "dblclick left elem1",
+                                   "click left elem1", "click left elem1",
+                                   "click left elem1", "click left elem1",
+                                   "click right elem1", "click right elem1",
+                                   "click right elem1", "click right elem1");
+
+    }
+
+    /**
+     *
+     */
     private void simulateEvent(IEventType eventType, IGUIElement guiElement) {
         events.add(new Event(eventType, guiElement));
+    }
+
+    /**
+     *
+     */
+    private void simulateEventWithTimestamp(IEventType eventType, IGUIElement guiElement) {
+        Event event = new Event(eventType, guiElement);
+        event.setTimestamp(System.currentTimeMillis());
+        events.add(event);
     }
 
@@ -214 +275 @@
                     assertTrue(result.get(i).getType() instanceof MouseClick);
                 }
+                else if ("dblclick".equals(parts[0])) {
+                    assertTrue(result.get(i).getType() instanceof MouseDoubleClick);
+                }
                 else if ("drag".equals(parts[0])) {
                     assertTrue(result.get(i).getType() instanceof MouseDragAndDrop);

trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/gui/MouseClickCondenser.java

@@ -72 +72 @@
                 }
                 else if (mouseClickSequenceFound(mbDown, mbUp)) {
-                    // skip the mouse button down and mouse button up event and add a mouse click
+                    // replace the mouse button down and mouse button up event with a generated
+                    // mouse click
                     index += 2;
                     resultingSequence.add(createClick(mbDown, mbUp));
@@ -78 +79 @@
                 }
                 else if (mouseDragAndDropSequenceFound(mbDown, mbUp)) {
-                    // skip the mouse button down and mouse button up event and add a mouse click
+                    // replace the mouse button down and mouse button up event with a generated
+                    // mouse drag and drop
                     index += 2;
                     resultingSequence.add(createDragAndDrop(mbDown, mbUp));
                     mouseClickHandled = true;
                 }
+                else if (mouseDoubleClickSequenceFound(mbDown, mbUp)) {
+                    // replace the two mouse click events with a generated mouse double click
+                    index += 2;
+                    resultingSequence.add(createDoubleClick(mbDown, mbUp));
+                    mouseClickHandled = true;
+                }
             }
 
@@ -88 +96 @@
                 resultingSequence.add(sequence.get(index));
                 index++;
+            }
+            
+            if (resultingSequence.size() > 1) {
+                // check for double clicks
+                int resultingSequenceIndex = resultingSequence.size() - 1;
+                Event click1 = resultingSequence.get(resultingSequenceIndex - 1);
+                Event click2 = resultingSequence.get(resultingSequenceIndex);
+                if (mouseDoubleClickSequenceFound(click1, click2)) {
+                    resultingSequence.remove(resultingSequenceIndex);
+                    resultingSequence.remove(resultingSequenceIndex - 1);
+                    resultingSequence.add(createDoubleClick(click1, click2));
+                }
             }
         }
@@ -195 +215 @@
 
     /**
+     * 
+     */
+    private boolean mouseDoubleClickSequenceFound(Event click1,
+                                                  Event click2)
+    {
+        // check the first in a row of three for validity
+        if (!(click1.getType() instanceof MouseClick)) {
+            return false;
+        }
+
+        if (((MouseClick) click1.getType()).getButton() != MouseButtonInteraction.Button.LEFT) {
+            return false;
+        }
+        
+        // check the second node for validity
+        if (!(click2.getType() instanceof MouseClick)) {
+            return false;
+        }
+
+        // use 500 milliseconds as timestamp difference as this is more or less similar to default
+        // values in Microsoft Windows 
+        if (!timestampDifferenceSmallerThan(click1, click2, 500)) {
+            return false;
+        }
+        
+        if (!targetsEqual(click1, click2)) {
+            return false;
+        }
+
+        if (!buttonsEqual(click1, click2)) {
+            return false;
+        }
+
+        if (!coordinatesEqual(click1, click2)) {
+            return false;
+        }
+        
+        return true;
+    }
+
+    /**
      *
      */
@@ -204 +265 @@
         int y = ((MouseButtonDown) mouseButtonDown.getType()).getY();
 
-        return new Event(new MouseClick(button, x, y), mouseButtonDown.getTarget());
+        Event click = new Event(new MouseClick(button, x, y), mouseButtonDown.getTarget());
+        click.setTimestamp(mouseButtonDown.getTimestamp());
+        return click;
+    }
+
+    /**
+     *
+     */
+    private Event createDoubleClick(Event click1, Event click2) {
+        MouseButtonInteraction.Button button = ((MouseClick) click1.getType()).getButton();
+       
+        int x = ((MouseClick) click1.getType()).getX();
+        int y = ((MouseClick) click1.getType()).getY();
+
+        Event doubleClick = new Event(new MouseDoubleClick(button, x, y), click1.getTarget());
+        doubleClick.setTimestamp(click1.getTimestamp());
+        return doubleClick;
     }
 
@@ -216 +293 @@
         int yEnd = ((MouseButtonUp) mouseButtonUp.getType()).getY();
 
-        return new Event
+        Event dragAndDrop = new Event
             (new MouseDragAndDrop(xStart, yStart, xEnd, yEnd), mouseButtonDown.getTarget());
+        
+        dragAndDrop.setTimestamp(mouseButtonDown.getTimestamp());
+        return dragAndDrop;
     }
 
@@ -248 +328 @@
      *
      */
+    private boolean timestampDifferenceSmallerThan(Event event1, Event event2, long difference) {
+        long timestamp1 = event1.getTimestamp();
+        
+        if (timestamp1 < 0) {
+            return false;
+        }
+        
+        long timestamp2 = event2.getTimestamp();
+        
+        if (timestamp2 < 0) {
+            return false;
+        }
+        
+        return (Math.abs((timestamp2 - timestamp1))) < difference;
+    }
+
+    /**
+     *
+     */
     private boolean coordinatesEqual(Event event1, Event event2) {
         int x1 =
@@ -256 +355 @@
             (event2.getType() instanceof MouseButtonInteraction) ?
                 ((MouseButtonInteraction) event2.getType()).getX() : -1;
-                
-        if ((x1 == -1) || (x1 != x2)) {
+        
+        // allow a deviation of one pixel to identify it as click anyway
+        if ((x1 == -1) || (x2 == -1) || (x2 < (x1 - 1)) || ((x1 + 1) < x2)) {
             return false;
         }
@@ -269 +369 @@
                 ((MouseButtonInteraction) event2.getType()).getY() : -1;
 
-        return (y1 != -1) && (y1 == y2);
+        return (y1 != -1) && (y2 != -1) && ((y1 - 1) < y2) && (y2 < (y1 + 1));
    }