Index: AlarmMapping.csv =================================================================== diff -u -r39a9d9b3930ab483df75da6c2e7bf8838fa8ff5e -red9ea343a2a22623796045d9e1229a2cbfa8c970 --- AlarmMapping.csv (.../AlarmMapping.csv) (revision 39a9d9b3930ab483df75da6c2e7bf8838fa8ff5e) +++ AlarmMapping.csv (.../AlarmMapping.csv) (revision ed9ea343a2a22623796045d9e1229a2cbfa8c970) @@ -148,14 +148,14 @@ 147,"DG dialysate generation conductivity fault alarm." 148,"Inlet water temperature too high." 149,"Inlet water temperature too low." - 150,"Inlet water conductivity too high." + 150,"Inlet water conductivity is in warning range." 151,"Inlet water conductivity too low." 152,"Inlet water pressure too low." 153,"HD prime completed high priority alarm." 154,"EEPROM operations (read, write, erase) failure." 155,"DG software configuration record invalid CRC." 156,"HW usage data (treatment time in HD and total consumed water in DG) failure." - 157,"This alarm ID is available for use." + 157,"Inlet water temperature is not within specified range." 158,"This alarm ID is available for use." 159,"Dialysate inlet pump failed flow vs motor speed check." 160,"Blood pump rotor speed too high." Index: denali.pro =================================================================== diff -u -raa7591d9f61f5d8d5a2b3604d4c37d6cea829700 -red9ea343a2a22623796045d9e1229a2cbfa8c970 --- denali.pro (.../denali.pro) (revision aa7591d9f61f5d8d5a2b3604d4c37d6cea829700) +++ denali.pro (.../denali.pro) (revision ed9ea343a2a22623796045d9e1229a2cbfa8c970) @@ -165,6 +165,7 @@ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.h \ + sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.h \ @@ -415,6 +416,7 @@ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.cpp \ + sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.cpp \ Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -red9ea343a2a22623796045d9e1229a2cbfa8c970 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision ed9ea343a2a22623796045d9e1229a2cbfa8c970) @@ -156,6 +156,7 @@ {Gui::GuiActionType::ID_SelfTestNoCartridgeData , 2 * 4 }, // 2 parameters each 4bytes // Pre-Treatment Disposables Installation Confirm {Gui::GuiActionType::ID_AdjustDisposablesConfirmReq , 0 * 4 }, // 0 parameter + {Gui::GuiActionType::ID_AdjustDisposablesConfirmRsp , 2 * 4 }, // 2 parameter // Pre-Treatment SelfTest Dry Progress Data {Gui::GuiActionType::ID_SelfTestDryData , 2 * 4 }, // 2 parameters each 4bytes // Pre-Treatment Disposable Priming Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r526875e8db8cf0c97f5cd8aa90564e41d42f5fde -red9ea343a2a22623796045d9e1229a2cbfa8c970 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 526875e8db8cf0c97f5cd8aa90564e41d42f5fde) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision ed9ea343a2a22623796045d9e1229a2cbfa8c970) @@ -441,6 +441,7 @@ 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_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; Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -red9ea343a2a22623796045d9e1229a2cbfa8c970 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision ed9ea343a2a22623796045d9e1229a2cbfa8c970) @@ -162,6 +162,7 @@ ID_SelfTestNoCartridgeData = 0x6100, // 97 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response // Pre-Treatment Disposables Installation Confirm ID_AdjustDisposablesConfirmReq = 0x6200, // 98 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response + ID_AdjustDisposablesConfirmRsp = 0xAD00, // 173 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response // Pre-Treatment SelfTest Dry Progress Data ID_SelfTestDryData = 0x6300, // 99 // Pre-Treatment Disposable Priming Index: sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -red9ea343a2a22623796045d9e1229a2cbfa8c970 --- sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml (.../PreTreatmentDisposablesStack.qml) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml (.../PreTreatmentDisposablesStack.qml) (revision ed9ea343a2a22623796045d9e1229a2cbfa8c970) @@ -98,6 +98,19 @@ onInstallationChanged : { page( _preTreatmentDisposablesCartridgeInstallation , vinstallation )} } + // FIXME: this is just a BandAid + // there should be a final screen after SalineBag to collect HD errors of user disposables installation + // the current message response regarding of the error will be displayed on the SalineBag screen which at least currently doesn't related to that screen (It is Heparin Syringe not installed.) + Connections { target: vPreTreatmentAdjustmentDisposablesConfirm + onAdjustmentTriggered : { + if ( vPreTreatmentAdjustmentDisposablesConfirm.adjustment_Accepted ) { + _preTreatmentDisposablesSalineBag.reasonText = "" + } else { + _preTreatmentDisposablesSalineBag.reasonText = vPreTreatmentAdjustmentDisposablesConfirm.text() + } + } + } + onVisibleChanged: { if (visible) { _mainMenu.hidden = true Index: sources/model/MModel.h =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -red9ea343a2a22623796045d9e1229a2cbfa8c970 --- sources/model/MModel.h (.../MModel.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/model/MModel.h (.../MModel.h) (revision ed9ea343a2a22623796045d9e1229a2cbfa8c970) @@ -97,6 +97,7 @@ #include "MPreTreatmentAdjustWaterSampleResponse.h" #include "MPreTreatmentSelfTestNoCartridgeData.h" #include "MPreTreatmentSelfTestDryData.h" +#include "MPreTreatmentAdjustDisposablesConfirmResponse.h" #include "MPreTreatmentAdjustDisposablesPrimeResponse.h" #include "MPreTreatmentDisposablesPrimeData.h" #include "MPreTreatmentAdjustPatientConnectionBeginResponse.h" @@ -385,6 +386,7 @@ REGISTER_METATYPE( AdjustInitTreatmentResponseData ) \ REGISTER_METATYPE( AdjustParametersValidationResponseData ) \ REGISTER_METATYPE( AdjustWaterSampleResponseData ) \ + REGISTER_METATYPE( AdjustDisposablesConfirmResponseData ) \ REGISTER_METATYPE( AdjustDisposablesPrimeResponseData ) \ REGISTER_METATYPE( AdjustPatientConnectionBeginResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationInitResponseData ) \ @@ -506,6 +508,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustInitTreatmentResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustParametersValidationResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustWaterSampleResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDisposablesConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDisposablesPrimeResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPatientConnectionBeginResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationInitResponseData ) \ @@ -678,6 +681,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustInitTreatmentResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustParametersValidationResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustWaterSampleResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDisposablesConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDisposablesPrimeResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPatientConnectionBeginResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationInitResponseData ) \ @@ -934,6 +938,7 @@ ACTION_RECEIVE_SIGNAL( AdjustInitTreatmentResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustParametersValidationResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustWaterSampleResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustDisposablesConfirmResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustDisposablesPrimeResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustPatientConnectionBeginResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationInitResponseData ) \ Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp =================================================================== diff -u --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp (revision 0) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp (revision ed9ea343a2a22623796045d9e1229a2cbfa8c970) @@ -0,0 +1,45 @@ +/*! + * + * Copyright (c) 2021-2022 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MPreTreatmentAdjustDisposablesConfirmResponse.cpp + * \author (last) Behrouz NematiPour + * \date (last) 11-Apr-2021 + * \author (original) Behrouz NematiPour + * \date (original) 11-Apr-2021 + * + */ +#include "MPreTreatmentAdjustDisposablesConfirmResponse.h" + +using namespace Model; + +QVariantList MAdjustDisposablesConfirmResponse::parameters() const { + return { + _data.mAccepted.value, + _data.mReason .value, + }; +} + +bool MAdjustDisposablesConfirmResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { + int index = 0; // message data start position + if (GetValue(vByteArray, index, _data.mAccepted )) + if (GetValue(vByteArray, index, _data.mReason )) + return true ; + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } +} + +/*! + * \brief MAdjustDisposablesConfirmResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +AdjustDisposablesConfirmResponseData MAdjustDisposablesConfirmResponse::data() const { + Data data; + data.mAccepted = _data.mAccepted.value; + data.mReason = _data.mReason .value; + return data; +} Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.h =================================================================== diff -u --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.h (revision 0) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.h (revision ed9ea343a2a22623796045d9e1229a2cbfa8c970) @@ -0,0 +1,84 @@ +/*! + * + * Copyright (c) 2021-2022 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN + * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file MPreTreatmentAdjustDisposablesConfirmResponse.h + * \author (last) Behrouz NematiPour + * \date (last) 11-Apr-2021 + * \author (original) Behrouz NematiPour + * \date (original) 11-Apr-2021 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustDisposablesConfirmResponse class + * \details The DisposablesConfirm adjustment response model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:-----------:| + * |0xAD00| 0x020 | Rsp | Y | HD | UI | DisposablesConfirm Response | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * + * \sa Data + * \sa MAdjustDisposablesConfirmReq : DisposablesConfirm Request + * \sa MTreatmentDisposablesConfirm : DisposablesConfirm Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | HD | + * | infoText | AdjustDisposablesConfirm | + * + */ +class MAdjustDisposablesConfirmResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U32 mAccepted; + Types::U32 mReason ; + } _data; + +public: + + Type_Enum typeText () const override { return Type_Enum::eEvent ; } + Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + QString infoText () const override { return QString("AdjustDisposablesConfirm") ; } + + struct Data { + bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ + quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ + }; + + MAdjustDisposablesConfirmResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MAdjustDisposablesConfirmResponse::Data AdjustDisposablesConfirmResponseData; Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r0552e825eebff72cbfd7f4f2fbb74b46c80f1e21 -red9ea343a2a22623796045d9e1229a2cbfa8c970 --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 0552e825eebff72cbfd7f4f2fbb74b46c80f1e21) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision ed9ea343a2a22623796045d9e1229a2cbfa8c970) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 21-Feb-2022 + * \date (last) 23-Feb-2022 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * @@ -183,14 +183,14 @@ /*0147*/case GuiAlarmID::ALARM_ID_DIALYSATE_CONDUCTIVITY_FAULT : { result = QObject::tr("DG dialysate generation conductivity fault alarm." ); break; } /* 147*/ /*0148*/case GuiAlarmID::ALARM_ID_INLET_WATER_HIGH_TEMPERATURE : { result = QObject::tr("Inlet water temperature too high." ); break; } /* 148*/ /*0149*/case GuiAlarmID::ALARM_ID_INLET_WATER_LOW_TEMPERATURE : { result = QObject::tr("Inlet water temperature too low." ); break; } /* 149*/ -/*0150*/case GuiAlarmID::ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY : { result = QObject::tr("Inlet water conductivity too high." ); break; } /* 150*/ +/*0150*/case GuiAlarmID::ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_WARNING_RANGE : { result = QObject::tr("Inlet water conductivity is in warning range." ); break; } /* 150*/ /*0151*/case GuiAlarmID::ALARM_ID_INLET_WATER_LOW_CONDUCTIVITY : { result = QObject::tr("Inlet water conductivity too low." ); break; } /* 151*/ /*0152*/case GuiAlarmID::ALARM_ID_INLET_WATER_LOW_PRESSURE : { result = QObject::tr("Inlet water pressure too low." ); break; } /* 152*/ /*0153*/case GuiAlarmID::ALARM_ID_PRIME_COMPLETED_HIGH : { result = QObject::tr("HD prime completed high priority alarm." ); break; } /* 153*/ /*0154*/case GuiAlarmID::ALARM_ID_NVDATA_EEPROM_OPS_FAILURE : { result = QObject::tr("EEPROM operations (read, write, erase) failure." ); break; } /* 154*/ /*0155*/case GuiAlarmID::ALARM_ID_HD_SW_CONFIG_RECORD_INVALID_CRC : { result = QObject::tr("DG software configuration record invalid CRC." ); break; } /* 155*/ /*0156*/case GuiAlarmID::ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR : { result = QObject::tr("HW usage data (treatment time in HD and total consumed water in DG) failure." ); break; } /* 156*/ -/*0157*/case GuiAlarmID::ALARM_ID____AVAILABLE_23 : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 157*/ +/*0157*/case GuiAlarmID::ALARM_ID_INLET_WATER_TEMPERATURE_OUT_OF_RANGE : { result = QObject::tr("Inlet water temperature is not within specified range." ); break; } /* 157*/ /*0158*/case GuiAlarmID::ALARM_ID____AVAILABLE_24 : { result = QObject::tr("This alarm ID is available for use." ); break; } /* 158*/ /*0159*/case GuiAlarmID::ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK : { result = QObject::tr("Dialysate inlet pump failed flow vs motor speed check." ); break; } /* 159*/ /*0160*/case GuiAlarmID::ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH : { result = QObject::tr("Blood pump rotor speed too high." ); break; } /* 160*/ Index: sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -red9ea343a2a22623796045d9e1229a2cbfa8c970 --- sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp (.../VPreTreatmentAdjustmentDisposablesConfirm.cpp) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp (.../VPreTreatmentAdjustmentDisposablesConfirm.cpp) (revision ed9ea343a2a22623796045d9e1229a2cbfa8c970) @@ -24,9 +24,25 @@ */ void View::VPreTreatmentAdjustmentDisposablesConfirm::initConnections() { ADJUST_VIEW_CONNECTION(AdjustDisposablesConfirmRequestData); + ACTION_VIEW_CONNECTION(AdjustDisposablesConfirmResponseData); } /*! + * \brief VPreTreatmentAdjustmentUltrafiltrationInit::onActionReceive + * \details received response model data handler + * \param vData - model data + */ +void View::VPreTreatmentAdjustmentDisposablesConfirm::onActionReceive(const AdjustDisposablesConfirmResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + + // *** has to be the last to let the information to be set and then emit the signal *** + // *** otherwise will use the previous values before being set. *** + adjustment ( true ); +} + +/*! * \brief View::VPreTreatmentAdjustmentDisposablesConfirm::doConfirm * \details the invocable slot to send user's Disposables installation confirm */ Index: sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -red9ea343a2a22623796045d9e1229a2cbfa8c970 --- sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h (.../VPreTreatmentAdjustmentDisposablesConfirm.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h (.../VPreTreatmentAdjustmentDisposablesConfirm.h) (revision ed9ea343a2a22623796045d9e1229a2cbfa8c970) @@ -19,6 +19,7 @@ // Project #include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" +#include "MPreTreatmentAdjustDisposablesConfirmResponse.h" namespace View { @@ -43,7 +44,7 @@ TRIGGER( bool , adjustment , 0) // coco end - VIEW_DEC_CLASS(VPreTreatmentAdjustmentDisposablesConfirm) + VIEW_DEC_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentDisposablesConfirm, AdjustDisposablesConfirmResponseData) public slots: void doConfirm();