Compare commits
2 Commits
f547f563bf
...
praesentat
Author | SHA1 | Date | |
---|---|---|---|
ed6d355517 | |||
f1f033d1cd |
@@ -37,6 +37,11 @@ static QDateTime start_ = QDateTime::currentDateTime();
|
|||||||
static Configuration const *current_tariff{nullptr};
|
static Configuration const *current_tariff{nullptr};
|
||||||
|
|
||||||
int CALCULATE_LIBRARY_API isOutOfService(QDateTime const &dt) {
|
int CALCULATE_LIBRARY_API isOutOfService(QDateTime const &dt) {
|
||||||
|
if (!current_tariff) {
|
||||||
|
qCritical() << __func__ << ":" << __LINE__ << "NO CURRENT TARIFF";
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// L201
|
// L201
|
||||||
if (current_tariff->tariffFileName.contains("tariff01")) {
|
if (current_tariff->tariffFileName.contains("tariff01")) {
|
||||||
qCritical() << __func__ << ":" << __LINE__ << "NO";
|
qCritical() << __func__ << ":" << __LINE__ << "NO";
|
||||||
@@ -67,7 +72,7 @@ int CALCULATE_LIBRARY_API isOutOfService(QDateTime const &dt) {
|
|||||||
|
|
||||||
if (dt.time() >= QTime::fromString("23:00:00", Qt::ISODate)) {
|
if (dt.time() >= QTime::fromString("23:00:00", Qt::ISODate)) {
|
||||||
qCritical() << __func__ << ":" << __LINE__ << "YES";
|
qCritical() << __func__ << ":" << __LINE__ << "YES";
|
||||||
return false;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
} else
|
} else
|
||||||
@@ -825,6 +830,7 @@ CalcState CALCULATE_LIBRARY_API init_tariff(parking_tariff_t **tariff, char cons
|
|||||||
}
|
}
|
||||||
QFileInfo fi(confFile);
|
QFileInfo fi(confFile);
|
||||||
(*tariff)->tariffFileName << fi.baseName();
|
(*tariff)->tariffFileName << fi.baseName();
|
||||||
|
current_tariff = *tariff;
|
||||||
} else {
|
} else {
|
||||||
delete *tariff;
|
delete *tariff;
|
||||||
*tariff = nullptr;
|
*tariff = nullptr;
|
||||||
@@ -1099,7 +1105,9 @@ int CALCULATE_LIBRARY_API compute_next_timestep(parking_tariff_t *tariff, int cu
|
|||||||
qCritical() << __LINE__ << "compute_next_timestep() TTTTTT tariff-files:" << tariff->tariffFileName;
|
qCritical() << __LINE__ << "compute_next_timestep() TTTTTT tariff-files:" << tariff->tariffFileName;
|
||||||
if (tariff->tariffFileName.contains("tariff02") ||
|
if (tariff->tariffFileName.contains("tariff02") ||
|
||||||
tariff->tariffFileName.contains("tariff02_1700_2300") ||
|
tariff->tariffFileName.contains("tariff02_1700_2300") ||
|
||||||
tariff->tariffFileName.contains("tariff02_1900_2300")) {
|
tariff->tariffFileName.contains("tariff02_1900_2300") ||
|
||||||
|
tariff->tariffFileName.contains("tariff03") ||
|
||||||
|
tariff->tariffFileName.contains("tariff03_H242_sat")) {
|
||||||
QDateTime dt = start_.addSecs( stepList[nextStepIndex] * 60);
|
QDateTime dt = start_.addSecs( stepList[nextStepIndex] * 60);
|
||||||
qCritical() << __LINE__ << "compute_next_timestep() dt:" << dt.toString(Qt::ISODate);
|
qCritical() << __LINE__ << "compute_next_timestep() dt:" << dt.toString(Qt::ISODate);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user