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

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

Revision: 6473
          http://fudaa.svn.sourceforge.net/fudaa/?rev=6473&view=rev
Author:   bmarchan
Date:     2011-10-03 10:13:18 +0000 (Mon, 03 Oct 2011)
Log Message:
-----------
Add : Affichage des infos de calcul de d?\195?\169bit

Modified Paths:
--------------
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeFlowAction.java

Added Paths:
-----------
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivFlowInfoPanel.java

Added: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivFlowInfoPanel.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivFlowInfoPanel.java	                        (rev 0)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivFlowInfoPanel.java	2011-10-03 10:13:18 UTC (rev 6473)
@@ -0,0 +1,74 @@
+/*
+ * @creation 8 sept. 06
+ * @modification $Date: 2009-06-03 15:10:45 +0200 (mer., 03 juin 2009) $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.fudaa.piv;
+
+import com.memoire.bu.BuGridLayout;
+import java.awt.Dimension;
+import javax.swing.JLabel;
+import javax.swing.JTextField;
+import org.fudaa.ctulu.gui.CtuluDialogPanel;
+import org.fudaa.fudaa.piv.metier.PivFlowResults;
+
+
+/**
+ * Un panneau d'information sur le calcul de d\xE9bit effectu\xE9.
+ * @author Bertrand Marchand (mar...@de...)
+ * @version $Id$
+ */
+public class PivFlowInfoPanel extends CtuluDialogPanel {
+  private PivFlowResults res_;
+  private JTextField tfDischarge;
+  private JTextField tfWettedArea;
+  private JTextField tfMeanVelocity;
+  
+  /**
+   * Construction du panneau avec les r\xE9sutalts de d\xE9bit
+   * @param _res Les r\xE9sultats.
+   */
+  public PivFlowInfoPanel(PivFlowResults _res) {
+
+    setLayout(new BuGridLayout(2,3,3));
+    add(new JLabel(PivResource.getS("D\xE9bit total (m3/s)")));
+    add(tfDischarge=new JTextField());
+    add(new JLabel(PivResource.getS("Surface mouill\xE9e (m2)")));
+    add(tfWettedArea=new JTextField());
+    add(new JLabel(PivResource.getS("Vitesse moyenne (m/s)")));
+    add(tfMeanVelocity=new JTextField());
+    
+    tfDischarge.setPreferredSize(new Dimension(80,tfDischarge.getPreferredSize().height));
+    tfDischarge.setEditable(false);
+    tfWettedArea.setEditable(false);
+    tfMeanVelocity.setEditable(false);
+    
+    setResults(_res);
+  }
+  
+  /**
+   * Affecte les r\xE9sultats au dialogue et les affiche.
+   * @param _res Les r\xE9sultats. Peut \xEAtre <tt>null</tt>
+   */
+  public void setResults(PivFlowResults _res) {
+    res_=_res;
+    
+    if (res_!=null) {
+      tfDischarge.setText(""+res_.getDischarge());
+      tfWettedArea.setText(""+res_.getWettedArea());
+      tfMeanVelocity.setText(""+res_.getMeanVelocity());
+    }
+    else {
+      tfDischarge.setText("");
+      tfWettedArea.setText("");
+      tfMeanVelocity.setText("");
+    }
+  }
+
+  @Override
+  public boolean isDataValid() {
+    return true;
+  }
+}
\ No newline at end of file


Property changes on: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivFlowInfoPanel.java
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

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	2011-09-30 16:16:15 UTC (rev 6472)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeFlowAction.java	2011-10-03 10:13:18 UTC (rev 6473)
@@ -9,11 +9,13 @@
 
 import java.awt.event.ActionEvent;
 import java.io.File;
+import javax.swing.SwingUtilities;
 import org.fudaa.ctulu.CtuluAnalyze;
 import org.fudaa.ctulu.gui.CtuluDialog;
 import org.fudaa.ctulu.gui.CtuluTaskOperationGUI;
 import org.fudaa.ebli.commun.EbliActionSimple;
 import org.fudaa.fudaa.piv.PivExePanel;
+import org.fudaa.fudaa.piv.PivFlowInfoPanel;
 import org.fudaa.fudaa.piv.PivImplementation;
 import org.fudaa.fudaa.piv.PivPreferences;
 import org.fudaa.fudaa.piv.PivProgressionPanel;
@@ -87,9 +89,18 @@
           diProgress_.dispose();
         }
 
-        impl.message(PivResource.getS("Calcul termin\xE9"), PivResource.getS("Le calcul s'est termin\xE9 avec succ\xE8s"), false);
-        impl.get2dFrame().getVisuPanel().setViewMode(PivVisuPanel.MODE_REAL_VIEW);
-        impl.get2dFrame().getVisuPanel().setFlowLayerVisible(true);
+        // Lanc\xE9 \xE0 la fin, car l'interface se bloque si on ne le fait pas.
+        // Probl\xE8me de thread swing probablement...
+        SwingUtilities.invokeLater(new Runnable() {
+          public void run() {
+            PivFlowInfoPanel pnInfo=new PivFlowInfoPanel(impl.getCurrentProject().getFlowResults());
+            pnInfo.afficheModale(impl.getFrame(), PivResource.getS("Calcul termin\xE9"), CtuluDialog.OK_OPTION);
+            impl.get2dFrame().getVisuPanel().setViewMode(PivVisuPanel.MODE_REAL_VIEW);
+            impl.get2dFrame().getVisuPanel().setFlowLayerVisible(true);
+          }
+        });
+        
+//        impl.message(PivResource.getS("Calcul termin\xE9"), PivResource.getS("Le calcul s'est termin\xE9 avec succ\xE8s"), false);
       }
     };
 

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