Index: denali.pro.user =================================================================== diff -u -r8ec5969db5d688c89ff99a4911112da53e0a9408 -r89e3ca8e108dd4b3315ae7862c631eba43f8fd0f --- denali.pro.user (.../denali.pro.user) (revision 8ec5969db5d688c89ff99a4911112da53e0a9408) +++ denali.pro.user (.../denali.pro.user) (revision 89e3ca8e108dd4b3315ae7862c631eba43f8fd0f) @@ -1,14 +1,14 @@ - + EnvironmentId {67370740-e20f-4fc6-be45-6652e866a8bf} ProjectExplorer.Project.ActiveTarget - 1 + 0 ProjectExplorer.Project.EditorSettings @@ -89,7 +89,7 @@ Desktop Qt 5.12.5 GCC 64bit Desktop Qt 5.12.5 GCC 64bit qt.qt5.5125.gcc_64_kit - 1 + 9 0 0 @@ -1185,7 +1185,7 @@ false true - /home/denali/Projects/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Release + /home/denali/Projects/tmp/build/unittest/tst_views 1 Index: sources/gui/qml/dialogs/Alert.qml =================================================================== diff -u -r666594860f4ea32da9a2bd362d40325b881b11f9 -r89e3ca8e108dd4b3315ae7862c631eba43f8fd0f --- sources/gui/qml/dialogs/Alert.qml (.../Alert.qml) (revision 666594860f4ea32da9a2bd362d40325b881b11f9) +++ sources/gui/qml/dialogs/Alert.qml (.../Alert.qml) (revision 89e3ca8e108dd4b3315ae7862c631eba43f8fd0f) @@ -25,7 +25,8 @@ * \brief Contains the Alert Dialog Implementation */ ModalDialog { id : _root - contentItem.objectName: "Alert" //SquishQt testability + objectName: "Alert" // SquishQt testability + contentItem.objectName: "AlertContent" Rectangle { id: _titleBar; color: "transparent"; @@ -81,6 +82,7 @@ } TouchRect { id: _confirm + objectName: "AlertConfirmButton" width: _root.width / 3; text.text: qsTr("CONFIRM") button.onPressed: { @@ -90,6 +92,7 @@ } TouchRect { id: _cancel + objectName: "AlertCancelButton" width: _root.width / 3; text.text: qsTr("CANCEL") button.onPressed: { Index: sources/gui/qml/dialogs/NotificationDialog.qml =================================================================== diff -u -rcd769413344091cea88a30861b49188c8c147cba -r89e3ca8e108dd4b3315ae7862c631eba43f8fd0f --- sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision cd769413344091cea88a30861b49188c8c147cba) +++ sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 89e3ca8e108dd4b3315ae7862c631eba43f8fd0f) @@ -134,6 +134,7 @@ // 3 - No button at all for the situations that the alarm can't be resolved by user. // :: OK button and the other 3 buttons (Resume,Rinseback,End) should never come together TouchRect { id : _resumeTouchRect + objectName: "_alarmResume" visible : resumeVisible button.onPressed: resumeClicked() text.text : qsTr("RESUME") @@ -142,6 +143,7 @@ } TouchRect { id : _rinsebackTouchRect + objectName: "_alarmRinseback" visible : rinsebackVisible button.onPressed: rinsebackClicked() text.text : qsTr("RINSEBACK") @@ -150,13 +152,15 @@ } TouchRect { id : _endTouchRect + objectName: "_alarmEnd" visible : endVisible button.onPressed: endClicked() text.text : qsTr("END") width : _buttonGroup.buttonsWidth borderColor : Colors.white } TouchRect { id : _okTouchRect + objectName: "_alarmOK" visible : okVisible button.onPressed: okClicked() text.text : qsTr("OK") Index: sources/gui/qml/pages/treatment/TreatmentBegin.qml =================================================================== diff -u -rdf74454a7a75eb63ac577739c1fd0f179e479f44 -r89e3ca8e108dd4b3315ae7862c631eba43f8fd0f --- sources/gui/qml/pages/treatment/TreatmentBegin.qml (.../TreatmentBegin.qml) (revision df74454a7a75eb63ac577739c1fd0f179e479f44) +++ sources/gui/qml/pages/treatment/TreatmentBegin.qml (.../TreatmentBegin.qml) (revision 89e3ca8e108dd4b3315ae7862c631eba43f8fd0f) @@ -77,6 +77,7 @@ } Text { id: _textValue + objectName: "_treatmentBeginUltrafiltrationValue" visible : true color : "white" text : _root.ufVolume.toFixed(vTreatmentUltrafiltration.precision) @@ -91,6 +92,7 @@ } Slider { id: _volumeSlider + objectName: "_treatmentBeginUltrafiltrationSlider" anchors { horizontalCenter: parent.horizontalCenter top: parent.top Index: sources/gui/qml/pages/treatment/TreatmentCreate.qml =================================================================== diff -u -r8ec5969db5d688c89ff99a4911112da53e0a9408 -r89e3ca8e108dd4b3315ae7862c631eba43f8fd0f --- sources/gui/qml/pages/treatment/TreatmentCreate.qml (.../TreatmentCreate.qml) (revision 8ec5969db5d688c89ff99a4911112da53e0a9408) +++ sources/gui/qml/pages/treatment/TreatmentCreate.qml (.../TreatmentCreate.qml) (revision 89e3ca8e108dd4b3315ae7862c631eba43f8fd0f) @@ -275,6 +275,7 @@ } Column { id: _arterialColumn + objectName: "_arterialPressureLimitsColumn" spacing: 45 anchors.horizontalCenter: parent.horizontalCenter Text { id: _arterialLabel @@ -285,6 +286,7 @@ anchors.left : _arterialPressureLimits.left } RangeSlider { id: _arterialPressureLimits + objectName: "_arterialPressureLimitsSlider" // dimension height : 5 width : Variables.createTreatmentSliderWidth @@ -338,6 +340,7 @@ } Column { id: _venousColumn + objectName: "_venousPressureLimitsColumn" spacing: 45 anchors.horizontalCenter: parent.horizontalCenter Text { id: _venousLabel @@ -348,6 +351,7 @@ anchors.left : _venousPressureLimits.left } RangeSlider { id: _venousPressureLimits + objectName: "_venousPressureLimitsSlider" // dimension height : 5 width : Variables.createTreatmentSliderWidth Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r8ec5969db5d688c89ff99a4911112da53e0a9408 -r89e3ca8e108dd4b3315ae7862c631eba43f8fd0f --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 8ec5969db5d688c89ff99a4911112da53e0a9408) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 89e3ca8e108dd4b3315ae7862c631eba43f8fd0f) @@ -130,7 +130,7 @@ TreatmentBegin { id: _treatmentBegin onBackClicked : {vTreatmentCreate.doRequestPop() } - onStartClicked : { vTreatmentAdjustmentUltrafiltrationInit.doAdjustment(_treatmentBegin.ufVolume) } + onStartClicked : {vTreatmentBegin.doCheckBLE() } } //// Treatment Adjustment Dialogs @@ -325,4 +325,10 @@ onPop : { pop() } onShowTreatmentStart : { push(_treatmentStart) } } + + Connections { target: vTreatmentBegin + onDidConfirmReadyToStartTreament: { + vTreatmentAdjustmentUltrafiltrationInit.doAdjustment(_treatmentBegin.ufVolume); + } + } } Index: sources/model/hd/alarm/MAlarmStatusData.cpp =================================================================== diff -u -rdf74454a7a75eb63ac577739c1fd0f179e479f44 -r89e3ca8e108dd4b3315ae7862c631eba43f8fd0f --- sources/model/hd/alarm/MAlarmStatusData.cpp (.../MAlarmStatusData.cpp) (revision df74454a7a75eb63ac577739c1fd0f179e479f44) +++ sources/model/hd/alarm/MAlarmStatusData.cpp (.../MAlarmStatusData.cpp) (revision 89e3ca8e108dd4b3315ae7862c631eba43f8fd0f) @@ -115,7 +115,7 @@ case GuiAlarmID::ALARM_ID_NVDATA_SRVC_RECORD_CRC_ERROR: { result = QObject::tr("Service record CRC failure." ); break; } case GuiAlarmID::ALARM_ID_NVDATA_CAL_RECORD_CRC_ERROR: { result = QObject::tr("Calibration record CRC failure." ); break; } case GuiAlarmID::ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR: { result = QObject::tr("HW usage data failure." ); break; } - case GuiAlarmID::AlARM_ID_NVDATA_DISINFECTION_DATE_CRC_ERROR: { result = QObject::tr("Last disinfection date CRC error." ); break; } + 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_FPGA_COMM_TIMEOUT: { result = QObject::tr("FPGA communication down for too long." ); break; } Index: sources/view/VTreatmentBegin.cpp =================================================================== diff -u -r5384b4f5833568db90b988b11bbd502386d2f9b2 -r89e3ca8e108dd4b3315ae7862c631eba43f8fd0f --- sources/view/VTreatmentBegin.cpp (.../VTreatmentBegin.cpp) (revision 5384b4f5833568db90b988b11bbd502386d2f9b2) +++ sources/view/VTreatmentBegin.cpp (.../VTreatmentBegin.cpp) (revision 89e3ca8e108dd4b3315ae7862c631eba43f8fd0f) @@ -41,13 +41,13 @@ } /** - * \brief VCreateTreatment::start - * Called when user is ready to begin a new treatment. + * \brief VCreateTreatment::doCheckBLE + * Called when the user is ready to check the BLE connection * Implements SRSUI 253, 695, PRS 50 */ -void VTreatmentBegin::doStartTreatment() { - LOG_DEBUG("Requesting to start a treatment..."); - +void VTreatmentBegin::doCheckBLE() +{ + LOG_DEBUG("Checking BLE Connection..."); GuiAlertRequestData request; request.id = GuiAlertID::ID_Alert_BLE_Connection; if (!_bleConnected) @@ -65,6 +65,17 @@ } /*! + * \brief VTreatmentBegin::doStartTreatment + * Called when the user is ready to start a treatment + */ +void VTreatmentBegin::doStartTreatment() +{ + LOG_DEBUG("Requesting to start a treatment..."); + startTreatmentRequest.request = TreatmentStartRequestData::eStartTreatment; + emit didStartNewTreatment(startTreatmentRequest); +} + +/*! * \brief VTreatmentBegin::doActionReceive * Slot called when we receive an HD operation mode update * \param messageData - (HDOperationModeData) contains the HD operation mode @@ -107,8 +118,7 @@ if (messageData.confirmed) { - startTreatmentRequest.request = TreatmentStartRequestData::eStartTreatment; - emit didStartNewTreatment(startTreatmentRequest); + emit didConfirmReadyToStartTreament(); } } Index: sources/view/VTreatmentBegin.h =================================================================== diff -u -r666594860f4ea32da9a2bd362d40325b881b11f9 -r89e3ca8e108dd4b3315ae7862c631eba43f8fd0f --- sources/view/VTreatmentBegin.h (.../VTreatmentBegin.h) (revision 666594860f4ea32da9a2bd362d40325b881b11f9) +++ sources/view/VTreatmentBegin.h (.../VTreatmentBegin.h) (revision 89e3ca8e108dd4b3315ae7862c631eba43f8fd0f) @@ -43,9 +43,11 @@ signals: void didStartNewTreatment(const TreatmentStartRequestData &data); void didRequestShowAlert(GuiAlertRequestData); + void didConfirmReadyToStartTreament(); public slots: void doStartTreatment(); + void doCheckBLE(); private slots: void doUserModifiedParameters(); void onDeviceDisconnected(); Index: unittests/tst_messaging.cpp =================================================================== diff -u -rdf0c8b4fa51d4f5ef0216eb2c3f6f5dfc97bf12e -r89e3ca8e108dd4b3315ae7862c631eba43f8fd0f --- unittests/tst_messaging.cpp (.../tst_messaging.cpp) (revision df0c8b4fa51d4f5ef0216eb2c3f6f5dfc97bf12e) +++ unittests/tst_messaging.cpp (.../tst_messaging.cpp) (revision 89e3ca8e108dd4b3315ae7862c631eba43f8fd0f) @@ -320,21 +320,6 @@ } /*! - * \brief tst_messaging::tst_MessageInterpreter_alarmStatus - * \details Tests MessageInterpreter alarmStatus method Message payload length check - */ -void tst_messaging::tst_MessageInterpreter_alarmStatus() -{ - Can::MessageInterpreter iMsg; - Can::Message msg; - msg.actionId = Gui::GuiActionType::ID_AlarmStatus; - msg.data = {}; - QVariantList data; - QVERIFY( ! iMsg.alarmStatus(msg, data)); - QVERIFY( data.isEmpty()); -} - -/*! * \brief tst_messaging::tst_MessageInterpreter_getPressureOcclusionData_isType * \details Tests MessageInterpreter getPressureOcclusionData method Message Type check */ Index: unittests/tst_messaging.h =================================================================== diff -u -rdf0c8b4fa51d4f5ef0216eb2c3f6f5dfc97bf12e -r89e3ca8e108dd4b3315ae7862c631eba43f8fd0f --- unittests/tst_messaging.h (.../tst_messaging.h) (revision df0c8b4fa51d4f5ef0216eb2c3f6f5dfc97bf12e) +++ unittests/tst_messaging.h (.../tst_messaging.h) (revision 89e3ca8e108dd4b3315ae7862c631eba43f8fd0f) @@ -52,7 +52,6 @@ void tst_MessageInterpreter_getAlarmStatus_isType(); void tst_MessageInterpreter_getAlarmStatus_payloadLen(); - void tst_MessageInterpreter_alarmStatus(); void tst_MessageInterpreter_getPressureOcclusionData_isType(); void tst_MessageInterpreter_getPressureOcclusionData_payloadLen(); Index: unittests/tst_models.cpp =================================================================== diff -u -r66e87ea403ec12a273553284919684282d87bc6a -r89e3ca8e108dd4b3315ae7862c631eba43f8fd0f --- unittests/tst_models.cpp (.../tst_models.cpp) (revision 66e87ea403ec12a273553284919684282d87bc6a) +++ unittests/tst_models.cpp (.../tst_models.cpp) (revision 89e3ca8e108dd4b3315ae7862c631eba43f8fd0f) @@ -1903,14 +1903,6 @@ } } -void tst_models::tst_MAlarmAcknowledgeRequest() -{ - MessageInterpreter interpreter; - QVariantList vData; - QByteArray payload; - QVERIFY(!interpreter.interpretMessage(Gui::GuiActions::ID_AlarmUserAckReq, vData, payload)); -} - void tst_models::tst_MStartTreatmentRequest() { MessageInterpreter interpreter; Index: unittests/tst_models.h =================================================================== diff -u -rdf0c8b4fa51d4f5ef0216eb2c3f6f5dfc97bf12e -r89e3ca8e108dd4b3315ae7862c631eba43f8fd0f --- unittests/tst_models.h (.../tst_models.h) (revision df0c8b4fa51d4f5ef0216eb2c3f6f5dfc97bf12e) +++ unittests/tst_models.h (.../tst_models.h) (revision 89e3ca8e108dd4b3315ae7862c631eba43f8fd0f) @@ -128,9 +128,6 @@ void tst_MAlarmCleared_data(); void tst_MAlarmCleared(); - void tst_MAlarmAcknowledgeRequest(); - - // Treatment Parameters void tst_MTreatmentParametersResp_data(); void tst_MTreatmentParametersResp(); Index: unittests/tst_views.cpp =================================================================== diff -u -r66e87ea403ec12a273553284919684282d87bc6a -r89e3ca8e108dd4b3315ae7862c631eba43f8fd0f --- unittests/tst_views.cpp (.../tst_views.cpp) (revision 66e87ea403ec12a273553284919684282d87bc6a) +++ unittests/tst_views.cpp (.../tst_views.cpp) (revision 89e3ca8e108dd4b3315ae7862c631eba43f8fd0f) @@ -760,7 +760,6 @@ view.onFinishedSaveNewTreatment(true); view.onFinishedSaveNewTreatment(false); view.doFinishedPrime(); - view.doStartTreatment(); QCOMPARE(view.treatmentData.bloodFlowRate, dataBackup.bloodFlowRate); QCOMPARE(view.treatmentData.dialysateFlowRate, dataBackup.dialysateFlowRate);