update colorscale

ARPA-SIMC · Jul 7, 2024 · eb760c6 · eb760c6
1 parent 4ce5a57
commit eb760c6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/agrolib/graphics/colorLegend.cpp b/agrolib/graphics/colorLegend.cpp
@@ -56,13 +56,13 @@ void ColorLegend::paintEvent(QPaintEvent *event)
 
         if ((i % stepText) == 0)
         {
-            if (isEqual(dblValue, 0) || isEqual(dblValue, 1))
+            if (fabs(dblValue) <= 1)
             {
                 nrDigits = 1;
             }
             else
             {
-                nrDigits = abs(ceil(log10(fabs(dblValue))));
+                nrDigits = int(ceil(log10(fabs(dblValue))));
             }
 
             // negative numbers

diff --git a/bin/CRITERIA3D/mainwindow.cpp b/bin/CRITERIA3D/mainwindow.cpp
@@ -2381,18 +2381,24 @@ void MainWindow::showCriteria3DVariable(criteria3DVariable var, int layerIndex,
     // set range
     if (isFixedRange)
     {
-        if (! isEqual(minimum, NODATA))
-            myProject.criteria3DMap.colorScale->setMinimum(minimum);
-        if (! isEqual(maximum, NODATA))
-            myProject.criteria3DMap.colorScale->setMaximum(maximum);
-
+        myProject.criteria3DMap.colorScale->setRange(minimum, maximum);
         myProject.criteria3DMap.colorScale->setFixedRange(true);
         myProject.criteria3DMap.colorScale->setHideOutliers(true);
     }
     else
     {
         myProject.criteria3DMap.colorScale->setFixedRange(false);
         myProject.criteria3DMap.colorScale->setHideOutliers(false);
+
+        if (! isEqual(minimum, NODATA) || ! isEqual(maximum, NODATA))
+        {
+            if (! isEqual(minimum, NODATA))
+                myProject.criteria3DMap.colorScale->setMinimum(minimum);
+            if (! isEqual(maximum, NODATA))
+                myProject.criteria3DMap.colorScale->setMaximum(maximum);
+
+            myProject.criteria3DMap.colorScale->setHideOutliers(true);
+        }
     }
 
     setCurrentRasterOutput(&(myProject.criteria3DMap));
@@ -3183,7 +3189,7 @@ void MainWindow::on_actionHide_Geomap_triggered()
 
 void MainWindow::on_actionView_surfaceWaterContent_automatic_range_triggered()
 {
-    showCriteria3DVariable(volumetricWaterContent, 0, true, 0.1, NODATA);
+    showCriteria3DVariable(volumetricWaterContent, 0, false, 0.1, NODATA);
 }
 
 

diff --git a/bin/CRITERIA3D/mainwindow.ui b/bin/CRITERIA3D/mainwindow.ui
@@ -1293,7 +1293,7 @@
        <second>0</second>
        <year>1752</year>
        <month>9</month>
-       <day>19</day>
+       <day>18</day>
       </datetime>
      </property>
      <property name="maximumDate">