1. In mark out task reticle button doesn't erase make out circle.

2. During reset, Next, fast and best registration button will disable. After reset done, next button will return to before reset status.

Author: qigongFDA

GUI.m

@@ -712,16 +712,23 @@ function ResetViewButtonPressed(hObj, eventdata, handles) %#ok<DEFNU>
 
     myData = handles.myData;
     taskinfo = myData.tasks_out{myData.iter};
-    set(handles.NextButton,'Enable', 'off');
     % 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;
@@ -1150,6 +1157,13 @@ function Reticlebutton_Callback(hObject, eventdata, handles)
 end
 guidata(handles.GUI, handles);
 taskimage_load(hObject);
-set(handles.NextButton,'Enable', 'off');
+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

tasks/task_mark1.m

@@ -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_out.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