Commit 30c673df authored by Jay Dubb's avatar Jay Dubb
Browse files

v1.31.1 

-- Add some error checking to MainGUI to avoid trying to display empty probe
parent 88151fa1

DataTree/AcquiredData/AcqDataClass.m

+5 −0
Original line number Original line Diff line number Diff line
@@ -120,7 +120,12 @@ classdef AcqDataClass < matlab.mixin.Copyable 
        

        

        % ---------------------------------------------------------

        % ---------------------------------------------------------

        function bbox = GetSdgBbox(obj)

        function bbox = GetSdgBbox(obj)

            bbox = [];

            

            optpos = [obj.GetSrcPos('2D'); obj.GetDetPos('2D')];

            optpos = [obj.GetSrcPos('2D'); obj.GetDetPos('2D')];

            if isempty(optpos)

                return

            end

            

            

            xmax = max(optpos(:,1));

            xmax = max(optpos(:,1));

            ymax = max(optpos(:,2));

            ymax = max(optpos(:,2));

MainGUI/DisplayAxesSDG.m

+4 −0
Original line number Original line Diff line number Diff line
@@ -59,6 +59,7 @@ iSrcDet = maingui.axesSDG.iSrcDet; 
color       = maingui.axesSDG.linecolor;

color       = maingui.axesSDG.linecolor;





SD          = maingui.dataTree.currElem.GetSDG('2D');

SD          = maingui.dataTree.currElem.GetSDG('2D');

bbox        = [];





if isfield(maingui.axesSDG, 'xlim')

if isfield(maingui.axesSDG, 'xlim')

    xbox        = maingui.axesSDG.xlim;

    xbox        = maingui.axesSDG.xlim;
@@ -71,6 +72,9 @@ end 
if ~ishandles(hAxes)

if ~ishandles(hAxes)

    return;

    return;

end

end

if isempty(bbox)

    return;

end





% Set gca to be SDG axes

% Set gca to be SDG axes

axes(hAxes);

axes(hAxes);

Utils/getVernum.m

+1 −1
Original line number Original line Diff line number Diff line
@@ -2,5 +2,5 @@ function vrnnum = getVernum() 




vrnnum{1} = '1';   % Major version #

vrnnum{1} = '1';   % Major version #

vrnnum{2} = '31';  % Major sub-version #

vrnnum{2} = '31';  % Major sub-version #

vrnnum{3} = '0';   % Minor version #

vrnnum{3} = '1';   % Minor version #

vrnnum{4} = '0';   % Minor sub-version # or patch #: 'p1', 'p2', etc
 
vrnnum{4} = '0';   % Minor sub-version # or patch #: 'p1', 'p2', etc

CRA Git | Maintained and supported by SUSTech CRA and CCSE