From d2a85532ce5dcc59164851a96c4c8185b3b4fa97 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 31 Jan 2024 11:40:08 +0100 Subject: [PATCH] Minor: changed debug output format. --- library/src/calculator_functions.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/library/src/calculator_functions.cpp b/library/src/calculator_functions.cpp index 064c6e0..d79efd1 100644 --- a/library/src/calculator_functions.cpp +++ b/library/src/calculator_functions.cpp @@ -712,9 +712,9 @@ QList Calculator::GetTimeSteps(Configuration *cfg) const { int const pop_carry_over = cfg->getPaymentOptions().pop_carry_over; int const pop_time_step_config = cfg->getPaymentOptions().pop_time_step_config; - qCritical() << __PRETTY_FUNCTION__ << " start parking time:" << start.toString(Qt::ISODate); - qCritical() << __PRETTY_FUNCTION__ << " payment option id:" << pop_id; - qCritical() << __PRETTY_FUNCTION__ << " 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"; @@ -852,11 +852,9 @@ Calculator::GetDailyTicketPrice(Configuration* cfg, ATBWeekDaysWorktime const &wt = workTime.value(); endTime = startDatetime; endTime.setTime(QTime::fromString(wt.pwd_time_to.c_str(), Qt::ISODate)); - std::optional> dailyTickets = cfg->getDailyTicketsForAllKeys(); if (dailyTickets) { QVector const tickets = dailyTickets.value(); - switch (permitType) { case PERMIT_TYPE::DAY_TICKET_ADULT: { std::optional c = cfg->getCustomerForType(ATBCustomer::CustomerType::ADULT);