Index: denali.pro =================================================================== diff -u -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed -rc8de9dc4cb679628ac9c0c9551bc43ad3c415d4a --- denali.pro (.../denali.pro) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) +++ denali.pro (.../denali.pro) (revision c8de9dc4cb679628ac9c0c9551bc43ad3c415d4a) @@ -148,7 +148,6 @@ sources/gui/GuiController.h \ \ # ---------- Views ---------- sources/view/VTreatmentCreate.h \ - sources/view/VTreatmentBegin.h \ sources/view/VEventSpy.h \ sources/view/VView.h \ sources/view/VPowerOff.h \ @@ -323,7 +322,6 @@ sources/gui/GuiController.cpp \ \ # ---------- Views ---------- sources/view/VTreatmentCreate.cpp \ - sources/view/VTreatmentBegin.cpp \ sources/view/VEventSpy.cpp \ sources/view/VPowerOff.cpp \ \ # ---------- Views - Alarm Index: denali.pro.user =================================================================== diff -u -re0412efcf85964a18ec52ad80f233c45998eb45a -rc8de9dc4cb679628ac9c0c9551bc43ad3c415d4a --- denali.pro.user (.../denali.pro.user) (revision e0412efcf85964a18ec52ad80f233c45998eb45a) +++ denali.pro.user (.../denali.pro.user) (revision c8de9dc4cb679628ac9c0c9551bc43ad3c415d4a) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed -rc8de9dc4cb679628ac9c0c9551bc43ad3c415d4a --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision c8de9dc4cb679628ac9c0c9551bc43ad3c415d4a) @@ -72,7 +72,6 @@ #include "VDGAccelerometerData.h" // ----- #include "VTreatmentCreate.h" -#include "VTreatmentBegin.h" // ----- In-Treatment Adjustments #include "VTreatmentAdjustmentDuration.h" #include "VTreatmentAdjustmentFlows.h" Index: sources/gui/qml/components/NotificationBar.qml =================================================================== diff -u -r73091a6f5717c0fc88e236c06c618ad361f30a3c -rc8de9dc4cb679628ac9c0c9551bc43ad3c415d4a --- sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c) +++ sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision c8de9dc4cb679628ac9c0c9551bc43ad3c415d4a) @@ -73,6 +73,7 @@ } MuteButton { id: _muteButton + visible: _root.iconVisible backgroundColor: _root.color anchors { verticalCenter : _root.verticalCenter @@ -88,6 +89,7 @@ } UpDownButton { id: _updownButton + visible: _root.iconVisible backgroundColor: _root.color isUp: true anchors { @@ -99,6 +101,7 @@ } TouchRect { id: _alarmsList + visible: _root.iconVisible height: 45 width : height Index: sources/gui/qml/main.qml =================================================================== diff -u -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed -rc8de9dc4cb679628ac9c0c9551bc43ad3c415d4a --- sources/gui/qml/main.qml (.../main.qml) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) +++ sources/gui/qml/main.qml (.../main.qml) (revision c8de9dc4cb679628ac9c0c9551bc43ad3c415d4a) @@ -63,7 +63,6 @@ import VDGReservoir 0.1 import VDGTemperatures 0.1 import VDGValvesStates 0.1 -import VTreatmentBegin 0.1 import VTreatmentCreate 0.1 import VDGAccelerometer 0.1 // In-Treatment - Adjustemnt @@ -138,7 +137,6 @@ VTreatmentAdjustmentDuration { id: vTreatmentAdjustmentDuration } VTreatmentAdjustmentFlows { id: vTreatmentAdjustmentFlows } VTreatmentCreate { id: vTreatmentCreate } - VTreatmentBegin { id: vTreatmentBegin } VTreatmentRanges { id: vTreatmentRanges } Index: sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml =================================================================== diff -u -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed -rc8de9dc4cb679628ac9c0c9551bc43ad3c415d4a --- sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml (.../PreTreatmentPrimeStack.qml) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) +++ sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml (.../PreTreatmentPrimeStack.qml) (revision c8de9dc4cb679628ac9c0c9551bc43ad3c415d4a) @@ -33,7 +33,7 @@ property int stackStepIndex : 4 PreTreatmentBase { id: _preTreatmentDrySelfTest - header.confirmVisible : false /* the state shall automatically change */ + header.confirmVisible : true header.confirmEnabeled : vPreTreatmentStates.selfTestDry_complete isComplete : vPreTreatmentStates.selfTestDry_complete title.text : qsTr("Begin Prime") @@ -104,15 +104,35 @@ } Connections { target: _preTreatmentDrySelfTest - onConfirmClicked : { /* the state shall automatically change */ } + onConfirmClicked : { vPreTreatmentAdjustmentDisposablesPrime.doPrime() } } + Connections { target: vPreTreatmentAdjustmentDisposablesPrime + onAdjustmentTriggered : { + if ( vPreTreatmentAdjustmentDisposablesPrime.adjustment_Accepted ) { + _preTreatmentDrySelfTest.reasonText = "" + } else { + _preTreatmentDrySelfTest.reasonText = vPreTreatmentAdjustmentDisposablesPrime.text() + } + } + } + Connections { target: _preTreatmentDisposablesPrime - onBackClicked : { vTreatmentCreate.doRequestPop() } + // onBackClicked : { vTreatmentCreate.doRequestPop() } onConfirmClicked : { vPreTreatmentAdjustmentPatientConnectionBegin.doBegin() } - //onContinueClicked : { vTreatmentCreate.doFinishedPrime() } + // onContinueClicked : { vTreatmentCreate.doFinishedPrime() } } + Connections { target: vPreTreatmentAdjustmentPatientConnectionBegin + onAdjustmentTriggered : { + if ( vPreTreatmentAdjustmentPatientConnectionBegin.adjustment_Accepted ) { + _preTreatmentDisposablesPrime.reasonText = "" + } else { + _preTreatmentDisposablesPrime.reasonText = vPreTreatmentAdjustmentPatientConnectionBegin.text() + } + } + } + onVisibleChanged: { if (visible) { _mainMenu.hidden = true Index: sources/gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml =================================================================== diff -u -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed -rc8de9dc4cb679628ac9c0c9551bc43ad3c415d4a --- sources/gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml (.../PreTreatmentWaterSampleStack.qml) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) +++ sources/gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml (.../PreTreatmentWaterSampleStack.qml) (revision c8de9dc4cb679628ac9c0c9551bc43ad3c415d4a) @@ -122,6 +122,16 @@ page( _preTreatmentWaterSampleResultFail )} onEndTreatmentClicked : { } + Connections { target: vPreTreatmentAdjustmentWaterSample + onAdjustmentTriggered : { + if ( vPreTreatmentAdjustmentWaterSample.adjustment_Accepted ) { + _preTreatmentWaterSample.reasonText = "" + } else { + _preTreatmentWaterSample.reasonText = vPreTreatmentAdjustmentWaterSample.text() + } + } + } + onVisibleChanged: { if (visible) { _mainMenu.hidden = true Index: sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml =================================================================== diff -u -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed -rc8de9dc4cb679628ac9c0c9551bc43ad3c415d4a --- sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml (.../PreTreatmentConnectionStack.qml) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) +++ sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml (.../PreTreatmentConnectionStack.qml) (revision c8de9dc4cb679628ac9c0c9551bc43ad3c415d4a) @@ -85,15 +85,35 @@ Connections { target: _preTreatmentPatientConnection onBackClicked : { page( _preTreatmentUltrafiltration )} - onConfirmClicked : { vPreTreatmentAdjustmentPatientConnectionConfirm.doConfirm() - page( _preTreatmentStartTreatment )} + onConfirmClicked : { vPreTreatmentAdjustmentPatientConnectionConfirm.doConfirm()} } Connections { target: _preTreatmentStartTreatment onBackClicked : { page( _preTreatmentPatientConnection )} onConfirmClicked : { vPreTreatmentAdjustmentStartTreatment.doStart() } } + Connections { target: vPreTreatmentAdjustmentPatientConnectionConfirm + onAdjustmentTriggered : { + if ( vPreTreatmentAdjustmentPatientConnectionConfirm.adjustment_Accepted ) { + page( _preTreatmentStartTreatment ) + _preTreatmentPatientConnection.reasonText = "" + } else { + _preTreatmentPatientConnection.reasonText = vPreTreatmentAdjustmentPatientConnectionConfirm.text() + } + } + } + + Connections { target: vPreTreatmentAdjustmentStartTreatment + onAdjustmentTriggered : { + if ( vPreTreatmentAdjustmentStartTreatment.adjustment_Accepted ) { + _preTreatmentStartTreatment.reasonText = "" + } else { + _preTreatmentStartTreatment.reasonText = vPreTreatmentAdjustmentStartTreatment.text() + } + } + } + onVisibleChanged: { if (visible) { _mainMenu.hidden = true Fisheye: Tag c8de9dc4cb679628ac9c0c9551bc43ad3c415d4a refers to a dead (removed) revision in file `sources/view/VTreatmentBegin.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag c8de9dc4cb679628ac9c0c9551bc43ad3c415d4a refers to a dead (removed) revision in file `sources/view/VTreatmentBegin.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/view/VTreatmentCreate.h =================================================================== diff -u -re0412efcf85964a18ec52ad80f233c45998eb45a -rc8de9dc4cb679628ac9c0c9551bc43ad3c415d4a --- sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision e0412efcf85964a18ec52ad80f233c45998eb45a) +++ sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision c8de9dc4cb679628ac9c0c9551bc43ad3c415d4a) @@ -85,14 +85,14 @@ const quint32 duration_Res = 15 ; // PRS 346 // mL/hr (0 = off) - const qreal heparinDispensingRate_Def = 0 ; // PRS 347 - const qreal heparinDispensingRate_Min = 0.1 ; // PRS 347 + const qreal heparinDispensingRate_Def = 0.0 ; // PRS 347 + const qreal heparinDispensingRate_Min = 0.0 ; // PRS 347 const qreal heparinDispensingRate_Max = 1.0 ; // PRS 347 const qreal heparinDispensingRate_Res = 0.1 ; // PRS 347 // mL - const qreal heparinBolusVolume_Def = 0 ; // PRS 348 - const qreal heparinBolusVolume_Min = 0.1 ; // PRS 348 + const qreal heparinBolusVolume_Def = 0.0 ; // PRS 348 + const qreal heparinBolusVolume_Min = 0.0 ; // PRS 348 const qreal heparinBolusVolume_Max = 2.0 ; // PRS 348 const qreal heparinBolusVolume_Res = 0.1 ; // PRS 348 Index: sources/view/VView.h =================================================================== diff -u -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed -rc8de9dc4cb679628ac9c0c9551bc43ad3c415d4a --- sources/view/VView.h (.../VView.h) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) +++ sources/view/VView.h (.../VView.h) (revision c8de9dc4cb679628ac9c0c9551bc43ad3c415d4a) @@ -161,7 +161,6 @@ REGISTER_TYPE( VTreatmentAdjustmentEnd ) \ REGISTER_TYPE( VTreatmentAdjustmentPressuresLimits ) \ REGISTER_TYPE( VTreatmentCreate ) \ - REGISTER_TYPE( VTreatmentBegin ) \ REGISTER_TYPE( VTreatmentAdjustmentVersions ) \ //--------------------------------------------------------------------------------// Index: unittests/tst_views.cpp =================================================================== diff -u -r695e95aa2ec5e6e1c395567449ac0f671ecd61ed -rc8de9dc4cb679628ac9c0c9551bc43ad3c415d4a --- unittests/tst_views.cpp (.../tst_views.cpp) (revision 695e95aa2ec5e6e1c395567449ac0f671ecd61ed) +++ unittests/tst_views.cpp (.../tst_views.cpp) (revision c8de9dc4cb679628ac9c0c9551bc43ad3c415d4a) @@ -20,7 +20,6 @@ #include "VTreatmentAdjustmentResponseBase.h" #include "VTreatmentAdjustmentUltrafiltrationState.h" #include "FileHandler.h" -#include "VTreatmentBegin.h" #include "VPreTreatmentDisposablesPrimeData.h" #include "VAlarmStatus.h" @@ -816,12 +815,3 @@ QVERIFY(obj != readObj); } - -void tst_views::VTreatmentBegin_continue() -{ - View::VTreatmentBegin view; - view.continueEnabled(false); - QCOMPARE(view.continueEnabled(), false); - view.doUserModifiedParameters(); - QCOMPARE(view.continueEnabled(), true); -} Index: unittests/tst_views.h =================================================================== diff -u -r96854524927f212c24b9e4a253baeff2e672228f -rc8de9dc4cb679628ac9c0c9551bc43ad3c415d4a --- unittests/tst_views.h (.../tst_views.h) (revision 96854524927f212c24b9e4a253baeff2e672228f) +++ unittests/tst_views.h (.../tst_views.h) (revision c8de9dc4cb679628ac9c0c9551bc43ad3c415d4a) @@ -47,6 +47,4 @@ void VCreateTreatment_fw_validation_response(); void VCreateTreatment_load_parameter_ranges(); void VCreateTreatment_check_init(); - - void VTreatmentBegin_continue(); };