From 6b882136442a2320a176b7c2ec9d2390e2cf9c95 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Sat, 13 Jul 2024 13:57:07 +0200 Subject: [PATCH] GetTimeSteps(): return step-list as reference; return only a non-empty step-list. --- library/src/calculator_functions.cpp | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/library/src/calculator_functions.cpp b/library/src/calculator_functions.cpp index 0d78e02..4e2af8c 100644 --- a/library/src/calculator_functions.cpp +++ b/library/src/calculator_functions.cpp @@ -2090,21 +2090,17 @@ QList Calculator::GetPriceSteps(Configuration * /*cfg*/) const { return QList(); } -QList Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex) const { - qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << cfg << "paymentOptionIndex:" << paymentOptionIndex; +QList &Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex) const { + qCritical() << "(" << __func__ << ":" << __LINE__ << ") paymentOptionIndex:" << paymentOptionIndex; if (m_timeSteps.size() > paymentOptionIndex) { - qCritical() << __func__ << ":" << __LINE__ << ")" << "timeSteps:" << m_timeSteps[m_timeSteps.size() - 1]; - qCritical() << __func__ << ":" << __LINE__ << ")" << "timeSteps:" << m_timeSteps; - qCritical() << __func__ << ":" << __LINE__ << ")" << "timeSteps size:" << m_timeSteps.size(); - return m_timeSteps[m_timeSteps.size() - 1]; + if (!m_timeSteps[paymentOptionIndex].isEmpty()) { + return m_timeSteps[paymentOptionIndex]; + } } else { m_timeSteps.push_back(QList()); - qCritical() << __func__ << ":" << __LINE__ << ")" << "timeSteps:" << m_timeSteps; } - qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << "m_timeSteps:" << m_timeSteps; - QDateTime start = QDateTime::currentDateTime(); start.setTime(QTime(start.time().hour(), start.time().minute(), 0)); @@ -2114,9 +2110,9 @@ QList Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex) static PaymentMethod const paymentMethodId = Utilities::getPaymentMethodId(cfg); - qCritical() << "(" << __func__ << ":" << __LINE__ << ") start parking time:" << start.toString(Qt::ISODate); - qCritical() << "(" << __func__ << ":" << __LINE__ << ") payment option id:" << pop_id; - qCritical() << "(" << __func__ << ":" << __LINE__ << ") payment option carry over:" << pop_carry_over; + qCritical() << "(" << __func__ << ":" << __LINE__ << ") start parking time:" << start.toString(Qt::ISODate); + qCritical() << "(" << __func__ << ":" << __LINE__ << ") payment option id:" << pop_id; + qCritical() << "(" << __func__ << ":" << __LINE__ << ") payment option carry over:" << pop_carry_over; if (pop_time_step_config == (int)ATBTimeStepConfig::TimeStepConfig::DYNAMIC) { //qCritical() << __PRETTY_FUNCTION__ << "payment option time step config:" << "TimeStepConfig::DYNAMIC"; @@ -2128,8 +2124,6 @@ QList Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex) m_timeSteps[paymentOptionIndex].append(step); } } else { - qCritical() << "(" << __func__ << ":" << __LINE__ << ")"; - uint16_t timeStepCompensation = 0; if (pop_carry_over) { @@ -2162,7 +2156,7 @@ QList Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex) // set dynamic minimal parking time cfg->getPaymentOptions(paymentOptionIndex).pop_min_time = timeStep; - qCritical() << "(" << __func__ << ":" << __LINE__ << ") computed minimal parking time:" << cfg->getPaymentOptions(paymentOptionIndex).pop_min_time; + qCritical() << "(" << __func__ << ":" << __LINE__ << ") computed minimal parking time:" << cfg->getPaymentOptions(paymentOptionIndex).pop_min_time; duration.pun_duration = timeStep; timeStepCompensation = duration.pun_duration_max - duration.pun_duration; @@ -2207,7 +2201,7 @@ QList Calculator::GetTimeSteps(Configuration *cfg, int paymentOptionIndex) } } - qCritical() << "(" << __func__ << ":" << __LINE__ << ")" << "NEW timeSteps:" << m_timeSteps; + qCritical() << "(" << __func__ << ":" << __LINE__ << ") NEW timeSteps:" << m_timeSteps; return m_timeSteps[paymentOptionIndex]; }