New function for Slice plotting added. Bug fixing in iso lines plotter.

matRad/util/matRad_plotSlice.m

@@ -1,4 +1,4 @@
-function [] = matRad_plotSlice(ct, varargin)
+function [hCMap,hDose,hCt,hContour,hIsoDose] = matRad_plotSlice(ct, varargin)
 % matRad tool function to directly plot a complete slice of a ct with dose
 % optionally including contours and isolines
 %
@@ -68,14 +68,14 @@
 isCubeIdx           = @(x) isscalar(x);
 isPlane             = @(x) isscalar(x) && (sum(x==[1, 2, 3])==1);
 isDoseWindow        = @(x) (length(x) == 2 && isvector(x));
-isThresh            = @(x) isscalar(x) && (x>=0) && (x<=1);
-isAlpha             = @(x) isscalar(x) && (x>=0) && (x<=1);
+isThresh            = @(x) (isscalar(x) && (x>=0) && (x<=1)) || isempty(x);
+isAlpha             = @(x) isscalar(x) && (x>=0) && (x<=1) || isempty(x);
 isDoseColorMap      = @(x) isnumeric(x) && (size(x, 2)==3) &&  all(x(:) >= 0) && all(x(:) <= 1);
-isDoseIsoLevels     = @(x) isnumeric(x) && isvector(x);
-isVOIselection      = @(x) all(x(:)==1 | x(:)==0);
+isDoseIsoLevels     = @(x) isnumeric(x) && isvector(x)|| isempty(x);
+isVOIselection      = @(x) isnumeric(x) || isempty(x); %all(x(:)==1 | x(:)==0) || isempty(x);
 isContourColorMap   = @(x) isnumeric(x) && (size(x, 2)==3) && size(x, 1)>=2 && all(x(:) >= 0) && all(x(:) <= 1);
 isBoolPlotLegend    = @(x) x==0 || x ==1;
-isColorBarLabel     = @(x) isstring(x) || ischar(x);
+isColorBarLabel     = @(x) isstring(x) || ischar(x) || isempty(x);
 isShowCt            = @(x) isscalar(x) && (x==0) || (x==1);
 
 p = inputParser;
@@ -133,15 +133,15 @@
 %% Plot dose
 if ~isempty(p.Results.dose)
     if ~isempty(p.Results.doseWindow) && p.Results.doseWindow(2) - p.Results.doseWindow(1) <= 0
         p.Results.doseWindow = [0 2];
     end
 
     [hDose,doseColorMap,doseWindow] = matRad_plotDoseSlice(p.Results.axesHandle, p.Results.dose, p.Results.plane, p.Results.slice, p.Results.thresh, p.Results.alpha, p.Results.doseColorMap, p.Results.doseWindow);
 
     %% Plot iso dose lines
     if ~isempty(p.Results.doseIsoLevels)
         hIsoDose = matRad_plotIsoDoseLines(p.Results.axesHandle,p.Results.dose,[],p.Results.doseIsoLevels,false,p.Results.plane,p.Results.slice,p.Results.doseColorMap,p.Results.doseWindow, lineVarargin{:});
         hold on;
     else
         hIsoDose = [];
     end
@@ -150,30 +150,30 @@
     hCMap = matRad_plotColorbar(p.Results.axesHandle,doseColorMap,doseWindow,'Location','EastOutside');
     set(hCMap,'Color',matRad_cfg.gui.textColor);
     if ~isempty(p.Results.colorBarLabel)
         set(get(hCMap,'YLabel'),'String', p.Results.colorBarLabel,'FontSize',matRad_cfg.gui.fontSize);
     end
     set(get(hCMap,'YLabel'),'String', p.Results.colorBarLabel, textVarargin{:});
 end
 %% Plot VOI contours & Legend
 
 if  ~isempty(p.Results.cst)
     [hContour,~] = matRad_plotVoiContourSlice(p.Results.axesHandle, p.Results.cst, p.Results.ct, p.Results.cubeIdx, p.Results.voiSelection, p.Results.plane, p.Results.slice, p.Results.contourColorMap, lineVarargin{:});
 
     if p.Results.boolPlotLegend
         visibleOnSlice = (~cellfun(@isempty,hContour));
         ixLegend = find(p.Results.voiSelection);
         hContourTmp    = cellfun(@(X) X(1),hContour(visibleOnSlice),'UniformOutput',false);
         if ~isempty(p.Results.voiSelection)
             hLegend        =  legend(p.Results.axesHandle,[hContourTmp{:}],[p.Results.cst(ixLegend(visibleOnSlice),2)],'AutoUpdate','off','TextColor',matRad_cfg.gui.textColor);
         else
             hLegend        =  legend(p.Results.axesHandle,[hContourTmp{:}],[p.Results.cst(visibleOnSlice,2)],'AutoUpdate','off','TextColor',matRad_cfg.gui.textColor);
         end
         set(hLegend,'Box','On');
         set(hLegend,'TextColor',matRad_cfg.gui.textColor);
         if ~isempty(textVarargin)
             set(hLegend, textVarargin{:});
         else
             set(hLegend,'FontSize',matRad_cfg.gui.fontSize);
         end
     end
 else
@@ -186,7 +186,7 @@
 colormap(p.Results.axesHandle,p.Results.doseColorMap);
 
 if isfield(p.Unmatched, 'FontSize')
     matRad_plotAxisLabels(p.Results.axesHandle,p.Results.ct,p.Results.plane,p.Results.slice, p.Unmatched.FontSize, [])
 else
     matRad_plotAxisLabels(p.Results.axesHandle,p.Results.ct,p.Results.plane,p.Results.slice, [], [])
 end
@@ -208,7 +208,7 @@
 
 %% Set text properties
 if ~isempty(textVarargin)
     set(p.Results.axesHandle, textVarargin{:})
     set(p.Results.axesHandle.Title, textVarargin{:})
 end
 

matRad/util/matRad_plotSliceWrapper.m

@@ -63,6 +63,8 @@
 %
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+warning('Deprecation warning: matRad_plotSliceWrapper is deprecated. Using matRad_plot_Slice instead');
+
 % Handle the argument list
 if ~exist('thresh','var') || isempty(thresh)
     thresh = [];
@@ -101,6 +103,11 @@
 
 matRad_cfg = MatRad_Config.instance();
 
+warning('Deprecation warning: matRad_plotSliceWrapper is deprecated. Using matRad_plot_Slice instead');
+
+[hCMap,hDose,hCt,hContour,hIsoDose] = matRad_plotSlice(ct, 'axesHandle', axesHandle, 'cst', cst, 'cubeIdx', cubeIdx, 'dose', dose, 'plane', plane, 'slice', slice,'thresh', thresh, 'alpha', alpha, 'contourColorMap', contourColorMap, 'doseColorMap', doseColorMap, 'doseWindow', doseWindow, 'doseIsoLevels', doseIsoLevels, 'voiSelection', voiSelection, 'colorBarLabel', colorBarLabel, 'boolPlotLegend', boolPlotLegend, 'others', varargin);
+
+%{
 set(axesHandle,'YDir','Reverse');
 % plot ct slice
 hCt = matRad_plotCtSlice(axesHandle,ct.cubeHU,cubeIdx,plane,slice); 
@@ -171,6 +178,6 @@
 if ~isempty(colorBarLabel)
     set(get(hCMap,'YLabel'),'String', colorBarLabel,'FontSize',matRad_cfg.gui.fontSize);
 end
-
+%}
 end