Index: sources/view/VTreatmentCreate.h =================================================================== diff -u -r5e03d3f26ea0c88562e430c4b8192dd745fa1011 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 5e03d3f26ea0c88562e430c4b8192dd745fa1011) +++ sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,13 +1,13 @@ /*! * - * Copyright (c) 2020-2022 Diality Inc. - All Rights Reserved. + * Copyright (c) 2020-2024 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 VTreatmentCreate.h * \author (last) Behrouz NematiPour - * \date (last) 19-Jul-2022 + * \date (last) 24-Jan-2024 * \author (original) Peter Lucia * \date (original) 22-Sep-2020 * @@ -24,6 +24,8 @@ // Project #include "MPreTreatmentAdjustParametersValidationResponse.h" +#include "MAdjustHDSerialNumberResponse.h" + #include "GuiController.h" #include "StorageGlobals.h" #include "VView.h" @@ -35,8 +37,6 @@ using namespace Gui; using namespace Model; -#define UNSET 9999 - namespace View { /*! @@ -74,6 +74,11 @@ // friends friend class::tst_views; + QString _HDSerialNumber = ""; + + PROPERTY(bool , heparinDispensingRateOff , true) + PROPERTY(bool , heparinBolusVolumeOff , true) + VALUESET(quint32 , bloodFlowRate , 0) VALUESET(quint32 , dialysateFlowRate , 0) VALUESET(quint32 , treatmentDuration , 0) @@ -88,29 +93,53 @@ VALUESET(quint32 , dialyzerType , 0) VALUESET(qreal , dialysateTemp , 0) - VALUESET(qint32 , arterialPressureLimitLow , 0) - VALUESET(qint32 , arterialPressureLimitHigh , 0) - VALUESET(qint32 , venousPressureLimitLow , 0) - VALUESET(qint32 , venousPressureLimitHigh , 0) + VALUESET(qint32 , arterialPressureLimitWindow , 0) + VALUESET(qint32 , venousPressureLimitWindow , 0) + VALUESET(qint32 , venousPressureLimitAsymtrc , 0) VALUESET(quint32 , bloodPressureMeasureInterval , 0) VALUESET(quint32 , rinsebackFlowRate , 0) VALUESET(QString , patientID ,"") VALUESET(bool , continueEnabled , 0) + PROPERTY(QString , txCode , "") + + TRIGGER (quint32 , bloodFlowRateRejectReason , 0 ) + TRIGGER (quint32 , dialysateFlowRateRejectReason , 0 ) + TRIGGER (quint32 , treatmentDurationRejectReason , 0 ) + TRIGGER (quint32 , heparinDispensingRateRejectReason , 0 ) + TRIGGER (quint32 , heparinBolusVolumeRejectReason , 0 ) + TRIGGER (quint32 , heparinStopTimeRejectReason , 0 ) + TRIGGER (quint32 , salineBolusVolumeRejectReason , 0 ) + + TRIGGER(quint32 , heparinTypeRejectReason , 0 ) + TRIGGER(quint32 , acidConcentrateRejectReason , 0 ) + TRIGGER(quint32 , bicarbonateConcentrateRejectReason , 0 ) + TRIGGER(quint32 , dialyzerTypeRejectReason , 0 ) + + TRIGGER (quint32 , dialysateTempRejectReason , 0 ) + TRIGGER (quint32 , arterialPressureLimitWindowRejectReason , 0 ) + TRIGGER (quint32 , venousPressureLimitWindowRejectReason , 0 ) + TRIGGER (quint32 , venousPressureLimitAsymtrcRejectReason , 0 ) + TRIGGER (quint32 , bloodPressureMeasureIntervalRejectReason , 0 ) + TRIGGER (quint32 , rinsebackFlowRateRejectReason , 0 ) + + VIEW_DEC_CLASS(VTreatmentCreate) VIEW_DEC_SLOT(AdjustParametersValidationResponseData) + VIEW_DEC_SLOT(AdjustSerialNumberHDResponseData) private: QString enumToString(GuiRequestReasons vEnum); + void generateTxCode(); + signals: void didAdjustment(const AdjustParametersValidationRequestData &data); void didAdjustment(const AdjustParametersConfirmRequestData &data); - void fwValidationFailed(QString reason); - void fwValidationSuccess(); - void scrollToParameter(QString parameter); + void didValidationFail(); + void didValidationPass(); public slots: void doValidation ();