From b99c74e1fc04cd6ab124cb802cd0ce95eef5870b Mon Sep 17 00:00:00 2001 From: lingutln Date: Thu, 24 May 2012 20:56:07 +0000 Subject: [PATCH] Data retrieval functionality completed and using ontologyterm object everywhere. Done by Nikhil. svn path=/; revision=336 --- Annotation/resources/config/actions.properties | 4 ++-- Annotation/src/ie/dcu/apps/ist/AppWindow.java | 2 +- Annotation/src/ie/dcu/apps/ist/actions/OpenAction.java | 2 +- Annotation/src/ie/dcu/apps/ist/actions/SaveAction.java | 2 +- .../src/ie/dcu/apps/ist/export/imagemap/Exporter.java | 5 +++++ .../src/ie/dcu/apps/ist/views/SegmentationView.java | 1 - Annotation/src/ie/dcu/segment/SegmentationContext.java | 10 ++++++++-- 7 files changed, 18 insertions(+), 8 deletions(-) diff --git a/Annotation/resources/config/actions.properties b/Annotation/resources/config/actions.properties index ecffedd..57e4dad 100644 --- 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 a5700ce..ccce7e1 100644 --- 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 797723a..ed1790c 100644 --- 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 0f37a7d..2821edb 100644 --- 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 202e720..037b02c 100644 --- 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 964b486..b191cfe 100644 --- 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 9053b53..4831a5b 100644 --- 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; } -- 2.34.1