Rc/v3 small bug fixes (e0404#788)

* bug fix : Dicom double str2double conversion for the sliceThickness * bugFix: comparing char values instead of double * Typo * the PlnStfMatch triggers multiple errors
amitantony · Nov 8, 2024 · 7e72320 · 7e72320
1 parent 3013c99
commit 7e72320
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/matRad/gui/matRad_Widget.m b/matRad/gui/matRad_Widget.m
@@ -194,7 +194,7 @@ function update(this,evt)
                 end
             catch ME
                 %Error Handling
-                this.showWarning('Update failed',ME); %We only show a warning to not halt execution.
+                this.showWarning('Update failed ',ME); %We only show a warning to not halt execution.
             end
         end
     end

diff --git a/matRad/gui/widgets/matRad_WorkflowWidget.m b/matRad/gui/widgets/matRad_WorkflowWidget.m
@@ -300,9 +300,9 @@ function btnLoadMat_Callback(this, hObject, event)
                         end
 
                         % check if dij exist
-                        if evalin('base','exist(''dij'')')
+                        if evalin('base','exist(''dij'')') && plnStfMatch
                             [dijStfMatch, msg] = matRad_compareDijStf(evalin('base','dij'),evalin('base','stf'));
-                            if plnStfMatch && dijStfMatch
+                            if dijStfMatch
                                 set(handles.txtInfo,'String','ready for optimization');
                                 set(handles.btnOptimize ,'Enable','on');
                             elseif ~noCheck 

diff --git a/matRad/gui/widgets/matRad_importDicomWidget.m b/matRad/gui/widgets/matRad_importDicomWidget.m
@@ -161,13 +161,13 @@
             handles = this.handles;
 
             % case the resolution was changed manually
-            if handles.resx_edit.String ~= this.importer.importFiles.resx
+            if str2double(handles.resx_edit.String) ~= str2double(this.importer.importFiles.resx)
                 this.importer.importFiles.resx = handles.resx_edit.String;
             end 
-            if handles.resy_edit.String ~= this.importer.importFiles.resy
+            if str2double(handles.resy_edit.String) ~= str2double(this.importer.importFiles.resy)
                 this.importer.importFiles.resy = handles.resy_edit.String;
             end
-            if handles.resz_edit.String ~= this.importer.importFiles.resz
+            if str2double(handles.resz_edit.String) ~= str2double(this.importer.importFiles.resz)
                 this.importer.importFiles.resz = handles.resz_edit.String;
             end
 

diff --git a/matRad/util/matRad_info.m b/matRad/util/matRad_info.m
@@ -34,7 +34,7 @@
     'matRad is free software and NOT A MEDICAL PRODUCT!' ...
     newline 'matRad comes WITHOUT ANY WARRANTY and does not guarantee FITNESS FOR A PARTICULAR PURPOSE.' ...
     newline 'Use matRad ONLY for research and education at your own risk.' ...
-    newline 'For license conditions see LICESNE.md. Third-party software used in matRad is subject to their respective licenses.'];             
+    newline 'For license conditions see LICENSE.md. Third-party software used in matRad is subject to their respective licenses.'];             
 
 %Websites
 message = [message newline newline ...