better handling of load-settings and figure setup

Author: r0oland

util/@PostProBackEnd/Apply_Vessel_Processing.m

@@ -9,9 +9,12 @@ function Apply_Vessel_Processing(PPA)
 
     PPA.Start_Wait_Bar(PPA.VesselGUI, 'Vessel Analysis');
 
-    if isempty(PPA.VesselFigs) ||~ishandle(PPA.VesselFigs.MainFig)
+    if isempty(PPA.VesselFigs) || ~ishandle(PPA.VesselFigs.MainFig)
       PPA.Setup_Vessel_Figures();
     end
+
+    wasEmptyImage = isempty(PPA.VesselFigs.InIm.CData);
+    
     % bring the figures we use to the front
     figure(PPA.VesselFigs.MainFig);
     figure(PPA.VesselFigs.ResultsFig);
@@ -43,10 +46,22 @@ function Apply_Vessel_Processing(PPA)
     % plot final image with fitted splines, widths and branch points
     PPA.Update_Vessel_Results_Plot();
 
-    % bring the figures we use to the front
-    figure(PPA.VesselFigs.MainFig);
-    figure(PPA.VesselFigs.ResultsFig);
-    figure(PPA.VesselGUI.UIFigure);
+    
+    
+    % bring the figures we use to the front, if image was empty, also 
+    % scale axis to show full image
+    if wasEmptyImage
+      figure(PPA.VesselFigs.MainFig);
+      axis tight;
+      figure(PPA.VesselFigs.ResultsFig);
+      axis tight;
+      figure(PPA.VesselGUI.UIFigure);
+      axis tight;
+    else
+      figure(PPA.VesselFigs.MainFig);
+      figure(PPA.VesselFigs.ResultsFig);
+      figure(PPA.VesselGUI.UIFigure);
+    end
 
   catch me
     PPA.ProgBar = [];

util/@PostProBackEnd/Handle_Master_Gui_State.m

@@ -35,15 +35,16 @@ function Handle_Master_Gui_State(PPA, stateString)
       else
         % update volume info status ------------------------------------------------
         control_vol_size_elements(PPA, false); % local function, see below
-
-        % auto load next step in processing...
+        PPA.MasterGUI.MapProcessingButton.Enable = true;
+        PPA.MasterGUI.VolumeProcessingButton.Enable = false;
+        
+        % close map if it's empty, not sure why we need this
         if ~isempty(PPA.MapFig) && ishandle(PPA.MapFig.MainFig)
           close(PPA.MapFig.MainFig);
           PPA.MapFig = [];
         end
+        % auto load next step in processing...
         PPA.MasterGUI.Open_Map_Gui();
-        PPA.MasterGUI.VolumeProcessingButton.Enable = false;
-        PPA.MasterGUI.MapProcessingButton.Enable = true;
 
         if PPA.Is_Visible(PPA.MapGUI) 
           figure(PPA.MapGUI.UIFigure);
@@ -55,6 +56,9 @@ function Handle_Master_Gui_State(PPA, stateString)
         PPA.ExportGUI.expFileName.Value = PPA.fileName;
       end
 
+      % make sure all images are displayed fully -> axis tight on all axis
+      make_axis_tight(PPA); % see below
+
     case 'vol_processing_complete'
       % after volume processing, we can do map processing
       PPA.MasterGUI.MapProcessingButton.Enable = true;
@@ -142,3 +146,34 @@ function update_map_size_display(PPA)
   PPA.MasterGUI.MapMemory.Value = ...
     [num2sip(mapBytes, 3, false, true) 'B'];
 end
+
+% update map info data --------------------------------------------------
+function make_axis_tight(PPA)
+  % make map images tight
+  if ~isempty(PPA.MapFig) && ishandle(PPA.MapFig.MainFig)
+    figure(PPA.MapFig.MainFig);
+    axis tight;
+  end
+  % make frangi images tight for map processing
+  if ~isempty(PPA.MapFrangi) && ishandle(PPA.MapFrangi.FigHandles.MainFig)
+    figure(PPA.MapFrangi.FigHandles.MainFig);
+    axis tight;
+  end
+
+  % make vessel analysis images tight
+  if ~isempty(PPA.VesselFigs) && ishandle(PPA.VesselFigs.MainFig)
+    figure(PPA.VesselFigs.MainFig);
+    axis tight;
+  end
+  if ~isempty(PPA.VesselFigs) && ishandle(PPA.VesselFigs.ResultsFig)
+    figure(PPA.VesselFigs.ResultsFig);
+    axis tight;
+  end
+
+  % make frangi images tight for vessel analysis
+  if ~isempty(PPA.VesselFrangi) && ishandle(PPA.VesselFrangi.FigHandles.MainFig)
+    figure(PPA.VesselFrangi.FigHandles.MainFig);
+    axis tight;
+  end
+
+end

util/@PostProBackEnd/PostProBackEnd.m

@@ -436,11 +436,14 @@ function Update_Status(PPA, statusText, append)
 
     %---------------------------------------------------------------
     function xPlotIm = get.xPlotIm(PPA)
-
-      if PPA.imInterpFct
-        xPlotIm = linspace(PPA.xPlot(1), PPA.xPlot(end), PPA.nXIm);
-      else
-        xPlotIm = PPA.xPlot;
+      if ~isempty(PPA.xPlot)
+        if PPA.imInterpFct
+          xPlotIm = linspace(PPA.xPlot(1), PPA.xPlot(end), PPA.nXIm);
+        else
+          xPlotIm = PPA.xPlot;
+        end
+      else 
+        xPlotIm = [];
       end
 
     end
@@ -487,13 +490,15 @@ function Update_Status(PPA, statusText, append)
 
     %---------------------------------------------------------------
     function yPlotIm = get.yPlotIm(PPA)
-
-      if PPA.imInterpFct
-        yPlotIm = linspace(PPA.yPlot(1), PPA.yPlot(end), PPA.nYIm);
+      if ~isempty(PPA.xPlot)
+        if PPA.imInterpFct
+          yPlotIm = linspace(PPA.yPlot(1), PPA.yPlot(end), PPA.nYIm);
+        else
+          yPlotIm = PPA.yPlot;
+        end
       else
-        yPlotIm = PPA.yPlot;
+        yPlotIm = [];
       end
-
     end
 
     %---------------------------------------------------------------

util/@PostProBackEnd/Setup_Vessel_Figures.m

@@ -1,4 +1,20 @@
 function Setup_Vessel_Figures(PPA)
+  % creates two main vessels analysis figures
+  % VesselFigs.MainFig
+  % VesselFigs.ResultsFig
+  % 
+  % with subplots:
+  % VesselFigs.TileLayout
+  % VesselFigs.InPlot
+  % VesselFigs.BinPlot 
+  % ....
+  % 
+  % containing images:
+  % VesselFigs.InIm
+  % VesselFigs.BinIm
+  % ...
+  % TODO complete list?
+
   PPA.Start_Wait_Bar(PPA.VesselGUI, 'Setting up figures...');
   PPA.Update_Status('Setting up vessel figures');
   ProgHandle = progressbar('Setting up vessel figures', {Colors.GuiLightOrange});