Changeset 315

Timestamp:

Dec 3, 2011, 10:25:45 PM (13 years ago)

Author:

sommeria

Message:

many corrections, use of the new GUI civ with mask, grid and the new matlab civ1 and fix
pivlab now included in civ_matlab which contains all matlab subfunctions for civ.

Location:

trunk/src

Files:

• check_files.m (modified) (2 diffs)
• civ.fig (modified) (previous)
• civ.m (modified) (39 diffs)
• civ_matlab.m (added)
• civ_uvmat.m (deleted)
• mouse_motion.m (modified) (4 diffs)
• pivlab.m (deleted)
• set_col_vec.m (modified) (3 diffs)
• set_grid.m (modified) (1 diff)
• uvmat.fig (modified) (previous)
• uvmat.m (modified) (19 diffs)
• view_field.m (modified) (1 diff)

trunk/src/check_files.m

@@ -41 +41 @@
     'civ_3D';... function associated with the interface 'civ_3D.fig' for PIV in volume (in progress)
     'civ_3D.fig';...
-    'civ_uvmat';...% civ programs, Matlab version (called by civ.m, option Civuvmat)
+    'civ_matlab';...% civ programs, Matlab version (called by civ.m, option Civprogram/Matlab in the upper menu bar)
     'close_fig';...% function  activated when a figure is closed
     'copyfields';...% copy fields between two matlab structures
@@ -71 +71 @@
     'peaklock';...%
     'phys_XYZ';...% transform coordiantes from pixels to phys
-    'pivlab';...% PIV program (Civ1), called by civ_uvmat
     'px_XYZ';...% transform coordiantes from phys to pixels
     'plot_field';...%displays a vector field and/or scalar or images

trunk/src/civ.m

@@ -23 +23 @@
 %TODO: search range
 
-% Last Modified by GUIDE v2.5 30-Nov-2011 21:52:52
+% Last Modified by GUIDE v2.5 03-Dec-2011 16:08:25
 % Begin initialization code - DO NOT EDIT
 gui_Singleton = 1;
@@ -533 +533 @@
     ind_opening=2;% propose 'fix' as the default option
     Data=nc2struct(fileinput,'ListGlobalAttribute','CivStage','absolut_time_T0','fix','patch','civ2','fix2');
+    if isfield(Data,'Txt')
+        msgbox_uvmat('ERROR',Data.Txt)
+        return
+    end
     if ~isempty(Data.CivStage)%test for civ files
         ind_opening=Data.CivStage;
@@ -959 +963 @@
 %could be included in get_mask callback ?
 if isequal(get(handles.CheckMask,'Value'),1)
-    maskname=get(handles.txt_MaskName,'String');
+    maskname=get(handles.txt_Mask,'String');
     if ~exist(maskname,'file')
         get_mask_civ1_Callback(hObject, eventdata, handles);
@@ -965 +969 @@
 end
 if isequal(get(handles.CheckMask,'Value'),1)
-    maskname=get(handles.txt_MaskName,'String');
+    maskname=get(handles.txt_Mask,'String');
     if ~exist(maskname,'file')
         get_mask_fix1_Callback(hObject, eventdata, handles);
@@ -977 +981 @@
 end
 if isequal(get(handles.CheckMask,'Value'),1)
-    maskname=get(handles.txt_MaskName,'String');
+    maskname=get(handles.txt_Mask,'String');
     if ~exist(maskname,'file')
         get_mask_fix2_Callback(hObject, eventdata, handles);
@@ -1097 +1101 @@
 %% MAIN LOOP
 time=get(handles.ImaDoc,'UserData'); %get the set of times
-super_cmd=[];
 batch_file_list=[];
  
@@ -1129 +1132 @@
         if Param.CheckCiv1
             % read image-dependent parameters
-            Param.Civ1.filename_ima_a=filecell.ima1.civ1{ifile,j};
-            Param.Civ1.filename_ima_b=filecell.ima2.civ1{ifile,j};
+            Param.Civ1.ImageA=filecell.ima1.civ1{ifile,j};
+            Param.Civ1.ImageB=filecell.ima2.civ1{ifile,j};
             if size(time,1)>=i2_civ1(ifile) && size(time,2)>=j2_civ1(j)
                 Param.Civ1.Dt=(time(i2_civ1(ifile),j2_civ1(j))-time(i1_civ1(ifile),j1_civ1(j)));
-                Param.Civ1.T0=((time(i2_civ1(ifile),j2_civ1(j))+time(i1_civ1(ifile),j1_civ1(j)))/2);
+                Param.Civ1.Time=((time(i2_civ1(ifile),j2_civ1(j))+time(i1_civ1(ifile),j1_civ1(j)))/2);
             else
                 Param.Civ1.Dt=1;
-                Param.Civ1.T0=0;
+                Param.Civ1.Time=0;
             end
             Param.Civ1.term_a=num2stra(j1_civ1(j),nom_type_nc);%UTILITE?
-            Param.Civ1.term_b=num2stra(j2_civ1(j),nom_type_nc);%
-            Param.Civ1.pxcmx=1; %velocities are expressed in pixel dispalcement
-            Param.Civ1.pxcmy=1;      
-            Param.Civ1.ImageInfo=imfinfo(filecell.ima1.civ1{1,1});%read the first image to get the size
-            
-            %TODO : civ should not need npx and npy
-            
+            Param.Civ1.term_b=num2stra(j2_civ1(j),nom_type_nc);%    
+            ImageInfo=imfinfo(filecell.ima1.civ1{1,1});%read the first image to get the size
+            Param.Civ1.ImageWidth=ImageInfo.Width;
+            Param.Civ1.ImageHeight=ImageInfo.Height;
+            Param.Civ1.ImageBitDepth=ImageInfo.BitDepth;
             % read mask parameters
             if Param.Civ1.CheckMask % the lines below should be changed with the new gui
-                %matbe they when check_mask the Maskname is read
-                if exist(Param.Civ1.MaskName,'file')
-                    Param.Civ1.MaskFlag='y';
-                else
-                    maskbase=[filecell.filebase '_' Param.Civ1.MaskName]; %
-                    nbslice_mask=str2double(maskdispl(1:end-4)); %
+                if ~exist(Param.Civ1.Mask,'file')
+                    maskbase=[filecell.filebase '_' Param.Civ1.Mask]; %
+                    nbslice_mask=str2double(Param.Civ1.Mask(1:end-4)); %
                     i1_mask=mod(i1_civ1(ifile)-1,nbslice_mask)+1;
-                    Param.Civ1.MaskName=name_generator(maskbase,i1_mask,1,'.png','_i');
-                    if exist(Param.Civ1.MaskName,'file')
-                        Param.Civ1.maskflag='y';
-                    else
-                        Param.Civ1.MaskName='noFile use default';
-                        Param.Civ1.MaskFlag='n';
-                    end
+                    Param.Civ1.Mask=name_generator(maskbase,i1_mask,1,'.png','_i');
                 end
-            else
-                Param.Civ1.MaskName='noFile use default';
-                Param.Civ1.MaskFlag='n';
-            end
-            
+            end
             % read grid parameters
             if Param.Civ1.CheckGrid
