kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Allow Views of App::Parts

Browse Source
This commit is contained in:
WandererFan
2017-09-26 13:16:23 -04:00
committed by Yorik van Havre
parent 6d032f1bcf
commit 913e6a7fd8
4 changed files with 98 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/Mod/TechDraw/Gui/Command.cpp
View File

@@ -34,6 +34,7 @@
#include <App/Document.h>
#include <App/DocumentObject.h>
#include <App/FeaturePython.h>
#include <App/Part.h>
#include <App/PropertyGeo.h>
#include <Base/Console.h>
#include <Base/Exception.h>
@@ -254,11 +255,17 @@ void CmdTechDrawNewView::activated(int iMsg)
}
std::vector<App::DocumentObject*> shapes = getSelection().getObjectsOfType(Part::Feature::getClassTypeId());
if (shapes.empty()) {
std::vector<App::DocumentObject*> parts = getSelection().getObjectsOfType(App::Part::getClassTypeId());
if ((shapes.empty()) &&
(parts.empty())) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Select at least 1 Part object."));
QObject::tr("Select at least 1 object with a Shape."));
return;
}
if (!parts.empty()) {
shapes.insert(shapes.end(),parts.begin(),parts.end());
}
std::string PageName = page->getNameInDocument();
@@ -337,11 +344,6 @@ void CmdTechDrawNewViewSection::activated(int iMsg)
}
App::DocumentObject* dObj = *(shapes.begin());
TechDraw::DrawViewPart* dvp = static_cast<TechDraw::DrawViewPart*>(dObj);
// if (dvp->getSectionRef()) {
// QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
// QObject::tr("This View already has a related Section. Choose another."));
// return;
// }
std::string PageName = page->getNameInDocument();
@@ -471,11 +473,24 @@ void CmdTechDrawProjGroup::activated(int iMsg)
}
std::vector<App::DocumentObject*> shapes = getSelection().getObjectsOfType(Part::Feature::getClassTypeId());
if (shapes.size() != 1) {
// if (shapes.size() != 1) {
// QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
// QObject::tr("Select exactly 1 Part object."));
// return;
// }
std::vector<App::DocumentObject*> parts = getSelection().getObjectsOfType(App::Part::getClassTypeId());
if ((shapes.empty()) &&
(parts.empty())) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Select exactly 1 Part object."));
QObject::tr("Select at least 1 object with a Shape."));
return;
}
if (!parts.empty()) {
shapes.insert(shapes.end(),parts.begin(),parts.end());
}
std::string PageName = page->getNameInDocument();
Gui::WaitCursor wc;
@@ -534,12 +549,23 @@ void CmdTechDrawNewMulti::activated(int iMsg)
return;
}
const std::vector<App::DocumentObject*>& shapes = getSelection().getObjectsOfType(Part::Feature::getClassTypeId());
if (shapes.empty()) {
std::vector<App::DocumentObject*> shapes = getSelection().getObjectsOfType(Part::Feature::getClassTypeId());
// if (shapes.empty()) {
// QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
// QObject::tr("Select at least 1 Part object."));
// return;
// }
std::vector<App::DocumentObject*> parts = getSelection().getObjectsOfType(App::Part::getClassTypeId());
if ((shapes.empty()) &&
(parts.empty())) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Select at least 1 Part object."));
QObject::tr("Select at least 1 object with a Shape."));
return;
}
if (!parts.empty()) {
shapes.insert(shapes.end(),parts.begin(),parts.end());
}
std::string PageName = page->getNameInDocument();
@@ -880,6 +906,7 @@ void CmdTechDrawDraftView::activated(int iMsg)
return;
}
//TODO: shouldn't this be checking for a Draft object only?
std::vector<App::DocumentObject*> objects = getSelection().getObjectsOfType(App::DocumentObject::getClassTypeId());
if (objects.empty()) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
@@ -905,6 +932,7 @@ bool CmdTechDrawDraftView::isActive(void)
return DrawGuiUtil::needPage(this);
}
//TODO: shouldn't this be checking for an Arch object only?
//===========================================================================
// TechDraw_ArchView
//===========================================================================