[Fudaa-svn-commit] SF.net SVN: fudaa:[9131] trunk/soft/fudaa-lspiv/src/main

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

Revision: 9131
          http://sourceforge.net/p/fudaa/svn/9131
Author:   bmarchan
Date:     2015-06-16 13:08:15 +0000 (Tue, 16 Jun 2015)
Log Message:
-----------
Fix : Pb de niveau d'eau sur les profils en 3D.

Modified Paths:
--------------
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivShow3DTransectPanel.java
    trunk/soft/fudaa-lspiv/src/main/resources/org/fudaa/fudaa/piv/piv_en.fr_txt

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivShow3DTransectPanel.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivShow3DTransectPanel.java	2015-05-12 13:29:25 UTC (rev 9130)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivShow3DTransectPanel.java	2015-06-16 13:08:15 UTC (rev 9131)
@@ -62,10 +62,10 @@
     double zniv_;
     double ratio_;
     
-    public DischargeModel(PivTransect _trans, PivFlowResults _res, double _zniv) {
+    public DischargeModel(PivTransect _trans, PivFlowResults _res) {
       res_=_res;
       trans_=_trans;
-      zniv_=_zniv;
+      zniv_=_res.getWaterElevation();
       
       double lgArrowMax=Double.NEGATIVE_INFINITY;
       double vx;
@@ -240,7 +240,7 @@
     PivFlowResults[] res=impl_.getCurrentProject().getFlowResults();
     if (res!=null) {
       for (int i=0; i<_isels.length; i++) {
-        DischargeModel mdl=new DischargeModel(transects[_isels[i]],res[_isels[i]], impl_.getCurrentProject().getOrthoParameters().getResolution());
+        DischargeModel mdl=new DischargeModel(transects[_isels[i]],res[_isels[i]]);
         pnGraph_.addData(mdl);
         pnGraph_.setDataRenderer(i+_isels.length, disRenderer_);
       }

Modified: trunk/soft/fudaa-lspiv/src/main/resources/org/fudaa/fudaa/piv/piv_en.fr_txt
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/resources/org/fudaa/fudaa/piv/piv_en.fr_txt	2015-05-12 13:29:25 UTC (rev 9130)
+++ trunk/soft/fudaa-lspiv/src/main/resources/org/fudaa/fudaa/piv/piv_en.fr_txt	2015-06-16 13:08:15 UTC (rev 9131)
@@ -45,7 +45,7 @@
 Choisir 2 points diff\xE9rents=Please choose 2 different points
 Choix de la variable=Variable choice
 Choix du segment=Segment choice
-Clic gauche \: Rotation de la vue\nCtrl+clic gauche \: D\xE9placement de la vue\nShift+clic gauche \: Zoom de la vue=Left click \: View rotation\nLeft Ctrl+click \: View pan\nLeft Shift+click \: View zoom
+Clic gauche \: Rotation de la vue\nCtrl+clic gauche \: D\xE9placement de la vue\nShift+clic gauche \: Zoom de la vue=Left click \: View rotation\nCtrl+Left click \: View pan\nShift+Left click \: View zoom
 Coefficient de vitesse=Velocity coefficient
 Construction des noeuds=Nodes construction
 Construction des points=Points construction

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