Changeset 549


Ignore:
Timestamp:
Oct 11, 2012, 9:58:22 AM (9 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/civ.m

    r548 r549  
    13671367                'matlab -nodisplay -nosplash -nojvm <<END_MATLAB \n'...
    13681368                'addpath(''' path_civ ''');\n']);
    1369             for p=1:length(batch_file_list)
     1369%             for p=1:length(batch_file_list)
    13701370                fprintf(fid,['run ' filename_bat '\n']);
    1371             end
     1371%             end
    13721372            fprintf(fid, 'exit\nEND_MATLAB\n');
    13731373            fclose(fid);
  • trunk/src/get_file_type.m

    r472 r549  
    2323
    2424switch FileExt
    25     case {'.civ','.log','.cmx','.cmx2','.txt','.bat'}
     25    case {'.civ','.log','.cmx','.cmx2','.txt','.bat','.m','.sh'}
    2626        FileType='txt';
    2727    case '.fig'
  • trunk/src/uvmat.m

    r548 r549  
    18251825    MovieObject=UvData.MovieObject{index};
    18261826end
    1827 [Field_b,ParamOut,errormsg] = read_field(imaname_1,UvData.FileType{index},MovieObject,num_frame)
     1827[Field_b,ParamOut,errormsg] = read_field(imaname_1,UvData.FileType{index},MovieObject,num_frame);
    18281828% Field_b.AX=Field_a.AX;
    18291829% Field_b.AY=Field_a.AY;
Note: See TracChangeset for help on using the changeset viewer.