Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r4a7dd11138d2321f1ab8d324b3bd25f02eaefe84 -r48b04367d9f229104e4048783df91089d0106379 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 4a7dd11138d2321f1ab8d324b3bd25f02eaefe84) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 48b04367d9f229104e4048783df91089d0106379) @@ -675,6 +675,7 @@ mData += vData.mUFVolume ; mData += vData.mUFPreWeight ; mData += vData.mUFEstimatedTargetWeight ; + mData += vData.mAcidConcentrateIndex ; onActionTransmit(GuiActionType::ID_AdjustParametersValidationReq, mData); } Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r49def2e3814791586d0982eaca4bc8403997b640 -r48b04367d9f229104e4048783df91089d0106379 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 49def2e3814791586d0982eaca4bc8403997b640) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 48b04367d9f229104e4048783df91089d0106379) @@ -221,8 +221,8 @@ {Gui::GuiActionType::ID_AdjustInitTreatmentReq , 1 * 4 }, // 1 parameters each 4bytes {Gui::GuiActionType::ID_AdjustInitTreatmentRsp , 2 * 4 }, // 2 parameters each 4bytes // Pre-Treatment Treatment Parameters Validation/Confirm - {Gui::GuiActionType::ID_AdjustParametersValidationReq , 24 * 4 }, //23 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustParametersValidationRsp , 25 * 4 }, //24 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustParametersValidationReq , 25 * 4 }, //23 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustParametersValidationRsp , 26 * 4 }, //24 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 Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml =================================================================== diff -u -r5210cdb6a463cbf0ec4c794342b5bd46763b2823 -r48b04367d9f229104e4048783df91089d0106379 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision 5210cdb6a463cbf0ec4c794342b5bd46763b2823) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision 48b04367d9f229104e4048783df91089d0106379) @@ -108,6 +108,7 @@ vTreatmentCreate.ufVolumeRejectionReason = Variables.noRejectReason vTreatmentCreate.ufPreWeightRejectionReason = Variables.noRejectReason vTreatmentCreate.ufEstimatedTargetWeightRejectionReason = Variables.noRejectReason + vTreatmentCreate.acidConcentrateIndexRejectionReason = Variables.noRejectReason } function confirmReady () { Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateTreatmentSettings.qml =================================================================== diff -u -re50998d376110516b4d3c9c860b9cbb4f2013623 -r48b04367d9f229104e4048783df91089d0106379 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateTreatmentSettings.qml (.../PreTreatmentCreateTreatmentSettings.qml) (revision e50998d376110516b4d3c9c860b9cbb4f2013623) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateTreatmentSettings.qml (.../PreTreatmentCreateTreatmentSettings.qml) (revision 48b04367d9f229104e4048783df91089d0106379) @@ -314,7 +314,7 @@ text : qsTr("Acid Concentrate") // showEdit : _root.editingEnabled // Hide 👋📋 TODO Phase 2 onEditClicked : _acidConcentrateAdjustment.open() - valid : ! vTreatmentCreate.acidConcentrateConversionFactorRejectionReason + valid : ! vTreatmentCreate.acidConcentrateConversionFactorRejectionReason && ! vTreatmentCreate.acidConcentrateIndexRejectionReason contentItem : BaseComboBox { id: _acidConcentrateComboBox anchors.rightMargin : Variables.defaultMargin * 2 @@ -331,7 +331,8 @@ } onActivated : { - if ( ! _acidConcentrate.valid ) { vTreatmentCreate.acidConcentrateConversionFactorRejectionReason = Variables.noRejectReason } + if ( ! _acidConcentrate.valid ) { vTreatmentCreate.acidConcentrateConversionFactorRejectionReason = Variables.noRejectReason + vTreatmentCreate.acidConcentrateIndexRejectionReason = Variables.noRejectReason } vTreatmentCreate.acidConcentrate = _acidConcentrateComboBox.currentIndex vTreatmentCreate.acidConcentrateSet = true vTreatmentCreate.acidConcentrateConversionFactor = vTreatmentRanges.acidConcentrateModel.get(vTreatmentCreate.acidConcentrate).value Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h =================================================================== diff -u -r4a7dd11138d2321f1ab8d324b3bd25f02eaefe84 -r48b04367d9f229104e4048783df91089d0106379 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h (.../MPreTreatmentAdjustParametersValidationResponse.h) (revision 4a7dd11138d2321f1ab8d324b3bd25f02eaefe84) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h (.../MPreTreatmentAdjustParametersValidationResponse.h) (revision 48b04367d9f229104e4048783df91089d0106379) @@ -58,8 +58,9 @@ * | #21:(U32) | \ref Data::mDialysateTempRejectionReason | * | #22:(U32) | \ref Data::mAcidConcentrateConversionFactorRejectionReason | * | #23:(U32) | \ref Data::mUFVolumeRejectionReason | - * | #23:(U32) | \ref Data::mUFPreWeightRejectionReason | - * | #23:(U32) | \ref Data::mUFEstimatedTargetWeightRejectionReason | + * | #24:(U32) | \ref Data::mUFPreWeightRejectionReason | + * | #25:(U32) | \ref Data::mUFEstimatedTargetWeightRejectionReason | + * | #26:(U32) | \ref Data::mAcidConcentrateIndexRejectionReason | * * \sa Data * @@ -103,6 +104,7 @@ Types::U32 mUFVolumeRejectionReason ; Types::U32 mUFPreWeightRejectionReason ; Types::U32 mUFEstimatedTargetWeightRejectionReason ; + Types::U32 mAcidConcentrateIndexRejectionReason ; } _data; public: @@ -137,6 +139,7 @@ quint32 mUFVolumeRejectionReason = 0; quint32 mUFPreWeightRejectionReason = 0; quint32 mUFEstimatedTargetWeightRejectionReason = 0; + quint32 mAcidConcentrateIndexRejectionReason = 0; }; MAdjustParametersValidationResponse () {} Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h =================================================================== diff -u -r1132f049e169cc87a059261f72fca0ceb7d739f1 -r48b04367d9f229104e4048783df91089d0106379 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision 1132f049e169cc87a059261f72fca0ceb7d739f1) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision 48b04367d9f229104e4048783df91089d0106379) @@ -96,7 +96,7 @@ * | #22:(F32) | \ref mUFVolume | * | #23:(F32) | \ref mUFPreWeight | * | #24:(F32) | \ref mUFEstimatedTargetWeight | - + * | #25:(U32) | \ref mAcidConcentrateIndex | * */ class MAdjustParametersValidationReq : public MModel { @@ -125,6 +125,7 @@ float mUFVolume = 0; // L float mUFPreWeight = 0; // kg float mUFEstimatedTargetWeight = 0; // kg + quint32 mAcidConcentrateIndex = 0; // QString toString() { return toString({ @@ -152,6 +153,7 @@ mUFVolume , mUFPreWeight , mUFEstimatedTargetWeight , + mAcidConcentrateIndex , }); } static QString toString(const QVariantList &vParameters) { Index: sources/view/VTreatmentCreate.cpp =================================================================== diff -u -r4a7dd11138d2321f1ab8d324b3bd25f02eaefe84 -r48b04367d9f229104e4048783df91089d0106379 --- sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision 4a7dd11138d2321f1ab8d324b3bd25f02eaefe84) +++ sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision 48b04367d9f229104e4048783df91089d0106379) @@ -66,6 +66,7 @@ data.mUFVolume = _ultrafiltrationVolume ; data.mUFPreWeight = _ufPreWeight ; data.mUFEstimatedTargetWeight = _ufEstimatedTargetWeight ; + data.mAcidConcentrateIndex = _acidConcentrate ; parametersConfirmed(false); parametersValidated(false); @@ -143,6 +144,7 @@ ufVolumeRejectionReason (data.mUFVolumeRejectionReason ); ufPreWeightRejectionReason (data.mUFPreWeightRejectionReason ); ufEstimatedTargetWeightRejectionReason (data.mUFEstimatedTargetWeightRejectionReason ); + acidConcentrateIndexRejectionReason (data.mAcidConcentrateIndexRejectionReason ); parametersValidated(false); } Index: sources/view/VTreatmentCreate.h =================================================================== diff -u -r1132f049e169cc87a059261f72fca0ceb7d739f1 -r48b04367d9f229104e4048783df91089d0106379 --- sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 1132f049e169cc87a059261f72fca0ceb7d739f1) +++ sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 48b04367d9f229104e4048783df91089d0106379) @@ -138,6 +138,7 @@ TRIGGER(quint32 , ufVolumeRejectionReason , 0) TRIGGER(quint32 , ufPreWeightRejectionReason , 0) TRIGGER(quint32 , ufEstimatedTargetWeightRejectionReason , 0) + TRIGGER(quint32 , acidConcentrateIndexRejectionReason , 0) VIEW_DEC_CLASS(VTreatmentCreate) VIEW_DEC_SLOT(AdjustParametersValidationResponseData)