Changeset 386 for trunk/src/uvmat.m

Timestamp:

Apr 2, 2012, 4:23:26 PM (13 years ago)

Author:

sommeria

Message:

several bugs corrected
for dealing with color movies

File:

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

trunk/src/uvmat.m

@@ -47 +47 @@
 %           .FieldName_1:(char string) second field selected('image', 'velocity'...)
 %           .CName: (char string)name of the scalar used for vector colors
-%          .MovieObject: movie object representing an input movie
-%          .MovieObject_1: idem for a second input series (_1)
+%          .MovieObject{1}: movie object representing an input movie
+%          .MovieObject{2}: idem for a second input series (_1)
 %          .filename_1 : last second input file name (to deal with a constant second input without reading again the file)
 %          .VelType_1: last velocity type (VelType, civ2...) for the second input series
@@ -1568 +1568 @@
 NomType=get(handles.NomType,'String');
 i1=str2num(get(handles.i1,'String'));%read the field indices (for movie, it is not given by the file name)
-i2=str2num(get(handles.i2,'String'));
-j1=1;
+i2=[];%default
+if strcmp(get(handles.i2,'Visible'),'on')
+    i2=str2num(get(handles.i2,'String'));
+end
+j1=[];
 if strcmp(get(handles.j1,'Visible'),'on')
     j1=stra2num(get(handles.j1,'String'));
@@ -1592 +1595 @@
     set(handles.CheckFixPair,'Value',0)
 end
-CheckFixPair=get(handles.CheckFixPair,'Value');
+CheckFixPair=get(handles.CheckFixPair,'Value')||(isempty(i2)&&isempty(j2));
 if CheckFixPair
     if get(handles.scan_i,'Value')==1% case of scanning along index i
@@ -2000 +2003 @@
                 ParamIn.Npy=UvData.XmlData.Npy;
                 ParamIn.Npx=UvData.XmlData.Npx;
-            else
-                
+            else            
                 errormsg='Npx and Npy need to be defined in the xml file for volume images .vol';
                 return