suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug 1643: Projections are always added to the first drawing page

Browse Source
This commit is contained in:
Michael G. Hansen 2014-08-19 15:07:02 +02:00 committed by wmayer
parent e9100c7ddb
commit dd7bd833c6
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Mod/Drawing/Gui/Command.cpp
View File

@ -319,23 +319,22 @@ CmdDrawingOrthoViews::CmdDrawingOrthoViews()
void CmdDrawingOrthoViews::activated(int iMsg)
{
std::vector<App::DocumentObject*> shapes = getSelection().getObjectsOfType(Part::Feature::getClassTypeId());
const std::vector<App::DocumentObject*> shapes = getSelection().getObjectsOfType(Part::Feature::getClassTypeId());
if (shapes.size() != 1) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Select a Part object."));
QObject::tr("Select exactly one Part object."));
return;
}
std::vector<App::DocumentObject*> pages = getSelection().getObjectsOfType(Drawing::FeaturePage::getClassTypeId());
// Check that a page object exists. TaskDlgOrthoViews will then check for a selected page object
// and use that, otherwise it will use the first page in the document.
const std::vector<App::DocumentObject*> pages = this->getDocument()->getObjectsOfType(Drawing::FeaturePage::getClassTypeId());
if (pages.empty()) {
pages = this->getDocument()->getObjectsOfType(Drawing::FeaturePage::getClassTypeId());
if (pages.empty()){
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("No page found"),
QObject::tr("Create a page first."));
return;
}
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("No page found"),
QObject::tr("Create a page first."));
return;
}
Gui::Control().showDialog(new TaskDlgOrthoViews());
}

5
src/Mod/Drawing/Gui/TaskOrthoViews.cpp
View File

@ -858,7 +858,10 @@ TaskOrthoViews::TaskOrthoViews(QWidget *parent)
const char * part = obj.front()->getNameInDocument();
App::Document * doc = App::GetApplication().getActiveDocument();
vector<App::DocumentObject*> pages = doc->getObjectsOfType(Drawing::FeaturePage::getClassTypeId());
vector<App::DocumentObject*> pages = Gui::Selection().getObjectsOfType(Drawing::FeaturePage::getClassTypeId());
if (pages.empty()) {
pages = doc->getObjectsOfType(Drawing::FeaturePage::getClassTypeId());
}
string PageName = pages.front()->getNameInDocument();
const char * page = PageName.c_str();