Changeset 346 for trunk/src

Timestamp:

Dec 22, 2011, 12:03:09 PM (13 years ago)

Author:

gostiaux

Message:

Commited wrong file in previous commit; now OK

Location:

trunk/src

Files:

• civ_matlab.m (modified) (1 diff)
• fileparts_uvmat.m (modified) (2 diffs)

trunk/src/civ_matlab.m

@@ -57 +57 @@
 
    % to try the reverse_pair method, uncomment below
-    [xtable1 ytable1 utable1 vtable1 ctable1 F1 result_conv1 errormsg1] = civ (Param.Civ1);
-    Param.Civ1.reverse_pair=1;
-    [xtable2 ytable2 utable2 vtable2 ctable2 F2 result_conv2 errormsg2] = civ (Param.Civ1);
-    xtable=[xtable1; xtable2];
-    ytable=[ytable1; ytable2];
-    utable=[utable1; -utable2];
-    vtable=[vtable1; -vtable2];
-    ctable=[ctable1; ctable2];
-    F=[F1; F2];
-    result_conv=[result_conv1; result_conv2];
-    errormsg=[errormsg1; errormsg2];
+%     [xtable1 ytable1 utable1 vtable1 ctable1 F1 result_conv1 errormsg1] = civ (Param.Civ1);
+%     Param.Civ1.reverse_pair=1;
+%     [xtable2 ytable2 utable2 vtable2 ctable2 F2 result_conv2 errormsg2] = civ (Param.Civ1);
+%     xtable=[xtable1; xtable2];
+%     ytable=[ytable1; ytable2];
+%     utable=[utable1; -utable2];
+%     vtable=[vtable1; -vtable2];
+%     ctable=[ctable1; ctable2];
+%     F=[F1; F2];
+%     result_conv=[result_conv1; result_conv2];
+%     errormsg=[errormsg1; errormsg2];
     
     

trunk/src/fileparts_uvmat.m

@@ -66 +66 @@
         delim1=r.delim1;
         num2=r.num2;
-        r=regexp(FileName,['.*\D(?<num3>\d+)(?<delim2>[-_])' num2 delim1 num1 '$'],'names');
-        if ~isempty(r) % FileName end matches delim2 num2 delim1 num1
+        r=regexp(FileName,['.*\D(?<num3>\d+)(?<delim2>[-_]&[^' delim1 '])' num2 delim1 num1 '$'],'names');
+        if ~isempty(r) % FileName end matches num3 delim2 num2 delim1 num1
             delim2=r.delim2;
             num3=r.num3;
@@ -230 +230 @@
         'Image3_a.jpg'...
         'movie57.avi'...
+        'merged_20_12_1.png'...
         };
 end