fudaa-svn-commit

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

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

Revision: 6519
          http://fudaa.svn.sourceforge.net/fudaa/?rev=6519&view=rev
Author:   bmarchan
Date:     2011-10-11 14:13:48 +0000 (Tue, 11 Oct 2011)
Log Message:
-----------
Fix : Controle des Z extremit?\195?\169 de transect

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

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-10-11 13:44:09 UTC (rev 6518)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeFlowAction.java	2011-10-11 14:13:48 UTC (rev 6519)
@@ -14,6 +14,7 @@
 import org.fudaa.ctulu.gui.CtuluDialog;
 import org.fudaa.ctulu.gui.CtuluTaskOperationGUI;
 import org.fudaa.ebli.commun.EbliActionSimple;
+import org.fudaa.ebli.geometrie.GrPolyligne;
 import org.fudaa.fudaa.piv.PivExePanel;
 import org.fudaa.fudaa.piv.PivFlowInfoPanel;
 import org.fudaa.fudaa.piv.PivImplementation;
@@ -21,6 +22,8 @@
 import org.fudaa.fudaa.piv.PivProgressionPanel;
 import org.fudaa.fudaa.piv.PivResource;
 import org.fudaa.fudaa.piv.PivVisuPanel;
+import org.fudaa.fudaa.piv.metier.PivOrthoParameters;
+import org.fudaa.fudaa.piv.metier.PivTransect;
 
 /**
  * Une action pour lancer le calcul de d\xE9bit.
@@ -130,7 +133,19 @@
       impl.error(PivResource.getS("Erreur"), PivResource.getS("Le projet ne contient pas de r\xE9sultats moyenn\xE9s"));
       return false;
     }
+    if (impl.getCurrentProject().getOrthoParameters()==null) {
+      impl.error(PivResource.getS("Erreur"), PivResource.getS("Les param\xE8tres d'orthorectification n'ont pas \xE9t\xE9 donn\xE9s"));
+      return false;
+    }
     
+    PivTransect trans=impl.getCurrentProject().getTransect();
+    PivOrthoParameters param=impl.getCurrentProject().getOrthoParameters();
+    GrPolyligne pl=trans.getStraight();
+    if (pl.sommet(0).z_<param.getWaterElevation() || pl.sommet(pl.nombre()-1).z_<param.getWaterElevation()) {
+      impl.error(PivResource.getS("Erreur"), PivResource.getS("Au moins un point extremit\xE9 du transect a un Z inf\xE9rieur au niveau d'eau."));
+      return false;
+    }
+    
     return true;
   }
 

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

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

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

Revision: 9113
          http://sourceforge.net/p/fudaa/svn/9113
Author:   bmarchan
Date:     2015-04-20 09:14:18 +0000 (Mon, 20 Apr 2015)
Log Message:
-----------
Ajout d'un raccourci pour le calcul des d?\195?\169bits

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

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	2015-04-20 09:12:57 UTC (rev 9112)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/action/PivComputeFlowAction.java	2015-04-20 09:14:18 UTC (rev 9113)
@@ -8,7 +8,9 @@
 package org.fudaa.fudaa.piv.action;
 
 import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
 
+import javax.swing.KeyStroke;
 import javax.swing.SwingUtilities;
 
 import org.fudaa.ctulu.CtuluLog;
@@ -42,6 +44,7 @@
    */
   public PivComputeFlowAction(PivImplementation _impl) {
     super(PivResource.getS("Calcul du d\xE9bit"), null, "COMPUTE_FLOW");
+    setKey(KeyStroke.getKeyStroke(KeyEvent.VK_Q, KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK));
 
     impl=_impl;
     setEnabled(false);

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