Changeset 29 for trunk/src/uvmat.m

Timestamp:

Mar 3, 2010, 10:48:08 AM (14 years ago)

Author:

sommeria

Message:

read_imadoc suppressed (obsolete, replaced by imadoc2struct)
update_imadoc: bug repaired: existing xml file was erased
various cleaning (deals with non existing input file for series and uvmat)

File:

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

trunk/src/uvmat.m

@@ -470 +470 @@
 %----------------------------------------------------------------
 function display_file_name(hObject, eventdata, handles,fileinput)
+if ~exist(fileinput,'file')
+    msgbox_uvmat('ERROR',['input file ' fileinput  ' does not exist'])
+    return
+end
 [RootPath,RootFile,i1,i2,str_a,str_b,ext,NomType,SubDir]=name2display(fileinput);
-form=imformats(ext(2:end));%test valid Matlab image formats
-if ~isempty(form)
-    ext_test='.image';
-    imainfo=imfinfo(fileinput);  
-    if length(imainfo) >1 %case of image with multiple frames
+ext_test=''; %default
+if ~isempty(ext) 
+    form=imformats(ext(2:end));%test valid Matlab image formats
+    if ~isempty(form)
+        ext_test='.image';
+        imainfo=imfinfo(fileinput);  
+        if length(imainfo) >1 %case of image with multiple frames
+            i1='1'; % set the frame counter to 1 by default
+            i2='';
+            str_a='';
+            str_b='';
+            NomType='*'; %indicate a set of indexed frames within a single file
+            [RootPath,RootFile]=fileparts(fileinput); %include the indices in the root file
+        end
+    elseif isequal(lower(ext),'.avi')
+        ext_test='.image';
         i1='1'; % set the frame counter to 1 by default
         i2='';
@@ -482 +497 @@
         NomType='*'; %indicate a set of indexed frames within a single file
         [RootPath,RootFile]=fileparts(fileinput); %include the indices in the root file
-    end
-elseif isequal(lower(ext),'.avi')
-    ext_test='.image';
-    i1='1'; % set the frame counter to 1 by default
-    i2='';
-    str_a='';
-    str_b='';
-    NomType='*'; %indicate a set of indexed frames within a single file
-    [RootPath,RootFile]=fileparts(fileinput); %include the indices in the root file
-else
-    ext_test=lower(ext);
+    else
+        ext_test=lower(ext);
+    end
 end
 switch ext_test