Changeset 346


Ignore:
Timestamp:
Dec 22, 2011, 12:03:09 PM (9 years ago)
Author:
gostiaux
Message:

Commited wrong file in previous commit; now OK

Location:
trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/civ_matlab.m

    r345 r346  
    5757
    5858   % to try the reverse_pair method, uncomment below
    59     [xtable1 ytable1 utable1 vtable1 ctable1 F1 result_conv1 errormsg1] = civ (Param.Civ1);
    60     Param.Civ1.reverse_pair=1;
    61     [xtable2 ytable2 utable2 vtable2 ctable2 F2 result_conv2 errormsg2] = civ (Param.Civ1);
    62     xtable=[xtable1; xtable2];
    63     ytable=[ytable1; ytable2];
    64     utable=[utable1; -utable2];
    65     vtable=[vtable1; -vtable2];
    66     ctable=[ctable1; ctable2];
    67     F=[F1; F2];
    68     result_conv=[result_conv1; result_conv2];
    69     errormsg=[errormsg1; errormsg2];
     59%     [xtable1 ytable1 utable1 vtable1 ctable1 F1 result_conv1 errormsg1] = civ (Param.Civ1);
     60%     Param.Civ1.reverse_pair=1;
     61%     [xtable2 ytable2 utable2 vtable2 ctable2 F2 result_conv2 errormsg2] = civ (Param.Civ1);
     62%     xtable=[xtable1; xtable2];
     63%     ytable=[ytable1; ytable2];
     64%     utable=[utable1; -utable2];
     65%     vtable=[vtable1; -vtable2];
     66%     ctable=[ctable1; ctable2];
     67%     F=[F1; F2];
     68%     result_conv=[result_conv1; result_conv2];
     69%     errormsg=[errormsg1; errormsg2];
    7070   
    7171   
  • trunk/src/fileparts_uvmat.m

    r339 r346  
    6666        delim1=r.delim1;
    6767        num2=r.num2;
    68         r=regexp(FileName,['.*\D(?<num3>\d+)(?<delim2>[-_])' num2 delim1 num1 '$'],'names');
    69         if ~isempty(r) % FileName end matches delim2 num2 delim1 num1
     68        r=regexp(FileName,['.*\D(?<num3>\d+)(?<delim2>[-_]&[^' delim1 '])' num2 delim1 num1 '$'],'names');
     69        if ~isempty(r) % FileName end matches num3 delim2 num2 delim1 num1
    7070            delim2=r.delim2;
    7171            num3=r.num3;
     
    230230        'Image3_a.jpg'...
    231231        'movie57.avi'...
     232        'merged_20_12_1.png'...
    232233        };
    233234end
Note: See TracChangeset for help on using the changeset viewer.