AlyxPanel weight button can now records current scales reading

Author: k1o0

+eui/AlyxPanel.m

@@ -43,11 +43,13 @@
     NewExpSubject % Drop-down menu subject list
     LoginText % Text displaying whether/which user is logged in
     LoginButton % Button to log in to Alyx
+    WeightButton % Button to submit weight to Alyx
     WaterEntry % Text box for entering the amout of water to give
     IsHydrogel % UI checkbox indicating whether to water to be given is in gel form
     WaterRequiredText % Handle to text UI element displaying the water required
     WaterRemainingText % Handle to text UI element displaying the water remaining
     LoginTimer % Timer to keep track of how long the user has been logged in, when this expires the user is automatically logged out
+    WeightTimer % Timer to reset weight button text when scale no longer gives new readings
     WaterRemaining % Holds the current water required for the selected subject
   end
 
@@ -134,7 +136,7 @@
         'Enable', 'off',...
         'Callback', @(~,~)obj.viewAllSubjects);
       % Button to open a dialog for manually submitting a mouse weight
-      uicontrol('Parent', waterbox,...
+      obj.WeightButton = uicontrol('Parent', waterbox,...
         'Style', 'pushbutton', ...
         'String', 'Manual weighing', ...
         'Enable', 'off',...
@@ -206,6 +208,11 @@ function delete(obj)
         delete(obj.LoginTimer) % ... delete it...
         obj.LoginTimer = []; % ... and remove it
       end
+      if ~isempty(obj.WeightTimer) % If there is a timer object
+        stop(obj.WeightTimer) % Stop the timer...
+        delete(obj.WeightTimer) % ... delete it...
+        obj.WeightTimer = []; % ... and remove it
+      end
     end
 
     function login(obj)
@@ -225,7 +232,7 @@ function login(obj)
           % minutes of 'inactivity' (defined as not calling
           % dispWaterReq)
           obj.LoginTimer = timer('StartDelay', 30*60, 'TimerFcn',...
-            @(~,~)obj.login, 'BusyMode', 'queue');
+            @(~,~)obj.login, 'BusyMode', 'queue', 'Name', 'Login Timer');
           start(obj.LoginTimer)
           % Enable all buttons
           set(findall(obj.RootContainer, '-property', 'Enable'), 'Enable', 'on');
@@ -584,7 +591,7 @@ function viewSubjectHistory(obj, ax)
         dat = horzcat(...
           arrayfun(@(x)datestr(x), dates', 'uni', false), ...
           weightsByDate', ...
-          arrayfun(@(x)sprintf('%.1f', 0.8*(x-iw)), [records.weight_expected]', 'uni', false), ...
+          arrayfun(@(x)sprintf('%.1f', 0.8*(x-iw)+iw), [records.weight_expected]', 'uni', false), ...
           weightPctByDate');
         waterDat = (...
           num2cell(horzcat([records.water_given]', [records.hydrogel_given]', ...
@@ -627,6 +634,26 @@ function viewAllSubjects(obj)
       end
     end
 
+    function updateWeightButton(obj, src, ~)
+      % Function for changing the text on the weight button to reflect the
+      % current weight value obtained by the scale.  This function must be
+      % a callback for the hw.WeighingScale NewReading event.  If a new
+      % reading isn't read for 10 sec the manual weighing option is made
+      % available instead.
+      %
+      % Example:
+      %  aiPanel = eui.AlyxPanel;
+      %  lh = event.listener(obj.WeighingScale, 'NewReading',...
+      %     @(src,evt)aiPanel.updateWeightButton(src,evt));
+      %
+      % See also hw.WeighingScale, eui.MControl
+      set(obj.WeightButton, 'String', sprintf('Record %.1fg', src.readGrams), 'Callback', @(~,~)obj.recordWeight(src.readGrams))
+      obj.WeightTimer = timer('Name', 'Last Weight',...
+        'TimerFcn', @(~,~)set(obj.WeightButton, 'String', 'Manual weighing', 'Callback', @(~,~)obj.recordWeight),...
+        'StopFcn', @(src,~)delete(src), 'StartDelay', 10);
+      start(obj.WeightTimer)
+    end
+    
     function log(obj, varargin)
       % Function for displaying timestamped information about
       % occurrences.  If the LoggingDisplay property is unset, the

+eui/MControl.m

@@ -90,8 +90,11 @@
         if isfield(rig, 'scale') && ~isempty(rig.scale)
           obj.WeighingScale = fieldOrDefault(rig, 'scale');
           init(obj.WeighingScale);
+          % Add listners for new reading, both for the log tab and also for
+          % the weigh button in the Alyx Panel.
           obj.Listeners = [obj.Listeners,...
-            {event.listener(obj.WeighingScale, 'NewReading', @obj.newScalesReading)}];
+            {event.listener(obj.WeighingScale, 'NewReading', @obj.newScalesReading)}...
+            {event.listener(obj.WeighingScale, 'NewReading', @(src,evt)obj.AlyxPanel.updateWeightButton(src,evt))}];
         end
       catch
         obj.log('Warning: could not connect to weighing scales');