Changeset 784 for trunk/src/civ.m

Timestamp:

Jun 7, 2014, 6:17:53 PM (11 years ago)

Author:

sommeria

Message:

adpat uvmat to reading data from rdvision

File:

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

trunk/src/civ.m

@@ -1205 +1205 @@
 % if strcmp(Param.Program,'civ_matlab')
     if Param.CheckCiv1
-        [ImageInfoA_civ1,Param.Civ1.ImageA]=get_file_type(filecell.ima1.civ1{1});
+        [ImageInfoA_civ1,Param.Civ1.ImageA]=get_file_info(filecell.ima1.civ1{1});
         Param.Civ1.FileTypeA=ImageInfoA_civ1.FileType;
-        [ImageInfoB_civ1,Param.Civ1.ImageB]=get_file_type(filecell.ima2.civ1{1});
+        [ImageInfoB_civ1,Param.Civ1.ImageB]=get_file_info(filecell.ima2.civ1{1});
         Param.Civ1.FileTypeB=ImageInfoB_civ1.FileType;
     end
     if Param.CheckCiv2
-        [ImageInfoA_civ2,Param.Civ2.ImageA]=get_file_type(filecell.ima1.civ2{1});
+        [ImageInfoA_civ2,Param.Civ2.ImageA]=get_file_info(filecell.ima1.civ2{1});
         Param.Civ2.FileTypeA=ImageInfoA_civ2.FileType;
-        [ImageInfoB_civ2,Param.Civ2.ImageB]=get_file_type(filecell.ima2.civ2{1});
+        [ImageInfoB_civ2,Param.Civ2.ImageB]=get_file_info(filecell.ima2.civ2{1});
         Param.Civ2.FileTypeB=ImageInfoB_civ2.FileType;
     end
@@ -2326 +2326 @@
     if ~isequal(ext_ima,'.png')
         if checkbox(1) %if civ1 is performed
-             [FileInfo,MovieObject]=get_file_type(filecell.ima1.civ1{1});
+             [FileInfo,MovieObject]=get_file_info(filecell.ima1.civ1{1});
              FileType=FileInfo.FileType;
             check_j=0;
@@ -2366 +2366 @@
         end
         if checkbox(4) %if civ2 is performed
-             [FileInfo,MovieObject]=get_file_type(filecell.ima1.civ2{1});
+             [FileInfo,MovieObject]=get_file_info(filecell.ima1.civ2{1});
              FileType=FileInfo.FileType;
             check_j=0;
@@ -3782 +3782 @@
     Data.CoordUnit='pixel';% used to set equal scaling for x and y in image dispaly
     par_civ1=read_GUI(handles.Civ1);
-    FileInfo=get_file_type(filecell.ima1.civ1{1});
+    FileInfo=get_file_info(filecell.ima1.civ1{1});
     par_civ1.FileTypeA=FileInfo.FileType;
     par_civ1.ImageWidth=size(Data.A,2);