Implemented Tooltip text functionality. Done by Nikhil.

svn path=/; revision=226

diff --git a/Annotation/src/ie/dcu/apps/ist/AppWindow.java b/Annotation/src/ie/dcu/apps/ist/AppWindow.java
index b3b1f3406bca4ef3fc40db433eeae3795adcb2a1..168d8e0438c6af7fb5a40c88fc7cb691fe2f39f9 100644 (file)
--- a/Annotation/src/ie/dcu/apps/ist/AppWindow.java
+++ b/Annotation/src/ie/dcu/apps/ist/AppWindow.java
@@ -6,7 +6,6 @@ import ie.dcu.apps.ist.exp.Experiment;
 import ie.dcu.apps.ist.views.*;
 import ie.dcu.segment.*;
 import ie.dcu.segment.annotate.*;
-import ie.dcu.segment.painters.SegmentationPainter;
 import ie.dcu.swt.*;
 import ie.dcu.swt.event.*;
 import ie.dcu.swt.layout.LayoutFactory;
@@ -626,14 +625,10 @@ public class AppWindow extends ApplicationWindow implements FileDropListener {
 
                private final ImageControl ctrl;
                private ImageData image;
-               private ImageData maskedImageData;
                private boolean inside;
-               private boolean insideSegment;
                private boolean enabled;
-               SegmentationPainter painter;
                
                public ImageObserver(SegmentationView view) {
-                       painter = view.getPainter();
                        view.addContextChangeListener(this);
                        view.getCanvas().addMouseMoveListener(this);
                        ctrl = view.getImageControl();
@@ -649,7 +644,6 @@ public class AppWindow extends ApplicationWindow implements FileDropListener {
                                Font font = JFaceResources.getDefaultFont();
                                getStatusLineManager().getControl().setFont(font);
                                this.inside = false;
-                               this.insideSegment = false;
                                this.enabled = enabled;
                        }
                }
@@ -678,23 +672,13 @@ public class AppWindow extends ApplicationWindow implements FileDropListener {
                                Font font = JFaceResources.getDefaultFont();
                                getStatusLineManager().getControl().setFont(font);
                                inside = false;
-                               insideSegment = false;
-                               shell.setToolTipText(null);
                        }
                }
 
 
                private final Point getImagePoint(MouseEvent e) {
-                       System.out.println("Painter coming as"+view.getPainter().getMaskData().transparentPixel);
-                       maskedImageData = view.getPainter().getMaskData();
-                       if (maskedImageData != null) {
-                               Point pt = new Point(e.x, e.y);
-                               if (ctrl.imageContains(pt)) {
-                                       return ctrl.canvasToImage(pt);
-                               }
-                       }
                        
-                       else if (image != null) {
+                       if (image != null) {
                                Point pt = new Point(e.x, e.y);
                                if (ctrl.imageContains(pt)) {
                                        return ctrl.canvasToImage(pt);
@@ -717,24 +701,23 @@ public class AppWindow extends ApplicationWindow implements FileDropListener {
                                Font font = JFaceResources.getFont(MONOSPACE_FONT);
                                getStatusLineManager().getControl().setFont(font);
                        }
-                       Listener mouseListener = new Listener() {
-                             public void handleEvent(Event event) {
-                               switch (event.type) {
-                               case SWT.MouseEnter:
-                               case SWT.MouseMove:
-                                     if (insideSegment) {
-                                         System.out.println("Which painter ? -->  "+view.getPainter());
-                                         System.out.println("Which painter ? -->  "+view.getPainter().getMaskData().transparentPixel);
-                                         view.getCanvas().setToolTipText(SegmentationView.comboLabel.getText());
-                                         return;
+                       MouseMoveListener mouseListener = new MouseMoveListener() {
+                             public void mouseMove(MouseEvent event) {
+                                         if (inside) {
+                                                 Point pt = getImagePoint(event);
+                                                 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)
+                                                 {
+                                                         view.getCanvas().setToolTipText(null);
+                                                 }
                                      }
-                                     view.getCanvas().setToolTipText(null);
-                                 break;
-                               }
-                             }
+                                 }
                            };
-                           view.getCanvas().addListener(SWT.MouseMove, mouseListener);
-                           view.getCanvas().addListener(SWT.MouseExit, mouseListener);
+                           view.getCanvas().addMouseMoveListener(mouseListener);
                            if((SegmentationView.comboLabel.getText()).trim().equals(""))
                            {
                                status(AppStatus.Information, 
@@ -748,7 +731,6 @@ public class AppWindow extends ApplicationWindow implements FileDropListener {
                                                        pt.x, pt.y, c.red, c.green, c.blue, SegmentationView.comboLabel.getText());
                            }
                        inside = true;
-                       insideSegment = true;
                }
 
 

diff --git a/Annotation/src/ie/dcu/segment/painters/LabelPainter.java b/Annotation/src/ie/dcu/segment/painters/LabelPainter.java
index 74c1bf42341c621a4b3f79216bb983337689b923..131d2f5eb67d8fdea2f0f0cb03ac382ae4aac244 100644 (file)
--- a/Annotation/src/ie/dcu/segment/painters/LabelPainter.java
+++ b/Annotation/src/ie/dcu/segment/painters/LabelPainter.java
@@ -51,7 +51,6 @@ public class LabelPainter implements SegmentationPainter {
                if (isNewMaskDataRequired(mask.getBounds())) {
                        maskData = createMaskData(mask.getBounds());
                } 
-               
                // Blit in pixels
                byte[] buff = new byte[maskData.width];
                for (int y = 0, i = 0; y < mask.height; y++) {
@@ -98,7 +97,6 @@ public class LabelPainter implements SegmentationPainter {
                
                // Set transparent pixel
                data.transparentPixel = 0;
-               System.out.println("In painter : "+data.transparentPixel);
                // Create and return the image
                return data;
        }