Skip to content

Add useful ofParameter constructor #6195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
hiroMTB wants to merge 6 commits into from
Closed

Add useful ofParameter constructor #6195

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
503b805
add additional constructor to ofParameter to be able to set serializa…
hiroMTB Dec 14, 2018
52e0e4b
add additional ofParameter::set to keep same style with its constructor
hiroMTB Dec 14, 2018
463692e
add additional constructor to ofReadonlyParameter to be able to set s…
hiroMTB Dec 14, 2018
890748e
add additional ofReadOnlyParameter::set to keep same style with its c…
hiroMTB Dec 14, 2018
7fc9b3d
add more constructor to support ofParameter<bool>
hiroMTB Dec 14, 2018
44363eb
add more constructor to support ofReadOnlyParameter<bool>
hiroMTB Dec 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 53 additions & 0 deletions libs/openFrameworks/types/ofParameter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,9 @@ class ofParameter: public ofAbstractParameter{
ofParameter(const ofParameter<ParameterType> & v);
ofParameter(const ParameterType & v);
ofParameter(const std::string& name, const ParameterType & v);
ofParameter(const std::string& name, const ParameterType & v, bool serializable);
ofParameter(const std::string& name, const ParameterType & v, const ParameterType & min, const ParameterType & max);
ofParameter(const std::string& name, const ParameterType & v, const ParameterType & min, const ParameterType & max, bool serializable);

const ParameterType & get() const;
const ParameterType * operator->() const;
Expand Down Expand Up @@ -557,6 +559,7 @@ class ofParameter: public ofAbstractParameter{
ofParameter<ParameterType> & set(const ParameterType & v);
ofParameter<ParameterType> & set(const std::string& name, const ParameterType & v);
ofParameter<ParameterType> & set(const std::string& name, const ParameterType & v, const ParameterType & min, const ParameterType & max);
ofParameter<ParameterType> & set(const std::string& name, const ParameterType & v, const ParameterType & min, const ParameterType & max, bool serializable);

ofParameter<ParameterType> & setWithoutEventNotifications(const ParameterType & v);

Expand Down Expand Up @@ -608,6 +611,14 @@ class ofParameter: public ofAbstractParameter{
,bInNotify(false)
,serializable(true){}

Value(std::string name, ParameterType v, bool serializable)
:name(name)
,value(v)
,min(of::priv::TypeInfo<ParameterType>::min())
,max(of::priv::TypeInfo<ParameterType>::max())
,bInNotify(false)
,serializable(serializable){}

Value(std::string name, ParameterType v, ParameterType min, ParameterType max)
:name(name)
,value(v)
Expand All @@ -616,6 +627,14 @@ class ofParameter: public ofAbstractParameter{
,bInNotify(false)
,serializable(true){}

Value(std::string name, ParameterType v, ParameterType min, ParameterType max, bool serializable)
:name(name)
,value(v)
,min(min)
,max(max)
,bInNotify(false)
,serializable(serializable){}

std::string name;
ParameterType value;
ParameterType min, max;
Expand Down Expand Up @@ -656,11 +675,20 @@ ofParameter<ParameterType>::ofParameter(const std::string& name, const Parameter
:obj(std::make_shared<Value>(name, v))
,setMethod(std::bind(&ofParameter<ParameterType>::eventsSetValue, this, std::placeholders::_1)){}

template<typename ParameterType>
ofParameter<ParameterType>::ofParameter(const std::string& name, const ParameterType & v, bool serializable)
:obj(std::make_shared<Value>(name, v, serializable))
,setMethod(std::bind(&ofParameter<ParameterType>::eventsSetValue, this, std::placeholders::_1)){}

template<typename ParameterType>
ofParameter<ParameterType>::ofParameter(const std::string& name, const ParameterType & v, const ParameterType & min, const ParameterType & max)
:obj(std::make_shared<Value>(name, v, min, max))
,setMethod(std::bind(&ofParameter<ParameterType>::eventsSetValue, this, std::placeholders::_1)){}

template<typename ParameterType>
ofParameter<ParameterType>::ofParameter(const std::string& name, const ParameterType & v, const ParameterType & min, const ParameterType & max, bool serializable)
:obj(std::make_shared<Value>(name, v, min, max, serializable))
,setMethod(std::bind(&ofParameter<ParameterType>::eventsSetValue, this, std::placeholders::_1)){}

template<typename ParameterType>
inline ofParameter<ParameterType> & ofParameter<ParameterType>::operator=(const ofParameter<ParameterType> & v){
Expand Down Expand Up @@ -689,6 +717,16 @@ ofParameter<ParameterType> & ofParameter<ParameterType>::set(const std::string&
return *this;
}

template<typename ParameterType>
ofParameter<ParameterType> & ofParameter<ParameterType>::set(const std::string& name, const ParameterType & value, const ParameterType & min, const ParameterType & max, bool serializable){
setName(name);
set(value);
setMin(min);
setMax(max);
setSerializable(serializable);
return *this;
}

template<typename ParameterType>
ofParameter<ParameterType> & ofParameter<ParameterType>::set(const std::string& name, const ParameterType & value){
setName(name);
Expand Down Expand Up @@ -1077,7 +1115,9 @@ class ofReadOnlyParameter: public ofAbstractParameter{
// ofReadOnlyParameter(ofReadOnlyParameter<ParameterType,Friend> & p);
ofReadOnlyParameter(const ParameterType & v);
ofReadOnlyParameter(const std::string& name, const ParameterType & v);
ofReadOnlyParameter(const std::string& name, const ParameterType & v, bool serializable);
ofReadOnlyParameter(const std::string& name, const ParameterType & v, const ParameterType & min, const ParameterType & max);
ofReadOnlyParameter(const std::string& name, const ParameterType & v, const ParameterType & min, const ParameterType & max, bool serializable);

const ParameterType & get() const;
const ParameterType * operator->() const;
Expand Down Expand Up @@ -1152,6 +1192,7 @@ class ofReadOnlyParameter: public ofAbstractParameter{

ofReadOnlyParameter<ParameterType,Friend>& set(const std::string& name, const ParameterType & value);
ofReadOnlyParameter<ParameterType,Friend>& set(const std::string& name, const ParameterType & value, const ParameterType & min, const ParameterType & max);
ofReadOnlyParameter<ParameterType,Friend>& set(const std::string& name, const ParameterType & value, const ParameterType & min, const ParameterType & max, bool serializable);

void setMin(const ParameterType & min);
void setMax(const ParameterType & max);
Expand Down Expand Up @@ -1198,10 +1239,17 @@ template<typename ParameterType,typename Friend>
inline ofReadOnlyParameter<ParameterType,Friend>::ofReadOnlyParameter(const std::string& name, const ParameterType & v)
:parameter(name,v){}

template<typename ParameterType,typename Friend>
inline ofReadOnlyParameter<ParameterType,Friend>::ofReadOnlyParameter(const std::string& name, const ParameterType & v, bool serializable)
:parameter(name,v, serializable){}

template<typename ParameterType,typename Friend>
inline ofReadOnlyParameter<ParameterType,Friend>::ofReadOnlyParameter(const std::string& name, const ParameterType & v, const ParameterType & min, const ParameterType & max)
:parameter(name,v,min,max){}

template<typename ParameterType,typename Friend>
inline ofReadOnlyParameter<ParameterType,Friend>::ofReadOnlyParameter(const std::string& name, const ParameterType & v, const ParameterType & min, const ParameterType & max, bool serializable)
:parameter(name,v,min,max,serializable){}

template<typename ParameterType,typename Friend>
inline const ParameterType & ofReadOnlyParameter<ParameterType,Friend>::get() const{
Expand Down Expand Up @@ -1440,6 +1488,11 @@ inline ofReadOnlyParameter<ParameterType,Friend> & ofReadOnlyParameter<Parameter
return *this;
}

template<typename ParameterType,typename Friend>
inline ofReadOnlyParameter<ParameterType,Friend> & ofReadOnlyParameter<ParameterType,Friend>::set(const std::string& name, const ParameterType & value, const ParameterType & min, const ParameterType & max, bool serializable){
parameter.set(name,value,min,max,serializable);
return *this;
}

template<typename ParameterType,typename Friend>
inline void ofReadOnlyParameter<ParameterType,Friend>::setMin(const ParameterType & min){
Expand Down