Index: denali.pro.user =================================================================== diff -u -r1d006f4e732fa2c5335d5adff425d0f39a99d37c -rc3a1e077ddeba65709084f9af5dd756741db8b4f --- denali.pro.user (.../denali.pro.user) (revision 1d006f4e732fa2c5335d5adff425d0f39a99d37c) +++ denali.pro.user (.../denali.pro.user) (revision c3a1e077ddeba65709084f9af5dd756741db8b4f) @@ -1,14 +1,14 @@ - + EnvironmentId {67370740-e20f-4fc6-be45-6652e866a8bf} ProjectExplorer.Project.ActiveTarget - 1 + 0 ProjectExplorer.Project.EditorSettings Index: denali.qrc =================================================================== diff -u -rbe1b2d8f110b741f3d630df438da07d411110543 -rc3a1e077ddeba65709084f9af5dd756741db8b4f --- denali.qrc (.../denali.qrc) (revision be1b2d8f110b741f3d630df438da07d411110543) +++ denali.qrc (.../denali.qrc) (revision c3a1e077ddeba65709084f9af5dd756741db8b4f) @@ -65,15 +65,9 @@ sources/gui/qml/components/TimeText.qml sources/gui/qml/components/ProgressCircle.qml sources/gui/qml/components/Slider.qml - sources/gui/qml/components/SliderCreateTreatment.qml - sources/gui/qml/components/ConfirmTreatmentTable.qml - sources/gui/qml/components/ConfirmTreatmentSubTable.qml - sources/gui/qml/components/SliderDoubleCreateTreatment.qml sources/gui/qml/components/GridSelection.qml - sources/gui/qml/components/TopMenuBarCreateTreatment.qml sources/gui/qml/components/ProgressBarEx.qml sources/gui/qml/components/CloseButton.qml - sources/gui/qml/components/ConfirmButton.qml sources/gui/qml/components/TickMarks.qml sources/gui/qml/components/NotificationBar.qml sources/gui/qml/components/NotificationBarSmall.qml @@ -82,9 +76,15 @@ sources/gui/qml/components/ImageClock.qml sources/gui/qml/components/ImageLogoDDarkTransparent.qml sources/gui/qml/components/PrimingTimer.qml - sources/gui/qml/components/ConfirmTreatmentTableEntry.qml sources/gui/qml/components/DebugDataColumn.qml sources/gui/qml/components/CheckListItem.qml + sources/gui/qml/components/ConfirmButton.qml + sources/gui/qml/components/pretreatment/SliderCreateTreatment.qml + sources/gui/qml/components/pretreatment/ConfirmTreatmentTable.qml + sources/gui/qml/components/pretreatment/ConfirmTreatmentSubTable.qml + sources/gui/qml/components/pretreatment/ConfirmTreatmentTableEntry.qml + sources/gui/qml/components/pretreatment/TopMenuBarCreateTreatment.qml + sources/gui/qml/components/pretreatment/SliderDoubleCreateTreatment.qml qtquickcontrols2.conf Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r0583a63307936f09e184dfe16acca25f9e3fd81c -rc3a1e077ddeba65709084f9af5dd756741db8b4f --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 0583a63307936f09e184dfe16acca25f9e3fd81c) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision c3a1e077ddeba65709084f9af5dd756741db8b4f) @@ -292,11 +292,11 @@ * \param vData - Data model contains the start treatment request information. * \return void */ -void MessageDispatcher::onAdjustment(const StartTreatmentRequestData &vData) +void MessageDispatcher::onAdjustment(const TreatmentStartRequestData &vData) { QVariantList mData; mData += vData.request; - onActionTransmit(GuiActionType::ID_StartTreatmentReq, mData); + onActionTransmit(GuiActionType::ID_TreatmentStartReq, mData); } /*! @@ -331,11 +331,11 @@ * \param vData - Data model contains the confirm treatment request * \return void */ -void MessageDispatcher::onAdjustment(const ConfirmTreatmentRequestData &vData) +void MessageDispatcher::onAdjustment(const TreatmentConfirmRequestData &vData) { QVariantList mData; mData += vData.request; - onActionTransmit(GuiActionType::ID_ConfirmTreatmentReq, mData); + onActionTransmit(GuiActionType::ID_TreatmentConfirmReq, mData); } /*! @@ -344,11 +344,11 @@ * \param vData - Data model contains the end treatment request * \return void */ -void MessageDispatcher::onAdjustment(const EndTreatmentRequestData &vData) +void MessageDispatcher::onAdjustment(const TreatmentEndRequestData &vData) { Q_UNUSED(vData) QVariantList mData; - onActionTransmit(GuiActionType::ID_EndTreatmentReq, mData); + onActionTransmit(GuiActionType::ID_TreatmentEndReq, mData); } @@ -390,7 +390,7 @@ mData += vData.heparinBolusVolume ; mData += vData.dialysateTemp ; - onActionTransmit(GuiActionType::ID_CreateTreatmentReq, mData); + onActionTransmit(GuiActionType::ID_TreatmentCreateReq, mData); } Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -re58be51c4aa52938af250db3ee579e98de08542c -rc3a1e077ddeba65709084f9af5dd756741db8b4f --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision e58be51c4aa52938af250db3ee579e98de08542c) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision c3a1e077ddeba65709084f9af5dd756741db8b4f) @@ -78,11 +78,11 @@ {Gui::GuiActionType::ID_AlarmUserAckReq , 1 * 4 }, // 1 parameter each 4bytes // ---- - {Gui::GuiActionType::ID_StartTreatmentReq , 1 * 4 }, // 1 parameters each 4bytes - {Gui::GuiActionType::ID_StartTreatmentRsp , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_ConfirmTreatmentReq , 1 * 4 }, // 1 parameters each 4bytes - {Gui::GuiActionType::ID_EndTreatmentReq , 0 }, - {Gui::GuiActionType::ID_EndTreatmentRsp , 0 }, + {Gui::GuiActionType::ID_TreatmentStartReq , 1 * 4 }, // 1 parameters each 4bytes + {Gui::GuiActionType::ID_TreatmentStartRsp , 2 * 4 }, // 2 parameters each 4bytes + {Gui::GuiActionType::ID_TreatmentConfirmReq , 1 * 4 }, // 1 parameters each 4bytes + {Gui::GuiActionType::ID_TreatmentEndReq , 0 }, + {Gui::GuiActionType::ID_TreatmentEndRsp , 0 }, // ---- {Gui::GuiActionType::ID_TreatmentRanges , 6 * 4 }, // 6 parameters each 4bytes @@ -105,8 +105,8 @@ {Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp , 8 * 4 }, // 8 parameters each 4bytes // --- - {Gui::GuiActionType::ID_CreateTreatmentReq , 17 * 4 }, // 17 parameters, each 4 bytes - {Gui::GuiActionType::ID_CreateTreatmentRsp , 18 * 4 }, // 18 parameters, each 4 bytes + {Gui::GuiActionType::ID_TreatmentCreateReq , 17 * 4 }, // 17 parameters, each 4 bytes + {Gui::GuiActionType::ID_TreatmentCreateRsp , 18 * 4 }, // 18 parameters, each 4 bytes // ---- {Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq , 2 * 4 }, // 2 parameters each 4bytes Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -re58be51c4aa52938af250db3ee579e98de08542c -rc3a1e077ddeba65709084f9af5dd756741db8b4f --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision e58be51c4aa52938af250db3ee579e98de08542c) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision c3a1e077ddeba65709084f9af5dd756741db8b4f) @@ -261,25 +261,25 @@ LOG_EVENT(AlarmAcknowledgeRequestData::toString(vData)); break; - case Gui::GuiActionType::ID_StartTreatmentReq: + case Gui::GuiActionType::ID_TreatmentStartReq: if ( ! length ) { logInvalidLength(vActionId); return false; } vPayload = Format::fromVariant(vData); - LOG_EVENT(StartTreatmentRequestData::toString(vData)); + LOG_EVENT(TreatmentStartRequestData::toString(vData)); break; - case Gui::GuiActionType::ID_ConfirmTreatmentReq: + case Gui::GuiActionType::ID_TreatmentConfirmReq: if ( ! length ) { logInvalidLength(vActionId); return false; } vPayload = Format::fromVariant(vData); - LOG_EVENT(ConfirmTreatmentRequestData::toString(vData)); + LOG_EVENT(TreatmentConfirmRequestData::toString(vData)); break; - case Gui::GuiActionType::ID_EndTreatmentReq: + case Gui::GuiActionType::ID_TreatmentEndReq: if ( length != 0 ) { logInvalidLength(vActionId); return false; } vPayload = Format::fromVariant(vData); - LOG_EVENT(EndTreatmentRequestData::toString(vData)); + LOG_EVENT(TreatmentEndRequestData::toString(vData)); break; - case Gui::GuiActionType::ID_CreateTreatmentReq: + case Gui::GuiActionType::ID_TreatmentCreateReq: if ( ! length ) { logInvalidLength(vActionId); return false; } vPayload = Format::fromVariant(vData); LOG_EVENT(AdjustTreatmentParametersRequestData::toString(vData)); @@ -369,7 +369,7 @@ case Gui::GuiActionType::ID_AlarmStatus : ok = alarmStatus (vMessage, vData); break; // TODO : implement notify<>() case Gui::GuiActionType::ID_AlarmTriggered : ok = alarmTriggered (vMessage, vData); break; // TODO : implement notify<>() case Gui::GuiActionType::ID_AlarmCleared : ok = alarmCleared (vMessage, vData); break; // TODO : implement notify<>() - case Gui::GuiActionType::ID_CreateTreatmentRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_CreateTreatmentRsp ); break; + case Gui::GuiActionType::ID_TreatmentCreateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentCreateRsp ); break; // Adjustment Response Messages case Gui::GuiActionType::ID_AdjustDurationRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDurationRsp ); break; @@ -381,8 +381,8 @@ case Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp : ok = adjustUltrafiltrationEdit (vMessage, vData); break; // TODO : implement notify<>() case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp : ok = adjustUltrafiltrationConfirm (vMessage, vData); break; // TODO : implement notify<>() - case Gui::GuiActionType::ID_StartTreatmentRsp : ok = notify (vMessage, vData, Gui::GuiActionType::ID_StartTreatmentRsp ); break; - case Gui::GuiActionType::ID_EndTreatmentRsp : ok = notify (vMessage, vData, Gui::GuiActionType::ID_EndTreatmentRsp ); break; + case Gui::GuiActionType::ID_TreatmentStartRsp : ok = notify (vMessage, vData, Gui::GuiActionType::ID_TreatmentStartRsp ); break; + case Gui::GuiActionType::ID_TreatmentEndRsp : ok = notify (vMessage, vData, Gui::GuiActionType::ID_TreatmentEndRsp ); break; // unhandles messages: these will only be logged as received message // there has nothing been defined for these messages. Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r1d006f4e732fa2c5335d5adff425d0f39a99d37c -rc3a1e077ddeba65709084f9af5dd756741db8b4f --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 1d006f4e732fa2c5335d5adff425d0f39a99d37c) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision c3a1e077ddeba65709084f9af5dd756741db8b4f) @@ -92,13 +92,13 @@ ID_AlarmUserAckReq = 0x3F00, // 63 ID_AlarmSilenceReq = 0x3200, // 50 - ID_CreateTreatmentReq = 0x3500, // 53 - ID_CreateTreatmentRsp = 0x3600, // 54 - ID_StartTreatmentReq = 0x3800, // 56 - ID_StartTreatmentRsp = 0x3900, // 57 - ID_ConfirmTreatmentReq = 0x3B00, // 59 - ID_EndTreatmentReq = 0x3C00, // 60 - ID_EndTreatmentRsp = 0x3D00, // 61 + ID_TreatmentCreateReq = 0x3500, // 53 + ID_TreatmentCreateRsp = 0x3600, // 54 + ID_TreatmentStartReq = 0x3800, // 56 + ID_TreatmentStartRsp = 0x3900, // 57 + ID_TreatmentConfirmReq = 0x3B00, // 59 + ID_TreatmentEndReq = 0x3C00, // 60 + ID_TreatmentEndRsp = 0x3D00, // 61 ID_PrimingData = 0x4300, // 67 Fisheye: Tag c3a1e077ddeba65709084f9af5dd756741db8b4f refers to a dead (removed) revision in file `sources/gui/qml/components/ConfirmTreatmentSubTable.qml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag c3a1e077ddeba65709084f9af5dd756741db8b4f refers to a dead (removed) revision in file `sources/gui/qml/components/ConfirmTreatmentTable.qml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag c3a1e077ddeba65709084f9af5dd756741db8b4f refers to a dead (removed) revision in file `sources/gui/qml/components/ConfirmTreatmentTableEntry.qml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag c3a1e077ddeba65709084f9af5dd756741db8b4f refers to a dead (removed) revision in file `sources/gui/qml/components/SliderCreateTreatment.qml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag c3a1e077ddeba65709084f9af5dd756741db8b4f refers to a dead (removed) revision in file `sources/gui/qml/components/SliderDoubleCreateTreatment.qml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag c3a1e077ddeba65709084f9af5dd756741db8b4f refers to a dead (removed) revision in file `sources/gui/qml/components/TopMenuBarCreateTreatment.qml'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/gui/qml/components/pretreatment/ConfirmTreatmentSubTable.qml =================================================================== diff -u --- sources/gui/qml/components/pretreatment/ConfirmTreatmentSubTable.qml (revision 0) +++ sources/gui/qml/components/pretreatment/ConfirmTreatmentSubTable.qml (revision c3a1e077ddeba65709084f9af5dd756741db8b4f) @@ -0,0 +1,75 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file ConfirmTreatmentSubTable.qml + * \date 2020/08/25 + * \author Peter Lucia + * + */ + +// Qt +import QtQuick 2.12 +import QtQuick.Layouts 1.12 + +// Project + +// Qml imports +import "qrc:/globals" +import "qrc:/components" + +Rectangle { + id: _root + property var prescriptionKeys: [] + property var prescriptionValues: [] + property var operatingKeys: [] + property var operatingValues: [] + objectName: "ConfirmTreatmentSubTable" + color: "transparent" + + GridLayout { + id: _prescription_grid + anchors.top: parent.top + anchors.topMargin: Variables.sliderTextMargin + width: _root.width / 2 + rows: _root.prescriptionKeys.length + columns: 1 + + Repeater { + id: _prescription_repeater + model: prescriptionKeys + ConfirmTreatmentTableEntry { + key: prescriptionKeys[index] + value: prescriptionValues[index] + } + } + } + + GridLayout { + id: _operating_grid + anchors.top: parent.top + anchors.topMargin: Variables.sliderTextMargin + anchors.left: _prescription_grid.right + rows: _root.prescriptionKeys.length + width: _root.width / 2 + columns: 1 + + Repeater { + id: _operating_repeater + model: operatingKeys + ConfirmTreatmentTableEntry { + key: operatingKeys[index] + value: operatingValues[index] + } + + + } + } + + + +} Index: sources/gui/qml/components/pretreatment/ConfirmTreatmentTable.qml =================================================================== diff -u --- sources/gui/qml/components/pretreatment/ConfirmTreatmentTable.qml (revision 0) +++ sources/gui/qml/components/pretreatment/ConfirmTreatmentTable.qml (revision c3a1e077ddeba65709084f9af5dd756741db8b4f) @@ -0,0 +1,117 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file ConfirmTreatmentTable.qml + * \date 2020/08/25 + * \author Peter Lucia + * + */ + +// Qt +import QtQuick 2.12 + +// Project + +// Qml imports +import "qrc:/globals" +import "qrc:/components" + +Rectangle { + id: _root + objectName: "ConfirmTreatmentTable" + width: Variables.createTreatmentTableWidth + height: Variables.createTreatmentTableHeight + color: Colors.backgroundDialog + + Rectangle { + id: _header + width: parent.width + height: Variables.createTreatmentHeaderHeight + color: "transparent" + radius: 5 + + Rectangle { + id: _treatment_profile_id + objectName: _root.objectName + "_treatment_profile_id" + height: 40 + width: height + anchors.top: _header.top + anchors.left: _header.left + anchors.topMargin: Variables.createTreatmentMargin + anchors.leftMargin: Variables.createTreatmentMargin + color: Colors.createTrProfileID + radius: 5 + + Text { + id: _treatment_profile_id_text + objectName: _treatment_profile_id.objectName + "_treatment_profile_id_text" + color: Colors.backgroundDialog + text: "1" + font.pixelSize: Fonts.fontPixelTextRectTitle + anchors.centerIn: _treatment_profile_id + font.bold: true + } + } + + Text { + id: _treatment_profile_name + objectName: _root.objectName + "_treatment_profile_name" + anchors.bottom: _treatment_profile_id.bottom + anchors.left: _treatment_profile_id.right + anchors.topMargin: Variables.createTreatmentMargin + anchors.leftMargin: 20 + text: "New Treatment" + color: "white" + font.pixelSize: Fonts.crTreatmentFontSize + } + } + + Text { + id: _prescription + objectName: _root.objectName + "_prescription" + text: "PRESCRIPTION" + font.pixelSize: Fonts.crTreatmentTableFontSize + color: "white" + anchors.left: parent.left + anchors.top: _header.bottom + anchors.leftMargin: Variables.createTreatmentMargin + } + + Text { + id: _operating_parameters + objectName: _root.objectName + "_operating_parameters" + text: "OPERATING PARAMETERS" + font.pixelSize: Fonts.crTreatmentTableFontSize + color: "white" + anchors.top: _header.bottom + anchors.left: _root.horizontalCenter + } + + ConfirmTreatmentSubTable { + id: _left_table + anchors.top: _prescription.bottom + anchors.left: _root.left + anchors.leftMargin: Variables.createTreatmentMargin + anchors.topMargin: Variables.createTreatmentTableMargin + anchors.bottom: parent.bottom + width: parent.width - 2*Variables.createTreatmentMargin + height: _root.height - _header.height + prescriptionKeys: vTreatmentCreate.doGetPrescriptionParameterNames() + prescriptionValues: vTreatmentCreate.doGetPrescriptionParameterValues() + operatingKeys: vTreatmentCreate.doGetOperatingParameterNames() + operatingValues: vTreatmentCreate.doGetOperatingParameterValues() + onVisibleChanged: { + if (visible) { + prescriptionKeys = vTreatmentCreate.doGetPrescriptionParameterNames() + prescriptionValues = vTreatmentCreate.doGetPrescriptionParameterValues() + operatingKeys = vTreatmentCreate.doGetOperatingParameterNames() + operatingValues = vTreatmentCreate.doGetOperatingParameterValues() + } + } + } +} Index: sources/gui/qml/components/pretreatment/ConfirmTreatmentTableEntry.qml =================================================================== diff -u --- sources/gui/qml/components/pretreatment/ConfirmTreatmentTableEntry.qml (revision 0) +++ sources/gui/qml/components/pretreatment/ConfirmTreatmentTableEntry.qml (revision c3a1e077ddeba65709084f9af5dd756741db8b4f) @@ -0,0 +1,67 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright \n + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n + * IN PART OR IN WHOLE, \n + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n + * + * \file ConfirmTreatmentTableEntry.qml + * \date 2020/08/25 + * \author Peter Lucia + * + */ + +// Qt +import QtQuick 2.12 + +// Project + +// Qml imports +import "qrc:/globals" +import "qrc:/components" + +/*! + * \brief ConfirmTreatmentTableEntry - A cell of a confirm treatment + * parameters table with configurable key name, value name, and dimensions. + * Provides a single component for a repeater when building the column + */ +Rectangle { + id: _root + property var key: "Key" + property var value: "Value" + height: Variables.createTreatmentSubTableHeight + width: Variables.createTreatmentSubTableWidth + color: "transparent" + + Line { + id: _line + width: _root.width + Variables.createTreatmentTableMargin + thickness: 3 + color: Colors.backgroundMenu + anchors.top: _root.bottom + anchors.left: _root.left + anchors.leftMargin: -Variables.createTreatmentTableMargin + } + + Text { + id: _key + objectName: key + index + color: Colors.textMain + text: key + anchors.left: parent.left + anchors.verticalCenter: _root.verticalCenter + font.pixelSize: Fonts.crTreatmentTableFontSize + } + + Text { + id: _value + objectName: value + index + color: Colors.textMain + text: value + anchors.left: _line.horizontalCenter + anchors.verticalCenter: _root.verticalCenter + anchors.leftMargin: 3*Variables.createTreatmentMargin + font.pixelSize: Fonts.crTreatmentTableFontSize + } +} Index: sources/gui/qml/components/pretreatment/SliderCreateTreatment.qml =================================================================== diff -u --- sources/gui/qml/components/pretreatment/SliderCreateTreatment.qml (revision 0) +++ sources/gui/qml/components/pretreatment/SliderCreateTreatment.qml (revision c3a1e077ddeba65709084f9af5dd756741db8b4f) @@ -0,0 +1,117 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file SliderCreateTreatment.qml + * \author (last) Peter Lucia + * \date (last) 06-Oct-2020 + * \author (original) Peter Lucia + * \date (original) 07-Jul-2020 + * + */ + +// Qt +import QtQuick 2.12 + +// Project +// Qml imports +import "qrc:/globals" +import "qrc:/components" + +/*! + * \brief Slider component with a title and the currently selected value + */ +Rectangle { + id: _root + + property alias text: _text.text + property var units: "" + property alias min: _slider.minimum + property alias max: _slider.maximum + property alias value: _slider.value + property alias diameter: _slider.diameter + property alias selectedValue: _selected_value + property alias step: _slider.step + property alias stepSnap: _slider.stepSnap + property alias sliderWidth: _slider.width + property alias isActive: _slider.isActive + property alias sliderObjectName: _slider.objectName + property alias selectedValueObjectName: _selected_value.objectName + + signal pressed() + signal released() + + height: Variables.createTreatmentSliderHeight + width: Variables.createTreatmentSliderWidth + anchors.horizontalCenter: parent.horizontalCenter + color: "transparent"; + + function setValid(valid) { + if (valid) { + _selected_value.color = Colors.textMain + _text.color = Colors.textMain + } else { + _selected_value.color = Colors.createTreatmentInvalidParam + _text.color = Colors.createTreatmentInvalidParam + } + } + + Text { + id: _text + text: "" + anchors.top: parent.top + anchors.left: parent.left + font.pixelSize: Fonts.fontPixelFluidText + color: Colors.textMain; + + } + + Text { + id: _selected_value + anchors.top: parent.top + anchors.right: parent.right + text: "-- " + _root.units + font.pixelSize: Fonts.fontPixelFluidUnit + color: Colors.textDisableButton; + + } + + Slider { id : _slider + anchors.horizontalCenter: parent.horizontalCenter; + anchors.bottom: parent.bottom; + width : Variables.createTreatmentSliderWidth + diameter: Variables.sliderCircleDiameter + color : Colors.createTreatmentInactive + handlerColor: Colors.createTreatmentInactive + touchMargin: Variables.createTreatmentSliderMargin + height : 5 + minimum : 100 + maximum : 500 + unit : qsTr("") + step : Variables.bloodFlowResolution + ticks : true + onValueChanged: { + _selected_value.text = value + " " + _root.units + } + + onActiveChanged: { + if (isActive) { + _selected_value.color = Colors.textMain + _text.color = Colors.textMain + } else { + _selected_value.color = Colors.textDisableButton + _text.color = Colors.textDisableButton + } + } + + onProgressRectClicked: { setActive(true); setValid(true); } + onProgressRectDragged: { setActive(true); setValid(true); } + onPressed: { _root.pressed(); } + onReleased: { _root.released(); } + onDragged: { setActive(true); setValid(true); } + onClicked: { setActive(true); setValid(true); } + } +} Index: sources/gui/qml/components/pretreatment/SliderDoubleCreateTreatment.qml =================================================================== diff -u --- sources/gui/qml/components/pretreatment/SliderDoubleCreateTreatment.qml (revision 0) +++ sources/gui/qml/components/pretreatment/SliderDoubleCreateTreatment.qml (revision c3a1e077ddeba65709084f9af5dd756741db8b4f) @@ -0,0 +1,194 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file SliderDoubleCreateTreatment.qml + * \author (last) Peter Lucia + * \date (last) 06-Oct-2020 + * \author (original) Peter Lucia + * \date (original) 03-Aug-2020 + * + */ + +// Qt +import QtQuick 2.12 + +// Project +// Qml imports +import "qrc:/globals" +import "qrc:/components" + +/*! + * \brief Two side-by-side sliders that fit the width of a normal slider component + */ +Rectangle { + id: _root + + property alias lowTitle: _lowTitle.text + property var lowUnits: "" + property alias highTitle: _highTitle.text + property var highUnits: "" + property alias lowMin: _lowSlider.minimum + property alias lowMax: _lowSlider.maximum + property alias highMin: _highSlider.minimum + property alias highMax: _highSlider.maximum + property alias lowValue: _lowSlider.value + property alias highValue: _highSlider.value + property alias lowDiameter: _lowSlider.diameter + property alias highDiameter: _highSlider.diameter + property alias lowSelectedValue: _lowSelectedValue + property alias highSelectedValue: _highSelectedValue + property alias lowStep: _lowSlider.step + property alias highStep: _highSlider.step + property alias lowStepSnap: _lowSlider.stepSnap + property alias highStepSnap: _highSlider.stepSnap + property alias lowSliderWidth: _lowSlider.width + property alias highSliderWidth: _highSlider.width + property alias isLowActive: _lowSlider.isActive + property alias isHighActive: _highSlider.isActive + property alias lowSliderObjectName: _lowSlider.objectName + property alias lowSelectedValueObjectName: _lowSelectedValue.objectName + property alias highSliderObjectName: _highSlider.objectName + property alias highSelectedValueObjectName: _highSelectedValue.objectName + + signal lowSliderPressed() + signal lowSliderReleased() + signal highSliderPressed() + signal highSliderReleased() + + height: Variables.createTreatmentSliderHeight + width: Variables.createTreatmentSliderWidth + anchors.horizontalCenter: parent.horizontalCenter + color: "transparent"; + + function setLowValid(valid) { + if (valid) { + _lowTitle.color = Colors.textMain + _lowSelectedValue.color = Colors.textMain + } else { + _lowTitle.color = Colors.createTreatmentInvalidParam + _lowSelectedValue.color = Colors.createTreatmentInvalidParam + } + } + + function setHighValid(valid) { + if (valid) { + _highTitle.color = Colors.textMain + _highSelectedValue.color = Colors.textMain + } else { + _highTitle.color = Colors.createTreatmentInvalidParam + _highSelectedValue.color = Colors.createTreatmentInvalidParam + } + } + + Text { + id: _lowTitle + text: "Low" + anchors.top: parent.top + anchors.left: parent.left + font.pixelSize: Fonts.fontPixelFluidText + color: Colors.textMain; + } + + Text { + id: _lowSelectedValue + anchors.top: parent.top + anchors.right: parent.horizontalCenter + anchors.rightMargin: Variables.createTreatmentSliderWidth / 15 + text: "-- " + _lowSlider.unit + font.pixelSize: Fonts.fontPixelFluidUnit + color: Colors.createTreatmentInactive; + } + + Slider { id : _lowSlider + anchors.left: parent.left; + anchors.bottom: parent.bottom + width: Variables.createTreatmentSliderWidth / 2.3 + diameter: Variables.sliderCircleDiameter + color : Colors.createTreatmentInactive + handlerColor: Colors.createTreatmentInactive + touchMargin: Variables.createTreatmentSliderMargin + progressRectMargin: 0 + height : 5 + minimum: 0 + maximum: 100 + unit : qsTr("") + step : Variables.bloodFlowResolution + ticks : true + onValueChanged: { + _lowSelectedValue.text = value + " " + _root.lowUnits; + } + onActiveChanged: { + if (isActive) { + _lowTitle.color = Colors.textMain + _lowSelectedValue.color = Colors.textMain + } else { + _lowSelectedValue.color = Colors.createTreatmentInactive; + } + } + + onProgressRectClicked: { setActive(true); setLowValid(true); } + onProgressRectDragged: { setActive(true); setLowValid(true); } + onPressed: { _root.lowSliderPressed(); } + onReleased: { _root.lowSliderReleased(); } + onDragged: { setActive(true); setLowValid(true); } + onClicked: { setActive(true); setLowValid(true); } + } + + Text { + id: _highTitle + text: "High" + anchors.top: parent.top + anchors.left: _highSlider.left + font.pixelSize: Fonts.fontPixelFluidText + color: Colors.textMain; + } + + Text { + id: _highSelectedValue + anchors.top: parent.top + anchors.right: parent.right + text: "-- " + _highSlider.unit + font.pixelSize: Fonts.fontPixelFluidUnit + color: Colors.createTreatmentInactive; + } + + Slider { id : _highSlider + anchors.right: parent.right; + anchors.bottom: parent.bottom; + width: Variables.createTreatmentSliderWidth / 2.3 + diameter: Variables.sliderCircleDiameter + color : Colors.createTreatmentInactive + handlerColor: Colors.createTreatmentInactive + touchMargin: Variables.createTreatmentSliderMargin + progressRectMargin: 0 + height : 5 + minimum: 50 + maximum: 100 + unit : qsTr("") + step : Variables.bloodFlowResolution + ticks : true + onValueChanged: { + _highSelectedValue.text = value + " " + _root.highUnits; + } + + onActiveChanged: { + if (isActive) { + _highTitle.color = Colors.textMain + _highSelectedValue.color = Colors.textMain + } else { + _highSelectedValue.color = Colors.createTreatmentInactive + } + } + + onProgressRectClicked: { setActive(true); setHighValid(true); } + onProgressRectDragged: { setActive(true); setHighValid(true); } + onPressed: { _root.highSliderPressed(); } + onReleased: { _root.highSliderReleased(); } + onDragged: { setActive(true); setHighValid(true); } + onClicked: { setActive(true); setHighValid(true); } + } +} Index: sources/gui/qml/components/pretreatment/TopMenuBarCreateTreatment.qml =================================================================== diff -u --- sources/gui/qml/components/pretreatment/TopMenuBarCreateTreatment.qml (revision 0) +++ sources/gui/qml/components/pretreatment/TopMenuBarCreateTreatment.qml (revision c3a1e077ddeba65709084f9af5dd756741db8b4f) @@ -0,0 +1,180 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file TopMenuBarCreateTreatment.qml + * \author (last) Peter Lucia + * \date (last) 28-Aug-2020 + * \author (original) Peter Lucia + * \date (original) 03-Aug-2020 + * + */ + +// Qt +import QtQuick 2.12 +import QtQuick.Layouts 1.12 + +// Project +// Qml imports +import "qrc:/globals" +import "qrc:/components" + +/*! + * \brief TopMenuBarCreateTreatment - Contains a back button as well + * as the current progress in each of the pre-treatment steps. + */ +Rectangle { id: _root + height: Variables.topBarMenuHeight + color: Colors.backgroundMainMenu + property var step: "CREATE"; + property int spacing: 5 + signal clickedBack() + + BackButton { id : _backButton + objectName: "_backButton" + width: parent.width / 10 + anchors.verticalCenter: parent.verticalCenter + anchors.top: parent.top + anchors.left: parent.left + anchors.margins: _root.height / 4 + onClicked: _root.clickedBack() + } + + Rectangle { + color: "transparent" + height: parent.height + width: parent.width + + anchors { + verticalCenter: parent.verticalCenter + horizontalCenter: parent.horizontalCenter + + } + + Row { + anchors.centerIn: parent + spacing: 5 + + CircleWithText { id: _create + text: "CREATE" + state: "active" + } + + Line { id: _confirm_line + length: 120 + color: Colors.createTreatmentInactive + radius: 5 + anchors.verticalCenter: _create.verticalCenter + + states: [ + State { + name: "active" + PropertyChanges { target: _confirm_line; thickness: 3; color: Colors.createTreatmentActive; } + }, + State { + name: "inactive" + PropertyChanges { target: _confirm_line; thickness: 1; color: Colors.createTreatmentInactive; } + } + ] + } + + CircleWithText { id: _confirm + text: "CONFIRM" + } + + Line { id: _priming_line + length: 120 + color: Colors.createTreatmentInactive + radius: 5 + anchors.verticalCenter: _create.verticalCenter + + states: [ + State { + name: "active" + PropertyChanges { target: _priming_line; thickness: 3; color: Colors.createTreatmentActive; } + }, + State { + name: "inactive" + PropertyChanges { target: _priming_line; thickness: 1; color: Colors.createTreatmentInactive; } + } + ] + } + + CircleWithText { id: _prime + text: "PRIME" + } + + Line { id: _begin_line + length: 120 + color: Colors.createTreatmentInactive + radius: 5 + anchors.verticalCenter: _create.verticalCenter + + states: [ + State { + name: "active" + PropertyChanges { target: _begin_line; thickness: 3; color: Colors.createTreatmentActive; } + }, + State { + name: "inactive" + PropertyChanges { target: _begin_line; thickness: 1; color: Colors.createTreatmentInactive; } + } + ] + } + + CircleWithText { id: _begin + text: "BEGIN" + } + } + } + + states: [ + State { + name: "create" + PropertyChanges { target: _create; state: "active" } + PropertyChanges { target: _confirm; state: "inactive" } + PropertyChanges { target: _confirm_line; state: "inactive" } + PropertyChanges { target: _prime; state: "inactive" } + PropertyChanges { target: _priming_line; state: "inactive" } + PropertyChanges { target: _begin; state: "inactive" } + PropertyChanges { target: _begin_line; state: "inactive" } + }, + State { + name: "confirm" + PropertyChanges { target: _create; state: "active" } + PropertyChanges { target: _confirm; state: "active" } + PropertyChanges { target: _confirm_line; state: "active" } + PropertyChanges { target: _prime; state: "inactive" } + PropertyChanges { target: _priming_line; state: "inactive" } + PropertyChanges { target: _begin; state: "inactive" } + PropertyChanges { target: _begin_line; state: "inactive" } + }, + State { + name: "prime" + PropertyChanges { target: _create; state: "active" } + PropertyChanges { target: _confirm; state: "active" } + PropertyChanges { target: _confirm_line; state: "active" } + PropertyChanges { target: _prime; state: "active" } + PropertyChanges { target: _priming_line; state: "active" } + PropertyChanges { target: _begin; state: "inactive" } + PropertyChanges { target: _begin_line; state: "inactive" } + }, + State { + name: "begin" + PropertyChanges { target: _create; state: "active" } + PropertyChanges { target: _confirm; state: "active" } + PropertyChanges { target: _confirm_line; state: "active" } + PropertyChanges { target: _prime; state: "active" } + PropertyChanges { target: _priming_line; state: "active" } + PropertyChanges { target: _begin; state: "active" } + PropertyChanges { target: _begin_line; state: "active" } + } + + ] + + + +} Index: sources/gui/qml/pages/treatment/TreatmentBegin.qml =================================================================== diff -u -r0d59385f134f65a19dace1e2b46eb2631924396e -rc3a1e077ddeba65709084f9af5dd756741db8b4f --- sources/gui/qml/pages/treatment/TreatmentBegin.qml (.../TreatmentBegin.qml) (revision 0d59385f134f65a19dace1e2b46eb2631924396e) +++ sources/gui/qml/pages/treatment/TreatmentBegin.qml (.../TreatmentBegin.qml) (revision c3a1e077ddeba65709084f9af5dd756741db8b4f) @@ -22,6 +22,7 @@ // Qml imports import "qrc:/globals" import "qrc:/components" +import "qrc:/components/pretreatment" /*! * \brief ManagerHome is the screen @@ -105,7 +106,7 @@ } TouchRect { id : _continueRect - objectName: "_treatmentBeginStart" + objectName: "_treatmentBeginStartButton" anchors.horizontalCenter: parent.horizontalCenter text.text: qsTr("START") button.onClicked: { Index: sources/gui/qml/pages/treatment/TreatmentConfirm.qml =================================================================== diff -u -r67371c6a2861c5e8a2328984ae999bf8df4b0bb7 -rc3a1e077ddeba65709084f9af5dd756741db8b4f --- sources/gui/qml/pages/treatment/TreatmentConfirm.qml (.../TreatmentConfirm.qml) (revision 67371c6a2861c5e8a2328984ae999bf8df4b0bb7) +++ sources/gui/qml/pages/treatment/TreatmentConfirm.qml (.../TreatmentConfirm.qml) (revision c3a1e077ddeba65709084f9af5dd756741db8b4f) @@ -22,6 +22,7 @@ // Qml imports import "qrc:/globals" import "qrc:/components" +import "qrc:/components/pretreatment" /*! * \brief ManagerHome is the screen Index: sources/gui/qml/pages/treatment/TreatmentCreate.qml =================================================================== diff -u -r0401b9a1fb6f89f0ec83571f2f868956c7500a0f -rc3a1e077ddeba65709084f9af5dd756741db8b4f --- sources/gui/qml/pages/treatment/TreatmentCreate.qml (.../TreatmentCreate.qml) (revision 0401b9a1fb6f89f0ec83571f2f868956c7500a0f) +++ sources/gui/qml/pages/treatment/TreatmentCreate.qml (.../TreatmentCreate.qml) (revision c3a1e077ddeba65709084f9af5dd756741db8b4f) @@ -21,6 +21,7 @@ // Qml imports import "qrc:/globals" import "qrc:/components" +import "qrc:/components/pretreatment" /*! * \brief ManagerHome is the screen @@ -43,7 +44,7 @@ Flickable { id: _flickable - objectName: "TreatmentCreateFlickable" + objectName: "_treatmentCreateFlickable" anchors.top: _topMenuBar.bottom anchors.left: parent.left anchors.bottom: parent.bottom Index: sources/gui/qml/pages/treatment/TreatmentPrime.qml =================================================================== diff -u -r67371c6a2861c5e8a2328984ae999bf8df4b0bb7 -rc3a1e077ddeba65709084f9af5dd756741db8b4f --- sources/gui/qml/pages/treatment/TreatmentPrime.qml (.../TreatmentPrime.qml) (revision 67371c6a2861c5e8a2328984ae999bf8df4b0bb7) +++ sources/gui/qml/pages/treatment/TreatmentPrime.qml (.../TreatmentPrime.qml) (revision c3a1e077ddeba65709084f9af5dd756741db8b4f) @@ -21,7 +21,9 @@ // Qml imports import "qrc:/globals" import "qrc:/components" +import "qrc:/components/pretreatment" + /*! * \brief ManagerHome is the screen * which is the default screen in the "Manager" stack Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -re58be51c4aa52938af250db3ee579e98de08542c -rc3a1e077ddeba65709084f9af5dd756741db8b4f --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision e58be51c4aa52938af250db3ee579e98de08542c) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision c3a1e077ddeba65709084f9af5dd756741db8b4f) @@ -28,6 +28,7 @@ // Qml imports import "qrc:/globals" import "qrc:/components" +import "qrc:/components/pretreatment" import "qrc:/pages/treatment/adjustments" /*! Index: sources/model/MEndTreatmentResponse.cpp =================================================================== diff -u -r074b32b5cc08f41f2d9ce0d021f2151b76bba5ad -rc3a1e077ddeba65709084f9af5dd756741db8b4f --- sources/model/MEndTreatmentResponse.cpp (.../MEndTreatmentResponse.cpp) (revision 074b32b5cc08f41f2d9ce0d021f2151b76bba5ad) +++ sources/model/MEndTreatmentResponse.cpp (.../MEndTreatmentResponse.cpp) (revision c3a1e077ddeba65709084f9af5dd756741db8b4f) @@ -2,21 +2,21 @@ using namespace Model; -QVariantList MEndTreatmentResponse::parameters() const { +QVariantList MTreatmentEndResponse::parameters() const { return { _data.endTreatmentResponse.value, }; } -bool MEndTreatmentResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { +bool MTreatmentEndResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position if (GetValue(vByteArray, index, _data.endTreatmentResponse )) return true; else { if(vIndex) *vIndex = index; return false; } } -MEndTreatmentResponse::Data MEndTreatmentResponse::data() const { +MTreatmentEndResponse::Data MTreatmentEndResponse::data() const { Data data; data.endTreatmentResponse = _data.endTreatmentResponse.value; return data; Index: sources/model/MEndTreatmentResponse.h =================================================================== diff -u -r95a840fc93f1a2cd65732d835fad2aca0f03f28e -rc3a1e077ddeba65709084f9af5dd756741db8b4f --- sources/model/MEndTreatmentResponse.h (.../MEndTreatmentResponse.h) (revision 95a840fc93f1a2cd65732d835fad2aca0f03f28e) +++ sources/model/MEndTreatmentResponse.h (.../MEndTreatmentResponse.h) (revision c3a1e077ddeba65709084f9af5dd756741db8b4f) @@ -16,8 +16,8 @@ namespace Model { /*! - * \brief The MEndTreatmentResponse class - * \details The end treamtent response model + * \brief The MTreatmentEndResponse class + * \details The treatment end response model * * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------------------: | @@ -37,7 +37,7 @@ * | infoText | EndTreatmentResponse | * */ -class MEndTreatmentResponse : public MAbstract { +class MTreatmentEndResponse : public MAbstract { // friends friend class ::tst_models; @@ -58,13 +58,13 @@ quint32 endTreatmentResponse = 0; }; - MEndTreatmentResponse () {} + MTreatmentEndResponse () {} bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; Data data ( ) const ; }; } -typedef Model::MEndTreatmentResponse::Data EndTreatmentResponseData; +typedef Model::MTreatmentEndResponse::Data TreatmentEndResponseData; #endif // MENDTREATMENTRESPONSE_H Index: sources/model/MModel.h =================================================================== diff -u -rc241fc1d31be3e4958582dff94de8189f5bbba67 -rc3a1e077ddeba65709084f9af5dd756741db8b4f --- sources/model/MModel.h (.../MModel.h) (revision c241fc1d31be3e4958582dff94de8189f5bbba67) +++ sources/model/MModel.h (.../MModel.h) (revision c3a1e077ddeba65709084f9af5dd756741db8b4f) @@ -208,9 +208,9 @@ REGISTER_METATYPE( PrimingData ) \ \ /* Request */ \ - REGISTER_METATYPE( StartTreatmentRequestData ) \ - REGISTER_METATYPE( ConfirmTreatmentRequestData ) \ - REGISTER_METATYPE( EndTreatmentRequestData ) \ + REGISTER_METATYPE( TreatmentStartRequestData ) \ + REGISTER_METATYPE( TreatmentConfirmRequestData ) \ + REGISTER_METATYPE( TreatmentEndRequestData ) \ REGISTER_METATYPE( AlarmAcknowledgeRequestData ) \ REGISTER_METATYPE( AlarmSilenceRequestData ) \ \ @@ -222,8 +222,8 @@ REGISTER_METATYPE( AdjustSalineRequestData ) \ REGISTER_METATYPE( AdjustTreatmentParametersRequestData ) \ /* Response */ \ - REGISTER_METATYPE( StartTreatmentResponseData ) \ - REGISTER_METATYPE( EndTreatmentResponseData ) \ + REGISTER_METATYPE( TreatmentStartResponseData ) \ + REGISTER_METATYPE( TreatmentEndResponseData ) \ \ REGISTER_METATYPE( AdjustBloodDialysateResponseData ) \ REGISTER_METATYPE( AdjustDurationResponseData ) \ @@ -282,8 +282,8 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDurationResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, StartTreatmentResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, EndTreatmentResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentStartResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentEndResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSalineResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentParametersResponseData ) @@ -295,9 +295,9 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmRequestData ) \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, StartTreatmentRequestData ) \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, ConfirmTreatmentRequestData ) \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, EndTreatmentRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, TreatmentStartRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, TreatmentConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, TreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustSalineRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustTreatmentParametersRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmAcknowledgeRequestData ) \ @@ -355,8 +355,8 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDurationResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( StartTreatmentResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( EndTreatmentResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentStartResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentEndResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSalineResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustTreatmentParametersResponseData ) @@ -367,9 +367,9 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( StartTreatmentRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( ConfirmTreatmentRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( EndTreatmentRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( TreatmentStartRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( TreatmentConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( TreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustSalineRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustTreatmentParametersRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmAcknowledgeRequestData ) \ @@ -382,9 +382,9 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationConfirmRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( StartTreatmentRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( ConfirmTreatmentRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( EndTreatmentRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( TreatmentStartRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( TreatmentConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( TreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustSalineRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustTreatmentParametersRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmSilenceRequestData ) \ @@ -397,9 +397,9 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationConfirmRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( StartTreatmentRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( ConfirmTreatmentRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( EndTreatmentRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( TreatmentStartRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( TreatmentConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( TreatmentEndRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustSalineRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustTreatmentParametersRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmAcknowledgeRequestData ) \ @@ -435,8 +435,8 @@ ACTION_RECEIVE_SIGNAL( DGDebugTextData ) \ ACTION_RECEIVE_SIGNAL( PrimingData ) \ /* Response */ \ - ACTION_RECEIVE_SIGNAL( StartTreatmentResponseData ) \ - ACTION_RECEIVE_SIGNAL( EndTreatmentResponseData ) \ + ACTION_RECEIVE_SIGNAL( TreatmentStartResponseData ) \ + ACTION_RECEIVE_SIGNAL( TreatmentEndResponseData ) \ \ ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationStateResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustBloodDialysateResponseData ) \ Index: sources/model/MStartTreatmentResponse.cpp =================================================================== diff -u -r074b32b5cc08f41f2d9ce0d021f2151b76bba5ad -rc3a1e077ddeba65709084f9af5dd756741db8b4f --- sources/model/MStartTreatmentResponse.cpp (.../MStartTreatmentResponse.cpp) (revision 074b32b5cc08f41f2d9ce0d021f2151b76bba5ad) +++ sources/model/MStartTreatmentResponse.cpp (.../MStartTreatmentResponse.cpp) (revision c3a1e077ddeba65709084f9af5dd756741db8b4f) @@ -2,14 +2,14 @@ using namespace Model; -QVariantList MStartTreatmentResponse::parameters() const { +QVariantList MTreatmentStartResponse::parameters() const { return { _data.startTreatmentResponse.value, _data.startTreatmentRejectReason.value }; } -bool MStartTreatmentResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { +bool MTreatmentStartResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position if (GetValue(vByteArray, index, _data.startTreatmentResponse )) if (GetValue(vByteArray, index, _data.startTreatmentRejectReason )) @@ -19,7 +19,7 @@ } -MStartTreatmentResponse::Data MStartTreatmentResponse::data() const { +MTreatmentStartResponse::Data MTreatmentStartResponse::data() const { Data data; data.startTreatmentResponse = _data.startTreatmentResponse.value; data.startTreatmentRejectReason = _data.startTreatmentRejectReason.value; Index: sources/model/MStartTreatmentResponse.h =================================================================== diff -u -r1f8abdd821041623392d18cf4f80cad9ae1bf246 -rc3a1e077ddeba65709084f9af5dd756741db8b4f --- sources/model/MStartTreatmentResponse.h (.../MStartTreatmentResponse.h) (revision 1f8abdd821041623392d18cf4f80cad9ae1bf246) +++ sources/model/MStartTreatmentResponse.h (.../MStartTreatmentResponse.h) (revision c3a1e077ddeba65709084f9af5dd756741db8b4f) @@ -16,7 +16,7 @@ namespace Model { /*! - * \brief The MStartTreatmentResponse class + * \brief The MTreatmentStartResponse class * \details The start treamtent response model * * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | @@ -38,8 +38,9 @@ * | infoText | StartTreatmentResponse | * */ -class MStartTreatmentResponse : public MAbstract { +class MTreatmentStartResponse : public MAbstract { + // friends friend class ::tst_models; @@ -61,13 +62,13 @@ quint32 startTreatmentRejectReason = 0; }; - MStartTreatmentResponse () {} + MTreatmentStartResponse () {} bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; Data data ( ) const ; }; } -typedef Model::MStartTreatmentResponse::Data StartTreatmentResponseData; +typedef Model::MTreatmentStartResponse::Data TreatmentStartResponseData; #endif // MSTARTTREATMENTRESPONSE_H Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -r1d006f4e732fa2c5335d5adff425d0f39a99d37c -rc3a1e077ddeba65709084f9af5dd756741db8b4f --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 1d006f4e732fa2c5335d5adff425d0f39a99d37c) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision c3a1e077ddeba65709084f9af5dd756741db8b4f) @@ -324,7 +324,7 @@ }; /*! - * \brief The MStartTreatmentReq class + * \brief The MTreatmentStartReq class * \details The model to request starting a treatment * * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | @@ -336,7 +336,7 @@ * | #1:(U32) | \ref request | * */ -class MStartTreatmentReq : public MModel { +class MTreatmentStartReq : public MModel { public: enum Options { eSelectParams = 0, @@ -356,7 +356,7 @@ }; /*! - * \brief The MConfirmTreatmentReq class + * \brief The MTreatmentConfirmReq class * \details The model to tell HD treatment parameters have been confirmed * * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | @@ -368,7 +368,7 @@ * | #1:(U32) | \ref request | * */ -class MConfirmTreatmentReq : public MModel { +class MTreatmentConfirmReq : public MModel { public: enum Options { eCancel = 0, @@ -387,7 +387,7 @@ }; /*! - * \brief The MEndTreatmentReq class + * \brief The MTreatmentEndReq class * \details The model to request an end to treatment * * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | @@ -399,7 +399,7 @@ * | N/A || * */ -class MEndTreatmentReq : public MModel { +class MTreatmentEndReq : public MModel { public: // coco begin validated : Has been validated manually. @@ -500,9 +500,9 @@ typedef Model:: MAdjustUltrafiltrationStateReq AdjustUltrafiltrationStateRequestData; typedef Model:: MAdjustUltrafiltrationEditReq AdjustUltrafiltrationEditRequestData; typedef Model:: MAdjustUltrafiltrationConfirmReq AdjustUltrafiltrationConfirmRequestData; -typedef Model:: MStartTreatmentReq StartTreatmentRequestData; -typedef Model:: MConfirmTreatmentReq ConfirmTreatmentRequestData; -typedef Model:: MEndTreatmentReq EndTreatmentRequestData; +typedef Model:: MTreatmentStartReq TreatmentStartRequestData; +typedef Model:: MTreatmentConfirmReq TreatmentConfirmRequestData; +typedef Model:: MTreatmentEndReq TreatmentEndRequestData; typedef Model:: MAdjustSalineReq AdjustSalineRequestData; typedef Model:: MAlarmSilenceReq AlarmSilenceRequestData; typedef Model:: MAdjustTreatmentParametersReq AdjustTreatmentParametersRequestData; Index: sources/view/VBluetooth.cpp =================================================================== diff -u -r7249125bb71e6fab4139590ee777c64ece9cf3be -rc3a1e077ddeba65709084f9af5dd756741db8b4f --- sources/view/VBluetooth.cpp (.../VBluetooth.cpp) (revision 7249125bb71e6fab4139590ee777c64ece9cf3be) +++ sources/view/VBluetooth.cpp (.../VBluetooth.cpp) (revision c3a1e077ddeba65709084f9af5dd756741db8b4f) @@ -46,10 +46,10 @@ */ void VBluetooth::doScanForDevices() { + onUpdateStatus(tr("Scanning...")); bleDevices.clear(); emit didDevicesChanged(); emit didRequestScanForDevices(); - onUpdateStatus(tr("Scanning...")); } /*! @@ -62,7 +62,7 @@ { switch (error) { case QBluetoothDeviceDiscoveryAgent::PoweredOffError: - onUpdateStatus(tr("Error: The bluetooth module is powered off.")); + onUpdateStatus(tr("Error: Bluetooth module is powered off.")); break; default: onUpdateStatus(tr("Error: Scan for devices error.")); Index: sources/view/VTreatmentCreate.cpp =================================================================== diff -u -r9e234daa89b49df33be6faeaa597e6592526b539 -rc3a1e077ddeba65709084f9af5dd756741db8b4f --- sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision 9e234daa89b49df33be6faeaa597e6592526b539) +++ sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision c3a1e077ddeba65709084f9af5dd756741db8b4f) @@ -36,14 +36,14 @@ connect(&_GuiController, SIGNAL(didActionReceive(AdjustTreatmentParametersResponseData)), this, SLOT(doActionReceive(AdjustTreatmentParametersResponseData))); - connect(this, SIGNAL(requestSelectParameters(StartTreatmentRequestData)), - &_GuiController, SLOT(doAdjustment(StartTreatmentRequestData))); + connect(this, SIGNAL(requestSelectParameters(TreatmentStartRequestData)), + &_GuiController, SLOT(doAdjustment(TreatmentStartRequestData))); - connect(this, SIGNAL(requestConfirm(ConfirmTreatmentRequestData)), - &_GuiController, SLOT(doAdjustment(ConfirmTreatmentRequestData))); + connect(this, SIGNAL(requestConfirm(TreatmentConfirmRequestData)), + &_GuiController, SLOT(doAdjustment(TreatmentConfirmRequestData))); - connect(&_GuiController, SIGNAL(didActionReceive(StartTreatmentResponseData)), - this, SLOT(doActionReceive(StartTreatmentResponseData))); + connect(&_GuiController, SIGNAL(didActionReceive(TreatmentStartResponseData)), + this, SLOT(doActionReceive(TreatmentStartResponseData))); connect(this, SIGNAL(requestConcurrentSave(QString,QString,bool)), &_FileSaver, SLOT(onConcurrentSave(QString,QString,bool))); @@ -345,13 +345,13 @@ * to start selecting treatment parameters, cancel, or start the treatment * @param messageData */ -void VTreatmentCreate::doActionReceive(const StartTreatmentResponseData &messageData) +void VTreatmentCreate::doActionReceive(const TreatmentStartResponseData &messageData) { qDebug() << "Received response after start treatment request: " << messageData.startTreatmentResponse; if (messageData.startTreatmentResponse != 1) return; - if (startTreatmentRequest.request == StartTreatmentRequestData::eCancel) + if (startTreatmentRequest.request == TreatmentStartRequestData::eCancel) goToNextPage(false); else goToNextPage(true); @@ -463,7 +463,7 @@ saveNewTreatment(obj); // Tell FW we confirm - confirmTreatmentRequest.request = ConfirmTreatmentRequestData::eConfirm; + confirmTreatmentRequest.request = TreatmentConfirmRequestData::eConfirm; emit requestConfirm(confirmTreatmentRequest); // no FW response required @@ -574,7 +574,7 @@ */ void VTreatmentCreate::doStartTreatment() { qDebug() << "Requesting to start a treatment..."; - startTreatmentRequest.request = StartTreatmentRequestData::eStartTreatment; + startTreatmentRequest.request = TreatmentStartRequestData::eStartTreatment; emit requestSelectParameters(startTreatmentRequest); } @@ -869,7 +869,7 @@ void VTreatmentCreate::doSelectParameters() { qDebug() << "Sending request to FW to select parameters..."; - startTreatmentRequest.request = StartTreatmentRequestData::eSelectParams; + startTreatmentRequest.request = TreatmentStartRequestData::eSelectParams; emit requestSelectParameters(startTreatmentRequest); } @@ -880,7 +880,7 @@ void VTreatmentCreate::doCancelSelectingParameters() { qDebug() << "Sending request to FW to cancel selecting parameters..."; - startTreatmentRequest.request = StartTreatmentRequestData::eCancel; + startTreatmentRequest.request = TreatmentStartRequestData::eCancel; emit requestSelectParameters(startTreatmentRequest); } @@ -892,7 +892,7 @@ { // Tell FW we cancel confirm qDebug() << "Telling FW user is cancelling confirm treatment parameters..."; - confirmTreatmentRequest.request = ConfirmTreatmentRequestData::eCancel; + confirmTreatmentRequest.request = TreatmentConfirmRequestData::eCancel; emit requestConfirm(confirmTreatmentRequest); goToNextPage(false); } Index: sources/view/VTreatmentCreate.h =================================================================== diff -u -rf05549765024eec65ddd3e3e203560334c655ecb -rc3a1e077ddeba65709084f9af5dd756741db8b4f --- sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision f05549765024eec65ddd3e3e203560334c655ecb) +++ sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision c3a1e077ddeba65709084f9af5dd756741db8b4f) @@ -246,8 +246,8 @@ Page pageToShow = None; QString enumToString(GuiRequestReasons vEnum); - StartTreatmentRequestData startTreatmentRequest; - ConfirmTreatmentRequestData confirmTreatmentRequest; + TreatmentStartRequestData startTreatmentRequest; + TreatmentConfirmRequestData confirmTreatmentRequest; void goToNextPage(bool forward); @@ -262,8 +262,8 @@ void pop(); void showTreatmentStart(); void requestValidateParameters(const AdjustTreatmentParametersRequestData &data); - void requestConfirm(const ConfirmTreatmentRequestData &data); - void requestSelectParameters(const StartTreatmentRequestData &data); + void requestConfirm(const TreatmentConfirmRequestData &data); + void requestSelectParameters(const TreatmentStartRequestData &data); void resetCreateTreatment(); void fwValidationFailed(QString reason); void fwValidationSuccess(); @@ -277,7 +277,7 @@ void doFinishedPrime(); void doStartTreatment(); bool doActionReceive(AdjustTreatmentParametersResponseData data); - void doActionReceive(const StartTreatmentResponseData &messageData); + void doActionReceive(const TreatmentStartResponseData &messageData); void doUserModifiedParameters(); QStringList doGetPrescriptionParameterNames(); QStringList doGetPrescriptionParameterValues(); Index: sources/view/VTreatmentEnd.cpp =================================================================== diff -u -r53134008481fd775533e8988b7436f2f75e47336 -rc3a1e077ddeba65709084f9af5dd756741db8b4f --- sources/view/VTreatmentEnd.cpp (.../VTreatmentEnd.cpp) (revision 53134008481fd775533e8988b7436f2f75e47336) +++ sources/view/VTreatmentEnd.cpp (.../VTreatmentEnd.cpp) (revision c3a1e077ddeba65709084f9af5dd756741db8b4f) @@ -11,19 +11,19 @@ VTreatmentEnd::VTreatmentEnd(QObject *parent) : QObject(parent) { - connect(this, SIGNAL(didEndTreatmentRequest(EndTreatmentRequestData)), - &_GuiController, SLOT(doAdjustment(EndTreatmentRequestData))); + connect(this, SIGNAL(didEndTreatmentRequest(TreatmentEndRequestData)), + &_GuiController, SLOT(doAdjustment(TreatmentEndRequestData))); - connect(&_GuiController, SIGNAL(didActionReceive(EndTreatmentResponseData)), - this, SLOT(onEndTreatmentResponse(EndTreatmentResponseData))); + connect(&_GuiController, SIGNAL(didActionReceive(TreatmentEndResponseData)), + this, SLOT(onEndTreatmentResponse(TreatmentEndResponseData))); } /*! * \brief VTreatmentEnd::onEndTreatmentResponse * Receives the end teatment response * \param response The end treatment response */ -void VTreatmentEnd::onEndTreatmentResponse(EndTreatmentResponseData response) +void VTreatmentEnd::onEndTreatmentResponse(TreatmentEndResponseData response) { LOG_DEBUG(tr("End Treatment Response: %1").arg(response.endTreatmentResponse)); } @@ -35,6 +35,6 @@ void VTreatmentEnd::doEndTreatmentRequest() { LOG_DEBUG(tr("End Treatment Request.")); - EndTreatmentRequestData endTreatmentRequest; + TreatmentEndRequestData endTreatmentRequest; emit didEndTreatmentRequest(endTreatmentRequest); } Index: sources/view/VTreatmentEnd.h =================================================================== diff -u -r1f8abdd821041623392d18cf4f80cad9ae1bf246 -rc3a1e077ddeba65709084f9af5dd756741db8b4f --- sources/view/VTreatmentEnd.h (.../VTreatmentEnd.h) (revision 1f8abdd821041623392d18cf4f80cad9ae1bf246) +++ sources/view/VTreatmentEnd.h (.../VTreatmentEnd.h) (revision c3a1e077ddeba65709084f9af5dd756741db8b4f) @@ -36,13 +36,13 @@ explicit VTreatmentEnd(QObject *parent = nullptr); signals: - void didEndTreatmentRequest(EndTreatmentRequestData request); + void didEndTreatmentRequest(TreatmentEndRequestData request); public slots: void doEndTreatmentRequest(); private slots: - void onEndTreatmentResponse(EndTreatmentResponseData response); + void onEndTreatmentResponse(TreatmentEndResponseData response); }; } #endif // VTREATMENTEND_H Index: unittests/tst_models.cpp =================================================================== diff -u -re58be51c4aa52938af250db3ee579e98de08542c -rc3a1e077ddeba65709084f9af5dd756741db8b4f --- unittests/tst_models.cpp (.../tst_models.cpp) (revision e58be51c4aa52938af250db3ee579e98de08542c) +++ unittests/tst_models.cpp (.../tst_models.cpp) (revision c3a1e077ddeba65709084f9af5dd756741db8b4f) @@ -1679,7 +1679,7 @@ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MStartTreatmentResponse test definition ~~~~~~~~~~~~~~~~~~~~~~~~ // void tst_models::tst_MStartTreatmentResponse() { - Model::MStartTreatmentResponse mData; + Model::MTreatmentStartResponse mData; QFETCH(int , errorIndex ); QFETCH(QByteArray, data ); @@ -1717,7 +1717,7 @@ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MEndTreatmentResponse test definition ~~~~~~~~~~~~~~~~~~~~~~~~ // void tst_models::tst_MEndTreatmentResponse() { - Model::MEndTreatmentResponse mData; + Model::MTreatmentEndResponse mData; QFETCH(int , errorIndex ); QFETCH(QByteArray, data ); @@ -1804,15 +1804,15 @@ MessageInterpreter interpreter; QVariantList vData; QByteArray payload; - QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_StartTreatmentReq, vData, payload)); + QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_TreatmentStartReq, vData, payload)); } void tst_models::tst_MConfirmTreatmentRequest() { MessageInterpreter interpreter; QVariantList vData; QByteArray payload; - QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_ConfirmTreatmentReq, vData, payload)); + QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_TreatmentConfirmReq, vData, payload)); } void tst_models::tst_MEndTreatmentRequest() @@ -1821,18 +1821,18 @@ QVariantList vData; QByteArray payload; Message msg; - msg.actionId = Gui::GuiActions::ID_EndTreatmentReq; + msg.actionId = Gui::GuiActions::ID_TreatmentEndReq; - QVERIFY(interpreter.interpretMessage(Gui::GuiActions::ID_EndTreatmentReq, vData, payload)); + QVERIFY(interpreter.interpretMessage(Gui::GuiActions::ID_TreatmentEndReq, vData, payload)); QVERIFY(!interpreter.interpretMessage_HD(msg,vData)); vData.append(0); - QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_EndTreatmentReq, vData, payload)); + QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_TreatmentEndReq, vData, payload)); } void tst_models::tst_MAdjustmentTreatmentParametersRequest() { MessageInterpreter interpreter; QVariantList vData; QByteArray payload; - QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_CreateTreatmentReq, vData, payload)); + QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_TreatmentCreateReq, vData, payload)); } Index: unittests/tst_views.cpp =================================================================== diff -u -re58be51c4aa52938af250db3ee579e98de08542c -rc3a1e077ddeba65709084f9af5dd756741db8b4f --- unittests/tst_views.cpp (.../tst_views.cpp) (revision e58be51c4aa52938af250db3ee579e98de08542c) +++ unittests/tst_views.cpp (.../tst_views.cpp) (revision c3a1e077ddeba65709084f9af5dd756741db8b4f) @@ -719,7 +719,7 @@ void tst_views::VCreateTreatment_fw_validation_response() { View::VTreatmentCreate view; - GuiActionType action = GuiActionType::ID_CreateTreatmentRsp; + GuiActionType action = GuiActionType::ID_TreatmentCreateRsp; for (int i = 0; i < 18; ++i) { @@ -751,7 +751,7 @@ AdjustTreatmentParametersResponseData respData; - StartTreatmentResponseData startResponse; + TreatmentStartResponseData startResponse; startResponse.startTreatmentResponse = 0; // REJECT view.doActionReceive(startResponse);