From: lingutln <lingutln@localhost>
Date: Tue, 3 Jan 2012 20:00:50 +0000 (+0000)
Subject: Added new icon for specifying to form a segment. Done by Nikhil.
X-Git-Url: http://gitweb.planteome.org/?a=commitdiff_plain;h=bda4c2a2e75d95727d9f80308610ca93995b2cdd;p=old-jaiswallab-svn%2F.git

Added new icon for specifying to form a segment. Done by Nikhil.

svn path=/; revision=248
---

diff --git a/Annotation/resources/config/view.properties b/Annotation/resources/config/view.properties
index 7759757..38e43a0 100644
--- a/Annotation/resources/config/view.properties
+++ b/Annotation/resources/config/view.properties
@@ -7,6 +7,9 @@ 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.FormSegment.text=Form a segment from current view.
+SegmentationView.Action.FormSegment.tooltip=Form a segment from current view.
+SegmentationView.Action.FormSegment.image=file:resources/icons/apply.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/views/SegmentationView.java b/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
index 3695cb8..7de28f5 100644
--- a/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
+++ b/Annotation/src/ie/dcu/apps/ist/views/SegmentationView.java
@@ -95,6 +95,7 @@ public class SegmentationView extends Composite {
 		Foreground,
 		Background,
 		OperatingMode,
+		FormSegment,
 		ZoomIn,
 		ZoomOut,
 		ZoomOriginal,
@@ -174,6 +175,7 @@ public class SegmentationView extends Composite {
 		m.add(getAction(Tool.Foreground));
 		m.add(getAction(Tool.Background));
 		m.add(getAction(Tool.OperatingMode));
+		m.add(getAction(Tool.FormSegment));
 		m.add(new Separator());
 		m.add(getAction(Tool.ZoomIn));
 		m.add(getAction(Tool.ZoomOut));
@@ -830,6 +832,7 @@ public class SegmentationView extends Composite {
 			Tool.Foreground.action.setEnabled(!labelMode && canZoomIn());
 			Tool.Background.action.setEnabled(!labelMode && canZoomIn());
 			Tool.OperatingMode.action.setEnabled(canZoomIn());
+			Tool.FormSegment.action.setEnabled(CanLabel());
 						
 			// Always enabled if view enabled
 			Tool.SetBrushSize.action.setEnabled(true);