Index: sources/view/settings/VAdjustmentVersions.h =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/view/settings/VAdjustmentVersions.h (.../VAdjustmentVersions.h) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/view/settings/VAdjustmentVersions.h (.../VAdjustmentVersions.h) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -21,6 +21,8 @@ #include "VAdjustmentResponseBase.h" #include "MAdjustHDVersionsResponse.h" #include "MAdjustDGVersionsResponse.h" +#include "MAdjustHDSerialNumberResponse.h" +#include "MAdjustDGSerialNumberResponse.h" namespace View { @@ -39,6 +41,11 @@ AdjustVersionsRequestData _data; + const QString _hdVerDeviceFormat = "%1.%2.%3.%4"; + const QString _hdVerFPGAFormat = "%1.%2.%3.%4"; + const QString _dgVerDeviceFormat = "%1.%2.%3.%4"; + const QString _dgVerFPGAFormat = "%1.%2.%3.%4"; + // coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI @@ -67,9 +74,18 @@ PROPERTY( quint8 , dgVerFPGAMinor , 0) PROPERTY( quint8 , dgVerFPGALab , 0) + PROPERTY( QString , hdVerDevice ,"") + PROPERTY( QString , hdVerFPGA ,"") + PROPERTY( QString , hdSerial ,"") + PROPERTY( QString , dgVerDevice ,"") + PROPERTY( QString , dgVerFPGA ,"") + PROPERTY( QString , dgSerial ,"") + VIEW_DEC_CLASS(VAdjustmentVersions) - VIEW_DEC_SLOT (AdjustHDVersionsResponseData) - VIEW_DEC_SLOT (AdjustDGVersionsResponseData) + VIEW_DEC_SLOT (AdjustVersionsHDResponseData) + VIEW_DEC_SLOT (AdjustVersionsDGResponseData) + VIEW_DEC_SLOT (AdjustSerialNumberHDResponseData) + VIEW_DEC_SLOT (AdjustSerialNumberDGResponseData) // ---------- Version public slots: