summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMi Zhang <mzhang@email.wm.edu>2012-09-12 11:59:46 -0400
committerMi Zhang <mzhang@email.wm.edu>2012-09-12 11:59:46 -0400
commit82d93fcaf23aa3bc0b81b7b0d8b4677d135dbf33 (patch)
tree4bda1544a2f60b156f206f50ab8852605181580e
parent4e23085de0161e5fb8d823a6d4c32d4b7d3e5165 (diff)
downloadbeam_profiler-82d93fcaf23aa3bc0b81b7b0d8b4677d135dbf33.tar.gz
beam_profiler-82d93fcaf23aa3bc0b81b7b0d8b4677d135dbf33.zip
fix display bug
-rw-r--r--gui_win.figbin19224 -> 19156 bytes
-rw-r--r--gui_win.m49
2 files changed, 39 insertions, 10 deletions
diff --git a/gui_win.fig b/gui_win.fig
index 2f8f633..ca441ac 100644
--- a/gui_win.fig
+++ b/gui_win.fig
Binary files differ
diff --git a/gui_win.m b/gui_win.m
index e35a26a..ea7c947 100644
--- a/gui_win.m
+++ b/gui_win.m
@@ -22,7 +22,7 @@ function varargout = gui_win(varargin)
% Edit the above text to modify the response to help gui_win
-% Last Modified by GUIDE v2.5 10-Sep-2012 11:34:46
+% Last Modified by GUIDE v2.5 11-Sep-2012 17:00:46
% Begin initialization code - DO NOT EDIT
gui_Singleton = 1;
@@ -721,19 +721,48 @@ function uipanel1_ButtonDownFcn(hObject, eventdata, handles)
% hObject handle to uipanel1 (see GCBO)
% eventdata reserved - to be defined in a future version of MATLAB
% handles structure with handles and user data (see GUIDATA)
+
+
+% --- Executes during object creation, after setting all properties.
+function uipanel4_CreateFcn(hObject, eventdata, handles)
+% hObject handle to uipanel4 (see GCBO)
+% eventdata reserved - to be defined in a future version of MATLAB
+% handles empty - handles not created until after all CreateFcns called
+
+
+% --- Executes when selected object is changed in uipanel4.
+function uipanel4_SelectionChangeFcn(hObject, eventdata, handles)
+% hObject handle to the selected object in uipanel4
+% eventdata structure with the following fields (see UIBUTTONGROUP)
+% EventName: string 'SelectionChanged' (read only)
+% OldValue: handle of the previously selected object or empty if none was selected
+% NewValue: handle of the currently selected object
+% handles structure with handles and user data (see GUIDATA)
global image_m;
global image_original;
global image_cleaned;
global image_fitted;
-if get(handles.radiobutton4,'Value')
+if get(handles.radiobutton7,'Value')
image_m=image_original;
display_stuff(handles);
-end;
-if get(handles.radiobutton8,'Value')
- image_m=image_cleaned;
- display_stuff(handles);
-end;
-if get(handles.radiobutton9,'Value')
- image_m=image_fitted;
- display_stuff(handles);
+else
+ if get(handles.radiobutton8,'Value')
+ if image_cleaned == 0
+ set(handles.radiobutton7,'Value',1);
+ else
+ image_m=image_cleaned;
+ display_stuff(handles);
+ end;
+ else
+ if get(handles.radiobutton9,'Value')
+ if image_fitted == 0
+ set(handles.radiobutton7,'Value',1);
+ image_m=image_original;
+ display_stuff(handles);
+ else
+ image_m=image_fitted;
+ display_stuff(handles);
+ end;
+ end;
+ end;
end;