From 4a0ab015f6c908f5a6e8eae830e2208bc9e349ec Mon Sep 17 00:00:00 2001 From: wandererfan Date: Fri, 20 Mar 2020 14:08:52 -0400 Subject: [PATCH] [TD]Hatch - handle empty parameter - use default --- src/Mod/TechDraw/App/DrawHatch.cpp | 3 +++ src/Mod/TechDraw/Gui/QGIViewPart.cpp | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Mod/TechDraw/App/DrawHatch.cpp b/src/Mod/TechDraw/App/DrawHatch.cpp index acb6843b3f..27b1677c7a 100644 --- a/src/Mod/TechDraw/App/DrawHatch.cpp +++ b/src/Mod/TechDraw/App/DrawHatch.cpp @@ -270,6 +270,9 @@ std::string DrawHatch::prefSvgHatch(void) std::string defaultDir = App::Application::getResourceDir() + "Mod/TechDraw/Patterns/"; std::string defaultFileName = defaultDir + "simple.svg"; std::string result = hGrp->GetASCII("FileHatch",defaultFileName.c_str()); + if (result.empty()) { + result = defaultFileName; + } return result; } diff --git a/src/Mod/TechDraw/Gui/QGIViewPart.cpp b/src/Mod/TechDraw/Gui/QGIViewPart.cpp index 91d5cd9840..e730986132 100644 --- a/src/Mod/TechDraw/Gui/QGIViewPart.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewPart.cpp @@ -441,11 +441,11 @@ void QGIViewPart::draw() { void QGIViewPart::drawViewPart() { -// Base::Console().Message("QGIVP::DVP()\n"); auto viewPart( dynamic_cast(getViewObject()) ); if ( viewPart == nullptr ) { return; } +// Base::Console().Message("QGIVP::DVP() - %s / %s\n", viewPart->getNameInDocument(), viewPart->Label.getValue()); if (!viewPart->hasGeometry()) { removePrimitives(); //clean the slate removeDecorations(); @@ -508,7 +508,7 @@ void QGIViewPart::drawViewPart() } } } else if (fHatch) { - if (!fHatch->HatchPattern.isEmpty()) { + if (!fHatch->SvgIncluded.isEmpty()) { if (getExporting()) { newFace->hideSvg(true); newFace->isHatched(false);