From 6a0f27bf477333d7def4a7f4c9facad399bde858 Mon Sep 17 00:00:00 2001 From: lingutln Date: Sat, 17 Dec 2011 00:07:09 +0000 Subject: [PATCH] Latest commit. Done by Nikhil. svn path=/; revision=225 --- Annotation/src/ie/dcu/apps/ist/AppWindow.java | 12 ++++++++---- .../src/ie/dcu/segment/painters/CombinedPainter.java | 4 ++-- .../dcu/segment/painters/ForegroundOnlyPainter.java | 4 ++-- .../src/ie/dcu/segment/painters/LabelPainter.java | 6 +++--- .../src/ie/dcu/segment/painters/MarkupPainter.java | 4 ++-- .../src/ie/dcu/segment/painters/MaskPainter.java | 4 ++-- .../src/ie/dcu/segment/painters/OriginalPainter.java | 2 +- .../dcu/segment/painters/OutlineOverlayPainter.java | 4 ++-- .../ie/dcu/segment/painters/SegmentationPainter.java | 2 +- 9 files changed, 23 insertions(+), 19 deletions(-) diff --git a/Annotation/src/ie/dcu/apps/ist/AppWindow.java b/Annotation/src/ie/dcu/apps/ist/AppWindow.java index 4a552db..b3b1f34 100644 --- 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 36bcd67..15040a0 100644 --- 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 adc7b9b..630cafc 100644 --- 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 dc48ea0..74c1bf4 100644 --- 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 802000d..7f9dc61 100644 --- 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 f7a1d40..f7d3b89 100644 --- 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 3807c7d..c39c0d1 100644 --- 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 67b56c4..21271b4 100644 --- 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 a15c392..3bfc477 100644 --- 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. -- 2.34.1