From 357fe441d55baa66ba6fa1258cf07a5adeed2250 Mon Sep 17 00:00:00 2001
From: patapanp <patapanp@localhost>
Date: Mon, 3 Feb 2014 20:24:17 +0000
Subject: [PATCH] Combined label is changed to Segmented Sucessfuly.

svn path=/; revision=525
---
 Annotation/resources/doc/help.html                     |  4 ++--
 Annotation/src/ie/dcu/apps/ist/AppWindow.java          |  2 +-
 Annotation/src/ie/dcu/apps/ist/Main.java               |  2 +-
 Annotation/src/ie/dcu/apps/ist/PainterRegistry.java    |  4 ++--
 .../src/ie/dcu/apps/ist/views/SegmentationView.java    |  7 ++++---
 .../ie/dcu/apps/ist/widgets/AnnotatedImageControl.java |  2 +-
 Annotation/src/ie/dcu/segment/SegmentationContext.java |  4 ++--
 Annotation/src/ie/dcu/segment/SegmentationMask.java    |  4 ++--
 .../{CombinedPainter.java => SegmentPainter.java}      | 10 +++++-----
 9 files changed, 20 insertions(+), 19 deletions(-)
 rename Annotation/src/ie/dcu/segment/painters/{CombinedPainter.java => SegmentPainter.java} (97%)

diff --git a/Annotation/resources/doc/help.html b/Annotation/resources/doc/help.html
index 5e8a465..956bc23 100644
--- a/Annotation/resources/doc/help.html
+++ b/Annotation/resources/doc/help.html
@@ -125,12 +125,12 @@ visible or to quickly mark up more pixels.<br>
 <br>
 <span class="section">Views</span><br>
 It is sometimes useful to view the segmentation results in different
-ways. The default selected view is the "Combined" view; it shows the
+ways. The default selected view is the "Segmented" view; it shows the
 image, its highlighted segmentation, and any current foreground and background markup lines...all overlayed on
 the same image. Using the drop-down menu, you can select a different
 view:<br>
 <ul>
-<li><span style="font-style: italic;">Combined</span>:
+<li><span style="font-style: italic;">Segmented</span>:
 Shows the image with foreground areas brightened and background areas
 darkened. Any current foreground and background annotation marks are overlayed.</li>
 <li><span style="font-style: italic;">Original:</span>
