refactor: improve Object property management with duplicate prevention, memory cleanup, and updated VTK interface tests
This commit is contained in:
@@ -59,6 +59,10 @@ public:
|
||||
GenericMFPtr sloptr;
|
||||
std::string slostr;
|
||||
};
|
||||
|
||||
~ObjectPrivate() {
|
||||
for (auto& s : sigv) delete s.signal;
|
||||
}
|
||||
|
||||
std::string m_InstanceName;
|
||||
std::vector<Signal> sigv;
|
||||
@@ -71,7 +75,13 @@ public:
|
||||
|
||||
// Implementations of Property methods
|
||||
void Object::RegisterDisplayProperty(PropertyBase* prop) {
|
||||
if (prop) d->m_DisplayProperties.push_back(prop);
|
||||
if (prop) {
|
||||
for (auto* existing : d->m_DisplayProperties) {
|
||||
if (existing == prop) return;
|
||||
if (existing->GetName() == prop->GetName()) return;
|
||||
}
|
||||
d->m_DisplayProperties.push_back(prop);
|
||||
}
|
||||
}
|
||||
|
||||
const std::vector<PropertyBase*>& Object::GetDisplayProperties() const {
|
||||
@@ -80,6 +90,10 @@ const std::vector<PropertyBase*>& Object::GetDisplayProperties() const {
|
||||
|
||||
void Object::RegisterProperty(PropertyBase* prop) {
|
||||
if (prop) {
|
||||
for (auto* existing : d->m_Properties) {
|
||||
if (existing == prop) return;
|
||||
if (existing->GetName() == prop->GetName()) return;
|
||||
}
|
||||
d->m_Properties.push_back(prop);
|
||||
}
|
||||
}
|
||||
@@ -105,13 +119,16 @@ PropertyBase* Object::GetProperty(const std::string& name) const {
|
||||
for (auto* p : d->m_DynamicProperties) {
|
||||
if (p->GetName() == name || p->GetQualifiedName() == name) return p;
|
||||
}
|
||||
for (auto* p : d->m_DisplayProperties) {
|
||||
if (p->GetName() == name || p->GetQualifiedName() == name) return p;
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
void Object::NotifyPropertiesUpdated() {
|
||||
// Only notify properties in the primary list to avoid duplicates,
|
||||
// as all registered properties should be there.
|
||||
for (auto* p : d->m_Properties) p->Updated();
|
||||
for (auto* p : d->m_DynamicProperties) p->Updated();
|
||||
this->Updated();
|
||||
}
|
||||
|
||||
void Object::Updated() { ULIB_SIGNAL_EMIT(Object::Updated); }
|
||||
@@ -147,6 +164,9 @@ Object::~Object() {
|
||||
for (auto* p : d->m_DynamicProperties) {
|
||||
delete p;
|
||||
}
|
||||
for (auto* p : d->m_DisplayProperties) {
|
||||
delete p;
|
||||
}
|
||||
delete d;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user