[Fudaa-svn-commit] SF.net SVN: fudaa:[9465] trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/ fudaa/piv/io

[<bma...@us...>]

Revision: 9465
          http://sourceforge.net/p/fudaa/svn/9465
Author:   bmarchan
Date:     2016-11-25 13:55:34 +0000 (Fri, 25 Nov 2016)
Log Message:
-----------
Fix : Ecriture/lecture de la valeur CORREL dans les fichiers piv_filterxxx

Modified Paths:
--------------
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivInstantFilteredReader.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivInstantFilteredWriter.java

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivInstantFilteredReader.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivInstantFilteredReader.java	2016-11-24 12:01:32 UTC (rev 9464)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivInstantFilteredReader.java	2016-11-25 13:55:34 UTC (rev 9465)
@@ -55,7 +55,7 @@
    */
   private synchronized PivResultsDefault readVelocities() {
     // TODO Bertrand : A verifier
-    PivResultsDefault res = new PivResultsDefault(new TYPE[]{TYPE.VX,TYPE.VY});
+    PivResultsDefault res = new PivResultsDefault(new TYPE[]{TYPE.VX,TYPE.VY,TYPE.CORREL});
 
     if (super.in_ == null) {
       analyze_.addErrorFromFile(PivResource.getS("Flux d'entr\xE9e non trouv\xE9"), 0);

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivInstantFilteredWriter.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivInstantFilteredWriter.java	2016-11-24 12:01:32 UTC (rev 9464)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivInstantFilteredWriter.java	2016-11-25 13:55:34 UTC (rev 9465)
@@ -21,7 +21,8 @@
   @Override
   protected void internalWrite(final PivResultsI _res) {
     if (!_res.hasResult(TYPE.VX)  ||
-        !_res.hasResult(TYPE.VY)) {
+        !_res.hasResult(TYPE.VY)  ||
+        !_res.hasResult(TYPE.CORREL)) {
       donneesInvalides(_res);
       return;
     }
@@ -32,7 +33,7 @@
       
       for (int i=0; i<_res.getNbPoints(); i++) {
         // (est lu par les solveurs en format libre).
-        writer.println(_res.getX(i)+" "+_res.getY(i)+" "+_res.getValue(i, TYPE.VX)+" "+_res.getValue(i, TYPE.VY));
+        writer.println(_res.getX(i)+" "+_res.getY(i)+" "+_res.getValue(i, TYPE.VX)+" "+_res.getValue(i, TYPE.VY)+" "+_res.getValue(i, TYPE.CORREL));
       }
     }
     catch (final Exception _evt) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.