-%                 Param.Civ1.GridFlag='y';
-                if isequal(Param.Civ1.GridName(end-3:end),'grid')
-                    nbslice_grid=str2double(Param.Civ1.GridName(1:end-4)); %
+                if numel(Param.Civ1.Grid)>=4 && isequal(Param.Civ1.Grid(end-3:end),'grid')
+                    nbslice_grid=str2double(Param.Civ1.Grid(1:end-4)); %
                     if ~isnan(nbslice_grid)
                         i1_grid=mod(i1_civ1(ifile)-1,nbslice_grid)+1;
-                        Param.Civ1.GridName=[filecell.filebase '_' name_generator(Param.Civ1.GridName,i1_grid,1,'.grid','_i')];
+                        Param.Civ1.Grid=[filecell.filebase '_' name_generator(Param.Civ1.Grid,i1_grid,1,'.grid','_i')];
                         if ~exist(Param.Civ1.GridName,'file')
                             msgbox_uvmat('ERROR','grid file absent for civ1')
                         end
-                    elseif ~exist(Param.Civ1.GridName,'file')
+                    elseif ~exist(Param.Civ1.Grid,'file')
                         msgbox_uvmat('ERROR','grid file absent for civ1')
                     end
                 end
-%            else
-%                 Param.Civ1.GridName='noFile use default';
-%                 Param.Civ1.GridFlag='n';
             end
             
@@ -1282 +1266 @@
         end
         if Param.CheckCiv2==1
-            Param.Civ2.filename_ima_a=filecell.ima1.civ2{ifile,j};
-            Param.Civ2.filename_ima_b=filecell.ima2.civ2{ifile,j};
+            Param.Civ2.ImageA=filecell.ima1.civ2{ifile,j};
+            Param.Civ2.ImageB=filecell.ima2.civ2{ifile,j};
             if size(time,1)>=i2_civ2(ifile) && size(time,2)>=j2_civ2(j)
                 Param.Civ2.Dt=num2str(time(i2_civ2(ifile),j2_civ2(j))-time(i1_civ2(ifile),j1_civ2(j)));
-                Param.Civ2.T0=num2str((time(i2_civ2(ifile),j2_civ2(j))+time(i1_civ2(ifile),j1_civ2(j)))/2);
+                Param.Civ2.Time=num2str((time(i2_civ2(ifile),j2_civ2(j))+time(i1_civ2(ifile),j1_civ2(j)))/2);
             else
                 Param.Civ2.Dt=1;
-                Param.Civ2.T0=0;
+                Param.Civ2.Time=0;
             end
             Param.Civ2.term_a=num2stra(j1_civ2(j),nom_type_nc);
@@ -1295 +1279 @@
             Param.Civ2.filename_nc1=filecell.nc.civ1{ifile,j};
             Param.Civ2.filename_nc1(end-2:end)=[]; % remove '.nc'
-            Param.Civ2.pxcmx=1; %velocities are expressed in pixel dispalcement
-            Param.Civ2.pxcmy=1;
+            
+            % mask 
             if Param.Civ2.CheckMask
-                maskdispl=get(handles.txt_Mask,'String');
-                if exist(maskdispl,'file')
-                    Param.Civ2.MaskName=maskdispl;
-                    Param.Civ2.MaskFlag='y';
-                else
-                    maskbase=[filecell.filebase '_' maskdispl]; %
-                    nbslice_mask=str2double(maskdispl(1:end-4)); %
+                if ~exist(Param.Civ2.Mask,'file')
+                    maskbase=[filecell.filebase '_' Param.Civ2.Mask]; %
+                    nbslice_mask=str2double(Param.Civ2.Mask(1:end-4)); %
                     i1_mask=mod(i1_civ2(ifile)-1,nbslice_mask)+1;
-                    Param.Civ2.MaskName=name_generator(maskbase,i1_mask,1,'.png','_i');
-                    if exist(Param.Civ2.MaskName,'file')
-                        Param.Civ2.MaskFlag='y';
-                    else
-                        Param.Civ2.MaskName='noFile use default';
-                        Param.Civ2.MaskFlag='n';
+                    Param.Civ2.Mask=name_generator(maskbase,i1_mask,1,'.png','_i');
+                end
+            end
+            %grid
+            if Param.Civ2.CheckGrid
+                if numel(Param.Civ2.Grid)>=4 && isequal(Param.Civ2.Grid(end-3:end),'grid')
+                    nbslice_grid=str2double(Param.Civ2.Grid(1:end-4)); %
+                    if ~isnan(nbslice_grid)
+                        i1_grid=mod(i1_civ2(ifile)-1,nbslice_grid)+1;
+                        Param.Civ2.Grid=[filecell.filebase '_' name_generator(gridname,i1_grid,1,'.grid','_i')];
                     end
                 end
-            else
-                Param.Civ2.MaskName='noFile use default';
-                Param.Civ2.MaskFlag='n';
-            end
-            gridname=get(handles.txt_GridName,'String');
-            if numel(gridname)>=4 && isequal(gridname(end-3:end),'grid')
-                nbslice_grid=str2double(gridname(1:end-4)); %
-                if ~isnan(nbslice_grid)
-                    Param.Civ2.GridFlag='y';
-                    i1_grid=mod(i1_civ2(ifile)-1,nbslice_grid)+1;
-                    Param.Civ2.GridName=[filecell.filebase '_' name_generator(gridname,i1_grid,1,'.grid','_i')];
-%                     if exist(Param.Civ2.GridName,'file')
-%                         Param.Civ2.GridFlag='y';
-%                     else
-%                         Param.Civ2.GridName='noFile use default';
-%                         Param.Civ2.GridFlag='n';
-%                     end
-                elseif exist(gridname,'file')
-%                     Param.Civ2.GridFlag='y';
-%                 else
-%                     Param.Civ2.GridName='noFile use default';
-%                     Param.Civ2.GridFlag='n';
-                end
-%             else
-%                 Param.Civ2.GridName='noFile use default';
-%                 Param.Civ2.GridFlag='n';
-            end
-%             A=imread(filecell.ima1.civ2{1,1});%read the first image to get the size
-%             sizim=size(A);
-            Param.Civ2.ImageInfo=imfinfo(filecell.ima1.civ2{1,1});%read the first image to get the size
-            % TODO: case of movie
-%             Param.Civ2.npx=(sizim(2));
-%             Param.Civ2.npy=(sizim(1));      
+            end
+            ImageInfo=imfinfo(filecell.ima1.civ2{1,1});%read the first image to get the size
+            Param.Civ2.ImageWidth=ImageInfo.Width;
+            Param.Civ2.ImageHeight=ImageInfo.Height;
+            Param.Civ2.ImageBitDepth=ImageInfo.BitDepth;
+            % TODO: case of movie   
             switch CivMode
                 case 'CivX'
@@ -3235 +3192 @@
 set(gcf,'Pointer','arrow')
 
