Skip to content

Commit

Permalink
Merge commit '84f8d32bf81547cfe9ec6625d6f4098651041a5e'
Browse files Browse the repository at this point in the history
  • Loading branch information
@giadasan
giadasan committed Jun 25, 2024
2 parents 40e90ed + 84f8d32 commit 8c4a777
Show file tree
Hide file tree
Showing 29 changed files with 868 additions and 813 deletions.
780 changes: 354 additions & 426 deletions agrolib/dbMeteoGrid/dbMeteoGrid.cpp
View file

Large diffs are not rendered by default.

145 changes: 75 additions & 70 deletions agrolib/dbMeteoGrid/dbMeteoGrid.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
QString password;
};


struct TXMLvar
{
QString varField;
Expand All @@ -58,35 +57,41 @@
Crit3DMeteoGridDbHandler();
~Crit3DMeteoGridDbHandler();

bool openDatabase(QString *myError);
bool openDatabase(QString *myError, QString connectionName);
bool newDatabase(QString *myError);
bool newDatabase(QString *myError, QString connectionName);
bool deleteDatabase(QString *myError);
QString fileName() const { return _fileName; }
TXMLConnection connection() const { return _connection; }

QSqlDatabase db() const { return _db; }
void setDb(const QSqlDatabase &db) { _db = db; }

QDate firstDate() const { return _firstDate; }
QDate lastDate() const { return _lastDate; }

void setFirstDate(const QDate &firstDate) { _firstDate = firstDate; }
void setLastDate(const QDate &lastDate) { _lastDate = lastDate; }

Crit3DMeteoGridStructure gridStructure() const { return _gridStructure; }

Crit3DMeteoGrid *meteoGrid() const { return _meteoGrid; }
void setMeteoGrid(Crit3DMeteoGrid *meteoGrid) { _meteoGrid = meteoGrid; }

TXMLTable tableHourly() const { return _tableHourly; }
TXMLTable tableDaily() const { return _tableDaily; }
TXMLTable tableMonthly() const { return _tableMonthly; }

QString tableDailyModel() const { return _tableDailyModel; }
QString tableHourlyModel() const { return _tableHourlyModel; }

bool openDatabase(QString *errorStr);
bool openDatabase(QString *errorStr, QString connectionName);
bool newDatabase(QString *errorStr);
bool newDatabase(QString *errorStr, QString connectionName);
bool deleteDatabase(QString *errorStr);
void closeDatabase();
bool parseXMLFile(QString xmlFileName, QDomDocument* xmlDoc, QString *error);
bool checkXML(QString *myError);
bool parseXMLGrid(QString xmlFileName, QString *myError);
bool checkXML(QString *errorStr);
bool parseXMLGrid(QString xmlFileName, QString *errorStr);
void initMapMySqlVarType();

QSqlDatabase db() const;
QString fileName() const;
TXMLConnection connection() const;
Crit3DMeteoGridStructure gridStructure() const;
Crit3DMeteoGrid *meteoGrid() const;
QDate firstDate() const;
QDate lastDate() const;
TXMLTable tableDaily() const;
TXMLTable tableHourly() const;
TXMLTable tableMonthly() const;
QString tableDailyModel() const;
QString tableHourlyModel() const;

void setMeteoGrid(Crit3DMeteoGrid *meteoGrid);
void setDb(const QSqlDatabase &db);
void setFirstDate(const QDate &firstDate);
void setLastDate(const QDate &lastDate);

int getDailyVarCode(meteoVariable meteoGridDailyVar);
QString getDailyVarField(meteoVariable meteoGridDailyVar);
meteoVariable getDailyVarEnum(int varCode);
Expand All @@ -106,60 +111,60 @@
std::string getHourlyPragaName(meteoVariable meteoVar);
std::string getMonthlyPragaName(meteoVariable meteoVar);

bool loadCellProperties(QString *myError);
bool newCellProperties(QString *myError);
bool writeCellProperties(QString *myError, int nRow, int nCol);
bool loadIdMeteoProperties(QString *myError, QString idMeteo);
bool updateMeteoGridDate(QString &myError);

bool loadGridDailyData(QString &myError, const QString &meteoPointId, const QDate &firstDate, const QDate &lastDate);
bool loadGridDailyDataFixedFields(QString &myError, QString meteoPoint, QDate first, QDate last);
bool loadGridDailyDataEnsemble(QString &myError, QString meteoPoint, int memberNr, QDate first, QDate last);
bool loadGridDailyMeteoPrec(QString &myError, const QString &meteoPointId, const QDate &firstDate, const QDate &lastDate);
bool loadGridHourlyData(QString &myError, QString meteoPoint, QDateTime firstDate, QDateTime lastDate);
bool loadGridHourlyDataFixedFields(QString &myError, QString meteoPoint, QDateTime first, QDateTime last);
bool loadGridHourlyDataEnsemble(QString &myError, QString meteoPoint, int memberNr, QDateTime first, QDateTime last);
bool loadGridMonthlyData(QString &myError, QString meteoPoint, QDate firstDate, QDate lastDate);
bool loadGridAllMonthlyData(QString &myError, QDate firstDate, QDate lastDate);
bool loadGridMonthlySingleDate(QString &myError, const QString &meteoPoint, const QDate &myDate);

std::vector<float> loadGridDailyVar(QString *myError, QString meteoPoint, meteoVariable variable, QDate first, QDate last, QDate *firstDateDB);
std::vector<float> loadGridDailyVarFixedFields(QString *myError, QString meteoPoint, meteoVariable variable, QDate first, QDate last, QDate* firstDateDB);
std::vector<float> loadGridHourlyVar(QString *myError, QString meteoPoint, meteoVariable variable, QDateTime first, QDateTime last, QDateTime* firstDateDB);
std::vector<float> loadGridHourlyVarFixedFields(QString *myError, QString meteoPoint, meteoVariable variable, QDateTime first, QDateTime last, QDateTime* firstDateDB);
std::vector<float> exportAllDataVar(QString *myError, frequencyType freq, meteoVariable variable, QString id, QDateTime myFirstTime, QDateTime myLastTime, std::vector<QString> &dateStr);
bool getYearList(QString *myError, QString meteoPoint, QList<QString>* yearList);
bool idDailyList(QString *myError, QList<QString>* idMeteoList);

bool saveGridData(QString *myError, QDateTime firstTime, QDateTime lastTime, QList<meteoVariable> meteoVariableList, Crit3DMeteoSettings *meteoSettings);
bool saveGridHourlyData(QString *myError, QDateTime firstDate, QDateTime lastDate, QList<meteoVariable> meteoVariableList);
bool saveGridDailyData(QString *myError, QDateTime firstDate, QDateTime lastDate, QList<meteoVariable> meteoVariableList, Crit3DMeteoSettings *meteoSettings);
bool deleteAndWriteCellGridDailyData(QString& myError, QString meteoPointID, int row, int col, QDate firstDate, QDate lastDate,
bool loadCellProperties(QString *errorStr);
bool newCellProperties(QString *errorStr);
bool writeCellProperties(QString *errorStr, int nRow, int nCol);
bool loadIdMeteoProperties(QString *errorStr, QString idMeteo);
bool updateMeteoGridDate(QString &errorStr);

bool loadGridDailyData(QString &errorStr, const QString &meteoPointId, const QDate &firstDate, const QDate &lastDate);
bool loadGridDailyDataFixedFields(QString &errorStr, QString meteoPoint, QDate first, QDate last);
bool loadGridDailyDataEnsemble(QString &errorStr, QString meteoPoint, int memberNr, QDate first, QDate last);
bool loadGridDailyMeteoPrec(QString &errorStr, const QString &meteoPointId, const QDate &firstDate, const QDate &lastDate);
bool loadGridHourlyData(QString &errorStr, QString meteoPoint, QDateTime firstDate, QDateTime lastDate);
bool loadGridHourlyDataFixedFields(QString &errorStr, QString meteoPoint, QDateTime first, QDateTime last);
bool loadGridHourlyDataEnsemble(QString &errorStr, QString meteoPoint, int memberNr, QDateTime first, QDateTime last);
bool loadGridMonthlyData(QString &errorStr, QString meteoPoint, QDate firstDate, QDate lastDate);
bool loadGridAllMonthlyData(QString &errorStr, QDate firstDate, QDate lastDate);
bool loadGridMonthlySingleDate(QString &errorStr, const QString &meteoPoint, const QDate &myDate);

std::vector<float> loadGridDailyVar(QString *errorStr, QString meteoPoint, meteoVariable variable, QDate first, QDate last, QDate *firstDateDB);
std::vector<float> loadGridDailyVarFixedFields(QString *errorStr, QString meteoPoint, meteoVariable variable, QDate first, QDate last, QDate* firstDateDB);
std::vector<float> loadGridHourlyVar(QString *errorStr, QString meteoPoint, meteoVariable variable, QDateTime first, QDateTime last, QDateTime* firstDateDB);
std::vector<float> loadGridHourlyVarFixedFields(QString *errorStr, QString meteoPoint, meteoVariable variable, QDateTime first, QDateTime last, QDateTime* firstDateDB);
std::vector<float> exportAllDataVar(QString *errorStr, frequencyType freq, meteoVariable variable, QString id, QDateTime myFirstTime, QDateTime myLastTime, std::vector<QString> &dateStr);
bool getYearList(QString *errorStr, QString meteoPoint, QList<QString>* yearList);
bool idDailyList(QString *errorStr, QList<QString>* idMeteoList);

bool saveGridData(QString *errorStr, QDateTime firstTime, QDateTime lastTime, QList<meteoVariable> meteoVariableList, Crit3DMeteoSettings *meteoSettings);
bool saveGridHourlyData(QString *errorStr, QDateTime firstDate, QDateTime lastDate, QList<meteoVariable> meteoVariableList);
bool saveGridDailyData(QString *errorStr, QDateTime firstDate, QDateTime lastDate, QList<meteoVariable> meteoVariableList, Crit3DMeteoSettings *meteoSettings);
bool deleteAndWriteCellGridDailyData(QString& errorStr, QString meteoPointID, int row, int col, QDate firstDate, QDate lastDate,
QList<meteoVariable> meteoVariableList, Crit3DMeteoSettings* meteoSettings);
bool saveCellGridDailyData(QString *myError, QString meteoPointID, int row, int col, QDate firstDate, QDate lastDate, QList<meteoVariable> meteoVariableList, Crit3DMeteoSettings *meteoSettings);
bool saveCellGridDailyDataFF(QString *myError, QString meteoPointID, int row, int col, QDate firstDate, QDate lastDate, Crit3DMeteoSettings *meteoSettings);
bool saveCellGridDailyDataEnsemble(QString *myError, QString meteoPointID, int row, int col, QDate firstDate, QDate lastDate,
bool saveCellGridDailyData(QString *errorStr, QString meteoPointID, int row, int col, QDate firstDate, QDate lastDate, QList<meteoVariable> meteoVariableList, Crit3DMeteoSettings *meteoSettings);
bool saveCellGridDailyDataFF(QString *errorStr, QString meteoPointID, int row, int col, QDate firstDate, QDate lastDate, Crit3DMeteoSettings *meteoSettings);
bool saveCellGridDailyDataEnsemble(QString *errorStr, QString meteoPointID, int row, int col, QDate firstDate, QDate lastDate,
QList<meteoVariable> meteoVariableList, int memberNr, Crit3DMeteoSettings *meteoSettings);
bool saveCellGridMonthlyData(QString *myError, QString meteoPointID, int row, int col, QDate firstDate, QDate lastDate,
bool saveCellGridMonthlyData(QString *errorStr, QString meteoPointID, int row, int col, QDate firstDate, QDate lastDate,
QList<meteoVariable> meteoVariableList);
bool saveListDailyDataEnsemble(QString *myError, QString meteoPointID, QDate date, meteoVariable meteoVar, QList<float> values);
bool saveListDailyData(QString *myError, QString meteoPointID, QDate firstDate, meteoVariable meteoVar, QList<float> values, bool reverseOrder);
bool cleanDailyOldData(QString *myError, QDate date);
bool saveListHourlyData(QString *myError, QString meteoPointID, QDateTime firstDateTime, meteoVariable meteoVar, QList<float> values);
bool saveCellCurrentGridDaily(QString *myError, QString meteoPointID, QDate date, int varCode, float value);
bool saveListDailyDataEnsemble(QString *errorStr, QString meteoPointID, QDate date, meteoVariable meteoVar, QList<float> values);
bool saveListDailyData(QString *errorStr, QString meteoPointID, QDate firstDate, meteoVariable meteoVar, QList<float> values, bool reverseOrder);
bool cleanDailyOldData(QString *errorStr, QDate date);
bool saveListHourlyData(QString *errorStr, QString meteoPointID, QDateTime firstDateTime, meteoVariable meteoVar, QList<float> values);
bool saveCellCurrentGridDaily(QString *errorStr, QString meteoPointID, QDate date, int varCode, float value);

bool saveCellCurrentGridDailyList(QString meteoPointID, QList<QString> listEntries, QString &errorStr);
bool saveCellCurrentGridHourlyList(QString meteoPointID, QList<QString> listEntries, QString &errorStr);

bool saveCellCurrentGridDailyFF(QString &errorStr, QString meteoPointID, QDate date, QString varPragaName, float value);
bool saveCellGridHourlyData(QString *myError, QString meteoPointID, int row, int col, QDateTime firstTime, QDateTime lastTime, QList<meteoVariable> meteoVariableList);
bool saveCellGridHourlyDataFF(QString *myError, QString meteoPointID, int row, int col, QDateTime firstTime, QDateTime lastTime);
bool saveCellGridHourlyDataEnsemble(QString *myError, QString meteoPointID, int row, int col,
bool saveCellGridHourlyData(QString *errorStr, QString meteoPointID, int row, int col, QDateTime firstTime, QDateTime lastTime, QList<meteoVariable> meteoVariableList);
bool saveCellGridHourlyDataFF(QString *errorStr, QString meteoPointID, int row, int col, QDateTime firstTime, QDateTime lastTime);
bool saveCellGridHourlyDataEnsemble(QString *errorStr, QString meteoPointID, int row, int col,
QDateTime firstTime, QDateTime lastTime, QList<meteoVariable> meteoVariableList, int memberNr);
bool saveCellCurrentGridHourly(QString& errorStr, QString meteoPointID, QDateTime dateTime, int varCode, float value);
bool saveCellCurrentGridHourlyFF(QString &errorStr, QString meteoPointID, QDateTime dateTime, QString varPragaName, float value);
bool activeAllCells(QString *myError);
bool setActiveStateCellsInList(QString *myError, QList<QString> idList, bool activeState);
bool activeAllCells(QString *errorStr);
bool setActiveStateCellsInList(QString *errorStr, QList<QString> idList, bool activeState);

bool saveDailyDataCsv(const QString &csvFileName, const QList<meteoVariable> &variableList,
const QDate &firstDate, const QDate &lastDate, unsigned row, unsigned col, QString &errorStr);
Expand All @@ -180,7 +185,7 @@
bool isHourly();
bool isMonthly();

bool saveLogProcedures(QString *myError, QString nameProc, QDate date);
bool saveLogProcedures(QString *errorStr, QString nameProc, QDate date);

private:

Expand Down
30 changes: 17 additions & 13 deletions agrolib/dbMeteoPoints/dbMeteoPointsHandler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,28 +76,32 @@ Crit3DMeteoPointsDbHandler::~Crit3DMeteoPointsDbHandler()
}


QString Crit3DMeteoPointsDbHandler::getDatasetURL(QString dataset)
QString Crit3DMeteoPointsDbHandler::getDatasetURL(QString dataset, bool &isOk)
{
QSqlQuery qry(_db);
QString url = nullptr;

qry.prepare( "SELECT URL FROM datasets WHERE dataset = :dataset");
qry.bindValue(":dataset", dataset);
errorStr = "";
QString queryStr = QString("SELECT URL FROM datasets WHERE dataset = '%1' OR dataset = '%2'").arg(dataset, dataset.toUpper());

if( !qry.exec() )
QSqlQuery qry(_db);
if(! qry.exec(queryStr))
{
qDebug() << qry.lastError();
isOk = false;
errorStr = qry.lastError().text();
return "";
}
else
{
if (qry.next())
url = qry.value(0).toString();

{
isOk = true;
return qry.value(0).toString();
}
else
qDebug( "Error: dataset not found" );
{
isOk = false;
errorStr = "dataset " + dataset + " not found in the table 'datasets'";
return "";
}
}

return url;
}


Expand Down
2 changes: 1 addition & 1 deletion agrolib/dbMeteoPoints/dbMeteoPointsHandler.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
QString getErrorString() { return errorStr; }
void setErrorString(QString str) { errorStr = str; }

QString getDatasetURL(QString dataset);
QString getDatasetURL(QString dataset, bool &isOk);
bool setAndOpenDb(QString dbname_);

QList<QString> getAllDatasetsList();
Expand Down
Loading

0 comments on commit 8c4a777

Please sign in to comment.