From 92790b6d1e177ff4e9440b61340fb35511ed40cf Mon Sep 17 00:00:00 2001 From: logari81 Date: Wed, 9 Jan 2013 23:35:32 +0100 Subject: [PATCH] PartDesign: Deactivate nesting of original features in patterns --- src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp | 6 +----- src/Mod/PartDesign/Gui/ViewProviderTransformed.cpp | 11 ----------- src/Mod/PartDesign/Gui/ViewProviderTransformed.h | 2 -- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp b/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp index 462dfc1af0..3c17680adc 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp @@ -62,16 +62,12 @@ bool ViewProviderMultiTransform::setEdit(int ModNum) std::vector ViewProviderMultiTransform::claimChildren(void) const { - std::vector result = ViewProviderTransformed::claimChildren(); - PartDesign::MultiTransform* pcMultiTransform = static_cast(getObject()); if (pcMultiTransform == NULL) return std::vector(); // TODO: Show error? std::vector transformFeatures = pcMultiTransform->Transformations.getValues(); - - result.insert(result.end(), transformFeatures.begin(), transformFeatures.end()); - return result; + return transformFeatures; } bool ViewProviderMultiTransform::onDelete(const std::vector &svec) { diff --git a/src/Mod/PartDesign/Gui/ViewProviderTransformed.cpp b/src/Mod/PartDesign/Gui/ViewProviderTransformed.cpp index 9efe20aa41..5af43cd05f 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderTransformed.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderTransformed.cpp @@ -38,17 +38,6 @@ using namespace PartDesignGui; PROPERTY_SOURCE(PartDesignGui::ViewProviderTransformed,PartDesignGui::ViewProvider) -std::vector ViewProviderTransformed::claimChildren(void)const -{ - PartDesign::Transformed* pcTransformed = static_cast(getObject()); - if (pcTransformed == NULL) - return std::vector(); // TODO: Show error? - - std::vector originals = pcTransformed->Originals.getValues(); - - return originals; -} - void ViewProviderTransformed::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { QAction* act; diff --git a/src/Mod/PartDesign/Gui/ViewProviderTransformed.h b/src/Mod/PartDesign/Gui/ViewProviderTransformed.h index 39b7b099cf..1265f67e8a 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderTransformed.h +++ b/src/Mod/PartDesign/Gui/ViewProviderTransformed.h @@ -42,8 +42,6 @@ public: virtual ~ViewProviderTransformed() {} - /// grouping handling - std::vector claimChildren(void) const; void setupContextMenu(QMenu*, QObject*, const char*); virtual bool onDelete(const std::vector &);