Changeset 71 for trunk/src

Timestamp:

Mar 29, 2010, 6:34:55 PM (15 years ago)

Author:

sommeria

Message:

civ3D updated: introduction of image size
imadoc2struct: reding of image size from the xml file
set_object, view_field and related functions: improvement of projection object editing
mouse: possibility of adjusting the calibrations points with the mouse

Location:

trunk/src

Files:

• civ.fig (modified) (previous)
• civ.m (modified) (68 diffs)
• civ_3D.fig (modified) (previous)
• civ_3D.m (modified) (29 diffs)
• delete_object.m (modified) (2 diffs)
• geometry_calib.m (modified) (16 diffs)
• imadoc2struct.m (modified) (1 diff)
• keyboard_callback.m (modified) (1 diff)
• mouse_down.m (modified) (9 diffs)
• mouse_motion.m (modified) (10 diffs)
• mouse_up.m (modified) (6 diffs)
• plot_field.m (modified) (9 diffs)
• proj_field.m (modified) (2 diffs)
• read_geometry_calib.m (modified) (2 diffs)
• series/ima_levels.m (modified) (1 diff)
• series/relabel_i_j.m (modified) (1 diff)
• set_object.fig (modified) (previous)
• set_object.m (modified) (3 diffs)
• transform_field/im_levels.m (modified) (1 diff)
• update_obj.m (modified) (5 diffs)
• uvmat.fig (modified) (previous)
• uvmat.m (modified) (32 diffs)
• view_field.fig (modified) (previous)
• view_field.m (modified) (2 diffs)

trunk/src/civ.m

@@ -22 +22 @@
 function varargout = civ(varargin)
 
-% Last Modified by GUIDE v2.5 10-Jan-2010 22:04:45
+% Last Modified by GUIDE v2.5 27-Mar-2010 13:41:11
 % Begin initialization code - DO NOT EDIT
 gui_Singleton = 1;
@@ -44 +44 @@
 %------------------------------------------------------------------------
 % --- Executes just before civ is made visible.
-function civ_OpeningFcn(hObject, eventdata, handles, varargin)
+function civ_OpeningFcn(hObject, eventdata, handles, param)
 %------------------------------------------------------------------------
 % This function has no output args, see OutputFcn.
@@ -65 +65 @@
 %default initial parameters
 filebase=''; % root file name ('filebase'.civ)
-%nom_type=[]; % nomenclature type
 ext=[];
 testall=0; 
 browse=[];
-
+%default input parameters:
+num1=1; % set of field i numbers
+num2=2; % set of field i numbers
+num_a=1; % set of field j numbers (fields a)
+num_b=1; % second set of field j numbers (fields b)
+subdir='A'; % subdir for the netcdf result files
+ind_opening=1; % proposed operation number (1=civ1,2=fix1,3=patch1,4=civ2,5=fix2,6=patch2) 
 %load the initial parameters if the interface is started from uvmat 
-if ~isempty(varargin)% the interface is opened from uvmat
-    varcell=varargin{1};
-    filebase=varcell{1};
-    nom_type_read=varcell{2};
-    num1=varcell{3};
-    num2=varcell{4};
-    num_a=varcell{5};
-    num_b=varcell{6};
-    subdir=varcell{7};
-    ind_opening=varcell{8};
-    ext=varcell{11};
-else
-    num1=1; % set of field i numbers
-    num2=2; % set of field i numbers
-    num_a=1; % set of field j numbers (fields a)
-    num_b=1; % second set of field j numbers (fields b)
-    subdir='A'; % subdir for the netcdf result files
-    ind_opening=1; % proposed operation number (1=civ1,2=fix1,3=patch1,4=civ2,5=fix2,6=patch2)  
-end
-
-if exist('ext','var') && length(ext)>1 && (~isempty(imformats(ext(2:end)))||...
-                       isequal(lower(ext),'.avi'));%if an image file has been opened by uvmat
-        set(handles.ext_ima,'String',ext)
+if exist('param','var')&&isstruct(param)% the interface is opened from uvmat
+    filebase=param.RootName;
+    nom_type_read=param.NomType;
+    num1=param.num1;
+    num2=param.num2;
+    num_a=param.num_a;
+    num_b=param.num_b;
+    subdir=param.SubDir;
+    ind_opening=param.IndOpening;
+    ext=param.ImaExt;
+end
+if ~isempty(ext) && (~isempty(imformats(ext(2:end)))||...
+                       strcmp(lower(ext),'.avi'));%if an image file has been opened by uvmat
+        set(handles.ImaExt,'String',ext)
         if exist('nom_type_read','var')
             browse.nom_type_ima=nom_type_read; % the image nomenclature is stored
@@ -102 +98 @@
     end
 end
-set(handles.displ_filebase,'String',filebase);
+set(handles.RootName,'String',filebase);
 set(handles.ImaDoc,'UserData',testall);
 set(handles.ImaDoc,'String',ext)
 
 %read names of the .exe file to adjust the interface according to
-%available prog
-%read names of the .exe file
+%available binaries
 path_uvmat=which('uvmat');% check the path detected for source file uvmat
 path_UVMAT=fileparts(path_uvmat); %path to UVMAT
 errormsg=[];%default error message
-if isunix
-    syst='LINUX';
-else
-    syst='WIN';
-end
 xmlfile=fullfile(path_UVMAT,'PARAM.xml');
 if exist(xmlfile,'file')
@@ -123 +113 @@
     sparam=convert(t);
     catch
-         errormsg={[' Problem for reading ' xmlfile]; lasterr};   
+         errormsg={[' Unable to read the file PARAM.xml defining the civx binaries:']; lasterr};   
     end
 else
     errormsg=[xmlfile ' not found: path to civx binaries undefined'];
 end
-display(syst)
+
 if ~isempty(errormsg)
        msgbox_uvmat('ERROR',errormsg);
 end
-patch_newBin='';
-% todo_patch='';
-sge=0;
-
-if isfield(sparam,'PatchNewBin')
-    patch_newBin=sparam.PatchNewBin;
-end
-
-if isfield(sparam,'SGE')
-    sge=str2double(sparam.SGE);
-end   
-
-test_batch=sge;%default
-if isfield(sparam,'Todo_path')
-    todo_path=sparam.Todo_path;
-    name_todo=fullfile(todo_path,'TODO.txt');
-    if exist(name_todo,'file')
-        test_batch=1;
-    end
-end
+% patch_newBin='';
+test_batch=0;%default: ,no batch mode available
+if isfield(sparam,'BatchParam') && isfield(sparam.BatchParam,'BatchMode')
+    test_batch=strcmp(sparam.BatchParam.BatchMode,'sge'); %sge is currently the only implemented batch mod
+end
+% if isfield(sparam,'PatchNewBin')
+%     patch_newBin=sparam.PatchNewBin;
+% end
+% if isfield(sparam,'SGE')
+%     sge=str2double(sparam.SGE);
+% end   
+% test_batch=sge;%default
 if test_batch==0
     set(handles.BATCH,'BackgroundColor',[0.831 0.816 0.784])% put the BATCH button in grey (unactivated)
@@ -228 +210 @@
 set(handles.ref_i,'String',num2str(num_ref_i));
 set(handles.ref_j,'String',num2str(num_ref_j));
+set(handles.ref_i_civ2,'String',num2str(num_ref_i));
+set(handles.ref_j_civ2,'String',num2str(num_ref_j));
 set(handles.browse_root,'UserData',browse);
-if ~isempty(varargin)% the interface is opened from uvmat
-    displ_filebase_Callback(hObject, eventdata, handles); 
+if exist('param','var')%varargin the interface is opened from uvmat
+    RootName_Callback(hObject, eventdata, handles); 
 end
 
@@ -254 +238 @@
 %------------------------------------------------------------------------
 %get the input file properties
-filebase=get(handles.displ_filebase,'String');
+filebase=get(handles.RootName,'String');
 oldfile=''; %default
 if isempty(filebase)|| isequal(filebase,'')%loads the previously stored file name and set it as default in the file_input box
@@ -331 +315 @@
 if length(ext)>1 && (~isempty(imformats(ext([2:end])))||...
                        isequal(ext,'.avi')||isequal(ext,'.AVI'));%if an image file has been opened by uvmat
-    set(handles.ext_ima,'String',ext)
+    set(handles.ImaExt,'String',ext)
     browse.nom_type_ima=nom_type;
     browse.field_count=num_i1;
 %     A=imread(fileinput);
 %     npxy=size(A);
-%     set(handles.ext_ima,'UserData',npxy)
+%     set(handles.ImaExt,'UserData',npxy)
 end
 set(handles.ImaDoc,'String',ext);
@@ -368 +352 @@
     browse.ind_opening=ind_opening;
 end
-set(handles.displ_filebase,'String',filebase);
+set(handles.RootName,'String',filebase);
 set(handles.ImaDoc,'String',ext);
 if ~isempty(num_i1)
@@ -379 +363 @@
     set(handles.first_i,'String',num2str(ref_i));
     set(handles.last_i,'String',num2str(ref_i));
-    set(handles.ref_i,'String',num2str(ref_i)); 
+    set(handles.ref_i,'String',num2str(ref_i));
+    set(handles.ref_i_civ2,'String',num2str(ref_i))
 end
 if isempty(num_j1)
     set(handles.ref_j,'String','1');
+    set(handles.ref_j_civ2,'String','1');
 else
     ref_j=num_j1;
@@ -392 +378 @@
     set(handles.last_j,'String',num2str(ref_j));
     set(handles.ref_j,'String',num2str(ref_j)); 
+    set(handles.ref_j_civ2,'String',num2str(ref_j));
 end
 
@@ -439 +426 @@
 set(handles.ImaDoc,'UserData',testall);
 
-displ_filebase_Callback(hObject, eventdata, handles);
+RootName_Callback(hObject, eventdata, handles);
 
 %------------------------------------------------------------------------
 function ImaDoc_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
-displ_filebase_Callback(hObject, eventdata, handles)
+RootName_Callback(hObject, eventdata, handles)
 
 %------------------------------------------------------------------------
 % --- function activated when a new filebase (image series) is introduced
-function displ_filebase_Callback(hObject, eventdata, handles)
+function RootName_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
 global test_batch
 set(handles.compare,'Visible','on')
-ext_ima=get(handles.ext_ima,'String'); 
+ext_ima=get(handles.ImaExt,'String'); 
 nom_type_ima=[];%default
 field_count=1;%default
 nom_type_nc=[];
 time=[];
-TimeUnit=[]; %default
-CoordUnit=[];%default
+TimeUnit='frame'; %default
+CoordUnit='px';%default
 pxcmx_search=[];%default
 pxcmy_search=[];%default
-filebase=get(handles.displ_filebase,'String');
+filebase=get(handles.RootName,'String');
 
 ext=get(handles.ImaDoc,'String');
@@ -530 +517 @@
     set(handles.ref_i,'Visible','On')%use a reference index
     set(handles.ref_j,'Visible','On')
-    set(handles.dt,'Visible','Off')
-    set(handles.dt_text,'String','')
+%     set(handles.dt,'Visible','Off')
+ %   set(handles.root_txt,'String','')
 elseif isequal(ext,'.avi') || isequal(ext,'.AVI')
     set(handles.ref_j,'Visible','Off')
-    set(handles.dt,'Visible','Off')
-    set(handles.dt_text,'String','ref. ind.')
+ %   set(handles.dt,'Visible','Off')
+ %   set(handles.root_txt,'String','ref. ind.')
 else
     set(handles.ref_i,'Visible','Off')
     set(handles.ref_j,'Visible','Off')
-    set(handles.dt,'Visible','On')
-    set(handles.dt_text,'String','dt(ms)=')
+ %   set(handles.dt,'Visible','On')
+ %   set(handles.root_txt,'String','dt(ms)=')
 end
 testima_xml=0;
@@ -550 +537 @@
     end
 elseif isequal(ext,'.xml')
-    [XmlData,warntext]=imadoc2struct([filebase '.xml']);
+    [XmlData,warntext]=imadoc2struct([filebase '.xml'])
     if isfield(XmlData,'Time')
         time=XmlData.Time;
@@ -562 +549 @@
         fullname=fullfile(fileparts(filebase),XmlData.Heading.ImageName); %full name (including path) of the first image defined by the xmle file, 
         if ~exist(fullname,'file')
-%             testima_xml=1;
-%         else
             msgbox_uvmat('WARNING',['FirstImage ' fullname ' defined in the xml file does not exist'])
         end
     end
-    if isfield(XmlData,'Camera')
-        if isfield(XmlData.Camera,'TimeUnit')
-            TimeUnit=XmlData.Camera.TimeUnit;
-        end
-        if isfield(XmlData.Camera,'ImageSize')
-           ImageSize=XmlData.Camera.ImageSize;
-           if ~isempty(ImageSize)&& ~isempty(ImageSize)
-               xindex=findstr(ImageSize,'x');
-%                if length(xindex)>=2
-%                     npx=str2num(ImageSize(1:xindex(1)-1));
-%                     npy=str2num(ImageSize(xindex(1)+1:xindex(2)-1));
-%                end
-           end
-       end
+    if isfield(XmlData,'TimeUnit')
+        TimeUnit=XmlData.TimeUnit;
+    end
+    if isfield(XmlData,'Npx')
+        npx=XmlData.Npx;
+        npy=XmlData.Npy;
     end
     pxcmx_search=1;
@@ -610 +587 @@
         elseif error==1, msgbox_uvmat('WARNING','inconsistent number of fields in the .civ file');
         end
-%         ext_ima='.png';
+%         ImaExt='.png';
         nom_type_ima='png_old';       
 elseif isequal(lower(ext),'.avi') 
@@ -623 +600 @@
         end
         time=(dt*[0:nbfield-1])';%list of image times   
-        set(handles.dt,'String',num2str(dt*1000));%store the time interval between successive images
+        %set(handles.dt,'String',num2str(dt*1000));%store the time interval between successive images
 end
 if isempty(time)
@@ -689 +666 @@
     first_i=max(field_i+1,1);
         %determine the set of times and possible intervals for CIV
-    dt=(1/1000)*str2num(get(handles.dt,'String'));
-    time=(dt*[0:nb_field-1])';
+ %   dt=(1/1000)*str2num(get(handles.dt,'String'));
+    time=[0:nb_field-1]';% time=file index -1  by default
     set(handles.mode,'String',{'series(Di)'})
 end
@@ -703 +680 @@
         nbfield=size(time,1);
         nbfield2=size(time,2);
-        set(handles.displ_filebase,'UserData',time); %store the set of times
-        if isempty(TimeUnit)
-            set(handles.dt_unit,'String','dt in e-03');
-            set(handles.TimeUnit,'String','');
-        else
-            set(handles.dt_unit,'String',['dt in m' TimeUnit]);
-            set(handles.TimeUnit,'String',TimeUnit);
-        end
+        set(handles.RootName,'UserData',time); %store the set of times
+        set(handles.dt_unit,'String',['dt in m' TimeUnit]);
+        set(handles.dt_unit_civ2,'String',['dt in m' TimeUnit]);
+        set(handles.TimeUnit,'String',TimeUnit);
         set(handles.nb_field,'String',num2str(nbfield));
         set(handles.nb_field2,'String',num2str(nbfield2));
     end
 end
-set(handles.CoordUnit,'String',[CoordUnit '/'])
+set(handles.CoordUnit,'String',CoordUnit)
 set(handles.calcul_search,'UserData',[pxcmx_search pxcmy_search]);
 % npxy=[npy npx];
-set(handles.ext_ima,'String',ext_ima)
+set(handles.ImaExt,'String',ext_ima)
 set(handles.first_i,'String',num2str(first_i));
 set(handles.last_i,'String',num2str(last_i));%
@@ -824 +797 @@
 ref_i=str2num(get(handles.ref_i,'String'));
 % last_i=str2num(get(handles.last_i,'String'));
-time=get(handles.displ_filebase,'UserData'); %get the set of times
+time=get(handles.RootName,'UserData'); %get the set of times
 siztime=size(time);
 nbfield=siztime(1);
@@ -967 +940 @@
 set(gcf,'Pointer','watch')
 %nomenclature types
-filebase=get(handles.displ_filebase,'String');
+filebase=get(handles.RootName,'String');
 [filepath,Nme,ext_dir]=fileparts(filebase);
 browse=get(handles.browse_root,'UserData');
@@ -1014 +987 @@
     ref_j=str2double(get(handles.ref_j,'String'));
 end
-time=get(handles.displ_filebase,'UserData');%get the set of times
+time=get(handles.RootName,'UserData');%get the set of times
 if isempty(time)
     time=[0 1];
 end 
-dt_unit=str2double(get(handles.dt,'String'));% used when there is no image documentation file
+%dt_unit=str2double(get(handles.dt,'String'));% used when there is no image documentation file
+dt_unit=1000;%default
 displ_num=get(handles.list_pair_civ1,'UserData');
 
@@ -1074 +1048 @@
     if testpair
               displ_pair{1}=['Di= ' num2str(-floor(browse.incr_pair(1)/2)) '|' num2str(ceil(browse.incr_pair(1)/2))];        
-    elseif ~isequal(get(handles.dt_text,'String'),'dt(ms)=') 
-       for ipair=1:nbpair
-          if select(ipair)  
-              if size(time,1)>=ref_i+displ_num(4,ipair) && size(time,2)>=ref_j+displ_num(2,ipair)
-              dt=time(ref_i+displ_num(4,ipair),ref_j+displ_num(2,ipair))-time(ref_i+displ_num(3,ipair),ref_j+displ_num(1,ipair));%time interval dt
-              displ_pair{ipair}=['Di= ' num2str(-floor(ipair/2)) '|' num2str(ceil(ipair/2)) ' :dt= ' num2str(dt*1000)];
-              end
-          else 
-             displ_pair{ipair}='...'; %pair not displayed in the menu
-          end
-       end
+%     elseif ~isequal(get(handles.root_txt,'String'),'dt(ms)=') 
+%        for ipair=1:nbpair
+%           if select(ipair)  
+%               if size(time,1)>=ref_i+displ_num(4,ipair) && size(time,2)>=ref_j+displ_num(2,ipair)
+%               dt=time(ref_i+displ_num(4,ipair),ref_j+displ_num(2,ipair))-time(ref_i+displ_num(3,ipair),ref_j+displ_num(1,ipair));%time interval dt
+%               displ_pair{ipair}=['Di= ' num2str(-floor(ipair/2)) '|' num2str(ceil(ipair/2)) ' :dt= ' num2str(dt*1000)];
+%               end
+%           else 
+%              displ_pair{ipair}='...'; %pair not displayed in the menu
+%           end
+%        end
     else
        for ipair=1:nbpair
@@ -1154 +1128 @@
 set(gcf,'Pointer','watch')
 %nomenclature types
-filebase=get(handles.displ_filebase,'String');
+filebase=get(handles.RootName,'String');
 [filepath,Nme,ext_dir]=fileparts(filebase);
 browse=get(handles.browse_root,'UserData');
@@ -1205 +1179 @@
 %     return
 % end
-ref_i=str2num(get(handles.ref_i,'String'));
+ref_i=str2num(get(handles.ref_i_civ2,'String'));
 if isequal(mode,'pair j1-j2')%|isequal(mode,'st_pair j1-j2')
     ref_j=0;
 else
-    ref_j=str2num(get(handles.ref_j,'String'));
-end
-% if isequal(get(handles.dt_text,'String'),'dt(ms)=')%simple series(Di) with equal interval
-%     ref_i=ceil((first_i+last_i)/2);
-%     ref_j=1;
-% end
-%     ref_i=browse.num_ref;%field number initially selected by the browser
-time=get(handles.displ_filebase,'UserData'); %get the set of times
+    ref_j=str2num(get(handles.ref_j_civ2,'String'));
+end
+time=get(handles.RootName,'UserData'); %get the set of times
 if isempty(time)
     time=[0 1];%default
 end
-dt_unit=str2num(get(handles.dt,'String'));% used when there is no image documentation file
+%dt_unit=str2num(get(handles.dt,'String'));% used when there is no image documentation file
+dt_unit=1000;
 displ_num=get(handles.list_pair_civ1,'UserData');
 
