From 5e268e932bd39906b9896b9c9368d58fea2cd537 Mon Sep 17 00:00:00 2001
From: lingutln <lingutln@localhost>
Date: Tue, 27 Dec 2011 22:58:54 +0000
Subject: [PATCH] PO:ID instead of parent, Layout change, cursor change and
 slight modifications. Done by Nikhil.

svn path=/; revision=241
---
 Annotation/src/ie/dcu/apps/ist/AppWindow.java | 55 +++++++++++--------
 .../dcu/apps/ist/views/SegmentationView.java  | 25 ++-------
 .../ist/widgets/AnnotatedImageControl.java    |  7 ++-
 3 files changed, 43 insertions(+), 44 deletions(-)

diff --git a/Annotation/src/ie/dcu/apps/ist/AppWindow.java b/Annotation/src/ie/dcu/apps/ist/AppWindow.java
index 70f8668..f9a2a70 100644
--- a/Annotation/src/ie/dcu/apps/ist/AppWindow.java
+++ b/Annotation/src/ie/dcu/apps/ist/AppWindow.java
@@ -620,7 +620,7 @@ public class AppWindow extends ApplicationWindow implements FileDropListener {
 	};
 	
 	
-	private class ImageObserver implements MouseMoveListener, ContextChangeListener {
+	private class ImageObserver implements MouseMoveListener, MouseListener, ContextChangeListener {
 		private static final String MONOSPACE_FONT = "Monospace";
 
 		private final ImageControl ctrl;
@@ -631,6 +631,10 @@ public class AppWindow extends ApplicationWindow implements FileDropListener {
 		public ImageObserver(SegmentationView view) {
 			view.addContextChangeListener(this);
 			view.getCanvas().addMouseMoveListener(this);
+			if(SegmentationView.labelMode)
+			{
+				view.getCanvas().addMouseListener(this);
+			}
 			ctrl = view.getImageControl();
 			contextChanged(view.getContext());
 			FontDescriptor fd = FontDescriptor.createFrom(MONOSPACE_FONT, 8, SWT.NORMAL);
@@ -701,27 +705,19 @@ public class AppWindow extends ApplicationWindow implements FileDropListener {
 				Font font = JFaceResources.getFont(MONOSPACE_FONT);
 				getStatusLineManager().getControl().setFont(font);
 			}
-			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().addMouseMoveListener(mouseListener);
-			    status(AppStatus.Information, 
-							"Location [%4d,%4d] Color [%3d,%3d,%3d]",
-							pt.x, pt.y, c.red, c.green, c.blue);
-			  inside = true;
+			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)
+	        	  {
+	        		  view.getCanvas().setToolTipText(null);
+	        	  }
+			}
+			inside = true;
 		}
 
 
@@ -737,5 +733,20 @@ public class AppWindow extends ApplicationWindow implements FileDropListener {
 				image = null;
 			}
 		}
+		@Override
+		public void mouseDoubleClick(MouseEvent arg0) {
+			System.out.println("In mouse double click");
+			
+		}
+		@Override
+		public void mouseDown(MouseEvent arg0) {
+			System.out.println("In mouse down");
+			
+		}
+		@Override
+		public void mouseUp(MouseEvent arg0) {
+			System.out.println("In mouse up");
+			
+		}
 	}
 }
