Symphony-DAS
diff --git a/‎src/main/matlab/+symphonyui/+app/NullProtocol.m‎
Lines changed: 1 addition & 1 deletion b/‎src/main/matlab/+symphonyui/+app/NullProtocol.m‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/main/matlab/+symphonyui/+ui/+presenters/MainPresenter.m‎
Lines changed: 8 additions & 3 deletions b/‎src/main/matlab/+symphonyui/+ui/+presenters/MainPresenter.m‎
Lines changed: 8 additions & 3 deletions
diff --git a/‎src/main/matlab/+symphonyui/+ui/+views/MainView.m‎
Lines changed: 29 additions & 12 deletions b/‎src/main/matlab/+symphonyui/+ui/+views/MainView.m‎
Lines changed: 29 additions & 12 deletions
diff --git a/‎src/main/resources/icons/invalid.png‎
956 Bytes b/‎src/main/resources/icons/invalid.png‎
956 Bytes
diff --git a/‎src/main/resources/icons/spinner.gif‎
3.06 KB b/‎src/main/resources/icons/spinner.gif‎
3.06 KB
diff --git a/‎src/main/resources/icons/valid.png‎
756 Bytes b/‎src/main/resources/icons/valid.png‎
756 Bytes
@@ -8,7 +8,7 @@
 
         function [tf, msg] = isValid(obj) %#ok<MANU>
             tf = false;
-            msg = [];
+            msg = 'Cannot run null protocol';
         end
 
     end
 
@@ -485,6 +485,7 @@ function updateStateOfControls(obj)
             isPausing = controllerState.isPausing();
             isViewingPaused = controllerState.isViewingPaused();
             isRecordingPaused = controllerState.isRecordingPaused();
+            isPaused = controllerState.isPaused();
             isStopping = controllerState.isStopping();
             isStopped = controllerState.isStopped();
             try
@@ -515,10 +516,14 @@ function updateStateOfControls(obj)
 
             if ~isValid
                 status = validationMessage;
-            elseif isStopped
-                status = '';
+                statusMode = obj.view.INVALID_STATUS_MODE;
             else
                 status = char(controllerState);
+                if isStopped || isPaused
+                    statusMode = obj.view.VALID_STATUS_MODE;
+                else
+                    statusMode = obj.view.BUSY_STATUS_MODE;
+                end
             end
 
             obj.view.enableNewFile(enableNewFile);
@@ -538,7 +543,7 @@ function updateStateOfControls(obj)
             obj.view.enableInitializeRig(enableInitializeRig);
             obj.view.enableConfigureDevices(enableConfigureDevices);
             obj.view.setStatus(status);
-            obj.view.setIsValid(isValid);
+            obj.view.setStatusMode(statusMode);
         end
 
         function onViewSelectedResetProtocol(obj, ~, ~)
 
@@ -43,6 +43,14 @@
         recordButton
         pauseButton
         stopButton
+        statusLabel
+        statusIcon
+    end
+    
+    properties (Constant)
+        VALID_STATUS_MODE       = 1
+        INVALID_STATUS_MODE     = 2
+        BUSY_STATUS_MODE        = 3
     end
 
     methods
@@ -241,8 +249,19 @@ function createUi(obj)
                 'String', ['<html><img src="' path2Url(App.getResource('icons', 'stop_big.png')) '"/></html>'], ...
                 'TooltipString', 'Stop', ...
                 'Callback', @(h,d)notify(obj, 'Stop'));
+            
+            statusLayout = uix.HBox( ...
+                'Parent', mainLayout, ...
+                'BackgroundColor', 'white');
+            
+            obj.statusLabel = Label( ...
+                'Parent', statusLayout);
+            obj.statusIcon = Label( ...
+                'Parent', statusLayout);
+            
+            set(statusLayout, 'Widths', [-1 18]);
 
-            set(mainLayout, 'Heights', [-1 34]);
+            set(mainLayout, 'Heights', [-1 34 18]);
         end
 
         function close(obj)
@@ -412,20 +431,18 @@ function addModule(obj, name, value)
         end
 
         function setStatus(obj, s)
-            if isempty(s)
-                title = symphonyui.app.App.name;
-            else
-                title = sprintf('%s (%s)', symphonyui.app.App.name, s);
-            end
-            set(obj.figureHandle, 'Name', title);
+            set(obj.statusLabel, 'String', ['Status: ' s]);
         end
 
-        function setIsValid(obj, tf)
-            if tf
-                set(obj.protocolPopupMenu, 'ForegroundColor', 'black');
-            else
-                set(obj.protocolPopupMenu, 'ForegroundColor', 'red');
+        function setStatusMode(obj, m)
+            icon = '';
+            switch m
+                case obj.INVALID_STATUS_MODE
+                    icon = symphonyui.app.App.getResource('icons', 'invalid.png');
+                case obj.BUSY_STATUS_MODE
+                    icon = symphonyui.app.App.getResource('icons', 'spinner.gif');
             end
+            set(obj.statusIcon, 'Icon', icon)
         end
 
     end