Index: trunk/src/uvmat.m
===================================================================
--- trunk/src/uvmat.m	(revision 307)
+++ trunk/src/uvmat.m	(revision 309)
@@ -236,6 +236,4 @@
 set(hObject,'WindowButtonUpFcn',{'mouse_up',handles}) 
 set(hObject,'DeleteFcn',{@closefcn})%
-%set(handles.ListObject,'ButtonDownFcn',{@list_object_1_Callback,handles})% allows activation of lis_object_1_callback with right mouse click
-%set(handles.list_object_2,'ButtonDownFcn',{@list_object_2_Callback,handles})
 
 %% refresh projection plane
@@ -1329,8 +1327,8 @@
 set_scan_options(hObject, eventdata, handles)
 
-%---------------------------------------------------
-% switch file index scanning options scan_i and scan_j in an exclusive way
+%------------------------------------------------------------------------
+% --- switch file index scanning options scan_i and scan_j in an exclusive way
 function scan_i_Callback(hObject, eventdata, handles)
-%---------------------------------------------------
+%------------------------------------------------------------------------
 if get(handles.scan_i,'Value')==1
     set(handles.scan_i,'BackgroundColor',[1 1 0])
@@ -1344,8 +1342,8 @@
 scan_j_Callback(hObject, eventdata, handles)
 
-%-------------------------------------------------------------------
-% switch file index scanning options scan_i and scan_j in an exclusive way
+%------------------------------------------------------------------------
+% --- switch file index scanning options scan_i and scan_j in an exclusive way
 function scan_j_Callback(hObject, eventdata, handles)
-%-------------------------------------------------------------------
+%------------------------------------------------------------------------
 if get(handles.scan_j,'Value')==1
     set(handles.scan_j,'BackgroundColor',[1 1 0])
@@ -1366,7 +1364,7 @@
 end
 
-%-------------------------------------------------------------------
+%------------------------------------------------------------------------
 function i1_Callback(hObject, eventdata, handles)
-%-------------------------------------------------------------------
+%------------------------------------------------------------------------
 set(handles.i1,'BackgroundColor',[0.7 0.7 0.7])
 NomType=get(handles.FileIndex,'UserData');
@@ -1386,27 +1384,26 @@
      set(handles.FileIndex_1,'BackgroundColor',[0.7 0.7 0.7])
 end
-%Run0_Callback(hObject, eventdata, handles)
-
-%-------------------------------------------------------------------
+
+%------------------------------------------------------------------------
 function i2_Callback(hObject, eventdata, handles)
+%------------------------------------------------------------------------
 set(handles.i2,'BackgroundColor',[0.7 0.7 0.7])
 i1_Callback(hObject, eventdata, handles)
-%-------------------------------------------------------------------
-
-%-------------------------------------------------------------------
+
+%------------------------------------------------------------------------
 function j1_Callback(hObject, eventdata, handles)
+%------------------------------------------------------------------------
 set(handles.j1,'BackgroundColor',[0.7 0.7 0.7])
 i1_Callback(hObject, eventdata, handles)
-%-------------------------------------------------------------------
-
-%-------------------------------------------------------------------
+
+%------------------------------------------------------------------------
 function j2_Callback(hObject, eventdata, handles)
+%------------------------------------------------------------------------
 set(handles.j2,'BackgroundColor',[0.7 0.7 0.7])
 i1_Callback(hObject, eventdata, handles)
-%-------------------------------------------------------------------
-
-%-------------------------------------------------------------------
+
+%------------------------------------------------------------------------
 function slices_Callback(hObject, eventdata, handles)
-%-------------------------------------------------------------------
+%------------------------------------------------------------------------
 if get(handles.slices,'Value')==1
     set(handles.slices,'BackgroundColor',[1 1 0])
@@ -1424,7 +1421,7 @@
 end
 
-%-------------------------------------------------------------------
+%------------------------------------------------------------------------
 function nb_slice_Callback(hObject, eventdata, handles)
-%-------------------------------------------------------------------
+%------------------------------------------------------------------------
 nb_slice_str=get(handles.nb_slice,'String');
 if isequal(nb_slice_str,'volume')
@@ -1541,5 +1538,4 @@
     end
     set(handles.mask_test,'UserData',[])    
-    %huvmat=get(handles.mask_test,'parent');
     UvData=get(handles.uvmat,'UserData');
     if isfield(UvData,'MaskName')
