Changeset 183 for trunk/src/uvmat.m

Timestamp:

Jan 26, 2011, 5:03:40 PM (13 years ago)

Author:

sommeria

Message:

small bug repair: reading movies in read_fields, plotting rectangles and ellipes

File:

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

trunk/src/uvmat.m

@@ -2159 +2159 @@
     ParamIn.VelType=VelType;
     ParamIn.GUIName='get_field';
-    [Field{1},ParamOut,errormsg] = read_field(ObjectName,FileType,ParamIn);
+    [Field{1},ParamOut,errormsg] = read_field(ObjectName,FileType,ParamIn,num_i1);
+    if ~isempty(errormsg)
+        errormsg=['error in reading ' filename ': ' errormsg];
+        return
+    end
     if isfield(ParamOut,'Npx')&& isfield(ParamOut,'Npy')
         set(handles.npx,'String',num2str(ParamOut.Npx));% display image size on the interface
@@ -2244 +2248 @@
             ParamIn.VelType=VelType_1;
             ParamIn.GUIName='get_field_1';
-            [Field{2},ParamOut_1,errormsg] = read_field(Name,FileType_1,ParamIn);         
+            [Field{2},ParamOut_1,errormsg] = read_field(Name,FileType_1,ParamIn,num_i1);
+            if ~isempty(errormsg)
+                errormsg=['error in reading ' filename_1 ': ' errormsg];
+                return
+            end
             UvData.Field_1=Field{2}; %store the second field for possible use at next RUN
         end
@@ -4248 +4256 @@
     if ~isempty(hview_field)
         delete(hview_field)
+    end
+    hset_object=findobj(allchild(0),'Tag','set_object');
+    if ~isempty(hset_object)
+        delete(hset_object)
     end
 else