Skip to content

Commit

Permalink
Merge commit '906fcb2df0f705383b9e093f4687b959a82c14c5'
Browse files Browse the repository at this point in the history
  • Loading branch information
ftomei committed Oct 1, 2020
2 parents 69ca50b + 906fcb2 commit cdb0c66
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions agrolib/dbMeteoPoints/dbMeteoPointsHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ QDateTime Crit3DMeteoPointsDbHandler::getFirstDate(frequencyType frequency)
{
myDate = QDate::fromString(dateStr.mid(0,10), "yyyy-MM-dd");
myTime = QTime::fromString(dateStr.mid(11,8), "HH:mm:ss");
QDateTime date(QDateTime(myDate, myTime, Qt::UTC));
date = QDateTime(myDate, myTime, Qt::UTC);
}

if (firstDate.isNull() || date < firstDate)
Expand Down Expand Up @@ -272,7 +272,7 @@ QDateTime Crit3DMeteoPointsDbHandler::getLastDate(frequencyType frequency)
{
myDate = QDate::fromString(dateStr.mid(0,10), "yyyy-MM-dd");
myTime = QTime::fromString(dateStr.mid(11,8), "HH:mm:ss");
QDateTime date(QDateTime(myDate, myTime, Qt::UTC));
date = QDateTime(myDate, myTime, Qt::UTC);
}

if (lastDate.isNull() || date > lastDate)
Expand Down Expand Up @@ -318,7 +318,7 @@ QDateTime Crit3DMeteoPointsDbHandler::getFirstDate(frequencyType frequency, std:
{
myDate = QDate::fromString(dateStr.mid(0,10), "yyyy-MM-dd");
myTime = QTime::fromString(dateStr.mid(11,8), "HH:mm:ss");
QDateTime firstDate(QDateTime(myDate, myTime, Qt::UTC));
firstDate = QDateTime(myDate, myTime, Qt::UTC);
}
}
}
Expand Down Expand Up @@ -358,7 +358,7 @@ QDateTime Crit3DMeteoPointsDbHandler::getLastDate(frequencyType frequency, std::
{
myDate = QDate::fromString(dateStr.mid(0,10), "yyyy-MM-dd");
myTime = QTime::fromString(dateStr.mid(11,8), "HH:mm:ss");
QDateTime lastDate(QDateTime(myDate, myTime, Qt::UTC));
lastDate = QDateTime(myDate, myTime, Qt::UTC);
}
}
}
Expand Down

0 comments on commit cdb0c66

Please sign in to comment.