@@ -1550,7 +1546,7 @@
 end
 
-%-------------------------------------------------------------------
+%------------------------------------------------------------------------
 function errormsg=update_mask(handles,num_i1,num_j1)
-%-------------------------------------------------------------------
+%------------------------------------------------------------------------
 errormsg=[];%default
 MaskData=get(handles.mask_test,'UserData');
@@ -1633,9 +1629,8 @@
 
 
-%-------------------------------------------------------------------
+%------------------------------------------------------------------------
 function MenuExportFigure_Callback(hObject, eventdata, handles)
-%-------------------------------------------------------------------
+%------------------------------------------------------------------------
 huvmat=get(handles.MenuExport,'parent');
-%UvData=get(huvmat,'UserData');
 hfig=figure;
 copyobj(handles.axes3,hfig);
@@ -1644,15 +1639,15 @@
 colorbar
 
-%-------------------------------------------------------------------
-%-------------------------------------------------------------------
+%------------------------------------------------------------------------
+%------------------------------------------------------------------------
 % III - MAIN REFRESH FUNCTIONS : 'FRAME PLOT'
-%-------------------------------------------------------------------
-
-%-------------------------------------------------------------------
+%------------------------------------------------------------------------
+
+%------------------------------------------------------------------------
 % --- Executes on button press in runplus: make one step forward and call
 % --- run0. The step forward is along the fields series 1 or 2 depending on 
 % --- the scan_i and scan_j check box (exclusive each other)
 function runplus_Callback(hObject, eventdata, handles)
-%-------------------------------------------------------------------
+%------------------------------------------------------------------------
 set(handles.runplus,'BackgroundColor',[1 1 0])%paint the command button in yellow
 drawnow
@@ -1669,10 +1664,10 @@
 set(handles.runplus,'BackgroundColor',[1 0 0])%paint the command button back to red
 
-%-------------------------------------------------------------------
+%------------------------------------------------------------------------
 % --- Executes on button press in runmin: make one step backward and call
 % --- run0. The step backward is along the fields series 1 or 2 depending on 
 % --- the scan_i and scan_j check box (exclusive each other)
 function runmin_Callback(hObject, eventdata, handles)
-%-------------------------------------------------------------------
+%------------------------------------------------------------------------
 set(handles.runmin,'BackgroundColor',[1 1 0])%paint the command button in yellow
 drawnow
@@ -1688,8 +1683,8 @@
 set(handles.runmin,'BackgroundColor',[1 0 0])%paint the command button back to red
 
-%-------------------------------------------------------------------
+%------------------------------------------------------------------------
 % -- Executes on button press in Movie: make a series of +> steps
 function Movie_Callback(hObject, eventdata, handles)
-%------------------------------------------------------------------
+%------------------------------------------------------------------------
 set(handles.Movie,'BackgroundColor',[1 1 0])%paint the command button in yellow
 drawnow
@@ -1719,8 +1714,8 @@
 set(handles.Movie,'BackgroundColor',[1 0 0])%paint the command buttonback to red
 
-%-------------------------------------------------------------------
+%------------------------------------------------------------------------
 % -- Executes on button press in Movie: make a series of <- steps
 function MovieBackward_Callback(hObject, eventdata, handles)
-%------------------------------------------------------------------
+%------------------------------------------------------------------------
 set(handles.MovieBackward,'BackgroundColor',[1 1 0])%paint the command button in yellow
 drawnow
@@ -1750,7 +1745,7 @@
 set(handles.MovieBackward,'BackgroundColor',[1 0 0])%paint the command buttonback to red
 
-%-------------------------------------------------------------------
+%------------------------------------------------------------------------
 function STOP_Callback(hObject, eventdata, handles)
-%-------------------------------------------------------------------
+%------------------------------------------------------------------------
 set(handles.movie_pair,'BusyAction','Cancel')
 set(handles.movie_pair,'value',0)
@@ -1762,8 +1757,8 @@
 set(handles.MovieBackward,'BackgroundColor',[1 0 0])%paint the command buttonback to red
 
-%------------------------------------------------------------------
+%------------------------------------------------------------------------
 function errormsg=runpm(hObject,eventdata,handles,increment)
-%------------------------------------------------------------------
-%check for mï¿œovie pair status
+%------------------------------------------------------------------------
+%check for movie pair status
 movie_status=get(handles.movie_pair,'Value');
 if isequal(movie_status,1)
