svn path=/; revision=457

diff --git a/Annotation/.classpath b/Annotation/.classpath
index 2f52523f4a9e813d0389265fb6c3d4ac99b7e3d4..66527f684020d37c1592ca404b0ae3ca8d7b24fb 100644 (file)
--- 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 (file)
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 (file)
index 0000000..a45e1ac
--- /dev/null
+++ b/Annotation/library/sia_win_32.jar:Zone.Identifier:$DATA
@@ -0,0 +1,2 @@
+[ZoneTransfer]\r
+ZoneId=3\r

diff --git a/Annotation/src/ie/dcu/apps/ist/labelling/OntologyTerm.java b/Annotation/src/ie/dcu/apps/ist/labelling/OntologyTerm.java
index 76b22abac52991f045fdb209782aaf87cf3e9e2c..e79e5b998de9f08dba97a41f12dc8a6797981df7 100644 (file)
--- 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í") + " {" + 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 0af29cc5446344380f12aeb3c3a77208d719a80c..3dbe79409925fc50faf9eb5749a1323eb8014ac6 100644 (file)
--- 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);