Multiple segmentation and labelling. Done by Nikhil.

svn path=/; revision=271

diff --git a/Annotation/.classpath b/Annotation/.classpath
index 958e3b9467779ada53dbda78096712752a805fed..22412b6c9a2c02f608af7c008e1447f0c9cabf62 100644 (file)
--- a/Annotation/.classpath
+++ b/Annotation/.classpath
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry kind="src" path="src"/>\r
-       <classpathentry excluding="src/" kind="src" path=""/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
-       <classpathentry kind="lib" path="C:/Users/Nikhil/workspace/image_annotation/lib/swt-win.jar"/>\r
-       <classpathentry kind="lib" path="C:/Users/Nikhil/workspace/NewAnnotation/library/commons-lang3-3.1.jar"/>\r
-       <classpathentry kind="lib" path="C:/Users/Nikhil/workspace/NewAnnotation/library/jface.jar"/>\r
-       <classpathentry kind="lib" path="C:/Users/Nikhil/workspace/NewAnnotation/library/json.jar"/>\r
-       <classpathentry kind="output" path="bin"/>\r
-</classpath>\r
+<?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 01707f0340c929b6f69e8482b21ac16794d12d13..47b0a826a9ee979d15038367a938ea48583302d1 100644 (file)
--- 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