Index: denali.pro.user =================================================================== diff -u -r0b8e00869ef81ef0a834c03c13049f4c281870d2 -rd6dc1cd63d86d7d4f4c4d05958bec4f870783f41 --- denali.pro.user (.../denali.pro.user) (revision 0b8e00869ef81ef0a834c03c13049f4c281870d2) +++ denali.pro.user (.../denali.pro.user) (revision d6dc1cd63d86d7d4f4c4d05958bec4f870783f41) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -1487,7 +1487,7 @@ true true false - true + false false /home/denali/Projects/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Debug Index: sources/gui/qml/pages/postTreatment/PostTreatmentRinsebackStack.qml =================================================================== diff -u -r3702984c4572607055ab3ede4d45792e74595991 -rd6dc1cd63d86d7d4f4c4d05958bec4f870783f41 --- sources/gui/qml/pages/postTreatment/PostTreatmentRinsebackStack.qml (.../PostTreatmentRinsebackStack.qml) (revision 3702984c4572607055ab3ede4d45792e74595991) +++ sources/gui/qml/pages/postTreatment/PostTreatmentRinsebackStack.qml (.../PostTreatmentRinsebackStack.qml) (revision d6dc1cd63d86d7d4f4c4d05958bec4f870783f41) @@ -44,6 +44,7 @@ } PostTreatmentRinsebackComplete { id: _postTreatmentRinsebackComplete onAdditionalClicked : vTreatmentAdjustmentRinseback.doAdditional () //82.6 + onTreatmentBackClicked : vTreatmentAdjustmentRinseback.doTreatmentBack () //82.9 onConfirmClicked : vTreatmentAdjustmentRinseback.doConfirm () //82.7 onTreatmentEndClicked : vTreatmentAdjustmentRinseback.doTreatmentEnd () //82.8 } Index: sources/gui/qml/pages/postTreatment/rinseback/PostTreatmentRinsebackComplete.qml =================================================================== diff -u -rf4bdf1e57221c8395580fc169d239d49d670ce1b -rd6dc1cd63d86d7d4f4c4d05958bec4f870783f41 --- sources/gui/qml/pages/postTreatment/rinseback/PostTreatmentRinsebackComplete.qml (.../PostTreatmentRinsebackComplete.qml) (revision f4bdf1e57221c8395580fc169d239d49d670ce1b) +++ sources/gui/qml/pages/postTreatment/rinseback/PostTreatmentRinsebackComplete.qml (.../PostTreatmentRinsebackComplete.qml) (revision d6dc1cd63d86d7d4f4c4d05958bec4f870783f41) @@ -28,16 +28,18 @@ objectName: "_PostTreatmentRinsebackComplete" property alias reasonText : _notification.text - signal additionalClicked () + signal treatmentBackClicked () signal confirmClicked () signal treatmentEndClicked () QtObject { id: _private - property int sectionSpace : 30 - property int sectionWidth : _root.width * 2/3 - sectionSpace * 1.5 - property int sectionHeight: _root.width * 1/3 - sectionSpace * 1.5 + property int sectionSpace : 30 + property int sectionWidth : _root.width * 2/3 - sectionSpace * 1.5 + property int sectionHeight : _root.width * 1/3 - sectionSpace * 1.5 + property bool treatmentIncomplete : vTreatmentTime.time_Total > 0 } + Text { id: _title anchors { top: parent.top @@ -49,6 +51,23 @@ font.pixelSize: Fonts.fontPixelTitle } + TouchRect { id : _touchAdditional + width : 155 + height : 50 + text { + text: qsTr("ADDITIONAL") + font.bold : true + font.pixelSize: Fonts.fontPixelConfirm + } + anchors { + verticalCenter : _title.verticalCenter + right : parent.right + rightMargin : 30 + } + animated : true + onClicked : additionalClicked() + } + TimeText { id: timeout visible : vTreatmentRinseback.timeoutTotal anchors { @@ -130,24 +149,25 @@ } TouchRect { id : _backTreatmentTouchRect - visible : true - text.text : qsTr("ADDITIONAL") + visible : _private.treatmentIncomplete + text.text : qsTr("BACK TO TREATMENT") width : _buttonGroup.buttonsWidth - onClicked : additionalClicked() + onClicked : treatmentBackClicked() } TouchRect { id : _beginRinsebackTouchRect - visible : true + visible : _private.treatmentIncomplete text.text : qsTr("CONFIRM") width : _buttonGroup.buttonsWidth color : borderColor onClicked : confirmClicked() } TouchRect { id : _endTreatmentTouchRect - visible : vTreatmentTime.time_Total > 0 + visible : true text.text : qsTr("END TREATMENT") width : _buttonGroup.buttonsWidth + color : _private.treatmentIncomplete ? backgroundColor : borderColor onClicked : treatmentEndClicked() } } Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentPrime.qml =================================================================== diff -u -r76f632ce5a9039ae662d9a52286079b772f8ae7f -rd6dc1cd63d86d7d4f4c4d05958bec4f870783f41 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentPrime.qml (.../PreTreatmentPrime.qml) (revision 76f632ce5a9039ae662d9a52286079b772f8ae7f) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentPrime.qml (.../PreTreatmentPrime.qml) (revision d6dc1cd63d86d7d4f4c4d05958bec4f870783f41) @@ -50,7 +50,7 @@ minimum: 0 maximum: vPriming.secondsTotal diameter: 100 - value: vPriming.primingComplete ? vPriming.secondsTotal : vPriming.secondsRemaining + value: vPriming.primingComplete ? vPriming.secondsTotal : vPriming.secondsTotal - vPriming.secondsRemaining PrimingTimer { id: _timeText anchors.centerIn: parent Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r3702984c4572607055ab3ede4d45792e74595991 -rd6dc1cd63d86d7d4f4c4d05958bec4f870783f41 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 3702984c4572607055ab3ede4d45792e74595991) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision d6dc1cd63d86d7d4f4c4d05958bec4f870783f41) @@ -207,8 +207,13 @@ } } - // ---------- Manages Responses ---------- + Connections { target: vHDOperationMode + onStandbyChanged : { + pop( _treatmentHome ) + } + } + Connections { target: vTreatmentAdjustmentDuration onAdjustmentTriggered : { if ( vTreatmentAdjustmentDuration.adjustment_Accepted ) { Index: sources/model/hd/alarm/MAlarmStatusData.cpp =================================================================== diff -u -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 -rd6dc1cd63d86d7d4f4c4d05958bec4f870783f41 --- sources/model/hd/alarm/MAlarmStatusData.cpp (.../MAlarmStatusData.cpp) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) +++ sources/model/hd/alarm/MAlarmStatusData.cpp (.../MAlarmStatusData.cpp) (revision d6dc1cd63d86d7d4f4c4d05958bec4f870783f41) @@ -174,9 +174,9 @@ case GuiAlarmID::ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE : { result = QObject::tr("DG drain pump RPM out of range" ); break; } case GuiAlarmID::ALARM_ID_DG_HEATERS_NEGATIVE_COLD_JUNCTION_TEMPERATURE : { result = QObject::tr("DG heaters cold junction temperature out of range" ); break; } case GuiAlarmID::ALARM_ID_DG_HEATERS_FAULT : { result = QObject::tr("DG heaters fault" ); break; } - case GuiAlarmID::ALARM_ID_END_OF_DIALYSIS_TREATMENT_WARNING : { result = QObject::tr("HD end of treatment warning" ); break; } - case GuiAlarmID::ALARM_ID_END_OF_DIALYSIS_TREATMENT_ALARM : { result = QObject::tr("HD end of treatment alarm (user not acting to end treatment)" ); break; } - case GuiAlarmID::ALARM_ID_END_OF_DIALYSIS_TREATMENT_ALARM_HIGH : { result = QObject::tr("HD end of treatment alarm (high priority - user still not acting to end treatment)" ); break; } + case GuiAlarmID::ALARM_ID_END_OF_TREATMENT_WARNING : { result = QObject::tr("HD end of treatment warning" ); break; } + case GuiAlarmID::ALARM_ID_END_OF_TREATMENT_ALARM : { result = QObject::tr("HD end of treatment alarm (user not acting to end treatment)" ); break; } + case GuiAlarmID::ALARM_ID_END_OF_TREATMENT_HIGH : { result = QObject::tr("HD end of treatment alarm (high priority - user still not acting to end treatment)" ); break; } default: result = QObject::tr("ALARM_ID_UNDEFINED [%1]").arg(int(vAlarmID)); Index: sources/view/hd/data/VHDOperationModeData.cpp =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rd6dc1cd63d86d7d4f4c4d05958bec4f870783f41 --- sources/view/hd/data/VHDOperationModeData.cpp (.../VHDOperationModeData.cpp) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/view/hd/data/VHDOperationModeData.cpp (.../VHDOperationModeData.cpp) (revision d6dc1cd63d86d7d4f4c4d05958bec4f870783f41) @@ -22,6 +22,16 @@ void VHDOperationMode::onActionReceive(const HDOperationModeData &vData) { opMode ( vData.mOpMode ); + + fault ( vData.mOpMode == GuiHDOpModes::MODE_FAUL ); + service ( vData.mOpMode == GuiHDOpModes::MODE_SERV ); + init ( vData.mOpMode == GuiHDOpModes::MODE_INIT ); + standby ( vData.mOpMode == GuiHDOpModes::MODE_STAN ); + validateParameters ( vData.mOpMode == GuiHDOpModes::MODE_TPAR ); + preTreatment ( vData.mOpMode == GuiHDOpModes::MODE_PRET ); + inTreatment ( vData.mOpMode == GuiHDOpModes::MODE_TREA ); + postTreatment ( vData.mOpMode == GuiHDOpModes::MODE_POST ); + invalidMode ( vData.mOpMode == GuiHDOpModes::MODE_NLEG ); } /*! Index: sources/view/hd/data/VHDOperationModeData.h =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rd6dc1cd63d86d7d4f4c4d05958bec4f870783f41 --- sources/view/hd/data/VHDOperationModeData.h (.../VHDOperationModeData.h) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/view/hd/data/VHDOperationModeData.h (.../VHDOperationModeData.h) (revision d6dc1cd63d86d7d4f4c4d05958bec4f870783f41) @@ -38,8 +38,19 @@ { Q_OBJECT - PROPERTY( quint32 , opMode , 0) + PROPERTY( quint32 , opMode , 0 ) + PROPERTY( bool , fault , false ) ///< Fault mode + PROPERTY( bool , service , false ) ///< Service mode + PROPERTY( bool , init , false ) ///< Initialization & POST mode + PROPERTY( bool , standby , false ) ///< Standby mode + PROPERTY( bool , validateParameters , false ) ///< Treatment Parameters mode + PROPERTY( bool , preTreatment , false ) ///< Pre-Treatment mode + PROPERTY( bool , inTreatment , false ) ///< Treatment mode + PROPERTY( bool , postTreatment , false ) ///< Post-Treatment mode + PROPERTY( bool , invalidMode , false ) ///< Not legal - an illegal mode transition occurred + + Q_PROPERTY(QString text READ text NOTIFY opModeChanged) VIEW_DEC(VHDOperationMode, HDOperationModeData)