Index: sources/view/settings/VAdvancedInstitutionalRecord.h =================================================================== diff -u -re49c956894f999f6539b0c404dd1c9b18a76bb4b -r49271f2bd039c9d15586c7c9b2f57f80c801d819 --- sources/view/settings/VAdvancedInstitutionalRecord.h (.../VAdvancedInstitutionalRecord.h) (revision e49c956894f999f6539b0c404dd1c9b18a76bb4b) +++ sources/view/settings/VAdvancedInstitutionalRecord.h (.../VAdvancedInstitutionalRecord.h) (revision 49271f2bd039c9d15586c7c9b2f57f80c801d819) @@ -23,7 +23,10 @@ // Project #include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" +#include "MListModel.h" +#include "MSettings.h" #include "MTDAdvancedInstitutionalRecordResponse.h" +#include "MAdjustTDAdvancedInstitutionalRecordResponse.h" namespace View { @@ -40,6 +43,39 @@ // friends friend class ::tst_views; + enum { + None = -1, + Min = 0 , + Max = 1 , + Def = 2 , + } Range; + + enum { + eRole_Title = Qt::UserRole , + eRole_Units , + eRole_Min , + eRole_Max , + eRole_Step , + eRole_Decimal , + eRole_MinVal , + eRole_MaxVal , + eRole_DefVal , + eRole_RejectionMin , + eRole_RejectionMax , + eRole_RejectionDef , + } DataRole; + + enum { + MinRoRejectionRatio , + DisinfectionFrequency , + DisinfectionParametersCycleTime , + MaxBloodPumpStopTime , + InletWaterCondLowThreshold , + InletWaterCondHighThreshold , + ChlorineWaterSampleCheck , + WaterSampleTestResultRequired + } Records; + const QStringList _titles { tr("Minimum RO Rejection Ratio Alarm" ), tr("Disinfection Frequency" ), @@ -75,23 +111,28 @@ RANGESET( quint32 , chlorineWaterSampleCheck , 0) RANGESET( quint32 , waterSampleTestResultRequired , 0) - PROPERTY(QStringList , parametersTitle , titles()) - PROPERTY(QStringList , parametersUnit , units ()) + Q_PROPERTY(MListModel* model READ model NOTIFY didModelChange) - VIEW_DEC_CLASS_ADJUSTMENT(VAdvancedInstitutionalRecord, AdvancedInstitutionalRecordResponseData) + VIEW_DEC_CLASS_ADJUSTMENT(VAdvancedInstitutionalRecord, AdvancedInstitutionalRecordResponseData ) + VIEW_DEC_SLOT(SettingsData ) + VIEW_DEC_SLOT(AdjustAdvancedInstitutionalRecordResponseData ) private: - QStringList titles() { return _titles; } - QStringList units () { return _units ; } + MListModel* model () { return &_institutionalList; } + MListModel _institutionalList; + void initModel(); public slots: void doAdjustment() { AdvancedInstitutionalRequestData data; emit didAdjustment(data); } + void clearRejectionReason(const int &vRow, const int &vRange); + signals: void didAdjustment(const AdvancedInstitutionalRequestData &vData); + void didModelChange(); }; }