RowItemParams: Added font and text_height

diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index 0b129c3bf7b9d45acb6a69e89d0433576f3a4d6c..0b4cd7c599962ab5cd5399554c2326cfee077665 100644 (file)
--- a/pv/view/decodetrace.cpp
+++ b/pv/view/decodetrace.cpp
@@ -160,9 +160,7 @@ pair<int, int> DecodeTrace::v_extents() const
 {
        /// @todo Replace this with an implementation that knows the true
        /// height of the trace
-       QFontMetrics m(QApplication::font());
-       const int text_height =  m.boundingRect(QRect(), 0, "Tg").height();
-       const int row_height = (text_height * 6) / 4;
+       const int row_height = (RowItemPaintParams::text_height() * 6) / 4;
        return make_pair(-row_height / 2, row_height * 7 / 2);
 }
 
@@ -176,8 +174,7 @@ void DecodeTrace::paint_mid(QPainter &p, const RowItemPaintParams &pp)
 {
        using namespace pv::data::decode;
 
-       QFontMetrics m(QApplication::font());
-       text_height_ = m.boundingRect(QRect(), 0, "Tg").height();
+       text_height_ = RowItemPaintParams::text_height();
        row_height_ = (text_height_ * 6) / 4;
        const int annotation_height = (text_height_ * 5) / 4;
 

diff --git a/pv/view/rowitempaintparams.cpp b/pv/view/rowitempaintparams.cpp
index af5f675a5ea6ad956b6880f8367a84265bb139b6..c46d715bb13638860d0185ee9d05c85be6fa48b0 100644 (file)
--- a/pv/view/rowitempaintparams.cpp
+++ b/pv/view/rowitempaintparams.cpp
@@ -20,6 +20,9 @@
 
 #include <cassert>
 
+#include <QApplication>
+#include <QFontMetrics>
+
 #include "rowitempaintparams.hpp"
 
 namespace pv {
@@ -35,5 +38,15 @@ RowItemPaintParams::RowItemPaintParams(
        assert(scale > 0.0);
 }
 
+QFont RowItemPaintParams::font()
+{
+       return QApplication::font();
+}
+
+int RowItemPaintParams::text_height() {
+       QFontMetrics m(font());
+       return m.boundingRect(QRect(), 0, "Tg").height();
+}
+
 } // namespace view
 } // namespace pv

diff --git a/pv/view/rowitempaintparams.hpp b/pv/view/rowitempaintparams.hpp
index 5c71edcbbcb10783f7cd06ed1e50758af9f05e3c..ec66076b8860476644fabf6733b3ee2258d1cef1 100644 (file)
--- a/pv/view/rowitempaintparams.hpp
+++ b/pv/view/rowitempaintparams.hpp
@@ -21,6 +21,8 @@
 #ifndef PULSEVIEW_PV_VIEW_ROWITEMPAINTPARAMS_H
 #define PULSEVIEW_PV_VIEW_ROWITEMPAINTPARAMS_H
 
+#include <QFont>
+
 namespace pv {
 namespace view {
 
@@ -53,6 +55,11 @@ public:
                return offset_ / scale_;
        }
 
+public:
+       static QFont font();
+
+       static int text_height();
+
 private:
        int left_;
        int right_;