From 1d53d6b93c1ba27553023541820058584148be53 Mon Sep 17 00:00:00 2001
From: lingutln <lingutln@localhost>
Date: Mon, 23 Jan 2012 19:10:55 +0000
Subject: [PATCH] Multiple segmentation and labelling. Done by Nikhil.

svn path=/; revision=271
---
 Annotation/.classpath                         | 22 +++++++++----------
 Annotation/src/ie/dcu/apps/ist/AppWindow.java |  5 +++--
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/Annotation/.classpath b/Annotation/.classpath
index 958e3b9..22412b6 100644
--- a/Annotation/.classpath
+++ b/Annotation/.classpath
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<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="C:/Users/Nikhil/workspace/image_annotation/lib/swt-win.jar"/>
-	<classpathentry kind="lib" path="C:/Users/Nikhil/workspace/NewAnnotation/library/commons-lang3-3.1.jar"/>
-	<classpathentry kind="lib" path="C:/Users/Nikhil/workspace/NewAnnotation/library/jface.jar"/>
-	<classpathentry kind="lib" path="C:/Users/Nikhil/workspace/NewAnnotation/library/json.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<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/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="/home/lingutln/workspace/Annotation/library/swt-gtk-64.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/Annotation/src/ie/dcu/apps/ist/AppWindow.java b/Annotation/src/ie/dcu/apps/ist/AppWindow.java
index 01707f0..47b0a82 100644
--- a/Annotation/src/ie/dcu/apps/ist/AppWindow.java
+++ b/Annotation/src/ie/dcu/apps/ist/AppWindow.java
@@ -705,9 +705,10 @@ 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")) && view.getLabelMode())
+					if(view.getContext().getEnabledMask().getImageData().getPixel(pt.x,pt.y) != 0 && (view.getPainter().getName().equals("Combined")) && SegmentationView.getLabelMode())
 		        	{	
-						view.getCanvas().setToolTipText(SegmentationView.comboLabel.getText());
+						view.getCanvas().setToolTipText(view.getContext().getEnabledMask().segmentName);
+						SegmentationView.comboLabel.setText(view.getContext().getEnabledMask().segmentName);
 		            	return;
 		        	}
 		        	else
-- 
2.34.1