-
+%-------------------------------------------------------------------
+% --- 
+function closeview_field(gcbo,eventdata)
+hview_field=findobj(allchild(0),'tag','view_field');% look for view_field    
+    if ~isempty(hview_field)
+        delete(hview_field)
+    end
+    
+    
+%------------------------------------------------------------------------   
+% call 'view_field.fig' to display the  field selected in the list of 'status'
+function open_view_field(hObject, eventdata)
+%------------------------------------------------------------------------
+list=get(hObject,'String');
+index=get(hObject,'Value');
+rootroot=get(hObject,'UserData');
+filename=list{index};
+ind_dot=strfind(filename,'...');
+filename=filename(1:ind_dot-1);
+filename=fullfile(rootroot,filename);
+delete(get(hObject,'parent'))%delete the display figure to stop the check process
+if exist(filename,'file')%visualise the vel field if it exists
+    uvmat(filename)
+    set(gcbo,'Value',1)
+end
+
+%------------------------------------------------------------------------   
+% launched by pressing OK on the status figure
+function close_GUI(hObject, eventdata)
+%------------------------------------------------------------------------
+    delete(gcbf)
+    
+%------------------------------------------------------------------------   
+% launched by deleting the status figure
+function stop_status(hObject, eventdata)
+%------------------------------------------------------------------------
+hciv=findobj(allchild(0),'tag','civ');
+hhciv=guidata(hciv);
+set(hhciv.status,'value',0) %reset the status uicontrol in the GUI civ
+set(hhciv.status,'BackgroundColor',[0 1 0])
 
 
@@ -3351 +3347 @@
 end
 
-
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Callbacks in the uipanel Fix1
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %------------------------------------------------------------------------
 % --- Executes on button press in CheckMask.
@@ -3358 +3356 @@
 maskval=get(handles.CheckMask,'Value');
 if isequal(maskval,0)
-    set(handles.txt_MaskName,'String','')
+    set(handles.txt_Mask,'String','')
 else
     mask_displ='no mask'; %default
@@ -3391 +3389 @@
         set(handles.CheckMask,'Value',1)
     end
-    set(handles.txt_MaskName,'String',mask_displ)
     set(handles.txt_Mask,'String',mask_displ)
-    set(handles.txt_MaskName,'String',mask_displ)
+    set(handles.txt_Mask,'String',mask_displ)
+    set(handles.txt_Mask,'String',mask_displ)
 end
 
@@ -3434 +3432 @@
     end
     set(handles.txt_Mask,'String',mask_displ)
-    set(handles.txt_MaskName,'String',mask_displ)
+    set(handles.txt_Mask,'String',mask_displ)
 end
 
@@ -3443 +3441 @@
 maskval=get(handles.CheckMask,'Value');
 if isequal(maskval,0)
-    set(handles.txt_MaskName,'String','')
+    set(handles.txt_Mask,'String','')
 else
     mask_displ='no mask'; %default
@@ -3471 +3469 @@
         set(handles.CheckMask,'Value',0)
     end
-    set(handles.txt_MaskName,'String',mask_displ)
+    set(handles.txt_Mask,'String',mask_displ)
 end
 
@@ -3608 +3606 @@
 hparent=get(hObject,'parent');
 hchildren=get(hparent,'children');
-handle_txtbox=findobj(hchildren,'tag','txt_GridName');
+handle_txtbox=findobj(hchildren,'tag','txt_Grid');
 handle_dx=findobj(hchildren,'tag','num_Dx');
 handle_dy=findobj(hchildren,'tag','num_Dy');
+handle_title_dx=findobj(hchildren,'tag','title_Dx');
+handle_title_dy=findobj(hchildren,'tag','title_Dy');
 testgrid=0;
 filegrid='';
@@ -3639 +3639 @@
     set(handle_dx,'Visible','off');
     set(handle_dy,'Visible','off');
+    set(handle_title_dy,'Visible','off');
+    set(handle_title_dx,'Visible','off');
     set(handle_txtbox,'Visible','on')
     set(handle_txtbox,'String',filegrid)
 else
     set(hObject,'Value',0);
-    set(handle_dx,'Visible','on');
+    set(handle_dx,'Visible','on'); 
     set(handle_dy,'Visible','on');
+    set(handle_title_dy,'Visible','on');
+    set(handle_title_dx,'Visible','on');
     set(handle_txtbox,'Visible','off')
 end
 
 %% if hObject is on the checkciv1 frame, duplicate action for checkciv2 frame
-PanelName=get(hparent,'tag');
-if strcmp(PanelName,'panel_Civ1')
+PanelName=get(hparent,'tag')
+if strcmp(PanelName,'Civ1')
     hchildren=get(handles.Civ2,'children');
-    handle_checkbox=findobj(hchildren,'tag','check_Grid');
-    handle_txtbox=findobj(hchildren,'tag','txt_GridName');
+    handle_checkbox=findobj(hchildren,'tag','CheckGrid');
+    handle_txtbox=findobj(hchildren,'tag','txt_Grid');
     handle_dx=findobj(hchildren,'tag','num_Dx');
     handle_dy=findobj(hchildren,'tag','num_Dy');
+    handle_title_dx=findobj(hchildren,'tag','title_Dx');
+    handle_title_dy=findobj(hchildren,'tag','title_Dy');
     set(handle_checkbox,'UserData',filegrid);%store for future use
     if testgrid
@@ -3661 +3667 @@
         set(handle_dx,'Visible','off');
         set(handle_dy,'Visible','off');
+        set(handle_title_dx,'Visible','off');
+        set(handle_title_dy,'Visible','off');
         set(handle_txtbox,'Visible','on')
         set(handle_txtbox,'String',filegrid)
-    else
-        set(handle_checkbox,'Value',0);
-        set(handles.CheckGrid,'Value',0);
-        set(handle_dx,'Visible','on');
-        set(handle_dy,'Visible','on');
-        set(handle_txtbox,'Visible','off')
+%     else
+%         set(handle_checkbox,'Value',0);
+%         set(handles.CheckGrid,'Value',0);
+%         set(handle_dx,'Visible','on');
+%         set(handle_dy,'Visible','on');
+%          set(handle_title_dx,'Visible','on');
+%         set(handle_title_dy,'Visible','on');
+%         set(handle_txtbox,'Visible','off')
     end 
 end
@@ -3676 +3686 @@
 %------------------------------------------------------------------------
 value=get(hObject,'Value');
+hparent=get(hObject,'parent');
+parent_tag=get(hparent,'Tag');
+hchildren=get(hparent,'children');
+handle_txtbox=findobj(hchildren,'tag','txt_Mask');
+% handle_dx=findobj(hchildren,'tag','num_Dx');
+% handle_dy=findobj(hchildren,'tag','num_Dy');
 testmask=0;
 if value
@@ -3684 +3700 @@
         testmask=1;
     else % browse for a mask 
-        filemask=get(handles.CheckMask,'UserData');%look for previous mask name stored as UserData
+        filemask=get(hObject,'UserData');%look for previous mask name stored as UserData
         if exist(filemask,'file')
             filebase=filemask;
         end
