Index: sources/main.h =================================================================== diff -u -rd1907168ef46faa6de1ada400cad789f8379041f -r074b32b5cc08f41f2d9ce0d021f2151b76bba5ad --- sources/main.h (.../main.h) (revision d1907168ef46faa6de1ada400cad789f8379041f) +++ sources/main.h (.../main.h) (revision 074b32b5cc08f41f2d9ce0d021f2151b76bba5ad) @@ -168,35 +168,62 @@ #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 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 get_##NAME \ + WRITE set_##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 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 NAME##Min() const { return _##NAME##Min; } \ + void NAME##Min(const TYPE &p##NAME##Min) \ + { _##NAME##Min = p##NAME##Min; emit NAME##MinChanged(_##NAME##Min);} \ + TYPE NAME##Max() const { return _##NAME##Max; } \ + void NAME##Max(const TYPE &p##NAME##Max) \ + { _##NAME##Max = p##NAME##Max; emit NAME##MaxChanged(_##NAME##Max);} \ + TYPE NAME##Res() const { return _##NAME##Res; } \ + void NAME##Res(const TYPE &p##NAME##Res) \ + { _##NAME##Res = p##NAME##Res; emit NAME##ResChanged(_##NAME##Res);} \ + 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); \ + void NAME##MinChanged(const TYPE &p##NAME); \ + void NAME##MaxChanged(const TYPE &p##NAME); \ + void NAME##ResChanged(const TYPE &p##NAME); \ void NAME##_ValidationFailed(const QString &reason);