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

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

Revision: 7864
          http://fudaa.svn.sourceforge.net/fudaa/?rev=7864&view=rev
Author:   bmarchan
Date:     2012-11-09 13:36:41 +0000 (Fri, 09 Nov 2012)
Log Message:
-----------
Add : Chemin des exe donn?\195?\169 sur ligne de commande

Modified Paths:
--------------
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivExePanel.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeAverageAction.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeFlowAction.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeLaunchAction.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoLaunchAction.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoVerifyGRPAction.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivSelectImagesAction.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivExeLauncher.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProject.java

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivExePanel.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivExePanel.java	2012-11-09 08:19:19 UTC (rev 7863)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivExePanel.java	2012-11-09 13:36:41 UTC (rev 7864)
@@ -52,8 +52,7 @@
     add(btExePath,BorderLayout.EAST);
 //    add(pnExeDir);
 
-    String exePath=PivPreferences.PIV.getStringProperty(PivPreferences.PIV_EXE_PATH);
-    tfExePath.setText(exePath);
+    tfExePath.setText(PivExeLauncher.instance().getExePath().getPath());
 
     isDataValid();
 //    setErrorText(PivResource.getS("Le r\xE9pertoire des ex\xE9cutables n'a pas encore \xE9t\xE9 pr\xE9cis\xE9 ou n'est pas valide."));
@@ -88,7 +87,8 @@
    * Fermeture du dialogue, et mise a jour du path.
    */
   private void close() {
-    PivPreferences.PIV.putStringProperty(PivPreferences.PIV_EXE_PATH,tfExePath.getText().trim());
+    PivExeLauncher.instance().setExePath(new File(tfExePath.getText().trim()));
+    PivPreferences.PIV.putStringProperty(PivPreferences.PIV_EXE_PATH,PivExeLauncher.instance().getExePath().getPath());
     PivPreferences.PIV.writeIniFile();
   }
 

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java	2012-11-09 08:19:19 UTC (rev 7863)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivImplementation.java	2012-11-09 13:36:41 UTC (rev 7864)
@@ -81,8 +81,8 @@
   protected static BuInformationsSoftware isPIV_ = new BuInformationsSoftware();
   static {
     isPIV_.name = "LSPIV";
-    isPIV_.version = "1.3.1";
-    isPIV_.date = "2012-07-03";
+    isPIV_.version = "1.3.2";
+    isPIV_.date = "2012-11-08";
     isPIV_.rights = PivResource.getS("Tous droits r\xE9serv\xE9s")+". CETMEF (c)1999-2012";
     isPIV_.license = "GPL2";
     isPIV_.languages = "en,fr";

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeAverageAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeAverageAction.java	2012-11-09 08:19:19 UTC (rev 7863)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeAverageAction.java	2012-11-09 13:36:41 UTC (rev 7864)
@@ -59,9 +59,6 @@
       if (!pnExe.afficheModaleOk(impl.getFrame(), PivResource.getS("R\xE9pertoire contenant les executables"))) {
         return;
       }
-      else {
-        PivExeLauncher.instance().setExePath(new File(PivPreferences.PIV.getStringProperty(PivPreferences.PIV_EXE_PATH)));
-      }
     }
     
     PivSelectInstantVelResultsPanel pn=new PivSelectInstantVelResultsPanel(impl);

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeFlowAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeFlowAction.java	2012-11-09 08:19:19 UTC (rev 7863)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeFlowAction.java	2012-11-09 13:36:41 UTC (rev 7864)
@@ -63,9 +63,6 @@
       if (!pnExe.afficheModaleOk(impl.getFrame(), PivResource.getS("R\xE9pertoire contenant les executables"))) {
         return;
       }
-      else {
-        PivExeLauncher.instance().setExePath(new File(PivPreferences.PIV.getStringProperty(PivPreferences.PIV_EXE_PATH)));
-      }
     }
 
 

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeLaunchAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeLaunchAction.java	2012-11-09 08:19:19 UTC (rev 7863)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeLaunchAction.java	2012-11-09 13:36:41 UTC (rev 7864)
@@ -56,9 +56,6 @@
       if (!pnExe.afficheModaleOk(impl.getFrame(), PivResource.getS("R\xE9pertoire contenant les executables"))) {
         return;
       }
-      else {
-        PivExeLauncher.instance().setExePath(new File(PivPreferences.PIV.getStringProperty(PivPreferences.PIV_EXE_PATH)));
-      }
     }
 
 

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoLaunchAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoLaunchAction.java	2012-11-09 08:19:19 UTC (rev 7863)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoLaunchAction.java	2012-11-09 13:36:41 UTC (rev 7864)
@@ -52,9 +52,6 @@
       if (!pnExe.afficheModaleOk(impl.getFrame(), PivResource.getS("R\xE9pertoire contenant les executables"))) {
         return;
       }
