Index: sources/view/td/data/VTreatmentRanges.h =================================================================== diff -u -r1164ea502e3fabdb55aa41923e0e566505f197ef -r56381aae237db191956aff493907cd1f0801216b --- sources/view/td/data/VTreatmentRanges.h (.../VTreatmentRanges.h) (revision 1164ea502e3fabdb55aa41923e0e566505f197ef) +++ sources/view/td/data/VTreatmentRanges.h (.../VTreatmentRanges.h) (revision 56381aae237db191956aff493907cd1f0801216b) @@ -23,6 +23,7 @@ #include "MTDInstitutionalRecordResponse.h" #include "MTreatmentRangesData.h" #include "MSettings.h" +#include "MListModel.h" // namespace namespace View { @@ -39,6 +40,11 @@ const QString _vitalsDef = "30"; // LEAHI_PRS_215 + enum { + eRole_Key = Qt::UserRole + 1 , + eRole_Value , + } DataRole; + // Real-time properties received from TD from TreatmentRangesData READONLY( quint32 , treatmentRanges_Duration_Min , 0) READONLY( quint32 , treatmentRanges_Duration_Max , 0) @@ -62,6 +68,7 @@ VALUESET( float , potassium , 0) VALUESET( float , calcium , 0) READONLY( QStringList , acidConcentrateOptions ,{}) + READONLY( QVariantList , acidConcentrateValues ,{}) READONLY( QStringList , bicarbonateConcentrateOptions ,{}) READONLY( QStringList , dialyzerTypeOptions ,{}) READONLY( QStringList , bloodPressureMeasureInterval ,{}) @@ -70,6 +77,8 @@ RANGESET( float , dialysateTemp , 0) RANGESET( quint32 , salineBolusVolume , 0) + Q_PROPERTY(MListModel* acidConcentrateModel READ acidConcentrateModel NOTIFY didAcidConcentrateModelChange) + // Institutional RANGESET( quint32 , dialysateBicarbonate , 0) RANGESET( quint32 , dialysateSodium , 0) @@ -117,9 +126,14 @@ VIEW_DEC_SLOT(InstitutionalRecordResponseData ) signals: - void didTreatmentRangesDone (bool vPass ); - void didPopulateAcidConcentrate ( ); + void didTreatmentRangesDone (bool vPass ); + void didPopulateAcidConcentrate ( ); + void didAcidConcentrateModelChange ( ); +private: + MListModel* acidConcentrateModel () { return &_acidConcentrateModel; } + MListModel _acidConcentrateModel; + public slots: void doSaveAcidConcentrate (const QString &vOption ); void doClearAcidConcentrate (const bool vSet );