From: lingutln <lingutln@localhost>
Date: Mon, 23 Jan 2012 23:07:57 +0000 (+0000)
Subject: Image map for single segment.Done by Nikhil.
X-Git-Url: http://gitweb.planteome.org/?a=commitdiff_plain;h=47da5cd83d33c0eff5b60559859bfabe0614d8e4;p=old-jaiswallab-svn%2F.git

Image map for single segment.Done by Nikhil.

svn path=/; revision=272
---

diff --git a/Annotation/src/ie/dcu/apps/ist/AppWindow.java b/Annotation/src/ie/dcu/apps/ist/AppWindow.java
index 47b0a82..8694588 100644
--- a/Annotation/src/ie/dcu/apps/ist/AppWindow.java
+++ b/Annotation/src/ie/dcu/apps/ist/AppWindow.java
@@ -199,10 +199,12 @@ public class AppWindow extends ApplicationWindow implements FileDropListener {
 			AnnotationManager am = ctx.getAnnotations();
 			boolean hasObject = am.hasForegroundAnnotation() 
 				&& am.hasBackgroundAnnotation();
-			a.setEnabled(ExportImageMapAction.class, hasObject);
+		//	a.setEnabled(ExportImageMapAction.class, hasObject);
+			a.setEnabled(ExportImageMapAction.class, true);//change after demo
 		
 		} else {
-			a.setEnabled(ExportImageMapAction.class, false);
+			//a.setEnabled(ExportImageMapAction.class, false);
+			a.setEnabled(ExportImageMapAction.class, true);// change after demo
 		}
 	}
 	
@@ -707,8 +709,9 @@ public class AppWindow extends ApplicationWindow implements FileDropListener {
 				{
 					if(view.getContext().getEnabledMask().getImageData().getPixel(pt.x,pt.y) != 0 && (view.getPainter().getName().equals("Combined")) && SegmentationView.getLabelMode())
 		        	{	
-						view.getCanvas().setToolTipText(view.getContext().getEnabledMask().segmentName);
-						SegmentationView.comboLabel.setText(view.getContext().getEnabledMask().segmentName);
+						String segmentName = view.getContext().getEnabledMask().segmentName;
+						view.getCanvas().setToolTipText(segmentName);
+						SegmentationView.comboLabel.setText(segmentName);
 		            	return;
 		        	}
 		        	else
diff --git a/Annotation/src/ie/dcu/apps/ist/actions/ExportImageMapAction.java b/Annotation/src/ie/dcu/apps/ist/actions/ExportImageMapAction.java
index 3efe020..bef17a8 100644
--- a/Annotation/src/ie/dcu/apps/ist/actions/ExportImageMapAction.java
+++ b/Annotation/src/ie/dcu/apps/ist/actions/ExportImageMapAction.java
@@ -36,7 +36,7 @@ public class ExportImageMapAction extends AppAction{
 				
 				// Grab image and mask
 				SegmentationContext ctx = window.getContext();
-				SegmentationMask mask = ctx.getMask();
+				SegmentationMask mask = ctx.getSegmentationMasks().get(0);
 				BufferedImage image = ImageConverter.convert(ctx.getImageData());
 				
 				// Setup exporter