Index: denali.pro.user =================================================================== diff -u -rc12aef133e2c349ba1559a75135a55dd12b977c8 -rfd4648bc7ac8d86b125053e33419779493741afe --- denali.pro.user (.../denali.pro.user) (revision c12aef133e2c349ba1559a75135a55dd12b977c8) +++ denali.pro.user (.../denali.pro.user) (revision fd4648bc7ac8d86b125053e33419779493741afe) @@ -1,14 +1,14 @@ - + EnvironmentId {67370740-e20f-4fc6-be45-6652e866a8bf} ProjectExplorer.Project.ActiveTarget - 0 + 1 ProjectExplorer.Project.EditorSettings @@ -990,7 +990,7 @@ denali Qt4ProjectManager.Qt4RunConfiguration:/home/denali/Project/application/denali.pro - + 1 1 3768 false true Index: sources/canbus/caninterface.cpp =================================================================== diff -u -r2b00ad4142892e8d9e768ef58f139611e9d670c0 -rfd4648bc7ac8d86b125053e33419779493741afe --- sources/canbus/caninterface.cpp (.../caninterface.cpp) (revision 2b00ad4142892e8d9e768ef58f139611e9d670c0) +++ sources/canbus/caninterface.cpp (.../caninterface.cpp) (revision fd4648bc7ac8d86b125053e33419779493741afe) @@ -262,6 +262,7 @@ view = vFrame.payload().toHex('.').replace(QByteArray("a5"),QByteArray("\033[1;33mA5\033[0m")); } fprintf(stderr, "%s %s %s %i %s\n", vFrameCount.toLatin1().constData(), time.toLatin1().constData(), flags.toLatin1().constData(), vFrame.frameId(), view.toLatin1().constData()); + LOG_TEST(vFrame.toString()); } /*! @@ -329,6 +330,7 @@ case QCanBusDevice::UnknownError: _canStatus = _canDevice->errorString(); LOG_ERROR(_canStatus); + LOG_TEST (_canStatus); break; default: break; @@ -352,7 +354,6 @@ } else { mFrameCount = vFramesCount - (FrameCount_MAX - vFramesCount); } - qDebug() << mFrameCount; } /*! @@ -365,10 +366,11 @@ return; while (_canDevice->framesAvailable()) { const QCanBusFrame frame = _canDevice->readFrame(); - rxCount(); + FrameCount rxFrameCount = rxCount(); if ( _enableConsoleOut ) consoleOut(frame, QString("Rx:%1").arg(_rxFrameCount)); emit didFrameReceive(frame); + LOG_TEST(frame.toString() + " :" + QString::number(rxFrameCount)); } } Index: sources/storage/logger.cpp =================================================================== diff -u -r805119c460b4a266d6401c8705f4427e7fbe270f -rfd4648bc7ac8d86b125053e33419779493741afe --- sources/storage/logger.cpp (.../logger.cpp) (revision 805119c460b4a266d6401c8705f4427e7fbe270f) +++ sources/storage/logger.cpp (.../logger.cpp) (revision fd4648bc7ac8d86b125053e33419779493741afe) @@ -179,6 +179,7 @@ ok = ok && setLogPath(LogType::eLogEvent); ok = ok && setLogPath(LogType::eLogError); ok = ok && setLogPath(LogType::eLogDatum); + ok = ok && setLogPath(LogType::eLogTest ); return ok; } @@ -221,17 +222,25 @@ case eLogEvent: case eLogError: case eLogDatum: + case eLogTest : break; default: LOG_ERROR(tr("Incorrect type of logging").arg(vLogType)); } - mContent += _logPrefix[vLogType]; - mContent += _prefixSeparator; - mContent += QTime::currentTime().toString(_timeFormat); - mContent += _timeSeparator + vContent; - QString fileName = date + _dateSeparator + Log_File_Name; - _logFileName = _logPathNames[vLogType] + fileName; + if (vLogType == eLogTest) { + mContent = QTime::currentTime().toString("HH:mm:ss.zzz"); + mContent += ": " + vContent.simplified(); + QString fileName = date + _dateSeparator + Log_File_Name; + _logFileName = _logPathNames[vLogType] + fileName; + } else { + mContent += _logPrefix[vLogType]; + mContent += _prefixSeparator; + mContent += QTime::currentTime().toString(_timeFormat); + mContent += _timeSeparator + vContent; + QString fileName = date + _dateSeparator + Log_File_Name; + _logFileName = _logPathNames[vLogType] + fileName; + } FileHandler::write(_logFileName, mContent + "\r\n", true); if (vLogType == eLogError) { #ifdef QT_DEBUG Index: sources/storage/logger.h =================================================================== diff -u -r94f7349bd073a732dba5295250fc0e26f740743c -rfd4648bc7ac8d86b125053e33419779493741afe --- sources/storage/logger.h (.../logger.h) (revision 94f7349bd073a732dba5295250fc0e26f740743c) +++ sources/storage/logger.h (.../logger.h) (revision fd4648bc7ac8d86b125053e33419779493741afe) @@ -58,7 +58,17 @@ LOG_DATUM(vCONTENT); \ } +#define LOG_TEST(vCONTENT) emit Storage::Logger::I().didLog(vCONTENT, Storage::Logger::LogType::eLogTest) +#define LOG_TEST_ONCE_LOGGED \ + bLOG_TEST_ONCE_LOGGED +#define LOG_TEST_ONCE(vCONTENT) \ + static bool LOG_TEST_ONCE_LOGGED = false; \ + if ( ! LOG_TEST_ONCE_LOGGED ) { \ + LOG_TEST_ONCE_LOGGED = true; \ + LOG_TEST(vCONTENT); \ + } + // forward declarations class tst_logging; @@ -90,6 +100,8 @@ eLogError, eLogDatum, + eLogTest, + eLogType_Count, }; @@ -100,11 +112,13 @@ { eLogEvent, "log/event/" }, { eLogError, "log/error/" }, { eLogDatum, "log/event/" }, // "log/datum/" + { eLogTest , "log/test/" }, }; QHash _logPrefix { { eLogEvent, "Event" }, { eLogError, "Error" }, { eLogDatum, "Datum" }, + { eLogTest , "" }, }; const char *_dateFormat = "yyyy_MM_dd"; Index: sources/utility/format.cpp =================================================================== diff -u -rc12aef133e2c349ba1559a75135a55dd12b977c8 -rfd4648bc7ac8d86b125053e33419779493741afe --- sources/utility/format.cpp (.../format.cpp) (revision c12aef133e2c349ba1559a75135a55dd12b977c8) +++ sources/utility/format.cpp (.../format.cpp) (revision fd4648bc7ac8d86b125053e33419779493741afe) @@ -13,12 +13,8 @@ */ #include "format.h" -Format::Format() -{ +Format::Format() { } -} - - QString Format::toHexString(quint16 vValue, bool vWith0x, quint8 vLen) { if ( vWith0x ) { return "0x" + QString("%1").arg(vValue,0,16).rightJustified(vLen, '0').toUpper();