Fixes live plot issue (#244)

RascalSoftware · Jul 12, 2024 · 72d9879 · 72d9879
1 parent 55fec6e
commit 72d9879
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/utilities/plotting/plotRefSLDHelper.m b/utilities/plotting/plotRefSLDHelper.m
@@ -1,16 +1,19 @@
-function plotRefSLDHelper(data, noDelay, figureId)
+function plotRefSLDHelper(data, noDelay)
     % Helper function to make it easier to plot from event. Data is a struct
     % with the plot data and noDelay indicates if draw should be delayed.
     %
-    % plotRefSLDHelper(data, false, 1);
+    % plotRefSLDHelper(data, false);
     arguments
         data
         noDelay {logical} = true
-        figureId {mustBeInteger} = 0
     end
-    if figureId > 0
-        figure(figureId);
+
+    defaultState = 'on';
+    s = warning();
+    if any(strcmp({s.identifier}, 'MATLAB:Axes:NegativeDataInLogAxis'))
+        defaultState = 'off';
     end
+    warning('off','MATLAB:Axes:NegativeDataInLogAxis');
 
     numberOfContrasts = length(data.reflectivity);
 
@@ -76,4 +79,5 @@ function plotRefSLDHelper(data, noDelay, figureId)
     if noDelay
         drawnow limitrate;
     end
+    warning(defaultState, 'MATLAB:Axes:NegativeDataInLogAxis');
 end
diff --git a/utilities/plotting/useLivePlot.m b/utilities/plotting/useLivePlot.m
@@ -15,7 +15,7 @@
                 figureId {mustBePositive, mustBeInteger} = 1000
             end
             obj.figureId = figureId;
-            obj.handle = @(varargin) obj.callback(varargin{:}, true, obj.figureId);
+            obj.handle = @(varargin) obj.updatePlot(varargin{:});
             % Make the figure
             h = figure(obj.figureId);
             % Unregister other live plots only one at a time
@@ -30,12 +30,21 @@
                      'set controls.calcSldDuringFit = true\n'], figureId);
         end
 
+        function updatePlot(obj, data)
+            % Clears axes and updates plot
+            figure(obj.figureId);
+            subplot(1, 2, 1); cla;
+            subplot(1, 2, 2); cla;
+            obj.callback(data, false);
+        end
+
         function closeFigure(obj)
-            % Safely close the updating figure and clear the event...
-            % Remove all events...
+            % Safely close the updating figure and clear the event.
+
+            % Removes event for this plot
             eventManager.unregister(eventTypes.Plot, obj.handle);
 
-            % close the figure....
+            % close the figure.
             delete(obj.figureId);
         end
     end