Latest commit. Done by Nikhil.

svn path=/; revision=225

diff --git a/Annotation/src/ie/dcu/apps/ist/AppWindow.java b/Annotation/src/ie/dcu/apps/ist/AppWindow.java
index 4a552db9f983b910b9b4b7b1f4bcfae3d7ff55fb..b3b1f3406bca4ef3fc40db433eeae3795adcb2a1 100644 (file)
--- a/Annotation/src/ie/dcu/apps/ist/AppWindow.java
+++ b/Annotation/src/ie/dcu/apps/ist/AppWindow.java
@@ -685,20 +685,23 @@ public class AppWindow extends ApplicationWindow implements FileDropListener {
 
 
                private final Point getImagePoint(MouseEvent e) {
-                       if (image != null) {
+                       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);
                                }
                        }
                        
-                       maskedImageData = painter.getMaskImage().getImageData();
-                       if (maskedImageData != null) {
+                       else if (image != null) {
                                Point pt = new Point(e.x, e.y);
                                if (ctrl.imageContains(pt)) {
                                        return ctrl.canvasToImage(pt);
                                }
                        }
+                       
+                       
                        return null;
                }
                
@@ -720,7 +723,8 @@ public class AppWindow extends ApplicationWindow implements FileDropListener {
                                case SWT.MouseEnter:
                                case SWT.MouseMove:
                                      if (insideSegment) {
-                                        // System.out.println("Which painter ? -->  "+painter.getMaskImage().getImageData().y);
+                                         System.out.println("Which painter ? -->  "+view.getPainter());
+                                         System.out.println("Which painter ? -->  "+view.getPainter().getMaskData().transparentPixel);
                                          view.getCanvas().setToolTipText(SegmentationView.comboLabel.getText());
                                          return;
                                      }

diff --git a/Annotation/src/ie/dcu/segment/painters/CombinedPainter.java b/Annotation/src/ie/dcu/segment/painters/CombinedPainter.java
index 36bcd67a09a36874864ab972b00ac2b24fa7a604..15040a0e27ebfb05cdbcfe8b2c13036b7d90cea8 100644 (file)
--- a/Annotation/src/ie/dcu/segment/painters/CombinedPainter.java
+++ b/Annotation/src/ie/dcu/segment/painters/CombinedPainter.java
@@ -27,8 +27,8 @@ public class CombinedPainter implements SegmentationPainter {
                return "An overlaid view of the image, segmentation mask, and markup";
        }
 
-       public Image getMaskImage() {
-               return maskImage;
+       public ImageData getMaskData() {
+               return maskData;
        }
        
        public void paint(SegmentationContext ctx, ObservableImage im) {

diff --git a/Annotation/src/ie/dcu/segment/painters/ForegroundOnlyPainter.java b/Annotation/src/ie/dcu/segment/painters/ForegroundOnlyPainter.java
index adc7b9b19e0e97056200af1dbe7c4a52b4d25bdd..630cafcc458f739f8b4a951266acb025265b56b2 100644 (file)
--- a/Annotation/src/ie/dcu/segment/painters/ForegroundOnlyPainter.java
+++ b/Annotation/src/ie/dcu/segment/painters/ForegroundOnlyPainter.java
@@ -27,8 +27,8 @@ public class ForegroundOnlyPainter implements SegmentationPainter {
                return "Shows the foreground region of the image.";
        }
        
-       public Image getMaskImage() {
-               return maskImage;
+       public ImageData getMaskData() {
+               return maskData;
        }
 
        public void paint(SegmentationContext ctx, ObservableImage im) {

diff --git a/Annotation/src/ie/dcu/segment/painters/LabelPainter.java b/Annotation/src/ie/dcu/segment/painters/LabelPainter.java
index dc48ea0222f895536961bef939ed33d4e625507f..74c1bf42341c621a4b3f79216bb983337689b923 100644 (file)
--- a/Annotation/src/ie/dcu/segment/painters/LabelPainter.java
+++ b/Annotation/src/ie/dcu/segment/painters/LabelPainter.java
@@ -26,8 +26,8 @@ public class LabelPainter implements SegmentationPainter {
                return "Shows the segmented piece with label attached on hovering the mouse.";
        }
        
-       public Image getMaskImage() {
-               return maskImage;
+       public ImageData getMaskData() {
+               return maskData;
        }
 
        public void paint(SegmentationContext ctx, ObservableImage im) {
@@ -98,7 +98,7 @@ 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;
        }

diff --git a/Annotation/src/ie/dcu/segment/painters/MarkupPainter.java b/Annotation/src/ie/dcu/segment/painters/MarkupPainter.java
index 802000d459dcded3dd855470bfd7efe1dbb5543e..7f9dc61d8f93693c6ecf8904435ed7fc5ad6edd4 100644 (file)
--- a/Annotation/src/ie/dcu/segment/painters/MarkupPainter.java
+++ b/Annotation/src/ie/dcu/segment/painters/MarkupPainter.java
@@ -6,7 +6,7 @@ import ie.dcu.swt.*;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.ImageData;
 
 /**
  * Shows the current markup (annotations) only
@@ -26,7 +26,7 @@ public class MarkupPainter implements SegmentationPainter {
                return NAME;
        }
        
-       public Image getMaskImage() {
+       public ImageData getMaskData() {
                return null;
        }
 

diff --git a/Annotation/src/ie/dcu/segment/painters/MaskPainter.java b/Annotation/src/ie/dcu/segment/painters/MaskPainter.java
index f7a1d40d2e786c0b465b09379298bf5ec1fdd268..f7d3b893e315a598c18402442ccd4b78642bfdb9 100644 (file)
--- a/Annotation/src/ie/dcu/segment/painters/MaskPainter.java
+++ b/Annotation/src/ie/dcu/segment/painters/MaskPainter.java
@@ -26,8 +26,8 @@ public class MaskPainter implements SegmentationPainter {
                return NAME;
        }
        
-       public Image getMaskImage() {
-               return maskImage;
+       public ImageData getMaskData() {
+               return maskData;
        }
 
        public void paint(SegmentationContext ctx, ObservableImage im) {

diff --git a/Annotation/src/ie/dcu/segment/painters/OriginalPainter.java b/Annotation/src/ie/dcu/segment/painters/OriginalPainter.java
index 3807c7daa99bbc6a31d3889cd3c81ae24219c636..c39c0d1abd6a22b0af8ce5cec13cf150036ac229 100644 (file)
--- a/Annotation/src/ie/dcu/segment/painters/OriginalPainter.java
+++ b/Annotation/src/ie/dcu/segment/painters/OriginalPainter.java
@@ -23,7 +23,7 @@ public class OriginalPainter implements SegmentationPainter {
                return NAME;
        }
        
-       public Image getMaskImage() {
+       public ImageData getMaskData() {
                return null;
        }
 

diff --git a/Annotation/src/ie/dcu/segment/painters/OutlineOverlayPainter.java b/Annotation/src/ie/dcu/segment/painters/OutlineOverlayPainter.java
index 67b56c48ca09346e4309dc7bb22ae36d23911c5f..21271b45fee62c3556e62ee89d9ade44b83f02fe 100644 (file)
--- a/Annotation/src/ie/dcu/segment/painters/OutlineOverlayPainter.java
+++ b/Annotation/src/ie/dcu/segment/painters/OutlineOverlayPainter.java
@@ -25,8 +25,8 @@ public class OutlineOverlayPainter implements SegmentationPainter {
                return "Shows an an overlay of foreground border on the image";
        }
 
-       public Image getMaskImage() {
-               return maskImage;
+       public ImageData getMaskData() {
+               return maskData;
        }
        
        public void paint(SegmentationContext ctx, ObservableImage im) {

diff --git a/Annotation/src/ie/dcu/segment/painters/SegmentationPainter.java b/Annotation/src/ie/dcu/segment/painters/SegmentationPainter.java
index a15c392d36b90c864cd97cae0fb4c565196ebec9..3bfc477ac34030c0ea4a7e4212a20d21cadbd99c 100644 (file)
--- a/Annotation/src/ie/dcu/segment/painters/SegmentationPainter.java
+++ b/Annotation/src/ie/dcu/segment/painters/SegmentationPainter.java
@@ -21,7 +21,7 @@ public interface SegmentationPainter {
        /**
         * Returns a description of the painter.
         */
-       public Image getMaskImage();
+       public ImageData getMaskData();
 
        /**
         * Returns a masked image.