From: lingutln <lingutln@localhost>
Date: Thu, 4 Apr 2013 20:26:59 +0000 (+0000)
Subject: svn path=/; revision=457
X-Git-Url: http://gitweb.planteome.org/?a=commitdiff_plain;h=42bdde678f38235c025963051c64878c4d092bec;p=old-jaiswallab-svn%2F.git

svn path=/; revision=457
---

diff --git a/Annotation/.classpath b/Annotation/.classpath
index 2f52523..66527f6 100644
--- a/Annotation/.classpath
+++ b/Annotation/.classpath
@@ -7,7 +7,5 @@
 	<classpathentry kind="lib" path="/home/lingutln/workspace/Annotation/library/jface.jar"/>
 	<classpathentry kind="lib" path="/home/lingutln/workspace/Annotation/library/json.jar"/>
 	<classpathentry kind="lib" path="library/swt-gtk-64.jar"/>
-	<classpathentry kind="lib" path="library/ij.jar"/>
-	<classpathentry kind="lib" path="library/Jama-1.0.2.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/Annotation/library/sia_win_32.jar b/Annotation/library/sia_win_32.jar
new file mode 100644
index 0000000..d9d2c47
Binary files /dev/null and b/Annotation/library/sia_win_32.jar differ
diff --git a/Annotation/library/sia_win_32.jar:Zone.Identifier:$DATA b/Annotation/library/sia_win_32.jar:Zone.Identifier:$DATA
new file mode 100644
index 0000000..a45e1ac
--- /dev/null
+++ b/Annotation/library/sia_win_32.jar:Zone.Identifier:$DATA
@@ -0,0 +1,2 @@
+[ZoneTransfer]
+ZoneId=3
diff --git a/Annotation/src/ie/dcu/apps/ist/labelling/OntologyTerm.java b/Annotation/src/ie/dcu/apps/ist/labelling/OntologyTerm.java
index 76b22ab..e79e5b9 100644
--- a/Annotation/src/ie/dcu/apps/ist/labelling/OntologyTerm.java
+++ b/Annotation/src/ie/dcu/apps/ist/labelling/OntologyTerm.java
@@ -40,7 +40,8 @@ public class OntologyTerm {
 	}
 	// returns an HTML-safe label formatted to include both name and accession id
 	public String getFormattedTerm() {
-		return StringEscapeUtils.unescapeHtml4(this.name) + " {" + this.accessionId + "}";
+		//return StringEscapeUtils.unescapeHtml4(this.name) + " {" + this.accessionId + "}";
+		return StringEscapeUtils.unescapeHtml4("cut&#237;") + " {" + this.accessionId + "}";
 	}
 
 	public void setAccessionId(String accessionId) {
diff --git a/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java b/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
index 0af29cc..3dbe794 100644
--- a/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
+++ b/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
@@ -1013,7 +1013,6 @@ public class SegmentationView extends Composite {
 						}
 					}
 				});
-				
 			}			
 			// Repaint everything
 			repaint();
@@ -1153,8 +1152,7 @@ public class SegmentationView extends Composite {
 		
 		updateToolStates();
 	}
-	
-	
+
 	private void updateToolStates() {
 		if (isEnabled()) {
 			Tool.Apply.action.setEnabled(!Tool.AutoApply.action.isChecked());
@@ -1166,7 +1164,11 @@ public class SegmentationView extends Composite {
 			Tool.ZoomBestFit.action.setEnabled(canZoomBestFit());
 			if(view.getContext() != null)
 			{
-				comboLabel.setEnabled((view.getContext().getSegmentationMasks().size() > 0));
+				comboLabel.setEnabled((view.getContext().getSegmentationMasks().size() > 0) && getLabelMode());
+				Tool.AssignButton.action.setEnabled(false);
+				assign.setEnabled(false);
+				termDetailTable.setEnabled(false);
+	    		termSynonymTable.setEnabled(false);
 			}
 			else
 			{
@@ -1180,7 +1182,6 @@ public class SegmentationView extends Composite {
 			Tool.SegmentMode.action.setEnabled(canZoomIn());
 			Tool.LabelMode.action.setEnabled(canZoomIn());
 			Tool.FormSegment.action.setEnabled(CanLabel());
-			Tool.PredictSegments.action.setEnabled(canZoomIn());
 						
 			// Always enabled if view enabled
 			Tool.SetBrushSize.action.setEnabled(true);