Index: sources/canbus/MessageInterpreter.h =================================================================== diff -u -r0d59385f134f65a19dace1e2b46eb2631924396e -r95a840fc93f1a2cd65732d835fad2aca0f03f28e --- sources/canbus/MessageInterpreter.h (.../MessageInterpreter.h) (revision 0d59385f134f65a19dace1e2b46eb2631924396e) +++ sources/canbus/MessageInterpreter.h (.../MessageInterpreter.h) (revision 95a840fc93f1a2cd65732d835fad2aca0f03f28e) @@ -48,7 +48,7 @@ // friend friend class ::tst_messaging; friend class ::tst_logging; - friend class ::tst_canbus; + friend class ::tst_models; bool isType (const Message &vMessage, Gui::GuiActionType vType) const; bool isPayloadLenValid (const Message &vMessage, Gui::GuiActionType vType) const; Index: sources/gui/qml/components/Slider.qml =================================================================== diff -u -rb62ab443e75b76a91e35aca6ba2efd84e7199602 -r95a840fc93f1a2cd65732d835fad2aca0f03f28e --- sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision b62ab443e75b76a91e35aca6ba2efd84e7199602) +++ sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision 95a840fc93f1a2cd65732d835fad2aca0f03f28e) @@ -35,9 +35,9 @@ property alias bgColor : _root.color property alias handler : _handler + property alias handlerColor : _handler.color property alias diameter : _handler.diameter - property alias knobColor : _handler.color property bool isActive : false property alias progressRectMargin : _progressRect.margin Index: sources/gui/qml/components/SliderCreateTreatment.qml =================================================================== diff -u -rb62ab443e75b76a91e35aca6ba2efd84e7199602 -r95a840fc93f1a2cd65732d835fad2aca0f03f28e --- sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision b62ab443e75b76a91e35aca6ba2efd84e7199602) +++ sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision 95a840fc93f1a2cd65732d835fad2aca0f03f28e) @@ -85,7 +85,7 @@ width : Variables.createTreatmentSliderWidth diameter: Variables.sliderCircleDiameter color : Colors.createTreatmentInactive - knobColor: Colors.createTreatmentInactive + handlerColor: Colors.createTreatmentInactive touchMargin: Variables.createTreatmentSliderMargin height : 5 minimum : 100 Index: sources/gui/qml/components/SliderDoubleCreateTreatment.qml =================================================================== diff -u -rb62ab443e75b76a91e35aca6ba2efd84e7199602 -r95a840fc93f1a2cd65732d835fad2aca0f03f28e --- sources/gui/qml/components/SliderDoubleCreateTreatment.qml (.../SliderDoubleCreateTreatment.qml) (revision b62ab443e75b76a91e35aca6ba2efd84e7199602) +++ sources/gui/qml/components/SliderDoubleCreateTreatment.qml (.../SliderDoubleCreateTreatment.qml) (revision 95a840fc93f1a2cd65732d835fad2aca0f03f28e) @@ -109,7 +109,7 @@ width: Variables.createTreatmentSliderWidth / 2.3 diameter: Variables.sliderCircleDiameter color : Colors.createTreatmentInactive - knobColor: Colors.createTreatmentInactive + handlerColor: Colors.createTreatmentInactive touchMargin: Variables.createTreatmentSliderMargin progressRectMargin: 0 height : 5 @@ -162,7 +162,7 @@ width: Variables.createTreatmentSliderWidth / 2.3 diameter: Variables.sliderCircleDiameter color : Colors.createTreatmentInactive - knobColor: Colors.createTreatmentInactive + handlerColor: Colors.createTreatmentInactive touchMargin: Variables.createTreatmentSliderMargin progressRectMargin: 0 height : 5 Index: sources/model/MEndTreatmentResponse.h =================================================================== diff -u -r1f8abdd821041623392d18cf4f80cad9ae1bf246 -r95a840fc93f1a2cd65732d835fad2aca0f03f28e --- sources/model/MEndTreatmentResponse.h (.../MEndTreatmentResponse.h) (revision 1f8abdd821041623392d18cf4f80cad9ae1bf246) +++ sources/model/MEndTreatmentResponse.h (.../MEndTreatmentResponse.h) (revision 95a840fc93f1a2cd65732d835fad2aca0f03f28e) @@ -21,7 +21,7 @@ * * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------------------: | - * | 60 | 0x020 | 6 | Rsp | Y | HD | UI | End Treatment Response | + * |0x3D00| 0x020 | 6 | Rsp | Y | HD | UI | End Treatment Response | * * | Payload || * | || Index: sources/model/MTreatmentParametersResp.h =================================================================== diff -u -r1f8abdd821041623392d18cf4f80cad9ae1bf246 -r95a840fc93f1a2cd65732d835fad2aca0f03f28e --- sources/model/MTreatmentParametersResp.h (.../MTreatmentParametersResp.h) (revision 1f8abdd821041623392d18cf4f80cad9ae1bf246) +++ sources/model/MTreatmentParametersResp.h (.../MTreatmentParametersResp.h) (revision 95a840fc93f1a2cd65732d835fad2aca0f03f28e) @@ -31,35 +31,35 @@ * * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:------------------------------: | - * | 53 | 0x020 | 6 | Rsp | Y | HD | UI | Treatment Parameters Response | + * |0x3500| 0x020 | 6 | Rsp | Y | HD | UI | Treatment Parameters Response | * * | Payload || * | || * | #1:(U32) | \ref Data::requestValid | - * | #2:(U32) | \ref bloodFlowRate | - * | #3:(U32) | \ref dialysateFlowRate | - * | #4:(U32) | \ref duration | - * | #5:(U32) | \ref heparinStopTime | - * | #6:(U32) | \ref salineBolus | - * | #7:(U32) | \ref acidConcentrate | - * | #8:(U32) | \ref bicarbonateConcentrate | - * | #9:(U32) | \ref dialyzerType | - * | #10:(U32) | \ref bloodPressureMeasureInterval | - * | #11:(U32) | \ref rinsebackFlowRate | - * | #12:(U32) | \ref arterialPressureLimitLow | - * | #13:(U32) | \ref arterialPressureLimitHigh | - * | #14:(U32) | \ref venousPressureLimitLow | - * | #15:(U32) | \ref venousPressureLimitHigh | - * | #16:(U32) | \ref heparinDispensingRate | - * | #17:(U32) | \ref heparinBolusVolume | - * | #18:(U32) | \ref dialysateTemp | + * | #2:(U32) | \ref Data::bloodFlowRate | + * | #3:(U32) | \ref Data::dialysateFlowRate | + * | #4:(U32) | \ref Data::duration | + * | #5:(U32) | \ref Data::heparinStopTime | + * | #6:(U32) | \ref Data::salineBolus | + * | #7:(U32) | \ref Data::acidConcentrate | + * | #8:(U32) | \ref Data::bicarbonateConcentrate | + * | #9:(U32) | \ref Data::dialyzerType | + * | #10:(U32) | \ref Data::bloodPressureMeasureInterval | + * | #11:(U32) | \ref Data::rinsebackFlowRate | + * | #12:(U32) | \ref Data::arterialPressureLimitLow | + * | #13:(U32) | \ref Data::arterialPressureLimitHigh | + * | #14:(U32) | \ref Data::venousPressureLimitLow | + * | #15:(U32) | \ref Data::venousPressureLimitHigh | + * | #16:(U32) | \ref Data::heparinDispensingRate | + * | #17:(U32) | \ref Data::heparinBolusVolume | + * | #18:(U32) | \ref Data::dialysateTemp | * * \sa Data * *

