Data retrieval functionality completed and using ontologyterm object everywhere....

svn path=/; revision=336

diff --git a/Annotation/resources/config/actions.properties b/Annotation/resources/config/actions.properties
index ecffedd1f7a171c8cccdbc2cc4269f68e9e3ddbe..57e4dade646208822b8e872ffb1fa4f4c8df0b32 100644 (file)
--- a/Annotation/resources/config/actions.properties
+++ b/Annotation/resources/config/actions.properties
@@ -1,7 +1,7 @@
 
 OpenAction.dialog.text=Open an image or saved context
-OpenAction.dialog.filter.exts=*.jpg;*.jpeg;*.png;*.gif;*.bmp;*.ctx;*.imgmap
-OpenAction.dialog.filter.text=Image,imagemap and Context Files
+OpenAction.dialog.filter.exts=*.jpg;*.jpeg;*.png;*.gif;*.bmp;*.ctx;*.zip
+OpenAction.dialog.filter.text=Image,Zip and Context Files
 
 SaveAction.dialog.text=Save Segmentation Context
 SaveAction.dialog.filter.exts=*.ctx

diff --git a/Annotation/src/ie/dcu/apps/ist/AppWindow.java b/Annotation/src/ie/dcu/apps/ist/AppWindow.java
index a5700ce8d11c532856da531a856a45aa62599b90..ccce7e1a09db6fd38a74f2136c33b497d77d6b97 100644 (file)
--- a/Annotation/src/ie/dcu/apps/ist/AppWindow.java
+++ b/Annotation/src/ie/dcu/apps/ist/AppWindow.java
@@ -288,7 +288,7 @@ public class AppWindow extends ApplicationWindow implements FileDropListener {
                
                file.add(new Separator());
                file.add(actions.get(SaveAction.class));
-               file.add(actions.get(SaveAsAction.class));
+               //file.add(actions.get(SaveAsAction.class));
                file.add(new Separator());
                
                // Export Menu is hidden so as not to confuse the user. Instead this functionality is provided as Save

diff --git a/Annotation/src/ie/dcu/apps/ist/actions/OpenAction.java b/Annotation/src/ie/dcu/apps/ist/actions/OpenAction.java
index 797723aae57739938728f075fef0bac98709ee45..ed1790cb1c701154ef773fe9f551a1a7ab232b85 100644 (file)
--- a/Annotation/src/ie/dcu/apps/ist/actions/OpenAction.java
+++ b/Annotation/src/ie/dcu/apps/ist/actions/OpenAction.java
@@ -20,7 +20,7 @@ public class OpenAction extends AppAction {
        /**
         * The file extension given to a this object when it is saved on a disk
         */
-       public static final String IMGMAP_EXTENSION = ".imgmap";
+       public static final String IMGMAP_EXTENSION = ".zip";
        
        public OpenAction(ActionManager m) {
                super(m);

diff --git a/Annotation/src/ie/dcu/apps/ist/actions/SaveAction.java b/Annotation/src/ie/dcu/apps/ist/actions/SaveAction.java
index 0f37a7d33063364fa2f58575c0c873c1a6ce2e27..2821edb861c5048960d4dc98d191c4b446d76a0f 100644 (file)
--- a/Annotation/src/ie/dcu/apps/ist/actions/SaveAction.java
+++ b/Annotation/src/ie/dcu/apps/ist/actions/SaveAction.java
@@ -27,7 +27,7 @@ public class SaveAction extends AppAction {
        /**
         * The file extension given to a this object when it is saved on a disk
         */
-       public static final String IMGMAP_EXTENSION = ".imgmap";
+       public static final String IMGMAP_EXTENSION = ".zip";
        
        public SaveAction(ActionManager m) {
                super(m);

diff --git a/Annotation/src/ie/dcu/apps/ist/export/imagemap/Exporter.java b/Annotation/src/ie/dcu/apps/ist/export/imagemap/Exporter.java
index 202e72009662ef288092915fe0a37a92a92ea2aa..037b02c5bbca83a61bf4cc993b20361d08e0e050 100644 (file)
--- a/Annotation/src/ie/dcu/apps/ist/export/imagemap/Exporter.java
+++ b/Annotation/src/ie/dcu/apps/ist/export/imagemap/Exporter.java
@@ -317,6 +317,11 @@ public class Exporter {
                          Element annotationTermElem = document.createElement("annotation_term");
                          annotationTermElem.appendChild(document.createTextNode(annotationTerm));
                          segmentElement.appendChild(annotationTermElem);
+                         
+                         String annotationId = mask.ontologyTerm.getAccessionId();
+                         Element annotationIdElem = document.createElement("annotation_id");
+                         annotationIdElem.appendChild(document.createTextNode(annotationId));
+                         segmentElement.appendChild(annotationIdElem);                   
                  }
                  
                  TransformerFactory transformerFactory = TransformerFactory.newInstance();

diff --git a/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java b/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
index 964b486322f93b47aab1f548147ff7d48b634b12..b191cfe39df54f16b16db8b31dbddb3fe275692a 100644 (file)
--- a/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
+++ b/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
@@ -334,7 +334,6 @@ public class SegmentationView extends Composite {
         * (before assign button is clicked)
        */
        public static void termDetailLookup(String accessionId) {
-               System.out.println("curr accession id (from segment or label): " + accessionId);
                termDetailTable.setEnabled(true);
 
                String webServiceURL = new String(); 

diff --git a/Annotation/src/ie/dcu/segment/SegmentationContext.java b/Annotation/src/ie/dcu/segment/SegmentationContext.java
index 9053b53c24eff25425ac5888922783e8aaaf9d0d..4831a5b719b52fbf92b05174d0e918013262f208 100644 (file)
--- a/Annotation/src/ie/dcu/segment/SegmentationContext.java
+++ b/Annotation/src/ie/dcu/segment/SegmentationContext.java
@@ -522,7 +522,7 @@ public class SegmentationContext {
                                        // getting collection ids
                                        NodeList nlist = docEle.getElementsByTagName("segment");
                                        noOfSegments = nlist.getLength();
-                                       tempStorage = new String[nlist.getLength()][3];
+                                       tempStorage = new String[nlist.getLength()][4];
                                                if(nlist != null && nlist.getLength() > 0)
                                                {
                                                        for(int i = 0 ; i < nlist.getLength();i++) 
@@ -560,7 +560,7 @@ public class SegmentationContext {
                {
                        for(int i = 0 ; i < noOfSegments;i++) 
                        {
-                               for(int x = 0 ; x < 3;x++) 
+                               for(int x = 0 ; x < 4;x++) 
                                {
                                        if (x == 1)
                                        {
@@ -570,10 +570,16 @@ public class SegmentationContext {
                                        {
                                                segmentationMaskObjects.get(i).ontologyTerm.setName(tempStorage[i][x]);
                                        }
+                                       if (x == 3)
+                                       {
+                                               segmentationMaskObjects.get(i).ontologyTerm.setAccessionId(tempStorage[i][x]);
+                                       }
                                }
                        }
                        in.close();
                }
+               SegmentationView.comboLabel.setText(tempStorage[noOfSegments-1][2]);
+               SegmentationView.termDetailLookup(ctx.getEnabledMask().ontologyTerm.getAccessionId());
                return ctx;
 }