Index: sources/view/hd/adjustment/VTreatmentAdjustmentHDVersions.cpp =================================================================== diff -u -r242ef09c059eac13b036989147f5e2314df54a30 -rd66466bb093fc8806d76fc8b8bdfbd7852d0da98 --- sources/view/hd/adjustment/VTreatmentAdjustmentHDVersions.cpp (.../VTreatmentAdjustmentHDVersions.cpp) (revision 242ef09c059eac13b036989147f5e2314df54a30) +++ sources/view/hd/adjustment/VTreatmentAdjustmentHDVersions.cpp (.../VTreatmentAdjustmentHDVersions.cpp) (revision d66466bb093fc8806d76fc8b8bdfbd7852d0da98) @@ -5,37 +5,56 @@ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * - * \file VTreatmentAdjustmentHDVersions.cpp + * \file VTreatmentAdjustmentVersions.cpp * \author (last) Peman Montazemi * \date (last) 6-Nov-2020 * \author (original) Peman Montazemi * \date (original) 6-Nov-2020 * */ -#include "VTreatmentAdjustmentHDVersions.h" +#include "VTreatmentAdjustmentVersions.h" // Project #include "guicontroller.h" -VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentHDVersions, AdjustHDVersionsResponseData) +VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentVersions, AdjustVersionsResponseData) -void VTreatmentAdjustmentHDVersions::initConnections() { +void VTreatmentAdjustmentVersions::initConnections() { ACTION_VIEW_CONNECTION(AdjustHDVersionsResponseData); + ACTION_VIEW_CONNECTION(AdjustDGVersionsResponseData); ADJUST_VIEW_CONNECTION( AdjustVersionsRequestData); } -void VTreatmentAdjustmentHDVersions::onActionReceive(const AdjustHDVersionsResponseData &vData) +void VTreatmentAdjustmentVersions::onActionReceive(const AdjustHDVersionsResponseData &vData) { - verMajor (vData.mMajor ); - verMinor (vData.mMinor ); - verMicro (vData.mMicro ); - verBuild (vData.mBuild ); - verFPGAId (vData.mFPGAId ); - verFPGAMajor (vData.mFPGAMajor); - verFPGAMinor (vData.mFPGAMinor); - verFPGALab (vData.mFPGALab ); + // HD versions + HDVerMajor (vData.mHDMajor ); + HDVerMinor (vData.mHDMinor ); + HDVerMicro (vData.mHDMicro ); + HDVerBuild (vData.mHDBuild ); + HDVerFPGAId (vData.mHDFPGAId ); + HDVerFPGAMajor (vData.mHDFPGAMajor); + HDVerFPGAMinor (vData.mHDFPGAMinor); + HDVerFPGALab (vData.mHDFPGALab ); // *** 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. *** adjustment(true); // set here only because adjustment parent needs it, but HD Versions does not } + +void VTreatmentAdjustmentVersions::onActionReceive(const AdjustDGVersionsResponseData &vData) +{ + // DG versions + DGVerMajor (vData.mDGMajor ); + DGVerMinor (vData.mDGMinor ); + DGVerMicro (vData.mDGMicro ); + DGVerBuild (vData.mDGBuild ); + DGVerFPGAId (vData.mDGFPGAId ); + DGVerFPGAMajor (vData.mDGFPGAMajor); + DGVerFPGAMinor (vData.mDGFPGAMinor); + DGVerFPGALab (vData.mDGFPGALab ); + + // *** 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. *** + adjustment(true); // set here only because adjustment parent needs it, but HD Versions does not +}