[TD]Fix rich text size/position in Svg export

- still an issue with line spacing
FreeCAD · Feb 5, 2020 · d68fcb8 · d68fcb8
1 parent e6a2998
commit d68fcb8
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 50 deletions.
diff --git a/src/Mod/TechDraw/Gui/QGIRichAnno.cpp b/src/Mod/TechDraw/Gui/QGIRichAnno.cpp
@@ -22,23 +22,26 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-  #include <BRep_Builder.hxx>
-  #include <TopoDS_Compound.hxx>
-  # include <TopoDS_Shape.hxx>
-  # include <TopoDS_Edge.hxx>
-  # include <TopoDS.hxx>
-  # include <BRepAdaptor_Curve.hxx>
-  # include <Precision.hxx>
-
-  # include <QGraphicsScene>
-  # include <QGraphicsSceneMouseEvent>
-  # include <QGraphicsItem>
-  # include <QPainter>
-  # include <QPaintDevice>
-  # include <QSvgGenerator>
-  #include <QRegExp>
-
-  # include <math.h>
+#include <BRep_Builder.hxx>
+#include <TopoDS_Compound.hxx>
+#include <TopoDS_Shape.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopoDS.hxx>
+#include <BRepAdaptor_Curve.hxx>
+#include <Precision.hxx>
+
+#include <QGraphicsScene>
+#include <QGraphicsSceneMouseEvent>
+#include <QGraphicsItem>
+#include <QPainter>
+#include <QPaintDevice>
+#include <QSvgGenerator>
+#include <QRegExp>
+#include <QTextDocument>
+#include <QTextFrame>
+#include <QTextBlock>
+
+# include <math.h>
 #endif
 
 #include <App/Application.h>
@@ -77,7 +80,8 @@ using namespace TechDrawGui;
 
 //**************************************************************
 QGIRichAnno::QGIRichAnno(QGraphicsItem* myParent,
-                         TechDraw::DrawRichAnno* anno)
+                         TechDraw::DrawRichAnno* anno) :
+    m_isExporting(false)
 {
     setHandlesChildEvents(false);
     setAcceptHoverEvents(false);
@@ -192,41 +196,49 @@ void QGIRichAnno::setTextItem()
 {
 //    Base::Console().Message("QGIRA::setTextItem() - %s\n",getViewName());
     TechDraw::DrawRichAnno* annoFeat = getFeature();
-
-    //convert point font sizes to (Rez,mm) font sizes
-    QRegExp rxFontSize(QString::fromUtf8("font-size:([0-9]*)pt;"));
     QString inHtml = QString::fromUtf8(annoFeat->AnnoText.getValue());
-    QString match;
-    double mmPerPoint = 0.353;
-    double sizeConvert = Rez::getRezFactor() * mmPerPoint;
-    int pos = 0;
-    QStringList findList;
-    QStringList replList;
-    while ((pos = rxFontSize.indexIn(inHtml, pos)) != -1) {
-        QString found = rxFontSize.cap(0);
-        findList << found;
-        QString qsOldSize = rxFontSize.cap(1); 
-
-        QString repl = found;
-        double newSize = qsOldSize.toDouble();
-        newSize = newSize * sizeConvert;
-        QString qsNewSize = QString::number(newSize, 'f', 2);
-        repl.replace(qsOldSize,qsNewSize);
-        replList << repl;
-        pos += rxFontSize.matchedLength();
-    }
-    QString outHtml = inHtml;
-    int iRepl = 0;
-    //TODO: check list for duplicates?
-    for ( ; iRepl < findList.size(); iRepl++) {
-        outHtml = outHtml.replace(findList[iRepl], replList[iRepl]);
-    }
 
-    m_text->setHtml(outHtml);
-
-    m_text->setTextWidth(Rez::guiX(annoFeat->MaxWidth.getValue()));
+    //don't do this multiplication if exporting to SVG as other apps interpret 
+    //font sizes differently from QGraphicsTextItem (?)
+    if (!getExporting()) {
+        //convert point font sizes to (Rez,mm) font sizes
+        QRegExp rxFontSize(QString::fromUtf8("font-size:([0-9]*)pt;"));
+        QString match;
+        double mmPerPoint = 0.353;
+        double sizeConvert = Rez::getRezFactor() * mmPerPoint;
+        int pos = 0;
+        QStringList findList;
+        QStringList replList;
+        while ((pos = rxFontSize.indexIn(inHtml, pos)) != -1) {
+            QString found = rxFontSize.cap(0);
+            findList << found;
+            QString qsOldSize = rxFontSize.cap(1); 
+
+            QString repl = found;
+            double newSize = qsOldSize.toDouble();
+            newSize = newSize * sizeConvert;
+            QString qsNewSize = QString::number(newSize, 'f', 2);
+            repl.replace(qsOldSize,qsNewSize);
+            replList << repl;
+            pos += rxFontSize.matchedLength();
+        }
+        QString outHtml = inHtml;
+        int iRepl = 0;
+        //TODO: check list for duplicates?
+        for ( ; iRepl < findList.size(); iRepl++) {
+            outHtml = outHtml.replace(findList[iRepl], replList[iRepl]);
+        }
+
+        m_text->setTextWidth(Rez::guiX(annoFeat->MaxWidth.getValue()));
+        m_text->setHtml(outHtml);
+    } else {
+        //TODO: fix line spacing.  common solutions (style sheet, 
+        //      QTextBlock::setLineHeight(150, QTextBlockFormat::ProportionalHeight)) don't help
+        double realWidth = m_text->boundingRect().width();
+        m_text->setTextWidth(realWidth);
+        m_text->setHtml(inHtml);
+    }
 
-//    m_text->showBox(annoFeat->ShowFrame.getValue());
     if (annoFeat->ShowFrame.getValue()) {
         QRectF r = m_text->boundingRect().adjusted(1,1,-1,-1);
         m_rect->setPen(rectPen());

diff --git a/src/Mod/TechDraw/Gui/QGIRichAnno.h b/src/Mod/TechDraw/Gui/QGIRichAnno.h
@@ -80,6 +80,9 @@ class TechDrawGuiExport QGIRichAnno : public QGIView
     virtual TechDraw::DrawRichAnno* getFeature(void);
     QPen rectPen() const;
 
+    void setExporting(bool b) { m_isExporting = b; }
+    bool getExporting(void) { return m_isExporting; }
+
 
 public Q_SLOTS:
 /*    void textDragging(void);*/
@@ -92,6 +95,8 @@ public Q_SLOTS:
     virtual QVariant itemChange( GraphicsItemChange change,
                                  const QVariant &value ) override;
 
+    bool m_isExporting;
+
 protected:
 /*    QGMText* m_text;*/
     QGCustomText* m_text;

diff --git a/src/Mod/TechDraw/Gui/QGVPage.cpp b/src/Mod/TechDraw/Gui/QGVPage.cpp
@@ -763,9 +763,13 @@ void QGVPage::setExporting(bool enable)
     QList<QGraphicsItem*> sceneItems = scene()->items();
     for (auto& qgi:sceneItems) {
         QGIViewPart* qgiPart = dynamic_cast<QGIViewPart *>(qgi);
+        QGIRichAnno* qgiRTA  = dynamic_cast<QGIRichAnno *>(qgi);
         if(qgiPart) {
             qgiPart->setExporting(enable);
         }
+        if (qgiRTA) {
+            qgiRTA->setExporting(enable);
+        }
     }
 }