Index: denali.pro.user =================================================================== diff -u -r388ecba67cdd4402c04df9516b44d714745eef7e -ra3a8ae19d678d29179cc493df9de5b630185063b --- denali.pro.user (.../denali.pro.user) (revision 388ecba67cdd4402c04df9516b44d714745eef7e) +++ denali.pro.user (.../denali.pro.user) (revision a3a8ae19d678d29179cc493df9de5b630185063b) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -ra3a8ae19d678d29179cc493df9de5b630185063b --- sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision a3a8ae19d678d29179cc493df9de5b630185063b) @@ -36,6 +36,7 @@ signal disposablesRemovalBack () PostTreatmentBase { id: _patientDisconnectionConfirm + objectName :"_patientDisconnectionConfirm" property int stackStepIndex : 0 header.confirmVisible : true title.text : qsTr("Patient Disconnection") @@ -44,6 +45,7 @@ } PostTreatmentReview { id: _treatmentReviewConfirm + objectName :"_treatmentReviewConfirm" property int stackStepIndex : 1 header.confirmVisible : true title.text : qsTr("Treatment Review") @@ -56,13 +58,15 @@ } PostTreatmentBase { id: _detailTest + objectName :"_detailTest" property int stackStepIndex : 1 onBackClicked : pop() header.backVisible : true header.confirmVisible : false } PostTreatmentBase { id: _disposablesRemovalConfirm + objectName :"_disposablesRemovalConfirm" property int stackStepIndex : 2 header. backVisible : true header.confirmVisible : true Index: sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml =================================================================== diff -u -red9ea343a2a22623796045d9e1229a2cbfa8c970 -ra3a8ae19d678d29179cc493df9de5b630185063b --- sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml (.../PreTreatmentDisposablesStack.qml) (revision ed9ea343a2a22623796045d9e1229a2cbfa8c970) +++ sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml (.../PreTreatmentDisposablesStack.qml) (revision a3a8ae19d678d29179cc493df9de5b630185063b) @@ -35,6 +35,7 @@ readonly property bool hasHeparin : vTreatmentCreate.heparinBolusVolume || vTreatmentCreate.heparinDispensingRate PreTreatmentBase { id: _preTreatmentDisposablesSelfTest + objectName :"_preTreatmentDisposablesSelfTest" title.text : qsTr("System Self Test") hasTimeCircle : true timeCircleMinimum : 0 @@ -44,6 +45,7 @@ } PreTreatmentBase { id: _preTreatmentDisposablesCartridgeInstallation + objectName :"_preTreatmentDisposablesCartridgeInstallation" title.text : qsTr("Cartridge Installation") header.confirmVisible : true header.confirmText.text : qsTr("NEXT") @@ -52,6 +54,7 @@ } PreTreatmentBase { id: _preTreatmentDisposablesCartridgeConnetion + objectName :"_preTreatmentDisposablesCartridgeConnetion" function page_confirm() { if ( _root.hasHeparin ) page( _preTreatmentDisposablesHeparinSyringe ) else page( _preTreatmentDisposablesSalineBag ) @@ -67,6 +70,7 @@ } PreTreatmentBase { id: _preTreatmentDisposablesHeparinSyringe + objectName :"_preTreatmentDisposablesHeparinSyringe" title.text : qsTr("Heparin Syringe") header.backVisible : true header.confirmVisible : true @@ -77,6 +81,7 @@ } PreTreatmentBase { id: _preTreatmentDisposablesSalineBag + objectName :"_preTreatmentDisposablesSalineBag" function page_back() { if ( _root.hasHeparin ) page( _preTreatmentDisposablesHeparinSyringe ) else page( _preTreatmentDisposablesCartridgeConnetion ) Index: sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -ra3a8ae19d678d29179cc493df9de5b630185063b --- sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml (.../PreTreatmentPrimeStack.qml) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml (.../PreTreatmentPrimeStack.qml) (revision a3a8ae19d678d29179cc493df9de5b630185063b) @@ -35,6 +35,7 @@ signal startPrimeClicked() PreTreatmentBase { id: _preTreatmentDrySelfTest + objectName :"_preTreatmentDrySelfTest" header.confirmVisible : false // state change is immediate after test completed header.confirmEnabled : vPreTreatmentStates.selfTestDry_complete isComplete : vPreTreatmentStates.selfTestDry_complete @@ -58,6 +59,7 @@ } PreTreatmentBase { id: _preTreatmentDisposablesPrime + objectName :"_preTreatmentDisposablesPrime" header.confirmVisible : true header.confirmText.text : qsTr("CONTINUE") header.confirmEnabled : _preTreatmentDisposablesPrime.isComplete Index: sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -ra3a8ae19d678d29179cc493df9de5b630185063b --- sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml (.../PreTreatmentStack.qml) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml (.../PreTreatmentStack.qml) (revision a3a8ae19d678d29179cc493df9de5b630185063b) @@ -32,21 +32,21 @@ property int stackStepIndex : 0 - PreTreatmentWaterSampleStack{ id: _preTreatmentWaterSampleStack } - PreTreatmentConsumablesStack{ id: _preTreatmentConsumablesStack } - PreTreatmentDisposablesStack{ id: _preTreatmentDisposablesStack } - PreTreatmentPrimeStack { id: _pretreatmentPrimeStack } - PreTreatmentConnectionStack { id: _pretreatmentConnectionStack } + PreTreatmentWaterSampleStack{ id: _preTreatmentWaterSampleStack ;objectName: "_preTreatmentWaterSampleStack" } + PreTreatmentConsumablesStack{ id: _preTreatmentConsumablesStack ;objectName: "_preTreatmentConsumablesStack" } + PreTreatmentDisposablesStack{ id: _preTreatmentDisposablesStack ;objectName: "_preTreatmentDisposablesStack" } + PreTreatmentPrimeStack { id: _pretreatmentPrimeStack ;objectName: "_pretreatmentPrimeStack " } + PreTreatmentConnectionStack { id: _pretreatmentConnectionStack ;objectName: "_pretreatmentConnectionStack " } Connections { target: vPreTreatmentStates onStartChanged : {} onWaterSampleChanged : { page( _preTreatmentWaterSampleStack , vwaterSample )} onSelfTestConsumablesChanged: { page( _preTreatmentConsumablesStack , vselfTestConsumables )} onSelfTestNoCartridgeChanged: { page( _preTreatmentDisposablesStack , vselfTestNoCartridge )} - onInstallationChanged : { console.debug("vinstallation ", vinstallation )} + onInstallationChanged : { page( _preTreatmentDisposablesStack , vinstallation )} // DEBUG: Experimental : console.debug("vinstallation " onSelfTestDryChanged : { page( _pretreatmentPrimeStack , vselfTestDry )} - onPrimeChanged : { console.debug("vprime ", vprime )} - onRecirculateChanged : { console.debug("vrecirculate ", vrecirculate )} + onPrimeChanged : { page( _pretreatmentPrimeStack , vprime )} // DEBUG: Experimental : console.debug("vprime " + onRecirculateChanged : { page( _pretreatmentPrimeStack , vrecirculate )} // DEBUG: Experimental : console.debug("vrecirculate " onPatientConnectionChanged : { page( _pretreatmentConnectionStack , vpatientConnection )} } Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r1c23a7f4c576dd70c2bfb94a85af470b7d641f1e -ra3a8ae19d678d29179cc493df9de5b630185063b --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 1c23a7f4c576dd70c2bfb94a85af470b7d641f1e) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision a3a8ae19d678d29179cc493df9de5b630185063b) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 25-Feb-2022 + * \date (last) 28-Feb-2022 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 *