Index: sources/view/settings/VAdjustmentVersions.cpp =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -r13d6a4fae2f910ab6e289ac9280258a94f734405 --- sources/view/settings/VAdjustmentVersions.cpp (.../VAdjustmentVersions.cpp) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/view/settings/VAdjustmentVersions.cpp (.../VAdjustmentVersions.cpp) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) @@ -20,41 +20,79 @@ VIEW_DEF_CLASS_ADJUSTMENT(VAdjustmentVersions) void VAdjustmentVersions::initConnections() { - ACTION_VIEW_CONNECTION(AdjustHDVersionsResponseData); - ACTION_VIEW_CONNECTION(AdjustDGVersionsResponseData); ADJUST_VIEW_CONNECTION( AdjustVersionsRequestData); + ACTION_VIEW_CONNECTION(AdjustVersionsHDResponseData); + ACTION_VIEW_CONNECTION(AdjustVersionsDGResponseData); + ACTION_VIEW_CONNECTION(AdjustSerialNumberHDResponseData); + ACTION_VIEW_CONNECTION(AdjustSerialNumberDGResponseData); } -void VAdjustmentVersions::onActionReceive(const AdjustHDVersionsResponseData &vData) +void VAdjustmentVersions::onActionReceive(const AdjustVersionsHDResponseData &vData) { // HD versions data - hdVerMajor (vData.mMajor ); - hdVerMinor (vData.mMinor ); - hdVerMicro (vData.mMicro ); - hdVerBuild (vData.mBuild ); - hdVerFPGAId (vData.mFPGAId ); - hdVerFPGAMajor (vData.mFPGAMajor); - hdVerFPGAMinor (vData.mFPGAMinor); - hdVerFPGALab (vData.mFPGALab ); + hdVerMajor ( vData.mMajor ); + hdVerMinor ( vData.mMinor ); + hdVerMicro ( vData.mMicro ); + hdVerBuild ( vData.mBuild ); + hdVerFPGAId ( vData.mFPGAId ); + hdVerFPGAMajor ( vData.mFPGAMajor ); + hdVerFPGAMinor ( vData.mFPGAMinor ); + hdVerFPGALab ( vData.mFPGALab ); + hdVerDevice ( + _hdVerDeviceFormat + .arg ( vData.mMajor ) + .arg ( vData.mMinor ) + .arg ( vData.mMicro ) + .arg ( vData.mBuild )); + hdVerFPGA ( + _hdVerFPGAFormat + .arg ( vData.mFPGAId ) + .arg ( vData.mFPGAMajor ) + .arg ( vData.mFPGAMinor ) + .arg ( vData.mFPGALab )); + // *** has to be the last to let the information to be set and then emit the signal *** // *** otherwise will use the previous values before being set. *** adjustmentHD(true); // set here only because adjustment parent needs it, but HD Versions does not } -void VAdjustmentVersions::onActionReceive(const AdjustDGVersionsResponseData &vData) +void VAdjustmentVersions::onActionReceive(const AdjustVersionsDGResponseData &vData) { // DG versions data - dgVerMajor (vData.mMajor ); - dgVerMinor (vData.mMinor ); - dgVerMicro (vData.mMicro ); - dgVerBuild (vData.mBuild ); - dgVerFPGAId (vData.mFPGAId ); - dgVerFPGAMajor (vData.mFPGAMajor); - dgVerFPGAMinor (vData.mFPGAMinor); - dgVerFPGALab (vData.mFPGALab ); + dgVerMajor ( vData.mMajor ); + dgVerMinor ( vData.mMinor ); + dgVerMicro ( vData.mMicro ); + dgVerBuild ( vData.mBuild ); + dgVerFPGAId ( vData.mFPGAId ); + dgVerFPGAMajor ( vData.mFPGAMajor ); + dgVerFPGAMinor ( vData.mFPGAMinor ); + dgVerFPGALab ( vData.mFPGALab ); + dgVerDevice ( + _dgVerDeviceFormat + .arg ( vData.mMajor ) + .arg ( vData.mMinor ) + .arg ( vData.mMicro ) + .arg ( vData.mBuild )); + dgVerFPGA ( + _dgVerFPGAFormat + .arg ( vData.mFPGAId ) + .arg ( vData.mFPGAMajor ) + .arg ( vData.mFPGAMinor ) + .arg ( vData.mFPGALab )); + // *** has to be the last to let the information to be set and then emit the signal *** // *** otherwise will use the previous values before being set. *** adjustmentDG(true); // set here only because adjustment parent needs it, but HD Versions does not } + +void VAdjustmentVersions::onActionReceive(const AdjustSerialNumberHDResponseData &vData) +{ + hdSerial( vData.mSerialNumber ); +} + +void VAdjustmentVersions::onActionReceive(const AdjustSerialNumberDGResponseData &vData) +{ + dgSerial( vData.mSerialNumber ); +}