From 6dca01986ed7d07c88dba1f3695050f113e7f9ec Mon Sep 17 00:00:00 2001
From: lingutln <lingutln@localhost>
Date: Fri, 10 Feb 2012 21:54:14 +0000
Subject: [PATCH] Saving metadata to HTML imagemap. Done by Nikhil.

svn path=/; revision=298
---
 .../src/ie/dcu/apps/ist/export/imagemap/Exporter.java       | 5 ++++-
 .../src/ie/dcu/apps/ist/export/imagemap/ImageMap.java       | 1 -
 Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java  | 6 ++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

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 fdd1628..32fcac1 100644
--- 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 6f7f7ad..58ccfbb 100644
--- 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 031225b..59358b2 100644
--- 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);
-- 
2.34.1