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

Correctly identify standard template files

Browse Source
This commit is contained in:
j-dowsett 2013-11-28 17:56:29 +00:00
parent ad9c33b9d6
commit 7d159360c4
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -584,7 +584,8 @@ void TaskOrthoViews::pagesize(std::string& page_template)
for (int i=0; i < num_templates; i++)
{
if (templates[i] == page_template)
// if (templates[i] == page_template)
if (page_template.find(templates[i]) != std::string::npos)
{
pagewidth = dimensions[i][0] - 2*margin;
pageh1 = dimensions[i][1] - 2*margin;
@ -597,7 +598,8 @@ void TaskOrthoViews::pagesize(std::string& page_template)
//code below copied from FeaturePage.cpp
Base::FileInfo fi(page_template);
if (!fi.isReadable()) {
if (!fi.isReadable())
{
fi.setFile(App::Application::getResourceDir() + "Mod/Drawing/Templates/" + fi.fileName());
if (!fi.isReadable()) //if so then really shouldn't have been able to get this far, but just in case...
{
@ -657,7 +659,8 @@ void TaskOrthoViews::pagesize(std::string& page_template)
break;
}
}
catch (Standard_Failure) { }
catch (Standard_Failure)
{ }
file.close();