fix dvh in compare dose

Author: wahln

examples/matRad_example6_protonsNoise.m

@@ -108,7 +108,7 @@
 
 cst{ixRectum,6}{1}.parameters{1} = 40;  % Change the reference dose
 cst{ixRectum,6}{1}.penalty = 500; % Change the penalty
-resultGUI               = matRad_fluenceOptimization(dij,cst,pln);
+resultGUI = matRad_fluenceOptimization(dij,cst,pln);
 resultGUI = matRad_planAnalysis(resultGUI,ct,cst,stf,pln);
 
 display(resultGUI.qi(ixRectum).D_5);

matRad/planAnalysis/matRad_compareDose.m

@@ -57,6 +57,12 @@
 
 matRad_cfg = MatRad_Config.instance();
 
+colorSpec = {'Color',matRad_cfg.gui.elementColor,...
+        'XColor',matRad_cfg.gui.textColor,...
+        'YColor',matRad_cfg.gui.textColor,...
+        'GridColor',matRad_cfg.gui.textColor,...
+        'MinorGridColor',matRad_cfg.gui.backgroundColor};
+
 %% check if cubes consistent
 if ~isequal(size(cube1),size(cube2))
     matRad_cfg.dispError('dose cubes must be the same size\n');
@@ -159,11 +165,10 @@
         matRad_cfg.dispInfo('Plotting %s plane...\n',planename{plane});
 
         % Initialize Figure
-        hfig.(planename{plane}).('fig') = figure('Renderer', 'painters', 'Position', [10 50 800 800]);
-        set(gcf,'Color',[1 1 1]);
+        hfig.(planename{plane}).('fig') = figure('Position', [10 50 800 800],'Color',matRad_cfg.gui.backgroundColor);
 
         % Plot Dose 1
-        hfig.(planename{plane}).('cube1').Axes = subplot(2,2,1);
+        hfig.(planename{plane}).('cube1').Axes = subplot(2,2,1,colorSpec{:});
         [hfig.(planename{plane}).('cube1').CMap,...
             hfig.(planename{plane}).('cube1').Dose,...
             hfig.(planename{plane}).('cube1').Ct,...
@@ -172,7 +177,7 @@
             matRad_plotSliceWrapper(gca,ct,cstHandle,1,cube1,plane,slicename{plane},[],[],colorcube,jet,doseWindow,[],100);
 
         % Plot Dose 2
-        hfig.(planename{plane}).('cube2').Axes = subplot(2,2,2);
+        hfig.(planename{plane}).('cube2').Axes = subplot(2,2,2,colorSpec{:});
         [hfig.(planename{plane}).('cube2').CMap,...
             hfig.(planename{plane}).('cube2').Dose,...
             hfig.(planename{plane}).('cube2').Ct,...
@@ -181,7 +186,7 @@
             matRad_plotSliceWrapper(gca,ct,cstHandle,1,cube2,plane,slicename{plane},[],[],colorcube,jet,doseWindow,[],100);
 
         % Plot absolute difference
-        hfig.(planename{plane}).('diff').Axes = subplot(2,2,3);
+        hfig.(planename{plane}).('diff').Axes = subplot(2,2,3,colorSpec{:});
         [hfig.(planename{plane}).('diff').CMap,...
             hfig.(planename{plane}).('diff').Dose,...
             hfig.(planename{plane}).('diff').Ct,...
@@ -190,7 +195,7 @@
             matRad_plotSliceWrapper(gca,ct,cstHandle,1,differenceCube,plane,slicename{plane},[],[],colorcube,diffCMap,doseDiffWindow,[],100);
 
         % Plot gamma analysis
-        hfig.(planename{plane}).('gamma').Axes = subplot(2,2,4);
+        hfig.(planename{plane}).('gamma').Axes = subplot(2,2,4,colorSpec{:});
         gammaCMap = matRad_getColormap('gammaIndex');
         [hfig.(planename{plane}).('gamma').CMap,...
             hfig.(planename{plane}).('gamma').Dose,...
@@ -244,33 +249,32 @@
         yLabelString = 'Dose [Gy]';
     end
 
-    hfig.profiles.fig = figure('Renderer', 'painters', 'Position', [10 50 800 800]);
-    set(gcf,'Color',[1 1 1]);
+    hfig.profiles.fig = figure('Position', [10 50 800 800],'Color',matRad_cfg.gui.backgroundColor);
 
-    hfig.profiles.x = subplot(2,2,1);
-    plot(posX,profilex{1},'r')
+    hfig.profiles.x = subplot(2,2,1,colorSpec{:});
+    plot(hfig.profiles.x,posX,profilex{1},'r')
     hold on
-    plot(posX,profilex{2},'r--')
+    plot(hfig.profiles.x,posX,profilex{2},'r--')
     xlabel('X [mm]','FontSize',fontsize)
     ylabel(yLabelString,'FontSize',fontsize);
     title('x-Profiles');
     legend({'Dose 1','Dose 2'},'Location','southeast')
     legend boxoff
 
-    hfig.profiles.y = subplot(2,2,2);
-    plot(posY,profiley{1},'r')
+    hfig.profiles.y = subplot(2,2,2,colorSpec{:});
+    plot(hfig.profiles.y,posY,profiley{1},'r')
     hold on
-    plot(posY,profiley{2},'r--')
+    plot(hfig.profiles.y,posY,profiley{2},'r--')
     xlabel('Y [mm]','FontSize',fontsize)
     ylabel(yLabelString,'FontSize',fontsize);
     title('y-Profiles');
     legend({'Dose 1','Dose 2'},'Location','southeast')
     legend boxoff
 
-    hfig.profiles.z = subplot(2,2,3);
-    plot(posZ,profilez{1},'r')
+    hfig.profiles.z = subplot(2,2,3,colorSpec{:});
+    plot(hfig.profiles.z,posZ,profilez{1},'r')
     hold on
-    plot(posZ,profilez{2},'r--')
+    plot(hfig.profiles.z,posZ,profilez{2},'r--')
     xlabel('Z [mm]','FontSize',fontsize)
     ylabel(yLabelString,'FontSize',fontsize);
     title('z-Profiles');
@@ -290,9 +294,8 @@
     % Plot DVH
     matRad_cfg.dispInfo('Plotting DVH...');
 
-    hfig.dvh.fig = figure('Renderer', 'painters', 'Position', [10 100 1000 700]);
-    set(gcf,'Color',matRad_cfg.gui.backgroundColor);
-    matRad_showDVH(dvh1,cst,pln);
+    hfig.dvh.fig = figure('Position', [10 100 1000 700],'Color',matRad_cfg.gui.backgroundColor);
+    matRad_showDVH(dvh1,cst,pln,'axesHandle',axes(hfig.dvh.fig,colorSpec{:}));
     hold on
     matRad_showDVH(dvh2,cst,pln,'axesHandle',gca,'LineStyle','--');
     xlim([0 dvhWindow*1.2])

matRad/planAnalysis/matRad_showDVH.m

@@ -42,7 +42,7 @@ function matRad_showDVH(dvh,cst,varargin)
 
 p.addRequired('dvh',@isstruct);
 p.addRequired('cst',@iscell);
-p.addOptional('pln',[],@isstruct);
+p.addOptional('pln',[],@(x) isstruct(x) || isempty(x));
 p.addParameter('axesHandle',[],@isgraphics);
 p.addParameter('plotLegend',true,@(x) isscalar(x) && islogical(x));
 %p.addParameter('plotObjectives',false,@(x) isscalar(x) && islogical(x));