Merge branch 'dev' of github.com:e0404/matRad into dev

Author: wahln

matRad/planAnalysis/matRad_showQualityIndicators.m

@@ -57,7 +57,7 @@ function matRad_showQualityIndicators(figHandle,qi)
     end
     hF = ancestor(figHandle,'figure');
 else
-    pos = get(figHandle,'position');
+    pos = [0 0 1 1];
     hF = figHandle;
 end
 
@@ -86,7 +86,34 @@ function matRad_showQualityIndicators(figHandle,qi)
         'position',pos, ...
         'ForegroundColor',matRad_cfg.gui.textColor,...
         'BackgroundColor',colorMatrix,...
-        'RowStriping','on');    
+        'RowStriping','on'); 
+
+    %Try to adapt the position of the table
+    try
+        ext = get(table,'Extent');
+
+        pixPosTableBefore = getpixelposition(table);
+
+        relScrollSize = 16./pixPosTableBefore([3 4]);
+
+        posOld = pos;
+
+        if ext(3) < pos(3)
+            pos(3) = ext(3) + relScrollSize(1);
+            pos(1) = posOld(3) - pos(3);
+        end
+
+        if ext(4) < pos(4)
+            pos(4) = ext(4) + relScrollSize(2);
+            pos(2) = posOld(4) - pos(4);
+        end
+
+        set(table,'Position',pos);
+
+
+
+    catch
+    end
 catch ME
     matRad_cfg.dispWarning('The uitable function is not implemented in %s v%s.',env,vStr);
 end

matRad/scenarios/matRad_ScenarioModel.m

@@ -89,9 +89,9 @@
         function listAllScenarios(this)
             matRad_cfg = MatRad_Config.instance();
             matRad_cfg.dispInfo('Listing all scenarios...\n');
-            matRad_cfg.dispInfo('\t#\txShift\tyShift\tzShift\tabsRng\trelRng\tprob.\n');
+            matRad_cfg.dispInfo('\t#\tctScen\txShift\tyShift\tzShift\tabsRng\trelRng\tprob.\n');
             for s = 1:size(this.scenForProb,1)
-                str = num2str(this.scenForProb(s,:),'\t%.3f');
+                str = [num2str(this.scenForProb(s,1),'\t%d'),sprintf('\t\t'), num2str(this.scenForProb(s,2:end),'\t%.3f')];
                 matRad_cfg.dispInfo('\t%d\t%s\t%.3f\n',s,str,this.scenProb(s));
             end
         end