Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -rf723048b0efe2edf7cb08b9bba2ef67c55917503 -rb2db816026524a19086e900eef867d7f5a3aa6f2 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision f723048b0efe2edf7cb08b9bba2ef67c55917503) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision b2db816026524a19086e900eef867d7f5a3aa6f2) @@ -285,11 +285,16 @@ void MessageDispatcher::onAdjustment(const AdjustSetPointsRequestData &vData) { QVariantList mData; - mData += vData.bloodFlowRate ; - mData += vData.dialysateFlowRate ; - mData += vData.dialysateTemperature ; - mData += vData.acidConcentrate ; - mData += vData.bicarbConcentrate ; + mData += vData.bloodFlowRate ; + mData += vData.dialysateFlowRate ; + mData += vData.dialysateTemperature ; + mData += vData.acidConcentrate ; + mData += vData.acidConcentrateConversionFactor ; + mData += vData.bicarbConcentrate ; + mData += vData.treatmentModality ; + mData += vData.hepatitus ; + mData += vData.sodium ; + mData += vData.bicarbonate ; onActionTransmit(GuiActionType::ID_AdjustSetPointsReq, mData); } @@ -651,25 +656,30 @@ void MessageDispatcher::onAdjustment(const AdjustParametersValidationRequestData &vData) { QVariantList mData; + mData += vData.mTreatmentModality ; + mData += vData.mHDFTreatmentMode ; mData += vData.mBloodFlowRate ; mData += vData.mDialysateFlowRate ; mData += vData.mTreatmentDuration ; - mData += vData.mSalineBolusVolume ; - mData += vData.mHeparinStopTime ; + mData += vData.mHeparinDeliveryDuration ; mData += vData.mHeparinType ; - mData += vData.mAcidConcentrate ; - mData += vData.mBicarbonateConcentrate ; + mData += vData.mDryBicarbCartSize ; + mData += vData.mSodium ; + mData += vData.mBicarbonate ; mData += vData.mDialyzerType ; + mData += vData.mFluidBolusVolume ; mData += vData.mBloodPressureMeasureInterval ; - mData += vData.mRinsebackFlowRate ; mData += vData.mRinsebackVolume ; - mData += vData.mArterialPressureLimitWindow ; - mData += vData.mVenousPressureLimitWindow ; - mData += vData.mVenousPressureLimitAsymtrc ; - mData += vData.mTransmembranePressureLimitWindow; - mData += vData.mDialysateTemp ; - mData += vData.mHeparinDispensingRate ; + mData += vData.mHepatitusBStatus ; + mData += vData.mAcidConcentrateIndex ; + mData += vData.mSubstitutionFluidVolume ; mData += vData.mHeparinBolusVolume ; + mData += vData.mHeparinDispensingRate ; + mData += vData.mDialysateTemp ; + mData += vData.mAcidConcentrateConversionFactor ; + mData += vData.mUFPreWeight ; + mData += vData.mUFEstimatedTargetWeight ; + mData += vData.mUFVolume ; onActionTransmit(GuiActionType::ID_AdjustParametersValidationReq, mData); }