Index: denali.pro.user =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -r72fe36cdaa95eb8b68ba8a3714f8a92df65b4486 --- denali.pro.user (.../denali.pro.user) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ denali.pro.user (.../denali.pro.user) (revision 72fe36cdaa95eb8b68ba8a3714f8a92df65b4486) @@ -1,6 +1,6 @@ - + EnvironmentId Fisheye: Tag 72fe36cdaa95eb8b68ba8a3714f8a92df65b4486 refers to a dead (removed) revision in file `sources/abstract/singleton.h._'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -rc503f43840024e18650c1ac558448dd0f3b70427 -r72fe36cdaa95eb8b68ba8a3714f8a92df65b4486 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision c503f43840024e18650c1ac558448dd0f3b70427) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 72fe36cdaa95eb8b68ba8a3714f8a92df65b4486) @@ -107,7 +107,7 @@ /*! * \brief MessageInterpreter::logInvalidLength * \details Logs invalid data length for the message type vActionId - * \param vActionId - Message Type + * \param vActionId - Message Type */ void MessageInterpreter::logInvalidLength(const Gui::GuiActionType &vActionId) { @@ -184,71 +184,71 @@ QString mSenderID = "UI,"; vPayload.clear(); - int count = vData.length(); + int length = vData.length(); switch (vActionId) { // notice we are in transmit mode case Gui::GuiActionType::ID_Acknow: // len: 0, can have zero len break; // No data, Just registered case Gui::GuiActionType::ID_KeepAlive: // len: 255, can have any len - if ( count ) { // this message has a variable length + if ( length ) { // this message has a variable length vPayload = Format::fromVariant(vData[0]); } LOG_EVENT(mSenderID + QString("CheckIn")); break; case Gui::GuiActionType::ID_RawData: // len: 255, can have any len - if ( count ) { // this message has a variable length + if ( length ) { // this message has a variable length vPayload = Format::fromVariant(vData[0]); } LOG_EVENT(mSenderID + QString("RawData")); break; case Gui::GuiActionType::ID_PowerOff: - if ( ! count ) { logInvalidLength(vActionId); return false; } + if ( ! length ) { logInvalidLength(vActionId); return false; } vPayload += Format::fromVariant(vData); LOG_EVENT(AdjustPowerOffRequestData::toString(vData)); break; case Gui::GuiActionType::ID_AdjustBloodDialysateReq: - if ( ! count ) { logInvalidLength(vActionId); return false; } + if ( ! length ) { logInvalidLength(vActionId); return false; } vPayload = Format::fromVariant(vData); LOG_EVENT(AdjustBloodDialysateRequestData::toString(vData)); break; case Gui::GuiActionType::ID_AdjustDurationReq: - if ( ! count ) { logInvalidLength(vActionId); return false; } + if ( ! length ) { logInvalidLength(vActionId); return false; } vPayload = Format::fromVariant(vData); LOG_EVENT(AdjustDurationRequestData::toString(vData)); break; case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq: - if ( ! count ) { logInvalidLength(vActionId); return false; } + if ( ! length ) { logInvalidLength(vActionId); return false; } vPayload = Format::fromVariant(vData); LOG_EVENT(AdjustUltrafiltrationStateRequestData::toString(vData)); break; case Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq: - if ( ! count ) { logInvalidLength(vActionId); return false; } + if ( ! length ) { logInvalidLength(vActionId); return false; } vPayload = Format::fromVariant(vData); LOG_EVENT(AdjustUltrafiltrationEditRequestData::toString(vData)); break; case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq: - if ( ! count ) { logInvalidLength(vActionId); return false; } + if ( ! length ) { logInvalidLength(vActionId); return false; } vPayload = Format::fromVariant(vData); LOG_EVENT(AdjustUltrafiltrationConfirmRequestData::toString(vData)); break; case Gui::GuiActionType::ID_AdjustSalineReq: - if ( ! count ) { logInvalidLength(vActionId); return false; } + if ( ! length ) { logInvalidLength(vActionId); return false; } vPayload = Format::fromVariant(vData); LOG_EVENT(AdjustSalineRequestData::toString(vData)); break; case Gui::GuiActionType::ID_AlarmSilenceReq: - if ( ! count ) { logInvalidLength(vActionId); return false; } + if ( ! length ) { logInvalidLength(vActionId); return false; } vPayload = Format::fromVariant(vData); LOG_EVENT(AlarmSilenceRequestData::toString(vData)); break; Index: sources/canbus/MessageInterpreter.h =================================================================== diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -r72fe36cdaa95eb8b68ba8a3714f8a92df65b4486 --- sources/canbus/MessageInterpreter.h (.../MessageInterpreter.h) (revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997) +++ sources/canbus/MessageInterpreter.h (.../MessageInterpreter.h) (revision 72fe36cdaa95eb8b68ba8a3714f8a92df65b4486) @@ -38,7 +38,7 @@ * To make it simple : \n * - UI => Data of Messages (Values) => Frames (Bytes) => CANBus. \n * - CANBus => Frames (Bytes) => Data of Messages (Values) => UI. \n - + * */ class MessageInterpreter : public QObject { Fisheye: Tag 72fe36cdaa95eb8b68ba8a3714f8a92df65b4486 refers to a dead (removed) revision in file `sources/configuration/display.cpp._'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 72fe36cdaa95eb8b68ba8a3714f8a92df65b4486 refers to a dead (removed) revision in file `sources/configuration/display.h._'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 72fe36cdaa95eb8b68ba8a3714f8a92df65b4486 refers to a dead (removed) revision in file `sources/configuration/sound.cpp._'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 72fe36cdaa95eb8b68ba8a3714f8a92df65b4486 refers to a dead (removed) revision in file `sources/configuration/sound.h._'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/gui/qml/globals/Fonts.qml =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -r72fe36cdaa95eb8b68ba8a3714f8a92df65b4486 --- sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 72fe36cdaa95eb8b68ba8a3714f8a92df65b4486) @@ -55,15 +55,11 @@ readonly property int fontPixelDurationCurTime : 89 readonly property int fontPixelDurationAdjTime : 28 - - readonly property int fontPixelUltrafiltrationAdjustmentPauseButton : 26 readonly property int fontPixelUltrafiltrationAdjustmentResumeButton : 30 readonly property int fontPixelUltrafiltrationAdjustmentEditButton : 30 readonly property int fontPixelUltrafiltrationAdjustmentNextButton : 26 readonly property int fontPixelUltrafiltrationAdjustmentConfirmButton : 26 readonly property int fontPixelUltrafiltrationAdjustmentConfirmTitle : 40 readonly property int fontPixelUltrafiltrationAdjustmentEditValue : 46 - - } Fisheye: Tag 72fe36cdaa95eb8b68ba8a3714f8a92df65b4486 refers to a dead (removed) revision in file `sources/storage/settings.cpp._'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 72fe36cdaa95eb8b68ba8a3714f8a92df65b4486 refers to a dead (removed) revision in file `sources/storage/settings.h._'. Fisheye: No comparison available. Pass `N' to diff?