Index: sources/main.h =================================================================== diff -u -r4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac -rb62ab443e75b76a91e35aca6ba2efd84e7199602 --- sources/main.h (.../main.h) (revision 4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac) +++ sources/main.h (.../main.h) (revision b62ab443e75b76a91e35aca6ba2efd84e7199602) @@ -1,22 +1,22 @@ /*! - * + * * Copyright (c) 2019-2020 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 main.h * \author (last) Peter Lucia * \date (last) 15-Oct-2020 * \author (original) Behrouz NematiPour * \date (original) 28-Oct-2019 - * + * */ #pragma once // Qt #include - +#include // Project // TODO : A singleton parent class needs to be created @@ -241,35 +241,61 @@ #define REGISTER_TYPE(vTYPE) \ qmlRegisterType < vTYPE > (#vTYPE, 0, 1, #vTYPE); #define GET_VARIABLE_NAME(VARIABLE) (#VARIABLE) -#define TREATMENT_PARAMETER(TYPE, NAME, DEFVALUE) \ -private: \ - TYPE _##NAME = DEFVALUE; \ - bool is##NAME##Set = false; \ -protected: \ - Q_PROPERTY(TYPE NAME \ - READ get_##NAME \ - WRITE set_##NAME \ - NOTIFY NAME##Changed) \ - void set_##NAME(const TYPE &p##NAME) { \ - static bool init = false; \ - if ( !init || _##NAME != p##NAME ) { \ - init = true; \ - _##NAME = p##NAME; \ - DEBUG_PROPERTY_CHANGED(NAME, _) \ - is##NAME##Set = true; \ - emit NAME##Changed(_##NAME); \ - onUserModifiedParameters(); \ - } \ - } \ - TYPE get_##NAME() const { \ - return _##NAME; \ - } \ - void reset_##NAME() { \ - _##NAME = DEFVALUE; \ - is##NAME##Set = false; \ - emit NAME##Changed(_##NAME); \ - } \ -Q_SIGNALS: \ - void NAME##Changed(const TYPE &p##NAME); \ +#define DEBUG_TREATMENT_PARAMETER(NAME, VARIABLE) // qDebug() << NAME << VARIABLE; +#define TREATMENT_PARAMETER(TYPE, NAME, DEFVALUE, MIN, MAX, RES) \ +private: \ + TYPE _##NAME = DEFVALUE; \ + TYPE _##NAME##Min = MIN; \ + TYPE _##NAME##Max = MAX; \ + TYPE _##NAME##Res = RES; \ + bool is##NAME##Set = false; \ +protected: \ + Q_PROPERTY(TYPE NAME \ + READ NAME \ + WRITE NAME \ + NOTIFY NAME##Changed) \ + Q_PROPERTY(TYPE NAME##Min \ + READ NAME##Min \ + WRITE NAME##Min \ + NOTIFY NAME##MinChanged) \ + Q_PROPERTY(TYPE NAME##Max \ + READ NAME##Max \ + WRITE NAME##Max \ + NOTIFY NAME##MaxChanged) \ + Q_PROPERTY(TYPE NAME##Res \ + READ NAME##Res \ + WRITE NAME##Res \ + NOTIFY NAME##ResChanged) \ + void NAME(const TYPE &v##NAME) { \ + if ( !is##NAME##Set || _##NAME != v##NAME ) { \ + _##NAME = v##NAME; \ + is##NAME##Set = true; \ + emit NAME##Changed(_##NAME); \ + doUserModifiedParameters(); \ + } \ + DEBUG_TREATMENT_PARAMETER(#NAME, _##NAME) \ + } \ + TYPE NAME##Min() const { return _##NAME##Min; } \ + void NAME##Min(const TYPE &v##NAME##Min) \ + { _##NAME##Min = v##NAME##Min; emit NAME##MinChanged(_##NAME##Min);} \ + TYPE NAME##Max() const { return _##NAME##Max; } \ + void NAME##Max(const TYPE &v##NAME##Max) \ + { _##NAME##Max = v##NAME##Max; emit NAME##MaxChanged(_##NAME##Max);} \ + TYPE NAME##Res() const { return _##NAME##Res; } \ + void NAME##Res(const TYPE &v##NAME##Res) \ + { _##NAME##Res = v##NAME##Res; emit NAME##ResChanged(_##NAME##Res);} \ + TYPE NAME() const { \ + return _##NAME; \ + } \ + void reset_##NAME() { \ + _##NAME = DEFVALUE; \ + is##NAME##Set = false; \ + emit NAME##Changed(_##NAME); \ + } \ +Q_SIGNALS: \ + void NAME##Changed(const TYPE &v##NAME); \ + void NAME##MinChanged(const TYPE &v##NAME); \ + void NAME##MaxChanged(const TYPE &v##NAME); \ + void NAME##ResChanged(const TYPE &v##NAME); \ void NAME##_ValidationFailed(const QString &reason);