Changeset 65 for trunk/src/uvmat.m

Timestamp:

Mar 24, 2010, 8:47:23 PM (14 years ago)

Author:

sommeria

Message:

name_generator: remove unneeded indices at output
civ.m: & introduced at the end of system command lines (beginning by !) to allow matlab operations during civ in run mode
uvmat.m: debugging in dealing with projections
prove image pair movies superposed to velocity vectors
mouse: put circles along detected vectors

File:

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

trunk/src/uvmat.m

@@ -626 +626 @@
 update_rootinfo(hObject,eventdata,handles)
 
-%-------------------------------------------------------------------
-%-- called by action in FileIndex edit box
-%-------------------------------------------------------------------
-function FileIndex_Callback(hObject, eventdata, handles)
-NomType_str=get(handles.FileIndex,'String') ;
-[P,F,str1,str2,str_a,str_b]=name2display(['xx' NomType_str get(handles.FileExt,'String')]);
-% display the new index values on the counters
-set(handles.i1,'String',str1); 
-set(handles.i2,'String',str2);
-set(handles.j1,'String',str_a);
-set(handles.j2,'String',str_b);
+
+
+
+
 
 %-------------------------------------------------------------------
@@ -1670 +1663 @@
      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;
@@ -1691 +1684 @@
 %         end
     end
-    filename=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);
 end
 
@@ -1745 +1738 @@
 index_fields=get(handles.Fields,'Value');% selected string index
 FieldName=list_fields{index_fields}; % selected field
+UvData=get(handles.uvmat,'UserData');
 if isequal(FieldName,'image')
-%     run0_Callback(hObject, eventdata, handles)%display the first image
-    UvData=get(handles.uvmat,'UserData');
-else
-    msgbox_uvmat('ERROR','an image or movie must be first introduced as input')
-    return
-end
-[ff,rr,filebase,xx,Ext,SubDir]=read_file_boxes(handles);
-NomType=get(handles.FileIndex,'UserData');
+    test_1=0;
+    [ff,rr,filebase,xx,Ext,SubDir]=read_file_boxes(handles);
+    NomType=get(handles.FileIndex,'UserData');
+else
+    list_fields=get(handles.Fields_1,'String');% list menu fields
+    index_fields=get(handles.Fields_1,'Value');% selected string index
+    FieldName=list_fields{index_fields}; % selected field
+    if isequal(FieldName,'image')
+        test_1=1;
+        [ff,rr,filebase,xx,Ext,SubDir]=read_file_boxes_1(handles);
+        NomType=get(handles.FileIndex_1,'UserData');
+    else
+        msgbox_uvmat('ERROR','an image or movie must be first introduced as input')
+        return
+    end
+end
+
 num_i1=stra2num(get(handles.i1,'String'));
 num_j1=stra2num(get(handles.j1,'String'));
@@ -1779 +1782 @@
 %read the second image
 Field.AName='image';
-Field.AX=UvData.Field.AX;
-Field.AY=UvData.Field.AY;
+if test_1
+    Field_a=UvData.Field_1;
+else
+    Field_a=UvData.Field;
+end
+Field_b.AX=Field_a.AX;
+Field_b.AY=Field_a.AY;
 % z index
 nbslice=str2double(get(handles.nb_slice,'String'));
 if ~isempty(nbslice)
-    Field.ZIndex=mod(num_i2-1,nbslice)+1;
-end
-Field.CoordType='px';
+    Field_b.ZIndex=mod(num_i2-1,nbslice)+1;
+end
+Field_b.CoordType='px';
 %determine the input file type
-if isfield(UvData,'MovieObject')
+if (test_1 && isfield(UvData,'MovieObject_1'))||(~test_1 && isfield(UvData,'MovieObject'))
     FileType='movie';
 elseif isequal(lower(Ext),'.avi')
@@ -1806 +1814 @@
 switch FileType
         case 'movie'
-            Field.A=read(UvData.MovieObject,num_i2);
+            if test_1
+                Field_b.A=read(UvData.MovieObject_1,num_i2);
+            else
+                Field_b.A=read(UvData.MovieObject,num_i2);
+            end
         case 'avi'
             mov=aviread(imaname_1,num_i2);
-            Field.A=frame2im(mov(1));
+            Field_b.A=frame2im(mov(1));
         case 'vol'
-            Field.A=imread(imaname_1);
+            Field_b.A=imread(imaname_1);
         case 'multimage'
-            Field.A=imread(imaname_1,num_i2);
+            Field_b.A=imread(imaname_1,num_i2);
         case 'image'
-            Field.A=imread(imaname_1);
+            Field_b.A=imread(imaname_1);
 end 
 if get(handles.slices,'Value')
