Index: sources/canbus/messageinterpreter.cpp =================================================================== diff -u -rd3f916066c2d10c10fffa91fd8a7e5ac6dd86c7d -r9d2940c9f09ace35e4e0501a61d46b6bdf789dab --- sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision d3f916066c2d10c10fffa91fd8a7e5ac6dd86c7d) +++ sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision 9d2940c9f09ace35e4e0501a61d46b6bdf789dab) @@ -103,7 +103,6 @@ } break; - case Gui::GuiActionType::AdjustBloodDialysateReq: if (vData.count()) { vPayload = Format::fromVariant(vData); @@ -248,11 +247,9 @@ ok = treatmentRangesData (vMessage, vData); break; - default: printUnhandled (vMessage); break; - } return ok; } @@ -526,7 +523,7 @@ * \param vMessage - The vMessage of type Message which contains all the data, * require to be interpreted. * \param vData - Alarm Status dta - * \return true if the data can be extracted as defined for PowerOff Message ID + * \return true if the data can be extracted as defined for AlarmStatus Message ID */ bool MessageInterpreter::getAlarmStatus(const Message &vMessage, Model::MAlarmStatus &vData) { @@ -575,6 +572,15 @@ // qDebug() << '@' << flag << flag.toString() << ba; } +/*! + * \brief MessageInterpreter::getPressureOcclusionData + * \details This method interprets Pressure Occlusion message data + * in vMessage of type Message. + * \param vMessage - The vMessage of type Message which contains all the data, + * require to be interpreted. + * \param vData - Pressure Occlusion data + * \return true if the data can be extracted as defined for PressureOcclusion Message ID + */ bool MessageInterpreter::getPressureOcclusionData(const Message &vMessage, Model::MPressureOcclusion &vData) { if ( vMessage.actionId != Gui::GuiActionType::PressureOcclusion ) { @@ -592,6 +598,15 @@ return true; } +/*! + * \brief MessageInterpreter::pressureOcclusionData + * \details Used the getPressureOcclusionData method and converts each parameter + * in vData of type QVaranitList, to be used in the GUI + * Also logs the data + * \param vMessage - The message + * \param vData - the output data + * \return return value of the method getPressureOcclusionData + */ bool MessageInterpreter::pressureOcclusionData(const Message &vMessage, QVariantList &vData) { bool ok; @@ -606,6 +621,15 @@ return ok; } +/*! + * \brief MessageInterpreter::adjustBloodDialysateData + * \details This method interprets AdjustBlood Dialysate Response message data + * in vMessage of type Message. + * \param vMessage - The vMessage of type Message which contains all the data, + * require to be interpreted. + * \param vData - AdjustBlood Dialysate Response data + * \return true if the data can be extracted as defined for AdjustBlood Dialysate Response Message ID + */ bool MessageInterpreter::adjustBloodDialysateData(const Message &vMessage, QVariantList &vData) { // TODO : review other methods @@ -623,6 +647,15 @@ return ok; } +/*! + * \brief MessageInterpreter::getTreatmentRangesData + * \details This method interprets Treatment Ranges message data + * in vMessage of type Message. + * \param vMessage - The vMessage of type Message which contains all the data, + * require to be interpreted. + * \param vData - Treatment Ranges data + * \return true if the data can be extracted as defined for Treatment Ranges Message ID + */ bool MessageInterpreter::treatmentRangesData(const Message &vMessage, QVariantList &vData) { // TODO : review other methods Index: sources/gui/guiview.h =================================================================== diff -u -r8f6f7c11390e3ed6d918f1717d8e8b7ae5b7e5c6 -r9d2940c9f09ace35e4e0501a61d46b6bdf789dab --- sources/gui/guiview.h (.../guiview.h) (revision 8f6f7c11390e3ed6d918f1717d8e8b7ae5b7e5c6) +++ sources/gui/guiview.h (.../guiview.h) (revision 9d2940c9f09ace35e4e0501a61d46b6bdf789dab) @@ -67,7 +67,5 @@ } signals: void didAdjustBloodDialysateFlows(quint32 vBloodFlow, quint32 vDialysateFlow); - - }; } Index: sources/storage/filehandler.cpp =================================================================== diff -u -rea143a3b9822a985e0e6c2bad746cd04ae77e018 -r9d2940c9f09ace35e4e0501a61d46b6bdf789dab --- sources/storage/filehandler.cpp (.../filehandler.cpp) (revision ea143a3b9822a985e0e6c2bad746cd04ae77e018) +++ sources/storage/filehandler.cpp (.../filehandler.cpp) (revision 9d2940c9f09ace35e4e0501a61d46b6bdf789dab) @@ -38,7 +38,6 @@ void FileHandler::errOut(const QString &vMessage) { QString mCritical = vMessage; - //qCritical(mCritical.toLatin1().constData()); QTextStream err(stderr); err << mCritical << endl; }