Changeset 549

Timestamp:

Oct 11, 2012, 9:58:22 AM (12 years ago)

Author:

sommeria

Message:

bug corrected in civ: multiple commands in .sh for civ_matlab
.m and .sh files recognized in get_file_type

Location:

trunk/src

Files:

• civ.m (modified) (1 diff)
• get_file_type.m (modified) (1 diff)
• uvmat.m (modified) (1 diff)

trunk/src/civ.m

@@ -1367 +1367 @@
                 'matlab -nodisplay -nosplash -nojvm <<END_MATLAB \n'...
                 'addpath(''' path_civ ''');\n']);
-            for p=1:length(batch_file_list)
+%             for p=1:length(batch_file_list)
                 fprintf(fid,['run ' filename_bat '\n']);
-            end
+%             end
             fprintf(fid, 'exit\nEND_MATLAB\n');
             fclose(fid);

trunk/src/get_file_type.m

@@ -23 +23 @@
 
 switch FileExt
-    case {'.civ','.log','.cmx','.cmx2','.txt','.bat'}
+    case {'.civ','.log','.cmx','.cmx2','.txt','.bat','.m','.sh'}
         FileType='txt';
     case '.fig'

trunk/src/uvmat.m

@@ -1825 +1825 @@
     MovieObject=UvData.MovieObject{index};
 end
-[Field_b,ParamOut,errormsg] = read_field(imaname_1,UvData.FileType{index},MovieObject,num_frame)
+[Field_b,ParamOut,errormsg] = read_field(imaname_1,UvData.FileType{index},MovieObject,num_frame);
 % Field_b.AX=Field_a.AX;
 % Field_b.AY=Field_a.AY;