From 266b5cfdbd91ae44b4f8ca8763444b96526ccc09 Mon Sep 17 00:00:00 2001 From: wandererfan Date: Mon, 28 Oct 2019 19:30:52 -0400 Subject: [PATCH] [TD]fix default svg hatch file retrieval --- src/Mod/TechDraw/App/DrawViewSection.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/Mod/TechDraw/App/DrawViewSection.cpp b/src/Mod/TechDraw/App/DrawViewSection.cpp index f55b56f52d4d..6378fb045142 100644 --- a/src/Mod/TechDraw/App/DrawViewSection.cpp +++ b/src/Mod/TechDraw/App/DrawViewSection.cpp @@ -70,6 +70,7 @@ #include #include #include +#include #include #include @@ -742,18 +743,16 @@ TechDraw::DrawProjGroupItem* DrawViewSection::getBaseDPGI() void DrawViewSection::getParameters() { Base::Reference hGrp = App::GetApplication().GetUserParameter() - .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw"); + .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Files"); - std::string defaultDir = App::Application::getResourceDir() + "Mod/Drawing/patterns/"; + std::string defaultDir = App::Application::getResourceDir() + "Mod/TechDraw/Patterns/"; std::string defaultFileName = defaultDir + "simple.svg"; - QString patternFileName = QString::fromStdString(hGrp->GetASCII("FileHatch",defaultFileName.c_str())); - if (patternFileName.isEmpty()) { - patternFileName = QString::fromStdString(defaultFileName); + std::string patternFileName = hGrp->GetASCII("FileHatch",defaultFileName.c_str()); + Base::FileInfo tfi(patternFileName); + if (tfi.isReadable()) { + FileHatchPattern.setValue(patternFileName); } - QFileInfo tfi(patternFileName); - if (tfi.isReadable()) { - FileHatchPattern.setValue(patternFileName.toUtf8().constData()); - } + std::string patternName = hGrp->GetASCII("PatternName","Diamond"); NameGeomPattern.setValue(patternName);