Index: sources/view/VRxProfiles.h =================================================================== diff -u -r046fda9079b58d933faf0d4942c87c18bfdaa471 -r4ac90c09e5697ef0239364a888191b7aacf19448 --- sources/view/VRxProfiles.h (.../VRxProfiles.h) (revision 046fda9079b58d933faf0d4942c87c18bfdaa471) +++ sources/view/VRxProfiles.h (.../VRxProfiles.h) (revision 4ac90c09e5697ef0239364a888191b7aacf19448) @@ -17,9 +17,6 @@ // Qt #include #include -#include -#include -#include #include // Project @@ -28,6 +25,7 @@ #include "GuiController.h" #include "StorageGlobals.h" #include "VView.h" +#include "MListModel.h" // forward declaration class tst_views; @@ -38,6 +36,7 @@ namespace View { + class VRxProfiles : public QObject { Q_OBJECT @@ -47,82 +46,24 @@ PROPERTY(QStringList , rxProfilesList , {}) - PROPERTY(bool , heparinDispensingRateOff , true) - PROPERTY(bool , heparinBolusVolumeOff , true) - VALUESET(quint32 , bloodFlowRate , 0) - VALUESET(quint32 , dialysateFlowRate , 0) - VALUESET(quint32 , treatmentDuration , 0) - VALUESET(quint32 , salineBolusVolume , 0) - VALUESET(quint32 , heparinStopTime , 0) - VALUESET(quint32 , heparinType , 0) - VALUESET(quint32 , acidConcentrate , 0) - VALUESET(quint32 , bicarbonateConcentrate , 0) - VALUESET(quint32 , dialyzerType , 0) - VALUESET(quint32 , bloodPressureMeasureInterval , 0) - VALUESET(quint32 , rinsebackFlowRate , 0) - VALUESET(quint32 , rinsebackVolume , 0) - VALUESET(qint32 , arterialPressureLimitWindow , 0) - VALUESET(qint32 , venousPressureLimitWindow , 0) - VALUESET(qint32 , venousPressureLimitAsymtrc , 0) - VALUESET(qint32 , trancembrncPressureLimitWindow , 0) - VALUESET(float , dialysateTemp , 0) - VALUESET(float , heparinDispensingRate , 0) - VALUESET(float , heparinBolusVolume , 0) + Q_PROPERTY(MListModel* rxProfiles READ rxProfiles NOTIFY alarm_AlarmIDChanged) - VALUESET(bool , parametersValidated , 0) - VALUESET(bool , parametersConfirmed , 0) - - - 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) - TRIGGER(quint32 , rinsebackVolumeRejectReason , 0) - TRIGGER(quint32 , trancembrncPressureLimitWindowRejectReason , 0) - - VIEW_DEC_CLASS(VRxProfiles) - VIEW_DEC_SLOT(AdjustParametersValidationResponseData) - private: - QString enumToString(GuiRequestReasons vEnum); + MListModel* rxProfiles () { return &_rxProfilesModel; } ; + MListModel _rxProfilesModel; - signals: - void didAdjustment(const AdjustParametersValidationRequestData &data); - void didAdjustment(const AdjustParametersConfirmRequestData &data); - void didValidationFail(); - void didValidationPass(); - void didRxProfileList(); private slots: void onRxProfileList(const QFileInfoList &vRxProfiles); public slots: - void doValidation (); - void doConfirm (); - void doCancel (); void doInitRxProfilesList (); - - QStringList doGetPrescriptionParameterValues(); - QStringList doGetOperatingParameterValues(); }; }