Merge pull request #15 from DIDSR/qigong

merge from qigong to master

Author: brandon-gallas

GUI.fig

@@ -195,6 +195,7 @@ function GUI_OpeningFcn(hObj, eventdata, handles, varargin)
 
     % save myData
     handles.myData = myData;
+    handles.reticle = 1;
     settings = myData.settings;
     guidata(handles.GUI, handles)
 
@@ -431,7 +432,11 @@ function Initiate_GUI_Elements(handles)
         'BackgroundColor',myData.settings.BG_color,...
         'ForegroundColor',myData.settings.FG_color,...
         'Visible', 'off');   
-    
+    set (handles.Reticlebutton,...
+        'FontSize', myData.settings.FontSize,...
+        'BackgroundColor',myData.settings.BG_color,...
+        'ForegroundColor',myData.settings.FG_color,...
+        'Visible', 'off');
 
     % Update handles.GUI
     guidata(handles.GUI, handles);
@@ -707,16 +712,23 @@ function ResetViewButtonPressed(hObj, eventdata, handles) %#ok<DEFNU>
 
     myData = handles.myData;
     taskinfo = myData.tasks_out{myData.iter};
-    
     % Redraw the Image from the Temporary Image Folder
-    taskimage_load(hObj);
+    %taskimage_load(hObj);
     handles = guidata(hObj);
 
     switch myData.mode_desc
         case 'MicroRT'
 
             target_pos = [taskinfo.stage_x, taskinfo.stage_y];
+            currentNextStatus = get(handles.NextButton,'enable');
+            set(handles.NextButton,'enable','off');
+            set(handles.Fast_Register_Button,'enable','off');
+            set(handles.Best_Register_Button,'enable','off');
             handles.myData.stage = stage_move(handles.myData.stage,target_pos,handles.myData.stage.handle);
+            set(handles.NextButton,'enable',currentNextStatus);
+            set(handles.Fast_Register_Button,'enable','on');
+            set(handles.Best_Register_Button,'enable','on');
+            
     end
 
     %    myData.tasks_out{myData.iter} = taskinfo;
@@ -1127,3 +1139,31 @@ function Best_Register_Button_Callback(hObject, eventdata, handles)
     error_show(ME)
 end
 end
+
+
+
+
+% --- Executes on button press in Reticlebutton.
+function Reticlebutton_Callback(hObject, eventdata, handles)
+% hObject    handle to Reticlebutton (see GCBO)
+% eventdata  reserved - to be defined in a future version of MATLAB
+% handles    structure with handles and user data (see GUIDATA)
+if handles.reticle == 1 
+    handles.reticle = 0;
+    set(handles.Reticlebutton,'String','Show reticle');
+else
+    handles.reticle = 1;
+    set(handles.Reticlebutton,'String','Hide reticle');
+end
+guidata(handles.GUI, handles);
+taskimage_load(hObject);
+handles = guidata(hObject);
+st = dbstack;
+taskinfo = handles.myData.tasks_out{handles.myData.iter};
+taskinfo.calling_function = st(1).name;
+handles.myData.taskinfo = taskinfo;
+guidata(handles.GUI, handles);
+taskinfo.task_handle(handles.GUI);
+%set(handles.NextButton,'Enable', 'off');
+
+end

GUI.m

@@ -62,7 +62,7 @@ BODY
 start
 finish
 radio1of4,1st0001,-1,1,038459,16192,219,219,219,219,Qtext_radio1of1,1,1,Q_Op1,Q_Op2,Q_Op3,Q_Op4
-count,2nd0001,-1,1,027728,11381,439,439,439,439,Qtext_count,1,1,description
+count,2nd0001,-1,1,027728,11381,439,439,439,439,Qtext_count,1,1,Please count mitotic in this area
 slider,3rd0001,-1,1,19220,49879,658,658,658,658,Qtext_slider,1,1,Q_Op1,Q_Op2,Q_Op3,Q_Op4
 mark1,4th0001,-1,1,041163,33208,878,878,878,878,Qtext_select_region,1,1,Q_Op1,Q_Op2,Q_Op3,Q_Op4
 mark1_out,5th0001,-1,1,041163,33208,1097,1097,1097,1097,Qtext_select_region,1,1,Q_Op1,Q_Op2,Q_Op3,Q_Op4

sample_inputfiles/tissue40x-8B-axioplan2i.dapsi

@@ -169,6 +169,20 @@ function task_mark1(hObj)
             % Pack the results
             myData.tasks_out{handles.myData.iter} = taskinfo;
 
+            
+        case 'Reticlebutton_Callback' % keep mark result after hide/show reticle
+            if handles.panning_Zooming_Tool.markexists==1
+                textROIX= get(handles.textROIX);
+                textROIY= get(handles.textROIY);
+                x = str2num(textROIX.String);
+                y = str2num(textROIY.String);
+                handles.panning_Zooming_Tool.mark = rectangle('Position',...
+                    [x-40,y-40,80,80],'Curvature',[1,1],...
+                    'LineWidth',4,'LineStyle','--','EdgeColor','r','Tag','mark');
+                handles.panning_Zooming_Tool.markexists=1;
+            end
+                  
+            
         case {'NextButtonPressed', ...
                 'PauseButtonPressed',...
                 'Backbutton_Callback'} % Clean up the task elements

tasks/task_mark1.m

@@ -170,6 +170,20 @@ function task_mark1_out(hObj)
             % Pack the results
             myData.tasks_out{handles.myData.iter} = taskinfo;
 
+            
+        case 'Reticlebutton_Callback' % keep mark result after hide/show reticle
+            if handles.panning_Zooming_Tool.markexists==1
+                textROIX= get(handles.textROIX);
+                textROIY= get(handles.textROIY);
+                x = str2num(textROIX.String);
+                y = str2num(textROIY.String);
+                handles.panning_Zooming_Tool.mark = rectangle('Position',...
+                    [x-40,y-40,80,80],'Curvature',[1,1],...
+                    'LineWidth',4,'LineStyle','--','EdgeColor','r','Tag','mark');
+                handles.panning_Zooming_Tool.markexists=1;
+            end
+            
+            
         case {'NextButtonPressed', ...
                 'PauseButtonPressed',...
                 'Backbutton_Callback'} % Clean up the task elements

tasks/task_mark1_out.m

@@ -21,9 +21,11 @@ function taskimage_load(hObj)
     if ~isnan(handles.ImX)
 
         % Apply reticle mask
-        handles.ImX = reticle_apply_mask(...
-            handles.ImX,...
-            settings.scan_mask);
+        if handles.reticle == 1
+            handles.ImX = reticle_apply_mask(...
+                handles.ImX,...
+                settings.scan_mask);
+        end
         temp=size(handles.ImX);
         imageydim=temp(1);
         imagexdim=temp(2);

tasks/taskimage_load.m

@@ -36,7 +36,7 @@ function taskmgt_default(handles, on_off)
     set(handles.PauseButton, 'Visible',on_off);
     set(handles.ResumeButton, 'Visible', on_off, ...
         'Enable', 'off');
-    
+    set(handles.Reticlebutton, 'Visible', on_off);
     if handles.myData.iter > 2
         set(handles.Backbutton,'visible',on_off);
     end