Index: sources/view/VListModel.h =================================================================== diff -u -r171387aefe2f3d21245ff32fc9b9656c79bfa406 -rfb1185f1c17778a9f8b300170d8d635a1532f6b4 --- sources/view/VListModel.h (.../VListModel.h) (revision 171387aefe2f3d21245ff32fc9b9656c79bfa406) +++ sources/view/VListModel.h (.../VListModel.h) (revision fb1185f1c17778a9f8b300170d8d635a1532f6b4) @@ -8,6 +8,7 @@ #include "VView.h" #include "MListModel.h" +#include "MSettings.h" // namespace namespace View { @@ -24,21 +25,34 @@ Q_OBJECT enum { - Treatment = 0, - Trends = 1, - Heparin = 2, - HDF = 3 + eTreatment = 0, + eTrends = 1, + eHeparin = 2, + eHDF = 3 } TreatmentScreen; enum { eRole_Text = Qt::UserRole +1 , eRole_Visible , eRole_Screen , eRole_StatusColor - } HeaderbarDataRole; + } DataRole; - Q_PROPERTY(MListModel* headerbarModel READ headerbarModel NOTIFY didHeaderbarModelChange) + enum { + eWaterSample = 0, + eDialysateChecks= 1 + } WaterSample; + + Q_PROPERTY(MListModel* headerbarModel READ headerbarModel NOTIFY didHeaderbarModelChange) + Q_PROPERTY(MListModel* waterSampleModel READ waterSampleModel NOTIFY didWaterSampleModelChange) + + PROPERTY ( int , roWaterMode , 0) + PROPERTY ( int , heparinSyringePump , 0) + + VIEW_DEC_SLOT(SettingsData ) + + public: explicit VListModel(QObject *parent = nullptr); @@ -53,10 +67,14 @@ MListModel* headerbarModel () { return &_headerbarModel; } MListModel _headerbarModel; + MListModel* waterSampleModel () { return &_waterSampleModel; } + MListModel _waterSampleModel; + void initModel(); signals: void didHeaderbarModelChange(); + void didWaterSampleModelChange(); }; }