update soil editor

ARPA-SIMC · Nov 16, 2023 · c72de37 · c72de37
1 parent 18f3164
commit c72de37
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 22 deletions.
diff --git a/agrolib/soilWidget/tabHydraulicConductivityCurve.cpp b/agrolib/soilWidget/tabHydraulicConductivityCurve.cpp
@@ -85,7 +85,7 @@ void TabHydraulicConductivityCurve::insertElements(soil::Crit3DSoil *soil)
     fillElement = true;
     mySoil = soil;
     double x;
-    double maxThetaSat = 0;
+    double maxValue = 0;
 
     for (unsigned int i = 0; i < mySoil->nrHorizons; i++)
     {
@@ -95,14 +95,14 @@ void TabHydraulicConductivityCurve::insertElements(soil::Crit3DSoil *soil)
         QLineSeries* curve = new QLineSeries();
         curve->setColor(color);
         double factor = 1.1;
-        x = dxMin;
-        while (x < dxMax*factor)
+        x = xMin;
+        while (x <= xMax)
         {
             double y = soil::waterConductivityFromSignPsi(-x, mySoil->horizon[i]);
             if (y != NODATA)
             {
                 curve->append(x,y);
-                maxThetaSat = MAXVALUE(maxThetaSat, y);
+                maxValue = std::max(maxValue, y);
             }
             x *= factor;
         }
@@ -114,11 +114,11 @@ void TabHydraulicConductivityCurve::insertElements(soil::Crit3DSoil *soil)
         connect(curve, &QLineSeries::hovered, this, &TabHydraulicConductivityCurve::tooltipLineSeries);
     }
 
-    // round maxThetaSat to first decimal
-    maxThetaSat = ceil(maxThetaSat * 10) * 0.1;
+    // round maxValue to first decimal
+    maxValue = ceil(maxValue * 10) * 0.1;
 
-    // rescale to maxThetaSat
-    axisY->setMax(std::max(yMax, maxThetaSat));
+    // rescale to maxValue
+    axisY->setMax(std::max(yMax, maxValue));
 
     for (int i=0; i < barHorizons.barList.size(); i++)
     {

diff --git a/agrolib/soilWidget/tabHydraulicConductivityCurve.h b/agrolib/soilWidget/tabHydraulicConductivityCurve.h
@@ -31,11 +31,8 @@
         bool fillElement;
         int indexSelected;
 
-        double dxMin = 0.001;
-        double dxMax = 10000000;
-
-        double xMin = (dxMin * 100);
-        double xMax = (dxMax / 100);
+        double xMin = 0.1;
+        double xMax = 100000;
         double yMin = pow(10, -12);
         double yMax = 1000;
 

diff --git a/agrolib/soilWidget/tabWaterRetentionCurve.cpp b/agrolib/soilWidget/tabWaterRetentionCurve.cpp
@@ -105,8 +105,8 @@ void TabWaterRetentionCurve::insertElements(soil::Crit3DSoil *soil)
         QLineSeries* curve = new QLineSeries();
         curve->setColor(color);
         double factor = 1.2;
-        x = dxMin;
-        while (x < dxMax*factor)
+        x = xMin;
+        while (x <= xMax)
         {
             double y = soil::thetaFromSignPsi(-x, mySoil->horizon[i]);
             if (y != NODATA)

diff --git a/agrolib/soilWidget/tabWaterRetentionCurve.h b/agrolib/soilWidget/tabWaterRetentionCurve.h
@@ -36,13 +36,8 @@
         bool fillElement;
         int indexSelected;
 
-        double dxMin = 0.001;
-        double dxMax = 10000000;
-        double dyMin = 0.0;
-        double dyMax = 1.0;
-
-        double xMin = (dxMin * 100);
-        double xMax = (dxMax / 100);
+        double xMin = 0.1;
+        double xMax = 100000;
         double yMin = 0.0;
         double yMax = 0.6;