Index: sources/view/settings/VAdjustmentVersions.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 --- sources/view/settings/VAdjustmentVersions.cpp (.../VAdjustmentVersions.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/settings/VAdjustmentVersions.cpp (.../VAdjustmentVersions.cpp) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) @@ -24,89 +24,89 @@ ADJUST_VIEW_CONNECTION( AdjustVersionsRequestData); ADJUST_VIEW_CONNECTION( AdjustVersionsResponseData); - ACTION_VIEW_CONNECTION( AdjustVersionsHDRequestData); - ACTION_VIEW_CONNECTION(AdjustVersionsHDResponseData); - ACTION_VIEW_CONNECTION(AdjustVersionsDGResponseData); - ACTION_VIEW_CONNECTION(AdjustSerialNumberHDResponseData); - ACTION_VIEW_CONNECTION(AdjustSerialNumberDGResponseData); + ACTION_VIEW_CONNECTION( AdjustVersionsTDRequestData); + ACTION_VIEW_CONNECTION(AdjustVersionsTDResponseData); + ACTION_VIEW_CONNECTION(AdjustVersionsDDResponseData); + ACTION_VIEW_CONNECTION(AdjustSerialNumberTDResponseData); + ACTION_VIEW_CONNECTION(AdjustSerialNumberDDResponseData); } -void VAdjustmentVersions::onActionReceive(const AdjustVersionsHDRequestData &) +void VAdjustmentVersions::onActionReceive(const AdjustVersionsTDRequestData &) { AdjustVersionsResponseData data; emit didAdjustment(data); } -void VAdjustmentVersions::onActionReceive(const AdjustVersionsHDResponseData &vData) +void VAdjustmentVersions::onActionReceive(const AdjustVersionsTDResponseData &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 ); - hdVerCompatibilityRev ( vData.mCompatibilityRev ); + // TD versions data + tdVerMajor ( vData.mMajor ); + tdVerMinor ( vData.mMinor ); + tdVerMicro ( vData.mMicro ); + tdVerBuild ( vData.mBuild ); + tdVerFPGAId ( vData.mFPGAId ); + tdVerFPGAMajor ( vData.mFPGAMajor ); + tdVerFPGAMinor ( vData.mFPGAMinor ); + tdVerFPGALab ( vData.mFPGALab ); + tdVerCompatibilityRev ( vData.mCompatibilityRev ); - hdVerDevice ( - _hdVerDeviceFormat + tdVerDevice ( + _tdVerDeviceFormat .arg ( vData.mMajor ) .arg ( vData.mMinor ) .arg ( vData.mMicro ) .arg ( vData.mBuild ) .arg ( vData.mCompatibilityRev )); - hdVerFPGA ( - _hdVerFPGAFormat + tdVerFPGA ( + _tdVerFPGAFormat .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 + adjustmentTD(true); // set here only because adjustment parent needs it, but HD Versions does not } -void VAdjustmentVersions::onActionReceive(const AdjustVersionsDGResponseData &vData) +void VAdjustmentVersions::onActionReceive(const AdjustVersionsDDResponseData &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 ); - dgVerCompatibilityRev ( vData.mCompatibilityRev ); + // DD versions data + ddVerMajor ( vData.mMajor ); + ddVerMinor ( vData.mMinor ); + ddVerMicro ( vData.mMicro ); + ddVerBuild ( vData.mBuild ); + ddVerFPGAId ( vData.mFPGAId ); + ddVerFPGAMajor ( vData.mFPGAMajor ); + ddVerFPGAMinor ( vData.mFPGAMinor ); + ddVerFPGALab ( vData.mFPGALab ); + ddVerCompatibilityRev ( vData.mCompatibilityRev ); - dgVerDevice ( - _dgVerDeviceFormat + ddVerDevice ( + _ddVerDeviceFormat .arg ( vData.mMajor ) .arg ( vData.mMinor ) .arg ( vData.mMicro ) .arg ( vData.mBuild ) .arg ( vData.mCompatibilityRev )); - dgVerFPGA ( - _dgVerFPGAFormat + ddVerFPGA ( + _ddVerFPGAFormat .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 + adjustmentDD(true); // set here only because adjustment parent needs it, but TD Versions does not } -void VAdjustmentVersions::onActionReceive(const AdjustSerialNumberHDResponseData &vData) +void VAdjustmentVersions::onActionReceive(const AdjustSerialNumberTDResponseData &vData) { - hdSerial( vData.mSerialNumber ); + tdSerial( vData.mSerialNumber ); } -void VAdjustmentVersions::onActionReceive(const AdjustSerialNumberDGResponseData &vData) +void VAdjustmentVersions::onActionReceive(const AdjustSerialNumberDDResponseData &vData) { - dgSerial( vData.mSerialNumber ); + ddSerial( vData.mSerialNumber ); }