kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Base: Fix linter warnings in ParameterPy

Browse Source
This commit is contained in:
wmayer
2024-04-01 14:23:41 +02:00
parent 9aa0fca3e4
commit b998bc181c
1 changed files with 54 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/Base/ParameterPy.cpp
View File

@@ -50,9 +50,8 @@ class ParameterGrpObserver: public ParameterGrp::ObserverType // NOLINT
{
public:
explicit ParameterGrpObserver(const Py::Object& obj)
{
inst = obj;
}
: inst {obj}
{}
ParameterGrpObserver(const Py::Object& obj, const Py::Object& callable, ParameterGrp* target)
: callable(callable)
, _target(target)
@@ -68,7 +67,7 @@ public:
{
Base::PyGILStateLocker lock;
try {
ParameterGrp& rGrp = static_cast<ParameterGrp&>(rCaller);
auto& rGrp = dynamic_cast<ParameterGrp&>(rCaller);
ParameterGrp::handle hGrp(&rGrp);
Py::Callable method(this->inst.getAttr(std::string("onChange")));
Py::Tuple args(2);
@@ -90,9 +89,11 @@ public:
}
public:
// NOLINTBEGIN
Py::Object callable;
boost::signals2::scoped_connection conn;
ParameterGrp* _target = nullptr; // no reference counted, do not access
// NOLINTEND
private:
Py::Object inst;
@@ -110,6 +111,7 @@ public:
Py::Object repr() override;
// NOLINTBEGIN
Py::Object getGroup(const Py::Tuple&);
Py::Object getGroupName(const Py::Tuple&);
Py::Object getGroups(const Py::Tuple&);
@@ -158,6 +160,14 @@ public:
Py::Object exportTo(const Py::Tuple&);
Py::Object getContents(const Py::Tuple&);
// NOLINTEND
private:
void tryCall(ParameterGrpObserver* obs,
ParameterGrp* Param,
ParameterGrp::ParamType Type,
const char* Name,
const char* Value);
private:
ParameterGrp::handle _cParamGrp;
@@ -315,7 +325,7 @@ Py::Object ParameterGrpPy::getGroup(const Py::Tuple& args)
Base::Reference<ParameterGrp> handle = _cParamGrp->GetGroup(pstr);
if (handle.isValid()) {
// create a python wrapper class
ParameterGrpPy* pcParamGrp = new ParameterGrpPy(handle);
auto pcParamGrp = new ParameterGrpPy(handle);
// increment the ref count
return Py::asObject(pcParamGrp);
}
@@ -338,7 +348,7 @@ Py::Object ParameterGrpPy::getManager(const Py::Tuple& args)
Base::Reference<ParameterGrp> handle = _cParamGrp->Manager();
if (handle.isValid()) {
// create a python wrapper class
ParameterGrpPy* pcParamGrp = new ParameterGrpPy(handle);
auto pcParamGrp = new ParameterGrpPy(handle);
// increment the ref count
return Py::asObject(pcParamGrp);
}
@@ -356,7 +366,7 @@ Py::Object ParameterGrpPy::getParent(const Py::Tuple& args)
Base::Reference<ParameterGrp> handle = _cParamGrp->Parent();
if (handle.isValid()) {
// create a python wrapper class
ParameterGrpPy* pcParamGrp = new ParameterGrpPy(handle);
auto pcParamGrp = new ParameterGrpPy(handle);
// increment the ref count
return Py::asObject(pcParamGrp);
}
@@ -697,13 +707,33 @@ Py::Object ParameterGrpPy::attach(const Py::Tuple& args)
}
}
ParameterGrpObserver* obs = new ParameterGrpObserver(o);
auto obs = new ParameterGrpObserver(o);
_cParamGrp->Attach(obs);
_observers.push_back(obs);
return Py::None();
}
void ParameterGrpPy::tryCall(ParameterGrpObserver* obs,
ParameterGrp* Param,
ParameterGrp::ParamType Type,
const char* Name,
const char* Value)
{
Base::PyGILStateLocker lock;
Py::TupleN args(Py::asObject(new ParameterGrpPy(Param)),
Py::String(ParameterGrp::TypeName(Type)),
Py::String(Name ? Name : ""),
Py::String(Value ? Value : ""));
try {
Py::Callable(obs->callable).apply(args);
}
catch (Py::Exception&) {
Base::PyException e;
e.ReportException();
}
}
Py::Object ParameterGrpPy::attachManager(const Py::Tuple& args)
{
PyObject* obj = nullptr;
@@ -731,33 +761,22 @@ Py::Object ParameterGrpPy::attachManager(const Py::Tuple& args)
}
}
ParameterGrpObserver* obs = new ParameterGrpObserver(o, attr, _cParamGrp);
obs->conn =
_cParamGrp->Manager()->signalParamChanged.connect([obs](ParameterGrp* Param,
ParameterGrp::ParamType Type,
const char* Name,
const char* Value) {
if (!Param) {
return;
auto obs = new ParameterGrpObserver(o, attr, _cParamGrp);
ParameterManager* man = _cParamGrp->Manager();
obs->conn = man->signalParamChanged.connect([obs, this](ParameterGrp* Param,
ParameterGrp::ParamType Type,
const char* Name,
const char* Value) {
if (!Param) {
return;
}
for (auto p = Param; p; p = p->Parent()) {
if (p == obs->_target) {
tryCall(obs, Param, Type, Name, Value);
break;
}
for (auto p = Param; p; p = p->Parent()) {
if (p == obs->_target) {
Base::PyGILStateLocker lock;
Py::TupleN args(Py::asObject(new ParameterGrpPy(Param)),
Py::String(ParameterGrp::TypeName(Type)),
Py::String(Name ? Name : ""),
Py::String(Value ? Value : ""));
try {
Py::Callable(obs->callable).apply(args);
}
catch (Py::Exception&) {
Base::PyException e;
e.ReportException();
}
break;
}
}
});
}
});
_observers.push_back(obs);
return Py::None();
@@ -775,7 +794,7 @@ Py::Object ParameterGrpPy::detach(const Py::Tuple& args)
throw Py::TypeError("Object has no onChange attribute");
}
for (ParameterGrpObserverList::iterator it = _observers.begin(); it != _observers.end(); ++it) {
for (auto it = _observers.begin(); it != _observers.end(); ++it) {
if ((*it)->isEqual(o)) {
ParameterGrpObserver* obs = *it;
_observers.erase(it);