Skip to content

Commit

Permalink
Deactivate Nesting of Transform features
Browse files Browse the repository at this point in the history
  • Loading branch information
jriegel committed Jan 7, 2013
1 parent 546ab0f commit 171a8db
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 25 deletions.
26 changes: 13 additions & 13 deletions src/Mod/PartDesign/Gui/ViewProviderMultiTransform.cpp
Expand Up @@ -60,19 +60,19 @@ 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
//{
// 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;
//}

bool ViewProviderMultiTransform::onDelete(const std::vector<std::string> &svec) {
// Delete the transformation features
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/PartDesign/Gui/ViewProviderMultiTransform.h
Expand Up @@ -35,7 +35,7 @@ class PartDesignGuiExport ViewProviderMultiTransform : public ViewProviderTransf
ViewProviderMultiTransform()
{ featureName = std::string("MultiTransform"); }

std::vector<App::DocumentObject*> claimChildren(void) const;
//std::vector<App::DocumentObject*> claimChildren(void) const;

virtual bool onDelete(const std::vector<std::string> &);

Expand Down
20 changes: 10 additions & 10 deletions src/Mod/PartDesign/Gui/ViewProviderTransformed.cpp
Expand Up @@ -38,16 +38,16 @@ 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;
}
//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)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Mod/PartDesign/Gui/ViewProviderTransformed.h
Expand Up @@ -43,7 +43,7 @@ class PartDesignGuiExport ViewProviderTransformed : public ViewProvider
{}

/// grouping handling
std::vector<App::DocumentObject*> claimChildren(void) const;
//std::vector<App::DocumentObject*> claimChildren(void) const;
void setupContextMenu(QMenu*, QObject*, const char*);

virtual bool onDelete(const std::vector<std::string> &);
Expand Down

0 comments on commit 171a8db

Please sign in to comment.