Index: sources/gui/qml/components/GridSelection.qml =================================================================== diff -u -re5ae6f8513673d1c09bd04ec3da08e71bfded5e2 -r656a6e14a253c7125fa8408ae2aa0c1223009565 --- sources/gui/qml/components/GridSelection.qml (.../GridSelection.qml) (revision e5ae6f8513673d1c09bd04ec3da08e71bfded5e2) +++ sources/gui/qml/components/GridSelection.qml (.../GridSelection.qml) (revision 656a6e14a253c7125fa8408ae2aa0c1223009565) @@ -61,7 +61,7 @@ } clicked(curIndex) - active = true + active = curIndex > -1 } signal selectionResetted() Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentConfirm.qml =================================================================== diff -u -re5ae6f8513673d1c09bd04ec3da08e71bfded5e2 -r656a6e14a253c7125fa8408ae2aa0c1223009565 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentConfirm.qml (.../PreTreatmentConfirm.qml) (revision e5ae6f8513673d1c09bd04ec3da08e71bfded5e2) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentConfirm.qml (.../PreTreatmentConfirm.qml) (revision 656a6e14a253c7125fa8408ae2aa0c1223009565) @@ -39,8 +39,6 @@ // anchors.leftMargin : Variables.minVGap2 // } - onConfirmClicked: vTreatmentCreate.doConfirmParameters() // Updated the confirmed parameters for future prepopulation option - Flickable { id: _flickable objectName: "_PreTreatmentConfirmFlickable" interactive: false Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -re5ae6f8513673d1c09bd04ec3da08e71bfded5e2 -r656a6e14a253c7125fa8408ae2aa0c1223009565 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision e5ae6f8513673d1c09bd04ec3da08e71bfded5e2) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 656a6e14a253c7125fa8408ae2aa0c1223009565) @@ -138,29 +138,32 @@ anchors.horizontalCenter: parent.horizontalCenter enabled : vTreatmentCreate.isLastConfirmedParametersPopulated onClicked : { - _bloodFlowRate.prepopulate(vTreatmentCreate.bloodFlowRate_confirmed) - _dialysateFlowRate .prepopulate(vTreatmentCreate.dialysateFlowRate_confirmed) - _duration .prepopulate(vTreatmentCreate.treatmentDuration_confirmed) + // Update the underlying properties with the last confirmed stored parameter + vTreatmentCreate.prepopulateParameters() - // zero for the heparinDispensingRate is considered OFF - _heparinDispensingRateSwitch.setSwitchActive(vTreatmentCreate.heparinDispensingRate_confirmed != 0) - _heparinDispensingRate .prepopulate(vTreatmentCreate.heparinDispensingRate_confirmed) + // Update the sliders, switches, and type selections on the screen + _bloodFlowRate .prepopulate(vTreatmentCreate.bloodFlowRate ) + _dialysateFlowRate .prepopulate(vTreatmentCreate.dialysateFlowRate) + _duration .prepopulate(vTreatmentCreate.treatmentDuration) - _heparinBolusVolumeSwitch.setSwitchActive(vTreatmentCreate.heparinBolusVolume_confirmed != 0) - _heparinBolusVolume .prepopulate(vTreatmentCreate.heparinBolusVolume_confirmed) + _heparinDispensingRateSwitch.setSwitchActive(vTreatmentCreate.heparinDispensingRate != 0) // Switch for rates, considering 0 as OFF + _heparinDispensingRate .prepopulate (vTreatmentCreate.heparinDispensingRate ) - _heparinStopTime .prepopulate(vTreatmentCreate.heparinStopTime_confirmed) - _salineBolus .prepopulate(vTreatmentCreate.salineBolusVolume_confirmed) + _heparinBolusVolumeSwitch.setSwitchActive(vTreatmentCreate.heparinBolusVolume != 0) // Switch for rates, considering 0 as OFF + _heparinBolusVolume .prepopulate (vTreatmentCreate.heparinBolusVolume ) - _heparinType .setSelection(vTreatmentCreate.heparinType_confirmed) - _acidConcentrate .setSelection(vTreatmentCreate.acidConcentrate_confirmed) - _bicarbonateConcentrate .setSelection(vTreatmentCreate.bicarbonateConcentrate_confirmed) - _dialyzerType .setSelection(vTreatmentCreate.dialyzerType_confirmed) + _heparinStopTime .prepopulate(vTreatmentCreate.heparinStopTime ) + _salineBolus .prepopulate(vTreatmentCreate.salineBolusVolume) - _dialysateTemperature .prepopulate(vTreatmentCreate.dialysateTemp_confirmed) + _heparinType .setSelection(vTreatmentCreate.heparinType ) + _acidConcentrate .setSelection(vTreatmentCreate.acidConcentrate ) + _bicarbonateConcentrate .setSelection(vTreatmentCreate.bicarbonateConcentrate ) + _dialyzerType .setSelection(vTreatmentCreate.dialyzerType ) - _bloodPressureIntervalSwitch.setSwitchActive(vTreatmentCreate.bloodPressureMeasureInterval_confirmed !== 0) - _bloodPressureInterval .prepopulate(vTreatmentCreate.bloodPressureMeasureInterval_confirmed) + _dialysateTemperature .prepopulate(vTreatmentCreate.dialysateTemp ) + + _bloodPressureIntervalSwitch.setSwitchActive(vTreatmentCreate.bloodPressureMeasureInterval != 0) // Switch for rates, considering 0 as OFF + _bloodPressureInterval .prepopulate (vTreatmentCreate.bloodPressureMeasureInterval ) } } @@ -273,13 +276,13 @@ // This is a full implementation of a Switch Switch { id: _heparinDispensingRateSwitch property bool active: false - function resetSwitch() { // order of setting active and checked matters, need to set checked to // false first before active to false to obtain the correct behavior. checked = false active = false } + function setSwitchActive(vChecked) { // order of setting active and checked matters, need to set active to // true first before checked to passed value to obtain the correct behavior. @@ -290,13 +293,19 @@ onActiveChanged : { _heparinDispensingRate.active = active } + onCheckedChanged: { if ( ! active ) { active = true checked = ! checked } - vTreatmentCreate.heparinDispensingRate = 0 - _heparinDispensingRate.reset ( 0 ) + + if(!checked) { + // Reset the slider value to 0 only when we have it set to OFF + vTreatmentCreate.heparinDispensingRate = 0 + _heparinDispensingRate.reset ( 0 ) + } + _heparinDispensingRate.active = ! checked } @@ -373,8 +382,13 @@ active = true checked = ! checked } - vTreatmentCreate.heparinBolusVolume = 0 - _heparinBolusVolume.reset ( 0 ) + + if(!checked) { + // Reset the slider value to 0 only when we have it set to OFF + vTreatmentCreate.heparinBolusVolume = 0 + _heparinBolusVolume.reset ( 0 ) + } + _heparinBolusVolume.active = ! checked } @@ -860,8 +874,13 @@ active = true checked = ! checked } - vTreatmentCreate.bloodPressureMeasureInterval = 0 - _bloodPressureInterval.reset ( 0 ) + + if(!checked) { + // Reset the slider value to 0 only when we have it set to OFF + vTreatmentCreate.bloodPressureMeasureInterval = 0 + _bloodPressureInterval.reset ( 0 ) + } + _bloodPressureInterval.active = ! checked } Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h =================================================================== diff -u -re5ae6f8513673d1c09bd04ec3da08e71bfded5e2 -r656a6e14a253c7125fa8408ae2aa0c1223009565 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision e5ae6f8513673d1c09bd04ec3da08e71bfded5e2) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision 656a6e14a253c7125fa8408ae2aa0c1223009565) @@ -66,8 +66,8 @@ }; /*! - * \brief The MParameters class - * \details The base model class to hold the treatment parameters + * \brief The MAdjustParametersValidationReq class + * \details The model used to request treatment parameters validation * * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:-----------------------------------------:| @@ -94,8 +94,9 @@ * | #17:(F32) | \ref mDialysateTemp | * */ -class MParameters : public MModel { +class MAdjustParametersValidationReq : public MModel { public: + quint32 mBloodFlowRate = 0; // mL/min quint32 mDialysateFlowRate = 0; // mL/min quint32 mTreatmentDuration = 0; // minutes @@ -114,61 +115,28 @@ float mHeparinBolusVolume = 0; // mL float mDialysateTemp = 0; // Celsius - QVariantList getParametersList() { - return(QVariantList({ - mBloodFlowRate , - mDialysateFlowRate , - mTreatmentDuration , - mHeparinStopTime , - mSalineBolus , - mAcidConcentrate , - mBicarbonateConcentrate , - mDialyzerType , - mHeparinType , //FIXME: DEN-15377: to set the heparintype to not selected (-1) is used which is incorrect, since the type is unsigned. (No issue for now but is not correct.) - mBloodPressureMeasureInterval , - mRinsebackFlowRate , - mArterialPressureLimitWindow , - mVenousPressureLimitWindow , - mVenousPressureLimitAsymtrc , - mHeparinDispensingRate , - mHeparinBolusVolume , - mDialysateTemp , - })); - } - - void copy(const MParameters &vParams) { - //DEBUG: qDebug()<< Q_FUNC_INFO; - - mBloodFlowRate = vParams.mBloodFlowRate; - mDialysateFlowRate = vParams.mDialysateFlowRate; - mTreatmentDuration = vParams.mTreatmentDuration; - mHeparinStopTime = vParams.mHeparinStopTime; - mSalineBolus = vParams.mSalineBolus; - mAcidConcentrate = vParams.mAcidConcentrate; - mBicarbonateConcentrate = vParams.mBicarbonateConcentrate; - mDialyzerType = vParams.mDialyzerType; - mHeparinType = vParams.mHeparinType; - mBloodPressureMeasureInterval = vParams.mBloodPressureMeasureInterval; - mRinsebackFlowRate = vParams.mRinsebackFlowRate; - mArterialPressureLimitWindow = vParams.mArterialPressureLimitWindow; - mVenousPressureLimitWindow = vParams.mVenousPressureLimitWindow; - mVenousPressureLimitAsymtrc = vParams.mVenousPressureLimitAsymtrc; - mHeparinDispensingRate = vParams.mHeparinDispensingRate; - mHeparinBolusVolume = vParams.mHeparinBolusVolume; - mDialysateTemp = vParams.mDialysateTemp; - } -}; - -/*! - * \brief The MAdjustParametersValidationReq class - * \details The model used to request treatment parameters validation - */ -class MAdjustParametersValidationReq : public MParameters { -public: // disabled coco begin validated : Has been validated manually. // This object is used statically for now, kept the logic for later usage. QString toString() { - return toString(getParametersList()); + return toString({ + mBloodFlowRate , + mDialysateFlowRate , + mTreatmentDuration , + mHeparinStopTime , + mSalineBolus , + mAcidConcentrate , + mBicarbonateConcentrate , + mDialyzerType , + mHeparinType , //FIXME: DEN-15377: to set the heparintype to not selected (-1) is used which is incorrect, since the type is unsigned. (No issue for now but is not correct.) + mBloodPressureMeasureInterval , + mRinsebackFlowRate , + mArterialPressureLimitWindow , + mVenousPressureLimitWindow , + mVenousPressureLimitAsymtrc , + mHeparinDispensingRate , + mHeparinBolusVolume , + mDialysateTemp , + }); } // disabled coco end static QString toString(const QVariantList &vParameters) { @@ -177,23 +145,6 @@ }; /*! - * \brief The MAdjustParametersStored class - * \details The model used to store the unconfirmed treatement parameters for pre-populating - */ -class MAdjustParametersStored: public MParameters { -public: - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. - QString toString() { - return toString(getParametersList()); - } - // disabled coco end - static QString toString(const QVariantList &vParameters) { - return MModel::toString("PrepopulateParameters", vParameters); - } -}; - -/*! * \brief The MAdjustParametersConfirmReq class * \details The model to tell HD treatment parameters have been confirmed * @@ -484,4 +435,3 @@ typedef Model:: MAdjustUltrafiltrationInitReq AdjustUltrafiltrationInitRequestData; typedef Model:: MAdjustPatientConnectionConfirmReq AdjustPatientConnectionConfirmRequestData; typedef Model:: MAdjustStartTreatmentReq AdjustStartTreatmentRequestData; -typedef Model:: MAdjustParametersStored AdjustParametersStoredData; Index: sources/view/VTreatmentCreate.cpp =================================================================== diff -u -re5ae6f8513673d1c09bd04ec3da08e71bfded5e2 -r656a6e14a253c7125fa8408ae2aa0c1223009565 --- sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision e5ae6f8513673d1c09bd04ec3da08e71bfded5e2) +++ sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision 656a6e14a253c7125fa8408ae2aa0c1223009565) @@ -38,7 +38,6 @@ * Validates the treatment profile locally, then requests validation of it with FW */ void VTreatmentCreate::doValidation() { - AdjustParametersValidationRequestData data; data.mBloodFlowRate = _bloodFlowRate ; @@ -59,11 +58,6 @@ data.mBloodPressureMeasureInterval = _bloodPressureMeasureInterval ; data.mRinsebackFlowRate = _rinsebackFlowRate ; - // copy unconfirmed/unvalidated parameters into temporary model - _storedParameters.copy(data); - - //DEBUG: qDebug()<< "Unconfirmed Parameters : " << _storedParameters.toString(); - emit didAdjustment(data); } @@ -74,6 +68,8 @@ * \note Finished create treatment confirm... */ void VTreatmentCreate::doConfirm() { + updateConfirmedTreatmentParams(); + AdjustParametersConfirmRequestData confirmTreatmentRequest; confirmTreatmentRequest.requestedState = AdjustParametersConfirmRequestData::eConfirm; emit didAdjustment(confirmTreatmentRequest); @@ -140,6 +136,33 @@ } /*! + * \brief VCreateTreatment::updateConfirmedTreatmentParams + * \details Update the stored member variable for confirmed treatment parameters + */ +void VTreatmentCreate::updateConfirmedTreatmentParams() { + isLastConfirmedParametersPopulated(true); + + // update the confirmed parameter model for pre-populate treatment option + _confirmedTxParamsData.mBloodFlowRate = _bloodFlowRate ; + _confirmedTxParamsData.mDialysateFlowRate = _dialysateFlowRate ; + _confirmedTxParamsData.mTreatmentDuration = _treatmentDuration ; + _confirmedTxParamsData.mHeparinDispensingRate = _heparinDispensingRate ; + _confirmedTxParamsData.mHeparinBolusVolume = _heparinBolusVolume ; + _confirmedTxParamsData.mHeparinStopTime = _heparinStopTime ; + _confirmedTxParamsData.mSalineBolus = _salineBolusVolume ; + _confirmedTxParamsData.mHeparinType = _heparinType ; + _confirmedTxParamsData.mAcidConcentrate = _acidConcentrate ; + _confirmedTxParamsData.mBicarbonateConcentrate = _bicarbonateConcentrate ; + _confirmedTxParamsData.mDialyzerType = _dialyzerType ; + _confirmedTxParamsData.mDialysateTemp = _dialysateTemp ; + _confirmedTxParamsData.mArterialPressureLimitWindow = _arterialPressureLimitWindow ; + _confirmedTxParamsData.mVenousPressureLimitWindow = _venousPressureLimitWindow ; + _confirmedTxParamsData.mVenousPressureLimitAsymtrc = _venousPressureLimitAsymtrc ; + _confirmedTxParamsData.mBloodPressureMeasureInterval = _bloodPressureMeasureInterval ; + _confirmedTxParamsData.mRinsebackFlowRate = _rinsebackFlowRate ; +} + +/*! * \brief VCreateTreatment::doGetPrescriptionParameterValues * \details Gets a list of the prescription parameter values * \return (QStringList) The list of parameter values with units @@ -204,31 +227,27 @@ << QString("%0 mL/min" ).arg(_rinsebackFlowRate ); } -/** - * \brief VCreateTreatment::doConfirmParameters - * \details Copies confirmed treatment parameters into the properties for pre-populating applying +/*! + * \brief VCreateTreatment::prepopulateParameters + * \details Set the current treatment parameter properties to last confirmed parameters */ -void VTreatmentCreate::doConfirmParameters() { - - isLastConfirmedParametersPopulated(true); - - _bloodFlowRate_confirmed = _storedParameters.mBloodFlowRate ; - _dialysateFlowRate_confirmed = _storedParameters.mDialysateFlowRate ; - _treatmentDuration_confirmed = _storedParameters.mTreatmentDuration ; - _heparinDispensingRate_confirmed = _storedParameters.mHeparinDispensingRate ; - _heparinBolusVolume_confirmed = _storedParameters.mHeparinBolusVolume ; - _heparinStopTime_confirmed = _storedParameters.mHeparinStopTime ; - _salineBolusVolume_confirmed = _storedParameters.mSalineBolus ; - _heparinType_confirmed = _storedParameters.mHeparinType ; - _acidConcentrate_confirmed = _storedParameters.mAcidConcentrate ; - _bicarbonateConcentrate_confirmed = _storedParameters.mBicarbonateConcentrate ; - _dialyzerType_confirmed = _storedParameters.mDialyzerType ; - _dialysateTemp_confirmed = _storedParameters.mDialysateTemp ; - _arterialPressureLimitWindow_confirmed = _storedParameters.mArterialPressureLimitWindow ; - _venousPressureLimitWindow_confirmed = _storedParameters.mVenousPressureLimitWindow ; - _venousPressureLimitAsymtrc_confirmed = _storedParameters.mVenousPressureLimitAsymtrc ; - _bloodPressureMeasureInterval_confirmed = _storedParameters.mBloodPressureMeasureInterval ; - _rinsebackFlowRate_confirmed = _storedParameters.mRinsebackFlowRate ; - - //DEBUG: qDebug()<< Q_FUNC_INFO << " isPopulated : " << _isLastConfirmedParametersPopulated << _storedParameters.toString(); +void VTreatmentCreate::prepopulateParameters() { + // update the confirmed parameter model for pre-populate treatment option + bloodFlowRate ( _confirmedTxParamsData.mBloodFlowRate ); + dialysateFlowRate ( _confirmedTxParamsData.mDialysateFlowRate ); + treatmentDuration ( _confirmedTxParamsData.mTreatmentDuration ); + heparinDispensingRate ( _confirmedTxParamsData.mHeparinDispensingRate ); + heparinBolusVolume ( _confirmedTxParamsData.mHeparinBolusVolume ); + heparinStopTime ( _confirmedTxParamsData.mHeparinStopTime ); + salineBolusVolume ( _confirmedTxParamsData.mSalineBolus ); + heparinType ( _confirmedTxParamsData.mHeparinType ); + acidConcentrate ( _confirmedTxParamsData.mAcidConcentrate ); + bicarbonateConcentrate ( _confirmedTxParamsData.mBicarbonateConcentrate ); + dialyzerType ( _confirmedTxParamsData.mDialyzerType ); + dialysateTemp ( _confirmedTxParamsData.mDialysateTemp ); + arterialPressureLimitWindow ( _confirmedTxParamsData.mArterialPressureLimitWindow ); + venousPressureLimitWindow ( _confirmedTxParamsData.mVenousPressureLimitWindow ); + venousPressureLimitAsymtrc ( _confirmedTxParamsData.mVenousPressureLimitAsymtrc ); + bloodPressureMeasureInterval( _confirmedTxParamsData.mBloodPressureMeasureInterval ); + rinsebackFlowRate ( _confirmedTxParamsData.mRinsebackFlowRate ); } Index: sources/view/VTreatmentCreate.h =================================================================== diff -u -re5ae6f8513673d1c09bd04ec3da08e71bfded5e2 -r656a6e14a253c7125fa8408ae2aa0c1223009565 --- sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision e5ae6f8513673d1c09bd04ec3da08e71bfded5e2) +++ sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 656a6e14a253c7125fa8408ae2aa0c1223009565) @@ -37,15 +37,6 @@ #define UNSET 9999 -/* PARAMETER_PAIR macro allows defining two properties for each parameter. - * One property for the current value used towards treatment and a secondary for pre-populating - * a treatement on the create treatment screen. Done this way for better syncing when adding/removing - * a parameter. Adding here since it's only used here, in VTreatmentCreate - */ -#define PARAMETER_PAIR( vTYPE , vVARIABLE , vDEFVALUE ) \ - VALUESET( vTYPE , vVARIABLE , vDEFVALUE ) \ - VALUESET( vTYPE , vVARIABLE##_confirmed , vDEFVALUE ) - namespace View { /*! @@ -83,28 +74,26 @@ // friends friend class::tst_views; - PARAMETER_PAIR(quint32 , bloodFlowRate , 0) - PARAMETER_PAIR(quint32 , dialysateFlowRate , 0) - PARAMETER_PAIR(quint32 , treatmentDuration , 0) - PARAMETER_PAIR(float , heparinDispensingRate , 0) - PARAMETER_PAIR(float , heparinBolusVolume , 0) - PARAMETER_PAIR(quint32 , heparinStopTime , 0) - PARAMETER_PAIR(quint32 , salineBolusVolume , 0) + VALUESET(quint32 , bloodFlowRate , 0) + VALUESET(quint32 , dialysateFlowRate , 0) + VALUESET(quint32 , treatmentDuration , 0) + VALUESET(float , heparinDispensingRate , 0) + VALUESET(float , heparinBolusVolume , 0) + VALUESET(quint32 , heparinStopTime , 0) + VALUESET(quint32 , salineBolusVolume , 0) - PARAMETER_PAIR(quint32 , heparinType , 0) - PARAMETER_PAIR(quint32 , acidConcentrate , 0) - PARAMETER_PAIR(quint32 , bicarbonateConcentrate , 0) - PARAMETER_PAIR(quint32 , dialyzerType , 0) + VALUESET(quint32 , heparinType , 0) + VALUESET(quint32 , acidConcentrate , 0) + VALUESET(quint32 , bicarbonateConcentrate , 0) + VALUESET(quint32 , dialyzerType , 0) - PARAMETER_PAIR(qreal , dialysateTemp , 0) - PARAMETER_PAIR(qint32 , arterialPressureLimitWindow , 0) - PARAMETER_PAIR(qint32 , venousPressureLimitWindow , 0) - PARAMETER_PAIR(qint32 , venousPressureLimitAsymtrc , 0) - PARAMETER_PAIR(quint32 , bloodPressureMeasureInterval , 0) - PARAMETER_PAIR(quint32 , rinsebackFlowRate , 0) + VALUESET(qreal , dialysateTemp , 0) + VALUESET(qint32 , arterialPressureLimitWindow , 0) + VALUESET(qint32 , venousPressureLimitWindow , 0) + VALUESET(qint32 , venousPressureLimitAsymtrc , 0) + VALUESET(quint32 , bloodPressureMeasureInterval , 0) + VALUESET(quint32 , rinsebackFlowRate , 0) - PROPERTY( bool , isLastConfirmedParametersPopulated , false ) // for enabling/disabling the populate button in QML - VALUESET(QString , patientID ,"") VALUESET(bool , continueEnabled , 0) @@ -128,13 +117,17 @@ TRIGGER (quint32 , bloodPressureMeasureIntervalRejectReason , 0 ) TRIGGER (quint32 , rinsebackFlowRateRejectReason , 0 ) + PROPERTY( bool , isLastConfirmedParametersPopulated , false ) // for enabling/disabling the populate button in QML + VIEW_DEC_CLASS(VTreatmentCreate) VIEW_DEC_SLOT(AdjustParametersValidationResponseData) private: QString enumToString(GuiRequestReasons vEnum); - AdjustParametersStoredData _storedParameters; + void updateConfirmedTreatmentParams(); + AdjustParametersValidationRequestData _confirmedTxParamsData; + signals: void didAdjustment(const AdjustParametersValidationRequestData &data); void didAdjustment(const AdjustParametersConfirmRequestData &data); @@ -146,10 +139,9 @@ void doValidation (); void doConfirm (); void doCancel (); + void prepopulateParameters(); QStringList doGetPrescriptionParameterValues(); QStringList doGetOperatingParameterValues(); - - void doConfirmParameters(); }; }