Toggling between segmentation and labeling functionality. Done by Nikhil.

svn path=/; revision=239

diff --git a/Annotation/.classpath b/Annotation/.classpath
index 8e0a039b7e73df9ecc196f9fc27208cee45a9507..22412b6c9a2c02f608af7c008e1447f0c9cabf62 100644 (file)
--- a/Annotation/.classpath
+++ b/Annotation/.classpath
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry kind="src" path="src"/>\r
-       <classpathentry excluding="src/" kind="src" path=""/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
-       <classpathentry kind="lib" path="C:/Users/Nikhil/workspace/image_annotation/lib/swt-win.jar"/>\r
-       <classpathentry kind="lib" path="C:/Users/Nikhil/workspace/image_annotation/lib/jface.jar"/>\r
-       <classpathentry kind="lib" path="C:/Users/Nikhil/workspace/Annotation/library/commons-lang3-3.1.jar"/>\r
-       <classpathentry kind="lib" path="C:/Users/Nikhil/workspace/Annotation/library/json.jar"/>\r
-       <classpathentry kind="output" path="bin"/>\r
-</classpath>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="src" path="src"/>
+       <classpathentry excluding="src/" kind="src" path=""/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+       <classpathentry kind="lib" path="/home/lingutln/workspace/Annotation/library/commons-lang3-3.1.jar"/>
+       <classpathentry kind="lib" path="/home/lingutln/workspace/Annotation/library/jface.jar"/>
+       <classpathentry kind="lib" path="/home/lingutln/workspace/Annotation/library/json.jar"/>
+       <classpathentry kind="lib" path="/home/lingutln/workspace/Annotation/library/swt-gtk-64.jar"/>
+       <classpathentry kind="output" path="bin"/>
+</classpath>

diff --git a/Annotation/src/ie/dcu/apps/ist/controllers/AnnotationTool.java b/Annotation/src/ie/dcu/apps/ist/controllers/AnnotationTool.java
index e02fecfdf5998edc2997d187bd1a55bd9243b52a..96ae645665376234cf698d61282bbd91127ab72d 100644 (file)
--- a/Annotation/src/ie/dcu/apps/ist/controllers/AnnotationTool.java
+++ b/Annotation/src/ie/dcu/apps/ist/controllers/AnnotationTool.java
@@ -106,7 +106,7 @@ public class AnnotationTool extends MouseMotionAdapter {
        /**
         * @param type the annotation type to set
         */
-       public void setType(AnnotationType type, boolean isLabelling) {
+       public void setType(AnnotationType type) {
                assert (type != null);
                this.type = type;
        }

diff --git a/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java b/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
index c13f1a998d42fb62a6913fc2b3e22c5be3e9fbb2..62e0ac0223104c00e5182945de3349e5153f9e45 100644 (file)
--- a/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
+++ b/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
@@ -351,8 +351,8 @@ public class SegmentationView extends Composite {
        }
        
 
-       public void setAnnotationType(AnnotationType type, boolean isLabelling) {
-               view.setAnnotationType(type, isLabelling);
+       public void setAnnotationType(AnnotationType type) {
+               view.setAnnotationType(type);
        }
        
        
@@ -435,7 +435,6 @@ public class SegmentationView extends Composite {
                        // Toggling between Segmentation and labelling
                        Tool.Foreground.action.setEnabled(false);
                        Tool.Background.action.setEnabled(false);
-                       setAnnotationType(AnnotationType.Background, true);
                        view.removeContextChangeListener(eventHandler);
                        if(!(view.getTool() == null))
                        {
@@ -733,10 +732,10 @@ public class SegmentationView extends Composite {
        private void execute(Tool a, Event e) {
                switch (a) {
                case Foreground:
-                       setAnnotationType(AnnotationType.Foreground, false);
+                       setAnnotationType(AnnotationType.Foreground);
                        break;
                case Background:
-                       setAnnotationType(AnnotationType.Background, false);
+                       setAnnotationType(AnnotationType.Background);
                        break;
                case OperatingMode:
                        setLabellingMode(a.action.isChecked());

diff --git a/Annotation/src/ie/dcu/apps/ist/widgets/AnnotatedImageControl.java b/Annotation/src/ie/dcu/apps/ist/widgets/AnnotatedImageControl.java
index f023313d55715240f4d80a9d83e689649b1f9302..ef1fd103cd74bcc7c1ec213b16c6ce6abf9e2f39 100644 (file)
--- a/Annotation/src/ie/dcu/apps/ist/widgets/AnnotatedImageControl.java
+++ b/Annotation/src/ie/dcu/apps/ist/widgets/AnnotatedImageControl.java
@@ -127,9 +127,9 @@ public class AnnotatedImageControl extends Composite {
        }
        
        
-       public void setAnnotationType(AnnotationType type, boolean isLabelling) {
+       public void setAnnotationType(AnnotationType type) {
                if (getTool() != null) {
-                       getTool().setType(type, isLabelling);
+                       getTool().setType(type);
                }
        }