diff --git a/app/gui/oven_control/ovenstatics.cpp b/app/gui/oven_control/ovenstatics.cpp index 11b5c7c..c40a71b 100644 --- a/app/gui/oven_control/ovenstatics.cpp +++ b/app/gui/oven_control/ovenstatics.cpp @@ -317,7 +317,6 @@ void OvenStatistics::oneSecTimerFired(void){ nOneSecCnt++; if( (nOneSecCnt % 10) ==0 ) { srvdata->saveServiceData(); - qDebug()<<"statics data saved"; } if(bDataRefreshed) bDataRefreshed= false; diff --git a/app/gui/oven_control/stringer.cpp b/app/gui/oven_control/stringer.cpp index 17969fc..d141518 100644 --- a/app/gui/oven_control/stringer.cpp +++ b/app/gui/oven_control/stringer.cpp @@ -39,6 +39,21 @@ int toFahrenheit(int celsius) { return celsius * 1.8 + 32; } + +enum RealTimeFormat { UseAmPm, Use24 }; +RealTimeFormat realTimeFormat() +{ + Define::config_item item = Config::getInstance()->getConfigValue(Define::config_time_type); + switch (item.d32) + { + case Define::time_type_12h: + return UseAmPm; + case Define::time_type_24h: + default: + return Use24; + } +} + } QString Stringer::remainingTime(int msecs) @@ -54,7 +69,14 @@ QString Stringer::remainingTime(int msecs) return QString("%1초").arg(msecs); case FinishTime: - return QDateTime::currentDateTime().addMSecs(msecs).toString("HH:mm:ss"); + QDateTime dateTime = QDateTime::currentDateTime().addMSecs(msecs); + switch (realTimeFormat()) + { + case UseAmPm: + return dateTime.toString("A hh:mm:ss"); + case Use24: + return dateTime.toString("HH:mm:ss"); + } } return QString(); @@ -83,7 +105,14 @@ QString Stringer::remainingTime(int msecs, QString style) return style + heavySpan.arg(msecs) + lightSpan.arg("초"); case FinishTime: - return heavySpan.arg(QDateTime::currentDateTime().addMSecs(msecs).toString("HH:mm:ss")); + QDateTime dateTime = QDateTime::currentDateTime().addMSecs(msecs); + switch (realTimeFormat()) + { + case UseAmPm: + return heavySpan.arg(dateTime.toString("A hh:mm:ss")); + case Use24: + return heavySpan.arg(dateTime.toString("HH:mm:ss")); + } } return QString();