Changeset 635 for trunk/src/uvmat.m

Timestamp:

May 19, 2013, 11:37:49 PM (11 years ago)

Author:

sommeria

Message:

 

File:

• trunk/src/uvmat.m (modified) (10 diffs)

trunk/src/uvmat.m

@@ -1465 +1465 @@
 function runplus_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
+
 set(handles.runplus,'BackgroundColor',[1 1 0])%paint the command button in yellow
 drawnow
-%TODO: introduce the option: increment ='*' to move to the next available view
-increment=str2num(get(handles.num_IndexIncrement,'String')); %get the field increment d
-% if isnan(increment)
-%     set(handles.num_IndexIncrement,'String','1')%default value
-%     increment=1;
-% end
+increment=str2double(get(handles.num_IndexIncrement,'String')); %get the field increment d
+if isnan(increment)% case of free increment: move to next available field index
+    increment='+'; 
+end
 errormsg=runpm(hObject,eventdata,handles,increment);
 if ~isempty(errormsg)
@@ -1485 +1484 @@
 function runmin_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
+
 set(handles.runmin,'BackgroundColor',[1 1 0])%paint the command button in yellow
 drawnow
-increment=-str2num(get(handles.num_IndexIncrement,'String')); %get the field increment d
-% if isnan(increment)
-%     set(handles.num_IndexIncrement,'String','1')%default value
-%     increment=1;
-% end
+increment=-str2double(get(handles.num_IndexIncrement,'String')); %get the field increment d
+if isnan(increment)% case of free increment: move to previous available field index
+    increment='-'; 
+end
 errormsg=runpm(hObject,eventdata,handles,increment);
 if ~isempty(errormsg)
@@ -1502 +1501 @@
 function Movie_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
+
 set(handles.Movie,'BackgroundColor',[1 1 0])%paint the command button in yellow
 drawnow
-increment=str2num(get(handles.num_IndexIncrement,'String')); %get the field increment d
-% if isnan(increment)
-%     set(handles.num_IndexIncrement,'String','1')%default value
-%     increment=1;
-% end
+increment=str2double(get(handles.num_IndexIncrement,'String')); %get the field increment d
+if isnan(increment)% case of free increment: move to next available field index
+    increment='+'; 
+end
 set(handles.STOP,'Visible','on')
 set(handles.speed,'Visible','on')
@@ -1535 +1534 @@
 set(handles.MovieBackward,'BackgroundColor',[1 1 0])%paint the command button in yellow
 drawnow
-increment=-str2num(get(handles.num_IndexIncrement,'String')); %get the field increment d
+increment=-str2double(get(handles.num_IndexIncrement,'String')); %get the field increment d
+if isnan(increment)% case of free increment: move to next available field index
+    increment='-'; 
+end
 set(handles.STOP,'Visible','on')
 set(handles.speed,'Visible','on')
@@ -1607 +1609 @@
 
 %% increment (or decrement) the field indices and update the input filename(s)
-if isempty(increment)
+if ~isnumeric(increment)% undefined increment value
     set(handles.CheckFixPair,'Value',0)
 end
@@ -1617 +1619 @@
         j1_1=j1;
         j2_1=j2;
-if CheckFixPair
+if CheckFixPair && isnumeric(increment)
     if get(handles.scan_i,'Value')==1% case of scanning along index i
         i1=i1+increment;
@@ -1624 +1626 @@
             i1_1=i1_1+increment;
             i2_1=i2_1+increment;
-        end
-        
+        end        
     else % case of scanning along index j (burst numbers)
         j1=j1+increment;
@@ -1649 +1650 @@
         end
     end
-    if ~isempty(increment)
+    if isnumeric(increment)
         if get(handles.scan_i,'Value')==1% case of scanning along index i
             ref_i=ref_i+increment;% increment the current reference index i
@@ -1657 +1658 @@
     else % free increment
         runaction=get(gcbo,'tag');
-        if strcmp(runaction,'runplus')||strcmp(runaction,'Movie')% if runplus or movie is activated
+        if strcmp(increment,'+')% if runplus or movie is activated
             step=1;
         else
@@ -1719 +1720 @@
             end
         end
-        if ~isempty(increment)
+        if isnumeric(increment)
             if get(handles.scan_i,'Value')==1% case of scanning along index i
                 ref_i_1=ref_i_1+increment;% increment the current reference index i