Index: sources/view/settings/VAdjustmentVersions.h =================================================================== diff -u -r1dead6ecc09639538da51e5fac5e4d0e21d9eeee -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/view/settings/VAdjustmentVersions.h (.../VAdjustmentVersions.h) (revision 1dead6ecc09639538da51e5fac5e4d0e21d9eeee) +++ sources/view/settings/VAdjustmentVersions.h (.../VAdjustmentVersions.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,24 +1,25 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved. * \copyright * 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 VAdjustmentVersions.h - * \author (last) Peman Montazemi - * \date (last) 6-Nov-2020 - * \author (original) Peman Montazemi - * \date (original) 6-Nov-2020 + * \file VAdjustmentVersions.h + * \author (last) Behrouz NematiPour + * \date (last) 23-May-2022 + * \author (original) Behrouz NematiPour + * \date (original) 16-Apr-2021 * */ #pragma once #include // Project -#include "main.h" // Doxygen : don't remove +#include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" +#include "MAdjustHDVersionsRequest.h" #include "MAdjustHDVersionsResponse.h" #include "MAdjustDGVersionsResponse.h" #include "MAdjustHDSerialNumberResponse.h" @@ -41,67 +42,64 @@ AdjustVersionsRequestData _data; - const QString _hdVerDeviceFormat = "%1.%2.%3.%4"; + const QString _hdVerDeviceFormat = "%1.%2.%3.%4.%5"; const QString _hdVerFPGAFormat = "%1.%2.%3.%4"; - const QString _dgVerDeviceFormat = "%1.%2.%3.%4"; + const QString _dgVerDeviceFormat = "%1.%2.%3.%4.%5"; const QString _dgVerFPGAFormat = "%1.%2.%3.%4"; - // coco begin validated: + // disabled 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 // has been manually tested that it works perfectly fine TRIGGER( bool , adjustmentHD , 0) TRIGGER( bool , adjustmentDG , 0) - // coco end + // disabled coco end // HD Versions data - PROPERTY( quint8 , hdVerMajor , 0) - PROPERTY( quint8 , hdVerMinor , 0) - PROPERTY( quint8 , hdVerMicro , 0) - PROPERTY( quint16 , hdVerBuild , 0) - PROPERTY( quint8 , hdVerFPGAId , 0) - PROPERTY( quint8 , hdVerFPGAMajor , 0) - PROPERTY( quint8 , hdVerFPGAMinor , 0) - PROPERTY( quint8 , hdVerFPGALab , 0) + PROPERTY( quint8 , hdVerMajor , 0) + PROPERTY( quint8 , hdVerMinor , 0) + PROPERTY( quint8 , hdVerMicro , 0) + PROPERTY( quint16 , hdVerBuild , 0) + PROPERTY( quint8 , hdVerFPGAId , 0) + PROPERTY( quint8 , hdVerFPGAMajor , 0) + PROPERTY( quint8 , hdVerFPGAMinor , 0) + PROPERTY( quint8 , hdVerFPGALab , 0) + PROPERTY( quint32 , hdVerCompatibilityRev , 0) // DG Versions data - PROPERTY( quint8 , dgVerMajor , 0) - PROPERTY( quint8 , dgVerMinor , 0) - PROPERTY( quint8 , dgVerMicro , 0) - PROPERTY( quint16 , dgVerBuild , 0) - PROPERTY( quint8 , dgVerFPGAId , 0) - PROPERTY( quint8 , dgVerFPGAMajor , 0) - PROPERTY( quint8 , dgVerFPGAMinor , 0) - PROPERTY( quint8 , dgVerFPGALab , 0) + PROPERTY( quint8 , dgVerMajor , 0) + PROPERTY( quint8 , dgVerMinor , 0) + PROPERTY( quint8 , dgVerMicro , 0) + PROPERTY( quint16 , dgVerBuild , 0) + PROPERTY( quint8 , dgVerFPGAId , 0) + PROPERTY( quint8 , dgVerFPGAMajor , 0) + PROPERTY( quint8 , dgVerFPGAMinor , 0) + PROPERTY( quint8 , dgVerFPGALab , 0) + PROPERTY( quint32 , dgVerCompatibilityRev , 0) - PROPERTY( QString , hdVerDevice ,"") - PROPERTY( QString , hdVerFPGA ,"") - PROPERTY( QString , hdSerial ,"") - PROPERTY( QString , dgVerDevice ,"") - PROPERTY( QString , dgVerFPGA ,"") - PROPERTY( QString , dgSerial ,"") + 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 ( AdjustVersionsHDRequestData) VIEW_DEC_SLOT (AdjustVersionsHDResponseData) VIEW_DEC_SLOT (AdjustVersionsDGResponseData) VIEW_DEC_SLOT (AdjustSerialNumberHDResponseData) VIEW_DEC_SLOT (AdjustSerialNumberDGResponseData) // ---------- Version public slots: - void doUIPOSTFinal() { // this is only a test in here and later need to be removed - AdjustUIPostFinalResultRequestData data; - data.mResult = true; - emit didAdjustment(data); - } - void doAdjustment() { AdjustVersionsRequestData data; emit didAdjustment(data); } signals: - void didAdjustment(const AdjustVersionsRequestData &vData); - void didAdjustment(const AdjustUIPostFinalResultRequestData &vData); // this is only a test in here and later need to be removed + void didAdjustment(const AdjustVersionsRequestData &vData); + void didAdjustment(const AdjustVersionsResponseData &vData); }; }