Merge commit '9c6ec1ca6b0dfa7eb54cab8e8ff3da3a9f9586e7'

ARPA-SIMC · Mar 10, 2023 · 19079e9 · 19079e9
2 parents e0b8fe4 + 9c6ec1c
commit 19079e9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/agrolib/criteria1DWidget/criteria1DWidget.cpp b/agrolib/criteria1DWidget/criteria1DWidget.cpp
@@ -51,7 +51,7 @@
 
 Criteria1DWidget::Criteria1DWidget()
 {
-    resize(1300, 700);
+    resize(1200, 600);
 
     // font
     QFont currentFont = this->font();
@@ -2037,9 +2037,9 @@ bool Criteria1DWidget::checkIfCropIsChanged()
         return cropChanged;
     }
     // roots
-    if(cropFromDB.roots.rootDepthMin != rootDepthZeroValue->text().toDouble()
-            || cropFromDB.roots.rootDepthMax != rootDepthMaxValue->text().toDouble()
-            || cropFromDB.roots.shapeDeformation != shapeDeformationValue->value()
+    if(! isEqual(cropFromDB.roots.rootDepthMin, rootDepthZeroValue->text().toDouble())
+            || ! isEqual(cropFromDB.roots.rootDepthMax, rootDepthMaxValue->text().toDouble())
+            || ! isEqual(cropFromDB.roots.shapeDeformation, shapeDeformationValue->value())
             || cropFromDB.roots.rootShape != root::getRootDistributionTypeFromString(rootShapeComboBox->currentText().toStdString()))
     {
         cropChanged = true;

diff --git a/agrolib/crop/development.cpp b/agrolib/crop/development.cpp
@@ -135,7 +135,7 @@ namespace leafDevelopment
         if (myCrop->type == FRUIT_TREE)
             c4 = 15.0;
         else
-            c4 = 10.0;
+            c4 = 9.0;
 
         if (myDegreeDays <= myCrop->degreeDaysIncrease)
         {