Index: sources/view/VRxProfiles.h =================================================================== diff -u -ra3eef4554f2619b7b89822e776032ce8a2b4ca1e -r1f927e37764a81fb6538b5cf7a74d8beacf56aac --- sources/view/VRxProfiles.h (.../VRxProfiles.h) (revision a3eef4554f2619b7b89822e776032ce8a2b4ca1e) +++ sources/view/VRxProfiles.h (.../VRxProfiles.h) (revision 1f927e37764a81fb6538b5cf7a74d8beacf56aac) @@ -26,6 +26,7 @@ #include "StorageGlobals.h" #include "VView.h" #include "MListModel.h" +#include "MRxProfilesData.h" // forward declaration class tst_views; @@ -47,19 +48,42 @@ PROPERTY(QStringList , rxProfilesList , {}) -// Q_PROPERTY(MListModel* rxProfiles READ rxProfiles NOTIFY alarm_AlarmIDChanged) - + Q_PROPERTY(MListModel* rxProfiles READ rxProfiles CONSTANT) VIEW_DEC_CLASS(VRxProfiles) + + +public: + + enum { + eDataRole_BloodFlow = Qt::UserRole , + eDataRole_DialysateFlow , + eDataRole_TreatmentDuration , + eDataRole_AcidConcentrateType , + eDataRole_BicarbonateConcentrateType , + eDataRole_DialysateTemperature , + eDataRole_DialyzerType , + eDataRole_HeparinConcentration , + eDataRole_HeparinBolusVolume , + eDataRole_HeparinDispenseRate , + eDataRole_HeparinStop , + eDataRole_VitalSigns , + eDataRole_ProfileName , + eDataRole_Favorite , + eDataRole_LastModifiedDate , + eDataRole_RecentlyUsedDate , + } DataRole; + + private: -// MListModel* rxProfiles () { return &_rxProfilesModel; } ; -// MListModel _rxProfilesModel; + MListModel* rxProfiles () { return &_rxProfilesModels; } + MListModel _rxProfilesModels; signals: void didRxProfileList(); private slots: - void onRxProfileList(const QFileInfoList &vRxProfiles); + void onRxProfileList(const QList &vRxProfileDataList); public slots: