From ed6ee4da3df692039e2b176dfa5f8583d00ff779 Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Fri, 9 Feb 2018 11:39:03 +0100
Subject: [PATCH] ENH: UserValue and AutomaticValue become 2 sides of the same
coin
---
.../include/otbWrapperParameter.h | 33 ++++++++++++-------
1 file changed, 22 insertions(+), 11 deletions(-)
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameter.h
index 7f877f6a59..1672561d81 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameter.h
@@ -94,14 +94,29 @@ public:
/** Toogle the parameter mandatory flag */
itkBooleanMacro(Mandatory);
- /** Set the parameter AutomaticValue flag */
- itkSetMacro(AutomaticValue, bool);
+ /** Set the parameter AutomaticValue flag (which is the opposite of UserValue)*/
+ virtual void SetAutomaticValue(bool flag)
+ {
+ this->SetUserValue(!flag);
+ }
/** Get the parameter AutomaticValue flag */
- itkGetConstMacro(AutomaticValue, bool);
-
- /** Toogle the parameter AutomaticValue flag */
- itkBooleanMacro(AutomaticValue);
+ virtual bool GetAutomaticValue() const
+ {
+ return !m_UserValue;
+ }
+
+ /** Toogle ON the parameter AutomaticValue flag */
+ void AutomaticValueOn()
+ {
+ this->SetAutomaticValue(true);
+ }
+
+ /** Toogle OFF the parameter AutomaticValue flag */
+ void AutomaticValueOff()
+ {
+ this->SetAutomaticValue(false);
+ }
/** Set the user access level */
itkSetEnumMacro(UserLevel, UserLevel);
@@ -196,7 +211,6 @@ protected:
m_Mandatory( true ),
m_Active( false ),
m_UserValue( false ),
- m_AutomaticValue( false ),
m_UserLevel( UserLevel_Basic ),
m_Role( Role_Input ),
m_Root( this ),
@@ -221,12 +235,9 @@ protected:
/** True if activated (a mandatory parameter is always active) */
bool m_Active;
- /** True if the value is set in user mode */
+ /** True if the value is set in user mode (otherwise, it is an automatic value)*/
bool m_UserValue;
- /** True if the application change the value of this parameter */
- bool m_AutomaticValue;
-
UserLevel m_UserLevel;
/** Default iotype mode */
--
GitLab