Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r3d693a4edea8154d2ebdb55dbd9e93c1b743341a -ra8ce0941b44e15fb7b9365f98d4656e232d4bf35 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 3d693a4edea8154d2ebdb55dbd9e93c1b743341a) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision a8ce0941b44e15fb7b9365f98d4656e232d4bf35) @@ -687,19 +687,6 @@ /*! * \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 * \details This method transmits the Water Sample Adjustment Denali message. * \param vData - Data model contains Water Sample adjustment. * \return void Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r3d693a4edea8154d2ebdb55dbd9e93c1b743341a -ra8ce0941b44e15fb7b9365f98d4656e232d4bf35 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 3d693a4edea8154d2ebdb55dbd9e93c1b743341a) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision a8ce0941b44e15fb7b9365f98d4656e232d4bf35) @@ -223,7 +223,6 @@ // Pre-Treatment Treatment Parameters Validation/Confirm {Gui::GuiActionType::ID_AdjustParametersValidationReq , 25 * 4 }, //25 parameters each 4bytes {Gui::GuiActionType::ID_AdjustParametersValidationRsp , 25 * 4 }, //25 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustParametersConfirmReq , 1 * 4 }, // 1 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 Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -rf723048b0efe2edf7cb08b9bba2ef67c55917503 -ra8ce0941b44e15fb7b9365f98d4656e232d4bf35 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision f723048b0efe2edf7cb08b9bba2ef67c55917503) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision a8ce0941b44e15fb7b9365f98d4656e232d4bf35) @@ -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_AdjustParametersConfirmReq : INTERPRET_TRANSMIT_MESSAGE(AdjustParametersConfirmRequestData ); 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; Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r3da801fd23f007886f7fda5e9b45d17d565150d2 -ra8ce0941b44e15fb7b9365f98d4656e232d4bf35 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 3da801fd23f007886f7fda5e9b45d17d565150d2) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision a8ce0941b44e15fb7b9365f98d4656e232d4bf35) @@ -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/pages/pretreatment/create/PreTreatmentCreateContent.qml =================================================================== diff -u -r11c9e7b76125f24a08ed6c66175af20025ac5458 -ra8ce0941b44e15fb7b9365f98d4656e232d4bf35 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision 11c9e7b76125f24a08ed6c66175af20025ac5458) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision a8ce0941b44e15fb7b9365f98d4656e232d4bf35) @@ -215,10 +215,6 @@ onActivated: { const selectedItem = model[currentIndex] - // only send AdjustParametersConfirmRequestData::eCancel when validated - // Telling FW user is canceling confirm treatment parameters - if ( vTreatmentCreate.parametersValidated ) { vTreatmentCreate.doCancel() } - if ( selectedItem === _root.editRx ) { /*All parameters set to edit if parameters are validated */ } else if ( selectedItem === _root.selectRx ) { print("TODO: Open and Select from Prescription Manager") } else if ( selectedItem === _root.clearAll ) { _root.clear() } Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml =================================================================== diff -u -rdcd977aa407345edac30e4430a0476de4b0163d8 -ra8ce0941b44e15fb7b9365f98d4656e232d4bf35 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml (.../PreTreatmentCreatePatientPrescription.qml) (revision dcd977aa407345edac30e4430a0476de4b0163d8) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml (.../PreTreatmentCreatePatientPrescription.qml) (revision a8ce0941b44e15fb7b9365f98d4656e232d4bf35) @@ -14,7 +14,7 @@ readonly property bool heparinFeatured : vSettings.heparinSyringePump readonly property string patientID : _pretreatmentPatientIDEntry.text property bool isHDFFeatured : vTreatmentCreate.treatmentModality === HeaderBar.Mode_HDF - property bool isHeparinOn : _heparinRxControl.value === PreTreatmentCreateTreatmentSettings.ON + property bool isHeparinOn : _heparinRxControl.value === PreTreatmentCreatePatientPrescription.ON property bool editingEnabled : true property int columnSpacing : 15 @@ -71,7 +71,6 @@ } function ready () { - return (_root.isHDFFeatured ? _hdfTreatmentModeControl.isActive && _hdfTreatmentMode .valid && _subFluidVolume .isActive && _subFluidVolume .valid : true ) && _bloodFlowRate .isActive && _bloodFlowRate .valid && Index: sources/model/MModel.h =================================================================== diff -u -rf723048b0efe2edf7cb08b9bba2ef67c55917503 -ra8ce0941b44e15fb7b9365f98d4656e232d4bf35 --- sources/model/MModel.h (.../MModel.h) (revision f723048b0efe2edf7cb08b9bba2ef67c55917503) +++ sources/model/MModel.h (.../MModel.h) (revision a8ce0941b44e15fb7b9365f98d4656e232d4bf35) @@ -441,7 +441,6 @@ /* Pre-Treatment */ \ REGISTER_METATYPE( AdjustInitTreatmentRequestData ) \ REGISTER_METATYPE( AdjustParametersValidationRequestData ) \ - REGISTER_METATYPE( AdjustParametersConfirmRequestData ) \ REGISTER_METATYPE( AdjustWaterSampleRequestData ) \ REGISTER_METATYPE( AdjustWaterSampleResultRequestData ) \ REGISTER_METATYPE( AdjustConsumablesConfirmRequestData ) \ @@ -753,7 +752,6 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustIsolatedUFDurationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustIsolatedUFVolumeEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustIsolatedUFConfirmRequestData ) \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustParametersConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustSalineRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustVitalsRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHeparinRequestData ) \ @@ -993,7 +991,6 @@ /* Pre-Treatment */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustInitTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustParametersValidationRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustParametersConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustWaterSampleRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustWaterSampleResultRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustConsumablesConfirmRequestData ) \ @@ -1068,7 +1065,6 @@ /* Pre-Treatment */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustInitTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustParametersValidationRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustParametersConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustWaterSampleRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustWaterSampleResultRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustConsumablesConfirmRequestData ) \ @@ -1143,7 +1139,6 @@ /* Pre-Treatment */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustInitTreatmentRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustParametersValidationRequestData ) \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustParametersConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustWaterSampleRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustWaterSampleResultRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustConsumablesConfirmRequestData ) \ Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h =================================================================== diff -u -r3d693a4edea8154d2ebdb55dbd9e93c1b743341a -ra8ce0941b44e15fb7b9365f98d4656e232d4bf35 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision 3d693a4edea8154d2ebdb55dbd9e93c1b743341a) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision a8ce0941b44e15fb7b9365f98d4656e232d4bf35) @@ -162,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 MAdjustWaterSampleReq class * \details The model to request start/stop water sample @@ -395,7 +367,6 @@ typedef Model:: MAdjustInitTreatmentReq AdjustInitTreatmentRequestData; typedef Model:: MAdjustParametersValidationReq AdjustParametersValidationRequestData; -typedef Model:: MAdjustParametersConfirmReq AdjustParametersConfirmRequestData; typedef Model:: MAdjustWaterSampleReq AdjustWaterSampleRequestData; typedef Model:: MAdjustWaterSampleResultReq AdjustWaterSampleResultRequestData; typedef Model:: MAdjustConsumablesConfirmReq AdjustConsumablesConfirmRequestData; Index: sources/view/VTreatmentCreate.cpp =================================================================== diff -u -r3d693a4edea8154d2ebdb55dbd9e93c1b743341a -ra8ce0941b44e15fb7b9365f98d4656e232d4bf35 --- sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision 3d693a4edea8154d2ebdb55dbd9e93c1b743341a) +++ sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision a8ce0941b44e15fb7b9365f98d4656e232d4bf35) @@ -30,7 +30,6 @@ { ADJUST_VIEW_CONNECTION(AdjustParametersValidationRequestData ) ACTION_VIEW_CONNECTION(AdjustParametersValidationResponseData ) - ADJUST_VIEW_CONNECTION(AdjustParametersConfirmRequestData ) ACTION_VIEW_CONNECTION(AdjustSerialNumberTDResponseData ) } @@ -72,42 +71,6 @@ } /** - * \brief VCreateTreatment::doConfirm - * \details Emits treatment data to GUI controller, - * who emits to application controller - * \note Finished create treatment confirm... - */ -void VTreatmentCreate::doConfirm() { - AdjustParametersConfirmRequestData confirmTreatmentRequest; - confirmTreatmentRequest.requestedState = AdjustParametersConfirmRequestData::eConfirm; - emit didAdjustment(confirmTreatmentRequest); -} - -/** - * \brief VCreateTreatment::doCancel - * \details Notifies FW the user has canceled confirming the treatment parameters - * \note Telling FW user is canceling confirm treatment parameters... - */ -void VTreatmentCreate::doCancel() -{ - AdjustParametersConfirmRequestData confirmTreatmentRequest; - confirmTreatmentRequest.requestedState = AdjustParametersConfirmRequestData::eCancel; - parametersValidated(false); - emit didAdjustment(confirmTreatmentRequest); -} - -/** - * \brief VCreateTreatment::enumToString - * Convenience function to convert an enum to a string - * \param vEnum - the enum value - * \return QString - the enum name - */ -QString VTreatmentCreate::enumToString(GuiRequestReasons vEnum) -{ - return Gui::enumString(vEnum, "[%1] Unknown Rejection Reason"); -} - -/** * \brief VCreateTreatment::onFWValidationResponse * Slot to handle a validation response from FW * \param actionType The action type must be a create treatment response Index: sources/view/VTreatmentCreate.h =================================================================== diff -u -r3d693a4edea8154d2ebdb55dbd9e93c1b743341a -ra8ce0941b44e15fb7b9365f98d4656e232d4bf35 --- sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 3d693a4edea8154d2ebdb55dbd9e93c1b743341a) +++ sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision a8ce0941b44e15fb7b9365f98d4656e232d4bf35) @@ -62,7 +62,6 @@ * - The continue button is enabled upon success so FW can validate the parameter selection * * \sa Model::MAdjustParametersValidationResponse - * \sa Model::MAdjustParametersConfirmReq * \sa Model::MInitTreatmentReq * \sa Model::MConfirmTreatmentReq * \sa Model::MAdjustInitTreatmentResponse @@ -141,20 +140,14 @@ VIEW_DEC_SLOT(AdjustParametersValidationResponseData) VIEW_DEC_SLOT(AdjustSerialNumberTDResponseData) -private: - QString enumToString(GuiRequestReasons vEnum); - signals: void didAdjustment(const AdjustParametersValidationRequestData &data); - void didAdjustment(const AdjustParametersConfirmRequestData &data); void didValidationPass (); public slots: void doValidation (); - void doConfirm (); - void doCancel (); void generateTxCode(); };