refactor: unify Object signal system, update property connections, and integrate Eigen3 into Root module
This commit is contained in:
@@ -61,9 +61,9 @@ public:
|
||||
Content &GetModel();
|
||||
uLib::Object* GetContent() const override;
|
||||
|
||||
void PrintSelf(std::ostream &o) const;
|
||||
void PrintSelf(std::ostream &o) const override;
|
||||
|
||||
virtual vtkPolyData *GetPolyData() const;
|
||||
vtkPolyData *GetPolyData() const override;
|
||||
|
||||
void AddPocaPoint(HPoint3f poca);
|
||||
|
||||
|
||||
@@ -54,11 +54,11 @@ public:
|
||||
|
||||
void ReadFromStlFile(const char *filename);
|
||||
|
||||
virtual class vtkPolyData *GetPolyData() const;
|
||||
vtkPolyData *GetPolyData() const override;
|
||||
|
||||
virtual void contentUpdate();
|
||||
|
||||
virtual void Update();
|
||||
void Update() override;
|
||||
uLib::Object *GetContent() const override {
|
||||
return (uLib::Object *)m_model.get();
|
||||
}
|
||||
|
||||
@@ -54,11 +54,11 @@ public:
|
||||
|
||||
void ReadFromStlFile(const char *filename);
|
||||
|
||||
virtual class vtkPolyData *GetPolyData() const;
|
||||
vtkPolyData *GetPolyData() const override;
|
||||
|
||||
virtual void contentUpdate();
|
||||
|
||||
virtual void Update();
|
||||
void Update() override;
|
||||
uLib::Object *GetContent() const override {
|
||||
return (uLib::Object *)m_model.get();
|
||||
}
|
||||
|
||||
@@ -291,7 +291,7 @@ public:
|
||||
Prop3D::Prop3D() : Object(), pd(new Prop3DData(this)) {
|
||||
ULIB_ACTIVATE_DISPLAY_PROPERTIES;
|
||||
for (auto* p : this->GetDisplayProperties()) {
|
||||
uLib::Object::connect(p, &uLib::PropertyBase::Updated, this, &Prop3D::Update);
|
||||
uLib::Object::connect(p, &uLib::Object::Updated, this, &Prop3D::Update);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -222,7 +222,7 @@ public:
|
||||
|
||||
m_Prop3D->RegisterDisplayProperty(p);
|
||||
Vtk::Prop3D *prop3d = m_Prop3D;
|
||||
uLib::Object::connect(p, &uLib::PropertyBase::Updated,
|
||||
uLib::Object::connect(p, &uLib::Object::Updated,
|
||||
[prop3d]() { prop3d->Update(); });
|
||||
}
|
||||
}
|
||||
@@ -236,7 +236,7 @@ public:
|
||||
t.labels(), t.units() ? t.units() : "", GetCurrentGroup());
|
||||
m_Prop3D->RegisterDisplayProperty(p);
|
||||
Vtk::Prop3D *prop3d = m_Prop3D;
|
||||
uLib::Object::connect(p, &uLib::PropertyBase::Updated,
|
||||
uLib::Object::connect(p, &uLib::Object::Updated,
|
||||
[prop3d]() { prop3d->Update(); });
|
||||
}
|
||||
}
|
||||
@@ -295,7 +295,7 @@ public:
|
||||
if (m_Prop3D) {
|
||||
m_Prop3D->RegisterDisplayProperty(&p);
|
||||
Vtk::Prop3D *prop3d = m_Prop3D;
|
||||
uLib::Object::connect(&p, &uLib::PropertyBase::Updated,
|
||||
uLib::Object::connect(&p, &uLib::Object::Updated,
|
||||
[prop3d]() { prop3d->Update(); });
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user