Index: denali.pro =================================================================== diff -u -rae1042a0c14d6d27556730183cc2cbe1a00bc0a7 -r66e87ea403ec12a273553284919684282d87bc6a --- denali.pro (.../denali.pro) (revision ae1042a0c14d6d27556730183cc2cbe1a00bc0a7) +++ denali.pro (.../denali.pro) (revision 66e87ea403ec12a273553284919684282d87bc6a) @@ -1,4 +1,4 @@ -QT += widgets qml quick serialbus concurrent +QT += widgets qml quick serialbus concurrent bluetooth CONFIG += c++17 warn_on QMAKE_CXXFLAGS += -Wall -Werror -Wimplicit-fallthrough # -save-temps # see .ii and .s files @@ -31,6 +31,7 @@ sources/storage \ sources/gui \ sources/canbus \ + sources/bluetooth \ sources/utility \ sources/abstract \ sources/model \ @@ -110,18 +111,24 @@ sources/canbus/MessageBuilder.h \ sources/canbus/MessageInterpreter.h \ sources/canbus/MessageDispatcher.h \ + \ # Bluetooth + sources/bluetooth/BLEScanner.h \ \ # Gui sources/gui/GuiGlobals.h \ sources/gui/GuiView.h \ sources/gui/GuiController.h \ \ # ---------- Views ---------- + sources/view/VAlert.h \ + sources/view/VBluetooth.h \ + sources/view/VBluetoothDeviceInfo.h \ sources/view/VTreatmentCreate.h \ sources/view/VTreatmentEnd.h \ sources/view/VTreatmentBegin.h \ sources/view/VEventSpy.h \ sources/view/VView.h \ sources/view/VPowerOff.h \ sources/view/VPriming.h \ + sources/view/VVitals.h \ \ # ---------- Views - Alarm sources/view/hd/alarm/VAlarmStatus.h \ \ # ---------- Views - HD - Adjustment - In-Treatment @@ -228,17 +235,23 @@ sources/canbus/MessageBuilder.cpp \ sources/canbus/MessageDispatcher.cpp \ sources/canbus/MessageInterpreter.cpp \ + \ # Bluetooth + sources/bluetooth/BLEScanner.cpp \ \ # Gui sources/gui/GuiGlobals.cpp \ sources/gui/GuiView.cpp \ sources/gui/GuiController.cpp \ \ # ---------- Views ---------- + sources/view/VAlert.cpp \ + sources/view/VBluetooth.cpp \ + sources/view/VBluetoothDeviceInfo.cpp \ sources/view/VTreatmentCreate.cpp \ sources/view/VTreatmentEnd.cpp \ sources/view/VTreatmentBegin.cpp \ sources/view/VEventSpy.cpp \ sources/view/VPriming.cpp \ sources/view/VPowerOff.cpp \ + sources/view/VVitals.cpp \ \ # ---------- Views - Alarm sources/view/hd/alarm/VAlarmStatus.cpp \ \ # ---------- Views - HD - Adjustment - In-Treatment Index: denali.pro.user =================================================================== diff -u -r4bbec52d2257cfdef37604e3453846e501a2af91 -r66e87ea403ec12a273553284919684282d87bc6a --- denali.pro.user (.../denali.pro.user) (revision 4bbec52d2257cfdef37604e3453846e501a2af91) +++ denali.pro.user (.../denali.pro.user) (revision 66e87ea403ec12a273553284919684282d87bc6a) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -89,7 +89,7 @@ Desktop Qt 5.12.5 GCC 64bit Desktop Qt 5.12.5 GCC 64bit qt.qt5.5125.gcc_64_kit - 0 + 1 0 0 @@ -1176,7 +1176,7 @@ denali Qt4ProjectManager.Qt4RunConfiguration:/home/denali/Projects/application/denali.pro - -q -u -l + 3768 false true @@ -1185,7 +1185,7 @@ false true - /home/denali/Projects/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Debug + /home/denali/Projects/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Release 1 Index: denali.qrc =================================================================== diff -u -r820a00638e0573a5b0c51ed0b3e38d605d4400be -r66e87ea403ec12a273553284919684282d87bc6a --- denali.qrc (.../denali.qrc) (revision 820a00638e0573a5b0c51ed0b3e38d605d4400be) +++ denali.qrc (.../denali.qrc) (revision 66e87ea403ec12a273553284919684282d87bc6a) @@ -5,11 +5,13 @@ sources/gui/qml/pages/SettingsHome.qml sources/gui/qml/pages/Diagnostics.qml sources/gui/qml/pages/ManagerHome.qml + sources/gui/qml/pages/SettingsBluetooth.qml sources/gui/qml/dialogs/PowerOff.qml sources/gui/qml/dialogs/AutoHideInfo.qml sources/gui/qml/dialogs/NotificationDialog.qml + sources/gui/qml/dialogs/Alert.qml resources/images/Settings_gear_setting_tools-128.png @@ -21,6 +23,7 @@ resources/images/logo d Dark Transparent.png resources/images/Close.png resources/images/alarm.png + resources/images/alert.png resources/images/bell.png resources/images/bell-off.png resources/images/Back.png @@ -64,15 +67,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 @@ -81,9 +78,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 sources/gui/qml/components/RangeSlider.qml Index: main.cpp =================================================================== diff -u -r5c15c47de2e809f385e91e6136526020d227cb43 -r66e87ea403ec12a273553284919684282d87bc6a --- main.cpp (.../main.cpp) (revision 5c15c47de2e809f385e91e6136526020d227cb43) +++ main.cpp (.../main.cpp) (revision 66e87ea403ec12a273553284919684282d87bc6a) @@ -47,6 +47,7 @@ #include "GuiController.h" #include "Logger.h" #include "DriveWatcher.h" +#include "BLEScanner.h" #include "Threads.h" // kernel @@ -331,6 +332,9 @@ _MessageDispatcher.enableConsoleOut(gConsoleoutFrameInterface); } + //! - Initializing BLE Interface + _BLEScanner.doInit(); + //! - Initializing Application Controller _ApplicationController.init(Threads::_Application_Thread); Index: sources/bluetooth/BLEScanner.cpp =================================================================== diff -u -ra72ae0a4ecea77ac03220ddc5d8e5f322b254a61 -r66e87ea403ec12a273553284919684282d87bc6a --- sources/bluetooth/BLEScanner.cpp (.../BLEScanner.cpp) (revision a72ae0a4ecea77ac03220ddc5d8e5f322b254a61) +++ sources/bluetooth/BLEScanner.cpp (.../BLEScanner.cpp) (revision 66e87ea403ec12a273553284919684282d87bc6a) @@ -111,7 +111,7 @@ */ void BLEScanner::doReselectDevice(const QBluetoothDeviceInfo &deviceInfo) { - LOG_DEBUG(QString("Reselecting device ").arg(deviceInfo.address().toString())); + LOG_DEBUG(QString("Reselecting device %1").arg(deviceInfo.address().toString())); selectedDeviceInfo = deviceInfo; onConnectToDevice(deviceInfo); updateBLECuffCheckinType(true); Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -rae1042a0c14d6d27556730183cc2cbe1a00bc0a7 -r66e87ea403ec12a273553284919684282d87bc6a --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision ae1042a0c14d6d27556730183cc2cbe1a00bc0a7) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 66e87ea403ec12a273553284919684282d87bc6a) @@ -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); } @@ -418,10 +418,9 @@ mData += vData.heparinBolusVolume ; mData += vData.dialysateTemp ; - onActionTransmit(GuiActionType::ID_CreateTreatmentReq, mData); + onActionTransmit(GuiActionType::ID_TreatmentCreateReq, mData); } - /*! * \brief MessageDispatcher::actionTransmit * \details This method is called by slot MessageDispatcher::onActionTransmit Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -rae1042a0c14d6d27556730183cc2cbe1a00bc0a7 -r66e87ea403ec12a273553284919684282d87bc6a --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision ae1042a0c14d6d27556730183cc2cbe1a00bc0a7) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 66e87ea403ec12a273553284919684282d87bc6a) @@ -79,11 +79,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 @@ -110,8 +110,8 @@ {Gui::GuiActionType::ID_AdjustPressuresLimitsRsp , 6 * 4 }, // 6 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 -r595ede3b4cf5a1f5c06a04d1db99a0674ae742bd -r66e87ea403ec12a273553284919684282d87bc6a --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 595ede3b4cf5a1f5c06a04d1db99a0674ae742bd) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 66e87ea403ec12a273553284919684282d87bc6a) @@ -272,25 +272,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)); @@ -381,7 +381,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; @@ -395,8 +395,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.cpp =================================================================== diff -u -rf7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53 -r66e87ea403ec12a273553284919684282d87bc6a --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision f7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 66e87ea403ec12a273553284919684282d87bc6a) @@ -51,6 +51,8 @@ #include "VDGTemperaturesData.h" #include "VDGValvesStatesData.h" #include "VTreatmentCreate.h" +#include "VBluetooth.h" +#include "VBluetoothDeviceInfo.h" #include "VPriming.h" #include "VTreatmentBegin.h" #include "VTreatmentEnd.h" @@ -59,6 +61,8 @@ #include "VTreatmentAdjustmentUltrafiltrationEdit.h" #include "VTreatmentAdjustmentUltrafiltrationConfirm.h" #include "VTreatmentAdjustmentSaline.h" +#include "VVitals.h" +#include "VAlert.h" #include "VTreatmentAdjustmentHeparin.h" #include "VTreatmentAdjustmentPressuresLimits.h" Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r4bbec52d2257cfdef37604e3453846e501a2af91 -r66e87ea403ec12a273553284919684282d87bc6a --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 4bbec52d2257cfdef37604e3453846e501a2af91) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 66e87ea403ec12a273553284919684282d87bc6a) @@ -93,13 +93,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 = 0x3A00, // 58 - 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 @@ -154,6 +154,23 @@ Timeout = 0x01, }; + enum AlertID { + ID_Alert_None = 0, + ID_Alert_BLE_Connection, + ID_Alert_BLE_Measurement_Timeout + }; + + struct AlertRequest { + AlertID id; + QString title; + QString description; + }; + + struct AlertResponse { + AlertID id; + bool confirmed = false; + }; + Q_ENUM(GuiActionsType_Enum) Q_ENUM(GuiActionsData_Enum) @@ -202,6 +219,10 @@ typedef GuiActions::Heparin_Commands GuiHeparinCommands; typedef GuiActions::Heparin_States GuiHeparinStates; + typedef GuiActions::AlertID GuiAlertID; + typedef GuiActions::AlertRequest GuiAlertRequestData; + typedef GuiActions::AlertResponse GuiAlertResponseData; + void registerTypes(); void registerQmlTypes(); Index: sources/gui/qml/globals/Fonts.qml =================================================================== diff -u -r14c541d2b780b0a244bc84860aa565cf8dd7fe4b -r66e87ea403ec12a273553284919684282d87bc6a --- sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 14c541d2b780b0a244bc84860aa565cf8dd7fe4b) +++ sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 66e87ea403ec12a273553284919684282d87bc6a) @@ -68,4 +68,6 @@ readonly property int primingFontSize : 20 readonly property int crTreatmentFontSize : 30 readonly property int crTreatmentTableFontSize : 24 + readonly property int bleTitleFontSize : 30 + readonly property int bleConnectedFontSize : 16 } Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r14c541d2b780b0a244bc84860aa565cf8dd7fe4b -r66e87ea403ec12a273553284919684282d87bc6a --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 14c541d2b780b0a244bc84860aa565cf8dd7fe4b) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 66e87ea403ec12a273553284919684282d87bc6a) @@ -112,6 +112,12 @@ readonly property int notificationBarIconHeight : 30 readonly property int notificationBarIconWidth : 30 + readonly property int settingsBLEListViewWidth : 360 + readonly property int settingsBLEItemRightMargin : 20 + readonly property int settingsBLEButtonWidth : 300 + readonly property int settingsBLEButtonHeight : 85 + readonly property int settingsBLEMargin : 75 + readonly property int settingsBLEListViewMargin : 25 readonly property int settingsOptionWidth : 550 readonly property int settingsOptionHeight : 50 Index: sources/gui/qml/pages/SettingsHome.qml =================================================================== diff -u -r14c541d2b780b0a244bc84860aa565cf8dd7fe4b -r66e87ea403ec12a273553284919684282d87bc6a --- sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision 14c541d2b780b0a244bc84860aa565cf8dd7fe4b) +++ sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision 66e87ea403ec12a273553284919684282d87bc6a) @@ -28,6 +28,7 @@ * which is the default screen in the "Settings" stack */ ScreenItem { id: _root + backgroundRect.color: Colors.backgroundMenu USBButton { id: _usbButton anchors { top : parent.top @@ -80,33 +81,39 @@ vTreatmentEnd.doEndTreatmentRequest(); } } -} -/* TitleText { id: _titleText anchors.horizontalCenter: parent.horizontalCenter; anchors.top: parent.top anchors.topMargin: 150 width: parent.width text: qsTr("Device Settings") - } + /* Diagnostics { id: _diagnostics onBackClicked: pop() } + */ + SettingsBluetooth { + id: _bluetooth + onClickedBack: pop() + + } + Column { anchors.centerIn: parent; // add each settings page here. - SettingsItem { id: _item_diagnostics - title : qsTr("Diagnostics") - onClicked: push(_diagnostics); + SettingsItem { id: _item_bluetooth + title : qsTr("Bluetooth") + onClicked: push(_bluetooth); + } } -*/ +} Index: sources/gui/qml/pages/treatment/TreatmentBegin.qml =================================================================== diff -u -r14c541d2b780b0a244bc84860aa565cf8dd7fe4b -r66e87ea403ec12a273553284919684282d87bc6a --- sources/gui/qml/pages/treatment/TreatmentBegin.qml (.../TreatmentBegin.qml) (revision 14c541d2b780b0a244bc84860aa565cf8dd7fe4b) +++ sources/gui/qml/pages/treatment/TreatmentBegin.qml (.../TreatmentBegin.qml) (revision 66e87ea403ec12a273553284919684282d87bc6a) @@ -22,6 +22,7 @@ // Qml imports import "qrc:/globals" import "qrc:/components" +import "qrc:/components/pretreatment" /*! * \brief ManagerHome is the screen @@ -104,7 +105,7 @@ } TouchRect { id : _continueRect - objectName: "_treatmentBeginStart" + objectName: "_treatmentBeginStartButton" anchors.horizontalCenter: parent.horizontalCenter text.text: qsTr("START") button.onClicked: { Index: sources/gui/qml/pages/treatment/TreatmentCreate.qml =================================================================== diff -u -r14c541d2b780b0a244bc84860aa565cf8dd7fe4b -r66e87ea403ec12a273553284919684282d87bc6a --- sources/gui/qml/pages/treatment/TreatmentCreate.qml (.../TreatmentCreate.qml) (revision 14c541d2b780b0a244bc84860aa565cf8dd7fe4b) +++ sources/gui/qml/pages/treatment/TreatmentCreate.qml (.../TreatmentCreate.qml) (revision 66e87ea403ec12a273553284919684282d87bc6a) @@ -21,6 +21,7 @@ // Qml imports import "qrc:/globals" import "qrc:/components" +import "qrc:/components/pretreatment" /*! * \brief ManagerHome is the screen @@ -42,7 +43,7 @@ } Flickable { id: _flickable - objectName: "TreatmentCreateFlickable" + objectName: "_treatmentCreateFlickable" anchors.top: _topMenuBar.bottom anchors.left: parent.left anchors.bottom: parent.bottom @@ -375,9 +376,11 @@ onPressed: { _flickable.setInteractive(false) vTreatmentCreate.bloodPressureMeasureInterval = value + vVitals.doUpdateBPMeasureInterval(value) } onReleased: { vTreatmentCreate.bloodPressureMeasureInterval = value + vVitals.doUpdateBPMeasureInterval(value) _flickable.setInteractive(true) } } Index: sources/gui/qml/pages/treatment/TreatmentPrime.qml =================================================================== diff -u -r14c541d2b780b0a244bc84860aa565cf8dd7fe4b -r66e87ea403ec12a273553284919684282d87bc6a --- sources/gui/qml/pages/treatment/TreatmentPrime.qml (.../TreatmentPrime.qml) (revision 14c541d2b780b0a244bc84860aa565cf8dd7fe4b) +++ sources/gui/qml/pages/treatment/TreatmentPrime.qml (.../TreatmentPrime.qml) (revision 66e87ea403ec12a273553284919684282d87bc6a) @@ -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 -r153409973471214f29d5fad170a8b4ec0f4c4f2e -r66e87ea403ec12a273553284919684282d87bc6a --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 153409973471214f29d5fad170a8b4ec0f4c4f2e) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 66e87ea403ec12a273553284919684282d87bc6a) @@ -30,6 +30,7 @@ // Qml imports import "qrc:/globals" import "qrc:/components" +import "qrc:/components/pretreatment" import "qrc:/pages/treatment/adjustments" /*! @@ -129,7 +130,7 @@ TreatmentBegin { id: _treatmentBegin onClickedBack : {vTreatmentCreate.doRequestPop() } - onClickedStart : {vTreatmentCreate.doStartTreatment(); } + onClickedStart : {vTreatmentBegin.doStartTreatment(); } } //// Treatment Adjustment Dialogs Index: sources/model/MModel.h =================================================================== diff -u -rae1042a0c14d6d27556730183cc2cbe1a00bc0a7 -r66e87ea403ec12a273553284919684282d87bc6a --- sources/model/MModel.h (.../MModel.h) (revision ae1042a0c14d6d27556730183cc2cbe1a00bc0a7) +++ sources/model/MModel.h (.../MModel.h) (revision 66e87ea403ec12a273553284919684282d87bc6a) @@ -211,9 +211,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 ) \ \ @@ -226,19 +226,21 @@ REGISTER_METATYPE( AdjustHeparinRequestData ) \ REGISTER_METATYPE( AdjustPressuresLimitsRequestData ) \ REGISTER_METATYPE( AdjustTreatmentParametersRequestData ) \ + REGISTER_METATYPE( GuiAlertRequestData ) \ /* Response */ \ - REGISTER_METATYPE( StartTreatmentResponseData ) \ - REGISTER_METATYPE( EndTreatmentResponseData ) \ + REGISTER_METATYPE( TreatmentStartResponseData ) \ + REGISTER_METATYPE( TreatmentEndResponseData ) \ \ REGISTER_METATYPE( AdjustBloodDialysateResponseData ) \ REGISTER_METATYPE( AdjustDurationResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationStateResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationEditResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationConfirmResponseData ) \ REGISTER_METATYPE( AdjustSalineResponseData ) \ + REGISTER_METATYPE( GuiAlertResponseData ) \ REGISTER_METATYPE( AdjustHeparinResponseData ) \ REGISTER_METATYPE( AdjustPressuresLimitsResponseData ) \ - REGISTER_METATYPE( AdjustTreatmentParametersResponseData ) \ + REGISTER_METATYPE( AdjustTreatmentParametersResponseData ) //===============================================================================// /*! @@ -290,8 +292,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, AdjustHeparinResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsResponseData ) \ @@ -305,9 +307,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, AdjustHeparinRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPressuresLimitsRequestData ) \ @@ -368,8 +370,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( AdjustHeparinResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPressuresLimitsResponseData ) \ @@ -382,9 +384,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( AdjustHeparinRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPressuresLimitsRequestData ) \ @@ -399,9 +401,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( AdjustHeparinRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPressuresLimitsRequestData ) \ @@ -419,9 +421,9 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustPressuresLimitsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustSalineRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHeparinRequestData ) \ - 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( AdjustTreatmentParametersRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmAcknowledgeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmSilenceRequestData ) \ @@ -458,8 +460,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/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -r4bbec52d2257cfdef37604e3453846e501a2af91 -r66e87ea403ec12a273553284919684282d87bc6a --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 4bbec52d2257cfdef37604e3453846e501a2af91) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 66e87ea403ec12a273553284919684282d87bc6a) @@ -393,7 +393,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 | @@ -405,7 +405,7 @@ * | #1:(U32) | \ref request | * */ -class MStartTreatmentReq : public MModel { +class MTreatmentStartReq : public MModel { public: enum Options { eSelectParams = 0, @@ -425,19 +425,19 @@ }; /*! - * \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 | - * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:-------------------------:| - * | 56 | 0x100 | 9 | Req | Y | UI | HD | Confirm Treatment Request | + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:-----:|:------:|:-----:|:----:|:---:|:---:|:----:|:-------------------------:| + * | 0x3B00| 0x100 | 9 | Req | Y | UI | HD | Confirm Treatment Request | * * | Payload || * | || * | #1:(U32) | \ref request | * */ -class MConfirmTreatmentReq : public MModel { +class MTreatmentConfirmReq : public MModel { public: enum Options { eCancel = 0, @@ -456,7 +456,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 | @@ -468,7 +468,7 @@ * | N/A || * */ -class MEndTreatmentReq : public MModel { +class MTreatmentEndReq : public MModel { public: // coco begin validated : Has been validated manually. @@ -560,7 +560,6 @@ return MModel::toString("AdjustTreatmentParametersRequest", vParameters); } }; - } typedef Model:: MAdjustPowerOffReq AdjustPowerOffRequestData; @@ -572,9 +571,9 @@ typedef Model:: MAdjustSalineReq AdjustSalineRequestData; typedef Model:: MAdjustHeparinReq AdjustHeparinRequestData; typedef Model:: MAdjustPressuresLimitsReq AdjustPressuresLimitsRequestData; -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:: MAdjustTreatmentParametersReq AdjustTreatmentParametersRequestData; typedef Model:: MAlarmSilenceReq AlarmSilenceRequestData; typedef Model:: MAlarmAcknowledgeReq AlarmAcknowledgeRequestData; Index: sources/model/hd/alarm/MAlarmStatusData.cpp =================================================================== diff -u -r6cad9b004e904200b71de7431c745795256080df -r66e87ea403ec12a273553284919684282d87bc6a --- sources/model/hd/alarm/MAlarmStatusData.cpp (.../MAlarmStatusData.cpp) (revision 6cad9b004e904200b71de7431c745795256080df) +++ sources/model/hd/alarm/MAlarmStatusData.cpp (.../MAlarmStatusData.cpp) (revision 66e87ea403ec12a273553284919684282d87bc6a) @@ -14,7 +14,6 @@ */ #include "MAlarmStatusData.h" - using namespace Model; using namespace Gui; @@ -128,7 +127,7 @@ case GuiAlarmID::AlARM_ID_NVDATA_DISINFECTION_DATE_CRC_ERROR: { result = QObject::tr("Last disinfection date CRC error." ); break; } case GuiAlarmID::ALARM_ID_RO_PUMP_OUT_PRESSURE_OUT_OF_RANGE: { result = QObject::tr("Pressure at outlet of RO pump is out of range." ); break; } case GuiAlarmID::ALARM_ID_TEMPERATURE_SENSORS_FAULT: { result = QObject::tr("DG temperature sensors fault." ); break; } - case GuiAlarmID::ALARM_ID_TEMPERATURE_SENSORS_INCONSISTENT: { result = QObject::tr("DG temperature sensors values are inconsistent." ); break; } + case GuiAlarmID::ALARM_ID_FPGA_COMM_TIMEOUT: { result = QObject::tr("FPGA communication down for too long." ); break; } case GuiAlarmID::ALARM_ID_HD_COMM_TIMEOUT: { result = QObject::tr("HD communication timeout." ); break; } case GuiAlarmID::ALARM_ID_VALVE_CONTROL_FAILURE: { result = QObject::tr("FPGA not accepting commanded valve states." ); break; } case GuiAlarmID::ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK: { result = QObject::tr("Blood pump failed flow vs. motor speed check. \nMismatch with flow rate and rate implied by motor speed." ); break; } Index: sources/storage/FileHandler.cpp =================================================================== diff -u -r14c541d2b780b0a244bc84860aa565cf8dd7fe4b -r66e87ea403ec12a273553284919684282d87bc6a --- sources/storage/FileHandler.cpp (.../FileHandler.cpp) (revision 14c541d2b780b0a244bc84860aa565cf8dd7fe4b) +++ sources/storage/FileHandler.cpp (.../FileHandler.cpp) (revision 66e87ea403ec12a273553284919684282d87bc6a) @@ -107,7 +107,7 @@ } /*! - * \brief FileHandler::readCSV + * \brief FileHandler::readJSON * \details reads the provided filename's JSON content into the vContent variable. * \param vFileName - Source file name * \param vContent - The content of the file which will be written to when done. Index: sources/view/VView.h =================================================================== diff -u -rf7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53 -r66e87ea403ec12a273553284919684282d87bc6a --- sources/view/VView.h (.../VView.h) (revision f7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53) +++ sources/view/VView.h (.../VView.h) (revision 66e87ea403ec12a273553284919684282d87bc6a) @@ -135,8 +135,12 @@ REGISTER_TYPE( VTreatmentAdjustmentHeparin ) \ REGISTER_TYPE( VTreatmentAdjustmentPressuresLimits ) \ REGISTER_TYPE( VTreatmentCreate ) \ + REGISTER_TYPE( VBluetooth ) \ REGISTER_TYPE( VPriming ) \ REGISTER_TYPE( VTreatmentBegin ) \ REGISTER_TYPE( VTreatmentEnd ) \ - + REGISTER_TYPE( VTreatmentAdjustmentSaline ) \ + REGISTER_TYPE( VVitals ) \ + REGISTER_TYPE( VAlert ) + //--------------------------------------------------------------------------------// Index: unittests/tst_models.cpp =================================================================== diff -u -rdf0c8b4fa51d4f5ef0216eb2c3f6f5dfc97bf12e -r66e87ea403ec12a273553284919684282d87bc6a --- unittests/tst_models.cpp (.../tst_models.cpp) (revision df0c8b4fa51d4f5ef0216eb2c3f6f5dfc97bf12e) +++ unittests/tst_models.cpp (.../tst_models.cpp) (revision 66e87ea403ec12a273553284919684282d87bc6a) @@ -1745,7 +1745,7 @@ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MStartTreatmentResponse test definition ~~~~~~~~~~~~~~~~~~~~~~~~ // void tst_models::tst_MStartTreatmentResponse() { - Model::MStartTreatmentResponse mData; + Model::MTreatmentStartResponse mData; QFETCH(int , errorIndex ); QFETCH(QByteArray, data ); @@ -1783,7 +1783,7 @@ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ MEndTreatmentResponse test definition ~~~~~~~~~~~~~~~~~~~~~~~~ // void tst_models::tst_MEndTreatmentResponse() { - Model::MEndTreatmentResponse mData; + Model::MTreatmentEndResponse mData; QFETCH(int , errorIndex ); QFETCH(QByteArray, data ); @@ -1916,15 +1916,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() @@ -1933,18 +1933,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 -r14c541d2b780b0a244bc84860aa565cf8dd7fe4b -r66e87ea403ec12a273553284919684282d87bc6a --- unittests/tst_views.cpp (.../tst_views.cpp) (revision 14c541d2b780b0a244bc84860aa565cf8dd7fe4b) +++ unittests/tst_views.cpp (.../tst_views.cpp) (revision 66e87ea403ec12a273553284919684282d87bc6a) @@ -709,7 +709,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) { @@ -741,7 +741,7 @@ AdjustTreatmentParametersResponseData respData; - StartTreatmentResponseData startResponse; + TreatmentStartResponseData startResponse; startResponse.startTreatmentResponse = 0; // REJECT view.doActionReceive(startResponse);