improved theming

Author: wahln

matRad/IO/matRad_importPatient.m

@@ -53,18 +53,18 @@
 ct.numOfCtScen = 1;
 
 maskId = 1;
-hGlobalWaitbar = waitbar(0,'Importing Segmentations');
-set(findall(hGlobalWaitbar,'type','text'),'Interpreter','none');
-
-
+matRad_cfg = MatRad_Config.instance();
+hGlobalWaitbar = waitbar(0,'Importing Segmentations','Color',matRad_cfg.gui.backgroundColor,'DefaultTextColor',matRad_cfg.gui.textColor);
+matRad_applyThemeToWaitbar(hGlobalWaitbar);
 
 for f=1:numel(maskFiles)
     maskFile = maskFiles{f};
     waitbar(f/numel(maskFiles),hGlobalWaitbar,['Importing Segmentations: ' maskFiles{f}]);
     if exist(maskFile,'dir')
         contents = dir(maskFile);
-        hFolderWaitbar = waitbar(0,'Importing Folder');
-        set(findall(hFolderWaitbar,'type','text'),'Interpreter','none');
+        hFolderWaitbar = waitbar(0,'Importing Folder','Color',matRad_cfg.gui.backgroundColor,'DefaultTextColor',matRad_cfg.gui.textColor);
+        matRad_applyThemeToWaitbar(hFolderWaitbar);
+
         for s=1:numel(contents)
             waitbar(s/numel(contents),hFolderWaitbar,['Importing Folder: ' contents(s).name]);            
             if(~contents(s).isdir)

matRad/dicom/matRad_importDicom.m

@@ -42,7 +42,8 @@
 end
 
 %%
-h = waitbar(0,'Please wait...');
+h = waitbar(0,'Please wait...','Color',matRad_cfg.gui.backgroundColor,'DefaultTextColor',matRad_cfg.gui.textColor);
+matRad_applyThemeToWaitbar(h);
 %h.WindowStyle = 'Modal';
 steps = 2;
 
@@ -79,7 +80,8 @@
     close(h)
 
     %% creating structure cube
-    h = waitbar(0,'Please wait...');
+    h = waitbar(0,'Please wait...','Color',matRad_cfg.gui.backgroundColor,'DefaultTextColor',matRad_cfg.gui.textColor);
+    matRad_applyThemeToWaitbar(h);
     %h.WindowStyle = 'Modal';
     steps = numel(structures);
 

matRad/dicom/matRad_scanDicomImportFolder.m

@@ -51,7 +51,8 @@
 if ~isempty(fileList)
     %% check for dicom files and differentiate patients, types, and series
     numOfFiles = numel(fileList(:,1));
-    h = waitbar(0,'Please wait...');
+    h = waitbar(0,'Please wait...','Color',matRad_cfg.gui.backgroundColor,'DefaultTextColor',matRad_cfg.gui.textColor);
+    matRad_applyThemeToWaitbar(h);
     % precision value for double to string conversion
     str2numPrc = 10;
     %h.WindowStyle = 'Modal';

matRad/doseCalc/+DoseEngines/@matRad_DoseEngineBase/initDoseCalc.m

@@ -43,7 +43,8 @@
 % initialize waitbar
 % TODO: This should be managed from the user interface instead
 if ~matRad_cfg.disableGUI
-    this.hWaitbar = waitbar(0,msg);
+    this.hWaitbar = waitbar(0,msg,'Color',matRad_cfg.gui.backgroundColor,'DefaultTextColor',matRad_cfg.gui.textColor);
+    matRad_applyThemeToWaitbar(this.hWaitbar);
     % prevent closure of waitbar and show busy state
     set(this.hWaitbar,'pointer','watch');
 end

matRad/gui/matRad_Widget.m

@@ -107,7 +107,8 @@ function changedWorkspace(this,varargin)
                     close(handles.ErrorDlg);
                 end
             end
-            errordlg(Message);
+            h = errordlg(Message);
+            matRad_applyThemeToDlg(h);
             matRad_cfg.dispError(Message);
             this.handles = handles;
         end
@@ -126,10 +127,16 @@ function showWarning(this,Message,ME)
                 Message = [Message,ME.message];
                 % Future error hyperlinks {Message,ME.getReport(meType,'hyperlinks','off')};
             end
+            h = warndlg(Message);
+            matRad_applyThemeToDlg(h);
             matRad_cfg.dispWarning(Message);
-            warndlg(Message);
             this.handles = handles;         
         end
+
+        function showMessage(this,message,varargin)
+            h = msgbox(message,varargin{:});
+            matRad_applyThemeToDlg(h);
+        end
 
         %function notifyUpdate(this,workSpaceVariables)
         %   notify(this,'workspaceChanged',workSpaceVariables); 

matRad/gui/widgets/matRad_InfoWidget.m

