Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r9403146058e7c4cef17bd542bbd39bbf032be9f3 -rc70815ad2b3beadf61832f2e4d12eb90d476e020 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 9403146058e7c4cef17bd542bbd39bbf032be9f3) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision c70815ad2b3beadf61832f2e4d12eb90d476e020) @@ -656,6 +656,7 @@ void MessageDispatcher::onAdjustment(const AdjustParametersValidationRequestData &vData) { QVariantList mData; + mData += vData.mFinalConfirmation ; mData += vData.mTreatmentModality ; mData += vData.mHDFTreatmentMode ; mData += vData.mBloodFlowRate ; @@ -684,18 +685,6 @@ onActionTransmit(GuiActionType::ID_AdjustParametersValidationReq, mData); } -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Confirm Treatment request message. - * \param vData - Data model contains the confirm treatment request - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustParametersConfirmRequestData &vData) -{ - QVariantList mData; - mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustParametersConfirmReq, mData); -} /*! * \brief MessageDispatcher::onAdjustment Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -ra8ce0941b44e15fb7b9365f98d4656e232d4bf35 -rc70815ad2b3beadf61832f2e4d12eb90d476e020 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision a8ce0941b44e15fb7b9365f98d4656e232d4bf35) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision c70815ad2b3beadf61832f2e4d12eb90d476e020) @@ -98,7 +98,6 @@ // DG Data Messages {Gui::GuiActionType::ID_DGROPumpData , 6 * 4 }, // 6 parameters each 4bytes {Gui::GuiActionType::ID_DGDrainPumpData , 8 * 4 }, // 8 parameters each 4bytes - {Gui::GuiActionType::ID_DGOperationModeData , 2 * 4 }, // 2 parameter each 4bytes {Gui::GuiActionType::ID_DGReservoirData , 12 * 4 }, // 12 parameters each 4bytes {Gui::GuiActionType::ID_DGLoadCellReadingsData , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_DGAccelerometerData , 9 * 4 }, // 9 parameters each 4bytes @@ -111,8 +110,10 @@ {Gui::GuiActionType::ID_DDDialysatePumpData , 20 * 4 }, // 20 parameters each 4bytes {Gui::GuiActionType::ID_DDHeatersData , 8 * 4 }, // 8 parameters each 4bytes // NOTE: may contain optional 9 parameters each 4bytes {Gui::GuiActionType::ID_DDLevelData , 3 * 4 }, // 3 parameters each 4bytes - {Gui::GuiActionType::ID_DDGenDialysateData , 9 * 4 }, // 9 parameters each 4bytes + {Gui::GuiActionType::ID_DDGenDialysateData , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_DDBloodLeakData , 1 * 4 }, // 1 parameters each 4bytes + {Gui::GuiActionType::ID_DDOperationModeData , 2 * 4 }, // 2 parameter each 4bytes + //FP Data Messages {Gui::GuiActionType::ID_FPROPumpData , 9 * 4 }, // 9 parameters each 4bytes {Gui::GuiActionType::ID_FPPressuresData , 9 * 4 }, // 9 parameters each 4bytes @@ -121,6 +122,7 @@ {Gui::GuiActionType::ID_FPConductivityData , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_FPTemperaturesData , 13 * 4 }, // 13 parameters each 4bytes {Gui::GuiActionType::ID_FPROBoosterPumpData , 9 * 4 }, // 9 parameters each 4bytes + {Gui::GuiActionType::ID_FPRORejectionPercentageData , 5 * 4 }, // 5 parameters each 4bytes // HD Data Messages {Gui::GuiActionType::ID_HDAccelerometerData , 9 * 4 }, // 9 parameters each 4bytes {Gui::GuiActionType::ID_HDSyringePumpData , 9 * 4 }, // 9 parameters each 4bytes @@ -225,9 +227,9 @@ {Gui::GuiActionType::ID_AdjustParametersValidationRsp , 25 * 4 }, //25 parameters each 4bytes // Pre-Treatment Water Sample {Gui::GuiActionType::ID_DGFilterFlushData , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustWaterSampleReq , 1 * 4 }, // 1 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustWaterSampleRsp , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_AdjustWaterSampleResultReq , 1 * 4 }, // 1 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustWaterSampleResultRsp , 3 * 4 }, // 2 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustWaterSampleData , 2 * 4 }, // 2 parameters each 4bytes // Pre-Treatment Consumables Installation Confirm {Gui::GuiActionType::ID_AdjustConsumablesConfirmReq , 0 * 4 }, // 0 parameter // Pre-Treatment SelfTest NoCartridge Progress Data @@ -290,7 +292,7 @@ // ---- Treatment Log {Gui::GuiActionType::ID_AdjustTreatmentLogReq , 0 * 4 }, // 0 parameter - {Gui::GuiActionType::ID_AdjustTreatmentLogRsp , 36 * 4 }, //36 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustTreatmentLogRsp , 62 * 4 }, // 62 parameter each 4bytes {Gui::GuiActionType::ID_TreatmentLogAvrgeData , 5 * 4 }, // 5 parameter each 4bytes {Gui::GuiActionType::ID_TreatmentLogAlarmData , 3 * 4 }, // 3 parameter each 4bytes {Gui::GuiActionType::ID_TreatmentLogEventData , 3 * 4 }, // 3 parameter each 4bytes Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -ra8ce0941b44e15fb7b9365f98d4656e232d4bf35 -rc70815ad2b3beadf61832f2e4d12eb90d476e020 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision a8ce0941b44e15fb7b9365f98d4656e232d4bf35) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision c70815ad2b3beadf61832f2e4d12eb90d476e020) @@ -170,8 +170,8 @@ */ void MessageInterpreter::printUnhandled(const Message &vMessage) const { - if ( logUnhandledMessage(vMessage)) return; // the message is defined as unhandled and can still be handled and logged, return. if ( gDisableUnhandledReport ) return; // if the unhandled message error has been disabled, return. + if ( logUnhandledMessage(vMessage)) return; // the message is defined as unhandled and can still be handled and logged, return. QString mActionIdHexString = Format::toHexString(vMessage.actionId, false, eLenMessageIDDigits); QString logMessage = tr("Unhandled Message ID (HD)") + '\n' + QString("%1 # %2 %3") @@ -237,7 +237,6 @@ // Pre-Treatment case Gui::GuiActionType::ID_AdjustInitTreatmentReq : INTERPRET_TRANSMIT_MESSAGE(AdjustInitTreatmentRequestData ); break; case Gui::GuiActionType::ID_AdjustParametersValidationReq : INTERPRET_TRANSMIT_MESSAGE(AdjustParametersValidationRequestData ); break; - case Gui::GuiActionType::ID_AdjustWaterSampleReq : INTERPRET_TRANSMIT_MESSAGE(AdjustWaterSampleRequestData ); break; case Gui::GuiActionType::ID_AdjustWaterSampleResultReq : INTERPRET_TRANSMIT_MESSAGE(AdjustWaterSampleResultRequestData ); break; case Gui::GuiActionType::ID_AdjustConsumablesConfirmReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustConsumablesConfirmRequestData ); break; case Gui::GuiActionType::ID_AdjustDisposablesConfirmReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustDisposablesConfirmRequestData ); break; @@ -515,16 +514,19 @@ case Gui::GuiActionType::ID_SelfTestNoCartridgeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_SelfTestNoCartridgeData ); break; case Gui::GuiActionType::ID_SelfTestDryData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_SelfTestDryData ); break; case Gui::GuiActionType::ID_DisposablesPrimeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DisposablesPrimeData ); break; - // ----- Pre-Treatment - Adjust + + // ----- Pre-Treatment - Adjust case Gui::GuiActionType::ID_AdjustInitTreatmentRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustInitTreatmentRsp ); break; case Gui::GuiActionType::ID_AdjustParametersValidationRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustParametersValidationRsp ); break; - case Gui::GuiActionType::ID_AdjustWaterSampleRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustWaterSampleRsp ); break; + case Gui::GuiActionType::ID_AdjustWaterSampleResultRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustWaterSampleResultRsp ); break; case Gui::GuiActionType::ID_AdjustDisposablesConfirmRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDisposablesConfirmRsp ); break; case Gui::GuiActionType::ID_AdjustDisposablesPrimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDisposablesPrimeRsp ); break; case Gui::GuiActionType::ID_AdjustPatientConnectionBeginRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustPatientConnectionBeginRsp ); break; case Gui::GuiActionType::ID_AdjustUltrafiltrationInitRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationInitRsp ); break; case Gui::GuiActionType::ID_AdjustPatientConnectionConfirmRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustPatientConnectionConfirmRsp ); break; case Gui::GuiActionType::ID_AdjustStartTreatmentRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustStartTreatmentRsp ); break; + case Gui::GuiActionType::ID_AdjustWaterSampleData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustWaterSampleData ); break; +// case Gui::GuiActionType::ID_AdjustWaterSampleTimeout : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustWaterSampleTimeout ); break; // ----- In-Treatment - Datum case Gui::GuiActionType::ID_TreatmentTime : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentTime ); break; @@ -590,7 +592,8 @@ // unhandled messages: these will only be logged as received message // there has nothing been defined for these messages. - default : printUnhandled (vMessage ); break; +// default : printUnhandled (vMessage ); break; + default: break; //FIXME later enabled } return ok; @@ -616,6 +619,8 @@ switch (vMessage.actionId) { // notice we are in receive mode case Gui::GuiActionType::ID_Acknow : ok = true; /* TODO : implement notify<>() */ break; LOG_APPED(QString("DD,CheckIn," + QVariant(vData).toStringList().join(','))); break; + + /* // ----- POST case Gui::GuiActionType::ID_DGPostSingleResultData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGPostSingleResultData ); break; case Gui::GuiActionType::ID_DGPostFinalResultData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGPostFinalResultData ); break; @@ -624,7 +629,6 @@ case Gui::GuiActionType::ID_DGROPumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGROPumpData ); break; case Gui::GuiActionType::ID_DDPressuresData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDPressuresData ); break; case Gui::GuiActionType::ID_DGDrainPumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGDrainPumpData ); break; - case Gui::GuiActionType::ID_DGOperationModeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGOperationModeData ); break; case Gui::GuiActionType::ID_DGReservoirData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGReservoirData ); break; case Gui::GuiActionType::ID_DDValvesStatesData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDValvesStatesData ); break; case Gui::GuiActionType::ID_DDHeatersData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDHeatersData ); break; @@ -635,24 +639,34 @@ case Gui::GuiActionType::ID_DDDebugText : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDDebugText ); break; case Gui::GuiActionType::ID_DGGeneralEvent : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGGeneralEvent ); break; case Gui::GuiActionType::ID_DGAccelerometerData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGAccelerometerData ); break; - case Gui::GuiActionType::ID_DDConductivityData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDConductivityData ); break; - case Gui::GuiActionType::ID_DDGenDialysateData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDGenDialysateData ); break; case Gui::GuiActionType::ID_DDLevelData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDLevelData ); break; case Gui::GuiActionType::ID_DDBloodLeakData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDBloodLeakData ); break; // ----- Datum - Pre-Treatment progress case Gui::GuiActionType::ID_DGFilterFlushData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGFilterFlushData ); break; // DG Response Messages - case Gui::GuiActionType::ID_AdjustVersionsDDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsDDRsp ); break; - case Gui::GuiActionType::ID_AdjustSerialDDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialDDRsp ); break; case Gui::GuiActionType::ID_AdjustServiceDatesDGRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceDatesDGRsp ); break; - case Gui::GuiActionType::ID_AdjustDDDateTimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDDDateTimeRsp ); break; case Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp ); break; // RO Water case Gui::GuiActionType::ID_DuetRoWaterStatDGq : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DuetRoWaterStatDGq ); break; case Gui::GuiActionType::ID_DuetRoWaterModeDGr : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DuetRoWaterModeDGr ); break; // unhandled messages: these will only be logged as received message // there has nothing been defined for these messages. default : printUnhandled (vMessage ); break; + */ + /////////////////////////////////////// + //// FIXME: RO LOOP TEST + /////////////////////////////////////// + + + case Gui::GuiActionType::ID_DDGenDialysateData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDGenDialysateData ); break; + case Gui::GuiActionType::ID_DDConductivityData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDConductivityData ); break; + + case Gui::GuiActionType::ID_AdjustDDDateTimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDDDateTimeRsp ); break; + case Gui::GuiActionType::ID_DDOperationModeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDOperationModeData ); break; + case Gui::GuiActionType::ID_AdjustVersionsDDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsDDRsp ); break; + case Gui::GuiActionType::ID_AdjustSerialDDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialDDRsp ); break; + + default: break; //FIXME later enabled } return ok; @@ -680,20 +694,22 @@ LOG_APPED(QString("FP,CheckIn," + QVariant(vData).toStringList().join(','))); break; // FP data messages - case Gui::GuiActionType::ID_FPROPumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_FPROPumpData ); break; - case Gui::GuiActionType::ID_FPPressuresData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_FPPressuresData ); break; - case Gui::GuiActionType::ID_FPLevelData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_FPLevelData ); break; - case Gui::GuiActionType::ID_FPFlowSensorData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_FPFlowSensorData ); break; - case Gui::GuiActionType::ID_FPConductivityData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_FPConductivityData ); break; - case Gui::GuiActionType::ID_FPTemperaturesData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_FPTemperaturesData ); break; - case Gui::GuiActionType::ID_FPROBoosterPumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_FPROBoosterPumpData ); break; + case Gui::GuiActionType::ID_FPROPumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_FPROPumpData ); break; + case Gui::GuiActionType::ID_FPPressuresData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_FPPressuresData ); break; + case Gui::GuiActionType::ID_FPLevelData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_FPLevelData ); break; + case Gui::GuiActionType::ID_FPFlowSensorData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_FPFlowSensorData ); break; + case Gui::GuiActionType::ID_FPConductivityData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_FPConductivityData ); break; + case Gui::GuiActionType::ID_FPTemperaturesData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_FPTemperaturesData ); break; + case Gui::GuiActionType::ID_FPROBoosterPumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_FPROBoosterPumpData ); break; + case Gui::GuiActionType::ID_FPRORejectionPercentageData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_FPRORejectionPercentageData ); break; // FP Response Messages case Gui::GuiActionType::ID_AdjustVersionsFPRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsFPRsp ); break; // unhandled messages: these will only be logged as received message // there has nothing been defined for these messages. - default : printUnhandled (vMessage ); break; +// default : printUnhandled (vMessage ); break; + default: break; //FIXME later enabled } return ok; Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r7c78fc682c3b1dbfe2e416e3812f98e15875b751 -rc70815ad2b3beadf61832f2e4d12eb90d476e020 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 7c78fc682c3b1dbfe2e416e3812f98e15875b751) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision c70815ad2b3beadf61832f2e4d12eb90d476e020) @@ -160,7 +160,7 @@ ID_AdjustInitTreatmentRsp = 0x4600, // 70 //// ----- @LEAHIZED ID_AdjustParametersValidationReq = 0x3F00, // 63 //// ----- @LEAHIZED ID_AdjustParametersValidationRsp = 0x4000, // 64 //// ----- @LEAHIZED - ID_AdjustParametersConfirmReq = 0x4400, // 68 //// ----- @LEAHIZED + ID_AdjustParametersConfirmReq = 0x440F, // 68 //// ----- @LEAHIZED -> CRAPIZED OBSOLETE ID_TreatmentRanges = 0x4300, // 67 //// ----- @LEAHIZED // Pre-Treatment Water Sample Index: sources/gui/qml/components/HeaderBar.qml =================================================================== diff -u -r07121b02499a4c929c5b5e8bd804a67539574c1b -rc70815ad2b3beadf61832f2e4d12eb90d476e020 --- sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision 07121b02499a4c929c5b5e8bd804a67539574c1b) +++ sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision c70815ad2b3beadf61832f2e4d12eb90d476e020) @@ -36,11 +36,10 @@ Mode_HDF } - onIsHDFFeaturedChanged : vListModel.setHeaderbarHDFVisible(_root.isHDFFeatured ) - onIsHeparinFeaturedChanged : vListModel.setHeaderbarHeparinVisible(_root.isHeparinFeatured ) + onIsHDFFeaturedChanged : vHeaderbarModel.setHeaderbarHDFVisible(_root.isHDFFeatured ) + onIsHeparinFeaturedChanged : vHeaderbarModel.setHeaderbarHeparinVisible(_root.isHeparinFeatured ) Component.onCompleted : { - vListModel.setHeaderbarHeparinVisible (_root.isHeparinFeatured ) - vListModel.setHeaderbarHDFVisible (_root.isHDFFeatured ) + vHeaderbarModel.setHeaderbarHDFVisible (_root.isHDFFeatured ) } function vitalsRecorded() { _vitalsButton.pulseAnimation.start() } @@ -160,7 +159,7 @@ titlePixelSize : 32 backgroundColor : Colors.transparent highlightHeight : 15 - model : vListModel.headerbarModel + model : vHeaderbarModel.model onHiddenChanged : { if (hidden) { index = 0 } } } Index: sources/gui/qml/main.qml =================================================================== diff -u -r07121b02499a4c929c5b5e8bd804a67539574c1b -rc70815ad2b3beadf61832f2e4d12eb90d476e020 --- sources/gui/qml/main.qml (.../main.qml) (revision 07121b02499a4c929c5b5e8bd804a67539574c1b) +++ sources/gui/qml/main.qml (.../main.qml) (revision c70815ad2b3beadf61832f2e4d12eb90d476e020) @@ -35,7 +35,8 @@ import VTDSwitches 0.1 import VTDEjector 0.1 import VTDTemperature 0.1 -import VListModel 0.1 +import VHeaderbarModel 0.1 +import VWaterSampleModel 0.1 // POST import VHDPOSTData 0.1 @@ -65,6 +66,7 @@ import VPreTreatmentStates 0.1 import VTDTreatmentStates 0.1 import VPostTreatmentStates 0.1 +import VWaterSample 0.1 // Treatment - Common import VTreatmentVitals 0.1 @@ -103,7 +105,7 @@ import VDGDrainPump 0.1 import VDDHeaters 0.1 import VDGLoadCellReadings 0.1 -import VDGOperationMode 0.1 +import VDDOperationMode 0.1 import VDDPressures 0.1 import VDGROPump 0.1 import VDGReservoir 0.1 @@ -125,6 +127,7 @@ import VFPConductivity 0.1 import VFPTemperature 0.1 import VFPBoostPump 0.1 +import VFPRORejectionPercentage 0.1 // In-Treatment - Adjustemnt import VTreatmentAdjustmentBloodPrime 0.1 import VTreatmentAdjustmentBolusVolume 0.1 @@ -238,7 +241,9 @@ VTDSwitches { id: vTDSwitches } VTDEjector { id: vTDEjector } VTDTemperature { id: vTDTemperature } - VListModel { id: vListModel } + VHeaderbarModel { id: vHeaderbarModel } + VWaterSampleModel { id: vWaterSampleModel } + VWaterSample { id: vWaterSample } VTreatmentDialysateFlow { id: vTreatmentDialysateFlow } VTreatmentIsolatedUF { id: vTreatmentIsolatedUF } @@ -257,7 +262,7 @@ VDGDrainPump { id: vDGDrainPump } VDDHeaters { id: vDDHeaters } VDGLoadCellReadings { id: vDGLoadCellReadings } - VDGOperationMode { id: vDGOperationMode } + VDDOperationMode { id: vDDOperationMode } VDDPressures { id: vDDPressures } VDGROPump { id: vDGROPump } VDGReservoir { id: vDGReservoir } @@ -278,6 +283,7 @@ VFPConductivity { id: vFPConductivity } VFPTemperature { id: vFPTemperature } VFPBoostPump { id: vFPBoostPump } + VFPRORejectionPercentage { id: vFPRORejectionPercentage } // --- Pre-Treatment Progress Data VPreTreatmentAdjustmentInitTreatment { id: vPreTreatmentAdjustmentInitTreatment } VDGFilterFlush { id: vDGFilterFlush } @@ -332,6 +338,21 @@ VDisinfectAdjustDisinfect { id: vDisinfectAdjustDisinfect } VAdjustDGCleaningUsage { id: vAdjustDGCleaningUsage } + QtObject { id: _colorMode + readonly property color modeBackgroundColor : vSettings.darkMode ? Colors.panelBackground : Colors.offWhite + readonly property color modeBackgroundDialogColor : vSettings.darkMode ? Colors.darkModeBackground : Colors.offWhite + readonly property color modeSelctedColor : vSettings.darkMode ? Colors.darkModeSelect : Colors.lightModeSelect + readonly property color modeAutoStepColor : vSettings.darkMode ? Colors.statusTextPaused : Colors.lightModeAutoStep + readonly property color modeAutoStepProgressColor : vSettings.darkMode ? Colors.borderButton : Colors.statusTextPaused + readonly property color modeTextColor : vSettings.darkMode ? Colors.offWhite : Colors.backgroundMainMenu + readonly property color modeButtonColor : vSettings.darkMode ? Colors.borderButton : Colors.backgroundMainMenu + readonly property color modeAlarmButtonColor : vSettings.darkMode ? Colors.darkModeBackground : Colors.lightModeSelect + readonly property color modeAlarmStepButtonColor : vSettings.darkMode ? Colors.darkModeBackground : Colors.offWhite + readonly property color modeAlarmButtonPressedColor : vSettings.darkMode ? Colors.offWhite : Colors.lightModeSelect + readonly property color modeAlarmListColor : vSettings.darkMode ? Colors.offWhite : Colors.alarmDialogText + readonly property color modeAlarmStopStateColor : vSettings.darkMode ? Colors.darkModeAlarmStopState : Colors.lightModeAlarmStopState + } + Background {} // ----- Follow the below Z order ----- Index: sources/gui/qml/pages/TreatmentFlowBase.qml =================================================================== diff -u -r07121b02499a4c929c5b5e8bd804a67539574c1b -rc70815ad2b3beadf61832f2e4d12eb90d476e020 --- sources/gui/qml/pages/TreatmentFlowBase.qml (.../TreatmentFlowBase.qml) (revision 07121b02499a4c929c5b5e8bd804a67539574c1b) +++ sources/gui/qml/pages/TreatmentFlowBase.qml (.../TreatmentFlowBase.qml) (revision c70815ad2b3beadf61832f2e4d12eb90d476e020) @@ -55,6 +55,7 @@ property int checkListCompleteMargin : 50 property bool checkListTimeVisible : false property int checkListTimeSeconds : 0 + property int stepIndex : -1 property string completeText : "" property bool isComplete : false Index: sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml =================================================================== diff -u -rf90366dd7a36ac03a4e387550811fe5b8a7fbe80 -rc70815ad2b3beadf61832f2e4d12eb90d476e020 --- sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml (.../PreTreatmentBase.qml) (revision f90366dd7a36ac03a4e387550811fe5b8a7fbe80) +++ sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml (.../PreTreatmentBase.qml) (revision c70815ad2b3beadf61832f2e4d12eb90d476e020) @@ -26,9 +26,9 @@ * \brief the parent page of the pre-treatment screens */ TreatmentFlowBase { id: _root - objectName: "_PreTreatmentBase" - header.visible : false - headerTitle : qsTr("Setup Treatment") + objectName : "_PreTreatmentBase" + header.visible : false + headerTitle : qsTr("Setup Treatment") onVisibleChanged: if ( visible && instructionBased ) { _root.updateModel() } Index: sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml =================================================================== diff -u -r07121b02499a4c929c5b5e8bd804a67539574c1b -rc70815ad2b3beadf61832f2e4d12eb90d476e020 --- sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml (.../PreTreatmentInstallStack.qml) (revision 07121b02499a4c929c5b5e8bd804a67539574c1b) +++ sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml (.../PreTreatmentInstallStack.qml) (revision c70815ad2b3beadf61832f2e4d12eb90d476e020) @@ -23,6 +23,7 @@ } property int subStepIndex: PreTreatmentInstallStack.Step.BloodSetTubing + property int stepIndex: PreTreatmentStack.Step.Installation onVisibleChanged: { if (visible) { @@ -38,18 +39,23 @@ signal goToNextStep() signal goToPreviousStep() - function initStack() { page ( _preTreatmentBloodSetTubing ) } + function setPage(vPage, vCondition) { + _root.subStepIndex = vPage.stepIndex + page( vPage , vCondition) + } + function initStack() { setPage ( _preTreatmentBloodSetTubing ) } + function continueClicked() { switch ( _root.subStepIndex ) { case PreTreatmentInstallStack.Step.BloodSetTubing: vPreTreatmentAdjustmentDisposablesConfirm.doConfirm() break case PreTreatmentInstallStack.Step.BloodLines: - page ( _preTreatmentPressureLinesAndDialyzer ) + setPage ( _preTreatmentPressureLinesAndDialyzer ) break case PreTreatmentInstallStack.Step.PressureLinesAndDialyzer: - page ( _pretreatmentSalineSubstitution ) + setPage ( _pretreatmentSalineSubstitution ) break case PreTreatmentInstallStack.Step.SalineSubStitution: goToNextStep () @@ -65,13 +71,13 @@ goToPreviousStep () break case PreTreatmentInstallStack.Step.BloodLines: - page ( _preTreatmentBloodSetTubing ) + setPage ( _preTreatmentBloodSetTubing ) break case PreTreatmentInstallStack.Step.PressureLinesAndDialyzer: - page ( _preTreatmentBloodLines ) + setPage ( _preTreatmentBloodLines ) break case PreTreatmentInstallStack.Step.SalineSubStitution: - page ( _preTreatmentPressureLinesAndDialyzer ) + setPage ( _preTreatmentPressureLinesAndDialyzer ) break default: break @@ -93,41 +99,31 @@ } // ----- Screens definitions - PreTreatmentBase { id: _preTreatmentBloodSetTubing - instructionBased : true - onVisibleChanged : if (visible) { _root.subStepIndex = PreTreatmentInstallStack.Step.BloodSetTubing; updateModel() } - subStepName : qsTr("Blood Tubing Set") + PreTreatmentBase { id: _preTreatmentBloodSetTubing; stepIndex: PreTreatmentInstallStack.Step.BloodSetTubing; subStepName: qsTr("Blood Tubing Set"); instructionBased: true } + PreTreatmentBase { id: _preTreatmentBloodLines; stepIndex: PreTreatmentInstallStack.Step.BloodLines; subStepName: qsTr("Bloodlines"); instructionBased: true } + PreTreatmentBase { id: _preTreatmentPressureLinesAndDialyzer; stepIndex: PreTreatmentInstallStack.Step.PressureLinesAndDialyzer; subStepName: qsTr("Pressure Lines and Dialyzer"); instructionBased: true } + PreTreatmentBase { id: _pretreatmentSalineSubstitution; stepIndex: PreTreatmentInstallStack.Step.SalineSubStitution; instructionBased: true + subStepName: vTreatmentCreate.treatmentModality === HeaderBar.Mode_HDF ? qsTr("Substitution") : + qsTr("Saline") } - PreTreatmentBase { id: _preTreatmentBloodLines - instructionBased : true - onVisibleChanged : if (visible) { _root.subStepIndex = PreTreatmentInstallStack.Step.BloodLines ; updateModel() } - subStepName : qsTr("Bloodlines") - } - - PreTreatmentBase { id: _preTreatmentPressureLinesAndDialyzer - instructionBased : true - onVisibleChanged : if (visible) { _root.subStepIndex = PreTreatmentInstallStack.Step.PressureLinesAndDialyzer; updateModel() } - subStepName : qsTr("Pressure Lines and Dialyzer") - } - - PreTreatmentBase { id: _pretreatmentSalineSubstitution - instructionBased : true - onVisibleChanged : if (visible) { _root.subStepIndex = PreTreatmentInstallStack.Step.SalineSubStitution; updateModel() } - subStepName : vTreatmentCreate.treatmentModality === HeaderBar.Mode_HDF ? qsTr("Substitution") : - qsTr("Saline") - } - // blood tubing set auto-load Connections { target: vPreTreatmentAdjustmentDisposablesConfirm function onAdjustmentTriggered ( vValue ) { if ( vPreTreatmentAdjustmentDisposablesConfirm.adjustment_Accepted ) { _preTreatmentBloodSetTubing.reasonText = "" if ( vSettings.advancedMode ) { goToNextStep () } - else { page ( _preTreatmentBloodLines ) } + else { setPage ( _preTreatmentBloodLines ) } } else { _preTreatmentBloodSetTubing.reasonText = vPreTreatmentAdjustmentDisposablesConfirm.text() } } } + + onVisibleChanged: { + if (visible) { + _headerBar.activeStack = stackView + initStack() + } + } } Index: sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml =================================================================== diff -u -r07121b02499a4c929c5b5e8bd804a67539574c1b -rc70815ad2b3beadf61832f2e4d12eb90d476e020 --- sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml (.../PreTreatmentStack.qml) (revision 07121b02499a4c929c5b5e8bd804a67539574c1b) +++ sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml (.../PreTreatmentStack.qml) (revision c70815ad2b3beadf61832f2e4d12eb90d476e020) @@ -62,6 +62,11 @@ stackView.onCurrentItemChanged: if ( stackView.currentItem != _pretreatmentInstallation ) { _headerBar.activeStack = stackView } + function setPage(vPage, vCondition) { + _root.stackStepIndex = _root.stepKeys.indexOf(vPage.stepIndex) + page( vPage , vCondition) + } + // dynamically rebuild map 🗺️ when entering pretreatment. // { step key (enum) : step name (string) } -- decided to use 2 parallel list for better indexing function rebuildMap() { @@ -100,22 +105,22 @@ function confirmClicked() { switch ( stepKeys[_root.stackStepIndex] ) { case PreTreatmentStack.Step.Concentrates: - page ( _pretreatmentInstallation ) + setPage ( _pretreatmentInstallation ) break case PreTreatmentStack.Step.Installation: if ( vSettings.advancedMode ) { vPreTreatmentAdjustmentDisposablesConfirm.doConfirm() } else { _pretreatmentInstallation.continueClicked() } break case PreTreatmentStack.Step.SelfTests: - page ( _pretreatmentPrime ) + setPage ( _pretreatmentPrime ) break case PreTreatmentStack.Step.Prime: if ( _pretreatmentPrime.timeCircleProgressValue === 0 ) { vPreTreatmentAdjustmentDisposablesPrime.doPrime(); } - page ( _pretreatmentCreate ) + setPage ( _pretreatmentCreate ) break case PreTreatmentStack.Step.CreateRx: _pretreatmentCreate.confirmButtonClicked() - if ( vTreatmentCreate.parametersValidated ) { page ( _pretreatmentConnect ) } + if ( vTreatmentCreate.parametersValidated ) { setPage ( _pretreatmentConnect ) } break case PreTreatmentStack.Step.Connect: vPreTreatmentAdjustmentStartTreatment.doStart() @@ -222,46 +227,25 @@ } // Pages - PreTreatmentBase { id: _pretreatmentConcentrates - instructionBased : true - onVisibleChanged : if (visible) { _root.stackStepIndex = stepKeys.indexOf(PreTreatmentStack.Step.Concentrates); updateModel() } - } + PreTreatmentBase { id: _pretreatmentConcentrates; stepIndex: PreTreatmentStack.Step.Concentrates; instructionBased: true } + PreTreatmentInstallStack { id: _pretreatmentInstallation; stepIndex: PreTreatmentStack.Step.Installation } + PreTreatmentSelfTests { id: _pretreatmentSelfTests; stepIndex: PreTreatmentStack.Step.SelfTests } + PreTreatmentPrime { id: _pretreatmentPrime; stepIndex: PreTreatmentStack.Step.Prime } + PreTreatmentCreate { id: _pretreatmentCreate; stepIndex: PreTreatmentStack.Step.CreateRx } + PreTreatmentBase { id: _pretreatmentConnect; stepIndex: PreTreatmentStack.Step.Connect; instructionBased: true } - PreTreatmentInstallStack { id: _pretreatmentInstallation - onVisibleChanged : if (visible) { _root.stackStepIndex = stepKeys.indexOf(PreTreatmentStack.Step.Installation); initStack() } - } - - PreTreatmentSelfTests{ id: _pretreatmentSelfTests - onVisibleChanged : if (visible) { _root.stackStepIndex = stepKeys.indexOf(PreTreatmentStack.Step.SelfTests); } - } - - PreTreatmentPrime { id: _pretreatmentPrime - onVisibleChanged : if (visible) { _root.stackStepIndex = stepKeys.indexOf(PreTreatmentStack.Step.Prime); } - } - - PreTreatmentCreate { id: _pretreatmentCreate - onVisibleChanged : if (visible) { _root.stackStepIndex = stepKeys.indexOf(PreTreatmentStack.Step.CreateRx) } - showCreateRxHeaderButton: false - } - - PreTreatmentBase { id: _pretreatmentConnect - instructionBased : true - onVisibleChanged : if (visible) { _root.stackStepIndex = stepKeys.indexOf(PreTreatmentStack.Step.Connect); updateModel() } - showCreateRxHeaderButton: false - } - // Slots Connections { target: vTDOpMode - function onPreTreatmentChanged( vValue ) { if ( ! vTreatmentCreate.txCode ) { vTreatmentCreate.generateTxCode() } - if ( vSettings.advancedMode ) { page ( _pretreatmentInstallation , vValue )} - else { page ( _pretreatmentConcentrates , vValue )} + function onPreTreatmentChanged( vValue ) { if ( ! vTreatmentCreate.txCode ) { vTreatmentCreate.generateTxCode() } + if ( vSettings.advancedMode ) { setPage ( _pretreatmentInstallation , vValue )} + else { setPage ( _pretreatmentConcentrates , vValue )} } } // Installation Connections { target: _pretreatmentInstallation - function onGoToNextStep () { page ( _pretreatmentSelfTests )} - function onGoToPreviousStep () { page ( _pretreatmentConcentrates )} + function onGoToNextStep () { setPage ( _pretreatmentSelfTests )} + function onGoToPreviousStep () { setPage ( _pretreatmentConcentrates )} } // priming @@ -278,7 +262,7 @@ // creat rx Connections{ target: vTreatmentCreate function onDidValidationPass ( ) { - if ( _pretreatmentCreate.visible) { page ( _pretreatmentConnect ) } + if ( _pretreatmentCreate.visible) { setPage ( _pretreatmentConnect ) } } } Index: sources/gui/qml/pages/treatment/TreatmentHDF.qml =================================================================== diff -u -r07121b02499a4c929c5b5e8bd804a67539574c1b -rc70815ad2b3beadf61832f2e4d12eb90d476e020 --- sources/gui/qml/pages/treatment/TreatmentHDF.qml (.../TreatmentHDF.qml) (revision 07121b02499a4c929c5b5e8bd804a67539574c1b) +++ sources/gui/qml/pages/treatment/TreatmentHDF.qml (.../TreatmentHDF.qml) (revision c70815ad2b3beadf61832f2e4d12eb90d476e020) @@ -32,8 +32,7 @@ signal sectionPressuresClicked() signal treatmentHDFEditClicked() - // onStatusColorChanged: TODO update to this - Component.onCompleted : vListModel.setHeaderbarHDFStatusColor(_root.statusColor.toString()) + Component.onCompleted : vHeaderbarModel.setHeaderbarHDFStatusColor(_root.statusColor.toString()) Connections { target: vTDOpMode function onInTreatmentChanged ( vValue ) { if ( vValue ) { _chart.updateXAxis() } } Index: sources/gui/qml/pages/treatment/TreatmentHeparin.qml =================================================================== diff -u -r07121b02499a4c929c5b5e8bd804a67539574c1b -rc70815ad2b3beadf61832f2e4d12eb90d476e020 --- sources/gui/qml/pages/treatment/TreatmentHeparin.qml (.../TreatmentHeparin.qml) (revision 07121b02499a4c929c5b5e8bd804a67539574c1b) +++ sources/gui/qml/pages/treatment/TreatmentHeparin.qml (.../TreatmentHeparin.qml) (revision c70815ad2b3beadf61832f2e4d12eb90d476e020) @@ -106,7 +106,7 @@ Connections { target: vTDTreatmentStates function onHeparinChanged ( vValue ) { - vListModel.setHeaderbarHeparinStatusColor(_root.statusColor(true).toString()) + vHeaderbarModel.setHeaderbarHeparinStatusColor(_root.statusColor(true).toString()) } } Index: sources/gui/qml/pages/treatment/TreatmentTrends.qml =================================================================== diff -u -r0bb5f08eb3570de6bff3ce67ca502db129b59096 -rc70815ad2b3beadf61832f2e4d12eb90d476e020 --- sources/gui/qml/pages/treatment/TreatmentTrends.qml (.../TreatmentTrends.qml) (revision 0bb5f08eb3570de6bff3ce67ca502db129b59096) +++ sources/gui/qml/pages/treatment/TreatmentTrends.qml (.../TreatmentTrends.qml) (revision c70815ad2b3beadf61832f2e4d12eb90d476e020) @@ -29,6 +29,7 @@ ScreenItem { id: _root objectName: "_TreatmentTrends" property alias isParamExpanded: _paramArea.isExpanded + showCreateRxHeaderButton: true onVisibleChanged: { _paramList.positionViewAtBeginning() Index: sources/model/MModel.h =================================================================== diff -u -ra8ce0941b44e15fb7b9365f98d4656e232d4bf35 -rc70815ad2b3beadf61832f2e4d12eb90d476e020 --- sources/model/MModel.h (.../MModel.h) (revision a8ce0941b44e15fb7b9365f98d4656e232d4bf35) +++ sources/model/MModel.h (.../MModel.h) (revision c70815ad2b3beadf61832f2e4d12eb90d476e020) @@ -75,8 +75,8 @@ #include "MTDSwitchesData.h" #include "MTDEjectorData.h" #include "MTDTemperatureData.h" +#include "MWaterSampleData.h" - // Debugging Messages #include "MHDDebugText.h" #include "MDGDebugText.h" @@ -103,11 +103,11 @@ #include "MAdjustTDAdvancedInstitutionalRecordResponse.h" #include "MTDAdvancedInstitutionalRecordResponse.h" -// DG Data Messages +// DD Data Messages #include "MDGDrainPumpData.h" #include "MDDHeatersData.h" #include "MDGLoadCellReadingsData.h" -#include "MDGOperationModeData.h" +#include "MDDOperationModeData.h" #include "MDDPressuresData.h" #include "MDGReservoirData.h" #include "MDGROPumpData.h" @@ -129,13 +129,14 @@ #include "MFPConductivityData.h" #include "MFPTemperatureData.h" #include "MFPBoostPumpData.h" +#include "MFPRORejectionPercentageData.h" // Pre-Treatment #include "MPreTreatmentAdjustRequests.h" #include "MPreTreatmentAdjustInitTreatmentResponse.h" #include "MPreTreatmentAdjustParametersValidationResponse.h" #include "MDGFilterFlushData.h" // DG message but part of the Pre-Treatment messaging flow -#include "MPreTreatmentAdjustWaterSampleResponse.h" +#include "MPreTreatmentAdjustWaterSampleResultResponse.h" #include "MPreTreatmentSelfTestNoCartridgeData.h" #include "MPreTreatmentSelfTestDryData.h" #include "MPreTreatmentAdjustDisposablesConfirmResponse.h" @@ -390,6 +391,7 @@ REGISTER_METATYPE( TDAirPumpData ) \ REGISTER_METATYPE( HDUsageInfoResponseData ) \ REGISTER_METATYPE( HDUsageInfoRequestData ) \ + REGISTER_METATYPE( WaterSampleData ) \ /* Treatment Log */ \ REGISTER_METATYPE( TreatmentLogAvrgeData ) \ REGISTER_METATYPE( TreatmentLogAlarmData ) \ @@ -401,7 +403,7 @@ REGISTER_METATYPE( DGROPumpData ) \ REGISTER_METATYPE( DDPressuresData ) \ REGISTER_METATYPE( DGDrainPumpData ) \ - REGISTER_METATYPE( DGOperationModeData ) \ + REGISTER_METATYPE( DDOperationModeData ) \ REGISTER_METATYPE( DGReservoirData ) \ REGISTER_METATYPE( DDValvesStatesData ) \ REGISTER_METATYPE( DDHeatersData ) \ @@ -422,6 +424,7 @@ REGISTER_METATYPE( FPConductivityData ) \ REGISTER_METATYPE( FPTemperatureData ) \ REGISTER_METATYPE( FPBoostPumpData ) \ + REGISTER_METATYPE( FPRORejectionPercentageData ) \ \ REGISTER_METATYPE( HDDebugTextData ) \ REGISTER_METATYPE( DGDebugTextData ) \ @@ -441,7 +444,6 @@ /* Pre-Treatment */ \ REGISTER_METATYPE( AdjustInitTreatmentRequestData ) \ REGISTER_METATYPE( AdjustParametersValidationRequestData ) \ - REGISTER_METATYPE( AdjustWaterSampleRequestData ) \ REGISTER_METATYPE( AdjustWaterSampleResultRequestData ) \ REGISTER_METATYPE( AdjustConsumablesConfirmRequestData ) \ REGISTER_METATYPE( AdjustDisposablesConfirmRequestData ) \ @@ -499,7 +501,7 @@ /* Pre-Treatment */ \ REGISTER_METATYPE( AdjustInitTreatmentResponseData ) \ REGISTER_METATYPE( AdjustParametersValidationResponseData ) \ - REGISTER_METATYPE( AdjustWaterSampleResponseData ) \ + REGISTER_METATYPE( AdjustWaterSampleResultResponseData ) \ REGISTER_METATYPE( AdjustDisposablesConfirmResponseData ) \ REGISTER_METATYPE( AdjustDisposablesPrimeResponseData ) \ REGISTER_METATYPE( AdjustPatientConnectionBeginResponseData ) \ @@ -623,6 +625,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDSwitchesData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDBatteryData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TDValvesData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, WaterSampleData ) \ /* Treatment Log */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentLogAvrgeData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentLogAlarmData ) \ @@ -634,7 +637,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGROPumpData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDPressuresData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGDrainPumpData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGOperationModeData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDOperationModeData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGReservoirData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDValvesStatesData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDHeatersData ) \ @@ -655,6 +658,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, FPConductivityData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, FPTemperatureData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, FPBoostPumpData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, FPRORejectionPercentageData ) \ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDDebugTextData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGDebugTextData ) \ @@ -673,7 +677,7 @@ /* Pre-Treatment */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustInitTreatmentResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustParametersValidationResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustWaterSampleResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustWaterSampleResultResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDisposablesConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDisposablesPrimeResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPatientConnectionBeginResponseData ) \ @@ -775,7 +779,6 @@ /* Pre-Treatment */ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustInitTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustParametersValidationRequestData ) \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustWaterSampleRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustWaterSampleResultRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustConsumablesConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDisposablesConfirmRequestData ) \ @@ -869,6 +872,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( TDSwitchesData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TDEjectorData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TDTemperatureData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( WaterSampleData ) \ /* Treatment Log */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentLogAvrgeData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentLogAlarmData ) \ @@ -880,7 +884,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( DGROPumpData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DDPressuresData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGDrainPumpData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( DGOperationModeData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDOperationModeData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGReservoirData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DDValvesStatesData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DDHeatersData ) \ @@ -901,6 +905,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( FPConductivityData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( FPTemperatureData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( FPBoostPumpData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( FPRORejectionPercentageData ) \ \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDDebugTextData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGDebugTextData ) \ @@ -919,7 +924,7 @@ /* Pre-Treatment */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustInitTreatmentResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustParametersValidationResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustWaterSampleResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustWaterSampleResultResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDisposablesConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDisposablesPrimeResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPatientConnectionBeginResponseData ) \ @@ -991,7 +996,6 @@ /* Pre-Treatment */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustInitTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustParametersValidationRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustWaterSampleRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustWaterSampleResultRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustConsumablesConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDisposablesConfirmRequestData ) \ @@ -1065,7 +1069,6 @@ /* Pre-Treatment */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustInitTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustParametersValidationRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustWaterSampleRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustWaterSampleResultRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustConsumablesConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDisposablesConfirmRequestData ) \ @@ -1139,7 +1142,6 @@ /* Pre-Treatment */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustInitTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustParametersValidationRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustWaterSampleRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustWaterSampleResultRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustConsumablesConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDisposablesConfirmRequestData ) \ @@ -1247,6 +1249,7 @@ ACTION_RECEIVE_SIGNAL( TDTemperatureData ) \ ACTION_RECEIVE_SIGNAL( TDAirBubbleData ) \ ACTION_RECEIVE_SIGNAL( TDAirPumpData ) \ + ACTION_RECEIVE_SIGNAL( WaterSampleData ) \ /* Alarms */ \ ACTION_RECEIVE_SIGNAL( AlarmStatusData ) \ ACTION_RECEIVE_SIGNAL( AlarmTriggeredData ) \ @@ -1259,7 +1262,7 @@ ACTION_RECEIVE_SIGNAL( DGROPumpData ) \ ACTION_RECEIVE_SIGNAL( DDPressuresData ) \ ACTION_RECEIVE_SIGNAL( DGDrainPumpData ) \ - ACTION_RECEIVE_SIGNAL( DGOperationModeData ) \ + ACTION_RECEIVE_SIGNAL( DDOperationModeData ) \ ACTION_RECEIVE_SIGNAL( DGReservoirData ) \ ACTION_RECEIVE_SIGNAL( DDValvesStatesData ) \ ACTION_RECEIVE_SIGNAL( DDHeatersData ) \ @@ -1280,6 +1283,7 @@ ACTION_RECEIVE_SIGNAL( FPConductivityData ) \ ACTION_RECEIVE_SIGNAL( FPTemperatureData ) \ ACTION_RECEIVE_SIGNAL( FPBoostPumpData ) \ + ACTION_RECEIVE_SIGNAL( FPRORejectionPercentageData ) \ \ ACTION_RECEIVE_SIGNAL( HDDebugTextData ) \ ACTION_RECEIVE_SIGNAL( DGDebugTextData ) \ @@ -1298,7 +1302,7 @@ /* Pre-Treatment */ \ ACTION_RECEIVE_SIGNAL( AdjustInitTreatmentResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustParametersValidationResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustWaterSampleResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustWaterSampleResultResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustDisposablesConfirmResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustDisposablesPrimeResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustPatientConnectionBeginResponseData ) \ Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h =================================================================== diff -u -r9403146058e7c4cef17bd542bbd39bbf032be9f3 -rc70815ad2b3beadf61832f2e4d12eb90d476e020 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision 9403146058e7c4cef17bd542bbd39bbf032be9f3) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision c70815ad2b3beadf61832f2e4d12eb90d476e020) @@ -72,35 +72,37 @@ * * | Payload || * | || - * | #01:(U32) | \ref mTreatmentModality | - * | #02:(U32) | \ref mHDFTreatmentMode | - * | #03:(U32) | \ref mBloodFlowRate | - * | #04:(U32) | \ref mDialysateFlowRate | - * | #05:(U32) | \ref mTreatmentDuration | - * | #06:(U32) | \ref mHeparinDeliveryDuration | - * | #07:(U32) | \ref mHeparinType | - * | #08:(U32) | \ref mDryBicarbCartSize | - * | #09:(U32) | \ref mSodium | - * | #10:(U32) | \ref mBicarbonate | - * | #11:(U32) | \ref mDialyzerType | - * | #12:(U32) | \ref mFluidBolusVolume | - * | #13:(U32) | \ref mBloodPressureMeasureInterval | - * | #14:(U32) | \ref mRinsebackVolume | - * | #15:(U32) | \ref mHepatitusBStatus | - * | #16:(U32) | \ref mAcidConcentrateIndex | - * | #17:(F32) | \ref mSubstitutionFluidVolume | - * | #18:(F32) | \ref mHeparinBolusVolume | - * | #19:(F32) | \ref mHeparinDispensingRate | - * | #20:(F32) | \ref mDialysateTemp | - * | #21:(F32) | \ref mAcidConcentrateConversionFactor | - * | #22:(F32) | \ref mUFPreWeight | - * | #23:(F32) | \ref mUFEstimatedTargetWeight | - * | #24:(F32) | \ref mUFVolume | + * | #01:(U32) | \ref mFinalConfirmation | + * | #02:(U32) | \ref mTreatmentModality | + * | #03:(U32) | \ref mHDFTreatmentMode | + * | #04:(U32) | \ref mBloodFlowRate | + * | #05:(U32) | \ref mDialysateFlowRate | + * | #06:(U32) | \ref mTreatmentDuration | + * | #07:(U32) | \ref mHeparinDeliveryDuration | + * | #08:(U32) | \ref mHeparinType | + * | #09:(U32) | \ref mDryBicarbCartSize | + * | #10:(U32) | \ref mSodium | + * | #11:(U32) | \ref mBicarbonate | + * | #12:(U32) | \ref mDialyzerType | + * | #13:(U32) | \ref mFluidBolusVolume | + * | #14:(U32) | \ref mBloodPressureMeasureInterval | + * | #15:(U32) | \ref mRinsebackVolume | + * | #16:(U32) | \ref mHepatitusBStatus | + * | #17:(U32) | \ref mAcidConcentrateIndex | + * | #18:(F32) | \ref mSubstitutionFluidVolume | + * | #19:(F32) | \ref mHeparinBolusVolume | + * | #20:(F32) | \ref mHeparinDispensingRate | + * | #21:(F32) | \ref mDialysateTemp | + * | #22:(F32) | \ref mAcidConcentrateConversionFactor | + * | #23:(F32) | \ref mUFPreWeight | + * | #24:(F32) | \ref mUFEstimatedTargetWeight | + * | #25:(F32) | \ref mUFVolume | * */ class MAdjustParametersValidationReq : public MModel { public: + quint32 mFinalConfirmation = 0; // flag quint32 mTreatmentModality = 0; // quint32 mHDFTreatmentMode = 0; // quint32 mBloodFlowRate = 0; // mL/min @@ -128,6 +130,7 @@ QString toString() { return toString({ + mFinalConfirmation , mTreatmentModality , mHDFTreatmentMode , mBloodFlowRate , @@ -159,35 +162,7 @@ } }; -/*! - * \brief The MAdjustParametersConfirmReq class - * \details The model to tell HD treatment parameters have been confirmed - * - * | MSG | CAN ID | Type | Ack | Src | Dest | Description | - * |:----:|:------:|:----:|:---:|:---:|:----:|:-----------------------------------:| - * |0x4400| 0x041 | Req | Y | UI | TD | Confirm Treatment Parameter Request | - * - * | Payload || - * | || - * | #1:(U32) | \ref requestedState | - * - */ -class MAdjustParametersConfirmReq : public MModel { -public: - enum Options { - eCancel = 0, - eConfirm = 1 - }; - Options requestedState = eConfirm; - QString toString() { - return toString({requestedState}); - } - static QString toString(const QVariantList &vParameters) { - return MModel::toString("ConfirmParameters", vParameters); - } -}; - /*! * \brief The MAdjustWaterSampleResultReq class * \details The model to provide water sample result @@ -357,7 +332,6 @@ typedef Model:: MAdjustInitTreatmentReq AdjustInitTreatmentRequestData; typedef Model:: MAdjustParametersValidationReq AdjustParametersValidationRequestData; -typedef Model:: MAdjustParametersConfirmReq AdjustParametersConfirmRequestData; typedef Model:: MAdjustWaterSampleResultReq AdjustWaterSampleResultRequestData; typedef Model:: MAdjustConsumablesConfirmReq AdjustConsumablesConfirmRequestData; typedef Model:: MAdjustDisposablesConfirmReq AdjustDisposablesConfirmRequestData; Index: sources/view/VTreatmentCreate.h =================================================================== diff -u -ra8ce0941b44e15fb7b9365f98d4656e232d4bf35 -rc70815ad2b3beadf61832f2e4d12eb90d476e020 --- sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision a8ce0941b44e15fb7b9365f98d4656e232d4bf35) +++ sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision c70815ad2b3beadf61832f2e4d12eb90d476e020) @@ -107,8 +107,6 @@ VALUESET(QString , patientID ,"") VALUESET(bool , parametersValidated , 0) - VALUESET(qint32 , actualRORejectionPercentage , 0) // TODO comes from FP Update Later - PROPERTY(QString , txCode ,"") TRIGGER(quint32 , treatmentModalityRejectReason , 0)