OpenCMT/uLib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: rename Puppet class to Prop3D across the codebase

Browse Source
This commit is contained in:
AndreaRigoni
2026-04-08 15:47:33 +00:00
parent 77f00a2b8a
commit f7ba4b1a17
63 changed files with 412 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/gcompose/src/MainPanel.cpp
View File

@@ -90,13 +90,13 @@ MainPanel::MainPanel(QWidget* parent) : QWidget(parent), m_context(nullptr), m_m
connect(m_contextPanel, &ContextPanel::objectSelected, [this](uLib::Object* obj) {
if (auto* viewport = qobject_cast<uLib::Vtk::QViewport*>(m_firstPane->currentViewport())) {
uLib::Vtk::Puppet* puppet = nullptr;
uLib::Vtk::Prop3D* prop3d = nullptr;
if (m_mainVtkContext) {
puppet = m_mainVtkContext->GetPuppet(obj);
prop3d = m_mainVtkContext->GetProp3D(obj);
}
viewport->SelectPuppet(puppet);
// Update the display properties in the viewport pane itself - use the puppet proxy if possible
m_firstPane->setObject(puppet ? (uLib::Object*)puppet : obj);
viewport->SelectProp3D(prop3d);
// Update the display properties in the viewport pane itself - use the prop3d proxy if possible
m_firstPane->setObject(prop3d ? (uLib::Object*)prop3d : obj);
} else {
m_firstPane->setObject(obj);
}
@@ -116,7 +116,7 @@ void MainPanel::setContext(uLib::ObjectsContext* context) {
if (m_mainVtkContext) {
if (auto* viewport = qobject_cast<uLib::Vtk::QViewport*>(m_firstPane->currentViewport())) {
viewport->RemovePuppet(*m_mainVtkContext);
viewport->RemoveProp3D(*m_mainVtkContext);
}
delete m_mainVtkContext;
m_mainVtkContext = nullptr;
@@ -125,9 +125,9 @@ void MainPanel::setContext(uLib::ObjectsContext* context) {
if (context) {
if (auto* viewport = qobject_cast<uLib::Vtk::QViewport*>(m_firstPane->currentViewport())) {
m_mainVtkContext = new uLib::Vtk::ObjectsContext(context);
// viewport->AddPuppet(*m_mainVtkContext); // redundant
// viewport->AddProp3D(*m_mainVtkContext); // redundant
auto syncSelection = [this](uLib::Vtk::Puppet* p) {
auto syncSelection = [this](uLib::Vtk::Prop3D* p) {
if (!p) {
m_contextPanel->clearSelection();
m_firstPane->setObject(nullptr);
@@ -136,14 +136,14 @@ void MainPanel::setContext(uLib::ObjectsContext* context) {
m_firstPane->setObject(p);
}
};
connect(viewport, &uLib::Vtk::QViewport::puppetSelected, syncSelection);
connect(viewport, &uLib::Vtk::QViewport::prop3dSelected, syncSelection);
uLib::Object::connect(m_mainVtkContext, &uLib::Vtk::ObjectsContext::PuppetAdded, [this](uLib::Vtk::Puppet* p) {
uLib::Object::connect(m_mainVtkContext, &uLib::Vtk::ObjectsContext::Prop3DAdded, [this](uLib::Vtk::Prop3D* p) {
if (p) {
auto panes = this->findChildren<ViewportPane*>();
for (auto* pane : panes) {
if (auto* vp = qobject_cast<uLib::Vtk::QViewport*>(pane->currentViewport())) {
vp->AddPuppet(*p);
vp->AddProp3D(*p);
vp->ZoomAuto();
vp->Render();
}
@@ -151,25 +151,25 @@ void MainPanel::setContext(uLib::ObjectsContext* context) {
}
});
uLib::Object::connect(m_mainVtkContext, &uLib::Vtk::ObjectsContext::PuppetRemoved, [this](uLib::Vtk::Puppet* p) {
uLib::Object::connect(m_mainVtkContext, &uLib::Vtk::ObjectsContext::Prop3DRemoved, [this](uLib::Vtk::Prop3D* p) {
if (p) {
auto panes = this->findChildren<ViewportPane*>();
for (auto* pane : panes) {
if (auto* vp = qobject_cast<uLib::Vtk::QViewport*>(pane->currentViewport())) {
vp->RemovePuppet(*p);
vp->RemoveProp3D(*p);
vp->Render();
}
}
}
});
// Add any puppets that were created during m_mainVtkContext's construction to all panes
// Add any prop3ds that were created during m_mainVtkContext's construction to all panes
auto panes = this->findChildren<ViewportPane*>();
for (auto* obj : context->GetObjects()) {
if (auto* p = m_mainVtkContext->GetPuppet(obj)) {
if (auto* p = m_mainVtkContext->GetProp3D(obj)) {
for (auto* pane : panes) {
if (auto* vp = qobject_cast<uLib::Vtk::QViewport*>(pane->currentViewport())) {
vp->AddPuppet(*p);
vp->AddProp3D(*p);
}
}
}

6
app/gcompose/src/PropertyWidgets.cpp
View File

@@ -403,10 +403,10 @@ void PropertyEditor::setObject(::uLib::Object* obj, bool displayOnly) {
const std::vector<::uLib::PropertyBase*>* props = &obj->GetProperties();
if (displayOnly) {
if (auto* puppet = dynamic_cast<::uLib::Vtk::Puppet*>(obj)) {
props = &puppet->GetDisplayProperties();
if (auto* prop3d = dynamic_cast<::uLib::Vtk::Prop3D*>(obj)) {
props = &prop3d->GetDisplayProperties();
} else {
// If it's not a puppet but displayOnly is requested, showing nothing or fallback?
// If it's not a prop3d but displayOnly is requested, showing nothing or fallback?
// Fallback: core properties.
}
}

8
app/gcompose/src/QViewportPane.cpp
View File

@@ -88,7 +88,7 @@ void QViewportPane::toggleDisplayPanel() {
void QViewportPane::setObject(uLib::Object* obj) {
m_displayEditor->setObject(obj, true);
// Auto-show panel if it's a puppet and we want to highlight this feature?
// Auto-show panel if it's a prop3d and we want to highlight this feature?
// User asked for "hiding panel", so maybe we don't auto-show.
}
@@ -179,9 +179,9 @@ void QViewportPane::AttemptSplit(Qt::Orientation orientation) {
if (currentVtk) {
auto* newVtk = qobject_cast<uLib::Vtk::QViewport*>(newPane->currentViewport());
if (newVtk) {
// Copy puppets
for (auto* puppet : currentVtk->getPuppets()) {
newVtk->AddPuppet(*puppet);
// Copy prop3ds
for (auto* prop3d : currentVtk->getProp3Ds()) {
newVtk->AddProp3D(*prop3d);
}
// Copy camera
if (currentVtk->GetRenderer() && newVtk->GetRenderer()) {

14
app/gcompose/src/ViewportPane.cpp
View File

@@ -99,15 +99,15 @@ void ViewportPane::toggleDisplayPanel() {
void ViewportPane::setObject(uLib::Object* obj) {
m_displayEditor->setObject(obj, true);
// Check if the object is a Puppet (meaning it has display properties)
bool isPuppet = (dynamic_cast<::uLib::Vtk::Puppet*>(obj) != nullptr);
// Check if the object is a Prop3D (meaning it has display properties)
bool isProp3D = (dynamic_cast<::uLib::Vtk::Prop3D*>(obj) != nullptr);
// Only show the "Display" toggle button if it's a puppet
m_toggleBtn->setVisible(isPuppet);
// Only show the "Display" toggle button if it's a prop3d
m_toggleBtn->setVisible(isProp3D);
// If it's a puppet, we might want to keep the panel state if it was already open,
// or if it's NOT a puppet, definitely hide the toggle and panel.
if (!isPuppet) {
// If it's a prop3d, we might want to keep the panel state if it was already open,
// or if it's NOT a prop3d, definitely hide the toggle and panel.
if (!isProp3D) {
m_toggleBtn->setChecked(false);
m_displayPanel->hide();
}