diff --git a/src/Mod/Mesh/Gui/DlgSmoothing.cpp b/src/Mod/Mesh/Gui/DlgSmoothing.cpp index 1f2fbecdf2..ee89b4db3c 100644 --- a/src/Mod/Mesh/Gui/DlgSmoothing.cpp +++ b/src/Mod/Mesh/Gui/DlgSmoothing.cpp @@ -107,7 +107,7 @@ bool DlgSmoothing::smoothSelection() const void DlgSmoothing::on_checkBoxSelection_toggled(bool on) { - /*emit*/ toggledSelection(on); + Q_EMIT toggledSelection(on); } // ------------------------------------------------ diff --git a/src/Mod/Mesh/Gui/MeshEditor.cpp b/src/Mod/Mesh/Gui/MeshEditor.cpp index fe94a47568..7bf35c8b98 100644 --- a/src/Mod/Mesh/Gui/MeshEditor.cpp +++ b/src/Mod/Mesh/Gui/MeshEditor.cpp @@ -342,9 +342,9 @@ void MeshFaceAddition::showMarker(SoPickedPoint* pp) void MeshFaceAddition::addFacetCallback(void * ud, SoEventCallback * n) { - MeshFaceAddition* that = reinterpret_cast(ud); + MeshFaceAddition* that = static_cast(ud); ViewProviderFace* face = that->faceView; - Gui::View3DInventorViewer* view = reinterpret_cast(n->getUserData()); + Gui::View3DInventorViewer* view = static_cast(n->getUserData()); const SoEvent* ev = n->getEvent(); // If we are in navigation mode then ignore all but key events @@ -653,8 +653,8 @@ float MeshFillHole::findClosestPoint(const SbLine& ray, const TBoundary& polygon void MeshFillHole::fileHoleCallback(void * ud, SoEventCallback * n) { - MeshFillHole* self = reinterpret_cast(ud); - Gui::View3DInventorViewer* view = reinterpret_cast(n->getUserData()); + MeshFillHole* self = static_cast(ud); + Gui::View3DInventorViewer* view = static_cast(n->getUserData()); const SoEvent* ev = n->getEvent(); if (ev->getTypeId() == SoLocation2Event::getClassTypeId()) { diff --git a/src/Mod/Mesh/Gui/MeshSelection.cpp b/src/Mod/Mesh/Gui/MeshSelection.cpp index 8e2936326c..a6225086ee 100644 --- a/src/Mod/Mesh/Gui/MeshSelection.cpp +++ b/src/Mod/Mesh/Gui/MeshSelection.cpp @@ -453,8 +453,8 @@ void MeshSelection::setRemoveComponentOnClick(bool on) void MeshSelection::selectGLCallback(void * ud, SoEventCallback * n) { // When this callback function is invoked we must leave the edit mode - Gui::View3DInventorViewer* view = reinterpret_cast(n->getUserData()); - MeshSelection* self = reinterpret_cast(ud); + Gui::View3DInventorViewer* view = static_cast(n->getUserData()); + MeshSelection* self = static_cast(ud); self->stopInteractiveCallback(view); n->setHandled(); std::vector polygon = view->getGLPolygon(); @@ -534,7 +534,7 @@ void MeshSelection::pickFaceCallback(void * ud, SoEventCallback * n) // handle only mouse button events if (n->getEvent()->isOfType(SoMouseButtonEvent::getClassTypeId())) { const SoMouseButtonEvent * mbe = static_cast(n->getEvent()); - Gui::View3DInventorViewer* view = reinterpret_cast(n->getUserData()); + Gui::View3DInventorViewer* view = static_cast(n->getUserData()); // Mark all incoming mouse button events as handled, especially, to deactivate the selection node n->getAction()->setHandled(); @@ -553,7 +553,7 @@ void MeshSelection::pickFaceCallback(void * ud, SoEventCallback * n) if (!vp || !vp->getTypeId().isDerivedFrom(ViewProviderMesh::getClassTypeId())) return; ViewProviderMesh* mesh = static_cast(vp); - MeshSelection* self = reinterpret_cast(ud); + MeshSelection* self = static_cast(ud); std::list views = self->getViewProviders(); if (std::find(views.begin(), views.end(), mesh) == views.end()) return; diff --git a/src/Mod/Mesh/Gui/ViewProvider.cpp b/src/Mod/Mesh/Gui/ViewProvider.cpp index 20e276bef9..31f2ecfbb4 100644 --- a/src/Mod/Mesh/Gui/ViewProvider.cpp +++ b/src/Mod/Mesh/Gui/ViewProvider.cpp @@ -913,7 +913,7 @@ void ViewProviderMesh::clipMeshCallback(void * ud, SoEventCallback * n) Gui::WaitCursor wc; // When this callback function is invoked we must in either case leave the edit mode - Gui::View3DInventorViewer* view = reinterpret_cast(n->getUserData()); + Gui::View3DInventorViewer* view = static_cast(n->getUserData()); view->setEditing(false); view->removeEventCallback(SoMouseButtonEvent::getClassTypeId(), clipMeshCallback,ud); n->setHandled(); @@ -974,7 +974,7 @@ void ViewProviderMesh::trimMeshCallback(void * ud, SoEventCallback * n) Gui::WaitCursor wc; // When this callback function is invoked we must in either case leave the edit mode - Gui::View3DInventorViewer* view = reinterpret_cast(n->getUserData()); + Gui::View3DInventorViewer* view = static_cast(n->getUserData()); view->setEditing(false); view->removeEventCallback(SoMouseButtonEvent::getClassTypeId(), trimMeshCallback,ud); n->setHandled(); @@ -1035,7 +1035,7 @@ void ViewProviderMesh::partMeshCallback(void * ud, SoEventCallback * cb) Gui::WaitCursor wc; // When this callback function is invoked we must in either case leave the edit mode - Gui::View3DInventorViewer* view = reinterpret_cast(cb->getUserData()); + Gui::View3DInventorViewer* view = static_cast(cb->getUserData()); view->setEditing(false); view->removeEventCallback(SoMouseButtonEvent::getClassTypeId(), partMeshCallback,ud); cb->setHandled(); @@ -1099,7 +1099,7 @@ void ViewProviderMesh::segmMeshCallback(void * ud, SoEventCallback * cb) Gui::WaitCursor wc; // When this callback function is invoked we must in either case leave the edit mode - Gui::View3DInventorViewer* view = reinterpret_cast(cb->getUserData()); + Gui::View3DInventorViewer* view = static_cast(cb->getUserData()); view->setEditing(false); view->removeEventCallback(SoMouseButtonEvent::getClassTypeId(), segmMeshCallback,ud); cb->setHandled(); @@ -1160,7 +1160,7 @@ void ViewProviderMesh::segmMeshCallback(void * ud, SoEventCallback * cb) void ViewProviderMesh::selectGLCallback(void * ud, SoEventCallback * n) { // When this callback function is invoked we must in either case leave the edit mode - Gui::View3DInventorViewer* view = reinterpret_cast(n->getUserData()); + Gui::View3DInventorViewer* view = static_cast(n->getUserData()); view->setEditing(false); view->removeEventCallback(SoMouseButtonEvent::getClassTypeId(), selectGLCallback,ud); n->setHandled(); @@ -1332,7 +1332,7 @@ std::vector ViewProviderMesh::getVisibleFacetsAfterZoom(const void ViewProviderMesh::renderGLCallback(void * ud, SoAction * action) { if (action->isOfType(SoGLRenderAction::getClassTypeId())) { - ViewProviderMesh* mesh = reinterpret_cast(ud); + ViewProviderMesh* mesh = static_cast(ud); Gui::SoVisibleFaceAction fa; fa.apply(mesh->getRoot()); } @@ -1411,11 +1411,6 @@ std::vector ViewProviderMesh::getVisibleFacets(const SbViewpor root->ref(); root->addChild(camera); -#if 0 - SoCallback* cb = new SoCallback; - cb->setCallback(renderGLCallback, const_cast(this)); - root->addChild(cb); -#else SoLightModel* lm = new SoLightModel(); lm->model = SoLightModel::BASE_COLOR; root->addChild(lm); @@ -1438,20 +1433,13 @@ std::vector ViewProviderMesh::getVisibleFacets(const SbViewpor //root->addChild(hints); root->addChild(mat); root->addChild(bind); -#endif root->addChild(this->getCoordNode()); root->addChild(this->getShapeNode()); // Coin3d's off-screen renderer doesn't work out-of-the-box any more on most recent Linux systems. // So, use FreeCAD's offscreen renderer now. -#if 0 - Gui::SoFCOffscreenRenderer& renderer = Gui::SoFCOffscreenRenderer::instance(); - renderer.setViewportRegion(vp); - renderer.setBackgroundColor(SbColor(0.0f, 0.0f, 0.0f)); -#else Gui::SoQtOffscreenRenderer renderer(vp); renderer.setBackgroundColor(SbColor4f(0.0f, 0.0f, 0.0f)); -#endif QImage img; renderer.render(root); @@ -1569,7 +1557,7 @@ void ViewProviderMesh::segmentMesh(const MeshCore::MeshKernel& toolMesh, const B void ViewProviderMesh::faceInfoCallback(void * ud, SoEventCallback * n) { const SoMouseButtonEvent * mbe = (SoMouseButtonEvent *)n->getEvent(); - Gui::View3DInventorViewer* view = reinterpret_cast(n->getUserData()); + Gui::View3DInventorViewer* view = static_cast(n->getUserData()); // Mark all incoming mouse button events as handled, especially, to deactivate the selection node n->getAction()->setHandled(); @@ -1651,7 +1639,7 @@ void ViewProviderMesh::faceInfoCallback(void * ud, SoEventCallback * n) void ViewProviderMesh::fillHoleCallback(void * ud, SoEventCallback * n) { const SoMouseButtonEvent * mbe = (SoMouseButtonEvent *)n->getEvent(); - Gui::View3DInventorViewer* view = reinterpret_cast(n->getUserData()); + Gui::View3DInventorViewer* view = static_cast(n->getUserData()); // Mark all incoming mouse button events as handled, especially, to deactivate the selection node n->getAction()->setHandled(); @@ -1697,7 +1685,7 @@ void ViewProviderMesh::markPartCallback(void * ud, SoEventCallback * n) // handle only mouse button events if (n->getEvent()->isOfType(SoMouseButtonEvent::getClassTypeId())) { const SoMouseButtonEvent * mbe = static_cast(n->getEvent()); - Gui::View3DInventorViewer* view = reinterpret_cast(n->getUserData()); + Gui::View3DInventorViewer* view = static_cast(n->getUserData()); // Mark all incoming mouse button events as handled, especially, to deactivate the selection node n->getAction()->setHandled(); @@ -1786,7 +1774,7 @@ void ViewProviderMesh::fillHole(Mesh::FacetIndex uFacet) // get the boundary to the picked facet std::list aBorder; - Mesh::Feature* fea = reinterpret_cast(this->getObject()); + Mesh::Feature* fea = static_cast(this->getObject()); const MeshCore::MeshKernel& rKernel = fea->Mesh.getValue().getKernel(); MeshCore::MeshRefPointToFacets cPt2Fac(rKernel); MeshCore::MeshAlgorithm meshAlg(rKernel); diff --git a/src/Mod/Mesh/Gui/ViewProviderCurvature.cpp b/src/Mod/Mesh/Gui/ViewProviderCurvature.cpp index ce99ac21ce..86d5aa8cdd 100644 --- a/src/Mod/Mesh/Gui/ViewProviderCurvature.cpp +++ b/src/Mod/Mesh/Gui/ViewProviderCurvature.cpp @@ -447,7 +447,7 @@ public: static void run(void * data, SoSensor * sensor) { - Annotation* self = reinterpret_cast(data); + Annotation* self = static_cast(data); self->show(); delete self; delete sensor; @@ -497,7 +497,7 @@ private: void ViewProviderMeshCurvature::curvatureInfoCallback(void * ud, SoEventCallback * n) { - Gui::View3DInventorViewer* view = reinterpret_cast(n->getUserData()); + Gui::View3DInventorViewer* view = static_cast(n->getUserData()); const SoEvent* ev = n->getEvent(); if (ev->getTypeId() == SoMouseButtonEvent::getClassTypeId()) { const SoMouseButtonEvent * mbe = static_cast(ev);