Index: sources/view/settings/VCalibrationSettings.h =================================================================== diff -u -r4f856b4068a1a5a131a74b5bcece7b6212b5c8d9 -r8350b02fa06da7cb6d7f085f88f55bf505ae78df --- sources/view/settings/VCalibrationSettings.h (.../VCalibrationSettings.h) (revision 4f856b4068a1a5a131a74b5bcece7b6212b5c8d9) +++ sources/view/settings/VCalibrationSettings.h (.../VCalibrationSettings.h) (revision 8350b02fa06da7cb6d7f085f88f55bf505ae78df) @@ -8,6 +8,9 @@ #include "VAdjustmentResponseBase.h" #include "MListModel.h" +#include "MDDCalibrationPressureRecordResponse.h" +#include "MAdjustDDCalibrationPressureRecordResponse.h" + namespace View { /*! @@ -27,6 +30,7 @@ eRole_Title = Qt::UserRole + 1 , eRole_Component , eRole_Payload , + eRole_Received , } DataRole; enum { @@ -49,15 +53,23 @@ PROPERTY(QStringList , columnTitle , {}) PROPERTY(QVariantList , rejectionReasons , {}) + + Q_PROPERTY(MListModel* model READ model NOTIFY didModelChange) - VIEW_DEC_CLASS(VCalibrationSettings); /// REMOVE ONCE RESPONSE INPOMEPLEENTED + VIEW_DEC_CLASS(VCalibrationSettings); +// VIEW_DEC_CLASS_ADJUSTMENT(VCalibrationSettings, ); + VIEW_DEC_SLOT(DDCalibrationPressureResponseData ) + VIEW_DEC_SLOT(AdjustDDCalibrationPressureResponseData ) + + private: MListModel* model () { return &_calibrationList; } MListModel _calibrationList; QVariantList initList(const QStringList &vTitles); quint32 getEpochUTC(); + void doRequestRecords(int vIndex); public slots: void refreshList (int vIndex); @@ -66,5 +78,8 @@ signals: void didModelChange(); + void didAdjustment(const DDCalibrationPressureRequestData &vData); + void didAdjustment(const AdjustDDCalibrationPressureRequestData &vData); + }; }