From: preecej <preecej@localhost>
Date: Thu, 8 Nov 2012 23:26:31 +0000 (+0000)
Subject: svn path=/; revision=407
X-Git-Url: http://gitweb.planteome.org/?a=commitdiff_plain;h=0f18b7385e766e0d12ae5715d0e74c0e82e61b71;p=old-jaiswallab-svn%2F.git

svn path=/; revision=407
---

diff --git a/Annotation/resources/doc/help.html b/Annotation/resources/doc/help.html
index eaf5383..f8549f9 100644
--- a/Annotation/resources/doc/help.html
+++ b/Annotation/resources/doc/help.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html><head><meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>SIA (Semantic Image Annotator), v0.2 - User Guide</title><style type="text/css">
+<html><head><meta content="text/html; charset=ISO-8859-1" http-equiv="content-type"><title>AISO (Annotation of Image Segments using Ontologies), v0.2.1 - User Guide</title><style type="text/css">
 .guicommand {
   font-family: "Courier New",Courier,monospace;
   font-weight: normal;
@@ -58,7 +58,7 @@ li {
 <div class="all">
 <h1><img src="../icons/icon-48.png"> Semantic Image Annotator, v0.2 <i>(beta)</i></h1>
 <h2>User Guide</h2>
-SIA is an interactive image segmentation tool designed to allow curators of biological specimens to segment and annotate image data with
+AISO is an interactive image segmentation tool designed to allow curators of biological specimens to segment and annotate image data with
 ontology terms.
 <br>
 <br>
@@ -70,7 +70,7 @@ Recent</span> menu. Alternatively, an image file can be dragged
 from your file system and dropped into the application to open it.
 Currently images of type JPEG, PNG, GIF, and BMP are supported.<br>
 <br>
-NOTE: You may also open images previously annotated in SIA. These files are marked with a .zip file extension and contain your previously-saved 
+NOTE: You may also open images previously annotated in AISO. These files are marked with a .zip file extension and contain your previously-saved 
 segments, labels, and other annotation data.
 <br><br>
 <span class="section">Segmenting the Image&nbsp;</span><br class="section">
@@ -89,7 +89,7 @@ or add additional foreground and background lines to refine the segmentation.<br
 If you are satisfied with the segmentation, you may click the <img src="../icons/apply.png" title="Form a segment from current view" alt="Apply"> icon to "form", or permanently affix, the segment. 
 <br><br>
 <span class="section">Labeling Segments</span><br>
-SIA has been integrated with ontology terms (currently provided by the Plant Ontology &lt;http://www.plantontology.org&gt;) to assist you in annotating your image segments.
+AISO has been integrated with ontology terms (currently provided by the Plant Ontology &lt;http://www.plantontology.org&gt;) to assist you in annotating your image segments.
 After forming a segment, click on the Labeling Mode icon (<i>menu bar:</i>&nbsp;<img src="../icons/copy.png" title="Labeling Mode" alt="Labeling Mode">)
 and then search for Plant Ontology terms in the "Annotate" text box in the upper-right hand corner. After selecting a term, click the "Assign" button and your segment will be labeled.
 If you want to perform more segmentation and labeling in your image, remember to first change your annotation mode by clicking
@@ -97,10 +97,10 @@ on the Segmentation Mode icon (<i>menu bar:</i>&nbsp;<img src="../icons/foregrou
 <br><br>
 <span class="section">Other Annotation Data</span><br>
 You can supply a curator name, independent collection ID, and comments for each image.
-You may also associate your annotated image with a taxonomic identifier. SIA uses the UBio &lt;http://www.ubio.org&gt; Namebank Search taxonomy web service to provide you with
+You may also associate your annotated image with a taxonomic identifier. AISO uses the UBio &lt;http://www.ubio.org&gt; Namebank Search taxonomy web service to provide you with
 a searchable list of species.
 <br><br>
-NOTE: SIA currently requires an internet connection for the term label and species lookup web services to function properly. Your computer will need an active internet connection
+NOTE: AISO currently requires an internet connection for the term label and species lookup web services to function properly. Your computer will need an active internet connection
 if you would like to use these features. 
 <br><br>
 <span class="section">Undo, Redo and Clear</span><br>
@@ -145,7 +145,7 @@ You may also want to export your annotated image as an HTML file for easy displa
 To export your current annotations as HTML-enabled images, check the box marked "Create HTML image map and open in browser" in the Save dialog box.
 <br><br>
 <span class="section">Requesting Features and Reporting Problems</span><br>
-If you have an additional feature you would like to suggest, or if you have encountered any issues while using SIA, please send
+If you have an additional feature you would like to suggest, or if you have encountered any issues while using AISO, please send
 us an email at &lt;sia-support@palea.cgrb.oregonstate.edu&gt;
 <br><br>
 <div class="footer">Orig. Kevin McGuinness 2008, Ed. Justin Preece 2012
diff --git a/Annotation/src/ie/dcu/apps/ist/Application.java b/Annotation/src/ie/dcu/apps/ist/Application.java
index 2442867..ecbd817 100644
--- a/Annotation/src/ie/dcu/apps/ist/Application.java
+++ b/Annotation/src/ie/dcu/apps/ist/Application.java
@@ -18,7 +18,7 @@ import static ie.dcu.util.OsUtils.*;
  */
 public class Application {
 	public static final String APP_ID   = "ist";
-	public static final String APP_NAME = "SIA (Semantic Image Annotator)";
+	public static final String APP_NAME = "AISO (Annotation of Image Segments using Ontologies)";
 	public static final String APP_VERSION  = "0.2.1 (beta)";
 	public static final String APP_RESOURCE_DIR = "resources";
 	
diff --git a/Annotation/src/ie/dcu/apps/ist/actions/AboutAction.java b/Annotation/src/ie/dcu/apps/ist/actions/AboutAction.java
index ae661a8..fe1b332 100644
--- a/Annotation/src/ie/dcu/apps/ist/actions/AboutAction.java
+++ b/Annotation/src/ie/dcu/apps/ist/actions/AboutAction.java
@@ -86,8 +86,8 @@ public class AboutAction extends AppAction {
 			String image = string("aboutImage");
 			addImage(image);
 			
-			addLabel("SIA (Semantic Image Annotator)" + System.getProperty("line.separator") 
-					+ "Ontology-Enabled Image Annotation", SWT.CENTER);
+			addLabel("AISO (Annotation of Image Segments using Ontologies)" + System.getProperty("line.separator") 
+					+ "Ontology-Enabled Image Segmentation and Annotation", SWT.CENTER);
 			
 			// 2nd row
 			addLabel(String.format("Version %s", Application.APP_VERSION), SWT.CENTER);
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 7eb8618..5386503 100644
--- a/Annotation/src/ie/dcu/apps/ist/export/imagemap/Exporter.java
+++ b/Annotation/src/ie/dcu/apps/ist/export/imagemap/Exporter.java
@@ -271,7 +271,7 @@ public class Exporter {
 		  Element rootElement = document.createElement("image_data");
 		  document.appendChild(rootElement);
 
-		  Element versionElement = document.createElement("sia_version");
+		  Element versionElement = document.createElement("app_version");
 		  versionElement.setTextContent(Application.APP_VERSION);
 		  rootElement.appendChild(versionElement);
 
