Merge branch 'master' of https://github.com/ARPA-SIMC/CRITERIA1D

ARPA-SIMC · Jul 5, 2024 · 1e423b8 · 1e423b8
2 parents 4bc3518 + c1a0a14
commit 1e423b8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/agrolib/criteria1DWidget/tabIrrigation.cpp b/agrolib/criteria1DWidget/tabIrrigation.cpp
@@ -253,8 +253,6 @@ void TabIrrigation::tooltipLAI(QPointF point, bool isShow)
  }
 }
 
-
-// TODO Giada
 void TabIrrigation::tooltipEvapTransp(QPointF point, bool isShow)
 {
  if (isShow)

diff --git a/agrolib/soilWidget/soilWidget.cpp b/agrolib/soilWidget/soilWidget.cpp
@@ -293,7 +293,7 @@ void Crit3DSoilWidget::setDbSoil(QSqlDatabase dbOpened, QString soilCode)
  // load default geotechnics parameters (not mandatory)
  if (! loadGeotechnicsParameters(dbSoil, geotechnicsClassList, errorStr))
  {
- QMessageBox::warning(nullptr, "Warning", "loadGeotechnicsParameters\n" + errorStr);
+ QMessageBox::warning(nullptr, "Warning", "Failed to load geotecnical parameters for slope stability: missing reference db");
  }
 
  // read soil list

diff --git a/agrolib/soilWidget/tabHorizons.cpp b/agrolib/soilWidget/tabHorizons.cpp
@@ -275,7 +275,7 @@ bool TabHorizons::checkDepths()
  for (int horizonNum = 0; horizonNum<tableDb->rowCount(); horizonNum++)
  {
  //except first row
- if ( horizonNum > 0)
+ if (horizonNum > 0)
  {
  if (mySoil->horizon[unsigned(horizonNum)].dbData.upperDepth != mySoil->horizon[horizonNum-1].dbData.lowerDepth)
  {
@@ -366,12 +366,12 @@ bool TabHorizons::checkHorizonData(int horizonNum)
  tableDb->item(horizonNum,9)->setBackground(Qt::red);
  }
 
- if (dbData->effectiveCohesion != NODATA && (dbData->effectiveCohesion < 0))
+ if (dbData->effectiveCohesion != NODATA && (dbData->effectiveCohesion < 0 || dbData->effectiveCohesion > 110))
  {
  tableDb->item(horizonNum,10)->setBackground(Qt::red);
  }
 
- if (dbData->frictionAngle != NODATA && (dbData->frictionAngle < 0))
+ if (dbData->frictionAngle != NODATA && (dbData->frictionAngle < 0 || dbData->frictionAngle > 50))
  {
  tableDb->item(horizonNum,11)->setBackground(Qt::red);
  }
@@ -462,12 +462,12 @@ void TabHorizons::checkComputedValues(int horizonNum)
  tableModel->item(horizonNum,5)->setBackground(Qt::yellow);
  }
 
- if (horizon->dbData.effectiveCohesion == NODATA)
+ if (abs(horizon->dbData.effectiveCohesion - horizon->effectiveCohesion) > EPSILON)
  {
  tableModel->item(horizonNum,11)->setBackground(Qt::yellow);
  }
 
- if (horizon->dbData.frictionAngle == NODATA)
+ if (abs(horizon->dbData.frictionAngle - horizon->frictionAngle) > EPSILON)
  {
  tableModel->item(horizonNum,12)->setBackground(Qt::yellow);
  }