From 0ce3d18c04b989eeae55d5a82d133a2d154ad6c1 Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Sat, 20 Dec 2014 10:51:38 +0000 Subject: [PATCH] DecodeTrace: Removed text_height_ --- pv/view/decodetrace.cpp | 7 +++---- pv/view/decodetrace.hpp | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp index 745cf29b..be2dadf1 100644 --- a/pv/view/decodetrace.cpp +++ b/pv/view/decodetrace.cpp @@ -129,7 +129,6 @@ DecodeTrace::DecodeTrace(pv::Session &session, decoder_stack->stack().front()->decoder()->name)), session_(session), decoder_stack_(decoder_stack), - text_height_(0), row_height_(0), delete_mapper_(this), show_hide_mapper_(this) @@ -174,9 +173,9 @@ void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp) { using namespace pv::data::decode; - text_height_ = ViewItemPaintParams::text_height(); - row_height_ = (text_height_ * 6) / 4; - const int annotation_height = (text_height_ * 5) / 4; + const int text_height = ViewItemPaintParams::text_height(); + row_height_ = (text_height * 6) / 4; + const int annotation_height = (text_height * 5) / 4; assert(decoder_stack_); const QString err = decoder_stack_->error_message(); diff --git a/pv/view/decodetrace.hpp b/pv/view/decodetrace.hpp index edf3205b..968ebf95 100644 --- a/pv/view/decodetrace.hpp +++ b/pv/view/decodetrace.hpp @@ -198,7 +198,7 @@ private: std::vector decoder_forms_; std::vector visible_rows_; - int text_height_, row_height_; + int row_height_; QSignalMapper delete_mapper_, show_hide_mapper_; }; -- 2.30.2