-      else {
-        PivExeLauncher.instance().setExePath(new File(PivPreferences.PIV.getStringProperty(PivPreferences.PIV_EXE_PATH)));
-      }
     }
 
     // La tache a ex\xE9cuter.

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoVerifyGRPAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoVerifyGRPAction.java	2012-11-09 08:19:19 UTC (rev 7863)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivOrthoVerifyGRPAction.java	2012-11-09 13:36:41 UTC (rev 7864)
@@ -57,9 +57,6 @@
       if (!pnExe.afficheModaleOk(impl.getFrame(), PivResource.getS("R\xE9pertoire contenant les executables"))) {
         return;
       }
-      else {
-        PivExeLauncher.instance().setExePath(new File(PivPreferences.PIV.getStringProperty(PivPreferences.PIV_EXE_PATH)));
-      }
     }
 
     CtuluAnalyze ana=new CtuluAnalyze();

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivSelectImagesAction.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivSelectImagesAction.java	2012-11-09 08:19:19 UTC (rev 7863)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivSelectImagesAction.java	2012-11-09 13:36:41 UTC (rev 7864)
@@ -63,9 +63,6 @@
       if (!pnExe.afficheModaleOk(impl.getFrame(), PivResource.getS("R\xE9pertoire contenant les executables"))) {
         return;
       }
-      else {
-        PivExeLauncher.instance().setExePath(new File(PivPreferences.PIV.getStringProperty(PivPreferences.PIV_EXE_PATH)));
-      }
     }
 
     // Selection des images

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivExeLauncher.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivExeLauncher.java	2012-11-09 08:19:19 UTC (rev 7863)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/io/PivExeLauncher.java	2012-11-09 13:36:41 UTC (rev 7864)
@@ -83,8 +83,15 @@
   }
   
   public static PivExeLauncher instance() {
+    // Le chemin des exes peut \xEAtre donn\xE9 en propri\xE9t\xE9, auquel cas il est prioritaire sur
+    // celui r\xE9cup\xE9r\xE9 du fichier des pr\xE9f\xE9rences
+    String exeRep=System.getProperty(PivPreferences.PIV_EXE_PATH);
+    if (exeRep==null) {
+      exeRep=PivPreferences.PIV.getStringProperty(PivPreferences.PIV_EXE_PATH);
+    }
+    
     if (instance_==null)
-      instance_=new PivExeLauncher(new File(PivPreferences.PIV.getStringProperty(PivPreferences.PIV_EXE_PATH)));
+      instance_=new PivExeLauncher(new File(exeRep));
     return instance_;
   }
 
@@ -96,6 +103,14 @@
   public void setExePath(File _exePath) {
     exePath=_exePath;
   }
+  
+  /**
+   * Retourne le chemin du repertoire des exes.
+   * @return Le chemin.
+   */
+  public File getExePath() {
+    return exePath;
+  }
 
   /**
    * Retourne vrai si tous les exe sont pr\xE9sents dans le repertoire sp\xE9cifi\xE9.
@@ -204,6 +219,8 @@
       FuLog.trace(PivResource.getS("Calcul des coefficients ok."));
     }
     catch (IOException ex) {
+      _ana.addError(ex.getMessage());
+      return false;
     }
 
     return true;

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProject.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProject.java	2012-11-09 08:19:19 UTC (rev 7863)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivProject.java	2012-11-09 13:36:41 UTC (rev 7864)
@@ -1076,7 +1076,10 @@
     PrintWriter out=null;
     try {
       out = new PrintWriter(new File(getOutputDir(),"list_avg.dat"));
-      for (int i=0; i<instantVelFiles.length; i++) {
+      // En principe, le nb de fichiers existants dans le repertoire devrait etre le meme
+      // que la taille du tableau usedInstantVelResults. Ce n'est pas toujours le cas,
+      // par exemple quand le calcul s'est mal pass\xE9.
+      for (int i=0; i<usedInstantVelResults.length; i++) {
         if (usedInstantVelResults[i])
           out.println(instantVelFiles[i].getName());
       }
@@ -1298,7 +1301,7 @@
     
     instantVelResults=_res;
     
-    usedInstantVelResults=new boolean[instantVelResults.length];
+    usedInstantVelResults=new boolean[instantVelResults==null?0:instantVelResults.length];
     Arrays.fill(usedInstantVelResults, true);
     
     isModified=true;

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