@@ -1274 +1244 @@
 end
 if isequal(mode,'series(Di)') % | isequal(mode,'st_series(Di)') 
-%     if  ~isequal(get(handles.dt_text,'String'),'dt(ms)=')
        for ipair=1:nbpair
           if select(ipair)
@@ -1585 +1554 @@
 % 
 % %root name
-% filebase=get(handles.displ_filebase,'String');
+% filebase=get(handles.RootName,'String');
 % if isempty(filebase)||isequal(filebase,'')
 %     msgbox_uvmat('ERROR','no input files')
@@ -1696 +1665 @@
 % %RUN FIX1
 % if box_test(2)==1 
-%     filebase=get(handles.displ_filebase,'String');
+%     filebase=get(handles.RootName,'String');
 %     %names of the civ1 fields
 %     field1.vel_type='civ1';
@@ -1726 +1695 @@
 %             maskname=maskdispl;
 %         else
-%             maskbase=[get(handles.displ_filebase,'String') '_' maskdispl]; % mask root name
+%             maskbase=[get(handles.RootName,'String') '_' maskdispl]; % mask root name
 %         end
 %     end
@@ -1757 +1726 @@
 %                       maskflag=0;
 %                  else
-%                      maskbase=[get(handles.displ_filebase2,'String') '_' maskdispl]; % mask root name
+%                      maskbase=[get(handles.RootName2,'String') '_' maskdispl]; % mask root name
 %                      nbslice_mask=str2num(maskdispl(1:end-4)); % 
 %                      num1_mask=mod(num1_civ1(ifile)-1,nbslice_mask)+1;               
@@ -1882 +1851 @@
 %             maskname=maskdispl;
 %         else
-%             maskbase=[get(handles.displ_filebase,'String') '_' maskdispl]; % mask root name
+%             maskbase=[get(handles.RootName,'String') '_' maskdispl]; % mask root name
 %         end
 %     end
@@ -1916 +1885 @@
 %                       maskflag=0;
 %                  else
-%                       maskbase=[get(handles.displ_filebase2,'String') '_' maskdispl]; % mask root name
+%                       maskbase=[get(handles.RootName2,'String') '_' maskdispl]; % mask root name
 %                       nbslice_mask=str2num(maskdispl(1:end-4)); % 
 %                       num1_mask=mod(num1_civ2(ifile)-1,nbslice_mask)+1;
@@ -2077 +2046 @@
 
 %root name
-filebase=get(handles.displ_filebase,'String');
+filebase=get(handles.RootName,'String');
 if isempty(filebase)||isequal(filebase,'')
     msgbox_uvmat('ERROR','no input files')
@@ -2198 +2167 @@
             rankend=min(find(double(wwrest)==10))-1;
             filebase=[wwrest(1:rankend) filebase(3:end)];
-            set(handles.displ_filebase,'String',filebase);
+            set(handles.RootName,'String',filebase);
         end
     else
@@ -2375 +2344 @@
 % for ifile=1:nbfield
 p1text=[];%initiate command text
-time=get(handles.displ_filebase,'UserData'); %get the set of times
+time=get(handles.RootName,'UserData'); %get the set of times
 civAll=get(handles.Experimental,'Value'); % Boolean for new civ excution method 
 for ifile=1:nbfield
@@ -2824 +2793 @@
 %------------------------------------------------------------------------
 %get the filename root, nomenclature and numbers
-filebase=get(handles.displ_filebase,'String');
+filebase=get(handles.RootName,'String');
 browse=get(handles.browse_root,'UserData');
 compare_list=get(handles.compare,'String');
@@ -2836 +2805 @@
     mode=mode_list{mode_value};
 end
-time=get(handles.displ_filebase,'UserData'); %get the set of times
-ext_ima=get(handles.ext_ima,'String');
+time=get(handles.RootName,'UserData'); %get the set of times
+ext_ima=get(handles.ImaExt,'String');
 nom_type_nc=browse.nom_type_nc;
 nom_type_ima2=browse.nom_type_ima;
@@ -2851 +2820 @@
     [Path2,Name2]=fileparts(filebase_B);
     Path1=Path2;
-    Name1=get(handles.displ_filebase2,'String');% root name of the first field series for stereo
+    Name1=get(handles.RootName_1,'String');% root name of the first field series for stereo
     filebase_A=fullfile(Path1,Name1);
     if length(Name1)>6
@@ -3407 +3376 @@
        end
     end
-    %npxy=get(handles.ext_ima,'UserData');
+    %npxy=get(handles.ImaExt,'UserData');
 % %     if numel(npxy)<2
 %     
-%         filename=name_generator(filebase_ima1,num1_civ1(1),num_a_civ1(1),ext_ima,nom_type_ima1);
+%         filename=name_generator(filebase_ima1,num1_civ1(1),num_a_civ1(1),ImaExt,nom_type_ima1);
 %         A=imread(filename);
 %         npxy=size(A);
@@ -3509 +3478 @@
 npx=num2str(sizim(2));
 npy=num2str(sizim(1));
-time=get(handles.displ_filebase,'UserData'); %get the set of times
+time=get(handles.RootName,'UserData'); %get the set of times
 gridname='';%default  ='noFile use default'
 gridflag='n';%default
@@ -3538 +3507 @@
 end 
  %main loop
-filebase=get(handles.displ_filebase,'String');
+filebase=get(handles.RootName,'String');
 sizcell=size(filecell);
 nbfield=sizcell(1);
@@ -3708 +3677 @@
 % npx=num2str(sizim(2));
 % npy=num2str(sizim(1));
-% time=get(handles.displ_filebase,'UserData'); %get the set of times
-% filebase=get(handles.displ_filebase,'String');
+% time=get(handles.RootName,'UserData'); %get the set of times
+% filebase=get(handles.RootName,'String');
 % %grid
 % gridname='';%default  ='noFile use default'
@@ -3932 +3901 @@
 % ref_i=ceil((first_i+last_i)/2);
 set(handles.ref_i,'String', num2str(first_i))% reference index for pair dt = first index
+set(handles.ref_i_civ2,'String', num2str(first_i))% reference index for pair dt = first index
 ref_i_Callback(hObject, eventdata, handles)%refresh dispaly of dt for pairs (in case of non constant dt)
 
@@ -3949 +3919 @@
 index=get(handles.list_pair_civ1,'Value');
 displ_num=get(handles.list_pair_civ1,'UserData');
-time=get(handles.displ_filebase,'UserData'); %get the set of times
+time=get(handles.RootName,'UserData'); %get the set of times
 pxcm_xy=get(handles.calcul_search,'UserData');
 pxcmx=pxcm_xy(1);
@@ -4021 +3991 @@
 else
     mask_displ='no mask'; %default
-    filebase=get(handles.displ_filebase,'String');
+    filebase=get(handles.RootName,'String');
     [ nbslice_mask, flag_mask]=get_mask(filebase,handles);
     if isequal(flag_mask,1)
@@ -4027 +3997 @@
     elseif get(handles.compare,'Value')>1 & ~isequal(mask_displ,'no mask')% look for the second mask series
             common_path=fileparts(filebase);
-            filebase_a=fullfile(common_path,get(handles.displ_filebase2,'String'));
+            filebase_a=fullfile(common_path,get(handles.RootName_1,'String'));
             [nbslice_a, flag_mask_a]=get_mask(filebase_a,handles);
             if isequal(flag_mask_a,0) || ~isequal(nbslice_a,nbslice_mask)
@@ -4068 +4038 @@
 else
 mask_displ='no mask'; %default
-filebase=get(handles.displ_filebase,'String');
+filebase=get(handles.RootName,'String');
 [nbslice, flag_mask]=get_mask(filebase,handles);
 if isequal(flag_mask,1)
       mask_displ=[num2str(nbslice) 'mask'];
 elseif get(handles.compare,'Value')>1 & ~isequal(mask_displ,'no mask')% look for the second mask series
-        filebase_a=get(handles.displ_filebase2,'String');
+        filebase_a=get(handles.RootName_1,'String');
         [nbslice_a, flag_mask_a]=get_mask(filebase_a,handles);
         if isequal(flag_mask_a,0) | ~isequal(nbslice_a,nbslice)
@@ -4112 +4082 @@
 else
 mask_displ='no mask'; %default
-filebase=get(handles.displ_filebase,'String');
+filebase=get(handles.RootName,'String');
 [nbslice, flag_mask]=get_mask(filebase,handles);
 if isequal(flag_mask,1)
       mask_displ=[num2str(nbslice) 'mask'];
 elseif get(handles.compare,'Value')>1 & ~isequal(mask_displ,'no mask')% look for the second mask series
-        filebase_a=get(handles.displ_filebase2,'String');
+        filebase_a=get(handles.RootName_1,'String');
         [nbslice_a, flag_mask_a]=get_mask(filebase_a,handles);
         if isequal(flag_mask_a,0) | ~isequal(nbslice_a,nbslice)
@@ -4153 +4123 @@
 else
     mask_displ='no mask'; %default
-    filebase=get(handles.displ_filebase,'String');
+    filebase=get(handles.RootName,'String');
     [nbslice, flag_mask]=get_mask(filebase,handles);
     if isequal(flag_mask,1)
           mask_displ=[num2str(nbslice) 'mask'];
     elseif get(handles.compare,'Value')>1 & ~isequal(mask_displ,'no mask')% look for the second mask series
-            filebase_a=get(handles.displ_filebase2,'String');
+            filebase_a=get(handles.RootName_1,'String');
             [nbslice_a, flag_mask_a]=get_mask(filebase_a,handles);
             if isequal(flag_mask_a,0) | ~isequal(nbslice_a,nbslice)
@@ -4325 +4295 @@
 testgrid=0;
 if value
-        filebase=get(handles.displ_filebase,'String');
+        filebase=get(handles.RootName,'String');
     [nbslice, flag_grid]=get_grid(filebase,handles);
     if isequal(flag_grid,1)
@@ -4375 +4345 @@
 value=get(handles.browse_gridciv2,'Value');
 if value
-        filebase=get(handles.displ_filebase,'String');
+        filebase=get(handles.RootName,'String');
     [nbslice, flag_grid]=get_grid(filebase,handles);
     if isequal(flag_grid,1)
@@ -4412 +4382 @@
 % function browse_gridciv2_Callback(hObject, eventdata, handles)
 % 
