From 6a9dff81297c672687df856795f1c8c17107f5bd Mon Sep 17 00:00:00 2001 From: wmayer Date: Thu, 10 Nov 2011 16:40:14 +0000 Subject: [PATCH] + do some code clean up + adjust type id according to inheritance of view providers git-svn-id: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk@5111 e8eeb9e2-ec13-0410-a4a9-efa5cf37419d --- src/Gui/ViewProvider.h | 8 -------- src/Mod/Part/Gui/ViewProviderMirror.cpp | 6 +++--- src/Mod/PartDesign/Gui/ViewProviderHole.cpp | 2 +- src/Mod/PartDesign/Gui/ViewProviderPad.cpp | 2 +- src/Mod/PartDesign/Gui/ViewProviderPatternRectangular.cpp | 2 +- src/Mod/PartDesign/Gui/ViewProviderRevolution.cpp | 2 +- 6 files changed, 7 insertions(+), 15 deletions(-) diff --git a/src/Gui/ViewProvider.h b/src/Gui/ViewProvider.h index 8b5648e1f..4641c5886 100644 --- a/src/Gui/ViewProvider.h +++ b/src/Gui/ViewProvider.h @@ -185,14 +185,6 @@ public: Transform, Cutting, Color, - Mirror - //FIXME: Never do such stuff in the base system -/*, - Fillet, - Sketch, - Pad, - Pocket, - Revolve*/ }; protected: /// is called by the document when the provider goes in edit mode diff --git a/src/Mod/Part/Gui/ViewProviderMirror.cpp b/src/Mod/Part/Gui/ViewProviderMirror.cpp index 356007c51..4741bc692 100644 --- a/src/Mod/Part/Gui/ViewProviderMirror.cpp +++ b/src/Mod/Part/Gui/ViewProviderMirror.cpp @@ -65,13 +65,13 @@ void ViewProviderMirror::setupContextMenu(QMenu* menu, QObject* receiver, const { QAction* act; act = menu->addAction(QObject::tr("Edit mirror plane"), receiver, member); - act->setData(QVariant((int)ViewProvider::Mirror)); + act->setData(QVariant((int)ViewProvider::Default)); ViewProviderPart::setupContextMenu(menu, receiver, member); } bool ViewProviderMirror::setEdit(int ModNum) { - if (ModNum == ViewProvider::Default || ModNum == ViewProvider::Mirror) { + if (ModNum == ViewProvider::Default) { // get the properties from the mirror feature Part::Mirroring* mf = static_cast(getObject()); Base::BoundBox3d bbox = mf->Shape.getBoundingBox(); @@ -134,7 +134,7 @@ bool ViewProviderMirror::setEdit(int ModNum) void ViewProviderMirror::unsetEdit(int ModNum) { - if (ModNum == ViewProvider::Default || ModNum == ViewProvider::Mirror) { + if (ModNum == ViewProvider::Default) { SoCenterballManip* manip = static_cast(pcEditNode->getChild(0)); SbVec3f move = manip->translation.getValue(); diff --git a/src/Mod/PartDesign/Gui/ViewProviderHole.cpp b/src/Mod/PartDesign/Gui/ViewProviderHole.cpp index b112bc8db..9ae9e686a 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderHole.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderHole.cpp @@ -31,7 +31,7 @@ using namespace PartDesignGui; -PROPERTY_SOURCE(PartDesignGui::ViewProviderHole,PartGui::ViewProviderPart) +PROPERTY_SOURCE(PartDesignGui::ViewProviderHole,PartDesignGui::ViewProvider) ViewProviderHole::ViewProviderHole() { diff --git a/src/Mod/PartDesign/Gui/ViewProviderPad.cpp b/src/Mod/PartDesign/Gui/ViewProviderPad.cpp index 35947f258..1bb696ab7 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPad.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderPad.cpp @@ -36,7 +36,7 @@ using namespace PartDesignGui; -PROPERTY_SOURCE(PartDesignGui::ViewProviderPad,PartGui::ViewProviderPart) +PROPERTY_SOURCE(PartDesignGui::ViewProviderPad,PartDesignGui::ViewProvider) ViewProviderPad::ViewProviderPad() { diff --git a/src/Mod/PartDesign/Gui/ViewProviderPatternRectangular.cpp b/src/Mod/PartDesign/Gui/ViewProviderPatternRectangular.cpp index 066c51c86..4929dcaae 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPatternRectangular.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderPatternRectangular.cpp @@ -30,7 +30,7 @@ using namespace PartDesignGui; -PROPERTY_SOURCE(PartDesignGui::ViewProviderPatternRectangular,PartGui::ViewProviderPart) +PROPERTY_SOURCE(PartDesignGui::ViewProviderPatternRectangular,PartDesignGui::ViewProvider) ViewProviderPatternRectangular::ViewProviderPatternRectangular() { diff --git a/src/Mod/PartDesign/Gui/ViewProviderRevolution.cpp b/src/Mod/PartDesign/Gui/ViewProviderRevolution.cpp index fe8ed944a..016764b5a 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderRevolution.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderRevolution.cpp @@ -37,7 +37,7 @@ using namespace PartDesignGui; -PROPERTY_SOURCE(PartDesignGui::ViewProviderRevolution,PartGui::ViewProviderPart) +PROPERTY_SOURCE(PartDesignGui::ViewProviderRevolution,PartDesignGui::ViewProvider) ViewProviderRevolution::ViewProviderRevolution() {