Added Toggle Between Segmentation and Labelling icon in the menu bar. Done by Nikhil.

svn path=/; revision=236

diff --git a/Annotation/resources/config/view.properties b/Annotation/resources/config/view.properties
index 73be3a2a7cf310832e86d907d709741f247534e7..77597571b7b41394c6eb00a0295113587d82c4e7 100644 (file)
--- a/Annotation/resources/config/view.properties
+++ b/Annotation/resources/config/view.properties
@@ -4,6 +4,9 @@ SegmentationView.Action.Foreground.image=file:resources/icons/foreground.png
 SegmentationView.Action.Background.text=Markup Background
 SegmentationView.Action.Background.tooltip=Markup Background Pixels
 SegmentationView.Action.Background.image=file:resources/icons/background.png
+SegmentationView.Action.OperatingMode.text=Toggle between Segmentation and Labelling
+SegmentationView.Action.OperatingMode.tooltip=Toggle between Segmentation and Labelling
+SegmentationView.Action.OperatingMode.image=file:resources/icons/copy.png
 SegmentationView.Action.ZoomIn.text=Zoom In
 SegmentationView.Action.ZoomIn.tooltip=Zoom In
 SegmentationView.Action.ZoomIn.image=file:resources/icons/zoom-in.png

diff --git a/Annotation/src/ie/dcu/apps/ist/AppWindow.java b/Annotation/src/ie/dcu/apps/ist/AppWindow.java
index 59b42117e2663e1cafdc234a30ff7546b54ad129..30e33153cb3a293039e588b9f255913186dba1ab 100644 (file)
--- a/Annotation/src/ie/dcu/apps/ist/AppWindow.java
+++ b/Annotation/src/ie/dcu/apps/ist/AppWindow.java
@@ -221,7 +221,7 @@ public class AppWindow extends ApplicationWindow implements FileDropListener {
                super.configureShell(shell);
                updateWindowTitle();
                loadIcons(shell);
-               shell.setSize(800, 600);
+               shell.setSize(900, 650);
                SwtUtils.center(shell);
        }
        

diff --git a/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java b/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
index d7dadce8cd239c231e8a603946eef28113ac88e8..56669a48bd3c10eff43995042bfcaf59396788e7 100644 (file)
--- a/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
+++ b/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
@@ -89,6 +89,7 @@ public class SegmentationView extends Composite {
        public enum Tool {
                Foreground,
                Background,
+               OperatingMode,
                ZoomIn,
                ZoomOut,
                ZoomOriginal,
@@ -163,6 +164,7 @@ public class SegmentationView extends Composite {
                ToolBarManager m = new ToolBarManager(bar1);
                m.add(getAction(Tool.Foreground));
                m.add(getAction(Tool.Background));
+               m.add(getAction(Tool.OperatingMode));
                m.add(new Separator());
                m.add(getAction(Tool.ZoomIn));
                m.add(getAction(Tool.ZoomOut));