Index: denali.pro.user =================================================================== diff -u -r3ad21b53b6b15cc0c88661cf17ba454fe0a302b1 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- denali.pro.user (.../denali.pro.user) (revision 3ad21b53b6b15cc0c88661cf17ba454fe0a302b1) +++ denali.pro.user (.../denali.pro.user) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -1,6 +1,6 @@ - + EnvironmentId Index: main.cpp =================================================================== diff -u -r2bc6542cebc264eb343f791f75223a1ca151465e -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- main.cpp (.../main.cpp) (revision 2bc6542cebc264eb343f791f75223a1ca151465e) +++ main.cpp (.../main.cpp) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -240,7 +240,7 @@ if (isNotStory) { if (isOnServer) { if (isOnMaster ) { - ver_branch = ""; // if only is built on server master branch don't show branch + ver_branch = ""; // if only is built on server master branch do not show branch } ver_major += '.'; ver_minor += '.'; @@ -375,6 +375,8 @@ Threads::quitThreads(); + Gui::_viewer->deleteLater(); + return app_exec; } #endif Index: sources/ApplicationController.cpp =================================================================== diff -u -r3f555c49ddd2c983f469709e3c001d0e76159248 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 3f555c49ddd2c983f469709e3c001d0e76159248) +++ sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -504,7 +504,7 @@ emit didActionTransmit(GuiActionType::ID_KeepAlive, {}); ApplicationPost post; connect(&post, &ApplicationPost::didPOSTFail, [=] (Gui::GuiAlarmID vAlarmID) { - emit didActionTransmit(GuiActionType::ID_AlarmTriggered, { vAlarmID }); + emit didActionTransmit(GuiActionType::ID_AlarmTriggered, { vAlarmID ,0,0,0,0}); }); connect(&post, &ApplicationPost::didPOSTDone, [=] (bool vResult) { AdjustUIPostFinalResultRequestData data; Index: sources/ApplicationController.h =================================================================== diff -u -r2bc6542cebc264eb343f791f75223a1ca151465e -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/ApplicationController.h (.../ApplicationController.h) (revision 2bc6542cebc264eb343f791f75223a1ca151465e) +++ sources/ApplicationController.h (.../ApplicationController.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "MModel.h" #include "GuiGlobals.h" #include "MessageGlobals.h" @@ -118,7 +118,7 @@ * \brief didSettingsInit - private signal to start initializing settings * \details This signal used internally to make the read task of the settings happen in Application_Thread * It's because no thread assigned to Settings itself, since this class will be used only once - * and doesn't need a thread by itself + * and does not need a thread by itself */ void didSettingsInit (QPrivateSignal); Index: sources/ApplicationPost.cpp =================================================================== diff -u -r3f555c49ddd2c983f469709e3c001d0e76159248 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/ApplicationPost.cpp (.../ApplicationPost.cpp) (revision 3f555c49ddd2c983f469709e3c001d0e76159248) +++ sources/ApplicationPost.cpp (.../ApplicationPost.cpp) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -67,7 +67,7 @@ /*! * \brief ApplicationPost::checkCANBus - * \details Checks the CAN Bus driver is loaded and the bus is functional + * \details Checks the CANBus driver is loaded and the bus is functional * \return false if there is an issue. */ bool ApplicationPost::checkCANBus() @@ -116,7 +116,7 @@ /*! * \brief ApplicationPost::CRC - * \details Checks the CAN Bus driver is loaded and the bus is functional + * \details Checks the CANBus driver is loaded and the bus is functional * \return false if there is an issue. */ bool ApplicationPost::RTC() Index: sources/MainTimer.h =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/MainTimer.h (.../MainTimer.h) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/MainTimer.h (.../MainTimer.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove // Define #define _MainTimer MainTimer::I() Index: sources/canbus/CanInterface.cpp =================================================================== diff -u -r052c794d6a8db55a2fbfdad172275af073ee54c3 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/canbus/CanInterface.cpp (.../CanInterface.cpp) (revision 052c794d6a8db55a2fbfdad172275af073ee54c3) +++ sources/canbus/CanInterface.cpp (.../CanInterface.cpp) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -39,7 +39,7 @@ /*! * \brief CanInterface Initialization - * \details Initializes the CANBUS and checks if can be connected + * \details Initializes the CANBus and checks if can be connected * \return true if connected, false otherwise */ bool CanInterface::init() @@ -181,7 +181,7 @@ /*! * \brief CanInterface::createDevice * \details Creates the CANBus device - * \return false if can't create the device + * \return false if cannot create the device */ bool CanInterface::initDevice() { @@ -232,8 +232,8 @@ /*! * \brief CanInterface status * \details Sets the Can interface status description - * \param vDescription - Description about the CANBUS Interface errors - * \param vError - Qt CANBUS Interface Error + * \param vDescription - Description about the CANBus Interface errors + * \param vError - Qt CANBus Interface Error */ void CanInterface::status(const QString &vDescription, QString vError) { @@ -255,8 +255,8 @@ /*! * \brief CanInterface send - * \details send a frame over the CANBUS - * \param vFrame - CANBUS message frame + * \details send a frame over the CANBus + * \param vFrame - CANBus message frame */ bool CanInterface::transmit(const QCanBusFrame &vFrame) { @@ -268,9 +268,9 @@ /*! * \brief CanInterface console Output messaging - * \details Sends out formatted CANBUS message to the console + * \details Sends out formatted CANBus message to the console * for debugging purposes. - * \param vFrame - The CANBUS frame to be sent out + * \param vFrame - The CANBus frame to be sent out */ void CanInterface::consoleOut(const QCanBusFrame &vFrame, const QString &vFrameCount) { @@ -331,8 +331,8 @@ /*! * \brief frameFlags - * \details CANBUS message frame type as flags - * \param vFrame - CANBUS message frame + * \details CANBus message frame type as flags + * \param vFrame - CANBus message frame * \return Frame flag as QString */ QString CanInterface::frameFlags(const QCanBusFrame &vFrame) @@ -354,8 +354,8 @@ /*! * \brief CanInterface onError - * \details Can Bus error handler which sets the can status description - * \param vError - CANBUS error + * \details CANBus error handler which sets the can status description + * \param vError - CANBus error */ void CanInterface::onFrameError(QCanBusDevice::CanBusError vError) { @@ -387,7 +387,7 @@ * \brief CanInterface::onFrameWritten * \details This is the slot connected to the signal * which is emitted every time a payload of frames - * has been written to the CANBUS bus. + * has been written to the CANBus bus. * \param vFramesCount - The framesCount argument is set to the number of frames * that were written in this payload. */ @@ -400,7 +400,7 @@ /*! * \brief CanInterface onFrameReceived - * \details CANBUS message read handler + * \details CANBus message read handler */ void CanInterface::onFrameReceive () { @@ -420,9 +420,9 @@ /*! * \brief CanInterface onActionPerform - * \details sends a CANBUS message frame of the CANBUS message of the performed action + * \details sends a CANBus message frame of the CANBus message of the performed action * This is a response from application UI to HD device - * \param vFrame - CANBUS message frame + * \param vFrame - CANBus message frame */ void CanInterface::onFrameTransmit(const QCanBusFrame &vFrame) { Index: sources/canbus/CanInterface.h =================================================================== diff -u -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/canbus/CanInterface.h (.../CanInterface.h) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) +++ sources/canbus/CanInterface.h (.../CanInterface.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -19,7 +19,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "MessageGlobals.h" // Define @@ -34,11 +34,11 @@ /*! * \brief CANBus interface - * \details This class contains the interface to CANBUS - * And utilizes Qt QCanBus to interact with the CANBUS + * \details This class contains the interface to CANBus + * And utilizes Qt QCanBus to interact with the CANBus * This class works only with the QCanBusFrame frames. * On the OS side there is a driver installed to convert SPI to CAN - * Since the GUI Board by itself doesn't contain the CAN Bus. + * Since the GUI Board by itself does not contain the CANBus. * Application would know nothing about the SPI-TO-CAN */ class CanInterface : public QObject Index: sources/canbus/FrameInterface.cpp =================================================================== diff -u -r3ad21b53b6b15cc0c88661cf17ba454fe0a302b1 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/canbus/FrameInterface.cpp (.../FrameInterface.cpp) (revision 3ad21b53b6b15cc0c88661cf17ba454fe0a302b1) +++ sources/canbus/FrameInterface.cpp (.../FrameInterface.cpp) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -137,7 +137,7 @@ * \brief FrameInterface::transmitFrame * \details Prepares a frame to be transmitted * and emit signal didFrameTransmit with the frame as its argument - * \param vFrameId - Channel id of the CANBUS frame + * \param vFrameId - Channel id of the CANBus frame * \param vData - The Data this frame is going to carry * \note This frame is created by MessageBuilder * and it can be one of the frames of a message @@ -148,7 +148,7 @@ QCanBusFrame mFrame; mFrame.setFrameId(vCan_Id); if (vData.length() > Can::eLenCanFrame) { - LOG_DEBUG(QString("Payload can't be larger than %1 bytes").arg(Can::eLenCanFrame)); + LOG_DEBUG(QString("Payload cannot be larger than %1 bytes").arg(Can::eLenCanFrame)); return; } mFrame.setPayload(vData); @@ -228,7 +228,7 @@ /*! * \brief FrameInterface::onFrameReceive * \details This the slot connected to the CanInterface didFrameReceive signal. - * When a frame received over the CANBUS, + * When a frame received over the CANBus, * this slot will be called to check the channel if should be listened to. * and will emit didFrameReceive if should be handled and ignored otherwise. * \param vFrame - The frame has to be sent @@ -260,9 +260,9 @@ /*! * \brief FrameInterface::onFrameTransmit * \details This the slot connected to the MessageDispatcher didFrameTransmit signal. - * When a frame needs to be send to CANBUS, + * When a frame needs to be send to CANBus, * this slot will call transmitFrame method to do the job. - * \param vCan_Id - CANBUS Can Id target of the frame. + * \param vCan_Id - CANBus Can Id target of the frame. * \param vData - The data which this frame will carry. */ void FrameInterface::onFrameTransmit(Can_Id vCan_Id, const QByteArray &vData) Index: sources/canbus/FrameInterface.h =================================================================== diff -u -r1b24a85761c65a685fac98f396e244af97b94443 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/canbus/FrameInterface.h (.../FrameInterface.h) (revision 1b24a85761c65a685fac98f396e244af97b94443) +++ sources/canbus/FrameInterface.h (.../FrameInterface.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -19,7 +19,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "MessageGlobals.h" // Define @@ -37,7 +37,7 @@ * \brief The FrameInterface class * \details This class is an interface between QByteArray and QCanBusFrame * and gets the data as QByteArray and creates a frame - * and sends it to the CanInterface to deal with the CANBUS. + * and sends it to the CanInterface to deal with the CANBus. * And does it in reverse when receives a frame from CanInterface. */ class FrameInterface : public QObject @@ -54,7 +54,7 @@ /*! * \brief The ChannelGroup enum - * \details The enum which represent the categories of the CANBUS channel + * \details The enum which represent the categories of the CANBus channel */ enum class ChannelGroup { eChannel_Unknown, ///< An Unknown channels category Index: sources/canbus/MessageAcknowModel.h =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/canbus/MessageAcknowModel.h (.../MessageAcknowModel.h) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/canbus/MessageAcknowModel.h (.../MessageAcknowModel.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "MessageGlobals.h" // Define @@ -34,7 +34,7 @@ * \brief The AcknowModel class * \details This is the private class of the MessageAcknowModel * which keeps list of the messages require Acknow. - * but since Qt doesn't support nested meta objects, + * but since Qt does not support nested meta objects, * it has been moved out with a meaningful namespace. */ class AcknowModel : public QObject { // Private Model Index: sources/canbus/MessageBuilder.cpp =================================================================== diff -u -r052c794d6a8db55a2fbfdad172275af073ee54c3 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/canbus/MessageBuilder.cpp (.../MessageBuilder.cpp) (revision 052c794d6a8db55a2fbfdad172275af073ee54c3) +++ sources/canbus/MessageBuilder.cpp (.../MessageBuilder.cpp) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -37,7 +37,7 @@ * \details This method builds list of frames out of the vActions of type GuiActionType * and vData of type QByteArray which has been requested to be sent by UI. * The message will be chopped into 8 bytes frames to be able to be send - * by fixed length CANBUS protocol. + * by fixed length CANBus protocol. * \param vAction - The ActionID of the requested message. * \param vData - The payload of the message. * \param vFrameList - The list of frames which has been created by vAction and vData to be sent. @@ -169,7 +169,7 @@ * \brief MessageBuilder::addPadding * \details This method is appending bytes containing 0x00 * to keep the length of the frame 8 bytes. - * \param vPayload - The payload of the CANBUS message + * \param vPayload - The payload of the CANBus message */ void MessageBuilder::addPadding(QByteArray &vPayload) { @@ -242,12 +242,12 @@ /*! * \brief MessageBuilder::buildMessage * \details Builds Message out of vPayload of type QByteArray - * by adding Sync byte, ActionID(MessageID), data length, data, CANBUS channel id for header + * by adding Sync byte, ActionID(MessageID), data length, data, CANBus channel id for header * and keeps collecting data from payload up until the specified length. - * \param vPayload - The payload of the CANBUS message + * \param vPayload - The payload of the CANBus message * \param vMessage - The Message variable which is going to be built - * \param vCan_Id - The CANBUS frame channel id - * \return false if the payload doesn't contain sync byte (Payload_Data::ePayload_Sync) + * \param vCan_Id - The CANBus frame channel id + * \return false if the payload does not contain sync byte (Payload_Data::ePayload_Sync) */ bool MessageBuilder::buildMessage(const QByteArray &vPayload, Message &vMessage, Can_Id vCan_Id) { @@ -256,7 +256,7 @@ if (hasSyncByte(mPayload)) { // Got header consoleOut(vPayload, true, vCan_Id); vMessage.can_id = vCan_Id; - vMessage.head = getHeader (mPayload); // keep header before taking it out of the payload. doesn't affect payload + vMessage.head = getHeader (mPayload); // keep header before taking it out of the payload. does not affect payload vMessage.sequence = getSequence (mPayload); vMessage.actionId = static_cast(getActionId(mPayload)); vMessage.length = getLength (mPayload); @@ -323,7 +323,7 @@ * \brief MessageBuilder::getSequence * \details Extract the 2 bytes of the sequence * out of the vPayload of type QByteArray - * \param vPayload - The payload of the CANBUS message + * \param vPayload - The payload of the CANBus message * \return Returns ActionId of type GuiActionType * \note Removes the 2 bytes of ActionID from vPayload * It starts from the first byte so those 2 bytes should be the first 2 bytes. @@ -342,10 +342,10 @@ * \details Collect the 3 bytes (Frame_Data::eLenHeaderInfo) * as header portion of the payload * which is the MessageID (2 bytes) , data length (1 byte) - * It doesn't contain sync byte (Payload_Data::ePayload_Sync) + * It does not contain sync byte (Payload_Data::ePayload_Sync) * as this value will be used for crc8 calculation - * and that doesn't include sync byte (Payload_Data::ePayload_Sync) - * \param vPayload - The payload of the CANBUS message + * and that does not include sync byte (Payload_Data::ePayload_Sync) + * \param vPayload - The payload of the CANBus message * \return Returns 3 byte of header data of type QByteArray * \note As it's obvious from the function parameter it's not changing the vPayload * Just has been mentioned to be consistent with the other methods of buildMessage. @@ -368,7 +368,7 @@ * \brief MessageBuilder::getActionId * \details Extracts the 2 bytes ActionID (Frame_Data::eLenActionId) * out of the vPayload of type QByteArray - * \param vPayload - The payload of the CANBUS message + * \param vPayload - The payload of the CANBus message * \return Returns ActionId of type GuiActionType * \note Removes the 2 bytes of ActionID from vPayload * It starts from the first byte so those 2 bytes should be the first 2 bytes. @@ -384,10 +384,10 @@ * \brief MessageBuilder::getLength * \details Extracts the 1 byte data length out of the vPayload * and removes the first 1 byte - * \param vPayload - The payload of the CANBUS message + * \param vPayload - The payload of the CANBus message * \return returns the length of the data which is added by 1 to include 1 byte crc * \note the length of the data should not be more than 255 which requires 1 byte only - * so technically it doesn't need to return a value of type more than 1 byte + * so technically it does not need to return a value of type more than 1 byte * But some room reserved for later huge buffer passing * And also as 1 byte crc8 is included as part of data * it make it 256 which is going to be more than a byte. @@ -408,7 +408,7 @@ * if vLen is less or equal to Frame_Data::eLenMaxHeaderData * it gets data of first byte up to the len of vLen * otherwise returns the whole vPayload as the data - * \param vPayload - The payload of the CANBUS message + * \param vPayload - The payload of the CANBus message * \param vLen - the length of the data * \return The data to be returned */ @@ -428,11 +428,11 @@ * \details Sends out formatted message to the console * for debugging purposes. * Since this method is only formatting the payload - * and doesn't extract the content of the payload + * and does not extract the content of the payload * it gets required information from outside through it's parameters. - * \param vPayload - The payload of the CANBUS message + * \param vPayload - The payload of the CANBus message * \param vIsHeader - Should be sent as true if this payload contains header data - * \param vCan_Id - CANBUS channel id + * \param vCan_Id - CANBus channel id * \param vUseColor - Use coloring or just space formatted output * if vUseColor passed true is uses different color for Sync byte, MessageID & data */ Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r73d6d02c19467735e92f7c451ca5d3b47a2a90e4 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 73d6d02c19467735e92f7c451ca5d3b47a2a90e4) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -145,12 +145,12 @@ /*! * \brief MessageDispatcher::onFrameReceive - * \details Upon message has been received over CANBUS this slot will be called + * \details Upon message has been received over CANBus this slot will be called * by FrameInterface::didFrameReceive signal to process the frame * Upon completion of collected all the required frames * on successful interpretation of the message, emits didActionReceived signal. * The message will be removed from list of the channel vCan_Id messages. - * \param vCan_Id - CANBUS channel of the frame + * \param vCan_Id - CANBus channel of the frame * \param vPayload - Payload of the frame */ void MessageDispatcher::onFrameReceive(Can_Id vCan_Id, const QByteArray &vPayload) @@ -767,7 +767,7 @@ QByteArray mData; Can_Id canid = vCanId; if (! _interpreter.interpretMessage(vActionId, vData, mData, canid)) { - LOG_DEBUG(QString("Incorrect Message, can't be interpreted, %1").arg(Format::toHexString(vActionId))); // TODO : LogInfo Improvement + LOG_DEBUG(QString("Incorrect Message, cannot be interpreted, %1").arg(Format::toHexString(vActionId))); // TODO : LogInfo Improvement return; } @@ -785,10 +785,10 @@ #endif } - // coco begin validated: Has been tested manually but in this function this can't be false because the message interpreter is doing the same validation. + // coco begin validated: Has been tested manually but in this function this cannot be false because the message interpreter is doing the same validation. // still checking here in case the logic has changed therefore buildFrame should still validate the message for developer safety. if ( ! _builder.buildFrames(vActionId, mData, frameList, mSequence) ) { - LOG_DEBUG(QString("Incorrect Message can't be built")); // TODO : LogInfo Improvement + LOG_DEBUG(QString("Incorrect Message cannot be built")); // TODO : LogInfo Improvement return; } // coco end @@ -819,7 +819,7 @@ /*! * \brief MessageDispatcher::buildMessage * \details Calls the messageBuilder buildMessage method. - * \param vCan_Id - CANBUS channel of the frame + * \param vCan_Id - CANBus channel of the frame * \param vPayload - Payload of the frame * \return false on error */ Index: sources/canbus/MessageDispatcher.h =================================================================== diff -u -r73d6d02c19467735e92f7c451ca5d3b47a2a90e4 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 73d6d02c19467735e92f7c451ca5d3b47a2a90e4) +++ sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "MessageBuilder.h" #include "MessageInterpreter.h" @@ -191,11 +191,11 @@ signals: /*! * \brief didActionReceive - * \details When a message received over the CANBUS this signal is emitted + * \details When a message received over the CANBus this signal is emitted * on successful collecting all required payloads from different frames if any * and successfully has been built into a message and can be interpreted - * \param vAction - The action has been extracted from CANBUS message header to be done - * \param vData - The data has been collected from CANBUS frame(s) + * \param vAction - The action has been extracted from CANBus message header to be done + * \param vData - The data has been collected from CANBus frame(s) */ void didActionReceive (GuiActionType vAction , const QVariantList &vData); @@ -227,7 +227,7 @@ * \brief didFrameTransmit * \details When a message is requested to be transmitted this signal is emitted * on successful interpretation and building the message into frames - * \param vCan_Id - Target channel of the CANBUS message + * \param vCan_Id - Target channel of the CANBus message * \param vPayload - The payload of the message to be sent */ void didFrameTransmit (Can_Id vCan_Id, const QByteArray &vPayload); Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r3ad21b53b6b15cc0c88661cf17ba454fe0a302b1 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 3ad21b53b6b15cc0c88661cf17ba454fe0a302b1) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -91,18 +91,18 @@ {Gui::GuiActionType::ID_HDAccelerometerData , 9 * 4 }, // 9 parameters each 4bytes {Gui::GuiActionType::ID_HDSyringePumpData , 9 * 4 }, // 9 parameters each 4bytes - // ---- TODO : AFTER GIVING IT SOME THOUGHT, IT SEEMS WE CAN GET THESE LEN FROM THE MODEL AND DON'T NEED TO HAVE THIS BUT NEED TO INVESTIGATE MORE. + // ---- TODO : AFTER GIVING IT SOME THOUGHT, IT SEEMS WE CAN GET THESE LEN FROM THE MODEL AND DO NOT NEED TO HAVE THIS BUT NEED TO INVESTIGATE MORE. {Gui::GuiActionType::ID_AlarmStatus , 4 * 4 + 2 }, // 4 parameters each 4bytes + 1 parameter 2bytes - {Gui::GuiActionType::ID_AlarmTriggered , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AlarmTriggered , 5 * 4 }, // 5 parameters each 4bytes {Gui::GuiActionType::ID_AlarmCleared , 1 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_AlarmClearedConditionReq , 1 * 4 }, // 1 parameter each 4bytes // the same message 63:0x3F00 {Gui::GuiActionType::ID_AlarmClearedConditionRsp , 1 * 4 }, // 1 parameter each 4bytes // the same message 63:0x3F00 {Gui::GuiActionType::ID_AlarmSilenceReq , 1 * 4 }, // 1 parameter each 1bytes {Gui::GuiActionType::ID_AlarmUserActionReq , 1 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_AlarmActiveListReq , 0 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_AlarmActiveListRsp , 12 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AlarmActiveListRsp , 12 * 4 }, //12 parameters each 4bytes {Gui::GuiActionType::ID_AlarmVolumeSetReq , 1 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_AlarmVolumeSetRsp , 2 * 4 }, // 2 parameters each 4bytes + {Gui::GuiActionType::ID_AlarmVolumeSetRsp , 2 * 4 }, // 2 parameters each 4bytes // ---- {Gui::GuiActionType::ID_TreatmentRanges , 6 * 4 }, // 6 parameters each 4bytes @@ -277,7 +277,7 @@ /*! * \brief The Can_Id enum - * \details The Valid Can Bus MessageID of each frame + * \details The Valid CANBus MessageID of each frame */ enum Can_Id : quint16 { eChlid_LOWEST = 0x7FF, Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r73d6d02c19467735e92f7c451ca5d3b47a2a90e4 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 73d6d02c19467735e92f7c451ca5d3b47a2a90e4) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -163,7 +163,7 @@ /*! * \brief MessageInterpreter::printUnhandled * \details Prints out the formatted string of the vMessage of type Message - * In case the Message ID of received CANBUS message + * In case the Message ID of received CANBus message * is known to the interpreter but has not been handled/implemented. * \param vMessage - The message contains Unhandled Message ID */ @@ -203,7 +203,7 @@ * to interpret messages from UI regarding vActionId. * \param vActionId - The ActionID of type GuiActionType * to be interpreted to hex representation of Message ID. - * \param vData - The data which has to be sent over the CANBUS. + * \param vData - The data which has to be sent over the CANBus. * \param vPayload - The Payload of the frame of Type QByteArray of hex values * Which has been interpreted from vData of Type QVariantList * \return true if the vActionId is valid. @@ -359,11 +359,11 @@ * \brief MessageInterpreter::interpretMessage * \details This method will call appropriate message interpreter * for received messages from HD or DG regarding the Can_Id. - * \param vCan_Id - The Channel Id of the CANBUS frame. + * \param vCan_Id - The Channel Id of the CANBus frame. * \param vMessage - The complete message of type Message which needs to be interpreted. * \param vActionId - The ActionId of GuiActionType which will be extracted from vMessage. * \param vData - The values of QVariantList which is understandable for UI - * and has been extracted from hex values of the CANBUS Message Payload + * and has been extracted from hex values of the CANBus Message Payload * regarding each Message Id definition. * \return true if the message channel is in the range which can be interpreted, false otherwise. * This return value will be used later to emit MessageDispatcher::didActionReceive signal or not @@ -388,9 +388,9 @@ * \param vMessage - The complete message of type Message which needs to be interpreted. * \param vActionId - The ActionId of GuiActionType which will be extracted from vMessage. * \param vData - The values of QVariantList which is understandable for UI - * and has been extracted from hex values of the CANBUS Message Payload + * and has been extracted from hex values of the CANBus Message Payload * in vMessage of type Message regarding each Message Id definition. - * \return true if the message CANBUS channel is in the range which can be interpreted, false otherwise. + * \return true if the message CANBus channel is in the range which can be interpreted, false otherwise. * This return value will be used later to emit MessageDispatcher::didActionReceive signal or not */ bool MessageInterpreter::interpretMessage_HD(const Message &vMessage, QVariantList &vData) @@ -512,9 +512,9 @@ * \param vMessage - The complete message of type Message which needs to be interpreted. * \param vActionId - The ActionId of GuiActionType which will be extracted from vMessage. * \param vData - The values of QVariantList which is understandable for UI - * and has been extracted from hex values of the CANBUS Message Payload + * and has been extracted from hex values of the CANBus Message Payload * in vMessage of type Message regarding each Message Id definition. - * \return true if the message CANBUS channel is in the range which can be interpreted, false otherwise. + * \return true if the message CANBus channel is in the range which can be interpreted, false otherwise. * This return value will be used later to emit MessageDispatcher::didActionReceive signal or not */ bool MessageInterpreter::interpretMessage_DG(const Message &vMessage, QVariantList &vData) Index: sources/canbus/MessageInterpreter.h =================================================================== diff -u -r73d6d02c19467735e92f7c451ca5d3b47a2a90e4 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/canbus/MessageInterpreter.h (.../MessageInterpreter.h) (revision 73d6d02c19467735e92f7c451ca5d3b47a2a90e4) +++ sources/canbus/MessageInterpreter.h (.../MessageInterpreter.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -32,7 +32,7 @@ * \brief The MessageInterpreter class * \details This the class that interprets the messages to/from frames. * UI only understands GuiActionType and QVariantList data types - * And CANBUS only understands QCanBusFrame with Hex values in QByteArrays + * And CANBus only understands QCanBusFrame with Hex values in QByteArrays * This is the class which interpret this data to/from. * This class is converting the data of messages to frames regarding the Message ID from values to array of bytes * or converting the payload of frames from data of messages regarding the Message ID from array of bytes to values. \n Index: sources/device/DeviceController.h =================================================================== diff -u -r052c794d6a8db55a2fbfdad172275af073ee54c3 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/device/DeviceController.h (.../DeviceController.h) (revision 052c794d6a8db55a2fbfdad172275af073ee54c3) +++ sources/device/DeviceController.h (.../DeviceController.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -19,7 +19,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "Threads.h" #include "DeviceGlobals.h" #include "DeviceModels.h" @@ -40,7 +40,7 @@ * It also is watching for the USB and SD-Card drives in Linux file system. * It has the interval of 1000 ms and will look if any device between /dev/sda1 to /dev/sdz1 exists then will mount it in /media/usb, * and does check if the SD-Card has been mounted under /media/sdcard, - * but for SD-Card doesn't try to mount it and it has to be mounted prior to UI Application start + * but for SD-Card does not try to mount it and it has to be mounted prior to UI Application start * and that's because from UI Application perspective it is not a removable/hot-plug device (although physically it is). * This class works in its own thread and will send notification by emitting signals about the USB device status * which are Mounted, Unmounted, Removed Index: sources/device/DeviceView.h =================================================================== diff -u -r97d593e2e7adb36f2f9f97f9bb9958dcef740bc1 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/device/DeviceView.h (.../DeviceView.h) (revision 97d593e2e7adb36f2f9f97f9bb9958dcef740bc1) +++ sources/device/DeviceView.h (.../DeviceView.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "DeviceGlobals.h" #include "DeviceModels.h" Index: sources/gui/GuiController.cpp =================================================================== diff -u -r97d593e2e7adb36f2f9f97f9bb9958dcef740bc1 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/gui/GuiController.cpp (.../GuiController.cpp) (revision 97d593e2e7adb36f2f9f97f9bb9958dcef740bc1) +++ sources/gui/GuiController.cpp (.../GuiController.cpp) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -205,7 +205,7 @@ //} break; - //case Another_Command_Which_Doesn't_Require_HD_Approval: + //case Another_Command_Which_does not_Require_HD_Approval: //return true; //break; default: Index: sources/gui/GuiController.h =================================================================== diff -u -rab7ffd27ecea1277d8645a8b62ff48c0cb3f6ff4 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/gui/GuiController.h (.../GuiController.h) (revision ab7ffd27ecea1277d8645a8b62ff48c0cb3f6ff4) +++ sources/gui/GuiController.h (.../GuiController.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "MModel.h" #include "GuiGlobals.h" #include "MessageGlobals.h" Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r2bc6542cebc264eb343f791f75223a1ca151465e -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 2bc6542cebc264eb343f791f75223a1ca151465e) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -60,7 +60,7 @@ * *** then it can be compared exactly the way it is with no conversion.***\n */ - enum GuiActionsType_Enum /* : quint16 QML doesn't support enum types */ { + enum GuiActionsType_Enum /* : quint16 QML does not support enum types */ { ID_Unknown = 0x0000, ID_CANBusFaultCount = 0x9909, @@ -259,7 +259,7 @@ ID_DisinfectDGChemicalTimeData = 0x8500, // 133 }; - enum class GuiActionsData_Enum /*: quint8 QML doesn't support*/ { + enum class GuiActionsData_Enum /*: quint8 QML does not support*/ { NoData = 0x00, Command = 0x00, // HD=>UI : should be handled in receive Index: sources/gui/GuiView.cpp =================================================================== diff -u -r61f16c988a159401c92730b4cbfca5085c77222f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/gui/GuiView.cpp (.../GuiView.cpp) (revision 61f16c988a159401c92730b4cbfca5085c77222f) +++ sources/gui/GuiView.cpp (.../GuiView.cpp) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -43,7 +43,7 @@ connect(&_GuiController, SIGNAL(didActionReceive (GuiActionType, const QVariantList &)), this , SLOT( onActionReceive (GuiActionType, const QVariantList &))); - // since we don't have access to this object because it is created in QML. + // since we do not have access to this object because it is created in QML. // Connection to the GuiController made here // It should be defined in the class which wants to connect to signal. connect(this , SIGNAL(didActionTransmit(GuiActionType,const QVariantList &)), Index: sources/gui/qml/components/MuteButton.qml =================================================================== diff -u -r1a8e9578b27bb3877116675d0b2361ce4f5b5539 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/gui/qml/components/MuteButton.qml (.../MuteButton.qml) (revision 1a8e9578b27bb3877116675d0b2361ce4f5b5539) +++ sources/gui/qml/components/MuteButton.qml (.../MuteButton.qml) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -42,7 +42,7 @@ TimeText { id: _timeoutText // texts are working with thir base line and not the dimetion - // needs to be adjusted and can't just be set to verticalCenter + // needs to be adjusted and cannot just be set to verticalCenter anchors.top: parent.top anchors.topMargin: 4 Index: sources/gui/qml/components/RangeSlider.qml =================================================================== diff -u -r8a5dbf556a66524fbe4b60ac1573182a0bd27617 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/gui/qml/components/RangeSlider.qml (.../RangeSlider.qml) (revision 8a5dbf556a66524fbe4b60ac1573182a0bd27617) +++ sources/gui/qml/components/RangeSlider.qml (.../RangeSlider.qml) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -46,10 +46,10 @@ property bool minVerticalEdgeVisible: true property int gapValue : 0 ///< the gap between minValue and maxValue so the minValue shall always be gap value less than maxValue and vise versa. - property real minValueLowerBound : _root.minimum ///< min value can't be lower than this value - property real minValueUpperBound : _root.maximum ///< min value can't be higher than this value - property real maxValueLowerBound : _root.minimum ///< max value can't be lower than this value - property real maxValueUpperBound : _root.maximum ///< max value can't be higher than this value + property real minValueLowerBound : _root.minimum ///< min value cannot be lower than this value + property real minValueUpperBound : _root.maximum ///< min value cannot be higher than this value + property real maxValueLowerBound : _root.minimum ///< max value cannot be lower than this value + property real maxValueUpperBound : _root.maximum ///< max value cannot be higher than this value property int curHandler : RangeSlider.HandlerOption.None ///< current active slider handler Index: sources/gui/qml/dialogs/NotificationDialog.qml =================================================================== diff -u -r7a1509a80fed2dd51aa28b460acbf0227d0c96d7 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 7a1509a80fed2dd51aa28b460acbf0227d0c96d7) +++ sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -52,7 +52,7 @@ // Look for this tag: #First_Time_Message_Sent_With_Silenced // the isSilenced is helping not to show this dialog maximized and // then if the silence is set minimize it immediately - // this behaviour doesn't look nice on the screen and it bounces + // this behaviour does not look nice on the screen and it bounces visible : description && ! isSilenced radius : Variables.dialogRadius @@ -148,7 +148,7 @@ // Regarding the discussion there should be only 3 situations: // 1 - Different combination of the Resume,Rinseback,End // 2 - OK button for user to only ack the alarm - // 3 - No button at all for the situations that the alarm can't be resolved by user. + // 3 - No button at all for the situations that the alarm cannot be resolved by user. // :: OK button and the other 3 buttons (Resume,Rinseback,End) should never come together TouchRect { id : _resumeTouchRect visible : resumeVisible Index: sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml =================================================================== diff -u -r99a56ec30f1ca4f401e744766bde4f6fac291752 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml (.../PreTreatmentConsumablesStack.qml) (revision 99a56ec30f1ca4f401e744766bde4f6fac291752) +++ sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml (.../PreTreatmentConsumablesStack.qml) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -47,7 +47,7 @@ // check List hasCheckList : true checkListStepNames : [ - //qsTr("Water Quality Check"), // this happens too fast and can't be sent to the UI. + //qsTr("Water Quality Check"), // this happens too fast and cannot be sent to the UI. qsTr("BiCarb Pump Check"), qsTr("Acid Pump Check" ), ] Index: sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml =================================================================== diff -u -r7077e38c74db9cccb5496ffefcf8936c0916de76 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml (.../PreTreatmentDisposablesStack.qml) (revision 7077e38c74db9cccb5496ffefcf8936c0916de76) +++ sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml (.../PreTreatmentDisposablesStack.qml) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -93,7 +93,7 @@ Connections { target: vPreTreatmentStates onSelfTestNoCartridge_startChanged : { /* , vselfTestNoCartridge_start */ } - // FW doesn't go all the time to start so the main state change should be sufficient to update the disposables stack. + // FW does not go all the time to start so the main state change should be sufficient to update the disposables stack. onSelfTestNoCartridgeChanged : { page( _preTreatmentDisposablesSelfTest , vselfTestNoCartridge )} onInstallationChanged : { page( _preTreatmentDisposablesCartridgeInstallation , vinstallation )} } Index: sources/model/hd/adjustment/settings/MAdjustHDRequests.h =================================================================== diff -u -rebc82b5efe26c1081606fab06a1c99bb4f9c0098 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/model/hd/adjustment/settings/MAdjustHDRequests.h (.../MAdjustHDRequests.h) (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) +++ sources/model/hd/adjustment/settings/MAdjustHDRequests.h (.../MAdjustHDRequests.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -190,7 +190,7 @@ /*! - * \brief The MAdjustUIPostFinalResultRequest class + * \brief The MAdjustUIPostFinalResultReq class * \details The UI power on self test result model * * | MSG | CAN ID | Type | Ack | Src | Dest | Description | Index: sources/model/hd/alarm/MAlarmTriggered.h =================================================================== diff -u -r2bc6542cebc264eb343f791f75223a1ca151465e -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/model/hd/alarm/MAlarmTriggered.h (.../MAlarmTriggered.h) (revision 2bc6542cebc264eb343f791f75223a1ca151465e) +++ sources/model/hd/alarm/MAlarmTriggered.h (.../MAlarmTriggered.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -49,9 +49,9 @@ *

Logging info

* | || * | || - * | typeText | Event | - * | unitText | HD | - * | infoText | Alarm Triggered | + * | typeText | Event | + * | unitText | HD | + * | infoText | AlarmTriggered | * */ class MAlarmTriggered : public MAbstract { @@ -114,7 +114,18 @@ * * | Payload || * | || + * | || * + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | UI | + * | infoText | AlarmTriggered | + * */ class MAlarmTriggeredReq : public MModel { public: Index: sources/model/settings/MSettings.h =================================================================== diff -u -r2216ac6ac7f77437a7c29ac8b4043be01bc4609e -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/model/settings/MSettings.h (.../MSettings.h) (revision 2216ac6ac7f77437a7c29ac8b4043be01bc4609e) +++ sources/model/settings/MSettings.h (.../MSettings.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -20,7 +20,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove // Define #define _Settings Storage::MSettings::I() Index: sources/storage/FileHandler.cpp =================================================================== diff -u -r1c18f738693756ca1f0342c2cc158e32bc28f90b -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/storage/FileHandler.cpp (.../FileHandler.cpp) (revision 1c18f738693756ca1f0342c2cc158e32bc28f90b) +++ sources/storage/FileHandler.cpp (.../FileHandler.cpp) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -197,7 +197,7 @@ /*! * \brief FileHandler::makeFolder - * \details Create the folder vFolder if it doesn't exist. + * \details Create the folder vFolder if it does not exist. * \param vFolder - the folder to create * \return true on successful creation */ @@ -257,7 +257,7 @@ * e.g. 80% retains means older files which use 20% of storage will be listed. * e.g. 0% retains means no file shall be retained, therefore all the files listed. * e.g. 100% retains means all file shall be retained, therefore the list shall be empty. - * By default set t0 0 so don't have any size constraint + * By default set t0 0 so do not have any size constraint * \return list of the files found by their information. * if vRetainPercent is used then it contains list of the file(s) to be removed. */ @@ -291,7 +291,7 @@ // the total size that all the quint64 totalSizeRetain = totalSizeStorage * (vRetainPercent / 100.0); - // if already totalSizeFiles <= totalSizeRetain, don't go any further and return empty list. + // if already totalSizeFiles <= totalSizeRetain, do not go any further and return empty list. if (totalSizeFiles <= totalSizeRetain) return fileInfoList; // gets each file size from oldest to newest Index: sources/storage/FileHandler.h =================================================================== diff -u -r821bf955d0ba7e028bccfee7c04ca77cf80a0bd4 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/storage/FileHandler.h (.../FileHandler.h) (revision 821bf955d0ba7e028bccfee7c04ca77cf80a0bd4) +++ sources/storage/FileHandler.h (.../FileHandler.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -29,7 +29,7 @@ * \brief The FileHandler class * This class is suppose to be the static class * which contains methods to manipulate files and folders - * Since it is static it doesn't have thread so needs to be used with care + * Since it is static it does not have thread so needs to be used with care * and the classes which are using it need to take care of the threading. */ class FileHandler Index: sources/storage/Logger.cpp =================================================================== diff -u -r73d6d02c19467735e92f7c451ca5d3b47a2a90e4 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/storage/Logger.cpp (.../Logger.cpp) (revision 73d6d02c19467735e92f7c451ca5d3b47a2a90e4) +++ sources/storage/Logger.cpp (.../Logger.cpp) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -205,15 +205,15 @@ /*! * \brief Logger::setLogBasePath * \details Tries to the set the log path to the default log path (Log_Base_Path_Name) - * Will set the application folder as the base log path if can't set the log path to the default. + * Will set the application folder as the base log path if cannot set the log path to the default. * Will log the event in that case. * \param vUseApplicationDirPath */ void Logger::setLogBasePath(bool vUseApplicationDirPath) { if (vUseApplicationDirPath) { _dir.setPath(qApp->applicationDirPath()); - // Don't use LOG_XXXXX, At this moment Logger has not been initialized yet + // Do not use LOG_XXXXX, At this moment Logger has not been initialized yet qDebug() << QString("Application path used for events logging (%1)").arg(_dir.path()); } else { @@ -243,7 +243,7 @@ * \details Sets the log path for the log type vLogType * Creates the folder if not exists. * \param vLogType - log type - * \return returns false if the path doesn't exist and folder can't be created. + * \return returns false if the path does not exist and folder cannot be created. */ bool Logger::setLogPath(LogType vLogType) { Index: sources/storage/Logger.h =================================================================== diff -u -r13d6a4fae2f910ab6e289ac9280258a94f734405 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/storage/Logger.h (.../Logger.h) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) +++ sources/storage/Logger.h (.../Logger.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -20,7 +20,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "StorageGlobals.h" // Define @@ -80,7 +80,7 @@ public : enum LogType { - eLogDebug, ///< Application Error : CANBus messages doesn't have error it's Event/Data only + eLogDebug, ///< Application Error : CANBus messages does not have error it's Event/Data only eLogEvent, ///< Massages on the CANBus : Error is an event type eLogDatum, ///< Massages on the CANBus : Broadcast data type Index: sources/storage/Settings.h =================================================================== diff -u -r61f16c988a159401c92730b4cbfca5085c77222f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/storage/Settings.h (.../Settings.h) (revision 61f16c988a159401c92730b4cbfca5085c77222f) +++ sources/storage/Settings.h (.../Settings.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -20,7 +20,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "StorageGlobals.h" #include "Threads.h" Index: sources/storage/TreatmentLog.h =================================================================== diff -u -rac07818fa03e65ff3601535b790bb6cb4e34f731 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/storage/TreatmentLog.h (.../TreatmentLog.h) (revision ac07818fa03e65ff3601535b790bb6cb4e34f731) +++ sources/storage/TreatmentLog.h (.../TreatmentLog.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -20,7 +20,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "MPostTreatmentAdjustTreatmentLogResponse.h" #include "MTreatmentLogAvrgeData.h" #include "MTreatmentLogAlarmData.h" Index: sources/utility/format.cpp =================================================================== diff -u -r2f0d1d22a15f0ddb459c6527b4746439f66bfe1b -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/utility/format.cpp (.../format.cpp) (revision 2f0d1d22a15f0ddb459c6527b4746439f66bfe1b) +++ sources/utility/format.cpp (.../format.cpp) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -69,7 +69,7 @@ * \brief Format::fromVariant * \details This static method converts the defined types into QByteArray * \param vData - The value - * \return The QByteAttay of the value vData if can't be converted 0x00 will be returned + * \return The QByteAttay of the value vData if cannot be converted 0x00 will be returned * \note Regarding the QVariant type conversion, if cannot be converted 0 will be returned * This rule has been used and also to be consistent followed the same rule. * \note This method converts both float and double to F32 and returns its QByteArray representation. Index: sources/utility/types.h =================================================================== diff -u -r2f0d1d22a15f0ddb459c6527b4746439f66bfe1b -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/utility/types.h (.../types.h) (revision 2f0d1d22a15f0ddb459c6527b4746439f66bfe1b) +++ sources/utility/types.h (.../types.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -129,7 +129,7 @@ template < typename T > static T safeIncrement(T &vValue, quint8 vStep = 1) { - // step can't be zero + // step cannot be zero if (!vStep) vStep = 1; T mMax = (T)(pow(2, sizeof(T) * 8) - 1); Index: sources/view/VAdjustmentResponseBase.h =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/VAdjustmentResponseBase.h (.../VAdjustmentResponseBase.h) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/view/VAdjustmentResponseBase.h (.../VAdjustmentResponseBase.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MAdjustHDRequests.h" #include "MAdjustDGRequests.h" Index: sources/view/VEventSpy.h =================================================================== diff -u -r13d6a4fae2f910ab6e289ac9280258a94f734405 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/VEventSpy.h (.../VEventSpy.h) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) +++ sources/view/VEventSpy.h (.../VEventSpy.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -20,7 +20,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove // define #define _VEventSpy View::VEventSpy::I() Index: sources/view/VPowerOff.h =================================================================== diff -u -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/VPowerOff.h (.../VPowerOff.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) +++ sources/view/VPowerOff.h (.../VPowerOff.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MAdjustPowerOff.h" Index: sources/view/dg/data/VDGAccelerometerData.h =================================================================== diff -u -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/dg/data/VDGAccelerometerData.h (.../VDGAccelerometerData.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) +++ sources/view/dg/data/VDGAccelerometerData.h (.../VDGAccelerometerData.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MDGAccelerometerData.h" Index: sources/view/dg/data/VDGDrainPumpData.h =================================================================== diff -u -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/dg/data/VDGDrainPumpData.h (.../VDGDrainPumpData.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) +++ sources/view/dg/data/VDGDrainPumpData.h (.../VDGDrainPumpData.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MDGDrainPumpData.h" Index: sources/view/dg/data/VDGHeatersData.h =================================================================== diff -u -r7077e38c74db9cccb5496ffefcf8936c0916de76 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/dg/data/VDGHeatersData.h (.../VDGHeatersData.h) (revision 7077e38c74db9cccb5496ffefcf8936c0916de76) +++ sources/view/dg/data/VDGHeatersData.h (.../VDGHeatersData.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MDGHeatersData.h" Index: sources/view/dg/data/VDGLoadCellReadingsData.h =================================================================== diff -u -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/dg/data/VDGLoadCellReadingsData.h (.../VDGLoadCellReadingsData.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) +++ sources/view/dg/data/VDGLoadCellReadingsData.h (.../VDGLoadCellReadingsData.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MDGLoadCellReadingsData.h" Index: sources/view/dg/data/VDGOperationModeData.h =================================================================== diff -u -r6816b783f50e08267aa016d64350bc020080d901 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/dg/data/VDGOperationModeData.h (.../VDGOperationModeData.h) (revision 6816b783f50e08267aa016d64350bc020080d901) +++ sources/view/dg/data/VDGOperationModeData.h (.../VDGOperationModeData.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MDGOperationModeData.h" #include "GuiGlobals.h" Index: sources/view/dg/data/VDGPressuresData.h =================================================================== diff -u -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/dg/data/VDGPressuresData.h (.../VDGPressuresData.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) +++ sources/view/dg/data/VDGPressuresData.h (.../VDGPressuresData.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MDGPressuresData.h" Index: sources/view/dg/data/VDGROPumpData.h =================================================================== diff -u -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/dg/data/VDGROPumpData.h (.../VDGROPumpData.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) +++ sources/view/dg/data/VDGROPumpData.h (.../VDGROPumpData.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MDGROPumpData.h" Index: sources/view/dg/data/VDGReservoirData.h =================================================================== diff -u -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/dg/data/VDGReservoirData.h (.../VDGReservoirData.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) +++ sources/view/dg/data/VDGReservoirData.h (.../VDGReservoirData.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MDGReservoirData.h" Index: sources/view/dg/data/VDGTemperaturesData.h =================================================================== diff -u -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/dg/data/VDGTemperaturesData.h (.../VDGTemperaturesData.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) +++ sources/view/dg/data/VDGTemperaturesData.h (.../VDGTemperaturesData.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MDGTemperaturesData.h" Index: sources/view/dg/data/VDGValvesStatesData.h =================================================================== diff -u -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/dg/data/VDGValvesStatesData.h (.../VDGValvesStatesData.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) +++ sources/view/dg/data/VDGValvesStatesData.h (.../VDGValvesStatesData.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MDGValvesStatesData.h" Index: sources/view/dg/data/disinfect/VDisinfectDGData.h =================================================================== diff -u -re125bd5cf13750eaf241d518b9c846139afaa81c -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/dg/data/disinfect/VDisinfectDGData.h (.../VDisinfectDGData.h) (revision e125bd5cf13750eaf241d518b9c846139afaa81c) +++ sources/view/dg/data/disinfect/VDisinfectDGData.h (.../VDisinfectDGData.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MDisinfectDGFlushTimeData.h" #include "MDisinfectDGHeatTimeData.h" Index: sources/view/dg/data/disinfect/VDisinfectStatesData.h =================================================================== diff -u -r42c029b1704455433cb095d2e76dcd540c1f0046 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/dg/data/disinfect/VDisinfectStatesData.h (.../VDisinfectStatesData.h) (revision 42c029b1704455433cb095d2e76dcd540c1f0046) +++ sources/view/dg/data/disinfect/VDisinfectStatesData.h (.../VDisinfectStatesData.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MDisinfectStatesData.h" Index: sources/view/dg/data/post/VDGPOSTData.h =================================================================== diff -u -rb50431293b0690d6071f0fd58044880909cef01d -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/dg/data/post/VDGPOSTData.h (.../VDGPOSTData.h) (revision b50431293b0690d6071f0fd58044880909cef01d) +++ sources/view/dg/data/post/VDGPOSTData.h (.../VDGPOSTData.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -17,7 +17,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" #include "MDGPostSingleResultData.h" #include "MDGPostFinalResultData.h" Index: sources/view/dg/data/pretreatment/VDGFilterFlushData.h =================================================================== diff -u -r2c3846821eda0903c34bb5fcf2aebcbde2d0343a -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/dg/data/pretreatment/VDGFilterFlushData.h (.../VDGFilterFlushData.h) (revision 2c3846821eda0903c34bb5fcf2aebcbde2d0343a) +++ sources/view/dg/data/pretreatment/VDGFilterFlushData.h (.../VDGFilterFlushData.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MDGFilterFlushData.h" Index: sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h =================================================================== diff -u -rab7ffd27ecea1277d8645a8b62ff48c0cb3f6ff4 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h (.../VCommonAdjustmentVitals.h) (revision ab7ffd27ecea1277d8645a8b62ff48c0cb3f6ff4) +++ sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h (.../VCommonAdjustmentVitals.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -17,7 +17,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" namespace View { Index: sources/view/hd/adjustment/disinfect/VDisinfectAdjustChemicalConfirm.h =================================================================== diff -u -re125bd5cf13750eaf241d518b9c846139afaa81c -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/adjustment/disinfect/VDisinfectAdjustChemicalConfirm.h (.../VDisinfectAdjustChemicalConfirm.h) (revision e125bd5cf13750eaf241d518b9c846139afaa81c) +++ sources/view/hd/adjustment/disinfect/VDisinfectAdjustChemicalConfirm.h (.../VDisinfectAdjustChemicalConfirm.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -17,7 +17,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" #include "MDisinfectAdjustRequests.h" #include "MDisinfectAdjustChemicalConfirmResponse.h" Index: sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h =================================================================== diff -u -re125bd5cf13750eaf241d518b9c846139afaa81c -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h (.../VDisinfectAdjustDisinfect.h) (revision e125bd5cf13750eaf241d518b9c846139afaa81c) +++ sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h (.../VDisinfectAdjustDisinfect.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -17,7 +17,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" #include "MDisinfectAdjustRequests.h" #include "MDisinfectAdjustResponse.h" Index: sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.h =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.h (.../VPostTreatmentAdjustDisposablesRemovalConfirm.h) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.h (.../VPostTreatmentAdjustDisposablesRemovalConfirm.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -17,7 +17,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" #include "MPostTreatmentAdjustDisposablesRemovalConfirmResponse.h" Index: sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h (.../VPostTreatmentAdjustPatientDisconnectionConfirm.h) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h (.../VPostTreatmentAdjustPatientDisconnectionConfirm.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -17,7 +17,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" namespace View { Index: sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h =================================================================== diff -u -r1c18f738693756ca1f0342c2cc158e32bc28f90b -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h (.../VPostTreatmentAdjustTreatmentLog.h) (revision 1c18f738693756ca1f0342c2cc158e32bc28f90b) +++ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h (.../VPostTreatmentAdjustTreatmentLog.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -20,7 +20,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" #include "TreatmentLog.h" // Model MPostTreatmentAdjustTreatmentLogResponse included in this controller header #include "MTreatmentLogAvrgeData.h" Index: sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.h =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.h (.../VPreTreatmentAdjustmentConsumablesConfirm.h) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.h (.../VPreTreatmentAdjustmentConsumablesConfirm.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -17,7 +17,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" namespace View { Index: sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h (.../VPreTreatmentAdjustmentDisposablesConfirm.h) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h (.../VPreTreatmentAdjustmentDisposablesConfirm.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -17,7 +17,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" namespace View { Index: sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesPrime.h =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesPrime.h (.../VPreTreatmentAdjustmentDisposablesPrime.h) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesPrime.h (.../VPreTreatmentAdjustmentDisposablesPrime.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -17,7 +17,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" #include "MPreTreatmentAdjustDisposablesPrimeResponse.h" Index: sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.h =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.h (.../VPreTreatmentAdjustmentInitTreatment.h) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.h (.../VPreTreatmentAdjustmentInitTreatment.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -17,7 +17,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" #include "MPreTreatmentAdjustInitTreatmentResponse.h" Index: sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionBegin.h =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionBegin.h (.../VPreTreatmentAdjustmentPatientConnectionBegin.h) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionBegin.h (.../VPreTreatmentAdjustmentPatientConnectionBegin.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -17,7 +17,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" #include "MPreTreatmentAdjustPatientConnectionBeginResponse.h" Index: sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.h =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.h (.../VPreTreatmentAdjustmentPatientConnectionConfirm.h) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.h (.../VPreTreatmentAdjustmentPatientConnectionConfirm.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -17,7 +17,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" #include "MPreTreatmentAdjustPatientConnectionConfirmResponse.h" Index: sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h (.../VPreTreatmentAdjustmentStartTreatment.h) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h (.../VPreTreatmentAdjustmentStartTreatment.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -17,7 +17,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" #include "MPreTreatmentAdjustStartTreatmentResponse.h" Index: sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentUltrafiltrationInit.h =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentUltrafiltrationInit.h (.../VPreTreatmentAdjustmentUltrafiltrationInit.h) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentUltrafiltrationInit.h (.../VPreTreatmentAdjustmentUltrafiltrationInit.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -17,7 +17,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" #include "MPreTreatmentAdjustUltrafiltrationInitResponse.h" Index: sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h (.../VPreTreatmentAdjustmentWaterSample.h) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h (.../VPreTreatmentAdjustmentWaterSample.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -17,7 +17,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" #include "MPreTreatmentAdjustWaterSampleResponse.h" Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentDuration.h =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentDuration.h (.../VTreatmentAdjustmentDuration.h) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentDuration.h (.../VTreatmentAdjustmentDuration.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -17,7 +17,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" #include "MTreatmentAdjustDurationResponse.h" Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentEnd.h =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentEnd.h (.../VTreatmentAdjustmentEnd.h) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentEnd.h (.../VTreatmentAdjustmentEnd.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -17,7 +17,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" #include "MTreatmentAdjustEndResponse.h" Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.h =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.h (.../VTreatmentAdjustmentFlows.h) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.h (.../VTreatmentAdjustmentFlows.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" #include "MTreatmentAdjustBloodDialysateResponse.h" Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.h =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.h (.../VTreatmentAdjustmentHeparin.h) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.h (.../VTreatmentAdjustmentHeparin.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -17,7 +17,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" #include "MTreatmentAdjustHeparinResponse.h" Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h (.../VTreatmentAdjustmentPressuresLimits.h) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h (.../VTreatmentAdjustmentPressuresLimits.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" #include "MTreatmentAdjustPressuresLimitsResponse.h" Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRecirculate.h =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRecirculate.h (.../VTreatmentAdjustmentRecirculate.h) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRecirculate.h (.../VTreatmentAdjustmentRecirculate.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -17,7 +17,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" #include "MTreatmentAdjustRecirculateResponse.h" Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRinseback.h =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRinseback.h (.../VTreatmentAdjustmentRinseback.h) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRinseback.h (.../VTreatmentAdjustmentRinseback.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -17,7 +17,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" #include "MTreatmentAdjustRinsebackResponse.h" Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentSaline.h =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentSaline.h (.../VTreatmentAdjustmentSaline.h) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentSaline.h (.../VTreatmentAdjustmentSaline.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -17,7 +17,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" #include "MTreatmentAdjustSalineResponse.h" Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.h =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.h (.../VTreatmentAdjustmentUltrafiltrationConfirm.h) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.h (.../VTreatmentAdjustmentUltrafiltrationConfirm.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -17,7 +17,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" #include "MTreatmentAdjustUltrafiltrationConfirmResponse.h" Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.h =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.h (.../VTreatmentAdjustmentUltrafiltrationEdit.h) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.h (.../VTreatmentAdjustmentUltrafiltrationEdit.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -17,7 +17,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" #include "MTreatmentAdjustUltrafiltrationEditResponse.h" Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.h =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.h (.../VTreatmentAdjustmentUltrafiltrationState.h) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.h (.../VTreatmentAdjustmentUltrafiltrationState.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -17,7 +17,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" #include "MTreatmentAdjustUltrafiltrationStateResponse.h" Index: sources/view/hd/alarm/VAlarmActiveList.h =================================================================== diff -u -r376859852f4d1a07263c44524aec347db29e0133 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/alarm/VAlarmActiveList.h (.../VAlarmActiveList.h) (revision 376859852f4d1a07263c44524aec347db29e0133) +++ sources/view/hd/alarm/VAlarmActiveList.h (.../VAlarmActiveList.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" #include "MAlarmActiveList.h" Index: sources/view/hd/alarm/VAlarmStatus.h =================================================================== diff -u -r3229695c1c67de600c095d52c6f99dacfafb462d -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/alarm/VAlarmStatus.h (.../VAlarmStatus.h) (revision 3229695c1c67de600c095d52c6f99dacfafb462d) +++ sources/view/hd/alarm/VAlarmStatus.h (.../VAlarmStatus.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MTreatmentAdjustRequests.h" #include "GuiGlobals.h" @@ -30,7 +30,7 @@ class tst_views; // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" namespace View { Index: sources/view/hd/data/VHDAccelerometerData.h =================================================================== diff -u -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/data/VHDAccelerometerData.h (.../VHDAccelerometerData.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) +++ sources/view/hd/data/VHDAccelerometerData.h (.../VHDAccelerometerData.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MHDAccelerometerData.h" Index: sources/view/hd/data/VHDOperationModeData.h =================================================================== diff -u -r65558208e4968de9a5470ff5fda1ee2a9d00c793 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/data/VHDOperationModeData.h (.../VHDOperationModeData.h) (revision 65558208e4968de9a5470ff5fda1ee2a9d00c793) +++ sources/view/hd/data/VHDOperationModeData.h (.../VHDOperationModeData.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MHDOperationModeData.h" #include "GuiGlobals.h" Index: sources/view/hd/data/VHDSyringePumpData.h =================================================================== diff -u -rebc82b5efe26c1081606fab06a1c99bb4f9c0098 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/data/VHDSyringePumpData.h (.../VHDSyringePumpData.h) (revision ebc82b5efe26c1081606fab06a1c99bb4f9c0098) +++ sources/view/hd/data/VHDSyringePumpData.h (.../VHDSyringePumpData.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MHDSyringePumpData.h" Index: sources/view/hd/data/VTreatmentRanges.h =================================================================== diff -u -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/data/VTreatmentRanges.h (.../VTreatmentRanges.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) +++ sources/view/hd/data/VTreatmentRanges.h (.../VTreatmentRanges.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MTreatmentRangesData.h" Index: sources/view/hd/data/post/VHDPOSTData.h =================================================================== diff -u -r3f555c49ddd2c983f469709e3c001d0e76159248 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/data/post/VHDPOSTData.h (.../VHDPOSTData.h) (revision 3f555c49ddd2c983f469709e3c001d0e76159248) +++ sources/view/hd/data/post/VHDPOSTData.h (.../VHDPOSTData.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -17,7 +17,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" #include "MHDPostSingleResultData.h" #include "MHDPostFinalResultData.h" Index: sources/view/hd/data/posttreatment/VPostTreatmentStatesData.h =================================================================== diff -u -r88563177f10f20ced98750b2e40036201728131d -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/data/posttreatment/VPostTreatmentStatesData.h (.../VPostTreatmentStatesData.h) (revision 88563177f10f20ced98750b2e40036201728131d) +++ sources/view/hd/data/posttreatment/VPostTreatmentStatesData.h (.../VPostTreatmentStatesData.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MPostTreatmentStatesData.h" Index: sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.h =================================================================== diff -u -r88563177f10f20ced98750b2e40036201728131d -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.h (.../VPreTreatmentDisposablesPrimeData.h) (revision 88563177f10f20ced98750b2e40036201728131d) +++ sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.h (.../VPreTreatmentDisposablesPrimeData.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MPreTreatmentDisposablesPrimeData.h" Index: sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.h =================================================================== diff -u -r88563177f10f20ced98750b2e40036201728131d -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.h (.../VPreTreatmentSelfTestDryData.h) (revision 88563177f10f20ced98750b2e40036201728131d) +++ sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.h (.../VPreTreatmentSelfTestDryData.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MPreTreatmentSelfTestDryData.h" Index: sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.h =================================================================== diff -u -r88563177f10f20ced98750b2e40036201728131d -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.h (.../VPreTreatmentSelfTestNoCartridgeData.h) (revision 88563177f10f20ced98750b2e40036201728131d) +++ sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.h (.../VPreTreatmentSelfTestNoCartridgeData.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MPreTreatmentSelfTestNoCartridgeData.h" Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h =================================================================== diff -u -r88563177f10f20ced98750b2e40036201728131d -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h (.../VPreTreatmentStatesData.h) (revision 88563177f10f20ced98750b2e40036201728131d) +++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h (.../VPreTreatmentStatesData.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MPreTreatmentStatesData.h" Index: sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp =================================================================== diff -u -r7077e38c74db9cccb5496ffefcf8936c0916de76 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp (.../VHDTreatmentStatesData.cpp) (revision 7077e38c74db9cccb5496ffefcf8936c0916de76) +++ sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp (.../VHDTreatmentStatesData.cpp) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -26,7 +26,7 @@ * But also listens to other messages which affect ultrafiltration and saline bolus state. * These extra messages are AdjustSalineResponseData , AdjustUltrafiltrationStateResponseData. * Which ever comes first will set its related properties. - * Since the properties wont set twice if they have the same value it doesn't affect performance so much. + * Since the properties wont set twice if they have the same value it does not affect performance so much. * Also FW suppose to send the TreatmentStatesData related message immediately after the two others. */ void VHDTreatmentStates::initConnections() { Index: sources/view/hd/data/treatment/VHDTreatmentStatesData.h =================================================================== diff -u -r88563177f10f20ced98750b2e40036201728131d -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/data/treatment/VHDTreatmentStatesData.h (.../VHDTreatmentStatesData.h) (revision 88563177f10f20ced98750b2e40036201728131d) +++ sources/view/hd/data/treatment/VHDTreatmentStatesData.h (.../VHDTreatmentStatesData.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MTreatmentStatesData.h" #include "MTreatmentAdjustUltrafiltrationStateResponse.h" Index: sources/view/hd/data/treatment/VTreatmentBloodFlow.h =================================================================== diff -u -r88563177f10f20ced98750b2e40036201728131d -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/data/treatment/VTreatmentBloodFlow.h (.../VTreatmentBloodFlow.h) (revision 88563177f10f20ced98750b2e40036201728131d) +++ sources/view/hd/data/treatment/VTreatmentBloodFlow.h (.../VTreatmentBloodFlow.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MTreatmentFlowsData.h" Index: sources/view/hd/data/treatment/VTreatmentBloodPrimeData.h =================================================================== diff -u -r3f555c49ddd2c983f469709e3c001d0e76159248 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/data/treatment/VTreatmentBloodPrimeData.h (.../VTreatmentBloodPrimeData.h) (revision 3f555c49ddd2c983f469709e3c001d0e76159248) +++ sources/view/hd/data/treatment/VTreatmentBloodPrimeData.h (.../VTreatmentBloodPrimeData.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MTreatmentBloodPrimeData.h" Index: sources/view/hd/data/treatment/VTreatmentDialysateFlow.h =================================================================== diff -u -r88563177f10f20ced98750b2e40036201728131d -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/data/treatment/VTreatmentDialysateFlow.h (.../VTreatmentDialysateFlow.h) (revision 88563177f10f20ced98750b2e40036201728131d) +++ sources/view/hd/data/treatment/VTreatmentDialysateFlow.h (.../VTreatmentDialysateFlow.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MTreatmentFlowsData.h" Index: sources/view/hd/data/treatment/VTreatmentHeparinData.h =================================================================== diff -u -r88563177f10f20ced98750b2e40036201728131d -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/data/treatment/VTreatmentHeparinData.h (.../VTreatmentHeparinData.h) (revision 88563177f10f20ced98750b2e40036201728131d) +++ sources/view/hd/data/treatment/VTreatmentHeparinData.h (.../VTreatmentHeparinData.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MTreatmentHeparinData.h" Index: sources/view/hd/data/treatment/VTreatmentPressureOcclusion.h =================================================================== diff -u -r88563177f10f20ced98750b2e40036201728131d -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/data/treatment/VTreatmentPressureOcclusion.h (.../VTreatmentPressureOcclusion.h) (revision 88563177f10f20ced98750b2e40036201728131d) +++ sources/view/hd/data/treatment/VTreatmentPressureOcclusion.h (.../VTreatmentPressureOcclusion.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MTreatmentPressureOcclusionData.h" Index: sources/view/hd/data/treatment/VTreatmentRecirculateData.h =================================================================== diff -u -r88563177f10f20ced98750b2e40036201728131d -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/data/treatment/VTreatmentRecirculateData.h (.../VTreatmentRecirculateData.h) (revision 88563177f10f20ced98750b2e40036201728131d) +++ sources/view/hd/data/treatment/VTreatmentRecirculateData.h (.../VTreatmentRecirculateData.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MTreatmentRecirculateData.h" Index: sources/view/hd/data/treatment/VTreatmentRinsebackData.h =================================================================== diff -u -r88563177f10f20ced98750b2e40036201728131d -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/data/treatment/VTreatmentRinsebackData.h (.../VTreatmentRinsebackData.h) (revision 88563177f10f20ced98750b2e40036201728131d) +++ sources/view/hd/data/treatment/VTreatmentRinsebackData.h (.../VTreatmentRinsebackData.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MTreatmentRinsebackData.h" Index: sources/view/hd/data/treatment/VTreatmentSalineData.h =================================================================== diff -u -r88563177f10f20ced98750b2e40036201728131d -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/data/treatment/VTreatmentSalineData.h (.../VTreatmentSalineData.h) (revision 88563177f10f20ced98750b2e40036201728131d) +++ sources/view/hd/data/treatment/VTreatmentSalineData.h (.../VTreatmentSalineData.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MTreatmentSalineData.h" Index: sources/view/hd/data/treatment/VTreatmentTime.h =================================================================== diff -u -r8a5dbf556a66524fbe4b60ac1573182a0bd27617 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/data/treatment/VTreatmentTime.h (.../VTreatmentTime.h) (revision 8a5dbf556a66524fbe4b60ac1573182a0bd27617) +++ sources/view/hd/data/treatment/VTreatmentTime.h (.../VTreatmentTime.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MTreatmentTimeData.h" Index: sources/view/hd/data/treatment/VTreatmentUltrafiltration.h =================================================================== diff -u -r88563177f10f20ced98750b2e40036201728131d -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/hd/data/treatment/VTreatmentUltrafiltration.h (.../VTreatmentUltrafiltration.h) (revision 88563177f10f20ced98750b2e40036201728131d) +++ sources/view/hd/data/treatment/VTreatmentUltrafiltration.h (.../VTreatmentUltrafiltration.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -18,7 +18,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VView.h" #include "MTreatmentOutletFlowData.h" Index: sources/view/settings/VAdjustmentAlarmVolume.h =================================================================== diff -u -rf38edd22f7b63694c21b83d6f4b69ea618390126 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/settings/VAdjustmentAlarmVolume.h (.../VAdjustmentAlarmVolume.h) (revision f38edd22f7b63694c21b83d6f4b69ea618390126) +++ sources/view/settings/VAdjustmentAlarmVolume.h (.../VAdjustmentAlarmVolume.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -17,7 +17,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" #include "MAdjustHDRequests.h" #include "MAdjustHDAlarmVolumeResponse.h" Index: sources/view/settings/VAdjustmentService.h =================================================================== diff -u -r13d6a4fae2f910ab6e289ac9280258a94f734405 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/settings/VAdjustmentService.h (.../VAdjustmentService.h) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) +++ sources/view/settings/VAdjustmentService.h (.../VAdjustmentService.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -17,7 +17,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" #include "MAdjustHDServiceResponse.h" #include "MAdjustDGServiceResponse.h" Index: sources/view/settings/VAdjustmentVersions.h =================================================================== diff -u -r2bc6542cebc264eb343f791f75223a1ca151465e -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/settings/VAdjustmentVersions.h (.../VAdjustmentVersions.h) (revision 2bc6542cebc264eb343f791f75223a1ca151465e) +++ sources/view/settings/VAdjustmentVersions.h (.../VAdjustmentVersions.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -17,7 +17,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" #include "MAdjustHDVersionsRequest.h" #include "MAdjustHDVersionsResponse.h" Index: sources/view/settings/VDateTime.h =================================================================== diff -u -ra5be04172757fa469d85fb83a6998a4404214f19 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- sources/view/settings/VDateTime.h (.../VDateTime.h) (revision a5be04172757fa469d85fb83a6998a4404214f19) +++ sources/view/settings/VDateTime.h (.../VDateTime.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -19,7 +19,7 @@ #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" #include "MAdjustHDDateTimeResponse.h" #include "MAdjustDGDateTimeResponse.h" Index: unittests/tst_acknow.cpp =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- unittests/tst_acknow.cpp (.../tst_acknow.cpp) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ unittests/tst_acknow.cpp (.../tst_acknow.cpp) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -66,7 +66,7 @@ /*! * \brief tst_acknow::tst_AcknowModel_Receive_Normal - * \details UI receives a message which doesn't require Acknow + * \details UI receives a message which does not require Acknow */ void tst_acknow::tst_AcknowModel_Receive_Normal() { @@ -129,7 +129,7 @@ /*! * \brief tst_acknow::tst_AcknowModel_Receive_Normal - * \details UI receives a message which doesn't require Acknow + * \details UI receives a message which does not require Acknow */ void tst_acknow::tst_AcknowModel_onAcknowReceive_Correct() { Index: unittests/tst_acknow.h =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- unittests/tst_acknow.h (.../tst_acknow.h) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ unittests/tst_acknow.h (.../tst_acknow.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -38,7 +38,7 @@ void init(); void tst_AcknowModel_Init(); - // NOTE : PLEASE DON'T CHANGE THE ORDER + // NOTE : PLEASE DO NOT CHANGE THE ORDER // THE SEQUENCES HAS BEEN HARD CODED IN THE MESSAGES. void tst_AcknowModel_Receive_Normal(); void tst_AcknowModel_Receive_Acknow(); Index: unittests/tst_canbus.cpp =================================================================== diff -u -r0d3114203575d6725576f8bdc8299ad772d55fd5 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- unittests/tst_canbus.cpp (.../tst_canbus.cpp) (revision 0d3114203575d6725576f8bdc8299ad772d55fd5) +++ unittests/tst_canbus.cpp (.../tst_canbus.cpp) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -93,7 +93,7 @@ { _expected = QByteArray("123456789"); _FrameInterface.transmitFrame(Can_Id::eChlid_HD_UI, _expected); - QVERIFY( ! _emited ); //there is no signal call - Code Coverage only : Error : "Payload can't be larger than 8 bytes" + QVERIFY( ! _emited ); //there is no signal call - Code Coverage only : Error : "Payload cannot be larger than 8 bytes" } void tst_canbus::tst_FrameInterface_ActionTransmit_PowerOff_Accepted() @@ -305,7 +305,7 @@ frame.init(); QVERIFY(frame._txFrameList.isEmpty()); frame.removeHead(); - // if the code doesn't work and calls the removeFirst of and empty list it will assert. + // if the code does not work and calls the removeFirst of and empty list it will assert. QVERIFY(true); } Index: unittests/tst_canbus.h =================================================================== diff -u -r0d3114203575d6725576f8bdc8299ad772d55fd5 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- unittests/tst_canbus.h (.../tst_canbus.h) (revision 0d3114203575d6725576f8bdc8299ad772d55fd5) +++ unittests/tst_canbus.h (.../tst_canbus.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -47,7 +47,7 @@ void tst_FrameInterface_ReInit(); - // NOTE : PLEASE DON'T CHANGE THE ORDER + // NOTE : PLEASE DO NOT CHANGE THE ORDER // THE SEQUENCES HAVE BEEN HARD CODED IN THE MESSAGES. void tst_FrameInterface_ActionTransmit_KeepAlive(); void tst_FrameInterface_TransmitFrame_LongerData(); Index: unittests/tst_models.cpp =================================================================== diff -u -r6581def57942b1c1ef56a2f2feb74559946517b9 -rfc329c788fe9453983072bee937ccbc95b4ed6e4 --- unittests/tst_models.cpp (.../tst_models.cpp) (revision 6581def57942b1c1ef56a2f2feb74559946517b9) +++ unittests/tst_models.cpp (.../tst_models.cpp) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) @@ -1435,7 +1435,7 @@ case 2: { index = index * sizeof mData._data.mTop ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break; case 3: { index = index * sizeof mData._data.mEscalatesIn; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break; case 4: { index = index * sizeof mData._data.mMuteTimeout; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break; - case 5: { index = index * sizeof mData._data.mFlags ; QVERIFY (! mData.fromByteArray(data)); /* GetBits doesn't need this */} break; + case 5: { index = index * sizeof mData._data.mFlags ; QVERIFY (! mData.fromByteArray(data)); /*GetBits does not need this */} break; default: QVERIFY2(false, "Incorrect Test"); break;