From 49a4d696d53429d38141a4636dd9eafc0961224a Mon Sep 17 00:00:00 2001
From: Mi Zhang <mzhang@email.wm.edu>
Date: Mon, 17 Sep 2012 10:26:11 -0400
Subject: more load/clean bugs fixed

---
 gui_win.m | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/gui_win.m b/gui_win.m
index 4ec5177..d76772d 100644
--- a/gui_win.m
+++ b/gui_win.m
@@ -168,6 +168,7 @@ global image_cleaned;
 global image_fitted;
 image_cleaned = 0;
 image_fitted = 0;
+set(handles.checkbox2,'Value',0);
 set(handles.radiobutton7,'Value',1);
 if image_display > 0
 image_display = image_original;
@@ -241,6 +242,7 @@ image_cleaned = 0;
 image_fitted = 0;
 isworking =1;
 set(handles.radiobutton7,'Value',1);
+set(handles.checkbox2,'Value',0);
 if image_display > 0
 image_display = image_original;
 display_stuff(handles);
@@ -249,7 +251,7 @@ end;
 % This calls a file-open dialog and runs the beam profiler on the choosen
 % file
 if get(handles.radiobutton4,'Value')
-    
+    set(handles.checkbox2,'Value',0);
     set(handles.togglebutton1,'Value',1);
     set(handles.togglebutton1,'BackgroundColor','Red');
     set(handles.togglebutton1,'String','STOP');
@@ -289,11 +291,16 @@ function pushbutton10_Callback(hObject, eventdata, handles)
 global isworking;
 global image_display;
 global image_cleaned;
+global image_negative;
 
 if (isworking == 1)
 else
     isworking = 1;
     set(handles.pushbutton10,'String','Working');
+    if get(handles.checkbox2,'Value')
+        set(handles.checkbox2,'Value',0);
+        image_display=image_display+image_negative;
+    end;
     
     %read the attenuation from the GUI
     filter = str2num(get(handles.edit4,'String'));
@@ -307,6 +314,7 @@ else
     
     set(handles.pushbutton10,'String','Clean');
     set(handles.radiobutton8,'Value',1);
+    
 end;
 isworking = 0;
 
@@ -483,7 +491,7 @@ function pushbutton3_Callback(hObject, eventdata, handles)
 global image_name;
 global image_display;
 %fname_to_save = horzcat(pwd,filesep,'saved_images',filesep,datestr(now, 'yyyy_mm_dd_HHMMSS'),'.png');
-fname_to_save = horzcat('Z:\beam_profiler_images',filesep,datestr(now, 'yyyy_mm_dd_HHMMSS'),'.png');
+fname_to_save = horzcat('Z:\beam_profier images',filesep,datestr(now, 'yyyy_mm_dd_HHMMSS'),'.png');
 
 set(handles.text12,'String',horzcat('Image saved to: ',fname_to_save));
 image_to_save=uint16(image_display);
-- 
cgit v1.2.3