-        [FileName, PathName, filterindex] = uigetfile( ...
+        [FileName, PathName] = uigetfile( ...
             {'*.png', ' (*.png)';
             '*.png',  '.png files '; ...
@@ -3694 +3710 @@
             'Pick a mask file *.png',filebase);
         filemask=fullfile(PathName,FileName);
-        set(handles.CheckMask,'UserData',filemask);%store for future use
+        set(hObject,'UserData',filemask);%store for future use
         if ~(isempty(FileName)||isempty(PathName)||isequal(FileName,0)||~exist(filemask,'file'))
             testmask=1;
@@ -3701 +3717 @@
 end
 if testmask
-    set(handles.num_Dx,'Visible','off');
-    set(handles.num_Dy,'Visible','off');
-    set(handles.num_Dx,'Visible','off');
-    set(handles.num_Dy,'Visible','off');
-    set(handles.txt_MaskName,'Visible','on')
-    set(handles.txt_MaskName,'String',filemask)
-else
-    set(handles.CheckMask,'Value',0);
-    set(handles.CheckGrid,'Value',0);
-    set(handles.num_Dx,'Visible','on');
-    set(handles.num_Dy,'Visible','on');
-    set(handles.num_Dx,'Visible','on');
-    set(handles.num_Dy,'Visible','on');
-    set(handles.txt_MaskName,'Visible','off')
+    stage=1;%default
+    switch parent_tag
+%         case 'Fix1'
+%             stage=2;
+        case 'Civ2'
+             stage=3;
+%         case 'Fix2'
+%             stage=4;
+    end
+    set(handles.txt_Mask(stage:end),'Visible','on')
+    set(handles.txt_Mask(stage:end),'String',filemask)
+    set(handles.CheckMask(stage:end),'Value',1)
+else
+    set(hObject,'Value',0);
+    set(handle_txtbox,'Visible','off')
 end
 
@@ -3922 +3939 @@
         ref_j=1;%default
     end
-    [filecell,num1_civ1,num2_civ1,num_a_civ1,num_b_civ1,num1_civ2,num2_civ2,num_a_civ2,num_b_civ2,nom_type_nc,file_ref_fix1,file_ref_fix2]=...
+    [filecell,i1,i21,j1,j2,i1_civ2,i2_civ2,j1_civ2,j2_civ2,nom_type_nc,file_ref_fix1,file_ref_fix2]=...
         set_civ_filenames(handles,ref_i,ref_j,[1 0 0 0 0 0]);
     Data.ListVarName={'ny','nx','A'};
-    Data.VarDimName={'ny','nx',{'ny','nx'}};
+    Data.VarDimName= {'ny','nx',{'ny','nx'}};
     Data.A=imread(filecell.ima1.civ1{1});
     Data.ny=[size(Data.A,1) 1];
     Data.nx=[1 size(Data.A,2)];
     par_civ1=read_GUI(handles.Civ1);
-    par_civ1.filename_ima_a=filecell.ima1.civ1{1};
-    par_civ1.filename_ima_b=filecell.ima2.civ1{1};
-    par_civ1.T0=0;
-    par_civ1.Dt=1;
+    par_civ1.ImageWidth=size(Data.A,1);
+    par_civ1.ImageHeight=size(Data.A,2);
+    par_civ1.Mask='all';% will provide only the grid set for PIV, no image correlation
     Param.Civ1=par_civ1;
-    Data=civ_uvmat(Param);
-    Data.ListVarName=[Data.ListVarName {'ny','nx','A'}];
-    Data.VarDimName=[Data.VarDimName {'ny','nx',{'ny','nx'}}];
-    Data.A=imread(filecell.ima1.civ1{1});
-    Data.ny=[size(Data.A,1) 1];
-    Data.nx=[1 size(Data.A,2)];
+    Grid=civ_matlab(Param);% get the grid of x, y positions set for PIV 
     hview_field=view_field(Data);
     set(0,'CurrentFigure',hview_field)
@@ -3948 +3959 @@
     ViewData.CivHandle=handles.civ;% indicate the handle of the civ GUI in view_field
     ViewData.axes3.B=imread(filecell.ima2.civ1{1});%store the second image in the UserData of the GUI view_field
-    ViewData.axes3.X=Data.Civ1_X; %keep the set of points in memeory
-    ViewData.axes3.Y=Data.Civ1_Y;
+    ViewData.axes3.X=Grid.Civ1_X; %keep the set of points in memeory
+    ViewData.axes3.Y=Grid.Civ1_Y;
     set(hview_field,'UserData',ViewData)
     corrfig=findobj(allchild(0),'tag','corrfig');% look for a current figure for image correlation display
@@ -3970 +3981 @@
 end
 
-%-------------------------------------------------------------------
-% --- 
-function closeview_field(gcbo,eventdata)
-hview_field=findobj(allchild(0),'tag','view_field');% look for view_field    
-    if ~isempty(hview_field)
-        delete(hview_field)
-    end
-    
-    
-%------------------------------------------------------------------------   
-% call 'view_field.fig' to display the  field selected in the list of 'status'
-function open_view_field(hObject, eventdata)
-%------------------------------------------------------------------------
-list=get(hObject,'String');
-index=get(hObject,'Value');
-rootroot=get(hObject,'UserData');
-filename=list{index};
-ind_dot=findstr(filename,'...');
-filename=filename(1:ind_dot-1);
-filename=fullfile(rootroot,filename);
-delete(get(hObject,'parent'))%delete the display figure to stop the check process
-if exist(filename,'file')%visualise the vel field if it exists
-    uvmat(filename)
-    set(gcbo,'Value',1)
-end
-
-%------------------------------------------------------------------------   
-% launched by pressing OK on the status figure
-function close_GUI(hObject, eventdata)
-%------------------------------------------------------------------------
-    delete(gcbf)
-    
-%------------------------------------------------------------------------   
-% launched by deleting the status figure
-function stop_status(hObject, eventdata)
-%------------------------------------------------------------------------
-hciv=findobj(allchild(0),'tag','civ');
-hhciv=guidata(hciv);
-set(hhciv.status,'value',0) %reset the status uicontrol in the GUI civ
-set(hhciv.status,'BackgroundColor',[0 1 0])
+
+%------------------------------------------------------------------------
+% --- Executes on button press in CheckThreshold.
+function CheckThreshold_Callback(hObject, eventdata, handles)
+%------------------------------------------------------------------------
+huipanel=get(hObject,'parent');
+obj(1)=findobj(huipanel,'Tag','num_MinIma');
+obj(2)=findobj(huipanel,'Tag','num_MaxIma');
+obj(3)=findobj(huipanel,'Tag','title_Threshold');
+if get(hObject,'Value')
+    set(obj,'Visible','on')
+else
+    set(obj,'Visible','off')
+end
+
 
 %------------------------------------------------------------------------
@@ -4039 +4025 @@
 % end
 
-
-
-
 %------------------------------------------------------------------------
 function cmd=cmd_civ1(filename,Param)
@@ -4048 +4031 @@
 %changes : filename_cmx -> filename ( no extension )
 filename=regexprep(filename,'.nc',''); %file name for the result 
-Param.Civ1
 if isequal(Param.Civ1.Dt,'0')
     Param.Civ1.Dt='1' ;%case of 'displacement' mode
 end
-Param.Civ1.filename_ima_a=regexprep(Param.Civ1.filename_ima_a,'.png','');
-Param.Civ1.filename_ima_b=regexprep(Param.Civ1.filename_ima_b,'.png','');
+Param.Civ1.ImageA=regexprep(Param.Civ1.ImageA,'.png','');
+Param.Civ1.ImageB=regexprep(Param.Civ1.ImageB,'.png','');
 fid=fopen([filename '.civ1.cmx'],'w');
 fprintf(fid,['##############   CMX file' '\n' ]);
-fprintf(fid,   ['FirstImage ' regexprep(Param.Civ1.filename_ima_a,'\\','\\\\') '\n' ]);% for windows compatibility
-fprintf(fid,   ['LastImage  ' regexprep(Param.Civ1.filename_ima_b,'\\','\\\\') '\n' ]);% for windows compatibility
+fprintf(fid,   ['FirstImage ' regexprep(Param.Civ1.ImageA,'\\','\\\\') '\n' ]);% for windows compatibility
+fprintf(fid,   ['LastImage  ' regexprep(Param.Civ1.ImageB,'\\','\\\\') '\n' ]);% for windows compatibility
 fprintf(fid,  ['XX' '\n' ]);
-fprintf(fid,  ['Mask ' Param.Civ1.MaskFlag '\n' ]);
-fprintf(fid,  ['MaskName ' regexprep(Param.Civ1.MaskName,'\\','\\\\') '\n' ]);
-fprintf(fid,   ['ImageSize ' num2str(Param.Civ1.ImageInfo.Width) ' ' num2str(Param.Civ1.ImageInfo.Height) '\n' ]);   %VERIFIER CAS GENERAL ?
+if isfield(Param.Civ1,'Mask')
+    fprintf(fid,  ['Mask ' 'y' '\n' ]);
+    fprintf(fid,  ['MaskName ' regexprep(Param.Civ1.Mask,'\\','\\\\') '\n' ]);
+else
+    fprintf(fid,  ['Mask ' 'n' '\n' ]);
+    fprintf(fid,  ['MaskName ' 'noFile use default' '\n' ]);
+end
+fprintf(fid,   ['ImageSize ' num2str(Param.Civ1.ImageWidth) ' ' num2str(Param.Civ1.ImageHeight) '\n' ]);   %VERIFIER CAS GENERAL ?
 fprintf(fid,   ['CorrelationBoxesSize ' num2str(Param.Civ1.Bx) ' ' num2str(Param.Civ1.By) '\n' ]);
 fprintf(fid,   ['SearchBoxeSize ' num2str(Param.Civ1.Searchx) ' ' num2str(Param.Civ1.Searchy) '\n' ]);
 fprintf(fid,   ['RO ' num2str(Param.Civ1.Rho) '\n' ]);
-if isfield(Param.Civ1,'GridName')
+if isfield(Param.Civ1,'Grid')
     fprintf(fid,   ['GridSpacing ' '25' ' ' '25' '\n' ]);
 else
@@ -4071 +4058 @@
 end
 fprintf(fid,   ['XX 1.0' '\n' ]);
-fprintf(fid,   ['Dt_TO ' num2str(Param.Civ1.Dt) ' ' num2str(Param.Civ1.T0) '\n' ]);
-fprintf(fid,  ['PixCmXY ' num2str(Param.Civ1.pxcmx) ' ' num2str(Param.Civ1.pxcmy) '\n' ]);
+fprintf(fid,   ['Dt_TO ' num2str(Param.Civ1.Dt) ' ' num2str(Param.Civ1.Time) '\n' ]);
+fprintf(fid,  ['PixCmXY ' '1' ' ' '1' '\n' ]);
 fprintf(fid,  ['XX 1' '\n' ]);
 fprintf(fid,   ['ShiftXY ' num2str(Param.Civ1.Shiftx) ' '  num2str(Param.Civ1.Shifty) '\n' ]);
-if isfield(Param.Civ1,'GridName')
+if isfield(Param.Civ1,'Grid')
     fprintf(fid,  ['Grid ' 'y' '\n' ]);
-    fprintf(fid,   ['GridName ' regexprep(Param.Civ1.GridName,'\\','\\\\') '\n' ]);
+    fprintf(fid,   ['GridName ' regexprep(Param.Civ1.Grid,'\\','\\\\') '\n' ]);
 else
     fprintf(fid,  ['Grid ' 'n' '\n' ]);
@@ -4095 +4082 @@
 else% Image threshold  activated
     if isempty(Param.Civ1.MaxIma)||isnan(Param.Civ1.MaxIma)
-        Param.Civ1.MaxIma=2^Param.Civ1.ImageInfo.BitDepth;%take the max image value as upper bound by default
+        Param.Civ1.MaxIma=2^Param.Civ1.ImageBitDepth;%take the max image value as upper bound by default
     end
     fprintf(fid,  ['SeuilImage y' '\n' ]);
@@ -4176 +4163 @@
     Param.Civ2.Dt='1' ;%case of 'displacement' mode
 end
-Param.Civ2.filename_ima_a=regexprep(Param.Civ2.filename_ima_a,'.png','');
-Param.Civ2.filename_ima_b=regexprep(Param.Civ2.filename_ima_b,'.png','');% bug : .png appears two times ?
+Param.Civ2.ImageA=regexprep(Param.Civ2.ImageA,'.png','');
+Param.Civ2.ImageB=regexprep(Param.Civ2.ImageB,'.png','');% bug : .png appears two times ?
 [fid,errormsg]=fopen([filename '.civ2.cmx'],'w');
 if isequal(fid,-1)
@@ -4185 +4172 @@
 end
 fprintf(fid,['##############   CMX file' '\n' ]);
-fprintf(fid,   ['FirstImage ' regexprep(Param.Civ2.filename_ima_a,'\\','\\\\') '\n' ]);% for windows compatibility
-fprintf(fid,   ['LastImage  ' regexprep(Param.Civ2.filename_ima_b,'\\','\\\\') '\n' ]);% for windows compatibility
+fprintf(fid,   ['FirstImage ' regexprep(Param.Civ2.ImageA,'\\','\\\\') '\n' ]);% for windows compatibility
+fprintf(fid,   ['LastImage  ' regexprep(Param.Civ2.ImageB,'\\','\\\\') '\n' ]);% for windows compatibility
 fprintf(fid,  ['XX' '\n' ]);
-fprintf(fid, ['Mask ' Param.Civ2.MaskFlag '\n' ]);
-fprintf(fid, ['MaskName ' regexprep(Param.Civ2.MaskName,'\\','\\\\') '\n' ]);% for windows compatibility
-fprintf(fid,   ['ImageSize ' num2str(Param.Civ2.ImageInfo.Width) ' ' num2str(Param.Civ2.ImageInfo.Height) '\n' ]);  
+if isfield(Param.Civ2,'Mask')
+    fprintf(fid,  ['Mask ' 'y' '\n' ]);
+    fprintf(fid,  ['MaskName ' regexprep(Param.Civ2.Mask,'\\','\\\\') '\n' ]);
+else
+    fprintf(fid,  ['Mask ' 'n' '\n' ]);
+    fprintf(fid,  ['MaskName ' 'noFile use default' '\n' ]);
+end
+% fprintf(fid, ['Mask ' Param.Civ2.MaskFlag '\n' ]);
+% fprintf(fid, ['MaskName ' regexprep(Param.Civ2.MaskName,'\\','\\\\') '\n' ]);% for windows compatibility
+fprintf(fid,   ['ImageSize ' num2str(Param.Civ2.ImageWidth) ' ' num2str(Param.Civ2.ImageHeight) '\n' ]);  
 % fprintf(fid, ['ImageSize ' num2str(Param.Civ2.npx) ' ' num2str(Param.Civ2.npy) '\n' ]);   %VERIFIER CAS GENERAL ?
 fprintf(fid, ['CorrelationBoxesSize ' num2str(Param.Civ2.Bx) ' ' num2str(Param.Civ2.By) '\n' ]);
 fprintf(fid, ['SearchBoxeSize ' num2str(Param.Civ2.Bx) ' ' num2str(Param.Civ2.By) '\n']);
 fprintf(fid, ['RO ' num2str(Param.Civ2.Rho) '\n']);
-if isfield(Param.Civ2,'GridName')
+if isfield(Param.Civ2,'Grid')
     fprintf(fid,   ['GridSpacing ' '25' ' ' '25' '\n' ]);
 else
@@ -4202 +4196 @@
 % fprintf(fid, ['GridSpacing ' num2str(Param.Civ2.Dx) ' ' num2str(Param.Civ2.Dy) '\n']);
 fprintf(fid, ['XX 1.0' '\n' ]);
-fprintf(fid, ['Dt_TO ' num2str(Param.Civ2.Dt) ' ' num2str(Param.Civ2.T0) '\n' ]);
-fprintf(fid, ['PixCmXY ' num2str(Param.Civ2.pxcmx) ' ' num2str(Param.Civ2.pxcmy) '\n' ]);
+fprintf(fid, ['Dt_TO ' num2str(Param.Civ2.Dt) ' ' num2str(Param.Civ2.Time) '\n' ]);
+fprintf(fid, ['PixCmXY ' '1' ' ' '1' '\n' ]);
 fprintf(fid, ['XX 1' '\n' ]);
 fprintf(fid, 'ShiftXY 0 0\n');
-if isfield(Param.Civ2,'GridName')
+if isfield(Param.Civ2,'Grid')
     fprintf(fid,  ['Grid ' 'y' '\n' ]);
-    fprintf(fid,   ['GridName ' regexprep(Param.Civ2.GridName,'\\','\\\\') '\n' ]);
+    fprintf(fid,   ['GridName ' regexprep(Param.Civ2.Grid,'\\','\\\\') '\n' ]);
 else
     fprintf(fid,  ['Grid ' 'n' '\n' ]);
@@ -4229 +4223 @@
 else% Image threshold  activated
     if isempty(Param.Civ2.MaxIma)||isnan(Param.Civ2.MaxIma)
-        Param.Civ2.MaxIma=2^Param.Civ2.ImageInfo.BitDepth;%take the max image value as upper bound by default
+        Param.Civ2.MaxIma=2^Param.Civ2.ImageBitDepth;%take the max image value as upper bound by default
     end
     fprintf(fid,  ['SeuilImage y' '\n' ]);
@@ -4250 +4244 @@
 
 %------------------------------------------------------------------------
-% --- Executes on button press in CheckThreshold.
-function CheckThreshold_Callback(hObject, eventdata, handles)
-%------------------------------------------------------------------------
-huipanel=get(hObject,'parent');
-obj(1)=findobj(huipanel,'Tag','num_MinIma');
-obj(2)=findobj(huipanel,'Tag','num_MaxIma');
-obj(3)=findobj(huipanel,'Tag','title_Threshold');
-if get(hObject,'Value')
-    set(obj,'Visible','on')
-else
-    set(obj,'Visible','off')
-end
-
-%------------------------------------------------------------------------
 % --- CheckCiv1  Unified: TO ABADON
 function xml_civ1_parameters=CIV1_CMD_Unified(filename,namelog,par)
@@ -4270 +4250 @@
 %global CivBin%name of the executable for checkciv1 calculation
 
-civ1.image1=par.filename_ima_a;
-civ1.image2=par.filename_ima_b;
+civ1.image1=par.ImageA;
+civ1.image2=par.ImageB;
 civ1.imageSize_X=par.npx;
 civ1.imageSize_Y=par.npy;
@@ -4295 +4275 @@
 civ1.dt=par.Dt;
 civ1.unit='pixel';
-civ1.absolut_time_T0=par.T0;
-civ1.pixcmx=par.pxcmx;
-civ1.pixcmy=par.pxcmy;
+civ1.absolut_time_T0=par.Time;
+civ1.pixcmx='1';
+civ1.pixcmy='1';
 civ1.convectFlow='n';
 
@@ -4311 +4291 @@
 filename=regexprep(filename,'.nc','');
 
-civ2.image1=par.filename_ima_a;
-civ2.image2=par.filename_ima_b;
+civ2.image1=par.ImageA;
+civ2.image2=par.ImageB;
 civ2.imageSize_X=par.npx;
 civ2.imageSize_Y=par.npy;
@@ -4348 +4328 @@
 civ2.dt=par.Dt;
 civ2.unit='pixel';
-civ2.absolut_time_T0=par.T0;
-civ2.pixcmx=par.pxcmx;
-civ2.pixcmy=par.pxcmy;
+civ2.absolut_time_T0=par.Time;
+civ2.pixcmx='1';
+civ2.pixcmy='1';
 civ2.convectFlow='n';
-civ2.pixcmx=par.pxcmx;
-civ2.pixcmy=par.pxcmy;
-civ2.convectFlow='n';

trunk/src/mouse_motion.m

@@ -218 +218 @@
              % case of PIV correlation display
                     if test_piv
-                        %par=civ('read_param_civ1',hhciv);
                         par=read_GUI(hhciv.Civ1);
                         [dd,ind_pt]=min(abs(Field.X-xy(1,1))+abs(Field.Y-xy(1,2)));
                         xround=Field.X(ind_pt);
                         yround=Field.Y(ind_pt);
-                        par.PointCoord=[xround size(Field.A,1)-yround+1];
+                        par.Grid=[xround size(Field.A,1)-yround+1];
                         % mark the correlation box with a rectangle
-                        par.filename_ima_a=Field.A;
-                        par.filename_ima_b=Field.B;
+                        par.ImageA=Field.A;
+                        par.ImageB=Field.B;
+                        [par.ImageHeight,par.ImageWidth]=size(par.ImageA);
                         Param.Civ1=par;
                         ibx2=floor((par.Bx-1)/2);
@@ -249 +249 @@
                             set(hhhh,'Position',[xround-isx2+shiftx yround-isy2+shifty 2*isx2 2*isy2])
                         end
-                        %[xtable, ytable, utable, vtable, ctable, typevector, result_conv] = ...
-                         %               pivlab (Field.A,Field.B,ibx2,iby2,isx2,isy2,shiftx,shifty,[xround size(Field.A,1)-yround+1], 1, []);
-                        [Data,errormsg,result_conv]= civ_matlab(Param)
+                        [Data,errormsg,result_conv]= civ_matlab(Param);
                         rangx(1)=-(isx2-ibx2)+shiftx;
                         rangx(2)=isx2-ibx2+shiftx;
@@ -268 +266 @@
                                 set(0,'CurrentFigure',corrfig(1))
                                 AxeData.CurrentCorrImage=imagesc(rangx,-rangy,result_conv,[0 1]);
-                                AxeData.CurrentVector=line([0 Data.Civ1_U],[0 -Data.Civ1_V],'Tag','vector');
-                                
+                                AxeData.CurrentVector=line([0 Data.Civ1_U],[0 Data.Civ1_V],'Tag','vector');               
                                 colorbar
                                 set(haxes,'UserData',AxeData)
@@ -278 +275 @@
                             set(AxeData.CurrentCorrImage,'XData',rangx)
                             set(AxeData.CurrentCorrImage,'YData',-rangy)
-                            set(AxeData.CurrentVector,'XData',[0 Data.Civ1_U],'YData',[0 -Data.Civ1_V])
+                            set(AxeData.CurrentVector,'XData',[0 Data.Civ1_U],'YData',[0 Data.Civ1_V])
                         end
                     end

trunk/src/set_col_vec.m

@@ -10 +10 @@
             % colcode.CName: 'ima_cor','black','white',...
             % colcode.ListColorCode ='black', 'white', 'rgb','brg', '64 colors'
-            % colcode.FixedCbounds =0; thresholds scaling relative to min and max, =1 fixed thresholds
-            % colcode.MinC; min 
-            % colcode.MaxC; max
+            % colcode.CheckFixVecColor =0; thresholds scaling relative to min and max, =1 fixed thresholds
+            % colcode.MinVec; min 
+            % colcode.MaxVec; max
             % colcode.ColCode1: first threshold for rgb, relative to min (0) and max (1)
             % colcode.ColCode2: second threshold for rgb, relative to min (0) and max (1), 
@@ -19 +19 @@
 % vec_C: matlab vector representing the scalar setting the color
 function [colorlist,col_vec,colcode_out]=set_col_vec(colcode,vec_C)
-
 col_vec=[]; 
 colcode_out=colcode;%default
@@ -61 +60 @@
     col_vec=ones(size(vec_C));%all vectors at color#1
 elseif strcmp(colcode.ListColorCode,'rgb')|| strcmp(colcode.ListColorCode,'bgr')% 3 color representation
-    ind1=find(vec_C < ColCode1); % =1 for red vectors
+%    ind1=find(vec_C < ColCode1); % =1 for red vectors
     ind_green=find((vec_C >= ColCode1) & (vec_C < ColCode2));% =1 for green vectors
-    ind3=find(vec_C >= ColCode2);% =1 for blue vectors
+%     ind3=find(vec_C >= ColCode2);% =1 for blue vectors
     colorlist(2,:)=[0 1 0];%green
-    col_vec(ind1)=1;
+    col_vec(vec_C < ColCode1)=1;
     col_vec(ind_green)=2;
-    col_vec(ind3)=3;
+    col_vec(vec_C >= ColCode2)=3;
     if strcmp(colcode.ListColorCode,'rgb')
         colorlist(1,:)=[1 0 0];%red

trunk/src/set_grid.m

@@ -32 +32 @@
                    'gui_LayoutFcn',  [] , ...
                    'gui_Callback',   []);
-if nargin & isstr(varargin{1})
+% if nargin & isstr(varargin{1})
+%     gui_State.gui_Callback = str2func(varargin{1});
+% end
+if nargin && ischar(varargin{1})
     gui_State.gui_Callback = str2func(varargin{1});
 end
-
 if nargout
     [varargout{1:nargout}] = gui_mainfcn(gui_State, varargin{:});

trunk/src/uvmat.m

@@ -932 +932 @@
 %% view the field  
 run0_Callback(hObject, eventdata, handles); %view field
-mask_test=get(handles.mask_test,'value');
+mask_test=get(handles.CheckMask,'value');
 if mask_test
-    MaskData=get(handles.mask_test,'UserData');
+    MaskData=get(handles.CheckMask,'UserData');
     if isfield(MaskData,'maskhandle') && ishandle(MaskData.maskhandle)
           delete(MaskData.maskhandle)    %delete old mask
     end
-    mask_test_Callback(hObject, eventdata, handles)
+    CheckMask_Callback(hObject, eventdata, handles)
 end
 
@@ -1453 +1453 @@
 
 %------------------------------------------------------------------------
-% --- Executes on button press in mask_test.
-function mask_test_Callback(hObject, eventdata, handles)
+% --- Executes on button press in CheckMask.
+function CheckMask_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
 %case of view mask selection
-if isequal(get(handles.mask_test,'Value'),1)
+if isequal(get(handles.CheckMask,'Value'),1)
     [FF,RootPath,FileBase]=read_file_boxes(handles);
     num_i1=stra2num(get(handles.i1,'String'));
@@ -1499 +1499 @@
                 set(handles.nb_slice,'String',Name(i+1:ind_mask-1));
                 set(handles.nb_slice,'BackgroundColor',[1 1 0])
-                set(handles.mask_test,'UserData',Mask);
-                set(handles.mask_test,'BackgroundColor',[1 1 0])
+                set(handles.CheckMask,'UserData',Mask);
+                set(handles.CheckMask,'BackgroundColor',[1 1 0])
                 if nbslice > 1
                     set(handles.slices,'value',1)
@@ -1522 +1522 @@
         Mask.Base=fullfile(RootDir,RootFile);
         Mask.NbSlice=1;
-        set(handles.mask_test,'UserData',Mask);
-        set(handles.mask_test,'BackgroundColor',[1 1 0])
+        set(handles.CheckMask,'UserData',Mask);
+        set(handles.CheckMask,'BackgroundColor',[1 1 0])
     end
     if isempty(errormsg)
@@ -1529 +1529 @@
     end
     if ~isempty(errormsg)
-            set(handles.mask_test,'Value',0)
-            set(handles.mask_test,'BackgroundColor',[0.7 0.7 0.7])
+            set(handles.CheckMask,'Value',0)
+            set(handles.CheckMask,'BackgroundColor',[0.7 0.7 0.7])
      end
-else 
-    MaskData=get(handles.mask_test,'UserData');
+else % desactivate mask display
+    MaskData=get(handles.CheckMask,'UserData');
     if isfield(MaskData,'maskhandle') && ishandle(MaskData.maskhandle)
           delete(MaskData.maskhandle)    
     end
-    set(handles.mask_test,'UserData',[])    
+    set(handles.CheckMask,'UserData',[])    
     UvData=get(handles.uvmat,'UserData');
     if isfield(UvData,'MaskName')
@@ -1543 +1543 @@
         set(handles.uvmat,'UserData',UvData)
     end
-    set(handles.mask_test,'BackgroundColor',[0.7 0.7 0.7])
+    set(handles.CheckMask,'BackgroundColor',[0.7 0.7 0.7])
 end
 
@@ -1550 +1550 @@
 %------------------------------------------------------------------------
 errormsg=[];%default
-MaskData=get(handles.mask_test,'UserData');
+MaskData=get(handles.CheckMask,'UserData');
 if isfield(MaskData,'maskhandle')&& ishandle(MaskData.maskhandle)
     uistack(MaskData.maskhandle,'top');
@@ -1556 +1556 @@
 num_i1_mask=mod(num_i1-1,MaskData.NbSlice)+1;
 MaskName=name_generator(MaskData.Base,num_i1_mask,num_j1,'.png',MaskData.NomType);
-huvmat=get(handles.mask_test,'parent');
+huvmat=get(handles.CheckMask,'parent');
 UvData=get(huvmat,'UserData');
 
@@ -1623 +1623 @@
             MaskData.maskhandle=image(Mask.AX,Mask.AY,imflag,'Tag','mask','HitTest','off','AlphaData',0.6*flagmask);
 %             set(MaskData.maskhandle,'AlphaData',0.6*flagmask)
-            set(handles.mask_test,'UserData',MaskData)
+            set(handles.CheckMask,'UserData',MaskData)
         end
     end
@@ -2556 +2556 @@
 
 % second projection object (view_field display)
-% IndexObj_2=get(handles.list_object_2,'Value');%selected projection object for the second view
-% if IndexObj_2==0
-%     IndexObj_2=1;
-% end
-%if isequal(get(handles.list_object_2,'Visible'),'on') && IndexObj_2 <= numel(UvData.Object)&& ~isempty(UvData.Object{IndexObj_2})
- if length( IndexObj)>=2
-%      IndexObj(2)=IndexObj_2;
+if length( IndexObj)>=2
     view_field_handle=findobj(allchild(0),'tag','view_field');%handles of the view_field GUI
     if ~isempty(view_field_handle)
@@ -2579 +2573 @@
     [ObjectData,errormsg]=proj_field(UvData.Field,UvData.Object{iobj});% project field on the object
     if testnewseries && isfield(ObjectData,'CoordUnit')&& isfield(PlotParam{imap},'Coordinates')
-        PlotParam{imap}=rmfield(PlotParam{imap}.Coordinates,'CheckFixEqual'); %set FixEqual to depend on the field (=1 if Data.CoordUnit=1 in plot_field)
+        PlotParam{imap}.Coordinates=rmfield(PlotParam{imap}.Coordinates,'CheckFixEqual'); %set FixEqual to depend on the field (=1 if Data.CoordUnit=1 in plot_field)
     end 
     if ~isempty(errormsg)
@@ -2651 +2645 @@
 
 %% update the mask
-if isequal(get(handles.mask_test,'Value'),1)%if the mask option is on
+if isequal(get(handles.CheckMask,'Value'),1)%if the mask option is on
    update_mask(handles,num_i1,num_i2);
 end
@@ -3818 +3812 @@
      UvData.Object=UvData.Object(1);
 end 
-list_object=get(handles.ListObject,'String');
+%list_object=get(handles.ListObject,'String');
 set(handles.ListObject,'Value',1)
 set(handles.ListObject,'String',{''})
@@ -3826 +3820 @@
 
 %delete mask if it is displayed 
-if isequal(get(handles.mask_test,'Value'),1)%if the mask option is on
+if isequal(get(handles.CheckMask,'Value'),1)%if the mask option is on
    UvData=rmfield(UvData,'MaskName'); %will impose mask refresh  
 end
@@ -3832 +3826 @@
 run0_Callback(hObject, eventdata, handles)
 
-%--------------------------------------------
+%------------------------------------------------------------------------
 function histo1_menu_Callback(hObject, eventdata, handles)
 %--------------------------------------------
@@ -3842 +3836 @@
 update_histo(handles.histo_u,huvmat,FieldName)
 
-%----------------------------------------------
+%------------------------------------------------------------------------
 function histo2_menu_Callback(hObject, eventdata, handles)
-%----------------------------------------------
+%------------------------------------------------------------------------
 %plot second histo
 huvmat=get(handles.histo2_menu,'parent');
@@ -3852 +3846 @@
 update_histo(handles.histo_v,huvmat,FieldName)
 
-
-%--------------------------------------------
+%------------------------------------------------------------------------
 %read the field .Fieldname stored in UvData and plot its histogram
 function update_histo(haxes,huvmat,FieldName)
+%------------------------------------------------------------------------
 UvData=get(huvmat,'UserData');
 if ~isfield(UvData.Field,FieldName)
@@ -4108 +4102 @@
 list=get(handles.ListColorCode,'String');
 ichoice=get(handles.ListColorCode,'Value');
-colcode.ColorCode=list{ichoice};
-colcode.MinC=str2num(get(handles.num_MinVec,'String'));
-colcode.MaxC=str2num(get(handles.num_MaxVec,'String'));
-test3color=strcmp(colcode.ColorCode,'rgb') || strcmp(colcode.ColorCode,'bgr');
+colcode.ListColorCode=list{ichoice};
+colcode.MinVec=str2num(get(handles.num_MinVec,'String'));
+colcode.MaxVec=str2num(get(handles.num_MaxVec,'String'));
+test3color=strcmp(colcode.ListColorCode,'rgb') || strcmp(colcode.ListColorCode,'bgr');
 if test3color
-    colcode.colcode1=str2num(get(handles.num_ColCode1,'String'));
-    colcode.colcode2=str2num(get(handles.num_ColCode2,'String'));
-end
-colcode.FixedCbounds=0;
-colcode.FixedCbounds=1;
-vec_C=colcode.MinC+(colcode.MaxC-colcode.MinC)*(0.5:width-0.5)/width;%sample of vec_C values from min to max
+    colcode.ColCode1=str2num(get(handles.num_ColCode1,'String'));
+    colcode.ColCode2=str2num(get(handles.num_ColCode2,'String'));
+end
+% colcode.FixedCbounds=0;
+%colcode.CheckFixVecColor=1;
+vec_C=colcode.MinVec+(colcode.MaxVec-colcode.MinVec)*(0.5:width-0.5)/width;%sample of vec_C values from min to max
 [colorlist,col_vec]=set_col_vec(colcode,vec_C);
 oneheight=ones(1,height);
@@ -4138 +4132 @@
 write_plot_param(handles,PlotParamOut); %update the auto plot parameters
 
-%-------------------------------------------------------------------
-% --- Executes on button press in grid.
-function grid_Callback(hObject, eventdata, handles)
+% %-------------------------------------------------------------------
+% % --- Executes on button press in grid.
+% function grid_Callback(hObject, eventdata, handles)
 
 

trunk/src/view_field.m

@@ -280 +280 @@
 % --- Executes on button press in FixEqual.
 function CheckFixEqual_Callback(hObject, eventdata, handles)
-test=get(handles.FixEqual,'Value');
+test=get(handles.CheckFixEqual,'Value');
 if test
     set(handles.CheckFixEqual,'BackgroundColor',[1 1 0])