Index: leahi.pro =================================================================== diff -u -r3c543158a4f8165fe878b59e5d09ea82e06c53f5 -r3454906bbb35aa2976572145068980bf691daf1c --- leahi.pro (.../leahi.pro) (revision 3c543158a4f8165fe878b59e5d09ea82e06c53f5) +++ leahi.pro (.../leahi.pro) (revision 3454906bbb35aa2976572145068980bf691daf1c) @@ -177,6 +177,7 @@ sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.h \ sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.h \ sources/model/td/adjustment/settings/MTDAdvancedInstitutionalRecordResponse.h \ + sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.h \ sources/model/td/data/MTDAirBubbleData.h \ sources/model/td/data/MTDAirPumpData.h \ @@ -248,6 +249,7 @@ sources/view/fp/data/VFPTemperatureData.h \ sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.h \ sources/view/settings/VAdvancedInstitutionalRecord.h \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.h \ sources/view/td/data/VTDAirBubbleData.h \ sources/view/td/data/VTDAirPumpData.h \ sources/view/td/data/VTDAirTrapData.h \ @@ -540,6 +542,7 @@ sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.cpp \ sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.cpp \ sources/model/td/adjustment/settings/MTDAdvancedInstitutionalRecordResponse.cpp \ + sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.cpp \ sources/model/td/data/MTDAirBubbleData.cpp \ sources/model/td/data/MTDAirPumpData.cpp \ sources/model/td/data/MTDAirTrapData.cpp \ @@ -726,6 +729,7 @@ \ # ---------- Views - TD - States Data sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.cpp \ sources/view/settings/VAdvancedInstitutionalRecord.cpp \ + sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.cpp \ sources/view/td/data/VTDAirBubbleData.cpp \ sources/view/td/data/VTDAirPumpData.cpp \ sources/view/td/data/VTDAirTrapData.cpp \ Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -r3c543158a4f8165fe878b59e5d09ea82e06c53f5 -r3454906bbb35aa2976572145068980bf691daf1c --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 3c543158a4f8165fe878b59e5d09ea82e06c53f5) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 3454906bbb35aa2976572145068980bf691daf1c) @@ -144,6 +144,7 @@ #include "VTreatmentAdjustmentRinseback.h" #include "VTreatmentAdjustmentRecirculate.h" #include "VTreatmentAdjustmentPressuresLimits.h" +#include "VTreatmentAdjustmentPressuresWidening.h" #include "VTreatmentAdjustmentBloodFlowRate.h" #include "VTreatmentAdjustmentBolusVolume.h" #include "VTreatmentAdjustmentDialysateFlowRate.h" Index: sources/gui/qml/main.qml =================================================================== diff -u -r3c543158a4f8165fe878b59e5d09ea82e06c53f5 -r3454906bbb35aa2976572145068980bf691daf1c --- sources/gui/qml/main.qml (.../main.qml) (revision 3c543158a4f8165fe878b59e5d09ea82e06c53f5) +++ sources/gui/qml/main.qml (.../main.qml) (revision 3454906bbb35aa2976572145068980bf691daf1c) @@ -141,6 +141,7 @@ import VTreatmentAdjustmentUltrafiltrationEdit 0.1 import VTreatmentAdjustmentUltrafiltrationConfirm 0.1 import VTreatmentAdjustmentPressuresLimits 0.1 +import VTreatmentAdjustmentPressuresWidening 0.1 import VTreatmentAdjustmentSaline 0.1 import VTreatmentAdjustmentVitals 0.1 import VTreatmentAdjustmentHeparin 0.1 @@ -313,6 +314,7 @@ VTreatmentAdjustmentUltrafiltrationEdit { id: vTreatmentAdjustmentUltrafiltrationEdit } VTreatmentAdjustmentUltrafiltrationConfirm { id: vTreatmentAdjustmentUltrafiltrationConfirm } VTreatmentAdjustmentPressuresLimits { id: vTreatmentAdjustmentPressuresLimits } + VTreatmentAdjustmentPressuresWidening { id: vTreatmentAdjustmentPressuresWidening } VTreatmentAdjustmentHeparin { id: vTreatmentAdjustmentHeparin } VTreatmentAdjustmentRinseback { id: vTreatmentAdjustmentRinseback } VTreatmentAdjustmentRecirculate { id: vTreatmentAdjustmentRecirculate } Index: sources/gui/qml/pages/treatment/TreatmentHome.qml =================================================================== diff -u -r45ce5cd058a8d0239d486e0ab4b057731f7dba76 -r3454906bbb35aa2976572145068980bf691daf1c --- sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision 45ce5cd058a8d0239d486e0ab4b057731f7dba76) +++ sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision 3454906bbb35aa2976572145068980bf691daf1c) @@ -128,14 +128,6 @@ height : 60 visible : ! _alarmBar.visible && text - property int source: -1 - - onTextChanged: { - if (text === "") { - source = -1 - } - } - CloseButton { id: _dismissButton objectName: "_dismissButton" anchors { @@ -153,45 +145,47 @@ Connections { target: vTreatmentAdjustmentBloodFlowRate function onAdjustmentTriggered ( vValue ) { if (vTreatmentAdjustmentBloodFlowRate.adjustment_Accepted) { - if (_notification.source === 0) { - _notification.text = "" - } + _notification.text = "" } else { _notification.text = vTreatmentAdjustmentBloodFlowRate.text() - _notification.source = 0 } } } Connections { target: vTreatmentAdjustmentDialysateFlowRate function onAdjustmentTriggered ( vValue ) { if (vTreatmentAdjustmentDialysateFlowRate.adjustment_Accepted) { - if (_notification.source === 1) { - _notification.text = "" - } + _notification.text = "" } else { _notification.text = vTreatmentAdjustmentDialysateFlowRate.text() - _notification.source = 1 } } } Connections { target: vTreatmentAdjustmentDialysateTemperature function onAdjustmentTriggered ( vValue ) { if (vTreatmentAdjustmentDialysateTemperature.adjustment_Accepted) { - if (_notification.source === 2) { - _notification.text = "" - } + _notification.text = "" } else { _notification.text = vTreatmentAdjustmentDialysateTemperature.text() - _notification.source = 2 } } } + Connections { target: vTreatmentAdjustmentPressuresWidening + function onAdjustmentTriggered ( vValue ) { + if (vTreatmentAdjustmentPressuresWidening.adjustment_Accepted) { + _notification.text = "" + } + else { + _notification.text = vTreatmentAdjustmentPressuresWidening.text() + } + } + } + onVisibleChanged: { if (visible) { _mainMenu.hidden = true Index: sources/view/VView.h =================================================================== diff -u -r3c543158a4f8165fe878b59e5d09ea82e06c53f5 -r3454906bbb35aa2976572145068980bf691daf1c --- sources/view/VView.h (.../VView.h) (revision 3c543158a4f8165fe878b59e5d09ea82e06c53f5) +++ sources/view/VView.h (.../VView.h) (revision 3454906bbb35aa2976572145068980bf691daf1c) @@ -235,6 +235,7 @@ REGISTER_TYPE( VTreatmentAdjustmentRecirculate ) \ REGISTER_TYPE( VTreatmentAdjustmentEnd ) \ REGISTER_TYPE( VTreatmentAdjustmentPressuresLimits ) \ + REGISTER_TYPE( VTreatmentAdjustmentPressuresWidening ) \ REGISTER_TYPE( VTreatmentAdjustmentBloodFlowRate ) \ REGISTER_TYPE( VTreatmentAdjustmentBolusVolume ) \ REGISTER_TYPE( VTreatmentAdjustmentDialysateFlowRate ) \