@@ -144,20 +144,7 @@ function btnAbout_Callback(this, hObject, event)
             msg{end+1} = matRad_info();
 
             handles.aboutBox = msgbox(msg,'About matRad');
-
-            if matRad_cfg.isOctave
-                txtObj = findall(handles.aboutBox,'type','text');
-                txtObj = txtObj(1);
-                okBtn = findall(handles.aboutBox,'type','uicontrol','style','pushbutton');
-                set(findall(handles.aboutBox,'type','uipanel'),'BackgroundColor',matRad_cfg.gui.backgroundColor);
-            else
-                txtObj = findall(handles.aboutBox,'tag','MessageBox');
-                okBtn = findall(handles.aboutBox,'tag','OKButton');
-                handles.aboutBox.Color = matRad_cfg.gui.backgroundColor;
-            end
-
-            set(txtObj,'Color',matRad_cfg.gui.textColor);
-            set(okBtn,'BackgroundColor',matRad_cfg.gui.elementColor,'ForegroundColor',matRad_cfg.gui.textColor);
+            matRad_applyThemeToDlg(handles.aboutBox);
 
             this.handles = handles;
         end

matRad/gui/widgets/matRad_WorkflowWidget.m

@@ -878,12 +878,12 @@ function CheckOptimizerStatus(this, usedOptimizer,OptCase)
             [statusmsg,statusflag] = usedOptimizer.GetStatus();
 
             if statusflag == 0 || statusflag == 1
-                status = 'none';
+                statusIcon = 'none';
             else
-                status = 'warn';
+                statusIcon = 'warn';
             end
 
-            msgbox(['Optimizer finished with status ' num2str(statusflag) ' (' statusmsg ')'],'Optimizer',status,'modal');
+            this.showMessage(sprintf('Optimizer finished with status %d (%s)',statusflag,statusmsg),'Optimization finished!',statusIcon,'modal');
         end
     end
 end

matRad/gui/widgets/matRad_exportWidget.m

@@ -306,6 +306,9 @@
     methods
         %---------------CALLBACK FOR H2 BUTTON EXPORT
         function this = btn_export_Callback(this,  hObject, event)
+
+            matRad_cfg = MatRad_Config.instance();
+
             handles = this.handles;
 
             exportDir = get(handles.edit_dir_export,'String');
@@ -407,7 +410,8 @@
 
                 currentCube = 0;
 
-                hWaitbar = waitbar(0,'Exporting...','WindowStyle', 'modal');
+                hWaitbar = waitbar(0,'Exporting...','WindowStyle', 'modal','Color',matRad_cfg.gui.backgroundColor,'DefaultTextColor',matRad_cfg.gui.textColor);
+                matRad_applyThemeToWaitbar(hWaitbar);
                 cleanUp = onCleanup(@() close(hWaitbar));
 
                 %CT and Mask export

matRad/planAnalysis/matRad_showDVH.m

@@ -142,7 +142,7 @@ function matRad_showDVH(dvh,cst,varargin)
 %% Legend and limits
 fontSizeValue = matRad_cfg.gui.fontSize;
 if plotLegend
-    myLegend = legend(axesHandle,'location','NorthEast','FontSize',matRad_cfg.gui.fontSize,'Interpreter','none');
+    myLegend = legend(axesHandle,'location','NorthEast','FontSize',matRad_cfg.gui.fontSize,'TextColor',matRad_cfg.gui.textColor,'Interpreter','none');
     legend(axesHandle,'boxoff');
     legend(axesHandle,'show');
 end

matRad/planAnalysis/matRad_showQualityIndicators.m

@@ -63,14 +63,30 @@ function matRad_showQualityIndicators(figHandle,qi)
 
 %since uitable is only available in newer octave versions, we try and catch
 try    
+    colorMatrix = repmat(matRad_cfg.gui.elementColor,numel(rnames),1);
+    ix2 = 2:2:numel(rnames);
+    if ~isempty(ix2)    
+        shadeColor = rgb2hsv(matRad_cfg.gui.elementColor);
+        if shadeColor(3) < 0.5
+            shadeColor(3) = shadeColor(3)*1.5+0.1;
+        else
+            shadeColor(3) = shadeColor(3)*0.5-0.1;
+        end
+
+        colorMatrix(ix2,:) = repmat(hsv2rgb(shadeColor),numel(ix2),1);
+    end
+
+
+
     % Create the uitable
     table = uitable(hF,'Data',qi,...
         'ColumnName',cnames,...
         'RowName',rnames,'ColumnWidth',{70},...
         'units','normalized',...
         'position',pos, ...
         'ForegroundColor',matRad_cfg.gui.textColor,...
-        'BackgroundColor',[matRad_cfg.gui.elementColor;matRad_cfg.gui.backgroundColor]);    
+        'BackgroundColor',colorMatrix,...
+        'RowStriping','on');    
 catch ME
     matRad_cfg.dispWarning('The uitable function is not implemented in %s v%s.',env,vStr);
 end