@@ -1828 +1840 @@
 transform=transform_list{choice_value};
 if  ~isequal(transform_name,'') && ~isequal(transform_name,'px')
-    if isfield(UvData,'XmlData') && isfield(UvData.XmlData,'GeometryCalib')%use geometry calib recorded from the ImaDoc xml file as first priority
-        Field=transform(Field,UvData.XmlData);
+    if test_1 && isfield(UvData,'XmlData_1') && isfield(UvData.XmlData_1,'GeometryCalib')%use geometry calib recorded from the ImaDoc xml file as first priority
+        Field_b=transform(Field_b,UvData.XmlData_1);
+    elseif ~test_1 && isfield(UvData,'XmlData') && isfield(UvData.XmlData,'GeometryCalib')%use geometry calib
+        Field_b=transform(Field_b,UvData.XmlData);
     end
 end
@@ -1840 +1854 @@
 while get(handles.speed,'Value')~=0 && isequal(get(handles.movie_pair,'BusyAction'),'queue')%isequal(get(handles.run0,'BusyAction'),'queue'); % enable STOP command
     % read and plot the series of images in non erase mode
-    set(hima,'CData',Field.A); 
+    set(hima,'CData',Field_b.A); 
     pause(1.02-get(handles.speed,'Value'));% wait for next image
-    set(hima,'CData',UvData.Field.A);
+    set(hima,'CData',Field_a.A);
     pause(1.02-get(handles.speed,'Value'));% wait for next image
 end
@@ -1966 +1980 @@
 sub_value=get(handles.SubField,'Value');
 FileType_1='none';%default
-%if sub_value==1
+%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')
@@ -1984 +1999 @@
         FieldName_1='image';
     else 
-       form=imformats(Ext([2:end]));
+       form=imformats(Ext_1([2:end]));
        if ~isempty(form)% if the extension corresponds to an image format recognized by Matlab
            if isequal(NomType_1,'*');
@@ -2064 +2079 @@
             A=read(UvData.MovieObject_1,num_i1);
         case 'avi'
-            mov=aviread(filename,num_i1);
+            mov=aviread(filename_1,num_i1);
             A=frame2im(mov(1));
         case 'vol'
-            A=imread(filename);
+            A=imread(filename_1);
         case 'multimage'
-            A=imread(filename,num_i1);
+            A=imread(filename_1,num_i1);
         case 'image'
-            A=imread(filename);
+            A=imread(filename_1);
+        case 'netcdf'
+        otherwise
+            errormsg=['unknown input file type ' filename_1];
     end 
     npxy=size(A);
@@ -2498 +2516 @@
     set(handles.MaxA,'String','255')
 end
-IndexObj=get(handles.list_object_1,'Value');
-Object=UvData.Object;
-IndexObj=min(IndexObj,numel(Object));
-for iobj=[1 IndexObj]
-    if ~isempty(Object{iobj})%& isfield(Object{iobj},'plotaxes')& ishandle(Object{iobj}.plotaxes)
+IndexObj(1)=get(handles.list_object_1,'Value');
+if IndexObj(1)> numel(UvData.Object)
+    IndexObj(1)=1;
+end
+IndexObj_2=get(handles.list_object_2,'Value');
+if IndexObj_2 <= numel(UvData.Object)
+    IndexObj(2)=IndexObj_2;
+end
+for iobj=IndexObj
+    if ~isempty(UvData.Object{iobj})%& isfield(Object{iobj},'plotaxes')& ishandle(Object{iobj}.plotaxes)
         %Projeter les champs sur l'objet:*
-        ObjectData=proj_field(UvData.Field,Object{iobj},iobj);
+        ObjectData=proj_field(UvData.Field,UvData.Object{iobj},iobj);
    
         %use of mask
@@ -2554 +2577 @@
         if ~isempty(ObjectData)
             haxes=[];%default
-            if isfield(Object{iobj},'plotaxes')
-                haxes=Object{iobj}.plotaxes;%axes used for representing the projection on the object
+            if isfield(UvData.Object{iobj},'plotaxes')
+                haxes=UvData.Object{iobj}.plotaxes;%axes used for representing the projection on the object
             end
             PosColorbar=[];%default: no colorbar
@@ -4169 +4192 @@
 IndexObj=get(handles.list_object_1,'Value');
 str_1=list_str{IndexObj};
-% set(handles.list_object_1,'BackgroundColor',[1 1 0]) 
-% set(handles.list_object_2,'BackgroundColor',[1 1 1]) 
 val_2=get(handles.list_object_2,'Value');
 str_2=get(handles.list_object_2,'String');