Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rc1d0546e2d1a51ff919b2172ce647003359f0853 -r63d2d3c26b9e1cfda1aa8a81610b8ef08f9d2bdb --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision c1d0546e2d1a51ff919b2172ce647003359f0853) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 63d2d3c26b9e1cfda1aa8a81610b8ef08f9d2bdb) @@ -165,7 +165,7 @@ ID_DGFilterFlushData = 0x600F, // ?? //// ----- @CRAPIZED: had to change to avoid duplication ID_AdjustWaterSampleReq = 0x5D00, // 93 ID_AdjustWaterSampleRsp = 0x5E00, // 94 - ID_AdjustWaterSampleResultReq = 0x5F00, // 95 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response + ID_AdjustWaterSampleResultReq = 0x5F0F, // 95 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response // Pre-Treatment Consumables Installation Confirm ID_AdjustConsumablesConfirmReq = 0x6800, // 104 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response // Pre-Treatment SelfTest NoCartridge Progress Data @@ -235,11 +235,11 @@ ID_AdjustPressuresLimitsReq = 0x4600, // 70 ID_AdjustPressuresLimitsRsp = 0x4700, // 71 - ID_AdjustSalineReq = 0x5E00, // 94 - ID_AdjustSalineRsp = 0x5F00, // 95 + ID_AdjustSalineReq = 0x5F00, // 94 + ID_AdjustSalineRsp = 0x6000, // 95 - ID_AdjustVitalsReq = 0x4321, // TESTING -- UPDATE WITH ACTUAL - ID_AdjustVitalsRsp = 0x1234, // TESTING -- UPDATE WITH ACTUAL + ID_AdjustVitalsReq = 0x9700, // 151 TESTING -- UPDATE WITH ACTUAL + ID_AdjustVitalsRsp = 0x9800, // 152 TESTING -- UPDATE WITH ACTUAL ID_AdjustHeparinReq = 0x4B00, // 75 ID_AdjustHeparinRsp = 0x4C00, // 76 Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml =================================================================== diff -u -r23121e17d1a6120ae4a31930e18de362d9533bcb -r63d2d3c26b9e1cfda1aa8a81610b8ef08f9d2bdb --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision 23121e17d1a6120ae4a31930e18de362d9533bcb) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision 63d2d3c26b9e1cfda1aa8a81610b8ef08f9d2bdb) @@ -48,7 +48,7 @@ notificationText = notificationTextString vTreatmentVitals.doTimerStop() - vTreatmentAdjustmentVitals.doRequest() ///trjhrtjr + vTreatmentAdjustmentVitals.doRequest() ///REMOVE ONLY FOR TESTING MESSAGE } onClosed: vTreatmentVitals.doTimerStart() @@ -84,18 +84,22 @@ _headerBar.vitalsRecorded() } else { - print("**** vTreatmentAdjustmentVitals.doRequest() ") - vTreatmentAdjustmentVitals.doRequest() - } + } + } + Connections { target: vTreatmentAdjustmentVitals + function onAdjustmentTriggered ( vValue ) { + if ( vTreatmentAdjustmentVitals.adjustment_Accepted ) { + // read data + print("**** vTreatmentAdjustmentVitals.adjustment_Accepte ") - if ( vTreatmentVitals.enableDialog ) { - print("**** vTreatmentVitals.enableDialog " + vTreatmentVitals.enableDialog) -// _root.update ( vSystolic, vDiastolic, vHeartRate ) -// _root.open () } + else { + notificationText = qsTr("Rejected Reason: %1").arg(vTreatmentAdjustmentVitals.adjustment_ReasonText) + if ( vTreatmentVitals.enableDialog ) { _root.open () } + } } } Index: sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp =================================================================== diff -u -r31b1e7a5d69f014398827e16286f28515cd60e35 -r63d2d3c26b9e1cfda1aa8a81610b8ef08f9d2bdb --- sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp (.../VCommonAdjustmentVitals.cpp) (revision 31b1e7a5d69f014398827e16286f28515cd60e35) +++ sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp (.../VCommonAdjustmentVitals.cpp) (revision 63d2d3c26b9e1cfda1aa8a81610b8ef08f9d2bdb) @@ -39,7 +39,7 @@ update (vData.mSystolic, vData.mDiastolic, vData.mHeartRate); emit didTrigger(vData.mSystolic, vData.mDiastolic, vData.mHeartRate); - qDebug() << tr("**************8Vital received,%1,%2,%3") + qDebug() << tr("**************Vital received,%1,%2,%3") .arg(vData.mSystolic ) .arg(vData.mDiastolic) .arg(vData.mHeartRate); Index: sources/view/td/adjustment/treatment/VTreatmentAdjustmentVitals.cpp =================================================================== diff -u -r31b1e7a5d69f014398827e16286f28515cd60e35 -r63d2d3c26b9e1cfda1aa8a81610b8ef08f9d2bdb --- sources/view/td/adjustment/treatment/VTreatmentAdjustmentVitals.cpp (.../VTreatmentAdjustmentVitals.cpp) (revision 31b1e7a5d69f014398827e16286f28515cd60e35) +++ sources/view/td/adjustment/treatment/VTreatmentAdjustmentVitals.cpp (.../VTreatmentAdjustmentVitals.cpp) (revision 63d2d3c26b9e1cfda1aa8a81610b8ef08f9d2bdb) @@ -29,7 +29,7 @@ { adjustment_Accepted ( vData.mAccepted ); adjustment_Reason ( vData.mReason ); - + qDebug() << __FUNCTION__ << adjustment_Accepted << adjustment_Reason; // *** has to be the last to let the information to be set and then emit the signal *** // *** otherwise will use the previous values before being set. *** adjustment ( true ); @@ -41,7 +41,6 @@ */ void View::VTreatmentAdjustmentVitals::doRequest() { - qDebug() << "View::VTreatmentAdjustmentVitals::doRequest()"; AdjustVitalsRequestData data; emit didAdjustment(data); }