diff --git a/Annotation/src/ie/dcu/apps/ist/AppWindow.java b/Annotation/src/ie/dcu/apps/ist/AppWindow.java
index 1919489..49a5051 100644
--- a/Annotation/src/ie/dcu/apps/ist/AppWindow.java
+++ b/Annotation/src/ie/dcu/apps/ist/AppWindow.java
@@ -710,7 +710,7 @@ public class AppWindow extends ApplicationWindow implements FileDropListener {
 				status(AppStatus.Information, "Location [%4d,%4d] Color [%3d,%3d,%3d]",pt.x, pt.y, c.red, c.green, c.blue);
 				if(view.getContext().isEnabled())
 				{
-					if(view.getContext().getEnabledMask().getImageData().getPixel(pt.x,pt.y) != 0 && (view.getPainter().getName().equals("Combined")) && SegmentationView.getLabelMode())
+					if(view.getContext().getEnabledMask().getImageData().getPixel(pt.x,pt.y) != 0 && (view.getPainter().getName().equals("Segmented")) && SegmentationView.getLabelMode())
 		        	{	
 						String segmentName = view.getContext().getEnabledMask().ontologyTerm.getName();
 						view.getCanvas().setToolTipText(segmentName);
diff --git a/Annotation/src/ie/dcu/apps/ist/Main.java b/Annotation/src/ie/dcu/apps/ist/Main.java
index d878efd..2e03a7a 100644
--- a/Annotation/src/ie/dcu/apps/ist/Main.java
+++ b/Annotation/src/ie/dcu/apps/ist/Main.java
@@ -32,7 +32,7 @@ public class Main {
 		for (String s: Application.DEFAULT_PLUGIN_SEARCH_PATH) {
 			System.out.println(s);
 		}
-
+		
 		Display.setAppName(Application.APP_NAME);
 		check();
 		loadPlugins();
diff --git a/Annotation/src/ie/dcu/apps/ist/PainterRegistry.java b/Annotation/src/ie/dcu/apps/ist/PainterRegistry.java
index ed5d6fc..83571cb 100644
--- a/Annotation/src/ie/dcu/apps/ist/PainterRegistry.java
+++ b/Annotation/src/ie/dcu/apps/ist/PainterRegistry.java
@@ -14,10 +14,10 @@ public class PainterRegistry {
 	
 	
 	private void init() {
-		add(new CombinedPainter());
+		add(new SegmentPainter());
 		add(new OriginalPainter());
 		/*
-		 * Commented different views of segmentation. Currently original and combined painter are enabled
+		 * Commented different views of segmentation. Currently original and Segment painter are enabled
 		 */
 		//add(new MarkupPainter());
 		//add(new MaskPainter());
diff --git a/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java b/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
index d989874..aed5dd3 100644
--- a/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
+++ b/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
@@ -258,8 +258,8 @@ public class SegmentationView extends Composite {
 	 */
 	public void resetView() {
 		Tool.LabelMode.action.setChecked(false);
-		resetViewSelectionToolbar(painters.get("Combined"));
-
+		resetViewSelectionToolbar(painters.get("Segmented"));
+		//panini
 		// clear metadata
 		comboLabel.removeAll();
 		comboLabel.setEnabled(false);
@@ -1221,7 +1221,8 @@ public class SegmentationView extends Composite {
 	Assign the label to the segment on clicking assign button and update the image segment. 
 	*/
 	private void assignLabel() {
-		SegmentationPainter painter = painters.get("Combined");
+		SegmentationPainter painter = painters.get("Segmented");
+		//panini
 		setPainter(painter);
 	}
 	
diff --git a/Annotation/src/ie/dcu/apps/ist/widgets/AnnotatedImageControl.java b/Annotation/src/ie/dcu/apps/ist/widgets/AnnotatedImageControl.java
index 4880b63..3f9db4f 100644
--- a/Annotation/src/ie/dcu/apps/ist/widgets/AnnotatedImageControl.java
+++ b/Annotation/src/ie/dcu/apps/ist/widgets/AnnotatedImageControl.java
@@ -33,7 +33,7 @@ public class AnnotatedImageControl extends Composite {
 		setLayout(new FillLayout());
 		view = new ImageControl(this, SWT.NONE);
 		listeners = new ArrayList<ContextChangeListener>(2);
-		painter = new CombinedPainter();
+		painter = new SegmentPainter();
 		view.getCanvas().addMouseMoveListener(cursorChanger);
 		addDisposeListener(disposeListener);
 	}
diff --git a/Annotation/src/ie/dcu/segment/SegmentationContext.java b/Annotation/src/ie/dcu/segment/SegmentationContext.java
index cb2dce0..258f50c 100644
--- a/Annotation/src/ie/dcu/segment/SegmentationContext.java
+++ b/Annotation/src/ie/dcu/segment/SegmentationContext.java
@@ -12,7 +12,7 @@ import java.util.ArrayList;
 import java.util.logging.Logger;
 import java.util.zip.*;
 
-import javax.xml.bind.DatatypeConverter;
+//import javax.xml.bind.DatatypeConverter;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
@@ -21,7 +21,7 @@ import org.eclipse.swt.graphics.*;
 import org.eclipse.swt.widgets.Display;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
-import org.w3c.dom.Node;
+//import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 
diff --git a/Annotation/src/ie/dcu/segment/SegmentationMask.java b/Annotation/src/ie/dcu/segment/SegmentationMask.java
index 56cb6f3..d9b499f 100644
--- a/Annotation/src/ie/dcu/segment/SegmentationMask.java
+++ b/Annotation/src/ie/dcu/segment/SegmentationMask.java
@@ -1,10 +1,10 @@
 package ie.dcu.segment;
 
 import ie.dcu.matrix.ByteMatrix;
-import ie.dcu.segment.annotate.Annotation;
+//import ie.dcu.segment.annotate.Annotation;
 import ie.dcu.segment.annotate.AnnotationManager;
 
-import ie.dcu.segment.annotate.AnnotationType;
+//import ie.dcu.segment.annotate.AnnotationType;
 
 import ie.dcu.apps.ist.labelling.OntologyTerm;
 
diff --git a/Annotation/src/ie/dcu/segment/painters/CombinedPainter.java b/Annotation/src/ie/dcu/segment/painters/SegmentPainter.java
similarity index 97%
rename from Annotation/src/ie/dcu/segment/painters/CombinedPainter.java
rename to Annotation/src/ie/dcu/segment/painters/SegmentPainter.java
index 9e2064a..2e56be5 100644
--- a/Annotation/src/ie/dcu/segment/painters/CombinedPainter.java
+++ b/Annotation/src/ie/dcu/segment/painters/SegmentPainter.java
@@ -11,9 +11,9 @@ import org.eclipse.swt.widgets.*;
  * 
  * @author Kevin McGuinness
  */
-public class CombinedPainter implements SegmentationPainter {
-	public static final String NAME = "Combined";
-	
+public class SegmentPainter implements SegmentationPainter {
+	public static final String NAME = "Segmented";
+	//here it applies
 	private ImageData maskBorderData;
 	private Image maskBorderImage;
 
@@ -106,7 +106,7 @@ public class CombinedPainter implements SegmentationPainter {
 		if (isNewMaskDataRequired(mask)) {
 			mask.maskImageData = createMaskData(mask.getBounds());
 		} 
-		byte main_index = 9;
+		//byte main_index;
 		// Blit in pixels
 		for (int y = 0, i = 0; y < mask.height; y++) {
 			int rowOffset = y * mask.maskImageData.bytesPerLine;
@@ -138,7 +138,7 @@ public class CombinedPainter implements SegmentationPainter {
 				
 				// Next location in the mask
 				i++;
-				main_index = index;
+				//main_index = index;
 			}
 		}
 	// Create new mask
-- 
2.34.1