Renamed pv::binding::DeviceOptions and DecoderOptions to Device and Decoder

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

diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index 0a2afbfa67f4e16474cb9330e0800f0d361ee03f..f423b21ef9a009caa04202109882666e2b6d0fb4 100644 (file)
--- 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)
@@ -160,23 +159,23 @@ pair<int, int> DecodeTrace::v_extents() const
 {
        /// @todo Replace this with an implementation that knows the true
        /// height of the trace
-       const int row_height = (RowItemPaintParams::text_height() * 6) / 4;
+       const int row_height = (ViewItemPaintParams::text_height() * 6) / 4;
        return make_pair(-row_height / 2, row_height * 7 / 2);
 }
 
-void DecodeTrace::paint_back(QPainter &p, const RowItemPaintParams &pp)
+void DecodeTrace::paint_back(QPainter &p, const ViewItemPaintParams &pp)
 {
        Trace::paint_back(p, pp);
        paint_axis(p, pp, get_visual_y());
 }
 
-void DecodeTrace::paint_mid(QPainter &p, const RowItemPaintParams &pp)
+void DecodeTrace::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 {
        using namespace pv::data::decode;
 
-       text_height_ = RowItemPaintParams::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();
@@ -224,7 +223,7 @@ void DecodeTrace::paint_mid(QPainter &p, const RowItemPaintParams &pp)
        draw_unresolved_period(p, annotation_height, pp.left(), pp.right());
 }
 
-void DecodeTrace::paint_fore(QPainter &p, const RowItemPaintParams &pp)
+void DecodeTrace::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
 {
        using namespace pv::data::decode;
 
@@ -333,7 +332,7 @@ QMenu* DecodeTrace::create_context_menu(QWidget *parent)
 }
 
 void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a,
-       QPainter &p, int h, const RowItemPaintParams &pp, int y,
+       QPainter &p, int h, const ViewItemPaintParams &pp, int y,
        size_t base_colour) const
 {
        double samples_per_pixel, pixels_offset;
@@ -435,7 +434,7 @@ void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p,
 }
 
 void DecodeTrace::draw_error(QPainter &p, const QString &message,
-       const RowItemPaintParams &pp)
+       const ViewItemPaintParams &pp)
 {
        const int y = get_visual_y();
 
@@ -556,9 +555,15 @@ int DecodeTrace::get_row_at_point(const QPoint &point)
        if (!row_height_)
                return -1;
 
-       const int row = (point.y() - get_visual_y() + row_height_ / 2) /
-               row_height_;
-       if (row < 0 || row >= (int)visible_rows_.size())
+       const int y = (point.y() - get_visual_y() + row_height_ / 2);
+
+       /* Integer divison of (x-1)/x would yield 0, so we check for this. */
+       if (y < 0)
+               return -1;
+
+       const int row = y / row_height_;
+
+       if (row >= (int)visible_rows_.size())
                return -1;
 
        return row;
@@ -621,7 +626,7 @@ void DecodeTrace::hover_point_changed()
 
        hp.setY(get_visual_y() - (row_height_ / 2) +
                (hover_row * row_height_) -
-               row_height_ - text_size.height());
+               row_height_ - text_size.height() - padding);
 
        QToolTip::showText(view->viewport()->mapToGlobal(hp), ann);
 }
@@ -682,8 +687,8 @@ void DecodeTrace::create_decoder_form(int index,
        }
 
        // Add the options
-       shared_ptr<prop::binding::DecoderOptions> binding(
-               new prop::binding::DecoderOptions(decoder_stack_, dec));
+       shared_ptr<binding::Decoder> binding(
+               new binding::Decoder(decoder_stack_, dec));
        binding->add_properties_to_form(decoder_form, true);
 
        bindings_.push_back(binding);
@@ -768,7 +773,7 @@ void DecodeTrace::commit_channels()
 void DecodeTrace::on_new_decode_data()
 {
        if (owner_)
-               owner_->appearance_changed(false, true);
+               owner_->row_item_appearance_changed(false, true);
 }
 
 void DecodeTrace::delete_pressed()
@@ -828,7 +833,7 @@ void DecodeTrace::on_show_hide_decoder(int index)
        decoder_forms_[index]->set_decoder_visible(show);
 
        if (owner_)
-               owner_->appearance_changed(false, true);
+               owner_->row_item_appearance_changed(false, true);
 }
 
 } // namespace view