Skip to content

Commit

Permalink
update fallow
Browse files Browse the repository at this point in the history
  • Loading branch information
ftomei committed Mar 10, 2023
1 parent 2bc65d3 commit 9c6ec1c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions criteria1DWidget/criteria1DWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

Criteria1DWidget::Criteria1DWidget()
{
resize(1300, 700);
resize(1200, 600);

// font
QFont currentFont = this->font();
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion crop/development.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down

0 comments on commit 9c6ec1c

Please sign in to comment.