PartDesign: Deactivate nesting of original features in patterns

Conflicts: src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp src/Mod/PartDesign/Gui/ViewProviderTransformed.cpp src/Mod/PartDesign/Gui/ViewProviderTransformed.h
FreeCAD · Jan 12, 2013 · 56e448d · 56e448d
1 parent 4ed9b1c
commit 56e448d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 26 deletions.
diff --git a/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp b/src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp
@@ -60,19 +60,15 @@ bool ViewProviderMultiTransform::setEdit(int ModNum)
     }
 }
 
-//std::vector<App::DocumentObject*> ViewProviderMultiTransform::claimChildren(void) const
-//{
-//    std::vector<App::DocumentObject*> result = ViewProviderTransformed::claimChildren();
-//
-//    PartDesign::MultiTransform* pcMultiTransform = static_cast<PartDesign::MultiTransform*>(getObject());
-//    if (pcMultiTransform == NULL)
-//        return std::vector<App::DocumentObject*>(); // TODO: Show error?
-//
-//    std::vector<App::DocumentObject*> transformFeatures = pcMultiTransform->Transformations.getValues();
-//
-//    result.insert(result.end(), transformFeatures.begin(), transformFeatures.end());
-//    return result;
-//}
+std::vector<App::DocumentObject*> ViewProviderMultiTransform::claimChildren(void) const
+{
+    PartDesign::MultiTransform* pcMultiTransform = static_cast<PartDesign::MultiTransform*>(getObject());
+    if (pcMultiTransform == NULL)
+        return std::vector<App::DocumentObject*>(); // TODO: Show error?
+
+    std::vector<App::DocumentObject*> transformFeatures = pcMultiTransform->Transformations.getValues();
+    return transformFeatures;
+}
 
 bool ViewProviderMultiTransform::onDelete(const std::vector<std::string> &svec) {
     // Delete the transformation features

diff --git 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<App::DocumentObject*> ViewProviderTransformed::claimChildren(void)const
-//{
-//    PartDesign::Transformed* pcTransformed = static_cast<PartDesign::Transformed*>(getObject());
-//    if (pcTransformed == NULL)
-//        return std::vector<App::DocumentObject*>(); // TODO: Show error?
-//
-//    std::vector<App::DocumentObject*> 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
@@ -42,8 +42,6 @@ class PartDesignGuiExport ViewProviderTransformed : public ViewProvider
     virtual ~ViewProviderTransformed()
         {}
 
-    /// grouping handling
-    //std::vector<App::DocumentObject*> claimChildren(void) const;
     void setupContextMenu(QMenu*, QObject*, const char*);
 
     virtual bool onDelete(const std::vector<std::string> &);