Index: trunk/autoquest-ui-swt/src/main/java/de/ugoe/cs/autoquest/ui/swt/GuiModelTabComposite.java =================================================================== --- trunk/autoquest-ui-swt/src/main/java/de/ugoe/cs/autoquest/ui/swt/GuiModelTabComposite.java (revision 2160) +++ trunk/autoquest-ui-swt/src/main/java/de/ugoe/cs/autoquest/ui/swt/GuiModelTabComposite.java (revision 2168) @@ -15,4 +15,7 @@ package de.ugoe.cs.autoquest.ui.swt; + +import java.util.Collections; +import java.util.LinkedList; import org.eclipse.swt.SWT; @@ -112,8 +115,17 @@ public void updateModelList() { guiModelList.removeAll(); - for(String key : GlobalDataContainer.getInstance().getAllKeys()) { - if( GlobalDataContainer.getInstance().getData(key) instanceof IHierarchicalEventTargetModel ) { - guiModelList.add(key); + + java.util.List guiModels = new LinkedList<>(); + + for (String key : GlobalDataContainer.getInstance().getAllKeys()) { + if (GlobalDataContainer.getInstance().getData(key) instanceof IHierarchicalEventTargetModel) { + guiModels.add(key); } + } + + Collections.sort(guiModels); + + for (String entry : guiModels) { + guiModelList.add(entry); } } Index: trunk/autoquest-ui-swt/src/main/java/de/ugoe/cs/autoquest/ui/swt/ModelsTabComposite.java =================================================================== --- trunk/autoquest-ui-swt/src/main/java/de/ugoe/cs/autoquest/ui/swt/ModelsTabComposite.java (revision 2160) +++ trunk/autoquest-ui-swt/src/main/java/de/ugoe/cs/autoquest/ui/swt/ModelsTabComposite.java (revision 2168) @@ -15,4 +15,7 @@ package de.ugoe.cs.autoquest.ui.swt; +import java.util.Collections; +import java.util.LinkedList; + import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; @@ -289,10 +292,19 @@ public void updateModelList() { modelList.removeAll(); + + java.util.List models = new LinkedList<>(); + for (String key : GlobalDataContainer.getInstance().getAllKeys()) { if ((GlobalDataContainer.getInstance().getData(key) instanceof IStochasticProcess) || (GlobalDataContainer.getInstance().getData(key) instanceof ITaskModel)) { - modelList.add(key); - } + models.add(key); + } + } + + Collections.sort(models); + + for (String entry : models) { + modelList.add(entry); } } Index: trunk/autoquest-ui-swt/src/main/java/de/ugoe/cs/autoquest/ui/swt/SequencesTabComposite.java =================================================================== --- trunk/autoquest-ui-swt/src/main/java/de/ugoe/cs/autoquest/ui/swt/SequencesTabComposite.java (revision 2160) +++ trunk/autoquest-ui-swt/src/main/java/de/ugoe/cs/autoquest/ui/swt/SequencesTabComposite.java (revision 2168) @@ -16,4 +16,7 @@ import org.eclipse.swt.widgets.Composite; + +import java.util.Collections; +import java.util.LinkedList; import org.eclipse.swt.SWT; @@ -144,8 +147,17 @@ public void updateSequenceList() { sequenceList.removeAll(); - for(String key : GlobalDataContainer.getInstance().getAllKeys()) { - if( SequenceInstanceOf.isCollectionOfSequences(GlobalDataContainer.getInstance().getData(key)) ) { - sequenceList.add(key); + + java.util.List sequences = new LinkedList<>(); + + for (String key : GlobalDataContainer.getInstance().getAllKeys()) { + if (SequenceInstanceOf.isCollectionOfSequences(GlobalDataContainer.getInstance().getData(key))) { + sequences.add(key); } + } + + Collections.sort(sequences); + + for (String entry : sequences) { + sequenceList.add(entry); } } Index: trunk/autoquest-ui-swt/src/main/java/de/ugoe/cs/autoquest/ui/swt/ShowGuiModelDialog.java =================================================================== --- trunk/autoquest-ui-swt/src/main/java/de/ugoe/cs/autoquest/ui/swt/ShowGuiModelDialog.java (revision 2160) +++ trunk/autoquest-ui-swt/src/main/java/de/ugoe/cs/autoquest/ui/swt/ShowGuiModelDialog.java (revision 2168) @@ -28,8 +28,7 @@ import org.eclipse.swt.widgets.TreeItem; +import de.ugoe.cs.autoquest.eventcore.HierarchicalEventTargetModel; import de.ugoe.cs.autoquest.eventcore.IHierarchicalEventTarget; import de.ugoe.cs.autoquest.eventcore.IHierarchicalEventTargetModel; -import de.ugoe.cs.autoquest.eventcore.guimodel.GUIModel; -import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement; import de.ugoe.cs.util.console.Console; @@ -91,10 +90,10 @@ btnCollapseAll.setText("Collapse all"); - if (model instanceof GUIModel) { + if (model instanceof HierarchicalEventTargetModel) { Button btnCondense = new Button(shell, SWT.NONE); btnCondense.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - ((GUIModel) model).condenseModel(); + ((HierarchicalEventTargetModel) model).condenseModel(); targetTree.removeAll(); buildTargetTree(); @@ -189,8 +188,8 @@ try { // try to merge the elements - IGUIElement firstElement = (IGUIElement) selectedNodes[0].getData(); + T firstElement = (T) selectedNodes[0].getData(); for( int i=1 ; i) model).mergeEventTargets + (firstElement, (T) selectedNodes[i].getData()); } } Index: trunk/autoquest-ui-swt/src/main/java/de/ugoe/cs/autoquest/ui/swt/ShowUsabilityEvaluationResultDialog.java =================================================================== --- trunk/autoquest-ui-swt/src/main/java/de/ugoe/cs/autoquest/ui/swt/ShowUsabilityEvaluationResultDialog.java (revision 2160) +++ trunk/autoquest-ui-swt/src/main/java/de/ugoe/cs/autoquest/ui/swt/ShowUsabilityEvaluationResultDialog.java (revision 2168) @@ -19,4 +19,5 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.LinkedList; @@ -37,9 +38,16 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.layout.RowLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Dialog; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Event; +import org.eclipse.swt.widgets.Group; +import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeColumn; @@ -51,4 +59,5 @@ import de.ugoe.cs.autoquest.tasktrees.treeifc.ITask; import de.ugoe.cs.autoquest.usability.UsabilitySmell; +import de.ugoe.cs.autoquest.usability.UsabilitySmell.ManualLabel; import de.ugoe.cs.autoquest.usability.UsabilitySmellIntensity; import de.ugoe.cs.autoquest.usability.UsabilityEvaluationResult; @@ -73,9 +82,18 @@ private StyledText description; - /** the tree of involved GUI elements of a specific task on the right bottom */ + /** the tree of involved GUI elements of a specific smell on the right */ private Tree involvedTargetsTree; - /** the table containing the parents tasks of a displayed task */ + /** the table containing the involved tasks of a displayed smell */ private Tree involvedTasks; + + /** the radio button group for assessing if a smell is true positive or not */ + private Group assessmentRadioButtons; + + /** the list of all different tags given for smells */ + private List existingTags = new LinkedList<>(); + + /** the parent of all check boxes for tag representation */ + private Composite tagCheckBoxParent; /** the displayed usability evaluation result */ @@ -96,4 +114,14 @@ setText("Usability Evaluation Result " + dataSetName); this.usabilityEvalResult = usabilityEvalResult; + + for (UsabilitySmell smell : usabilityEvalResult.getAllSmells()) { + for (String tag : smell.getTags()) { + if (!existingTags.contains(tag)) { + existingTags.add(tag); + } + } + } + + Collections.sort(existingTags); } @@ -168,16 +196,19 @@ } }); - + SashForm detailsSashForm = new SashForm(mainSashForm, SWT.VERTICAL); detailsSashForm.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1)); - description = new StyledText(detailsSashForm, SWT.READ_ONLY | SWT.BORDER | SWT.WRAP); + Composite descriptionComposite = new Composite(detailsSashForm, SWT.NONE); + descriptionComposite.setLayout(new GridLayout()); + + description = new StyledText(descriptionComposite, SWT.READ_ONLY | SWT.BORDER | SWT.WRAP); description.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1)); - SashForm detailsBottomSashForm = new SashForm(detailsSashForm, SWT.HORIZONTAL); - detailsBottomSashForm.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1)); + SashForm detailsTreesSashForm = new SashForm(detailsSashForm, SWT.HORIZONTAL); + detailsTreesSashForm.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1)); involvedTasks = VisualizationUtils.createTaskDetailsTree - (detailsBottomSashForm, "involved tasks", usabilityEvalResult.getTaskModel()); + (detailsTreesSashForm, "involved tasks", usabilityEvalResult.getTaskModel()); VisualizationUtils.addItemSpecificContextMenu @@ -198,9 +229,93 @@ involvedTargetsTree = - VisualizationUtils.createTargetsTree(detailsBottomSashForm, "involved GUI elements"); + VisualizationUtils.createTargetsTree(detailsTreesSashForm, "involved GUI elements"); VisualizationUtils.addInvolvedTargetsHighlighting(involvedTasks, involvedTargetsTree); - detailsBottomSashForm.setWeights(new int[] { 1, 1 }); + final Composite detailsAssessmentComposite = new Composite(descriptionComposite, SWT.NONE); + detailsAssessmentComposite.setLayoutData(new GridData(SWT.FILL, SWT.BOTTOM, true, false, 1, 1)); + detailsAssessmentComposite.setLayout(new GridLayout(5, false)); + + assessmentRadioButtons = new Group(detailsAssessmentComposite, SWT.NONE); + assessmentRadioButtons.setLayout(new RowLayout(SWT.HORIZONTAL)); + + final Button unassessedRadioButton = new Button(assessmentRadioButtons, SWT.RADIO); + unassessedRadioButton.setText("unassessed"); + unassessedRadioButton.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent event) { + TreeItem[] selectedItems = smellList.getSelection(); + if ((selectedItems.length == 1) && + (selectedItems[0].getData() instanceof UsabilitySmell)) + { + UsabilitySmell smell = (UsabilitySmell) selectedItems[0].getData(); + if (unassessedRadioButton.getSelection()) { + smell.setManualLabel(ManualLabel.UNCHECKED); + } + } + } + }); + + final Button falsePositiveRadioButton = new Button(assessmentRadioButtons, SWT.RADIO); + falsePositiveRadioButton.setText("false positive"); + falsePositiveRadioButton.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent event) { + TreeItem[] selectedItems = smellList.getSelection(); + if ((selectedItems.length == 1) && + (selectedItems[0].getData() instanceof UsabilitySmell)) + { + UsabilitySmell smell = (UsabilitySmell) selectedItems[0].getData(); + if (falsePositiveRadioButton.getSelection()) { + smell.setManualLabel(ManualLabel.FALSE_POSITIVE); + } + } + } + }); + + final Button truePositiveRadioButton = new Button(assessmentRadioButtons, SWT.RADIO); + truePositiveRadioButton.setText("true positive"); + truePositiveRadioButton.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent event) { + TreeItem[] selectedItems = smellList.getSelection(); + if ((selectedItems.length == 1) && + (selectedItems[0].getData() instanceof UsabilitySmell)) + { + UsabilitySmell smell = (UsabilitySmell) selectedItems[0].getData(); + if (truePositiveRadioButton.getSelection()) { + smell.setManualLabel(ManualLabel.TRUE_POSITIVE); + } + } + } + }); + + new Label(detailsAssessmentComposite, SWT.NONE).setText("Tags:"); + + tagCheckBoxParent = new Composite(detailsAssessmentComposite, SWT.NONE); + tagCheckBoxParent.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1)); + tagCheckBoxParent.setLayout(new RowLayout()); + + recreateTagsSashForm(); + + final Text addTagField = new Text(detailsAssessmentComposite, SWT.BORDER); + addTagField.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1)); + addTagField.setSize(addTagField.computeSize(100, 50)); + + final Button addTagButton = new Button(detailsAssessmentComposite, SWT.NONE); + addTagButton.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1)); + addTagButton.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + String tagName = addTagField.getText(); + if ((tagName != null) && (!"".equals(tagName)) && (!existingTags.contains(tagName))) { + existingTags.add(tagName); + recreateTagsSashForm(); + } + } + }); + addTagButton.setText("add tag"); + + detailsTreesSashForm.setWeights(new int[] { 1, 1 }); detailsSashForm.setWeights(new int[] { 1, 3 }); mainSashForm.setWeights(new int[] { 1, 3 }); @@ -210,4 +325,60 @@ //descriptionColumn.pack(); //smellList.pack(); + } + + /** + *

+ * TODO: comment + *

+ * + */ + private void recreateTagsSashForm() { + for (Control child : tagCheckBoxParent.getChildren()) { + child.dispose(); + } + + if (existingTags.size() > 0) { + TreeItem[] selectedItems = smellList.getSelection(); + boolean enabled = (selectedItems.length == 1) && + (selectedItems[0].getData() instanceof UsabilitySmell); + + for (String existingTag : existingTags) { + Button checkBox = new Button(tagCheckBoxParent, SWT.CHECK); + checkBox.setText(existingTag); + checkBox.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent event) { + Button btn = (Button) event.getSource(); + + TreeItem[] selectedItems = smellList.getSelection(); + if ((selectedItems.length == 1) && + (selectedItems[0].getData() instanceof UsabilitySmell)) + { + UsabilitySmell smell = (UsabilitySmell) selectedItems[0].getData(); + + if (btn.getSelection()) { + smell.addTag(btn.getText()); + } + else { + smell.removeTag(btn.getText()); + } + } + } + }); + + checkBox.setEnabled(enabled); + if (enabled) { + checkBox.setSelection + (((UsabilitySmell) selectedItems[0].getData()).getTags().contains(existingTag)); + } + } + } + else { + new Label(tagCheckBoxParent, SWT.NONE).setText + ("no tags added yet --> add using the text field and the button on the right"); + } + + tagCheckBoxParent.layout(); + tagCheckBoxParent.redraw(); } @@ -247,4 +418,11 @@ if (!added) { smellList.add(smell); + } + + // extract the intial list of tags of the smells + for (String tag : smell.getTags()) { + if (!existingTags.contains(tag)) { + existingTags.add(tag); + } } } @@ -432,4 +610,18 @@ involvedTargetsTree.removeAll(); involvedTasks.removeAll(); + + for (Control child : assessmentRadioButtons.getChildren()) { + if (child instanceof Button) { + child.setEnabled(false); + ((Button) child).setSelection(false); + } + } + + for (Control child : tagCheckBoxParent.getChildren()) { + if (child instanceof Button) { + child.setEnabled(false); + ((Button) child).setSelection(false); + } + } } @@ -494,4 +686,23 @@ styleRange.font = new Font(description.getDisplay(), "Courier", 12, SWT.NORMAL); description.setStyleRange(styleRange); + + assessmentRadioButtons.getChildren()[0].setEnabled(true); + ((Button) assessmentRadioButtons.getChildren()[0]).setSelection + (smell.getManualLabel() == ManualLabel.UNCHECKED); + + assessmentRadioButtons.getChildren()[1].setEnabled(true); + ((Button) assessmentRadioButtons.getChildren()[1]).setSelection + (smell.getManualLabel() == ManualLabel.FALSE_POSITIVE); + + assessmentRadioButtons.getChildren()[2].setEnabled(true); + ((Button) assessmentRadioButtons.getChildren()[2]).setSelection + (smell.getManualLabel() == ManualLabel.TRUE_POSITIVE); + + for (Control child : tagCheckBoxParent.getChildren()) { + if (child instanceof Button) { + child.setEnabled(true); + ((Button) child).setSelection(smell.getTags().contains(((Button) child).getText())); + } + } List involvedTaskList = getInvolvedTasks(smell); Index: trunk/autoquest-ui-swt/src/main/java/de/ugoe/cs/autoquest/ui/swt/TaskTreePlotUtils.java =================================================================== --- trunk/autoquest-ui-swt/src/main/java/de/ugoe/cs/autoquest/ui/swt/TaskTreePlotUtils.java (revision 2160) +++ trunk/autoquest-ui-swt/src/main/java/de/ugoe/cs/autoquest/ui/swt/TaskTreePlotUtils.java (revision 2168) @@ -168,27 +168,9 @@ plot.addDomainMarker(marker); - double xLow = 0; - double yLow = 0; - double xHigh = 100; - double yHigh = 100; - double maxY = 0; - for (int i = 0; i < dataset.getItemCount(0); i++) { - double xValue = dataset.getXValue(0, i); - double yValue = dataset.getYValue(0, i); - - if ((xLow < xValue) && (xValue < mpMarker)) { - xLow = xValue; - yLow = yValue; - } - else if ((xHigh > xValue) && (xValue > mpMarker)) { - xHigh = xValue; - yHigh = yValue; - } - - maxY = Math.max(maxY, yValue); - } - - marker = new ValueMarker((yHigh + yLow) / 2); - marker.setLabel(new DecimalFormat("#0.0").format((yHigh + yLow) / 2)); + double yMP = dataset.getYValue(0, mostProminent.size() - 1); + double maxY = dataset.getYValue(0, dataset.getItemCount(0) - 1); + + marker = new ValueMarker(yMP); + marker.setLabel(new DecimalFormat("#0.0").format(yMP)); marker.setLabelOffset(new RectangleInsets(5, 15, 0, 10)); plot.addRangeMarker(marker); Index: trunk/autoquest-ui-swt/src/main/java/de/ugoe/cs/autoquest/ui/swt/UsabilityTabComposite.java =================================================================== --- trunk/autoquest-ui-swt/src/main/java/de/ugoe/cs/autoquest/ui/swt/UsabilityTabComposite.java (revision 2160) +++ trunk/autoquest-ui-swt/src/main/java/de/ugoe/cs/autoquest/ui/swt/UsabilityTabComposite.java (revision 2168) @@ -14,4 +14,7 @@ package de.ugoe.cs.autoquest.ui.swt; + +import java.util.Collections; +import java.util.LinkedList; import org.eclipse.swt.SWT; @@ -142,9 +145,18 @@ public void updateResultList() { evaluationResultsList.removeAll(); + + java.util.List results = new LinkedList<>(); + for (String key : GlobalDataContainer.getInstance().getAllKeys()) { Object data = GlobalDataContainer.getInstance().getData(key); if (data instanceof UsabilityEvaluationResult) { - evaluationResultsList.add(key); + results.add(key); } + } + + Collections.sort(results); + + for (String entry : results) { + evaluationResultsList.add(entry); } } Index: trunk/autoquest-ui-swt/src/main/java/de/ugoe/cs/autoquest/ui/swt/VisualizationUtils.java =================================================================== --- trunk/autoquest-ui-swt/src/main/java/de/ugoe/cs/autoquest/ui/swt/VisualizationUtils.java (revision 2160) +++ trunk/autoquest-ui-swt/src/main/java/de/ugoe/cs/autoquest/ui/swt/VisualizationUtils.java (revision 2168) @@ -36,5 +36,5 @@ import de.ugoe.cs.autoquest.eventcore.IEventTarget; -import de.ugoe.cs.autoquest.eventcore.guimodel.IGUIElement; +import de.ugoe.cs.autoquest.eventcore.IHierarchicalEventTarget; import de.ugoe.cs.autoquest.tasktrees.treeifc.IEventTaskInstance; import de.ugoe.cs.autoquest.tasktrees.treeifc.IMarkingTemporalRelationship; @@ -243,5 +243,5 @@ * */ - static void addInvolvedTargets(Tree guiElementsTree, List targets) { + static void addInvolvedTargets(Tree eventTargetsTree, List targets) { for (IEventTarget target : targets) { List pathToIntegrate = new LinkedList(); @@ -250,6 +250,6 @@ pathToIntegrate.add(0, target); - if (target instanceof IGUIElement) { - target = ((IGUIElement) target).getParent(); + if (target instanceof IHierarchicalEventTarget) { + target = ((IHierarchicalEventTarget) target).getParent(); } else { @@ -264,5 +264,5 @@ if (parent == null) { - children = guiElementsTree.getItems(); + children = eventTargetsTree.getItems(); } else { @@ -282,5 +282,5 @@ if (childItem == null) { if (parent == null) { - childItem = new TreeItem(guiElementsTree, SWT.NONE); + childItem = new TreeItem(eventTargetsTree, SWT.NONE); } else { @@ -297,6 +297,6 @@ } - expandAll(guiElementsTree, true); - updateColumnWidths(guiElementsTree); + expandAll(eventTargetsTree, true); + updateColumnWidths(eventTargetsTree); }