Changeset 1495 for trunk

Timestamp:

04/11/14 11:22:26 (10 years ago)

Author:

pharms

Message:

• state of the HCSE 2014 Paper. An appropriate tag will follow.

Location:

trunk/autoquest-ui-swt

Files:

• .classpath (modified) (1 diff)
• pom.xml (modified) (1 diff)
• src/main/java/de/ugoe/cs/autoquest/ui/swt/MainWindow.java (modified) (4 diffs)
• src/main/java/de/ugoe/cs/autoquest/ui/swt/ShowTaskTreeDialog.java (modified) (4 diffs)
• src/main/java/de/ugoe/cs/autoquest/ui/swt/ShowUsabilityEvaluationResultDialog.java (added)
• src/main/java/de/ugoe/cs/autoquest/ui/swt/UsabilityTabComposite.java (added)
• src/main/java/de/ugoe/cs/autoquest/ui/swt/VisualizationUtils.java (modified) (4 diffs)

trunk/autoquest-ui-swt/.classpath

@@ -2 +2 @@
 <classpath>
         <classpathentry kind="src" output="target/classes" path="src/main/java">
-                <attributes>
-                        <attribute name="optional" value="true"/>
-                        <attribute name="maven.pomderived" value="true"/>
-                </attributes>
-        </classpathentry>
-        <classpathentry kind="src" output="target/test-classes" path="src/test/java">
                 <attributes>
                         <attribute name="optional" value="true"/>

trunk/autoquest-ui-swt/pom.xml

@@ -51 +51 @@
             <groupId>de.ugoe.cs.autoquest</groupId>
             <artifactId>autoquest-core-tasktrees</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>de.ugoe.cs.autoquest</groupId>
+            <artifactId>autoquest-core-usability</artifactId>
             <version>${project.parent.version}</version>
         </dependency>

trunk/autoquest-ui-swt/src/main/java/de/ugoe/cs/autoquest/ui/swt/MainWindow.java

@@ -53 +53 @@
     protected TabItem modelsTab;
     protected TabItem guiModelsTab;
+    protected TabItem usabilityTab;
     protected TabItem dataTab;
     protected ConsoleTabComposite consoleTabComposite;
@@ -58 +59 @@
     protected ModelsTabComposite modelsTabComposite;
     protected GuiModelTabComposite guiModelTabComposite;
+    protected UsabilityTabComposite usabilityTabComposite;
     protected DataTabComposite dataTabComposite;
 
@@ -221 +223 @@
                     guiModelTabComposite.updateModelList();
                 }
+                else if (e.item == usabilityTab) {
+                    usabilityTabComposite.updateResultList();
+                }
                 else if (e.item == dataTab) {
                     dataTabComposite.updateDataList();
@@ -252 +257 @@
         guiModelsTab.setControl(guiModelTabComposite);
 
+        usabilityTab = new TabItem(tabFolder, SWT.NONE);
+        usabilityTab.setText("Usability Evaluation Results");
+
+        usabilityTabComposite = new UsabilityTabComposite(tabFolder, SWT.NO_BACKGROUND);
+        usabilityTab.setControl(usabilityTabComposite);
+
         dataTab = new TabItem(tabFolder, SWT.NONE);
         dataTab.setText("Data");

trunk/autoquest-ui-swt/src/main/java/de/ugoe/cs/autoquest/ui/swt/ShowTaskTreeDialog.java

@@ -91 +91 @@
 
     /** the tree of involved GUI elements of a specific task on the right bottom */
-    private Tree involvedGUIElementsTree;
+    private Tree involvedTargetsTree;
 
     /** the table containing the parents tasks of a displayed task */
@@ -363 +363 @@
         });
         
-        involvedGUIElementsTree =
-            VisualizationUtils.createGUIElementsTree(detailsBottomSashForm, "involved GUI elements");
+        involvedTargetsTree =
+            VisualizationUtils.createTargetsTree(detailsBottomSashForm, "involved GUI elements");
         
         detailsBottomSashForm.setWeights(new int[] { 2, 3 });
@@ -502 +502 @@
         taskDetailsTree.removeAll();
         executionVariantsTree.removeAll();
-        involvedGUIElementsTree.removeAll();
+        involvedTargetsTree.removeAll();
         parentTasks.removeAll();
     }
@@ -549 +549 @@
         VisualizationUtils.updateColumnWidths(parentTasks);
         
-        VisualizationUtils.addInvolvedTargets(involvedGUIElementsTree, task);
+        VisualizationUtils.addInvolvedTargets(involvedTargetsTree, task);
     }
 

trunk/autoquest-ui-swt/src/main/java/de/ugoe/cs/autoquest/ui/swt/VisualizationUtils.java

@@ -23 +23 @@
 import org.eclipse.swt.events.MenuEvent;
 import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
@@ -53 +54 @@
 class VisualizationUtils {
     
-
     /**
      *
@@ -156 +156 @@
      *
      */
-    static Tree createGUIElementsTree(Composite  parent, String name) {
-        Tree tree = new Tree(parent, SWT.BORDER | SWT.SINGLE);
+    static Tree createTargetsTree(Composite  parent, String name) {
+        Tree tree = new Tree(parent, SWT.BORDER | SWT.MULTI);
         tree.setHeaderVisible(true);
         
@@ -307 +307 @@
      *
      */
+    static void addInvolvedTargetsHighlighting(final Tree tasks, final Tree involvedTargetsTree) {
+        tasks.addSelectionListener(new SelectionAdapter() {
+            @Override
+            public void widgetSelected(SelectionEvent e) {
+                TreeItem[] selectedItems = tasks.getSelection();
+                if ((selectedItems.length == 1) &&
+                    (selectedItems[0].getData() instanceof ITask))
+                {
+                    highlightInvolvedTargets
+                        ((ITask) selectedItems[0].getData(), involvedTargetsTree);
+                }
+            }
+        });
+
+    }
+
+    /**
+     *
+     */
+    static void highlightInvolvedTargets(ITask task, Tree involvedTargetsTree) {
+        List<IEventTarget> targets = new ArrayList<IEventTarget>();
+        getInvolvedTargets(task, targets);
+        
+        List<TreeItem> itemsToSelect = new LinkedList<TreeItem>();
+        List<TreeItem> candidateItems = new LinkedList<TreeItem>();
+        
+        for (TreeItem item : involvedTargetsTree.getItems()) {
+            candidateItems.add(item);
+        }
+        
+        while (candidateItems.size() > 0) {
+            TreeItem candidate = candidateItems.remove(0);
+            
+            if (targets.contains(candidate.getData())) {
+                itemsToSelect.add(candidate);
+            }
+            
+            for (TreeItem child : candidate.getItems()) {
+                candidateItems.add(child);
+            }
+        }
+        
+        involvedTargetsTree.setSelection
+            (itemsToSelect.toArray(new TreeItem[itemsToSelect.size()]));
+    }
+
+    /**
+     *
+     */
     static void addExpansionListener(Tree tree, Listener listener) {
         Listener[] listeners = tree.getListeners(SWT.Expand);