Saving metadata to HTML imagemap. Done by Nikhil.

svn path=/; revision=298

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 fdd16283e065c3fe0e188d86aa623850f38be9e8..32fcac1dca5137a86bcb45b39513db0a1912ba80 100644 (file)
--- a/Annotation/src/ie/dcu/apps/ist/export/imagemap/Exporter.java
+++ b/Annotation/src/ie/dcu/apps/ist/export/imagemap/Exporter.java
@@ -97,7 +97,10 @@ public class Exporter {
                map.setImageName(imageName);
                map.setCuratorName(SegmentationView.curatorCombo.getText());
                map.setSpeciesName(SegmentationView.speciesCombo.getText());
-               map.setCollectionId(Integer.parseInt(SegmentationView.collectionId.getText()));
+               if(!(SegmentationView.collectionId.getText().equals("")))
+               {
+                       map.setCollectionId(Integer.parseInt(SegmentationView.collectionId.getText()));
+               }
                map.setComments(SegmentationView.comment.getText());
                
                List<String> preloads = new ArrayList<String>();

diff --git a/Annotation/src/ie/dcu/apps/ist/export/imagemap/ImageMap.java b/Annotation/src/ie/dcu/apps/ist/export/imagemap/ImageMap.java
index 6f7f7adff6ee9da036865aba5736d6e406b1674d..58ccfbb1af4b26ab4013c760de2068118b4fd9a6 100644 (file)
--- a/Annotation/src/ie/dcu/apps/ist/export/imagemap/ImageMap.java
+++ b/Annotation/src/ie/dcu/apps/ist/export/imagemap/ImageMap.java
@@ -190,7 +190,6 @@ public class ImageMap {
        public void exportToFile(File file) throws IOException {
                FileWriter writer = new FileWriter(file);
                try {
-                       System.out.println("Content"+export().toString());
                        writer.append(export());
                } finally {
                        writer.close();

diff --git a/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java b/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
index 031225bfb5baeb824de75c4a3e23441f6a0bca56..59358b2eb48237157749ca6cfefa2277eefce689 100644 (file)
--- a/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
+++ b/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
@@ -137,7 +137,7 @@ public class SegmentationView extends Composite {
                viewSelectionToolbar = new ToolBar(this, SWT.RIGHT | SWT.FLAT);
                termLookupBar = new ToolBar(this, SWT.RIGHT | SWT.FLAT);
                view = new AnnotatedImageControl(this, SWT.BORDER);
-               termDetailComposite = new Composite(this, SWT.BORDER);
+               termDetailComposite = new Composite(this, SWT.RIGHT | SWT.FLAT | SWT.BORDER);
                
                brushControl = new BrushControl(getShell(), SWT.BORDER);
                eventHandler = new EventHandler();
@@ -411,7 +411,8 @@ public class SegmentationView extends Composite {
                
                // Layout term lookup toolbar
                gd = new GridData();
-               gd.horizontalAlignment = SWT.FILL;
+               gd.horizontalAlignment = SWT.LEFT;
+               gd.grabExcessHorizontalSpace = true;
                gd.verticalAlignment = GridData.BEGINNING;
                gd.verticalIndent = 1;
                gd.verticalSpan = 1;
@@ -424,6 +425,7 @@ public class SegmentationView extends Composite {
                // Inner composite properties
                gd = new GridData();
                gd.verticalAlignment = GridData.BEGINNING;
+               gd.horizontalAlignment = SWT.LEFT;
                gd.grabExcessHorizontalSpace = true;
                gd.grabExcessVerticalSpace = true;
                termDetailComposite.setLayoutData(gd);