Logging info

* | || * | || - * | typeText | Datum | + * | typeText | Event | * | unitText | HD | * | infoText | TreatmentParametersResponse | * @@ -93,7 +93,7 @@ public: - Type_Enum typeText () const override { return Type_Enum::eDatum; } + Type_Enum typeText () const override { return Type_Enum::eEvent; } Unit_Enum unitText () const override { return Unit_Enum::eHD ; } QString infoText () const override { return QString("TreatmentParametersResponse"); } Index: sources/model/hd/data/MPrimingData.h =================================================================== diff -u -r7c895d9b6c198a48ab75ac2090b0a61d99bbd1ab -r95a840fc93f1a2cd65732d835fad2aca0f03f28e --- sources/model/hd/data/MPrimingData.h (.../MPrimingData.h) (revision 7c895d9b6c198a48ab75ac2090b0a61d99bbd1ab) +++ sources/model/hd/data/MPrimingData.h (.../MPrimingData.h) (revision 95a840fc93f1a2cd65732d835fad2aca0f03f28e) @@ -9,6 +9,30 @@ class tst_models; namespace Model { +/*! + * \brief The MPrimingData class + * \details The priming data model + * + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------------------: | + * |0x4300| 0x020 | 9 | 1 Hz | Y | HD | UI | Priming Status | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::currentState | + * | #2:(U32) | \ref Data::secondsRemaining | + * | #3:(U32) | \ref Data::secondsTotal | + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Dataum | + * | unitText | HD | + * | infoText | PrimingData | + * + */ class MPrimingData : public MAbstract { // friends @@ -26,7 +50,7 @@ Type_Enum typeText () const override { return Type_Enum::eDatum ; } Unit_Enum unitText () const override { return Unit_Enum::eHD ; } - QString infoText () const override { return QString("PrimingData"); } + QString infoText () const override { return QString("PrimingData") ; } struct Data { quint32 currentState = 0; Index: unittests/tst_canbus.cpp =================================================================== diff -u -r0d59385f134f65a19dace1e2b46eb2631924396e -r95a840fc93f1a2cd65732d835fad2aca0f03f28e --- unittests/tst_canbus.cpp (.../tst_canbus.cpp) (revision 0d59385f134f65a19dace1e2b46eb2631924396e) +++ unittests/tst_canbus.cpp (.../tst_canbus.cpp) (revision 95a840fc93f1a2cd65732d835fad2aca0f03f28e) @@ -364,49 +364,3 @@ } } } - -void tst_canbus::tst_MAlarmAcknowledgeRequest() -{ - MessageInterpreter interpreter; - QVariantList vData; - QByteArray payload; - QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_AlarmUserAckReq, vData, payload)); -} - -void tst_canbus::tst_MStartTreatmentRequest() -{ - MessageInterpreter interpreter; - QVariantList vData; - QByteArray payload; - QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_StartTreatmentReq, vData, payload)); -} - -void tst_canbus::tst_MConfirmTreatmentRequest() -{ - MessageInterpreter interpreter; - QVariantList vData; - QByteArray payload; - QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_ConfirmTreatmentReq, vData, payload)); -} - -void tst_canbus::tst_MEndTreatmentRequest() -{ - MessageInterpreter interpreter; - QVariantList vData; - QByteArray payload; - Message msg; - msg.actionId = Gui::GuiActions::ID_EndTreatmentReq; - - QVERIFY(interpreter.interpretMessage(Gui::GuiActions::ID_EndTreatmentReq, vData, payload)); - QVERIFY(!interpreter.interpretMessage_HD(msg,vData)); - vData.append(0); - QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_EndTreatmentReq, vData, payload)); -} - -void tst_canbus::tst_MAdjustmentTreatmentParametersRequest() -{ - MessageInterpreter interpreter; - QVariantList vData; - QByteArray payload; - QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_CreateTreatmentReq, vData, payload)); -} Index: unittests/tst_canbus.h =================================================================== diff -u -r0d59385f134f65a19dace1e2b46eb2631924396e -r95a840fc93f1a2cd65732d835fad2aca0f03f28e --- unittests/tst_canbus.h (.../tst_canbus.h) (revision 0d59385f134f65a19dace1e2b46eb2631924396e) +++ unittests/tst_canbus.h (.../tst_canbus.h) (revision 95a840fc93f1a2cd65732d835fad2aca0f03f28e) @@ -47,12 +47,6 @@ void tst_FrameInterface_ReInit(); - void tst_MAlarmAcknowledgeRequest(); - void tst_MStartTreatmentRequest(); - void tst_MConfirmTreatmentRequest(); - void tst_MEndTreatmentRequest(); - void tst_MAdjustmentTreatmentParametersRequest(); - // NOTE : PLEASE DON'T CHANGE THE ORDER // THE SEQUENCES HAVE BEEN HARD CODED IN THE MESSAGES. void tst_FrameInterface_ActionTransmit_KeepAlive(); Index: unittests/tst_models.cpp =================================================================== diff -u -r0d59385f134f65a19dace1e2b46eb2631924396e -r95a840fc93f1a2cd65732d835fad2aca0f03f28e --- unittests/tst_models.cpp (.../tst_models.cpp) (revision 0d59385f134f65a19dace1e2b46eb2631924396e) +++ unittests/tst_models.cpp (.../tst_models.cpp) (revision 95a840fc93f1a2cd65732d835fad2aca0f03f28e) @@ -54,6 +54,10 @@ #include "MStartTreatmentResponse.h" #include "MEndTreatmentResponse.h" +#include "MessageInterpreter.h" + +using namespace Can; + // #define CONSOLEOUT /*! @@ -1768,3 +1772,49 @@ break; } } + +void tst_models::tst_MAlarmAcknowledgeRequest() +{ + MessageInterpreter interpreter; + QVariantList vData; + QByteArray payload; + QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_AlarmUserAckReq, vData, payload)); +} + +void tst_models::tst_MStartTreatmentRequest() +{ + MessageInterpreter interpreter; + QVariantList vData; + QByteArray payload; + QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_StartTreatmentReq, vData, payload)); +} + +void tst_models::tst_MConfirmTreatmentRequest() +{ + MessageInterpreter interpreter; + QVariantList vData; + QByteArray payload; + QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_ConfirmTreatmentReq, vData, payload)); +} + +void tst_models::tst_MEndTreatmentRequest() +{ + MessageInterpreter interpreter; + QVariantList vData; + QByteArray payload; + Message msg; + msg.actionId = Gui::GuiActions::ID_EndTreatmentReq; + + QVERIFY(interpreter.interpretMessage(Gui::GuiActions::ID_EndTreatmentReq, vData, payload)); + QVERIFY(!interpreter.interpretMessage_HD(msg,vData)); + vData.append(0); + QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_EndTreatmentReq, vData, payload)); +} + +void tst_models::tst_MAdjustmentTreatmentParametersRequest() +{ + MessageInterpreter interpreter; + QVariantList vData; + QByteArray payload; + QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_CreateTreatmentReq, vData, payload)); +} Index: unittests/tst_models.h =================================================================== diff -u -r0d59385f134f65a19dace1e2b46eb2631924396e -r95a840fc93f1a2cd65732d835fad2aca0f03f28e --- unittests/tst_models.h (.../tst_models.h) (revision 0d59385f134f65a19dace1e2b46eb2631924396e) +++ unittests/tst_models.h (.../tst_models.h) (revision 95a840fc93f1a2cd65732d835fad2aca0f03f28e) @@ -36,8 +36,11 @@ void tst_MStartTreatmentResponse(); void tst_MEndTreatmentResponse_data(); void tst_MEndTreatmentResponse(); + void tst_MStartTreatmentRequest(); + void tst_MEndTreatmentRequest(); // - Treatment Adjustments + void tst_MAdjustmentTreatmentParametersRequest(); // -- Treatment Duration void tst_MAdjustDurationResponse_data (); @@ -57,6 +60,7 @@ // --- Confirm void tst_MAdjustUltrafiltrationConfirmResponse_data (); void tst_MAdjustUltrafiltrationConfirmResponse (); + void tst_MConfirmTreatmentRequest(); // - Data Messages void tst_DGROPumpData_data(); @@ -108,6 +112,9 @@ void tst_MAlarmCleared_data(); void tst_MAlarmCleared(); + void tst_MAlarmAcknowledgeRequest(); + + // Treatment Parameters void tst_MTreatmentParametersResp_data(); void tst_MTreatmentParametersResp();