-% filebase=get(handles.displ_filebase,'String');
+% filebase=get(handles.RootName,'String');
 % [FileName, PathName, filterindex] = uigetfile( ...
 %        {'*.grid', ' (*.grid)';
@@ -4430 +4400 @@
 % handles    structure with handles and user data (see GUIDATA)
 
-filebase=get(handles.displ_filebase,'String');
+filebase=get(handles.RootName,'String');
 [FileName, PathName, filterindex] = uigetfile( ...
        {'*.grid', ' (*.grid)';
@@ -4621 +4591 @@
         set(handles.subdir_civ2,'Visible','off')
         set(handles.subdir_civ2_text,'Visible','off')
+        set(handles.dt_unit_civ2,'Visible','off')
+        set(handles.ref_i_civ2,'Visible','off')
+        set(handles.i_ref_civ2_title,'Visible','off')
+        set(handles.j_ref_civ2_title,'Visible','off')
+        set(handles.ref_j_civ2,'Visible','off')
     end
 else
@@ -4626 +4601 @@
     set(handles.subdir_civ2,'Visible','on')
     set(handles.subdir_civ2_text,'Visible','on')
-end
+    set(handles.dt_unit_civ2,'Visible','on')
+    set(handles.ref_i_civ2,'Visible','on')
+    set(handles.i_ref_civ2_title,'Visible','on')
+    set(handles.j_ref_civ2_title,'Visible','on')
+    set(handles.ref_j_civ2,'Visible','on')
+end
+set(handles.rho_civ2_title,'Visible',state)
 
 %------------------------------------------------------------------------
@@ -4725 +4706 @@
 set(handles.list_pair_civ1,'Visible',state)
 set(handles.PAIR_txt,'Visible',state)
-%set(handles.dt_display_txt,'Visible',state)
-set(handles.dt_unit,'Visible',state)
+%set(handles.dt_unit,'Visible',state)
 set(handles.PAIR_frame,'Visible',state)
 
@@ -4789 +4769 @@
  par.npx=num2str(sizim(2));
  par.npy=num2str(sizim(1));
- time=get(handles.displ_filebase,'UserData'); %get the set of times
+ time=get(handles.RootName,'UserData'); %get the set of times
  par.gridname=get(handles.grid_civ1,'String');
  par.gridflag='y';
@@ -4829 +4809 @@
 par.npx=num2str(sizim(2));
 par.npy=num2str(sizim(1));
-time=get(handles.displ_filebase,'UserData'); %get the set of times
+time=get(handles.RootName,'UserData'); %get the set of times
 par.gridname=get(handles.grid_civ2,'String');
 par.gridflag='y';
@@ -5130 +5110 @@
 
 %------------------------------------------------------------------------
+function ref_i_civ2_Callback(hObject, eventdata, handles)
+%------------------------------------------------------------------------
+mode_list=get(handles.mode,'String');
+mode_value=get(handles.mode,'Value');
+mode=mode_list{mode_value};
+find_netcpair_civ2(hObject, eventdata, handles);% update the menu of pairs depending on the available netcdf files
+
+%------------------------------------------------------------------------
+function ref_j_civ2_Callback(hObject, eventdata, handles)
+%------------------------------------------------------------------------
+mode_list=get(handles.mode,'String');
+mode_value=get(handles.mode,'Value');
+mode=mode_list{mode_value};
+if  isequal(mode,'series(Dj)') 
+    find_netcpair_civ2(hObject, eventdata, handles);% update the menu of pairs depending on the available netcdf files
+end
+
+%------------------------------------------------------------------------
 % --- Executes on button press in compare.
 function compare_Callback(hObject, eventdata, handles)
@@ -5135 +5133 @@
 test=get(handles.compare,'Value');
 if test==2 || test==3    
-    filebase=get(handles.displ_filebase,'String');
+    filebase=get(handles.RootName,'String');
     browse=get(handles.browse_root,'Userdata');
     browse.nom_type_ima1=browse.nom_type_ima;
     set(handles.browse_root,'UserData',browse);
     set(handles.sub_txt,'Visible','on')
-    set(handles.displ_filebase2,'Visible','On');%mkes the second file input window visible 
+    set(handles.RootName_1,'Visible','On');%mkes the second file input window visible 
     mode_store=get(handles.mode,'String');%get the present 'mode'
     set(handles.compare,'UserData',mode_store);%store the mode display  
@@ -5153 +5151 @@
     ind_opening=1;%default
     browse.incr_pair=[0 0]; %default
-    oldfile=get(handles.displ_filebase,'String');
+    oldfile=get(handles.RootName,'String');
     menu={'*.xml;*.avi;*.AVI;*.nc','(*.xml,*.avi,*.nc)'; ...
             '*.xml', '.xml files';'*.avi;*.AVI', '.avi files';'*.nc', '.nc files';...
@@ -5167 +5165 @@
         return
     end
-    set(handles.displ_filebase2,'String',name);
+    set(handles.RootName_1,'String',name);
     [RootPath,RootFile,field_count,str2,str_a,str_b,xx,nom_type,subdir]=name2display(name);
     browse=get(handles.browse_root,'UserData');
@@ -5174 +5172 @@
     
     %check image extension
-    if ~strcmp(ext,get(handles.ext_ima,'String'))
+    if ~strcmp(ext,get(handles.ImaExt,'String'))
         msgbox_uvmat('ERROR','The two  input image series must have the same extenion name')
         return
@@ -5181 +5179 @@
     %check image size
     A=imread(fileinput);
-    npxy=get(handles.ext_ima,'UserData');
+    npxy=get(handles.ImaExt,'UserData');
     if ~isequal(npxy(1),size(A,1))|| ~isequal(npxy(2),size(A,2))
         msgbox_uvmat('ERROR','The two input image series must have the same size')
@@ -5188 +5186 @@
 else
     set(handles.mode,'Visible','on')
-    set(handles.displ_filebase2,'Visible','Off');
+    set(handles.RootName_1,'Visible','Off');
     set(handles.sub_txt,'Visible','off')
-    set(handles.displ_filebase2,'String',[]);
+    set(handles.RootName_1,'String',[]);
     mode_store=get(handles.compare,'UserData');
     set(handles.mode,'String',mode_store)
@@ -5202 +5200 @@
 function get_ref_fix1_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
-filebase=get(handles.displ_filebase,'String');
+filebase=get(handles.RootName,'String');
 [FileName, PathName, filterindex] = uigetfile( ...
        {'*.nc', ' (*.nc)';
@@ -5247 +5245 @@
 %------------------------------------------------------------------------
 if isequal(get(handles.get_ref_fix2,'Value'),1)
-    filebase=get(handles.displ_filebase,'String');
+    filebase=get(handles.RootName,'String');
     [FileName, PathName, filterindex] = uigetfile( ...
            {'*.nc', ' (*.nc)';
@@ -5369 +5367 @@
 end
 
+
+
+

trunk/src/civ_3D.m

@@ -22 +22 @@
 function varargout = civ_3D(varargin)
 
-% Last Modified by GUIDE v2.5 25-Feb-2009 23:14:16
+% Last Modified by GUIDE v2.5 26-Mar-2010 22:51:31
 % Begin initialization code - DO NOT EDIT
 gui_Singleton = 1;
@@ -234 +234 @@
 set(handles.first_i,'String',num2str(num_ref_i));
 set(handles.last_i,'String',num2str(num_ref_i));
-set(handles.first_j,'String',num2str(num_ref_j));
-set(handles.last_j,'String',num2str(num_ref_j));
 set(handles.ref_i,'String',num2str(num_ref_i));
-set(handles.ref_j,'String',num2str(num_ref_j));
 set(handles.browse_root,'UserData',browse);
 if ~isempty(varargin)% the interface is opened from uvmat
@@ -381 +378 @@
     set(handles.ref_i,'String',num2str(ref_i)); 
 end
-if isempty(str2num(str_a))
-    set(handles.ref_j,'String','1');
-else
-    ref_j=str2num(str_a);
-    if ~isempty(str2num(str_b))
-        ref_j=floor((str2num(str_a)+str2num(str_b))/2);
-        browse.incr_pair(2)=str2num(str_b)-str2num(str_a); 
-    end
-    set(handles.first_j,'String',num2str(ref_j));
-    set(handles.last_j,'String',num2str(ref_j));
-    set(handles.ref_j,'String',num2str(ref_j)); 
-end;
 if isequal(ind_opening,1)
     set(handles.CIV1,'Value',1)
@@ -470 +455 @@
     last_i=first_i;  %default last_i
 end
-first_j=str2num(get(handles.first_j,'String'));
-if isempty(first_j)| first_j < 1
-    first_j=1; %default first_j
-end
-last_j=str2num(get(handles.last_j,'String'));
-if isempty(last_j)| last_j < first_j
-    last_j=first_j; %default last_j
-end
+
 incr_i=str2num(get(handles.incr_i,'String'));
 if isempty(incr_i) | incr_i < 1;
     set(handles.incr_i,'String','1') %default incr_i
-end
-incr_j=str2num(get(handles.incr_j,'String'));
-if isempty(incr_j) | incr_j < 1;
-    set(handles.incr_j,'String','1') %default incr_j
 end
 dt=[];%default
@@ -514 +488 @@
 %%%%%%%%   read image documentation file  %%%%%%%%%%%%%%%%%%%%%%%%%%%
     mode=''; %default
-    %read the image documentation file if found
-if  isequal(ext,'.xml')
-    set(handles.ref_i,'Visible','On')%use a reference index
-    set(handles.ref_j,'Visible','On')
-    set(handles.dt,'Visible','Off')
-    set(handles.dt_text,'String','ref. ind.')
-elseif isequal(ext,'.avi') | isequal(ext,'.AVI')
-    set(handles.ref_j,'Visible','Off')
-    set(handles.dt,'Visible','Off')
-    set(handles.dt_text,'String','ref. ind.')
-else
-    set(handles.ref_i,'Visible','Off')
-    set(handles.ref_j,'Visible','Off')
-    set(handles.dt,'Visible','On')
-    set(handles.dt_text,'String','dt(ms)=')
-end
-
 if isequal(ext,'.xml')
-    [XmlData,warntext]=imadoc2struct([filebase '.xml']);
+    [XmlData,warntext]=imadoc2struct([filebase '.xml'])
         if isfield(XmlData,'Heading')&&isfield(XmlData.Heading','ImageName')
             [PP,FF,fc,str2,str_a,str_b,ext_ima_read,nom_type_read]=name2display(XmlData.Heading.ImageName);
         end
-        if isfield(XmlData,'Camera')
-            if isfield(XmlData.Camera,'TimeUnit')
-                TimeUnit=XmlData.Camera.TimeUnit;
-            end
-            if isfield(XmlData.Camera,'ImageSize')
-               ImageSize=XmlData.Camera.ImageSize;
-               if ~isempty(ImageSize)&& ~isempty(ImageSize)
-                   xindex=findstr(ImageSize,'x');
-                   if length(xindex)>=2
-                        npx=str2num(ImageSize(1:xindex(1)-1));
-                        npy=str2num(ImageSize(xindex(1)+1:xindex(2)-1));
-                   end
-               end
-           end
+        if isfield(XmlData,'TimeUnit')
+                TimeUnit=XmlData.TimeUnit;
+        end
+        if isfield(XmlData,'Npx')&&isfield(XmlData,'Npy')
+            set(handles.npx,'String',num2str(XmlData.Npx));
+            set(handles.npy,'String',num2str(XmlData.Npy));
+        end
+        if isfield(XmlData,'Time')&&~isempty(XmlData.Time)
+            time=XmlData.Time;
+            set(handles.npz,'String',num2str(size(time,2)));
         end
         pxcmx_search=1;
@@ -641 +594 @@
   last_j=1;
 end
+UvData.XmlData=XmlData;
+
 if exist('time','var')
-    siztime=size(time);
-    nbfield=siztime(1);
-    nbfield2=siztime(2);
+    nbfield=size(time,1);
     set(handles.displ_filebase,'UserData',time); %store the set of times
-    set(handles.dt_unit,'String',['m' TimeUnit]);
     set(handles.TimeUnit,'String',TimeUnit);
     set(handles.nb_field,'String',num2str(nbfield));
-    set(handles.nb_field2,'String',num2str(nbfield2));
 end
 set(handles.CoordUnit,'String',[CoordUnit '/'])
-set(handles.pxcmx,'String',num2str(pxcmx));
-set(handles.pxcmy,'String',num2str(pxcmy));
 if isempty(pxcmx_search)
    set(handles.calcul_search,'UserData',[pxcmx pxcmy]);
@@ -659 +608 @@
    set(handles.calcul_search,'UserData',[pxcmx_search pxcmy_search]);
 end
-set(handles.pxcmx,'UserData',npx);
-set(handles.pxcmy,'UserData',npy);
 set(handles.first_i,'String',num2str(first_i));
 set(handles.last_i,'String',num2str(last_i));%
-set(handles.first_j,'String',num2str(first_j));
-set(handles.last_j,'String',num2str(last_j));%
 browse.ext_ima=ext_ima;
 browse.nom_type_ima=nom_type_ima;
@@ -830 +775 @@
      set(handles.nb_field,'Visible','On')
      set(handles.ref_i,'Visible','On')
-     if nbfield2 > 1
-        set(handles.jtext,'Visible','On')
-        set(handles.first_j,'Visible','On')
-        set(handles.last_j,'Visible','On')
-        set(handles.incr_j,'Visible','On')
-        set(handles.nb_field2,'Visible','On')
-        set(handles.ref_j,'Visible','On')
-     else
-        set(handles.jtext,'Visible','Off')
-        set(handles.first_j,'Visible','Off')
-        set(handles.last_j,'Visible','Off')
-        set(handles.incr_j,'Visible','Off')
-        set(handles.nb_field2,'Visible','Off')
-        set(handles.ref_j,'Visible','Off')
-    end
 elseif isequal(mode,'displacement')%the pairs have the same indices
      displ_num(1,1)=0; 
@@ -939 +869 @@
 end
 ref_i=str2num(get(handles.ref_i,'String'));
-if isequal(mode,'pair j1-j2')|isequal(mode,'st_pair j1-j2')
-    ref_j=0;
-else
-    ref_j=str2num(get(handles.ref_j,'String'));
-end
-if isequal(get(handles.dt_text,'String'),'dt(ms)=')%simple series(Di) with equal interval
-    ref_i=floor((first_i+last_i)/2);
-    ref_j=1;
-end
 time=get(handles.displ_filebase,'UserData');%get the set of times
 if isempty(time)
     time=[0 1];
 end 
-dt_unit=str2num(get(handles.dt,'String'));% used when there is no image documentation file
 displ_num=get(handles.list_pair_civ1,'UserData');
 
@@ -1006 +926 @@
     end
 end
-if isequal(mode,'series(Di)') | isequal(mode,'st_series(Di)')
+if isequal(mode,'series(Di)') 
     if testpair
               displ_pair{1}=['Di= ' num2str(-floor(browse.incr_pair(1)/2)) '|' num2str(ceil(browse.incr_pair(1)/2))];        
-    elseif ~isequal(get(handles.dt_text,'String'),'dt(ms)=') 
+    else 
        for ipair=1:nbpair
           if select(ipair)          
-              dt=time(ref_i+displ_num(4,ipair),ref_j+displ_num(2,ipair))-time(ref_i+displ_num(3,ipair),ref_j+displ_num(1,ipair));%time interval dt
+              dt=time(ref_i+displ_num(4,ipair),1)-time(ref_i+displ_num(3,ipair),1);%time interval dt
               displ_pair{ipair}=['Di= ' num2str(-floor(ipair/2)) '|' num2str(ceil(ipair/2)) ' :dt= ' num2str(dt*1000)];
           else 
@@ -1018 +938 @@
           end
        end
-    else
-       for ipair=1:nbpair
-         if select(ipair)
-            displ_pair{ipair}=['Di= ' num2str(-floor(ipair/2)) '|' num2str(ceil(ipair/2)) ' :dt= ' num2str(dt_unit*ipair)];
-         else 
-            displ_pair{ipair}='...'; %pair not displayed in the menu
-         end
-       end
-    end
-elseif isequal(mode,'series(Dj)')|isequal(mode,'st_series(Dj)')% series on the j index
-    if testpair
-         displ_pair{1}=['Dj= ' num2str(-floor(browse.incr_pair(1)/2)) '|' num2str(ceil(browse.incr_pair(1)/2))]; 
-    else
-       for ipair=1:nbpair
-          if select(ipair)
-              dt=time(ref_i+displ_num(4,ipair),ref_j+displ_num(2,ipair))-time(ref_i+displ_num(3,ipair),ref_j+displ_num(1,ipair));%time interval dt
-              displ_pair{ipair}=['Dj= ' num2str(-floor(ipair/2)) '|' num2str(ceil(ipair/2)) ' :dt= ' num2str(dt*1000)];
-           elseif testpair
-              displ_pair{1}=['Dj= ' num2str(-floor(browse.incr_pair(2)/2)) '|' num2str(ceil(browse.incr_pair(2)/2))];
-          else 
-             displ_pair{ipair}='...'; %pair not displayed in the menu
-          end
-       end
-   end
-elseif isequal(mode,'pair j1-j2')|isequal(mode,'st_pair j1-j2')%case of pairs
+    end
+elseif isequal(mode,'pair j1-j2')%case of pairs
     for ipair=1:nbpair
         if select(ipair)
@@ -1073 +970 @@
 %--------------------------------------------------------------
 function find_netcpair_civ2(hObject, eventdata, handles)
+return %do not exist in 3D
 set(gcf,'Pointer','watch')
 %nomenclature types
@@ -1124 +1022 @@
     ref_j=str2num(get(handles.ref_j,'String'));
 end
-if isequal(get(handles.dt_text,'String'),'dt(ms)=')%simple series(Di) with equal interval
-    ref_i=ceil((first_i+last_i)/2);
-    ref_j=1;
-end
-%     ref_i=browse.num_ref;%field number initially selected by the browser
 time=get(handles.displ_filebase,'UserData'); %get the set of times
 if isempty(time)
@@ -1185 +1078 @@
 end
 if isequal(mode,'series(Di)')  | isequal(mode,'st_series(Di)') 
-    if  ~isequal(get(handles.dt_text,'String'),'dt(ms)=')
+    if  ~isequal(get(handles.ext_txt,'String'),'dt(ms)=')
        for ipair=1:nbpair
           if select(ipair)
@@ -1240 +1133 @@
 last_i=str2num(get(handles.last_i,'String'));
 incr=str2num(get(handles.incr_i,'String'));
-first_j=str2num(get(handles.first_j,'String'));
-last_j=str2num(get(handles.last_j,'String'));
-incr_j=str2num(get(handles.incr_j,'String'));
 list_civ1=get(handles.list_pair_civ1,'String');
 index_civ1=get(handles.list_pair_civ1,'Value');
@@ -1249 +1139 @@
 index_civ2=get(handles.list_pair_civ2,'Value');
 str_civ2=list_civ2{index_civ2};
-if isequal(first_i,[])|isequal(first_j,[]), errordlg('first field number not defined'),...
+if isempty(first_i), msgbox_uvmat('ERROR','first field number not defined'),...
     set(handles.RUN, 'Enable','On'), set(handles.RUN,'BackgroundColor',[1 0 0]),return,end;
-if isequal(last_i,[])| isequal(last_j,[]),errordlg('last field number not defined'),...
+if isempty(last_i),msgbox_uvmat('ERROR','last field number not defined'),...
     set(handles.RUN, 'Enable','On'), set(handles.RUN,'BackgroundColor',[1 0 0]),return,end;
-if isequal(incr,[])| isequal(incr_j,[]),errordlg('increment in field number not defined'),...
+if isempty(incr), msgbox_uvmat('ERROR','increment in field number not defined'),...
     set(handles.RUN, 'Enable','On'), set(handles.RUN,'BackgroundColor',[1 0 0]),return,end;
-if last_i < first_i | last_j < first_j , errordlg('last field number must be larger than the first one'),...
+if last_i < first_i , msgbox_uvmat('ERROR','last field number must be larger than the first one'),...
     set(handles.RUN, 'Enable','On'), set(handles.RUN,'BackgroundColor',[1 0 0]),return,end;
 num1=[first_i:incr:last_i];
-num_j=[first_j:incr_j:last_j];
-if isequal (mode,'series(Di)') |isequal(mode,'st_series(Di)')
+if isequal (mode,'series(Di)') 
      %recognize the pair civ1 from the display
         indsel=find((double(str_civ1)<48)|(double(str_civ1)>57));% character indices of non numerical characters
@@ -1273 +1162 @@
     num1_civ1=num1-d1;% set of first image numbers
     num2_civ1=num1+d2;
-    num_a_civ1=num_j;
-    num_b_civ1=num_j;
+    num_a_civ1=1;
+    num_b_civ1=1;
     num1_civ2=num1-floor(index_civ2/2)*ones(size(num1));% set of first image numbers
     num2_civ2=num1+ceil(index_civ2/2)*ones(size(num1));
     num1_civ2=num1-d1;% set of first image numbers
     num2_civ2=num1+d2;
-    num_a_civ2=num_j;
-    num_b_civ2=num_j;
+    num_a_civ2=1;
+    num_b_civ2=1;
     % adjust the first and last field number
     lastfield=str2num(get(handles.nb_field,'String'));
@@ -1439 +1328 @@
 global civ1_exe civ2_exe patch_exe patch_new_exe fix_exe todo_path sge Civ_exe
 
-pxcmx=get(handles.pxcmx,'String');
-pxcmy=get(handles.pxcmy,'String');
-npx=get(handles.pxcmx,'UserData');
-npy=get(handles.pxcmy,'UserData');
+% pxcmx=get(handles.pxcmx,'String');
+% pxcmy=get(handles.pxcmy,'String');
+% npx=get(handles.pxcmx,'UserData');
+% npy=get(handles.pxcmy,'UserData');
 
 %check the list of operations:
@@ -1489 +1378 @@
 path_uvmat=which('uvmat');% check the path detected for source file uvmat
 path_UVMAT=fileparts(path_uvmat); %path to UVMAT
-if isunix
-    %fid = fopen(fullfile(path_UVMAT,'PARAM_LINUX.txt'),'r');%open the file with civ_3D binary names
-    xmlfile=fullfile(path_UVMAT,'PARAM_LINUX.xml');
-    if exist(xmlfile,'file')
-        t=xmltree(xmlfile);
-        sparam=convert(t);
-    end
-else
-    %fid = fopen(fullfile(path_UVMAT,'PARAM_WIN.txt'),'r');%open the file with civ_3D binary names
-    xmlfile=fullfile(path_UVMAT,'PARAM_WIN.xml');
-    if exist(xmlfile,'file')
-        t=xmltree(xmlfile);
-        sparam=convert(t);
-    end
-end
- sge=0;
-if isfield(sparam,'Civ_exe')
-    Civ_exe=sparam.Civ_exe
-end
-if isfield(sparam,'Civ1_exe')
-    civ1_exe=sparam.Civ1_exe
-end
-if isfield(sparam,'Civ2_exe')
-    civ2_exe=sparam.Civ2_exe
-end
-if isfield(sparam,'Patch_exe')
-    patch_exe=sparam.Patch_exe
-end
-if isfield(sparam,'PatchNew_exe')
-    patch_new_exe=sparam.PatchNew_exe
-end
-if isfield(sparam,'Fix_exe')
-    fix_exe=sparam.Fix_exe
-end
-if isfield(sparam,'Todo_path')
-    todo_path=sparam.Todo_path
-end
-if isfield(sparam,'SGE')
-    sge=str2num(sparam.SGE)
-end 
+%fid = fopen(fullfile(path_UVMAT,'PARAM_LINUX.txt'),'r');%open the file with civ_3D binary names
+xmlfile=fullfile(path_UVMAT,'PARAM.xml');
+if exist(xmlfile,'file')
+    t=xmltree(xmlfile);
+    sparam=convert(t);
+end
+if isfield(sparam.BatchParam,'Civ3D3CBin')
+    Civ3D3CBin=sparam.BatchParam.Civ3D3CBin;
+else
+    msgbox_uvmat('ERROR','binary for CIV3D3C not defined in PARAM.xml')
+    return
+end
+ 
 %choice of batch priority
 ind_answer=2;
-if sge
+% if sge
     [s,w]=unix('qstat -q civ_3D.q|grep job_| wc -l'); %check the waiting list (command unix)
     if isequal(s,0)
@@ -1547 +1409 @@
         return
     end
-end
+% end
 %initialize the waitbars
 set(handles.waitbar_1,'Position',[0.946 0.876 0.03 0.001])
@@ -1635 +1497 @@
 %           for j=1:nbslice
               filename=name_generator(filebase,num1_civ1(ifile),[],'.nc',...
-                nom_type_nc,1,num2_civ1(ifile),[],subdir_civ1);%
+                '_i1-i2',1,num2_civ1(ifile),[],subdir_civ1);%
             detect=exist(filename,'file')
               if detect% if a netcdf file already exists
@@ -1657 +1519 @@
 %get image names
 for ifile=1:nbfield
-    filecell_ima1_civ1{ifile}=name_generator(filebase, num1_civ1(ifile),[],ext_ima,nom_type_ima);%first image
-    filecell_ima2_civ1{ifile}=name_generator(filebase, num2_civ1(ifile),[],ext_ima,nom_type_ima); %second image
+    filecell_ima1_civ1{ifile}=name_generator(filebase, num1_civ1(ifile),[],'.vol','_i');%first image
+    filecell_ima2_civ1{ifile}=name_generator(filebase, num2_civ1(ifile),[],'.vol','_i'); %second image
      if ~exist(filecell_ima1_civ1{ifile},'file')
             msgbox_uvmat('ERROR',[filecell_ima1_civ1{ifile} ' not found'])
@@ -1684 +1546 @@
 set(handles.browse_root,'UserData',browse);%update the nomenclature type for uvmat
 
-%COPY IMAGES TO THE FORMAT .vol IF NEEDED
-if isequal(nom_type_ima,'avi')
-    nom_type_imanew='_i';
-else
-    nom_type_imanew=nom_type_ima;
-end
-
-if ~isequal(ext_ima,'.vol')
-    if box_test(1)==1 %if civ1 is performed
-       h = waitbar(0,['copy images to the .png format for civ1']);% display a wait bar 
-       for ifile=1:nbfield
-            waitbar(ifile/nbfield);
-            Atot=[];
-            filename_A=name_generator(filebase,num1_civ1(ifile),1,'.png','_i');%A VOIR
-            idetect_cur=exist(filename_A,'file');
-            for j=1:nbslice
-                    if idetect_cur==0
-                        A=read_image(cell2mat(filecell_ima1_civ1(ifile,j)),nom_type_ima2,npx,npy,num1_civ1(ifile));
-                        Atot=[Atot;A];
-                        %imwrite(A,filename,'BitDepth',16); 
-                    end
-            end
-            imwrite(Atot,filename_A,'BitDepth',16);
-                    %filecell_ima1_civ1(ifile,j)={filename};
-            Atot=[];
-            filename_B=name_generator(filebase, num2_civ1(ifile),1,'.png','_i');
-            idetect_cur=exist(filename_B,'file');
-            for j=1:nbslice
-                    if idetect_cur==0
-                        A=read_image(cell2mat(filecell_ima2_civ1(ifile,j)),nom_type_ima2,npx,npy,num2_civ1(ifile));
-                        Atot=[Atot;A];
-%                         imwrite(A,filename,'BitDepth',16);
-                    end
-                    %filecell_ima2_civ1(ifile,j)={filename};
-            end
-            imwrite(Atot,filename_B,'BitDepth',16);
-        end
-        close(h)
-    end    
-end
-
-if ~sge      
-    %OPEN THE WAIT LIST FOR BATCH PROCESSES
-    name_lock=fullfile(todo_path,'lock'); %lock file 
-    iwait=0;
-    while(exist(name_lock) & iwait<15)
-        pause(1); %wait 1 second
-        iwait=iwait+1;
-    end
-    if iwait==15
-        errordlg(['I''m tired to wait for the lock file, please delete it then click again on BATCH' name_lock ])
-        set(handles.BATCH, 'Enable','On')
-        set(handles.BATCH,'BackgroundColor',[1 0 0])
-        return
-    end
-    p0=fopen(name_lock,'w'); %create the file name_lock: prevents other users to interfere
-    name_todo=fullfile(todo_path,'TODO.txt');
-    p1=fopen(name_todo,'a');
-    if (p1<0)
-        errordlg(['error in opening ' name_todo])
-        set(handles.BATCH, 'Enable','On')
-        set(handles.BATCH,'BackgroundColor',[1 0 0])
-        return;
-    end
-end
-'TESTciv3D'
-nbfield
 for ifile=1:nbfield
     i_cmd=0; 
@@ -1770 +1565 @@
         [par_civ1.path,resu_file,resu_ext]=fileparts(filecell_nc1{ifile});
         par_civ1.volume1=filecell_ima1_civ1{ifile};
-        par_civ1.volume2=filecell_ima2_civ1{ifile}
-        par_civ1.nx=1024;
-        par_civ1.ny=1024;
+        par_civ1.volume2=filecell_ima2_civ1{ifile};
+        par_civ1.nx=str2double(get(handles.npx,'String'));
+        par_civ1.ny=str2double(get(handles.npy,'String'));;
         par_civ1.nz=par_civ1.gridLimits_Zmax - par_civ1.gridLimits_Zmin;
         'TEST'
@@ -1782 +1577 @@
     %    save(civAllxml)
         par_civ1_3d_xml=fullfile(par_civ1.path,[resu_file '.xml']);%[par_civ1.path '/test_to_change.xml'];
-         pvalue=num2str((1-ind_answer)*500);
+         pvalue=num2str((1-ind_answer)*500)
         save(civAllxml,par_civ1_3d_xml);
-      if(isunix && sge)
-         ['echo /CIVX/bin/MPI/lam-7.1.3_g95/bin/mpirun C  /CIVX/bin/civ3d3c -p ' par_civ1_3d_xml '|qsub -p ' pvalue ' -q lam.q -pe lam_loose 16 -e ' par_civ1_3d_xml '.errors -o ' par_civ1_3d_xml '.log' ]
-         eval ( ['!echo /CIVX/bin/MPI/lam-7.1.3_g95/bin/mpirun C  /CIVX/bin/civ3d3c -p ' par_civ1_3d_xml '|qsub -p ' pvalue ' -q lam.q -pe lam_loose 16 -e ' par_civ1_3d_xml '.errors -o ' par_civ1_3d_xml '.log' ])
-      else
-            '3D mode is NOT supported without sge'
-      end
-         return
+    
+%       if(isunix && sge)
+         ['echo /CIVX/bin/MPI/lam-7.1.3_g95/bin/mpirun C  ' Civ3D3CBin ' -p ' par_civ1_3d_xml '|qsub -p ' pvalue ' -q lam.q -pe lam_loose 16 -e ' par_civ1_3d_xml '.errors -o ' par_civ1_3d_xml '.log' ]
+         eval ( ['!echo /CIVX/bin/MPI/lam-7.1.3_g95/bin/mpirun C  ' Civ3D3CBin ' -p ' par_civ1_3d_xml '|qsub -p ' pvalue ' -q lam.q -pe lam_loose 16 -e ' par_civ1_3d_xml '.errors -o ' par_civ1_3d_xml '.log' ])
+%       else
+%           '3D mode is NOT supported without sge'
+%       end
+     return
         % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
         %  fichier xml produit
@@ -2723 +2519 @@
 par.gridSpacing_Z=get(handles.dz_civ1,'String');
 % Zmin=str2num(get(handles.first_j,'String'))-1;
-Zmax=str2num(get(handles.nb_field2,'String'));
+Zmax=str2num(get(handles.npz,'String'));
 par.gridLimits_Xmin=0;
 par.gridLimits_Ymin=0;
@@ -2729 +2525 @@
 % A=imread(file_ima);%read the first image to get the size
 %sizim=size(A);
-par.gridLimits_Xmax=1024;%num2str(sizim(2));
-par.gridLimits_Ymax=1024;%num2str(sizim(1));
+par.gridLimits_Xmax=str2double(get(handles.npx,'String'));%num2str(sizim(2));
+par.gridLimits_Ymax=str2double(get(handles.npy,'String'));%num2str(sizim(1));
 par.gridLimits_Zmax=Zmax;
 par.grid='grille';
@@ -3301 +3097 @@
 
 
-
-function edit75_Callback(hObject, eventdata, handles)
-% hObject    handle to edit75 (see GCBO)
-% eventdata  reserved - to be defined in a future version of MATLAB
-% handles    structure with handles and user data (see GUIDATA)
-
-% Hints: get(hObject,'String') returns contents of edit75 as text
-%        str2double(get(hObject,'String')) returns contents of edit75 as a double
-
-
-% --- Executes during object creation, after setting all properties.
-function edit75_CreateFcn(hObject, eventdata, handles)
-% hObject    handle to edit75 (see GCBO)
-% eventdata  reserved - to be defined in a future version of MATLAB
-% handles    empty - handles not created until after all CreateFcns called
-
-% Hint: edit controls usually have a white background on Windows.
-%       See ISPC and COMPUTER.
-if ispc && isequal(get(hObject,'BackgroundColor'), get(0,'defaultUicontrolBackgroundColor'))
-    set(hObject,'BackgroundColor','white');
-end
-
-
-
 function dz_civ1_Callback(hObject, eventdata, handles)
 % hObject    handle to dz_civ1 (see GCBO)
@@ -3334 +3106 @@
 
 
-% --- Executes during object creation, after setting all properties.
-function dz_civ1_CreateFcn(hObject, eventdata, handles)
-% hObject    handle to dz_civ1 (see GCBO)
+function edit77_Callback(hObject, eventdata, handles)
+% hObject    handle to edit77 (see GCBO)
 % eventdata  reserved - to be defined in a future version of MATLAB
-% handles    empty - handles not created until after all CreateFcns called
-
-% Hint: edit controls usually have a white background on Windows.
-%       See ISPC and COMPUTER.
-if ispc && isequal(get(hObject,'BackgroundColor'), get(0,'defaultUicontrolBackgroundColor'))
-    set(hObject,'BackgroundColor','white');
-end
-
-
+% handles    structure with handles and user data (see GUIDATA)
+
+% Hints: get(hObject,'String') returns contents of edit77 as text
+%        str2double(get(hObject,'String')) returns contents of edit77 as a double
+
+
+
+function edit78_Callback(hObject, eventdata, handles)
+% hObject    handle to ref_i (see GCBO)
+% eventdata  reserved - to be defined in a future version of MATLAB
+% handles    structure with handles and user data (see GUIDATA)
+
+% Hints: get(hObject,'String') returns contents of ref_i as text
+%        str2double(get(hObject,'String')) returns contents of ref_i as a double
+
+
+function edit79_Callback(hObject, eventdata, handles)
+% hObject    handle to edit79 (see GCBO)
+% eventdata  reserved - to be defined in a future version of MATLAB
+% handles    structure with handles and user data (see GUIDATA)
+
+% Hints: get(hObject,'String') returns contents of edit79 as text
+%        str2double(get(hObject,'String')) returns contents of edit79 as a double
+
+
+
+function npz_Callback(hObject, eventdata, handles)
+% hObject    handle to npz (see GCBO)
+% eventdata  reserved - to be defined in a future version of MATLAB
+% handles    structure with handles and user data (see GUIDATA)
+
+% Hints: get(hObject,'String') returns contents of npz as text
+%        str2double(get(hObject,'String')) returns contents of npz as a double
+
+
+function npy_Callback(hObject, eventdata, handles)
+% hObject    handle to npy (see GCBO)
+% eventdata  reserved - to be defined in a future version of MATLAB
+% handles    structure with handles and user data (see GUIDATA)
+
+% Hints: get(hObject,'String') returns contents of npy as text
+%        str2double(get(hObject,'String')) returns contents of npy as a double
+
+
+
+
+function npx_Callback(hObject, eventdata, handles)
+% hObject    handle to npx (see GCBO)
+% eventdata  reserved - to be defined in a future version of MATLAB
+% handles    structure with handles and user data (see GUIDATA)
+
+% Hints: get(hObject,'String') returns contents of npx as text
+%        str2double(get(hObject,'String')) returns contents of npx as a double
+
+
+
+

trunk/src/delete_object.m

@@ -7 +7 @@
 function delete_object(hObject)
 
-huvmat=findobj('Name','uvmat');%handles of the uvmat interface
+huvmat=findobj('tag','uvmat');%handles of the uvmat interface
 UvData=get(huvmat,'UserData');
-hlist_object=findobj(huvmat,'Tag','list_object');%handles of the object liçst in the uvmat interface
+hlist_object=findobj(huvmat,'Tag','list_object_1');%handles of the object liçst in the uvmat interface
 list_str=get(hlist_object,'String');%objet list
 ObjectData=[];%default
@@ -72 +72 @@
 set(hlist_object,'String',list_str)
 set(hlist_object,'Value',length(list_str))
+hlist_object=findobj(huvmat,'Tag','list_object_2');%handles of the object liçst in the uvmat interface
+set(hlist_object,'String',[list_str {'...'}])
+set(hlist_object,'Value',length(list_str)+1)

trunk/src/geometry_calib.m

@@ -78 +78 @@
 % Update handles structure
 guidata(hObject, handles);
-%movegui(hObject,'east');% position the GUI ton the right of the screen
-% if exist('handles_uvmat','var') %& isfield(data,'ParentButton')
-      set(hObject,'DeleteFcn',{@closefcn})%
-% end
+set(hObject,'DeleteFcn',{@closefcn})%
+
 %set the position of the interface
 if exist('pos','var')& length(pos)>2
@@ -100 +98 @@
     end   
 end
-set(handles.ListCoord,'String',{'...'})
+set(handles.ListCoord,'String',{'......'})
 if exist(inputxml,'file')
     loadfile(handles,inputxml)% load the point coordiantes existing in the xml file
@@ -106 +104 @@
 
 set(handles.ListCoord,'KeyPressFcn',{@key_press_fcn,handles})%set keyboard action function
-%set(hObject,'KeyPressFcn',{'keyboard_callback',handles})%set keyboard action function on uvmat interface when geometry_calib is on top 
-%htable=uitable(10,5) 
-%set(htable,'ColumnNames',{'x','y','z','X(pixels)','Y(pixels)'})
+
 
 %------------------------------------------------------------------------
@@ -214 +210 @@
     end
 end
-CoordCell=[CoordCell;{' ',' ',' ',' ',' '}];
+% CoordCell=[CoordCell;{' ',' ',' ',' ',' '}];
 Tabchar=cell2tab(CoordCell,'    |    ');%transform cells into table ready for display
+Tabchar=[Tabchar;{'......'}];
 set(handles.ListCoord,'Value',1)
 set(handles.ListCoord,'String',Tabchar)
+MenuPlot_Callback(handles.geometry_calib, [], handles)
 
 % 
@@ -227 +225 @@
 if ~isempty(huvmat)
     handles=guidata(huvmat);
-    set(handles.MenuTools,'enable','on')
+    set(handles.MenuMask,'enable','on')
+    set(handles.MenuGrid,'enable','on')
     set(handles.MenuObject,'enable','on')
     set(handles.MenuEdit,'enable','on')
@@ -298 +297 @@
 set(hhuvmat.FixedLimits,'BackgroundColor',[0.7 0.7 0.7])
 uvmat('RootPath_Callback',hObject,eventdata,hhuvmat); %file input with xml reading  in uvmat
-
+MenuPlot_Callback(hObject, eventdata, handles)
 figure(handles.geometry_calib)
 
@@ -450 +449 @@
 % est_kc=[1;0;0;0;0];
 est_dist=[1;0;0;0;0];
-run('D:\PROG\MATLAB\TOOLBOX_calib\go_calib_optim');
+run(fullfile(path_UVMAT,'TOOLBOX_calib','go_calib_optim'));
 
 GeometryCalib.CalibrationType='tsai';
@@ -497 +496 @@
     sparam=convert(t);
 end
-if ~isfield(sparam,'GeometryCalib_exe')
-    msgbox_uvmat('ERROR',['calibration program <GeometryCalib_exe> undefined in parameter file ' xmlfile])
+if ~isfield(sparam,'GeometryCalibBin')
+    msgbox_uvmat('ERROR',['calibration program <GeometryCalibBin> undefined in parameter file ' xmlfile])
     return
 end
-Tsai_exe=sparam.GeometryCalib_exe;
+Tsai_exe=sparam.GeometryCalibBin;
 if ~exist(Tsai_exe,'file')%the binary is defined in /bin, default setting
      Tsai_exe=fullfile(path_UVMAT,Tsai_exe);
 end
 if ~exist(Tsai_exe,'file')
-    msgbox_uvmat('ERROR',['calibration program ' sparam.GeometryCalib_exe ' defined in PARAM.xml does not exist'])
+    msgbox_uvmat('ERROR',['calibration program ' sparam.GeometryCalibBin ' defined in PARAM.xml does not exist'])
     return
 end
@@ -643 +642 @@
 ListCoord_Callback(hObject, eventdata, handles)
 MenuPlot_Callback(hObject, eventdata, handles)
+
 %------------------------------------------------------------------------
 % --- Executes on selection change in ListCoord.
 function ListCoord_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
+huvmat=findobj(allchild(0),'Name','uvmat');%find the current uvmat interface handle
+hplot=findobj(huvmat,'Tag','axes3');%main plotting axis of uvmat
+hhh=findobj(hplot,'Tag','calib_marker');
 Coord_cell=get(handles.ListCoord,'String');
 val=get(handles.ListCoord,'Value');
-if length(Coord_cell)>0
-    coord_str=Coord_cell{val};
-    k=findstr('|',coord_str);
-    if isempty(k)
-        return
-    end
-    set(handles.XObject,'String',coord_str(1:k(1)-5))
-    set(handles.YObject,'String',coord_str(k(1)+5:k(2)-5))
-    set(handles.ZObject,'String',coord_str(k(2)+5:k(3)-5))
-    set(handles.XImage,'String',coord_str(k(3)+5:k(4)-5))
-    set(handles.YImage,'String',coord_str(k(4)+5:end))
-    huvmat=findobj(allchild(0),'Name','uvmat');%find the current uvmat interface handle
-    hplot=findobj(huvmat,'Tag','axes3');%main plotting axis of uvmat
-    h_menu_coord=findobj(huvmat,'Tag','menu_coord');
-    menu=get(h_menu_coord,'String');
-    choice=get(h_menu_coord,'Value');
-    if iscell(menu)
-        option=menu{choice};
-    else
-        option='px'; %default
-    end
-    if isequal(option,'phys')
-        XCoord=str2num(coord_str(1:k(1)-5));
-        YCoord=str2num(coord_str(k(1)+5:k(2)-5));
-    elseif isequal(option,'px')|| isequal(option,'')
-        XCoord=str2num(coord_str(k(3)+5:k(4)-5));
-        YCoord=str2num(coord_str(k(4)+5:end));
-    else
-        msgbox_uvmat('ERROR','the choice in menu_coord of uvmat must be px or phys ')
-    end
-    huvmat=findobj(allchild(0),'Name','uvmat');%find the current uvmat interface handle
-    hplot=findobj(huvmat,'Tag','axes3');%main plotting axis of uvmat
-    hhh=findobj(hplot,'Tag','calib_marker');
-    if isempty(hhh)
-        axes(hplot)
-        line(XCoord,YCoord,'Color','m','Tag','calib_marker','LineStyle','.','Marker','o','MarkerSize',20);
-    else
-        set(hhh,'XData',XCoord)
-        set(hhh,'YData',YCoord)
-    end
+coord_str=Coord_cell{val};
+k=findstr('|',coord_str);
+if isempty(k)%last line '.....' selected
+    if ~isempty(hhh)
+        delete(hhh)%delete the circle marker
+    end
+    return
+end
+%fill the edit boxex
+set(handles.XObject,'String',coord_str(1:k(1)-5))
+set(handles.YObject,'String',coord_str(k(1)+5:k(2)-5))
+set(handles.ZObject,'String',coord_str(k(2)+5:k(3)-5))
+set(handles.XImage,'String',coord_str(k(3)+5:k(4)-5))
+set(handles.YImage,'String',coord_str(k(4)+5:end))
+h_menu_coord=findobj(huvmat,'Tag','transform_fct');
+menu=get(h_menu_coord,'String');
+choice=get(h_menu_coord,'Value');
+if iscell(menu)
+    option=menu{choice};
+else
+    option='px'; %default
+end
+if isequal(option,'phys')
+    XCoord=str2num(coord_str(1:k(1)-5));
+    YCoord=str2num(coord_str(k(1)+5:k(2)-5));
+elseif isequal(option,'px')|| isequal(option,'')
+    XCoord=str2num(coord_str(k(3)+5:k(4)-5));
+    YCoord=str2num(coord_str(k(4)+5:end));
+else
+    msgbox_uvmat('ERROR','the choice in menu_coord of uvmat must be px or phys ')
+end
+if isempty(XCoord)||isempty(YCoord)
+     if ~isempty(hhh)
+        delete(hhh)%delete the circle marker
+    end
+    return
+end
+xlim=get(hplot,'XLim');
+ylim=get(hplot,'YLim');
+ind_range=max(abs(xlim(2)-xlim(1)),abs(ylim(end)-ylim(1)))/20;%defines the size of the circle marker
+if isempty(hhh)
+    axes(hplot)
+    rectangle('Curvature',[1 1],...
+              'Position',[XCoord-ind_range/2 YCoord-ind_range/2 ind_range ind_range],'EdgeColor','m',...
+              'LineStyle','-','Tag','calib_marker');
+else
+    set(hhh,'Position',[XCoord-ind_range/2 YCoord-ind_range/2 ind_range ind_range])
 end
 
@@ -744 +754 @@
 Data.CoordType='px';
 plot_field(Data)
- 
 
 %------------------------------------------------------------------------
@@ -750 +759 @@
 function key_press_fcn(hObject,eventdata,handles)
 %------------------------------------------------------------------------
-hh=get(hObject,'parent');
-xx=double(get(hh,'CurrentCharacter')); %get the keyboard character
-
+xx=double(get(handles.geometry_calib,'CurrentCharacter')); %get the keyboard character
 if ismember(xx,[8 127])%backspace or delete
     Coord_cell=get(handles.ListCoord,'String');
-    data=read_geometry_calib(Coord_cell);
-    Coord=[]; %default
-    if isfield(data,'Coord')
-        Coord=data.Coord;
-    end
     val=get(handles.ListCoord,'Value');
-    Coord(val,:)=[];%suppress the selected item in the list
-    CoordCell={};
-    for iline=1:size(Coord,1)
-        for j=1:5
-            CoordCell{iline,j}=num2str(Coord(iline,j),4);
-        end
-    end
-    Tabchar=cell2tab(CoordCell,'    |    ');%transform cells into table ready for display
-    val=min(size(Coord,1),val);
-    set(handles.ListCoord,'Value',max(val,1))
-    set(handles.ListCoord,'String',Tabchar)  
-    ListCoord_Callback(hObject, eventdata, handles)
-    MenuPlot_Callback(hObject,eventdata,handles)
-end
-
-%------------------------------------------------------------------------
-% --- Executes on button press in append_point.
-function append_point_Callback(hObject, eventdata, handles)
-%------------------------------------------------------------------------
-       Coord=get(handles.ListCoord,'String'); 
-       val=length(Coord);
-       if val>=1 & isequal(Coord{val},'')
-            val=val-1; %do not take into account blank
-       end
-       Coord{val+1}='';
-       set(handles.ListCoord,'String',Coord)
-       set(handles.ListCoord,'Value',val+1)
+    if val<numel(Coord_cell) % the last element '...' has not been selected
+        Coord_cell(val)=[];%remove the selected line
+        set(handles.ListCoord,'String',Coord_cell)         
+        ListCoord_Callback(hObject, eventdata, handles) 
+        MenuPlot_Callback(hObject,eventdata,handles)
+    end
+end
+
+% %------------------------------------------------------------------------
+% % --- Executes on button press in append_point.
+% function append_point_Callback(hObject, eventdata, handles)
+% %------------------------------------------------------------------------
+%        Coord=get(handles.ListCoord,'String'); 
+%        val=length(Coord);
+%        if val>=1 & isequal(Coord{val},'')
+%             val=val-1; %do not take into account blank
+%        end
+%        Coord{val+1}='';
+%        set(handles.ListCoord,'String',Coord)
+%        set(handles.ListCoord,'Value',val+1)
 
 %------------------------------------------------------------------------
@@ -836 +831 @@
 ObjectData=read_geometry_calib(Coord_cell);
 %ObjectData=read_geometry_calib(handles);%read the interface input parameters defining the object
-if isequal(option,'phys')
-    ObjectData.Coord=ObjectData.Coord(:,[1:3]);
-elseif isequal(option,'px')||isequal(option,'')
-    ObjectData.Coord=ObjectData.Coord(:,[4:5]);
-else
-    msgbox_uvmat('ERROR','the choice in menu_coord of uvmat must be px or phys ')
+if ~isempty(ObjectData.Coord)
+    if isequal(option,'phys')
+        ObjectData.Coord=ObjectData.Coord(:,[1:3]);
+    elseif isequal(option,'px')||isequal(option,'')
+        ObjectData.Coord=ObjectData.Coord(:,[4:5]);
+    else
+        msgbox_uvmat('ERROR','the choice in menu_coord of uvmat must be '''', px or phys ')
+    end
 end
 axes(hhuvmat.axes3)
 hh=findobj('Tag','calib_points');
-if isempty(hh)
+if  ~isempty(ObjectData.Coord) && isempty(hh)
     hh=line(ObjectData.Coord(:,1),ObjectData.Coord(:,2),'Color','m','Tag','calib_points','LineStyle','.','Marker','+');
+elseif isempty(ObjectData.Coord)%empty list of points, suppress the plot
+    delete(hh)
 else
     set(hh,'XData',ObjectData.Coord(:,1))
@@ -874 +873 @@
     Tinput=CalibData.grid;
 end
-[T,CalibData.grid]=create_grid(grid_input);%display the GUI create_grid
+[T,CalibData.grid]=create_grid(Tinput);%display the GUI create_grid
 set(handles.geometry_calib,'UserData',CalibData)
 
 %grid in phys space
-Coord_cell=get(handles.ListCoord,'String');
-data=read_geometry_calib(Coord_cell);
-nbpoints=size(data.Coord,1); %nbre of calibration points
-data.Coord(1:size(T,1),1:3)=T;%update the existing list of phys coordinates from the GUI create_grid
-for i=1:nbpoints
-   for j=1:5
+Coord=get(handles.ListCoord,'String');
+val=get(handles.ListCoord,'Value');
+data=read_geometry_calib(Coord);
+%nbpoints=size(data.Coord,1); %nbre of calibration points
+data.Coord(val:val+size(T,1)-1,1:3)=T(end:-1:1,:);%update the existing list of phys coordinates from the GUI create_grid
+% for i=1:nbpoints
+%    for j=1:5
+%           Coord{i,j}=num2str(data.Coord(i,j),4);%display coordiantes with 4 digits
+%    end
+% end
+%update the phys coordinates starting from the selected point (down in the
+Coord(end,:)=[]; %remove last string '.....'
+for i=1:size(data.Coord,1)
+    for j=1:5
           Coord{i,j}=num2str(data.Coord(i,j),4);%display coordiantes with 4 digits
-   end
-end
-for i=nbpoints+1:size(data.Coord,1)
-    for j=1:3
-          Coord{i,j}=num2str(data.Coord(i,j),4);%display coordiantes with 4 digits
-    end
-    for j=4:5
-          Coord{i,j}='';%display coordiantes with 4 digi
-    end
-end
-
+    end
+end
 
 %size(data.Coord,1)
 Tabchar=cell2tab(Coord,'    |    ');
-set(handles.ListCoord,'Value',1)
+Tabchar=[Tabchar ;{'......'}];
 set(handles.ListCoord,'String',Tabchar)
 
-%-----------------------------------------------------------------------
-function MenuTranslatePoints_Callback(hObject, eventdata, handles)
-%-----------------------------------------------------------------------
-%hcalib=get(handles.calib_type,'parent');%handles of the GUI geometry_calib
-CalibData=get(handles.geometry_calib,'UserData');
-Tinput=[];%default
-if isfield(CalibData,'translate')
-    Tinput=CalibData.translate;
-end
-T=translate_points(Tinput);%display translate_points GUI and get shift parameters 
-CalibData.translate=T;
-set(handles.geometry_calib,'UserData',CalibData)
-%translation
-Coord_cell=get(handles.ListCoord,'String');
-data=read_geometry_calib(Coord_cell);
-data.Coord(:,1)=T(1)+data.Coord(:,1);
-data.Coord(:,2)=T(2)+data.Coord(:,2);
-data.Coord(:,3)=T(3)+data.Coord(:,3);
-data.Coord(:,[4 5])=data.Coord(:,[4 5]);
-for i=1:size(data.Coord,1)
-    for j=1:5
-          Coord{i,j}=num2str(data.Coord(i,j),4);%phys x,y,z
-   end
-end
-Tabchar=cell2tab(Coord,'    |    ');
-set(handles.ListCoord,'Value',1)
-set(handles.ListCoord,'String',Tabchar)
-
-
-% --------------------------------------------------------------------
-function MenuRotatePoints_Callback(hObject, eventdata, handles)
-%hcalib=get(handles.calib_type,'parent');%handles of the GUI geometry_calib
-CalibData=get(handles.geometry_calib,'UserData');
-Tinput=[];%default
-if isfield(CalibData,'rotate')
-    Tinput=CalibData.rotate;
-end
-T=rotate_points(Tinput);%display translate_points GUI and get shift parameters 
-CalibData.rotate=T;
-set(handles.geometry_calib,'UserData',CalibData)
-%-----------------------------------------------------
-%rotation
-Phi=T(1);
-O_x=0;%default
-O_y=0;%default
-if numel(T)>=2
-    O_x=T(2);%default
-end
-if numel(T)>=3
-    O_y=T(3);%default
-end
-Coord_cell=get(handles.ListCoord,'String');
-data=read_geometry_calib(Coord_cell);
-r1=cos(pi*Phi/180);
-r2=-sin(pi*Phi/180);
-r3=sin(pi*Phi/180);
-r4=cos(pi*Phi/180);
-x=data.Coord(:,1)-O_x;
-y=data.Coord(:,2)-O_y;
-data.Coord(:,1)=r1*x+r2*y;
-data.Coord(:,2)=r3*x+r4*y;
-% data.Coord(:,[4 5])=data.Coord(:,[4 5]);
-for i=1:size(data.Coord,1)
-    for j=1:5
-          Coord{i,j}=num2str(data.Coord(i,j),4);%phys x,y,z
-   end
-end
-Tabchar=cell2tab(Coord,'    |    ');
-set(handles.ListCoord,'Value',1)
-set(handles.ListCoord,'String',Tabchar)
-% --------------------------------------------------------------------
+% -----------------------------------------------------------------------
+% --- automatic grid dectection from local maxima of the images 
 function MenuDetectGrid_Callback(hObject, eventdata, handles)
-
+%------------------------------------------------------------------------
 CalibData=get(handles.geometry_calib,'UserData');
 grid_input=[];%default
@@ -989 +918 @@
 if nbpoints~=4
     msgbox_uvmat('ERROR','four points must be selected by the mouse, beginning by the new x axis, to delimitate the phs grid area')
-end
-corners_X=(data.Coord(end-3:end,4)); %pixel absissa of the four corners
-corners_Y=(data.Coord(end-3:end,5)); 
-
-%reorder the last two points if needed
+    return
+end
+corners_X=(data.Coord(end:-1:end-3,4)); %pixel absissa of the four corners
+corners_Y=(data.Coord(end:-1:end-3,5)); 
+
+%reorder the last two points (the two first in the list) if needed
 angles=angle((corners_X-corners_X(1))+i*(corners_Y-corners_Y(1)));
 if abs(angles(4)-angles(2))>abs(angles(3)-angles(2))
@@ -1015 +945 @@
 a_X1=XY_mat\corners_X; %transformation matrix for X
 x1=XY_mat*a_X1;%reconstruction
-err_X1=max(abs(x1-corners_X))%error
+err_X1=max(abs(x1-corners_X));%error
 a_Y1=XY_mat\corners_Y;%transformation matrix for X
 y1=XY_mat*a_Y1;
-err_Y1=max(abs(y1-corners_Y))%error
+err_Y1=max(abs(y1-corners_Y));%error
 GeometryCalib.CalibrationType='linear';
 GeometryCalib.CoordUnit=[];% default value, to be updated by the calling function
@@ -1072 +1002 @@
      Coord{ipoint,5}=num2str(Ypx(ipoint),4);%display coordiantes with 4 digi
 end
-Tabchar=cell2tab(Coord,'    |    ');
+Tabchar=cell2tab(Coord(end:-1:1,:),'    |    ');
+Tabchar=[Tabchar ;{'......'}];
 set(handles.ListCoord,'Value',1)
 set(handles.ListCoord,'String',Tabchar)
 MenuPlot_Callback(hObject, eventdata, handles)
+
+%-----------------------------------------------------------------------
+function MenuTranslatePoints_Callback(hObject, eventdata, handles)
+%-----------------------------------------------------------------------
+%hcalib=get(handles.calib_type,'parent');%handles of the GUI geometry_calib
+CalibData=get(handles.geometry_calib,'UserData');
+Tinput=[];%default
+if isfield(CalibData,'translate')
+    Tinput=CalibData.translate;
+end
+T=translate_points(Tinput);%display translate_points GUI and get shift parameters 
+CalibData.translate=T;
+set(handles.geometry_calib,'UserData',CalibData)
+%translation
+Coord_cell=get(handles.ListCoord,'String');
+data=read_geometry_calib(Coord_cell);
+data.Coord(:,1)=T(1)+data.Coord(:,1);
+data.Coord(:,2)=T(2)+data.Coord(:,2);
+data.Coord(:,3)=T(3)+data.Coord(:,3);
+data.Coord(:,[4 5])=data.Coord(:,[4 5]);
+for i=1:size(data.Coord,1)
+    for j=1:5
+          Coord{i,j}=num2str(data.Coord(i,j),4);%phys x,y,z
+   end
+end
+Tabchar=cell2tab(Coord,'    |    ');
+Tabchar=[Tabchar {'.....'}];
+%set(handles.ListCoord,'Value',1)
+set(handles.ListCoord,'String',Tabchar)
+
+
+% --------------------------------------------------------------------
+function MenuRotatePoints_Callback(hObject, eventdata, handles)
+%hcalib=get(handles.calib_type,'parent');%handles of the GUI geometry_calib
+CalibData=get(handles.geometry_calib,'UserData');
+Tinput=[];%default
+if isfield(CalibData,'rotate')
+    Tinput=CalibData.rotate;
+end
+T=rotate_points(Tinput);%display translate_points GUI and get shift parameters 
+CalibData.rotate=T;
+set(handles.geometry_calib,'UserData',CalibData)
+%-----------------------------------------------------
+%rotation
+Phi=T(1);
+O_x=0;%default
+O_y=0;%default
+if numel(T)>=2
+    O_x=T(2);%default
+end
+if numel(T)>=3
+    O_y=T(3);%default
+end
+Coord_cell=get(handles.ListCoord,'String');
+data=read_geometry_calib(Coord_cell);
+r1=cos(pi*Phi/180);
+r2=-sin(pi*Phi/180);
+r3=sin(pi*Phi/180);
+r4=cos(pi*Phi/180);
+x=data.Coord(:,1)-O_x;
+y=data.Coord(:,2)-O_y;
+data.Coord(:,1)=r1*x+r2*y;
+data.Coord(:,2)=r3*x+r4*y;
+% data.Coord(:,[4 5])=data.Coord(:,[4 5]);
+for i=1:size(data.Coord,1)
+    for j=1:5
+          Coord{i,j}=num2str(data.Coord(i,j),4);%phys x,y,z
+   end
+end
+Tabchar=cell2tab(Coord,'    |    ');
+Tabchar=[Tabchar;{'......'}];
+set(handles.ListCoord,'Value',1)
+set(handles.ListCoord,'String',Tabchar)
+
 
 %%%%%%%%%%%%%%%%%%%%

trunk/src/imadoc2struct.m

@@ -74 +74 @@
         xindex=findstr(ImageSize,'x');
         if length(xindex)>=2
-             npx=str2double(ImageSize(1:xindex(1)-1));
-             npy=str2double(ImageSize(xindex(1)+1:xindex(2)-1));
+             s.Npx=str2double(ImageSize(1:xindex(1)-1));
+             s.Npy=str2double(ImageSize(xindex(1)+1:xindex(2)-1));
         end
     end

trunk/src/keyboard_callback.m

@@ -24 +24 @@
 if ismember(xx,[8 127]) %if the delete or suppr key is pressed, delete the current object 
     currentobject=gco;
-    huvmat=findobj(allchild(0),'Name','uvmat');
+    huvmat=findobj(allchild(0),'tag','uvmat');
 %     UvData=get(huvmat,'UserData');%Data associated to the current uvmat interface
-    hlist_object=findobj(huvmat,'Tag','list_object');
+    hlist_object=findobj(huvmat,'Tag','list_object_1');
     ObjIndex=get(hlist_object,'Value')
-    if ObjIndex>1
+    if ObjIndex>1 
         delete_object(ObjIndex)
     end

trunk/src/mouse_down.m

@@ -25 +25 @@
 
 MouseAction='none'; %default
-huvmat=findobj(allchild(0),'Name','uvmat');%find the uvmat interface handle which controls theoption of  mouse action
+huvmat=findobj(allchild(0),'tag','uvmat');%find the uvmat interface handle which controls theoption of  mouse action
 if isempty(huvmat)
     return
@@ -49 +49 @@
 %edit an existing point or line if found
 hcurrentobject=gco;% current object handle (selected by the mouse)
-hcurrentfig=gcbo;% current figure handle
+hcurrentfig=hObject;% current figure handle
 fig_tag=get(hcurrentfig,'Tag');
 tag_obj=get(gco,'Tag');
@@ -105 +105 @@
 end    
 
+% zoom has first priority 
 if testzoom %&& ~test_create && ~test_edit && ~test_edit_vect && exist('xy','var')
      AxeData.Drawing='zoom'; %initiate drawing mode
      AxeData.CurrentObject=[];%unselect objects
+     set(haxes,'UserData',AxeData);
      return
 end
 if isempty(huvmat)
+    return
+end
+
+%ruler has second priority 
+if test_ruler
+    UvData.RulerCoord(1,1)=xy(1,1);
+    UvData.RulerCoord(1,2)=xy(1,2);
+    UvData.RulerHandle=line([xy(1,1) xy(1,1)],[xy(1,2) xy(1,2)],'Color','m','Tag','ruler');
+    set(huvmat,'UserData',UvData)
+    AxeData.Drawing='ruler';
+    set(haxes,'UserData',AxeData);
     return
 end
@@ -163 +176 @@
             end
             IndexObj=ObjectData.IndexObj;
-            set(hhuvmat.list_object_1,'Value',IndexObj);
-            set(hhuvmat.list_object_2,'Value',IndexObj);
+                    %indicate on the list of the GUI uvmat which object has been selected
+            if strcmp(get(hcurrentfig,'tag'),'uvmat') %if the uvmat graph has been selected, object projection is on the other frame view_field
+                set(hhuvmat.list_object_2,'Value',IndexObj);
+            else
+                set(hhuvmat.list_object_1,'Value',IndexObj);
+            end
             testdeform=0;
             set(gcbo,'Pointer','circle'); 
@@ -207 +224 @@
         set(huvmat,'UserData',UvData)
         list_str=get(hhuvmat.list_object_1,'String');
-        list_str{IndexObj}=[num2str(IndexObj) '-' ObjectData.Style];
-        if ~isequal(list_str{end},'...')
-             list_str{end+1}='...';
-        end
+        list_str{IndexObj}=[num2str(IndexObj) '-' ObjectData.Style]; 
         set(hhuvmat.list_object_1,'String',list_str)
+        list_str{end+1}='...';
         set(hhuvmat.list_object_2,'String',list_str)
         if strcmp(fig_tag,'view_field')%we are in view_field plot
-              set(hhuvmat.list_object_1,'Value',IndexObj)
+              set(hhuvmat.list_object_1,'Value',IndexObj)% the projection field will be plotted in uvmat frame
         else%we are in uvmat plot
             set(hhuvmat.list_object_2,'Value',IndexObj)
@@ -234 +249 @@
         if ~(isequal(coord_value,1)||isequal(coord_value,3)); %active only with no transform or px (no phys)
             set(hhuvmat.transform_fct,'Value',1)
+            uvmat('transform_fct_Callback',hObject,eventdata,hhuvmat); %file input with xml reading  in uvmat
             set(hhuvmat.FixedLimits,'Value',0)% put FixedLimits option to 'off'
             set(hhuvmat.FixedLimits,'BackgroundColor',[0.7 0.7 0.7])
-            uvmat('run0_Callback',hObject,eventdata,hhuvmat); %file input with xml reading  in uvmat
             return
         end
         Coord=get(h_ListCoord,'String');
-        data=read_geometry_calib(Coord)%transform char cell to numbers
+        data=read_geometry_calib(Coord);%transform char cell to numbers
         ind_range=10;%range of research around each existing point
         test_newpoint=1;
@@ -255 +270 @@
              val=get(h_ListCoord,'Value');
              if length(Coord)>=val
-                 Coord(val+1:length(Coord)+1)=Coord(val:length(Coord))% push the list forward beyond the current point
+                 Coord(val+1:length(Coord)+1)=Coord(val:length(Coord));% push the list forward beyond the current point
              end
              Coord{val}=strline;
              set(h_ListCoord,'String',Coord)
-             set(h_ListCoord,'Value',val+1)
+            % set(h_ListCoord,'Value',val+1)
              data=read_geometry_calib(Coord);%transform char cell to numbers
              XCoord=data.Coord(:,4);
@@ -274 +289 @@
         hhh=findobj('Tag','calib_marker');%look for handle of point marker (circle)
         if ~isempty(hhh)
-            set(hhh,'XData',xy(1,1))
-            set(hhh,'YData',xy(1,2))
+            set(hhh,'Position',[xy(1,1)-ind_range/2 xy(1,2)-ind_range/2 ind_range ind_range])
         else
-            line([xy(1,1) xy(1,1)],[xy(1,2) xy(1,2)],'Color','m','Tag','calib_marker','LineStyle','.','Marker','o','MarkerSize',20);
-        end
+            rectangle('Curvature',[1 1],...
+                  'Position',[xy(1,1)-ind_range/2 xy(1,2)-ind_range/2 ind_range ind_range],'EdgeColor','m',...
+                  'LineStyle','-','Tag','calib_marker');
+           % line([xy(1,1) xy(1,1)],[xy(1,2) xy(1,2)],'Color','m','Tag','calib_marker','LineStyle','.','Marker','o','MarkerSize',ind_range);
+        end
+        AxeData.Drawing='calibration';
     end
 end
@@ -296 +314 @@
 end   
 
-%create ruler
-if test_ruler
-    UvData.RulerCoord(1,1)=xy(1,1);
-    UvData.RulerCoord(1,2)=xy(1,2);
-    UvData.RulerHandle=line([xy(1,1) xy(1,1)],[xy(1,2) xy(1,2)],'Color','m','Tag','ruler');
-    set(huvmat,'UserData',UvData)
-end
+
 set(haxes,'UserData',AxeData);
 

trunk/src/mouse_motion.m

@@ -27 +27 @@
     return
 end
+test_draw=0;
 test_create=0;%default
-test_edit=0;%default
-test_edit=isfield(handles,'edit') & get(handles.edit,'Value');% edit test for mouse shap: an arrow
-test_zoom=isfield(handles,'zoom')& get(handles.zoom,'Value');% edit test for mouse shap: an arrow 
+test_object=0; %default
+test_edit=isfield(handles,'edit') && get(handles.edit,'Value');% edit test for mouse shap: an arrow
+test_zoom_draw=0; %default
+test_ruler=0;
+huvmat=findobj(allchild(0),'Name','uvmat');%find the uvmat interface handle
+if ~isempty(huvmat)
+    UvData=get(huvmat,'UserData');
+    test_ruler=isfield(UvData,'MouseAction') && isequal(UvData.MouseAction,'ruler');
+end
+
 
 %find the current axe 'haxes' and display the current mouse position or uicontrol tag
@@ -38 +46 @@
 text_displ_4='';
 
-haxes=[];
 AxeData=[];%default
 mouse=[];
@@ -44 +51 @@
 
 pointershape='arrow';% default pointer is an arrow 
-currentfig=gcbo;%store gcbo as variable currentfig
+currentfig=hObject;
 xy_fig=get(currentfig,'CurrentPoint');% current point of the current figure (gcbo)
 hchild=get(currentfig,'Children');%handles of all objects in the current figure
 
-% loop on all the objects in the current figure (selected by the last mouse click) 
+% loop on all the objects in the current figure and detect whether the mouse is over a plot  axes
+haxes=[];
 for ichild=1:length(hchild)
     obj_pos=get(hchild(ichild),'Position');%position of the object
@@ -68 +76 @@
             ivec=[];
             AxeData=get(haxes,'UserData');% data attached to the axis
-             if ~test_edit && ~test_zoom
+            if isfield(AxeData,'Drawing')&& ~isempty(AxeData.Drawing) 
+                test_draw=~isequal(AxeData.Drawing,'off');
+            end
+            test_zoom_draw=test_draw && isequal(AxeData.Drawing,'zoom')&& isfield(AxeData,'CurrentOrigin') && isequal(get(gcf,'SelectionType'),'normal');
+            test_object=test_draw && isfield(AxeData,'CurrentObject') && ~isempty(AxeData.CurrentObject) && ishandle(AxeData.CurrentObject);       
+             if ~test_edit && ~test_zoom_draw && ~test_ruler
                  pointershape='crosshair';%set pointer with cross shape (default when mouse is over an axis)
-%                % pointershape='crosshair';%set pointer with cross shape (default over axis)
              end
             if isfield(AxeData,'X') && isfield(AxeData,'Y') && isfield(AxeData,'Mesh')% test on the existence of a vector field in the current axis
@@ -78 +90 @@
                     ivec=find(flag_vec,1);% search the (first) selected vector index ivec
                     hhh=findobj(haxes,'Tag','vector_marker');
-                    if ~isempty(ivec) 
-                        %ivec=ivec(1);%choice the first selected vector if several are selected
-                        if ~test_create
-                            pointershape='arrow'; %mouse indicates  the detection of a vector
-                            if isempty(hhh)
-                                set(currentfig,'CurrentAxes',haxes)
-                                rectangle('Curvature',[1 1],...
-                  'Position',[AxeData.X(ivec)-AxeData.Mesh AxeData.Y(ivec)/2-AxeData.Mesh/2 AxeData.Mesh AxeData.Mesh],'EdgeColor','m',...
-                  'LineStyle','-','Tag','vector_marker');
-%                                 line(AxeData.X(ivec),AxeData.Y(ivec),'Color','m','Tag','vector_marker','LineStyle','.','Marker','o','MarkerSize',AxeData.Mesh);
-                            else
-                                set(hhh,'Position',[AxeData.X(ivec)-AxeData.Mesh/2 AxeData.Y(ivec)-AxeData.Mesh/2 AxeData.Mesh AxeData.Mesh])
+                    if ~isempty(ivec)
+                        if ~test_object % mark the vectors with a circle in the absence of other operations
+                            if  ~test_create && ~test_edit && ~test_ruler
+                                pointershape='arrow'; %mouse indicates  the detection of a vector
+                                if isempty(hhh)
+                                     hstack=findobj(allchild(0),'Type','figure');%current stack order of figures in matlab
+                                    axes(haxes)
+                                    rectangle('Curvature',[1 1],...
+                      'Position',[AxeData.X(ivec)-AxeData.Mesh/2 AxeData.Y(ivec)-AxeData.Mesh/2 AxeData.Mesh AxeData.Mesh],'EdgeColor','m',...
+                      'LineStyle','-','Tag','vector_marker');
+                                    set(0,'Children',hstack);%put back the initial figure stack after plot creation
+                                else
+                                    set(hhh,'Position',[AxeData.X(ivec)-AxeData.Mesh/2 AxeData.Y(ivec)-AxeData.Mesh/2 AxeData.Mesh AxeData.Mesh])
+                                end
                             end
-                        end                 
+                        end
                         mouse.X=AxeData.X(ivec);
                         mouse.Y=AxeData.Y(ivec);
@@ -193 +207 @@
 set(handles.text_display_3,'String',text_displ_3);
 set(handles.text_display_4,'String',text_displ_4);
+if ~test_draw
+    return 
+end
+% At this stage  if no drawing  operation is done
+
+
+%%%%%%%%%%%%%
+%draw a zoom rectangle if no object creation is selected
+if test_zoom_draw 
+   xy_rect=AxeData.CurrentOrigin;
+   if ~isempty(xy_rect) 
+        rect(1)=min(xy(1,1),xy_rect(1));%origin rectangle, x coordinate
+        rect(2)=min(xy(1,2),xy_rect(2));%origin rectangle, y coordinate
+        rect(3)=abs(xy(1,1)-xy_rect(1));%rectangle width
+        rect(4)=abs(xy(1,2)-xy_rect(2));%rectangle height
+        if rect(3)>0 & rect(4)>0
+            if isfield(AxeData,'CurrentRectZoom')& ishandle(AxeData.CurrentRectZoom)
+                set(AxeData.CurrentRectZoom,'Position',rect);%update the rectangle position
+            else
+                AxeData.CurrentRectZoom=rectangle('Position',rect,'LineStyle',':','Tag','rect_zoom');
+                set(haxes,'UserData',AxeData)
+            end
+        end
+   end
+    pointershape='arrow';
+end
 
 %%%%%%%%%%%%%%%%%
 %create or modify an object
-huvmat=findobj(allchild(0),'Name','uvmat');%find the uvmat interface handle
-if ~isempty(huvmat)
-    UvData=get(huvmat,'UserData');
-end
-if ~isempty(huvmat) & isfield(AxeData,'CurrentObject') & ishandle(AxeData.CurrentObject) & isfield(AxeData,'Drawing') & ~isequal(AxeData.Drawing,'off')
+
+if ~isempty(huvmat) && test_object
     PlotData=get(AxeData.CurrentObject,'UserData');
     huvmat=findobj(allchild(0),'Name','uvmat');%find the uvmat interface handle
@@ -250 +287 @@
 end    
 
-%%%%%%%%%%%%%
-%draw a zoom rectangle if no object creation is selected
-if ~isempty(haxes) & isfield(AxeData,'Drawing')& isequal(AxeData.Drawing,'zoom')& isfield(AxeData,'CurrentOrigin')...
-        & isequal(get(gcf,'SelectionType'),'normal')% 
-   xy_rect=AxeData.CurrentOrigin;
-   if ~isempty(xy_rect) 
-        rect(1)=min(xy(1,1),xy_rect(1));%origin rectangle, x coordinate
-        rect(2)=min(xy(1,2),xy_rect(2));%origin rectangle, y coordinate
-        rect(3)=abs(xy(1,1)-xy_rect(1));%rectangle width
-        rect(4)=abs(xy(1,2)-xy_rect(2));%rectangle height
-        if rect(3)>0 & rect(4)>0
-            if isfield(AxeData,'CurrentRectZoom')& ishandle(AxeData.CurrentRectZoom)
-                set(AxeData.CurrentRectZoom,'Position',rect);%update the rectangle position
-            else
-                AxeData.CurrentRectZoom=rectangle('Position',rect,'LineStyle',':','Tag','rect_zoom');
-                set(haxes,'UserData',AxeData)
-            end
-        end
-   end
-% end
-% if test_zoom
-    pointershape='arrow';
-end
-
 % detect calibration points if the GUI geometry_calib is opened
 h_geometry_calib=findobj(allchild(0),'Name','geometry_calib'); %find the geomterty_calib GUI
-if ~test_zoom && ~isempty(h_geometry_calib)
+if ~test_zoom_draw && ~isempty(h_geometry_calib)
     pointershape='crosshair';%default for geometry_calib: ready to create new points
     hh_geometry_calib=guidata(h_geometry_calib);
@@ -303 +316 @@
                     hhh=findobj('Tag','calib_marker');%look for handle of point marker (circle)
                     if ~isempty(hhh)
-                        set(hhh,'XData',XCoord(index_point))
-                        set(hhh,'YData',YCoord(index_point))
+                        set(hhh,'Position',[XCoord(index_point)-ind_range/2 YCoord(index_point)-ind_range/2 ind_range ind_range])
+%                         set(hhh,'XData',XCoord(index_point))
+%                         set(hhh,'YData',YCoord(index_point))
                     end
                 end          
@@ -313 +327 @@
 
 %draw ruler
-if ~isempty(huvmat)
-    UvData=get(huvmat,'UserData');
-    if isfield(UvData,'MouseAction') && isequal(UvData.MouseAction,'ruler')
+if test_ruler && isequal(AxeData.Drawing,'ruler')
            if isfield(UvData,'RulerHandle')
                pointershape='crosshair';
@@ -322 +334 @@
                 set(UvData.RulerHandle,'YData',RulerCoord(:,2));
            end
-    end
 end
 set(currentfig,'Pointer',pointershape);

trunk/src/mouse_up.m

@@ -1 +1 @@
 %'mouse_up': function  activated when the mouse button is released
 %----------------------------------------------------------------
-% function mouse_up(ggg,eventdata,handles)
+% function mouse_up(hObject,eventdata,handles)
 % activated by the command:
 % set(hObject,'WindowButtonUpFcn',{'mouse_up'}), 
@@ -22 +22 @@
 %AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 
-function mouse_up(ggg,eventdata,handles)
+function mouse_up(hObject,eventdata,handles)
 MouseAction='none'; %default
 zoomstate=0;%default
@@ -37 +37 @@
     zoomstate=get(hhuvmat.zoom,'Value');
 end
-% if isequal(MouseAction,'calib') && ~zoomstate
-%     return
-% end
-currentfig=gcbo;
-AxeData=get(gca,'UserData');
+currentfig=hObject;
 currentaxes=gca; %store the current axes handle
+AxeData=get(currentaxes,'UserData');
+
 test_drawing=0;%default
 
@@ -52 +50 @@
     IndexObj=PlotData.IndexObj;
     ObjectData=UvData.Object{IndexObj};    
+    ObjectData.enable_plot=1;
     if isequal(AxeData.Drawing,'translate')
         XYData=AxeData.CurrentOrigin;
@@ -264 +263 @@
 % editing calibration point
 if strcmp(MouseAction,'calib') 
-    xy=get(currentaxes,'CurrentPoint');%xy(1,1),xy(1,2): current x,y positions in axes coordinates
-    hh=findobj('Tag','calib_points')%look for handle of calibration points           
+    hh=findobj(currentaxes,'Tag','calib_points')%look for handle of calibration points           
     if ~isempty(hh)
         set(hh,'UserData',[])%remove edit mode
-    end   
-    strline=[ '    |    '  '    |    '  '    |    ' num2str(xy(1,1),4) '    |    ' num2str(xy(1,2),4)];
-    h_geometry_calib=findobj(allchild(0),'Name','geometry_calib'); %find the geomterty_calib GUI
-    hh_geometry_calib=guidata(h_geometry_calib);
-    h_ListCoord=hh_geometry_calib.ListCoord; %findobj(h_geometry_calib,'Tag','ListCoord');
-    Coord=get(h_ListCoord,'String');
-    val=get(h_ListCoord,'Value');
-%     if length(Coord)>=val
-%         Coord(val+1:length(Coord)+1)=Coord(val:length(Coord));% push the list forward beyond the current point
-%     end
-    Coord{val}=strline;
-    set(h_ListCoord,'String',Coord)
-    %set(h_ListCoord,'Value',val+1)
-    %geometry_calib('ListCoord_Callback',hObject,eventdata,hh_geometry_calib)
-    %data=read_geometry_calib(Coord);%transform char cell to numbers
-    %XCoord=data.Coord(:,4);
-    %YCoord=data.Coord(:,5)
+        h_geometry_calib=findobj(allchild(0),'Name','geometry_calib'); %find the geomterty_calib GUI
+        hh_geometry_calib=guidata(h_geometry_calib);
+        h_ListCoord=hh_geometry_calib.ListCoord; %handles of the coordinate list
+        Coord=get(h_ListCoord,'String');
+        val=get(h_ListCoord,'Value');
+        coord_str=Coord{val}; %current line (string)
+        k=findstr('|',coord_str);%find separator indices on the string
+        xy=get(currentaxes,'CurrentPoint');%xy(1,1),xy(1,2): current x,y positions in axes coordinates 
+        if numel(k)>=3
+            coord_str=[coord_str(1:k(3)-1) '|    ' num2str(xy(1,1),4) '    |    ' num2str(xy(1,2),4)]; %update the pixel information while preserving phys coord
+        else
+            coord_str=[ '    |    '  '    |    '  '    |    ' num2str(xy(1,1),4) '    |    ' num2str(xy(1,2),4)];
+        end
+        Coord{val}=coord_str;        
+        set(h_ListCoord,'String',Coord)
+    end
 end
 
@@ -301 +298 @@
     hruler=findobj(currentaxes,'Tag','ruler');
     delete(hruler)
+    AxeData.Drawing='off';%stop current drawing a
 end
 

trunk/src/plot_field.m

@@ -100 +100 @@
 
 function [PlotType,PlotParamOut,haxes]= plot_field(Data,haxes,PlotParam,KeepLim,PosColorbar)
+
 %default output
 if ~exist('PlotParam','var'),PlotParam=[];end;
@@ -151 +152 @@
     haxes=axes;
     set(haxes,'position',[0.13,0.2,0.775,0.73])
+else
+    hstack=findobj(allchild(0),'Type','figure');%current stack order of figures in matlab
 end
 if isfield(PlotParam,'text_display_1')& ishandle(PlotParam.text_display_1)
@@ -226 +229 @@
 
 set(haxes,'UserData',AxeData)
+if ~testnewfig
+set(0,'Children',hstack);%put back the initial figure stack after plot creation
 %set(haxes,'Tag','uvmat'); 
-
- 
-% %-------------------------------------------
-% function [AxeData,haxes]=plot_hist(Data,haxes,PlotParam)% TODO: chech whether this function is still used, replace by plot_profile ?
-% %------------------------------------------
-% AxeData=get(haxes,'UserData'); %defau
-% hfig=get(haxes,'parent');
-% if ~isfield(Data,'ListVarName')
-%     return
-% end
-% ColorOrder=[1 0 0;0 0.5 0;0 0 1;0 0.75 0.75;0.75 0 0.75;0.75 0.75 0;0.25 0.25 0.25];
-% set(haxes,'ColorOrder',ColorOrder)
-% if isfield(PlotParam,'NextPlot')
-%     set(haxes,'NextPlot',PlotParam.NextPlot)
-% end
-% charplot='''-''';
-% iplot=0;
-% legend_str={};
-% label_str='';
-% textmean={};
-% plotstr='plot(';
-% for ilist=1:length(Data.ListVarName)
-%     VarName=Data.ListVarName{ilist}; 
-%     eval(['[' VarName 'hist,' VarName 'val]=hist(double(Data.' VarName '),100);']);%coordinate variable set as c
-%     plotstr=[plotstr VarName 'val,' VarName 'hist,' charplot ','];
-%     eval(['nbcomponent2=size(Data.' VarName ',2);']);
-%     eval(['nbcomponent1=size(Data.' VarName ',1);']);
-%     eval(['varmean=mean(double(Data.' VarName '));']);%mean value
-%     textmean=[textmean; {[VarName 'mean= ' num2str(varmean,4)]}];
-%     if nbcomponent1==1| nbcomponent2==1
-%         legend_str=[legend_str {VarName}]; %variable with one component
-%     else
-%         for ic=1:min(nbcomponent1,nbcomponent2)
-%             legend_str=[legend_str [VarName '_' num2str(ic)]]; %variable with severals  components 
-%                                                                % labeled by their index (e.g. color component)
-%         end
-%     end
-%     label_str=[label_str ' ' VarName]; 
-% end
-% if ~isequal(plotstr,'plot(')
-%     plotstr(end)=')';
-%     eval(plotstr)
-%     hlegend=findobj(hfig,'Tag','legend');%find existing legend on the plot
-%     if ~isempty(hlegend)
-%         legend_old=get(hlegend,'String');
-%         if isequal(size(legend_old,1),size(legend_str,1))
-%              legend_str=[legend_old legend_str];
-%         end
-%     end
-%     legend(legend_str)
-%     xlabel(label_str)
-%     ylabel('nb values')
-%      grid on
-%     title_str='';
-%     if isfield(Data,'filename')
-%        [Path, title_str, ext]=fileparts(Data.filename);
-%        title_str=[title_str ext];
-%     end
-%     if isfield(Data,'Action')
-%         if ~isequal(title_str,'')
-%             title_str=[title_str ', '];
-%         end
-%         title_str=[title_str Data.Action];
-%     end
-%     htitle=title(title_str);
-%     set(htitle,'Interpreter','none')% desable tex interpreter
-%     hlist=findobj(gcf,'Style','listbox');
-%     if isempty(hlist)
-%             uicontrol('Style','popupmenu','Position',[20 20 200 20],'String',textmean);
-%     else
-%             set(hlist(1),'String',textmean)
-%     end
-% end
-% AxeData=Data;
+end
 
 
@@ -309 +241 @@
 hfig=get(haxes,'parent');
 AxeData=data;
+
 ColorOrder=[1 0 0;0 0.5 0;0 0 1;0 0.75 0.75;0.75 0 0.75;0.75 0.75 0;0.25 0.25 0.25];
 set(haxes,'ColorOrder',ColorOrder)
@@ -325 +258 @@
 
 %initiates string of the plot command
-plotstr='plot(';
+plotstr='hhh=plot(';
 textmean={};
 abscissa_name='';
 coord_x_index=[];
+test_newplot=1;
 for icell=1:length(CellVarIndex)
     testfalse=0;
@@ -354 +288 @@
     charplot_0='''-''';%default
     if isfield(data,'ObjectProjMode')& isequal(data.ObjectProjMode,'projection')
-        charplot_0='''+''';
+        charplot_0='+';
     end
     xtitle='';  
@@ -372 +306 @@
             testplot(VarType{icell}.warnflag)=0;
     end
-    if ~isempty(VarType{icell}.discrete')
-         charplot_0='''+''';
-    else
-          charplot_0='''-''';
-    end
+ 
     if isfield(data,'VarAttribute')
         VarAttribute=data.VarAttribute;
@@ -387 +317 @@
         end
     end
-    for ivar=1:length(VarIndex)
-        if testplot(VarIndex(ivar))
-            VarName=data.ListVarName{VarIndex(ivar)};
-            eval(['data.' VarName '=squeeze(data.' VarName ');'])
-            if isequal(VarName,'A')
-                charplot='''-''';
-            else
-                charplot=charplot_0;
-            end
-            plotstr=[plotstr 'coord_x{' num2str(icell) '},data.' VarName ',' charplot ','];
-            eval(['nbcomponent2=size(data.' VarName ',2);']);
-            eval(['nbcomponent1=size(data.' VarName ',1);']);
-            if numel(coord_x{icell})==2
-                coord_x{icell}=linspace(coord_x{icell}(1),coord_x{icell}(2),nbcomponent1);
-            end
-            eval(['varmean=mean(double(data.' VarName '));']);%mean value
-            textmean=[textmean; {[VarName 'mean= ' num2str(varmean,4)]}];
-            if nbcomponent1==1| nbcomponent2==1
-                legend_str=[legend_str {VarName}]; %variable with one component
-            else  %variable with severals  components
-                for ic=1:min(nbcomponent1,nbcomponent2)
-                    legend_str=[legend_str [VarName '_' num2str(ic)]]; %variable with severals  components 
-                end                                                   % labeled by their index (e.g. color component)
-            end
-        end
-    end
-end
-if ~isequal(plotstr,'plot(')
-    plotstr(end)=')';
-                %execute plot (instruction  plotstr)   
+    hh=findobj(haxes,'tag','plot_line');
+    if isequal(numel(hh),numel(find(testplot(VarIndex))))%update existing curves
+        icurve=0;
+        test_newplot=0;
+        if ~isempty(VarType{icell}.discrete')
+            charplot_0='+';
+            LineStyle='none';
+        else
+            charplot_0='none';
+            LineStyle='-';
+        end
+        for ivar=1:length(VarIndex)
+            if testplot(VarIndex(ivar))
+                icurve=icurve+1;
+                VarName=data.ListVarName{VarIndex(ivar)};
+                eval(['data.' VarName '=squeeze(data.' VarName ');'])
+                set(hh(icurve),'LineStyle',LineStyle)
+                set(hh(icurve),'Marker',charplot_0)
+%                 if isequal(VarName,'A')
+%                     set(hh(icurve),'LineStyle','-');
+%                 else
+%                     set(hh(icurve),'LineStyle',charplot_0);
+%                 end
+                set(hh(icurve),'XData',coord_x{icell})
+                eval(['yy=data.' VarName ';'])
+                set(hh(icurve),'YData',yy);
+%                 eval(['nbcomponent2=size(data.' VarName ',2);']);
+%                 eval(['nbcomponent1=size(data.' VarName ',1);']);
+%                 if numel(coord_x{icell})==2
+%                     coord_x{icell}=linspace(coord_x{icell}(1),coord_x{icell}(2),nbcomponent1);
+%                 end
+%                 eval(['varmean=mean(double(data.' VarName '));']);%mean value
+%                 textmean=[textmean; {[VarName 'mean= ' num2str(varmean,4)]}];
+%                 if nbcomponent1==1| nbcomponent2==1
+%                     legend_str=[legend_str {VarName}]; %variable with one component
+%                 else  %variable with severals  components
+%                     for ic=1:min(nbcomponent1,nbcomponent2)
+%                         legend_str=[legend_str [VarName '_' num2str(ic)]]; %variable with severals  components 
+%                     end                                                   % labeled by their index (e.g. color component)
+%                 end
+            end
+        end
+    else% new plot
+        if ~isempty(VarType{icell}.discrete')
+            charplot_0='''+''';
+        else
+            charplot_0='''-''';
+        end
+        for ivar=1:length(VarIndex)
+            if testplot(VarIndex(ivar))
+                VarName=data.ListVarName{VarIndex(ivar)};
+                eval(['data.' VarName '=squeeze(data.' VarName ');'])
+%                 if isequal(VarName,'A')
+%                     charplot='''-''';
+%                 else
+%                     charplot=charplot_0;
+%                 end
+                plotstr=[plotstr 'coord_x{' num2str(icell) '},data.' VarName ',' charplot_0 ','];
+                eval(['nbcomponent2=size(data.' VarName ',2);']);
+                eval(['nbcomponent1=size(data.' VarName ',1);']);
+                if numel(coord_x{icell})==2
+                    coord_x{icell}=linspace(coord_x{icell}(1),coord_x{icell}(2),nbcomponent1);
+                end
+                eval(['varmean=mean(double(data.' VarName '));']);%mean value
+                textmean=[textmean; {[VarName 'mean= ' num2str(varmean,4)]}];
+                if nbcomponent1==1| nbcomponent2==1
+                    legend_str=[legend_str {VarName}]; %variable with one component
+                else  %variable with severals  components
+                    for ic=1:min(nbcomponent1,nbcomponent2)
+                        legend_str=[legend_str [VarName '_' num2str(ic)]]; %variable with severals  components 
+                    end                                                   % labeled by their index (e.g. color component)
+                end
+            end
+        end
+    end
+end
+if test_newplot && ~isequal(plotstr,'plot(')
+    plotstr=[plotstr '''tag'',''plot_line'')']
+                %execute plot (instruction  plotstr)  
     eval(plotstr)
+   
                 %%%%%
-    grid on
+    grid(haxes, 'on')
     hxlabel=xlabel(xtitle);
     set(hxlabel,'Interpreter','none')% desable tex interpreter
@@ -478 +458 @@
 %----------------------------------------
 function [AxeData,haxes,PlotParamOut,PlotType]=plot_plane(Data,CellVarIndex,VarTypeCell,haxes,PlotParam,KeepLim,PosColorbar)
-
+grid(haxes, 'off')
 %default plotting parameters
 PlotType='plane';%default

trunk/src/proj_field.m

@@ -769 +769 @@
             ProjData.VarDimName=[ProjData.VarDimName {XName}];
             ProjData.VarAttribute{iselect}=FieldData.VarAttribute{VarIndex(iselect)};
+            if strcmp(ProjMode,'projection')
+                ProjData.VarAttribute{iselect}.Role='discrete';
+            else
+                 ProjData.VarAttribute{iselect}.Role='continuous';
+            end
         end
     
@@ -876 +881 @@
                 ProjData.ListVarName=[ProjData.ListVarName VarName{ivar} ];
                 ProjData.VarDimName=[ProjData.VarDimName {AXName}];%to generalize with the initial name of the x coordinate
+                ProjData.VarAttribute{ivar}.Role='continuous';% for plot with continuous line
             end
             if testU

trunk/src/read_geometry_calib.m

@@ -2 +2 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 function data=read_geometry_calib(Coord_cell)
-data_XIma=[];
-data_YIma=[];
-data_XObject=[];
-data_YObject=[];
-data_ZObject=[];
-%Coord=get(handles.ListCoord,'String');
-% XImage=get(handles.XImage,'String');
-% YImage=get(handles.YImage,'String');
-% XObject=get(handles.XObject,'String');
-% YObject=get(handles.YObject,'String');
-% ZObject=get(handles.ZObject,'String');
-% if ischar(Xcolumn)
-%     Xcolumn={Xcolumn};
-% end
 nb_defining_points=length(Coord_cell);
 iline=0;
@@ -28 +14 @@
         data4=str2num(coord_str(k(3)+5:k(4)-5));
         data5=str2num(coord_str(k(4)+5:end));
-        if ~isempty(data1)|~isempty(data2)|~isempty(data3)|~isempty(data4)|~isempty(data5)
+        if ~isempty(data1)||~isempty(data2)||~isempty(data3)||~isempty(data4)||~isempty(data5)
             iline=iline+1;
             if ~isempty(data1)

trunk/src/series/ima_levels.m

@@ -69 +69 @@
 Mfiltre=Mfiltre/(sum(sum(Mfiltre)));
 
-C=filter2(ones(windowsize)/windowsize^2,B);
+C=filter2(Mfiltre,B);
 C(:,1:windowsize)=C(:,windowsize)*ones(1,windowsize);
 C(:,end-windowsize+1:end)=C(:,end-windowsize+1)*ones(1,windowsize);

trunk/src/series/relabel_i_j.m

@@ -101 +101 @@
 Mfiltre=Mfiltre/(sum(sum(Mfiltre)));
 
-C=filter2(ones(windowsize)/windowsize^2,B);
+C=filter2(Mfiltre,B);
 C(:,1:windowsize)=C(:,windowsize)*ones(1,windowsize);
 C(:,end-windowsize+1:end)=C(:,end-windowsize+1)*ones(1,windowsize);

trunk/src/set_object.m

@@ -89 +89 @@
      PlotHandles=[];
 end
-enable_plot=0;%default
-SetData.PlotHandles=PlotHandles;
-% if exist('data','var') && isfield(data,'ParentButton')
-%         SetData.ParentButton=data.ParentButton;
-%         set(hObject,'DeleteFcn',{@closefcn,SetData.ParentButton})%
-% end
-set(hObject,'UserData',SetData)
+enable_plot=0;%default: does not allow plot of object and projection
+% SetData.PlotHandles=PlotHandles;
+% set(hObject,'UserData',SetData)
 
 % fill the interface as set in the input data:
 if exist('data','var') 
-    if isfield(data,'desable_plot')
-        enable_plot=~data.desable_plot;%test to desable button PLOT (display mode)
+    if isfield(data,'enable_plot')
+        enable_plot=data.enable_plot;%test to desable button PLOT (display mode)
+    end
+    if isfield(data,'Name')
+        set(handles.TITLE,'String',data.Name)
     end
     if ~isfield(data,'NbDim')||~isequal(data.NbDim,3)%2D case
@@ -732 +731 @@
 function PLOT_Callback(hObject, eventdata, handles)
 
-SetData=get(handles.set_object,'UserData');%get the hidden interface data
-huvmat=findobj('Name','uvmat');%find the current uvmat interface handle
-hlist_object=findobj(huvmat,'Tag','list_object_1');%handles of the object list in the GUI uvmat 
-IndexObj=get(hlist_object,'Value');%position in the objet list
+%SetData=get(handles.set_object,'UserData');%get the hidden interface data
+huvmat=findobj('tag','uvmat');%find the current uvmat interface handle
 UvData=get(huvmat,'UserData');%Data associated to the GUI uvmat 
+hhuvmat=guidata(huvmat);%handles in the uvmat GUI
+ObjectName=get(handles.set_object,'name');%name ome)f the current object (set_object na
+ListObject=get(hhuvmat.list_object_1,'String');%position in the objet list
+IndexObj_1=get(hhuvmat.list_object_1,'Value');
+IndexObj_2=get(hhuvmat.list_object_2,'Value');
+
+% set(plotfig,'Name',['Projection on' num2str(IndexObj) '-' ObjectData.Style]);
 ObjectData=read_set_object(handles);%read the input parameters defining the object in the GUI set_object
-ObjectData.HandlesDisplay=[]; % new object plot by default
-if length(UvData.Object) >= IndexObj && isfield(UvData.Object{IndexObj},'HandlesDisplay')
-    hdisplay=UvData.Object{IndexObj}.HandlesDisplay;
-    if isequal(UvData.Object{IndexObj}.Style, ObjectData.Style) && isequal(UvData.Object{IndexObj}.ProjMode, ObjectData.ProjMode)
-        ObjectData.HandlesDisplay=UvData.Object{IndexObj}.HandlesDisplay;
-    else  % for a new object styl, delete the existing object plots 
-        for ih=1:length(hdisplay)
-            PlotData=get(hdisplay(ih),'UserData');
-            if isfield(PlotData,'SubObject') & ishandle(PlotData.SubObject)
-                    delete(PlotData.SubObject);
-            end
-            if isfield(PlotData,'DeformPoint') & ishandle(PlotData.DeformPoint)
-                   delete(PlotData.DeformPoint);
-            end
-            if ~isequal(hdisplay(ih),0)
-                delete(hdisplay(ih));
-            end
-        end
-        if isfield(ObjectData,'plotaxes') && ishandle(ObjectData.plotaxes)
-            delete(ObjectData.plotaxes)%delete the axes for plotting the current projection result
-        end
-    end      
-end
+PlotHandles=[];%default
+testnew=0;
+if strcmp(ListObject{IndexObj_1},ObjectName)% we are editing the object whose projection is viewed in the uvmat frame
+   ObjectData.HandlesDisplay=handles.axes3;
+    PlotHandles=get_plot_handles(handles);
+    IndexObj=IndexObj_1;
+elseif strcmp(ListObject{IndexObj_2},ObjectName)% we are editing the object whose projection is viewed in view_field
+    hview_field=findobj('tag','view_field');
+    if ~isempty(hview_field)
+        PlotHandles=guidata(hview_field);
+%         PlotHandles=get_plot_handles( hhview_field);
+        ObjectData.HandlesDisplay=PlotHandles.axes3;%handle of axes3 in view_field
+    end
+    IndexObj=IndexObj_2;
+else %new object 
+    testnew=1;
+   
+    IndexObj=numel(ListObject)+1;
+    %ObjectName=[num2str(IndexObj) '-' ObjectData.Style];
+%     ListObject=[ListObject;ObjectName];
+%     set(hhuvmat.list_object_2,'String',[ListObject;ObjectName;{'...'}])
+%     set(hhuvmat.list_object_2,'Value',IndexObj)
+end
+ObjectName=get(handles.TITLE,'String');
+if length(ObjectName)<1
+    ObjectName=[num2str(IndexObj) '-' ObjectData.Style];
+else
+    for ilist=1:numel(ListObject)
+        if strcmp(ListObject{ilist},ObjectName)
+            ObjectName=[num2str(IndexObj) '-' ObjectName];
+            break
+        end 
+    end
+end
+ListObject{IndexObj,1}=ObjectName;
+set(hhuvmat.list_object_1,'String',ListObject)
+set(hhuvmat.list_object_2,'String',[ListObject;{'...'}])
+set(handles.set_object,'name',ObjectName);%update the name of set_object so that it equals its corresponding object in the list
+if testnew
+    set(hhuvmat.list_object_2,'Value',IndexObj)
+end
+% ObjectData.HandlesDisplay=[]; % new object plot by default
+% if length(UvData.Object) >= IndexObj && isfield(UvData.Object{IndexObj},'HandlesDisplay')
+%     hdisplay=UvData.Object{IndexObj}.HandlesDisplay;
+%     if isequal(UvData.Object{IndexObj}.Style, ObjectData.Style) && isequal(UvData.Object{IndexObj}.ProjMode, ObjectData.ProjMode)
+%         ObjectData.HandlesDisplay=UvData.Object{IndexObj}.HandlesDisplay;
+%     else  % for a new object styl, delete the existing object plots 
+%         for ih=1:length(hdisplay)
+%             PlotData=get(hdisplay(ih),'UserData');
+%             if isfield(PlotData,'SubObject') & ishandle(PlotData.SubObject)
+%                     delete(PlotData.SubObject);
+%             end
+%             if isfield(PlotData,'DeformPoint') & ishandle(PlotData.DeformPoint)
+%                    delete(PlotData.DeformPoint);
+%             end
+%             if ~isequal(hdisplay(ih),0)
+%                 delete(hdisplay(ih));
+%             end
+%         end
+%         if isfield(ObjectData,'plotaxes') && ishandle(ObjectData.plotaxes)
+%             delete(ObjectData.plotaxes)%delete the axes for plotting the current projection result
+%         end
+%     end      
+% end
 
 % update the object plot and projection field
-UvData.Object{IndexObj}=update_obj(UvData,IndexObj,ObjectData,SetData.PlotHandles);
-
+UvData.Object{IndexObj}=update_obj(UvData,IndexObj,ObjectData,PlotHandles);
 
 set(huvmat,'UserData',UvData)%update the data in the uvmat interface
-list_str=get(hlist_object,'String');
-% TITLE=set_title(ObjectData.Style,ObjectData.ProjMode);
-% list_str{IndexObj}=[num2str(IndexObj) '-' TITLE];
-list_str{IndexObj}=[num2str(IndexObj) '-' ObjectData.Style];
-% if isequal(length(list_str),IndexObj)
-%     list_str{IndexObj+1}='more...';
-% end
-set(hlist_object_1,'String',list_str)
-set(hlist_object_1,'Value',IndexObj)
-
-%update create buttons on the GUI uvmat: set to object edit mode after object plotting
+% list_str=get(hlist_object,'String');
+% list_str{IndexObj}=[num2str(IndexObj) '-' ObjectData.Style];
+% set(hlist_object_1,'String',list_str)
+% set(hlist_object_1,'Value',IndexObj)
+
+%set uvmat to object edit mode to allow further object update
 hhuvmat=guidata(huvmat);%handles of elements in the uvmat GUI
-%desactivate all create buttons in mode edit
-% if isequal(get(hhuvmat.edit,'Value'),0)
-%     set(hhuvmat.create,'Value',0)
-%     set(hhuvmat.create,'BackgroundColor',[0 1 0])%put unactivated buttons to green
-%     set(hhuvmat.LINE,'Value',0)
-%     set(hhuvmat.LINE,'BackgroundColor',[0 1 0])%put unactivated buttons to green
-%     set(hhuvmat.PATCH,'Value',0)
-%     set(hhuvmat.PATCH,'BackgroundColor',[0 1 0])%put unactivated buttons to green
-%     set(hhuvmat.PLANE,'Value',0)
-%     set(hhuvmat.PLANE,'BackgroundColor',[0 1 0])%put unactivated buttons to green
-%     set(hhuvmat.VOLUME,'Value',0)
-%     set(hhuvmat.VOLUME,'BackgroundColor',[0 1 0])%put unactivated buttons to green
-% end
 set(hhuvmat.MenuEditObject,'enable','on')
 set(hhuvmat.edit,'Value',1)
@@ -848 +874 @@
 title={'object name'};
 dir_save=uigetdir(RootPath);
-def={fullfile(dir_save,['Object' Object.CoordType '.xml'])};
+ObjectName=get(handles.TITLE,'String');
+if ~isempty(ObjectName)&&~strcmp(ObjectName,'')
+    def={fullfile(dir_save,[ObjectName Object.CoordType '.xml'])};
+else
+    def={fullfile(dir_save,[Object.Style Object.CoordType '.xml'])};
+end
 options.Resize='on';
 displ_txt='save object as an .xml file';%default display

trunk/src/transform_field/im_levels.m

@@ -18 +18 @@
 Mfiltre=Mfiltre/(sum(sum(Mfiltre)));
 
-C=filter2(ones(windowsize)/windowsize^2,B);
+C=filter2(Mfiltre,B);
 C(:,1:windowsize)=C(:,windowsize)*ones(1,windowsize);
 C(:,end-windowsize+1:end)=C(:,end-windowsize+1)*ones(1,windowsize);

trunk/src/update_obj.m

@@ -9 +9 @@
 %
 %INPUT:
-%UvIn: structure stored as 'Userdata' on the uvmat interface
+%UvData: structure stored as 'Userdata' on the uvmat interface, it contains
+%    .Object{1},{2}... description of all the projection objects 
+%    .Object{iview}.plotaxes: axes for the plot of the field projected on this object
+%    .Object{iview}.HandlesDisplay(ih): array of handles for plots representing the object #iview in the field #ih
 %IndexObjIn: object index for an existing objects stored in UvData
 %ObjectData: structure containing the input object properties
-%PlotHandles: structure containing the handles of the plotting parameter buttons on the uvmat interface (obtained by get_plot_handles.m)
+%       .Style: style of the object: 'line', 'rectangle'...
+%PlotHandles: structure containing the handles of the plotting parameter buttons on the uvmat or view_field interface 
 %-------------------------------------
 
@@ -35 +39 @@
                  HandlesDisplay=Object_set{IndexObj}.HandlesDisplay;%list of handles of object representations
              end
-             hplot_list=findobj(haxes,'Tag','proj_object');
+             hplot_list=findobj(haxes,'Tag','proj_object');%list of projection objects on the axes
              for ih=1:length(HandlesDisplay)
                  plot_detect=find(hplot_list==HandlesDisplay(ih));
@@ -46 +50 @@
              if ~testupdate% draw new object plot
                 hh=plot_object(ObjectData,Object_set{iview},haxes,'m');%draw the object with the new object data
-                Object_out.HandlesDisplay=[Object_out.HandlesDisplay hh];
+                if isfield(Object_out,'HandlesDisplay')
+                    Object_out.HandlesDisplay=[Object_out.HandlesDisplay hh];
+                else
+                    Object_out.HandlesDisplay=hh;
+                end
                 PlotData=get(hh,'UserData');
                 PlotData.IndexObj=IndexObj;
@@ -55 +63 @@
 end
 % plot the field projected on the object
-if ~isempty(PlotHandles) %&& ~testmask
+% if ~isempty(PlotHandles) %&& ~testmask
     ProjData= proj_field(UvData.Field,ObjectData,IndexObj);%project the current interface field on ObjectData
     if ~isempty(ProjData)   
         plotaxes=[];%default
+%         get(Object_set{IndexObj}.plotaxes)
         if length(Object_set)>= IndexObj && isfield(Object_set{IndexObj},'plotaxes')
             plotaxes=Object_set{IndexObj}.plotaxes;
@@ -73 +82 @@
         end
     end
-end
+% end
 
 

trunk/src/uvmat.m

@@ -195 +195 @@
 function uvmat_OpeningFcn(hObject, eventdata, handles, input )
 %-------------------------------------------------------------------
-%WARNING: avoid the second input parameter, leads to erros
-global dircur dir_opening nb_builtin
+global nb_builtin
+
 % Choose default command menuline output for uvmat
 handles.output = hObject;
@@ -202 +202 @@
 % Update handles structure
 guidata(hObject, handles);
-
-dircur=pwd; %current working directory
-dir_opening=dircur;
 
 % set the position of colorbar and ancillary GUIs:
@@ -247 +244 @@
 if ~isfield(UvData.Object{1},'plotaxes')
     UvData.Object{1}.plotaxes=handles.axes3;%default plotting axis
+    set(handles.list_object_1,'Value',1);
     set(handles.list_object_1,'String',{'1-PLANE'});
-    set(handles.list_object_1,'Value',1);
 end
 
@@ -382 +379 @@
         set(handles.list_object_1,'Visible','on')
         set(handles.frame_object,'Visible','on')
+        if ~isempty(errormsg)
+            msgbox_uvmat('ERROR',errormsg)
+        end
     else
         update_rootinfo(hObject,eventdata,handles);
@@ -566 +566 @@
         set(handles.FileExt,'String',ext);
         % fill file index counters
-        set(handles.i1,'String',i1);
-      
+        set(handles.i1,'String',i1);    
         set(handles.i2,'String',i2);
         set(handles.j1,'String',str_a);
@@ -574 +573 @@
         % synchronise indices of the second  input file if it exists
         if get(handles.SubField,'Value')==1% if the subfield button is activated, update the field numbers
-            [FileName_1,RootPath_1,FileBase_1,FileIndices_1,FileExt_1,SubDir_1]=read_file_boxes_1(handles);
+            [ff,rr,FileBase_1,ii,FileExt_1,SubDir_1]=read_file_boxes_1(handles);
             NomType_1=get(handles.FileIndex_1,'UserData');     
-            [FileName_1,idetect]=name_generator(FileBase_1,stra2num(i1),stra2num(i2),FileExt_1,NomType_1,1,stra2num(str_a),stra2num(str_b),SubDir_1);
-            if idetect
+            FileName_1=name_generator(FileBase_1,stra2num(i1),stra2num(i2),FileExt_1,NomType_1,1,stra2num(str_a),stra2num(str_b),SubDir_1);
+            if exist(FileName_1,'file')
                 FileIndex_1=name_generator('',stra2num(i1),stra2num(i2),'',NomType_1,1,stra2num(str_a),stra2num(str_b),'');
                 set(handles.FileIndex_1,'String',FileIndex_1)
@@ -636 +635 @@
 %-------------------------------------------------------------------
 function update_rootinfo(hObject,eventdata,handles)
-global dircur  dir_opening
 
 set(handles.RootPath,'BackgroundColor',[1 1 0])
@@ -1152 +1150 @@
 end
 TimeUnit_1=[];
-testima=0; %test for image input
+% testima=0; %test for image input
 if isequal(lower(FileExt),'.avi') %.avi file
-    testima=1;
+%     testima=1;
     info=aviinfo([FileBase FileIndices FileExt]);
     nbfield_1=info.NumFrames;
@@ -1368 +1366 @@
 function nb_slice_Callback(hObject, eventdata, handles)
 %-------------------------------------------------------------------
-nb_slice_str=get(handles.nb_slice,'String')
+nb_slice_str=get(handles.nb_slice,'String');
 if isequal(nb_slice_str,'volume')
     num=stra2num(get(handles.j1,'String'));
@@ -1664 +1662 @@
      num1=num1+increment;
      num2=num2+increment;
-     [filename,num1,num_a,num2,num_b]=name_generator(filebase,num1,num_a,FileExt,NomType,comp_input,num2,num_b,subdir)
+     [filename,num1,num_a,num2,num_b]=name_generator(filebase,num1,num_a,FileExt,NomType,comp_input,num2,num_b,subdir);
      if sub_value% set the second field name and indices
         num1_1=num1_1+increment;
@@ -1982 +1980 @@
 sub_value=get(handles.SubField,'Value');
 FileType_1='none';%default
-%if sub_value==
-filename_1
 if ~isempty(filename_1)
     % test for a constant second field (comparison with a fixed field)
     NomType_1=get(handles.FileIndex_1,'UserData');
-    Ext_1=get(handles.FileExt_1,'String')
+    Ext_1=get(handles.FileExt_1,'String');
     % determine the input file type
     if isequal(Ext_1,'.nc')||isequal(Ext_1,'.cdf')
@@ -2474 +2470 @@
 if ~isfield(UvData.Object{1},'plotaxes')
     UvData.Object{1}.plotaxes=handles.axes3;%default plotting axis
-    set(handles.list_object_1,'String',{'1-PLANE'});
     set(handles.list_object_1,'Value',1);
+    set(handles.list_object_1,'String',{'1-PLANE'});  
 end
 
@@ -2526 +2522 @@
     IndexObj(2)=IndexObj_2;
 end
-for iobj=IndexObj
+for imap=1:numel(IndexObj)
+    iobj=IndexObj(imap);
     if ~isempty(UvData.Object{iobj})%& isfield(Object{iobj},'plotaxes')& ishandle(Object{iobj}.plotaxes)
         %Projeter les champs sur l'objet:*
         ObjectData=proj_field(UvData.Field,UvData.Object{iobj},iobj);
-   
+        if imap==2
+            UvData.ProjField_2=ObjectData;%store the projection field on uvmat: ***** WILL REPLACE THE FIELD SORED ON THE AXES: AxeData *****
+        else
+            UvData.ProjField_1=ObjectData;%store the projection field on view_field
+        end
         %use of mask
         if isfield(ObjectData,'NbDim')&isequal(ObjectData.NbDim,2)
@@ -3774 +3775 @@
 if isequal(coord_option,'more...'); 
     coord_fct='';
-
-%     if exist(profil_perso,'file')
-%           h=load (profil_perso);
-%          if isfield(h,'transform_fct')
-%                 transform_fct=h.transform_fct;
-%          end
-%     end
     prompt = {'Enter the name of the transform function'};
     dlg_title = 'user defined transform';
@@ -3794 +3788 @@
     transform_selected =fullfile(PathName,FileName);
     if ~exist(transform_selected,'file')
-%            msgbox_uvmat('ERROR',['procesing fct ' transform_selected ' not found'])
            return
     end
@@ -3827 +3820 @@
     set(handles.path_transform,'String','')
 end
-%CurrentPath=fileparts(which(coord_option));
-% if ~isequal(PathName,CurrentPath)
-%     addpath(PathName) 
-%     errormsg=check_functions;
-%     msgbox_uvmat('WARNING',[['path ' PathName ' added to the current Matlab pathes'];errormsg])
-% end
-%set(handles.path_transform,'String',fullfile(PathName,' ')); %show the path to the senlected function
+
 set(handles.FixedLimits,'Value',0)
 set(handles.FixedLimits,'BackgroundColor',[0.7 0.7 0.7])
@@ -3857 +3844 @@
 end
 if isfield(UvData,'Object')
-    nbobject=length(UvData.Object);
-    UvData.Object([2:nbobject])=[];
+     UvData.Object=UvData.Object(1);
 end 
+list_object=get(handles.list_object_1,'String');
+set(handles.list_object_1,'Value',1)
+set(handles.list_object_1,'String',list_object(1))
+set(handles.list_object_2,'Value',2)
+set(handles.list_object_2,'String',[list_object(1);{'...'}])
+list_object_2_Callback(hObject, eventdata, handles)
+
+
 
 %delete mask if it is displayed 
@@ -4181 +4175 @@
     hhset_object=guidata(hset_object);
     if test
-        set(hhset_object.PLOT,'Visible','on');
+        set(hhset_object.PLOT,'enable','on');
     else
-       set(hhset_object.PLOT,'Visible','off'); 
+       set(hhset_object.PLOT,'enable','off'); 
     end
 end
@@ -4196 +4190 @@
 val_2=get(handles.list_object_2,'Value');
 str_2=get(handles.list_object_2,'String');
-if isequal(val_2,IndexObj)
-    set(handles.list_object_2,'Value',numel(str_2))
+if isequal(val_2,IndexObj)% if the first selection is equal to the second, it will suppress the second
+    set(handles.list_object_2,'Value',numel(str_2))%select the end of the list ('...')
     list_object_2_Callback(hObject, eventdata, handles)
 end
-hset_object=findobj(allchild(0),'Tag','set_object');
-if ~isempty(hset_object)
-     set(hset_object,'name',str_1);
-end
-update_object(handles,IndexObj,1)
+update_object(handles,IndexObj,1,str_1)
 
 %------------------------------------------------------------------------
@@ -4213 +4203 @@
 IndexObj=get(handles.list_object_2,'Value');
 if isequal(list_str{IndexObj},'...')
-    hview_field=findobj(allchild(0),'Tag','view_field')
+    hview_field=findobj(allchild(0),'Tag','view_field');
     if ~isempty(hview_field)
         delete(hview_field)
     end
-    set(handles.list_object_2,'BackgroundColor',[1 1 1])
-else
-    hset_object=findobj(allchild(0),'Tag','set_object');
-    if ~isempty(hset_object)
-        set(hset_object,'name',list_str{IndexObj});
-    end
-%     set(handles.list_object_2,'BackgroundColor',[1 1 0]) 
-%     set(handles.list_object_1,'BackgroundColor',[1 1 1]) 
-    update_object(handles,IndexObj,2)
+else
+    update_object(handles,IndexObj,2,list_str{IndexObj})
 end
 
 %------------------------------------------------------------------------
-function update_object(handles,IndexObj,option)
+function update_object(handles,IndexObj,option,ObjectName)
 %------------------------------------------------------------------------
 UvData=get(handles.uvmat,'UserData');%read UvData properties stored on the uvmat interface 
@@ -4236 +4219 @@
 end
 ObjectData=UvData.Object{IndexObj};
-if isequal(get(handles.edit,'Value'),0)
-    ObjectData.desable_plot=1; % desable the PLOT option in the set_object GUI (editing mode
+ObjectData.Name=ObjectName;
+if isequal(get(handles.edit,'Value'),1)
+    ObjectData.enable_plot=1; % desable the PLOT option in the set_object GUI (editing mode
 end
 PlotHandles=get_plot_handles(handles);%get the handles of the interface elements setting the plotting parameters
@@ -4245 +4229 @@
         ZBounds(2)=UvData.ZMax;%maximum for the Z slider
     end
-hset_object=findobj(allchild(0),'Name','set_object');
+hset_object=findobj(allchild(0),'tag','set_object');
 if ~isempty(hset_object)
     delete(hset_object)% delete existing version of set_object
 end
 hset_object=set_object(ObjectData,PlotHandles,ZBounds);% call the set_object interface,
+set(hset_object,'name',ObjectName)
 pos_uvmat=get(handles.uvmat,'Position');
 %position the set_object GUI with respect to uvmat
@@ -4327 +4312 @@
 %------------------------------------------------------
 function MenuExportField_Callback(hObject, eventdata, handles)
-
 global CurData
-huvmat=get(handles.RootPath,'parent');
-CurData=get(huvmat,'UserData');
+huvmat=findobj(allchild(0),'Name','uvmat');
+UvData=get(huvmat,'UserData');
+CurData=UvData.ProjField_1;
 evalin('base','global CurData')%make CurData global in the workspace
-display(['UserData of uvmat :'])
+display(['UserData of view_field :'])
 evalin('base','CurData') %display CurData in the workspace
 commandwindow;
@@ -4450 +4435 @@
 % ------------------------------------------------------------------
 function MenuCalib_Callback(hObject, eventdata, handles)
-% set(handles.TOOLS_txt,'Visible','on')
-% set(handles.frame_tools,'Visible','on')
+
 UvData=get(handles.uvmat,'UserData');%read UvData properties stored on the uvmat interface 
-%reinitialize the edit interface associated with uvmat
-%suppress the other options if MENULINE is chosen
+
+%suppress competing options 
 set(handles.zoom,'Value',0)
 set(handles.zoom,'BackgroundColor',[0.7 0.7 0.7])
-set(handles.MenuTools,'enable','off')
+set(handles.MenuMask,'enable','off')
+set(handles.MenuGrid,'enable','off')
 set(handles.MenuObject,'enable','off')
 set(handles.MenuEdit,'enable','off')
-%         set(handles.create,'Value',0)
-%         set(handles.create,'BackgroundColor',[0 1 0])
-%         set(handles.create,'enable','off')      
-% set(handles.edit_vect,'Value',0)
-% set(handles.edit_vect,'enable','off')
-% edit_vect_Callback(hObject, eventdata, handles)
-% set(handles.edit,'Value',0)
-% set(handles.edit,'BackgroundColor',[0.7 0.7 0.7])
-% set(handles.edit,'enable','off')
 set(handles.list_object_1,'Value',1)      
 % initiate display of GUI geometry_calib
@@ -4481 +4457 @@
 [UvData.hset_object,UvData.sethandles]=geometry_calib(handles,pos,FileName);% call the set_object interface     
 pos_uvmat=get(handles.uvmat,'Position');
-%pos_cal(1:2)=UvData.CalOrigin + pos_uvmat(1:2);
+
 if isfield(UvData,'CalOrigin')
     pos_cal(1)=pos_uvmat(1)+UvData.CalOrigin(1)*pos_uvmat(3);
@@ -4646 +4622 @@
     end
 end      
-varargin{1}=filebase;
-varargin{2}=NomType;
-varargin{3}=num1;
-varargin{4}=num2;
-varargin{5}=num_a;
-varargin{6}=num_b;
-varargin{7}=SubDir;
-varargin{8}=ind_opening;% A REVOIR +TRANSMETTRE IMADOC INFO
-varargin{11}=ext;
-civ(varargin);% interface de civ(not in the uvmat file)
+param.RootName=filebase;
+param.NomType=NomType;
+param.num1=num1;
+param.num2=num2;
+param.num_a=num_a;
+param.num_b=num_b;
+param.SubDir=SubDir;
+param.IndOpening=ind_opening;% A REVOIR +TRANSMETTRE IMADOC INFO
+param.ImaExt=ext;
+civ(param);% interface de civ(not in the uvmat file)
 
 % ------------------------------------------------------------------
@@ -4763 +4739 @@
 t=xmltree(fileinput);
 data=convert(t);
-PlotHandles=get_plot_handles(handles);%get the handles of the interface elements setting the plotting parameters
+data.enable_plot=1;
+[pp,data.Name]=fileparts(FileName);
+%PlotHandles=get_plot_handles(handles);%get the handles of the interface elements setting the plotting parameters
 hset_object=findobj(allchild(0),'Name','set_object');
 if ~isempty(hset_object)
     delete(hset_object)% delete existing version of set_object
 end
-[hset_object,UvData.sethandles]=set_object(data,PlotHandles);% call the set_object interface
+UvData=get(handles.uvmat,'UserData');
+[hset_object,UvData.sethandles]=set_object(data);% call the set_object interface
 %position the set_object GUI with respect to uvmat
 pos_uvmat=get(handles.uvmat,'Position');
@@ -4782 +4761 @@
 
 %------------------------------------------------------------------------
+% --- generic function used for the creation of a projection object
 function create_object(data,handles)
 %------------------------------------------------------------------------
@@ -4791 +4771 @@
 set(handles.edit,'Value',0); %suppress the object edit mode
 set(handles.edit,'BackgroundColor',[0.7,0.7,0.7])  
+data.enable_plot=1;
 if isfield(UvData,'CoordType')
     data.CoordType=UvData.CoordType;
@@ -4835 +4816 @@
 zoom_Callback(handles.uvmat, [], handles)
 
-
-
-% --------------------------------------------------------------------
+%------------------------------------------------------------------------
 function MenuRuler_Callback(hObject, eventdata, handles)
+%------------------------------------------------------------------------
 set(handles.zoom,'Value',0)
 zoom_Callback(handles.uvmat, [], handles)
@@ -4846 +4826 @@
 
 %------------------------------------------------------------------------
-% executed when closing: set the parent interface button to value 0
+% --- executed when closing: set the parent interface button to value 0
 function closefcn(gcbo,eventdata)
 %------------------------------------------------------------------------
@@ -4863 +4843 @@
     set(hhh,'enable','off')
 end
+
+
+% --- Executes on button press in delete_object.
+function delete_object_Callback(hObject, eventdata, handles)
+IndexObj=get(handles.list_object_2,'Value');
+    if IndexObj>1 
+        delete_object(IndexObj)
+    end
+    
+

trunk/src/view_field.m

@@ -2344 +2344 @@
 global CurData
 huvmat=findobj(allchild(0),'Name','uvmat');
-CurData=get(huvmat,'UserData');
+UvData=get(huvmat,'UserData');
+CurData=UvData.ProjField_2;
 evalin('base','global CurData')%make CurData global in the workspace
 display(['UserData of view_field :'])
@@ -2471 +2472 @@
 
 
-% --- Executes during object creation, after setting all properties.
-function colcode1_CreateFcn(hObject, eventdata, handles)
-% hObject    handle to colcode1 (see GCBO)
+
+% --- Executes on button press in checkbox42.
+function checkbox42_Callback(hObject, eventdata, handles)
+% hObject    handle to checkbox42 (see GCBO)
 % eventdata  reserved - to be defined in a future version of MATLAB
-% handles    empty - handles not created until after all CreateFcns called
-
-% Hint: edit controls usually have a white background on Windows.
-%       See ISPC and COMPUTER.
-if ispc && isequal(get(hObject,'BackgroundColor'), get(0,'defaultUicontrolBackgroundColor'))
-    set(hObject,'BackgroundColor','white');
-end
-
-
-% --- Executes during object creation, after setting all properties.
-function slider2_CreateFcn(hObject, eventdata, handles)
-% hObject    handle to slider2 (see GCBO)
+% handles    structure with handles and user data (see GUIDATA)
+
+% Hint: get(hObject,'Value') returns toggle state of checkbox42
+
+
+% --- Executes on button press in checkbox43.
+function checkbox43_Callback(hObject, eventdata, handles)
+% hObject    handle to checkbox43 (see GCBO)
 % eventdata  reserved - to be defined in a future version of MATLAB
-% handles    empty - handles not created until after all CreateFcns called
-
-% Hint: slider controls usually have a light gray background.
-if isequal(get(hObject,'BackgroundColor'), get(0,'defaultUicontrolBackgroundColor'))
-    set(hObject,'BackgroundColor',[.9 .9 .9]);
-end
-
-
-% --- Executes during object creation, after setting all properties.
-function slider1_CreateFcn(hObject, eventdata, handles)
-% hObject    handle to slider1 (see GCBO)
+% handles    structure with handles and user data (see GUIDATA)
+
+% Hint: get(hObject,'Value') returns toggle state of checkbox43
+
+
+% --- Executes on button press in checkbox44.
+function checkbox44_Callback(hObject, eventdata, handles)
+% hObject    handle to checkbox44 (see GCBO)
 % eventdata  reserved - to be defined in a future version of MATLAB
-% handles    empty - handles not created until after all CreateFcns called
-
-% Hint: slider controls usually have a light gray background.
-if isequal(get(hObject,'BackgroundColor'), get(0,'defaultUicontrolBackgroundColor'))
-    set(hObject,'BackgroundColor',[.9 .9 .9]);
-end
-
-
-% --- Executes during object creation, after setting all properties.
-function colcode2_CreateFcn(hObject, eventdata, handles)
-% hObject    handle to colcode2 (see GCBO)
+% handles    structure with handles and user data (see GUIDATA)
+
+% Hint: get(hObject,'Value') returns toggle state of checkbox44
+
+
+% --- Executes on selection change in popupmenu18.
+function popupmenu18_Callback(hObject, eventdata, handles)
+
+
+function edit91_Callback(hObject, eventdata, handles)
+% hObject    handle to edit91 (see GCBO)
 % eventdata  reserved - to be defined in a future version of MATLAB
-% handles    empty - handles not created until after all CreateFcns called
-
-% Hint: edit controls usually have a white background on Windows.
-%       See ISPC and COMPUTER.
-if ispc && isequal(get(hObject,'BackgroundColor'), get(0,'defaultUicontrolBackgroundColor'))
-    set(hObject,'BackgroundColor','white');
-end
-
-
+% handles    structure with handles and user data (see GUIDATA)
+
+% Hints: get(hObject,'String') returns contents of edit91 as text
+%        str2double(get(hObject,'String')) returns contents of edit91 as a double
+
+
+% --- Executes on button press in checkbox45.
+function checkbox45_Callback(hObject, eventdata, handles)
+% hObject    handle to checkbox45 (see GCBO)
+% eventdata  reserved - to be defined in a future version of MATLAB
+% handles    structure with handles and user data (see GUIDATA)
+
+% Hint: get(hObject,'Value') returns toggle state of checkbox45
+
+
+% --- Executes on selection change in popupmenu19.
+function popupmenu19_Callback(hObject, eventdata, handles)
+% hObject    handle to popupmenu19 (see GCBO)
+% eventdata  reserved - to be defined in a future version of MATLAB
+% handles    structure with handles and user data (see GUIDATA)
+
+% Hints: contents = get(hObject,'String') returns popupmenu19 contents as cell array
+%        contents{get(hObject,'Value')} returns selected item from popupmenu19
+
+
+
+