Modified popup Exception. Done by Nikhil.

svn path=/; revision=247

diff --git a/Annotation/.classpath b/Annotation/.classpath
index dae8e98e88b39b4f09341cfcc41b0d028f908a0a..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/jface.jar"/>\r
-       <classpathentry kind="lib" path="C:/Users/Nikhil/workspace/image_annotation/lib/swt-win.jar"/>\r
-       <classpathentry kind="lib" path="C:/Users/Nikhil/workspace/Annotation/library/commons-lang3-3.1.jar"/>\r
-       <classpathentry kind="lib" path="C:/Users/Nikhil/workspace/Annotation/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 ea03479eed23fe64e913ea010aaff81703724040..5e012534438c268519be2735888c883e938e4999 100644 (file)
--- a/Annotation/src/ie/dcu/apps/ist/AppWindow.java
+++ b/Annotation/src/ie/dcu/apps/ist/AppWindow.java
@@ -703,15 +703,15 @@ public class AppWindow extends ApplicationWindow implements FileDropListener {
                        }
                        if (inside) {
                                status(AppStatus.Information, "Location [%4d,%4d] Color [%3d,%3d,%3d]",pt.x, pt.y, c.red, c.green, c.blue);
-                                if(view.getPainter().getMaskData().getPixel(pt.x,pt.y) == 0)
-                         {                                                       
-                         view.getCanvas().setToolTipText(SegmentationView.comboLabel.getText());
-                         return;
-                         }
-                         else if(view.getPainter().getMaskData().getPixel(pt.x,pt.y) == 1)
-                         {
+                               if(view.getPainter().getMaskData().getPixel(pt.x,pt.y) == 0 && (view.getPainter().getName().equals("Foreground Only")))
+                       {                                                         
+                                       view.getCanvas().setToolTipText(SegmentationView.comboLabel.getText());
+                       return;
+                       }
+                       else if(view.getPainter().getMaskData().getPixel(pt.x,pt.y) == 1)
+                       {
                                  view.getCanvas().setToolTipText(null);
-                         }
+                       }
                        }
                        inside = true;
                }

diff --git a/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java b/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
index da23470258a7d9455aae8c0c112a729764425a66..3695cb8dbfa90103bfae32e059e2e69e6b99a070 100644 (file)
--- a/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
+++ b/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
@@ -1028,7 +1028,7 @@ public class SegmentationView extends Composite {
                                String lab = null;
                                if(result.comboText.indexOf('{') != -1)
                        {
-                                       lab = result.comboText.substring(0,comboLabel.getText().indexOf('{')-1);
+                                       lab = result.comboText.substring(0,result.comboText.indexOf('{')-1);
                        }
                        else
                        {