From 15917cd60fadc00f5b8d9c4b68f79ec3cfa9dd78 Mon Sep 17 00:00:00 2001
From: Wanderer Fan <wandererfan@gmail.com>
Date: Wed, 6 Apr 2022 19:00:31 -0400
Subject: [PATCH] [TD]fix artifact in PDF export

---
 src/Mod/TechDraw/Gui/QGIFace.cpp          |  7 +++++++
 src/Mod/TechDraw/Gui/QGIViewDimension.cpp | 25 ++++++++++++++++++-----
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/Mod/TechDraw/Gui/QGIFace.cpp b/src/Mod/TechDraw/Gui/QGIFace.cpp
index e20fd5086a..2705621e46 100644
--- a/src/Mod/TechDraw/Gui/QGIFace.cpp
+++ b/src/Mod/TechDraw/Gui/QGIFace.cpp
@@ -134,6 +134,8 @@ void QGIFace::draw()
                     lineSetToFillItems(ls);
                 }
             }
+            m_image->hide();
+            m_rect->hide();
         } else if ((m_mode == FromFile) ||
                    (m_mode == SvgFill)  ||
                    (m_mode == BitmapFill)) {  
@@ -171,7 +173,12 @@ void QGIFace::draw()
             }
         } else if (m_mode == PlainFill) {
             setFill(m_colNormalFill, m_styleNormal);
+            m_image->hide();
+            m_rect->hide();
         }
+    } else {
+        m_image->hide();
+        m_rect->hide();
     }
     show();
 }
diff --git a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp
index 1b18272d73..31e1d6fe2e 100644
--- a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp
+++ b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp
@@ -353,8 +353,6 @@ void QGIDatumLabel::setToleranceString()
         m_tolTextUnder->setPlainText(QString());
         return;
     }
-    m_tolTextOver->show();
-    m_tolTextUnder->show();
 
     std::pair<std::string, std::string> labelTexts, unitTexts;
 
@@ -373,8 +371,18 @@ void QGIDatumLabel::setToleranceString()
         }
     }
 
-    m_tolTextUnder->setPlainText(QString::fromUtf8(labelTexts.first.c_str()));
-    m_tolTextOver->setPlainText(QString::fromUtf8(labelTexts.second.c_str()));
+    if (labelTexts.first.empty()) {
+        m_tolTextUnder->hide();
+    } else {
+        m_tolTextUnder->setPlainText(QString::fromUtf8(labelTexts.first.c_str()));
+        m_tolTextUnder->show();
+    }
+    if (labelTexts.second.empty()) {
+        m_tolTextOver->hide();
+    }else {
+        m_tolTextOver->setPlainText(QString::fromUtf8(labelTexts.second.c_str()));
+        m_tolTextOver->show();
+    }
 
     return;
 } 
@@ -382,7 +390,12 @@ void QGIDatumLabel::setToleranceString()
 void QGIDatumLabel::setUnitString(QString t)
 {
     prepareGeometryChange();
-    m_unitText->setPlainText(t);
+    if (t.isEmpty()) {
+        m_unitText->hide();
+    } else {
+        m_unitText->setPlainText(t);
+        m_unitText->show();
+    }
 } 
 
 
@@ -507,6 +520,8 @@ QGIViewDimension::QGIViewDimension() :
 
     setZValue(ZVALUE::DIMENSION);         //note: this won't paint dimensions over another View if it stacks
                                           //above this Dimension's parent view.   need Layers?
+    m_border->hide();
+    m_label->hide();
 }
 
 QVariant QGIViewDimension::itemChange(GraphicsItemChange change, const QVariant &value)