Changeset 445 for trunk/src/uvmat.m

Timestamp:

Jun 8, 2012, 4:30:52 PM (12 years ago)

Author:

sommeria

Message:

possibility of dealing with series of multiple images eg tiff- introduced
bugs corrected in object creation.

File:

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

trunk/src/uvmat.m

@@ -2009 +2009 @@
 %% read the first input field if a filename has been introduced
 ParamIn.ColorVar='';%default variable name for vector color
+frame_index=1;%default
 if ~isempty(filename)
     ObjectName=filename;
@@ -2035 +2036 @@
             end
         case {'video','mmreader'}
-            ObjectName=UvData.MovieObject{1};         
+            ObjectName=UvData.MovieObject{1};      
+            if ~strcmp(NomType,'*')
+                frame_index=num_j1;%frame index for movies or multimage
+            else
+                frame_index=num_i1;
+            end
+        case 'multimage'
+            if ~strcmp(NomType,'*')
+                frame_index=num_j1;%frame index for movies or multimage
+            else
+                frame_index=num_i1;
+            end
         case 'vol' %TODO: update
             if isfield(UvData.XmlData,'Npy') && isfield(UvData.XmlData,'Npx')
@@ -2048 +2060 @@
     ParamIn.VelType=VelType;
     ParamIn.GUIName='get_field';
-    [Field{1},ParamOut,errormsg] = read_field(ObjectName,UvData.FileType{1},ParamIn,num_i1);
+    [Field{1},ParamOut,errormsg] = read_field(ObjectName,UvData.FileType{1},ParamIn,frame_index);
     if ~isempty(errormsg)
         errormsg=['error in reading ' filename ': ' errormsg];
@@ -2069 +2081 @@
 FieldName_1=[];
 ParamOut_1=[];
+frame_index_1=1;
 if ~isempty(filename_1)
     if ~exist(filename_1,'file')
@@ -2096 +2109 @@
         case {'video','mmreader'}
             Name=UvData.MovieObject{2};
+                        if ~strcmp(NomType_1,'*')
+                frame_index_1=num_j1;%frame index for movies or multimage
+            else
+                frame_index_1=num_i1;
+            end  
+         case 'multimage'
+            if ~strcmp(NomType_1,'*')
+                frame_index_1=num_j1;%frame index for movies or multimage
+            else
+                frame_index_1=num_i1;
+            end   
         case 'vol' %TODO: update
             if isfield(UvData.XmlData,'Npy') && isfield(UvData.XmlData,'Npx')
@@ -2123 +2147 @@
         ParamIn_1.VelType=VelType_1;
         ParamIn_1.GUIName='get_field_1';
-        [Field{2},ParamOut_1,errormsg] = read_field(Name,UvData.FileType{2},ParamIn_1,num_i1);
+        [Field{2},ParamOut_1,errormsg] = read_field(Name,UvData.FileType{2},ParamIn_1,frame_index_1);
         if ~isempty(errormsg)
             errormsg=['error in reading ' FieldName_1 ' in ' filename_1 ': ' errormsg];
@@ -4565 +4589 @@
     set(handles.ListObject,'String',ListObject)
 end
+
+IndexObj=length(ListObject);
+
 UvData=get(handles.uvmat,'UserData');
 UvData.Object{IndexObj}=[]; %create a new empty object
@@ -4570 +4597 @@
 UvData.Object{IndexObj}.DisplayHandle.view_field=[]; %no plot handle before plot_field operation
 set(handles.uvmat,'UserData',UvData)
-set(handles.ListObject,'Value',length(ListObject))
+set(handles.ListObject,'Value',IndexObj)
 hset_object=set_object(data);% call the set_object interface
 set(get(hset_object,'children'),'enable','on')% enable edit action on elements on GUI set_object