diff --git a/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java b/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
index 8d750b9..4f283ef 100644
--- a/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
+++ b/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
@@ -70,7 +70,7 @@ public class SegmentationView extends Composite {
 	private boolean auto = true;
 
 	// Inorder to toggle between segmentation and Labelling mode. Initially under Segmentation Mode
-	private boolean labelMode = false;
+	public static boolean labelMode = false;
 	
 	// Combo box housing the selectable views
 	private Combo combo;
@@ -440,7 +440,7 @@ public class SegmentationView extends Composite {
 	}
 	
 	public void setLabellingMode(boolean checked) {
-		if (!this.labelMode && checked) {
+		if (!labelMode && checked) {
 			// Toggling between Segmentation and labelling
 			Tool.Foreground.action.setEnabled(false);
 			Tool.Background.action.setEnabled(false);
@@ -455,7 +455,7 @@ public class SegmentationView extends Composite {
 			view.addContextChangeListener(eventHandler);
 			view.getTool().attach(view.getImageControl());
 		}
-		this.labelMode = checked;
+		labelMode = checked;
 		updateToolStates();
 	}
 	
@@ -866,18 +866,9 @@ public class SegmentationView extends Composite {
 		        String listElement;
 		        for(int i=0; i<array.length();i++)
 		        {
-		        	if(array.getJSONObject(i).getString("match_type").trim().equals("synonym"))
-		        	{
-		        		listElement = (array.getJSONObject(i).getString("match")+" {"+array.getJSONObject(i).getString("is_synonym_of")+"}");
-		        		listElement = StringEscapeUtils.unescapeHtml4(listElement);
-		        		comboLabel.add(listElement,i);
-		        	}
-		        	else if(array.getJSONObject(i).getString("match_type").equals("term"))
-		        	{
-		        		listElement = array.getJSONObject(i).getString("match");
-		        		listElement = StringEscapeUtils.unescapeHtml4(listElement);
-		        		comboLabel.add(listElement,i);
-		        	}
+		        	listElement = (array.getJSONObject(i).getString("match")+" {"+array.getJSONObject(i).getString("accession_id")+"}");
+		        	listElement = StringEscapeUtils.unescapeHtml4(listElement);
+		        	comboLabel.add(listElement,i);
 		        }
 		        in.close();
 	        }
@@ -1001,17 +992,14 @@ public class SegmentationView extends Composite {
 			updateToolStates();
 		}
 		
-
 		public void widgetSelected(SelectionEvent e) {
 			setBrushSize(brushControl.getBrushSize());
 		}
 		
-
 		public void contextChanged(ContextChangedEvent e) {
 			handleContextChanged(e);
 		}
 		
-
 		public void annotationPerformed(AnnotationEvent e) {
 			if (!isEnabled()) {
 				log.warning("annotation performed while not enabled");
@@ -1022,7 +1010,6 @@ public class SegmentationView extends Composite {
 			}
 			updateToolStates();
 		}
-
 		
 		public void annotationRedone(AnnotationEvent e) {
 			if (!isEnabled()) {
diff --git a/Annotation/src/ie/dcu/apps/ist/widgets/AnnotatedImageControl.java b/Annotation/src/ie/dcu/apps/ist/widgets/AnnotatedImageControl.java
index ef1fd10..cfca8a2 100644
--- a/Annotation/src/ie/dcu/apps/ist/widgets/AnnotatedImageControl.java
+++ b/Annotation/src/ie/dcu/apps/ist/widgets/AnnotatedImageControl.java
@@ -3,6 +3,7 @@ package ie.dcu.apps.ist.widgets;
 
 import ie.dcu.apps.ist.controllers.AnnotationTool;
 import ie.dcu.apps.ist.event.*;
+import ie.dcu.apps.ist.views.SegmentationView;
 import ie.dcu.segment.SegmentationContext;
 import ie.dcu.segment.annotate.*;
 import ie.dcu.segment.painters.*;
@@ -363,7 +364,7 @@ public class AnnotatedImageControl extends Composite {
 
 	private final DisposeListener disposeListener = new DisposeListener() {
 		public void widgetDisposed(DisposeEvent e) {
-			if (cursor != null) {
+			if (cursor != null && SegmentationView.labelMode) {
 				cursor.dispose();
 			}
 		}
@@ -378,7 +379,7 @@ public class AnnotatedImageControl extends Composite {
 
 		public void mouseMove(MouseEvent e) {
 			Canvas canvas = view.getCanvas();
-			if (view.imageContains(new Point(e.x, e.y))) {
+			if (view.imageContains(new Point(e.x, e.y)) && !SegmentationView.labelMode) {
 				if (cursor == null) {
 					cursor = CursorFactory.createCrosshairCursor();
 				}
@@ -388,7 +389,7 @@ public class AnnotatedImageControl extends Composite {
 			}
 		}
 	};
-
+	
 
 	/**
 	 * Listens for annotations and updates the buffer and view accordingly.
-- 
2.34.1