From b28331657191892791c188e888cfbec803fa3a83 Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 26 Mar 2024 12:10:27 +0100 Subject: [PATCH] MeshPart: use of TaskDialog::addTaskBox --- src/Mod/MeshPart/Gui/CrossSections.cpp | 7 +------ src/Mod/MeshPart/Gui/CrossSections.h | 1 - src/Mod/MeshPart/Gui/TaskCurveOnMesh.cpp | 4 +--- src/Mod/MeshPart/Gui/TaskCurveOnMesh.h | 1 - src/Mod/MeshPart/Gui/Tessellation.cpp | 8 +------- 5 files changed, 3 insertions(+), 18 deletions(-) diff --git a/src/Mod/MeshPart/Gui/CrossSections.cpp b/src/Mod/MeshPart/Gui/CrossSections.cpp index 9aa92e639d..5ecd5524a5 100644 --- a/src/Mod/MeshPart/Gui/CrossSections.cpp +++ b/src/Mod/MeshPart/Gui/CrossSections.cpp @@ -627,12 +627,7 @@ void CrossSections::makePlanes(Plane type, const std::vector& d, double TaskCrossSections::TaskCrossSections(const Base::BoundBox3d& bb) { widget = new CrossSections(bb); - taskbox = new Gui::TaskView::TaskBox(Gui::BitmapFactory().pixmap("Mesh_CrossSections"), - widget->windowTitle(), - true, - nullptr); - taskbox->groupLayout()->addWidget(widget); - Content.push_back(taskbox); + addTaskBox(Gui::BitmapFactory().pixmap("Mesh_CrossSections"), widget, true); } bool TaskCrossSections::accept() diff --git a/src/Mod/MeshPart/Gui/CrossSections.h b/src/Mod/MeshPart/Gui/CrossSections.h index f99e69b7e5..502e3304c1 100644 --- a/src/Mod/MeshPart/Gui/CrossSections.h +++ b/src/Mod/MeshPart/Gui/CrossSections.h @@ -107,7 +107,6 @@ public: private: CrossSections* widget; - Gui::TaskView::TaskBox* taskbox; }; } // namespace MeshPartGui diff --git a/src/Mod/MeshPart/Gui/TaskCurveOnMesh.cpp b/src/Mod/MeshPart/Gui/TaskCurveOnMesh.cpp index c63a35de9e..39e088d051 100644 --- a/src/Mod/MeshPart/Gui/TaskCurveOnMesh.cpp +++ b/src/Mod/MeshPart/Gui/TaskCurveOnMesh.cpp @@ -97,9 +97,7 @@ void CurveOnMeshWidget::reject() TaskCurveOnMesh::TaskCurveOnMesh(Gui::View3DInventor* view) { widget = new CurveOnMeshWidget(view); - taskbox = new Gui::TaskView::TaskBox(QPixmap(), widget->windowTitle(), true, nullptr); - taskbox->groupLayout()->addWidget(widget); - Content.push_back(taskbox); + addTaskBox(widget); } bool TaskCurveOnMesh::reject() diff --git a/src/Mod/MeshPart/Gui/TaskCurveOnMesh.h b/src/Mod/MeshPart/Gui/TaskCurveOnMesh.h index 1850abb91f..84e3788594 100644 --- a/src/Mod/MeshPart/Gui/TaskCurveOnMesh.h +++ b/src/Mod/MeshPart/Gui/TaskCurveOnMesh.h @@ -80,7 +80,6 @@ public: private: CurveOnMeshWidget* widget; - Gui::TaskView::TaskBox* taskbox; }; } // namespace MeshPartGui diff --git a/src/Mod/MeshPart/Gui/Tessellation.cpp b/src/Mod/MeshPart/Gui/Tessellation.cpp index effba12445..b6a04a5fe2 100644 --- a/src/Mod/MeshPart/Gui/Tessellation.cpp +++ b/src/Mod/MeshPart/Gui/Tessellation.cpp @@ -646,13 +646,7 @@ bool Mesh2ShapeGmsh::loadOutput() TaskTessellation::TaskTessellation() { widget = new Tessellation(); - Gui::TaskView::TaskBox* taskbox = - new Gui::TaskView::TaskBox(QPixmap() /*Gui::BitmapFactory().pixmap("MeshPart_Mesher")*/, - widget->windowTitle(), - true, - nullptr); - taskbox->groupLayout()->addWidget(widget); - Content.push_back(taskbox); + addTaskBox(widget); } void TaskTessellation::open()