Merge commit 'cae4252a4199467a1730c129da391514f390fb24'

Author: cate-to

agrolib/criteriaOutput/criteriaOutputElaboration.cpp

@@ -291,7 +291,7 @@ bool writeDtxToDB(QSqlDatabase db, QString idCase, std::vector<double>& dt30,
 int writeCsvOutputUnit(const QString &idCase, const QString &idCropClass, const QList<QString> &dataTables,
                        QSqlDatabase &dbData, QSqlDatabase &dbCrop, QSqlDatabase &dbClimateData,
                        const QDate &dateComputation, const CriteriaOutputVariable &outputVariable,
-                       const QString &csvFileName, QString &errorStr)
+                       const QString &csvFileName, int &nrMissingData, QString &errorStr)
 {
     // IRRI RATIO (parameter for elaboration on IRRIGATION variable)
     float irriRatio = NODATA;
@@ -311,6 +311,7 @@ int writeCsvOutputUnit(const QString &idCase, const QString &idCropClass, const
 
     double result = NODATA;
     int periodTDX = NODATA;
+    nrMissingData = 0;
 
     // check if table for idCase exist (skip otherwise)
     if (! dataTables.contains(idCase))
@@ -396,6 +397,7 @@ int writeCsvOutputUnit(const QString &idCase, const QString &idCropClass, const
             if (selectRes == ERROR_DB_INCOMPLETE_DATA)
             {
                 result = NODATA;
+                ++nrMissingData;
             }
             else if(selectRes != CRIT1D_OK)
             {
@@ -421,6 +423,7 @@ int writeCsvOutputUnit(const QString &idCase, const QString &idCropClass, const
             if (DTXRes == ERROR_DB_INCOMPLETE_DATA)
             {
                 result = NODATA;
+                ++nrMissingData;
             }
             else if (DTXRes != CRIT1D_OK)
             {
@@ -613,7 +616,6 @@ int selectSimpleVar(QSqlDatabase& db, QString idCase, QString varName, QString c
         }
     }
 
-
     QString statement = QString("SELECT %1(`%2`) FROM `%3` WHERE DATE >= '%4' AND DATE <= '%5'")
                     .arg(computation, varName, idCase, firstDate.toString("yyyy-MM-dd"), lastDate.toString("yyyy-MM-dd"));
     if(! qry.exec(statement))

agrolib/criteriaOutput/criteriaOutputElaboration.h

@@ -22,9 +22,9 @@
                       std::vector<double> &dt90, std::vector<double> &dt180, QString &errorStr);
 
     int writeCsvOutputUnit(const QString &idCase, const QString &idCropClass, const QList<QString> &dataTables,
-                            QSqlDatabase &dbData, QSqlDatabase &dbCrop, QSqlDatabase &dbClimateData,
-                            const QDate &dateComputation, const CriteriaOutputVariable &outputVariable,
-                            const QString &csvFileName, QString &errorStr);
+                           QSqlDatabase &dbData, QSqlDatabase &dbCrop, QSqlDatabase &dbClimateData,
+                           const QDate &dateComputation, const CriteriaOutputVariable &outputVariable,
+                           const QString &csvFileName, int &nrMissingData, QString &errorStr);
 
     int selectSimpleVar(QSqlDatabase &db, QString idCase, QString varName, QString computation, QDate firstDate,
                         QDate lastDate, float irriRatio, std::vector<float> &resultVector, QString &errorStr);

agrolib/criteriaOutput/criteriaOutputProject.cpp

@@ -525,23 +525,28 @@ int CriteriaOutputProject::createCsvFile()
     // list of data tables
     QList<QString> dataTables = dbData.tables();
 
+    int totalMissingData = 0;
     for (unsigned int i=0; i < compUnitList.size(); i++)
     {
         idCase = compUnitList[i].idCase;
         idCropClass = compUnitList[i].idCropClass;
 
+        int nrMissingData;
         myResult = writeCsvOutputUnit(idCase, idCropClass, dataTables, dbData, dbCrop, dbClimateData,
-                                      dateComputation, outputVariable, outputCsvFileName, projectError);
+                                      dateComputation, outputVariable, outputCsvFileName, nrMissingData, projectError);
         if (myResult != CRIT1D_OK)
         {
             if (QFile(outputCsvFileName).exists() && i == 0)
             {
                 // delete empty file
                 QDir().remove(outputCsvFileName);
             }
+
             return myResult;
         }
 
+        totalMissingData += nrMissingData;
+
         // counter
         if (i % step == 0)
         {
@@ -554,6 +559,11 @@ int CriteriaOutputProject::createCsvFile()
         }
     }
 
+    if (totalMissingData > 0)
+    {
+        logger.writeInfo("WARNING! Cases with missing data: " + QString::number(totalMissingData));
+    }
+
     return CRIT1D_OK;
 }
 
@@ -595,15 +605,11 @@ int CriteriaOutputProject::createShapeFile()
     {
         QDir().mkdir(outputShapeFilePath);
     }
+
     if (! shapeFromCsv(inputShape, outputCsvFileName, fieldListFileName, outputShapeFileName, projectError))
     {
         return ERROR_SHAPEFILE;
     }
-    /*
-    if (! shapeComputation(outputShapeFileName, computationListFileName, projectError))
-    {
-        return ERROR_SHAPEFILE;
-    }*/
 
     return CRIT1D_OK;
 }
@@ -1318,8 +1324,9 @@ int CriteriaOutputProject::createCsvFileFromGUI(const QDate &dateComputation, co
         QString idCase = compUnitList[i].idCase;
         QString idCropClass = compUnitList[i].idCropClass;
 
+        int nrMissingData = 0;
         myResult = writeCsvOutputUnit(idCase, idCropClass, dataTables, dbData, dbCrop, dbClimateData,
-                                      dateComputation, outputVariable, csvFileName, projectError);
+                                      dateComputation, outputVariable, csvFileName, nrMissingData, projectError);
         if (myResult != CRIT1D_OK)
         {
             if (QFile(csvFileName).exists() && i == 0)

agrolib/criteriaOutput/criteriaOutputProject.h

@@ -40,7 +40,7 @@
     #define ERROR_MAPS -85
     #define ERROR_MISSING_GDAL -100
 
-    #define CRITERIA_VERSION "v2.0.0 (2026)"
+    #define CRITERIA_OUTPUT_VERSION "v2.0.1 (2026)"
 
 
     class CriteriaOutputProject

agrolib/shapeUtilities/shapeFromCsv.cpp

@@ -317,7 +317,7 @@ bool shapeFromCsv(const Crit3DShapeHandler &refShapeFile, const QString &csvFile
                     }
                     if (! writeOK)
                     {
-                        errorStr = "Error in write this cases: " + idCase;
+                        errorStr = "Error in writing case: " + idCase + "\n*** Value: " + valueToWrite;
                         outputShapeFile.close();
                         csvFile.close();
                         return false;
@@ -331,7 +331,8 @@ bool shapeFromCsv(const Crit3DShapeHandler &refShapeFile, const QString &csvFile
     outputShapeFile.close();
     csvFile.close();
 
-    std::cout << " done.\n";
+    std::cout << " done." << std::endl;
+
     return true;
 }