refactor: unify Object signal system, update property connections, and integrate Eigen3 into Root module
This commit is contained in:
@@ -53,9 +53,6 @@ public:
|
||||
return GetGroup() + "." + GetName();
|
||||
}
|
||||
|
||||
// Signal support
|
||||
signals:
|
||||
virtual void Updated() override { ULIB_SIGNAL_EMIT(PropertyBase::Updated); }
|
||||
|
||||
// Serialization support for different uLib archives
|
||||
virtual void serialize(Archive::xml_oarchive & ar, const unsigned int version) override = 0;
|
||||
@@ -169,7 +166,6 @@ public:
|
||||
|
||||
virtual void serialize(Archive::property_register_archive & ar, const unsigned int v) override;
|
||||
|
||||
virtual void Updated() override { PropertyBase::Updated(); this->PropertyChanged(); }
|
||||
|
||||
protected:
|
||||
std::string m_name;
|
||||
@@ -263,7 +259,7 @@ public:
|
||||
if (m_DisplayOnly) {
|
||||
m_Object->RegisterDisplayProperty(newP);
|
||||
Object* obj = m_Object;
|
||||
Object::connect(newP, &PropertyBase::Updated, [obj]() { obj->Updated(); });
|
||||
Object::connect(newP, &Object::Updated, [obj]() { obj->Updated(); });
|
||||
} else {
|
||||
m_Object->RegisterDynamicProperty(newP);
|
||||
}
|
||||
@@ -277,7 +273,7 @@ public:
|
||||
if (m_DisplayOnly) {
|
||||
m_Object->RegisterDisplayProperty(p);
|
||||
Object* obj = m_Object;
|
||||
Object::connect(p, &PropertyBase::Updated, [obj]() { obj->Updated(); });
|
||||
Object::connect(p, &Object::Updated, [obj]() { obj->Updated(); });
|
||||
} else {
|
||||
m_Object->RegisterDynamicProperty(p);
|
||||
}
|
||||
@@ -300,7 +296,7 @@ public:
|
||||
if (m_Object) {
|
||||
EnumProperty* p = new EnumProperty(m_Object, t.name(), (int*)&const_cast<boost::serialization::hrp_enum<T>&>(t).value(), t.labels(), t.units() ? t.units() : "", GetCurrentGroup());
|
||||
p->SetReadOnly(t.is_read_only());
|
||||
if (m_DisplayOnly) { m_Object->RegisterDisplayProperty(p); Object* obj = m_Object; Object::connect(p, &PropertyBase::Updated, [obj]() { obj->Updated(); }); }
|
||||
if (m_DisplayOnly) { m_Object->RegisterDisplayProperty(p); Object* obj = m_Object; Object::connect(p, &Object::Updated, [obj]() { obj->Updated(); }); }
|
||||
else { m_Object->RegisterDynamicProperty(p); }
|
||||
}
|
||||
}
|
||||
@@ -308,7 +304,7 @@ public:
|
||||
if (m_Object) {
|
||||
EnumProperty* p = new EnumProperty(m_Object, t.name(), (int*)&const_cast<boost::serialization::hrp_enum_val<T>&>(t).value(), t.labels(), t.units() ? t.units() : "", GetCurrentGroup());
|
||||
p->SetReadOnly(t.is_read_only());
|
||||
if (m_DisplayOnly) { m_Object->RegisterDisplayProperty(p); Object* obj = m_Object; Object::connect(p, &PropertyBase::Updated, [obj]() { obj->Updated(); }); }
|
||||
if (m_DisplayOnly) { m_Object->RegisterDisplayProperty(p); Object* obj = m_Object; Object::connect(p, &Object::Updated, [obj]() { obj->Updated(); }); }
|
||||
else { m_Object->RegisterDynamicProperty(p); }
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user