@@ -1771,5 +1766,4 @@
 end
 %read the data on the current input rootfile(s)
-
 [FileName,RootPath,filebase,FileIndices,FileExt,subdir]=read_file_boxes(handles);
 NomType=get(handles.FileIndex,'UserData');
@@ -1792,5 +1786,4 @@
     filename_1=[];
 end   
-
 comp_input=get(handles.fix_pair,'Value');
 
@@ -1843,9 +1836,8 @@
 end
 
-
-%-------------------------------------------------------
+%------------------------------------------------------------------------
 % --- Executes on button press in movie_pair: create an alternating movie with two view
-%-------------------------------------------------------
 function movie_pair_Callback(hObject, eventdata, handles)
+%------------------------------------------------------------------------
 status=get(handles.movie_pair,'value');
 if isequal(status,0)
@@ -3675,7 +3667,7 @@
        set(handles.num_MaxVec,'String','1')
        set(handles.num_ColCode1,'String','0.333')
-       colcode1_Callback(hObject, eventdata, handles)
+       num_ColCode1_Callback(hObject, eventdata, handles)
        set(handles.num_ColCode2,'String','0.666')
-       colcode2_Callback(hObject, eventdata, handles)
+       num_ColCode2_Callback(hObject, eventdata, handles)
    else
        set(handles.CheckFixVecColor,'Value',1)%auto scale between min,max by default
@@ -3707,5 +3699,5 @@
     set(handles.num_ColCode2,'String',num2str(col))
 end
-colcode1_Callback(hObject, eventdata, handles)
+num_ColCode1_Callback(hObject, eventdata, handles)
 
 %----------------------------------------------------------------
@@ -3722,43 +3714,20 @@
     set(handles.num_ColCode1,'String',num2str(col))
 end
-colcode2_Callback(hObject, eventdata, handles)
+num_ColCode2_Callback(hObject, eventdata, handles)
 
 %----------------------------------------------------------------
-%execute on return carriage on the edit box corresponding to slider 1
+% --- Execute on return carriage on the edit box corresponding to slider 1
 %----------------------------------------------------------------
-function num_ColCode1_Callback(hObject, eventdata, handles)
-% col=str2num(get(handles.num_ColCode1,'String'));
-% set(handles.Slider1,'Value',col) 
+function num_ColCode1_Callback(hObject, eventdata, handles) 
 set_vec_col_bar(handles)
 update_plot(handles);
 
 %----------------------------------------------------------------
-%execute on return carriage on the edit box corresponding to slider 2
+% --- Execute on return carriage on the edit box corresponding to slider 2
 %----------------------------------------------------------------
 function num_ColCode2_Callback(hObject, eventdata, handles)
-% col=str2num(get(handles.num_ColCode2,'String'));
-% set(handles.Slider2,'Value',col) 
-% slider2_Callback(hObject, eventdata, handles)
 set_vec_col_bar(handles)
 update_plot(handles);
-%------------------------------------------------------------
-%update the slider values after displaying vectors
-%--------------------------------------------------------
-% function slider_update(handles,auto,minC,num_ColCode1,num_ColCode2,maxC)
-% set(handles.Slider1,'Min',minC) 
-% set(handles.Slider1,'Max',maxC)
-% set(handles.Slider2,'Min',minC) 
-% set(handles.Slider2,'Max',maxC)
-% set(handles.min_title_vec,'String',num2str(minC))
-% set(handles.num_MaxVec,'String',num2str(maxC))
-% if auto
-%         set(handles.num_ColCode1,'String',num2str(num_ColCode1,3))%update display
-%         set(handles.num_ColCode2,'String',num2str(num_ColCode2,3))
-% end
-% set(handles.Slider1,'Value',num_ColCode1)%update slider with constant display
-% set(handles.Slider2,'Value',num_ColCode2)
-% set_vec_col_bar(handles)
-
-
+%------------------------------------------------------------------------
 %-------------------------------------------------------
 % --- Executes on button press in CheckFixVecColor.
@@ -3771,5 +3740,4 @@
 function transform_fct_Callback(hObject, eventdata, handles)
 %-------------------------------------------------------------
-
 UvData=get(handles.uvmat,'UserData');
 menu=get(handles.transform_fct,'String');
