Renamed pv::data::Analog::get_snapshots and Logic::get_snapshots

[pulseview.git] / pv / view / decodetrace.cpp

diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index 0b129c3bf7b9d45acb6a69e89d0433576f3a4d6c..6f14732d2bddc56a9b71ed6bf24af6cd15447d79 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;
 
@@ -484,11 +481,11 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left,
                        ((data = logic_signal->logic_data())))
                        break;
 
-       if (!data || data->get_snapshots().empty())
+       if (!data || data->logic_snapshots().empty())
                return;
 
        const shared_ptr<LogicSnapshot> snapshot =
-               data->get_snapshots().front();
+               data->logic_snapshots().front();
        assert(snapshot);
        const int64_t sample_count = (int64_t)snapshot->get_sample_count();
        if (sample_count == 0)