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

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

Revision: 9555
          http://sourceforge.net/p/fudaa/svn/9555
Author:   bmarchan
Date:     2017-05-15 10:42:34 +0000 (Mon, 15 May 2017)
Log Message:
-----------
Pas de valeur par defaut pour le niveau d'eau

Modified Paths:
--------------
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOrthoParamPanel.java
    trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivOrthoParameters.java

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOrthoParamPanel.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOrthoParamPanel.java	2017-05-15 09:32:49 UTC (rev 9554)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/PivOrthoParamPanel.java	2017-05-15 10:42:34 UTC (rev 9555)
@@ -64,7 +64,7 @@
     tfYmin.setText("" + _params.getYmin());
     tfYmax.setText("" + _params.getYmax());
     tfResolution.setText("" + _params.getResolution());
-    tfNivEau.setText("" + _params.getWaterElevation());
+    tfNivEau.setText("" + (_params.getWaterElevation()==null ? "":_params.getWaterElevation()));
     btPositionSaisie.setEnabled(false);
   }
 

Modified: trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivOrthoParameters.java
===================================================================
--- trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivOrthoParameters.java	2017-05-15 09:32:49 UTC (rev 9554)
+++ trunk/soft/fudaa-lspiv/src/main/java/org/fudaa/fudaa/piv/metier/PivOrthoParameters.java	2017-05-15 10:42:34 UTC (rev 9555)
@@ -19,8 +19,8 @@
   protected double ymax;
   /** La resolution pour la transformation */
   protected double resolution;
-  /** Cote du plan d'eau */
-  protected double waterElevation;
+  /** Cote du plan d'eau (est null au depart, indiquant qu'aucune valeur n'a \xE9t\xE9 donn\xE9e) */
+  protected Double waterElevation;
   /** Mise a l'echelle : Les 2 points pour la transformation ([0] si aucune transformation de repere) */
   protected GrPoint[] scalingImgPoints=new GrPoint[0];
   /** Mise a l'echelle : Les 2 points pour la transformation ([0] si aucune transformation de repere) */
@@ -101,7 +101,7 @@
   /**
    * @return the waterElevation
    */
-  public double getWaterElevation() {
+  public Double getWaterElevation() {
     return waterElevation;
   }
 
@@ -108,7 +108,7 @@
   /**
    * @param waterElevation the waterElevation to set
    */
-  public void setWaterElevation(double waterElevation) {
+  public void setWaterElevation(Double waterElevation) {
     this.waterElevation = waterElevation;
   }
   

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