Commit 56e448d1 authored by logari81's avatar logari81 Committed by jriegel
Browse files

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
parent 4ed9b1c2
......@@ -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
......
......@@ -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;
......
......@@ -42,8 +42,6 @@ public:
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> &);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment