Skip to content

ofParameterGroup::add(std::shared_ptr<ofAbstractParameter> param); #8127

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

ofParameterGroup::add(std::shared_ptr<ofAbstractParameter> param); #8127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a6bb68f
ofParameter:: void add(std::shared_ptr<ofAbstractParameter> param);
alexandreburton Sep 21, 2024
b6c0be1
Merge branch 'master' into parametersharedptr
artificiel Nov 8, 2024
ff1b805
merge fix
artificiel Nov 8, 2024
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
1 change: 1 addition & 0 deletions libs/openFrameworks/types/ofParameter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ class ofParameterGroup : public ofAbstractParameter {
add(parameters...);
}

void add(std::shared_ptr<ofAbstractParameter> param);
void add(ofAbstractParameter & param);
std::string valueType() const;

Expand Down
21 changes: 12 additions & 9 deletions libs/openFrameworks/types/ofParameterGroup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,23 @@ ofParameterGroup::ofParameterGroup()
: obj(new Value) {
}

void ofParameterGroup::add(ofAbstractParameter & parameter) {
auto param = parameter.newReference();
auto escaped_name = param->getEscapedName();
void ofParameterGroup::add(std::shared_ptr<ofAbstractParameter> parameter) {
auto escaped_name = parameter->getEscapedName();
if (contains(escaped_name)) {
ofLogWarning() << "Adding another parameter with same name '" << param->getName() << "' to group '" << getName() << "'";
ofLogWarning() << "Adding another parameter with same name '" << parameter->getName() << "' to group '" << getName() << "'";
}
obj->parameters.push_back(param);
obj->parameters.push_back(parameter);
obj->parametersIndex[escaped_name] = obj->parameters.size() - 1;
param->setParent(*this);
parameter->setParent(*this);
}

void ofParameterGroup::remove(ofAbstractParameter & param) {
for (auto & p : obj->parameters) {
if (p->isReferenceTo(param)) {
void ofParameterGroup::add(ofAbstractParameter & parameter){
add(parameter.newReference());
}

void ofParameterGroup::remove(ofAbstractParameter &param){
for(auto & p: obj->parameters){
if(p->isReferenceTo(param)){
remove(param.getName());
return;
}
Expand Down