diff --git a/criteria1DWidget/criteria1DWidget.cpp b/criteria1DWidget/criteria1DWidget.cpp index 54f828e26..36bf4672a 100644 --- a/criteria1DWidget/criteria1DWidget.cpp +++ b/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/crop/development.cpp b/crop/development.cpp index ed2c3398e..7b5ae2160 100644 --- a/crop/development.cpp +++ b/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) {