From 7e3a7723c983b019163a99dd3d6dad03449927f6 Mon Sep 17 00:00:00 2001
From: lingutln <lingutln@localhost>
Date: Thu, 4 Apr 2013 19:30:38 +0000
Subject: [PATCH] Add toggling between Segmentation and Labelling modes. Done
 by Nikhil.

svn path=/; revision=456
---
 Annotation/.classpath                         | 10 +-
 Annotation/resources/config/view.properties   | 15 ++-
 .../dcu/apps/ist/views/SegmentationView.java  | 91 +++++--------------
 3 files changed, 36 insertions(+), 80 deletions(-)

diff --git a/Annotation/.classpath b/Annotation/.classpath
index 6eb1bbe..2f52523 100644
--- a/Annotation/.classpath
+++ b/Annotation/.classpath
@@ -3,9 +3,11 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry excluding="src/" kind="src" path=""/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="lib" path="/home/preecej/Development/eclipse_workspace/Annotation/library/commons-lang3-3.1.jar"/>
-	<classpathentry kind="lib" path="/home/preecej/Development/eclipse_workspace/Annotation/library/jface.jar"/>
-	<classpathentry kind="lib" path="/home/preecej/Development/eclipse_workspace/Annotation/library/json.jar"/>
-	<classpathentry kind="lib" path="/home/preecej/Development/eclipse_workspace/Annotation/library/swt-gtk-64.jar"/>
+	<classpathentry kind="lib" path="/home/lingutln/workspace/Annotation/library/commons-lang3-3.1.jar"/>
+	<classpathentry kind="lib" path="/home/lingutln/workspace/Annotation/library/jface.jar"/>
+	<classpathentry kind="lib" path="/home/lingutln/workspace/Annotation/library/json.jar"/>
+	<classpathentry kind="lib" path="library/swt-gtk-64.jar"/>
+	<classpathentry kind="lib" path="library/ij.jar"/>
+	<classpathentry kind="lib" path="library/Jama-1.0.2.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/Annotation/resources/config/view.properties b/Annotation/resources/config/view.properties
index a0cd0ac..e3a9cca 100644
--- a/Annotation/resources/config/view.properties
+++ b/Annotation/resources/config/view.properties
@@ -1,12 +1,9 @@
-SegmentationView.Action.Foreground.text=Segmentation Mode
-SegmentationView.Action.Foreground.tooltip=Segmentation Mode
-SegmentationView.Action.Foreground.image=file:resources/icons/foreground.png
-SegmentationView.Action.Background.text=Markup Background
-SegmentationView.Action.Background.tooltip=Markup Background Pixels
-SegmentationView.Action.Background.image=file:resources/icons/background.png
-SegmentationView.Action.OperatingMode.text=Labeling Mode
-SegmentationView.Action.OperatingMode.tooltip=Labeling Mode
-SegmentationView.Action.OperatingMode.image=file:resources/icons/copy.png
+SegmentationView.Action.SegmentMode.text=Segmentation Mode
+SegmentationView.Action.SegmentMode.tooltip=Segmentation Mode
+SegmentationView.Action.SegmentMode.image=file:resources/icons/foreground.png
+SegmentationView.Action.LabelMode.text=Labeling Mode
+SegmentationView.Action.LabelMode.tooltip=Labeling Mode
+SegmentationView.Action.LabelMode.image=file:resources/icons/copy.png
 SegmentationView.Action.FormSegment.text=Form segment
 SegmentationView.Action.FormSegment.tooltip=Form a segment from current view
 SegmentationView.Action.FormSegment.image=file:resources/icons/apply.png
