Changeset 1003

Timestamp:

Mar 28, 2017, 10:12:08 AM (7 years ago)

Author:

campagne8a

Message:

Fluidiamage compatibility

Location:

trunk/src

Files:

• read_pivdata_fluidimage.m (modified) (1 diff)
• series.m (modified) (2 diffs)

trunk/src/read_pivdata_fluidimage.m

@@ -151 +151 @@
         Field.V(isnan(Field.V)) = 0;
     case {'filter1','filter2',''}
-        Field.X= double(Data.ixvecs_grid);
-        Field.Y= double(Data.iyvecs_grid);
-        Field.U= double(Data.deltaxs_approx);
+        Field.X= double(Data.ixvecs_final);
+        Field.Y= double(Data.iyvecs_final);
+        Field.U= double(Data.deltaxs_final);
         Field.U(isnan(Field.U)) = 0;
-        Field.V= double(Data.deltays_approx);
+        Field.V= double(Data.deltays_final);
         Field.V(isnan(Field.V)) = 0;
 end

trunk/src/series.m

@@ -153 +153 @@
 [path_series,name,ext]=fileparts(which('series')); % path to the GUI series
 path_series_fct=fullfile(path_series,'series'); % path of the functions in subdirectroy 'series'
-[code, message] = system...
-    ('LD_LIBRARY_PATH=$(echo $LD_LIBRARY_PATH | pyp "p.split('':'') |... [s for s in p if ''matlab'' not in s] | '':''.join(p)") python -c "import fluidimage"'); 
+command = ['LD_LIBRARY_PATH=$(echo $LD_LIBRARY_PATH | pyp "l = x.split('':''); l = [s for s in l if ''matlab'' not in s]; print('':''.join(l))") ' ...
+            'python -c "import fluidimage" ' ];
+[code, ~] = system(command); 
 if code==0
     ActionExtList={'.m';'.sh';'.py (in dev.)'}; % default choice of extensions (Matlab fct .m or compiled version .sh
@@ -2159 +2160 @@
         msgbox_uvmat('CONFIRMATION',[num2str(currJobIndex-1) ' jobs launched on queue ' qstat_Queue '.'])
     case 'python'
-        command = [
-            'LD_LIBRARY_PATH=$(echo $LD_LIBRARY_PATH | pyp "p.split('':'') | [s for s in p if ''matlab'' not in s] | '':''.join(p)") ' ...
+        command = ['LD_LIBRARY_PATH=$(echo $LD_LIBRARY_PATH | pyp "l = x.split('':''); l = [s for s in l if ''matlab'' not in s]; print('':''.join(l))") ' ...
             'python -m fluidimage.run_from_xml ' filexml{iprocess}];
         % fprintf(['command:\n' command '\n\n'])