diff --git a/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java b/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
index b3ac8f8..0af29cc 100644
--- a/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
+++ b/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
@@ -104,9 +104,8 @@ public class SegmentationView extends Composite {
 	
 	
 	public enum Tool {
-		Foreground(true),
-		Background(true),
-		OperatingMode(true),
+		SegmentMode(true),
+		LabelMode(true),
 		FormSegment(true),
 		PredictSegments(false),
 		ZoomIn(false),
@@ -211,12 +210,11 @@ public class SegmentationView extends Composite {
 
 
 	private void createToolMainToolbar() {
+		SwtUtils.addButton(mainToolbar, 300, getAction(Tool.SetPainter).getText());
 		ToolBarManager m = new ToolBarManager(mainToolbar);
-		m.add(getAction(Tool.Foreground));
-		//m.add(getAction(Tool.Background));
-		m.add(getAction(Tool.OperatingMode));
+		m.add(getAction(Tool.SegmentMode));
+		m.add(getAction(Tool.LabelMode));
 		m.add(getAction(Tool.FormSegment));
-		//m.add(getAction(Tool.PredictSegments));
 		m.add(new Separator());
 		m.add(getAction(Tool.ZoomIn));
 		m.add(getAction(Tool.ZoomOut));
@@ -230,9 +228,6 @@ public class SegmentationView extends Composite {
 		m.add(new Separator());
 		m.add(getAction(Tool.SetBrushSize));
 		m.add(new Separator());
-		//m.add(getAction(Tool.AutoApply));
-		//m.add(getAction(Tool.Apply));
-		//m.add(getAction(Tool.SegmenterOptions));
 		m.update(true);
 	}
 	
@@ -260,7 +255,7 @@ public class SegmentationView extends Composite {
 	 * TODO: then recall this method from the Open (Open Recent), Go Next, Go Previous, and Close...when you add Close 
 	 */
 	public void resetView() {
-		Tool.OperatingMode.action.setChecked(false);
+		Tool.LabelMode.action.setChecked(false);
 		resetViewSelectionToolbar(painters.get("Combined"));
 
 		// clear metadata
@@ -408,17 +403,7 @@ public class SegmentationView extends Composite {
 		    		for (termDetailLabels code : values) {
 		    			String currResponseValue = responseArray.getJSONObject(0).getString(code.toString()); // assumes an array of one response
 		    			if (items[i].getText(0).equals(code.extendedLabel)) {
-		    				/*if (code.extendedLabel.equals("Synonyms")) {
-		    					String formattedSyns = new String();
-		    					
-		    					JSONArray synArray = responseArray.getJSONObject(0).getJSONArray("synonyms");
-		    					for (int j=0; j<synArray.length(); j++) {
-		    						formattedSyns += synArray.getString(j) + System.getProperty("line.separator");
-		    					}
-		    					items[i].setText(1, formattedSyns);
-		    				} else {*/
-		    					items[i].setText(1, currResponseValue);
-		    				//}
+		    				items[i].setText(1, currResponseValue);
 		    			}
 		    		}
 	    			termDetailTable.getColumn(1).pack();
@@ -619,7 +604,6 @@ public class SegmentationView extends Composite {
 		gd.grabExcessHorizontalSpace = true;
 		gd.grabExcessVerticalSpace = true;
 		gd.horizontalAlignment = SWT.FILL;
-		//gd.verticalAlignment = GridData.BEGINNING;
 		gd.verticalAlignment = SWT.FILL;
 		gd.heightHint = 200;
 		gd.widthHint = 70;
@@ -632,7 +616,6 @@ public class SegmentationView extends Composite {
 		gd.grabExcessVerticalSpace = true;
 		gd.horizontalAlignment = SWT.FILL;
 		gd.verticalAlignment = GridData.BEGINNING;
-		//gd.verticalAlignment = SWT.FILL;
 		gd.heightHint = 200;
 		gd.widthHint = 70;
 		termDetailTable.setLayoutData(gd);
@@ -811,9 +794,7 @@ public class SegmentationView extends Composite {
 	
 	public void setLabellingMode(boolean checked) {
 		if (!getLabelMode() && checked) {
-			// Toggling between Segmentation and labelling
-			Tool.Foreground.action.setEnabled(false);
-			Tool.Background.action.setEnabled(false);
+			Tool.SegmentMode.action.setChecked(false);
 			view.removeContextChangeListener(eventHandler);
 			view.addPopupListener();
 			if(!(view.getTool() == null))
@@ -844,11 +825,11 @@ public class SegmentationView extends Composite {
 	/**
 	 * Predicts the segments in the image using active learning.
 	*/
-//	public void predictSegments() {
-//		SIFTDescriptor sift = new SIFTDescriptor();
-//		sift.calculateDescriptors(view.getContext().getImage());
-//		updateToolStates();
-//	}	
+	/*public void predictSegments() {
+		SIFTDescriptor sift = new SIFTDescriptor();
+		sift.calculateDescriptors(view.getContext().getImage());
+		updateToolStates();
+	}*/	
 	
 	public boolean isAutoApply() {
 		return this.auto;
@@ -1033,8 +1014,7 @@ public class SegmentationView extends Composite {
 					}
 				});
 				
-			}
-			
+			}			
 			// Repaint everything
 			repaint();
 		}
@@ -1070,16 +1050,6 @@ public class SegmentationView extends Composite {
 		}
 	}
 
-
-	private boolean isAnnotatingBackground() {
-		return view.isAnnotatingBackground();
-	}
-	
-
-	private boolean isAnnotatingForeground() {
-		return view.isAnnotatingForeground();
-	}
-
 	private String getText(Tool a) {
 		return props.getProperty(getKey(a, "text"));
 	}
@@ -1115,9 +1085,8 @@ public class SegmentationView extends Composite {
 	
 	private int getType(Tool a) {
 		switch (a) {
-		case Foreground:
-		case Background:
-		case OperatingMode:
+		case SegmentMode:
+		case LabelMode:
 		case AutoApply:
 			return Action.AS_CHECK_BOX;
 		case SetBrushSize:
@@ -1131,21 +1100,16 @@ public class SegmentationView extends Composite {
 	
 	private void execute(Tool a, Event e) {
 		switch (a) {
-		case Foreground:
+		case SegmentMode:
 			setAnnotationType(AnnotationType.Foreground);
+			setLabellingMode(false);
 			break;
-		case Background:
-			setAnnotationType(AnnotationType.Background);
-			break;
-		case OperatingMode:
-			setLabellingMode(a.action.isChecked());
+		case LabelMode:
+			setLabellingMode(true);
 			break;
 		case FormSegment:
 			formSegmetationObject();
 			break;
-/*		case PredictSegments:
-			predictSegments();
-			break;*/
 		case ZoomIn:
 			zoomIn();
 			break;
@@ -1185,9 +1149,6 @@ public class SegmentationView extends Composite {
 		case AssignButton:
 			assignLabel();
 			break;
-		//case SegmenterOptions:
-			//showSegmenterOptions();
-			//break;
 		}
 		
 		updateToolStates();
@@ -1212,21 +1173,17 @@ public class SegmentationView extends Composite {
 				comboLabel.setEnabled(false);
 			}
 			assign.setEnabled(canZoomBestFit() & !(comboLabel.getText().isEmpty()));
-			Tool.Foreground.action.setChecked(isAnnotatingForeground());
-			Tool.Background.action.setChecked(isAnnotatingBackground());
-			Tool.OperatingMode.action.setChecked(getLabelMode());
+			Tool.SegmentMode.action.setChecked(!getLabelMode());
+			Tool.LabelMode.action.setChecked(getLabelMode());
 			Tool.Clear.action.setEnabled(canClear());
 			Tool.AutoApply.action.setChecked(auto);
-			//Tool.SegmenterOptions.action.setEnabled(canShowOptions());
-			Tool.Foreground.action.setEnabled(!getLabelMode() && canZoomIn());
-			Tool.Background.action.setEnabled(!getLabelMode() && canZoomIn());
-			Tool.OperatingMode.action.setEnabled(canZoomIn());
+			Tool.SegmentMode.action.setEnabled(canZoomIn());
+			Tool.LabelMode.action.setEnabled(canZoomIn());
 			Tool.FormSegment.action.setEnabled(CanLabel());
 			Tool.PredictSegments.action.setEnabled(canZoomIn());
 						
 			// Always enabled if view enabled
 			Tool.SetBrushSize.action.setEnabled(true);
-			//Tool.SegmenterOptions.action.setEnabled(true);
 			Tool.SetPainter.action.setEnabled(true);
 			Tool.Repaint.action.setEnabled(true);
 			Tool.AutoApply.action.setEnabled(true);
-- 
2.34.1