From: Joel Holdsworth Date: Sun, 24 Aug 2014 18:52:03 +0000 (+0100) Subject: Refactored common row functionality into RowItem X-Git-Tag: pulseview-0.3.0~483 X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=23935421086ebf58cfe68228971ded327a6155a1 Refactored common row functionality into RowItem --- diff --git a/CMakeLists.txt b/CMakeLists.txt index da3cc09c..631f82f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -162,6 +162,7 @@ set(pulseview_SOURCES pv/view/header.cpp pv/view/marginwidget.cpp pv/view/logicsignal.cpp + pv/view/rowitem.cpp pv/view/ruler.cpp pv/view/selectableitem.cpp pv/view/signal.cpp diff --git a/pv/view/rowitem.cpp b/pv/view/rowitem.cpp new file mode 100644 index 00000000..fe194bf7 --- /dev/null +++ b/pv/view/rowitem.cpp @@ -0,0 +1,92 @@ +/* + * This file is part of the PulseView project. + * + * Copyright (C) 2013 Joel Holdsworth + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include + +#include "view.h" + +#include "rowitem.h" + +namespace pv { +namespace view { + +RowItem::RowItem() : + _view(NULL), + _v_offset(0) +{ +} + +int RowItem::get_v_offset() const +{ + return _v_offset; +} + +void RowItem::set_v_offset(int v_offset) +{ + _v_offset = v_offset; +} + +void RowItem::set_view(View *view) +{ + assert(view); + + if (_view) + disconnect(_view, SIGNAL(hover_point_changed()), + this, SLOT(on_hover_point_changed())); + + _view = view; + + connect(view, SIGNAL(hover_point_changed()), + this, SLOT(on_hover_point_changed())); +} + +int RowItem::get_y() const +{ + assert(_view); + return _v_offset + _view->v_offset(); +} + +void RowItem::paint_back(QPainter &p, int left, int right) +{ + (void)p; + (void)left; + (void)right; +} + +void RowItem::paint_mid(QPainter &p, int left, int right) +{ + (void)p; + (void)left; + (void)right; +} + +void RowItem::paint_fore(QPainter &p, int left, int right) +{ + (void)p; + (void)left; + (void)right; +} + +void RowItem::hover_point_changed() +{ +} + +} // namespace view +} // namespace pv diff --git a/pv/view/rowitem.h b/pv/view/rowitem.h new file mode 100644 index 00000000..a48af5ce --- /dev/null +++ b/pv/view/rowitem.h @@ -0,0 +1,118 @@ +/* + * This file is part of the PulseView project. + * + * Copyright (C) 2013 Joel Holdsworth + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef PULSEVIEW_PV_VIEW_HEADERITEM_H +#define PULSEVIEW_PV_VIEW_HEADERITEM_H + +#include "selectableitem.h" + +namespace pv { +namespace view { + +class View; + +class RowItem : public SelectableItem +{ +public: + /** + * Constructor. + */ + RowItem(); + + /** + * Returns true if the item is visible and enabled. + */ + virtual bool enabled() const = 0; + + /** + * Gets the vertical layout offset of this signal. + */ + int get_v_offset() const; + + /** + * Sets the vertical layout offset of this signal. + */ + void set_v_offset(int v_offset); + + /** + * Sets the view that owns this trace in the view trace hierachy. + * @param The new owner of the trace. + */ + void set_view(pv::view::View *view); + + /** + * Gets the y-offset of the axis. + */ + int get_y() const; + + /** + * Paints the background layer of the trace with a QPainter + * @param p the QPainter to paint into. + * @param left the x-coordinate of the left edge of the signal + * @param right the x-coordinate of the right edge of the signal + **/ + virtual void paint_back(QPainter &p, int left, int right); + + /** + * Paints the mid-layer of the trace with a QPainter + * @param p the QPainter to paint into. + * @param left the x-coordinate of the left edge of the signal + * @param right the x-coordinate of the right edge of the signal + **/ + virtual void paint_mid(QPainter &p, int left, int right); + + /** + * Paints the foreground layer of the trace with a QPainter + * @param p the QPainter to paint into. + * @param left the x-coordinate of the left edge of the signal + * @param right the x-coordinate of the right edge of the signal + **/ + virtual void paint_fore(QPainter &p, int left, int right); + + /** + * Paints the signal label. + * @param p the QPainter to paint into. + * @param right the x-coordinate of the right edge of the header + * area. + * @param hover true if the label is being hovered over by the mouse. + */ + virtual void paint_label(QPainter &p, int right, bool hover) = 0; + + /** + * Computes the outline rectangle of a label. + * @param right the x-coordinate of the right edge of the header + * area. + * @return Returns the rectangle of the signal label. + */ + virtual QRectF label_rect(int right) = 0; + +public: + virtual void hover_point_changed(); + +protected: + pv::view::View *_view; + + int _v_offset; +}; + +} // namespace view +} // namespace pv + +#endif // PULSEVIEW_PV_VIEW_HEADERITEM_H diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp index 1231eae4..aba51510 100644 --- a/pv/view/trace.cpp +++ b/pv/view/trace.cpp @@ -42,9 +42,7 @@ const QPen Trace::AxisPen(QColor(128, 128, 128, 64)); const int Trace::LabelHitPadding = 2; Trace::Trace(QString name) : - _view(NULL), _name(name), - _v_offset(0), _popup(NULL), _popup_form(NULL) { @@ -70,43 +68,6 @@ void Trace::set_colour(QColor colour) _colour = colour; } -int Trace::get_v_offset() const -{ - return _v_offset; -} - -void Trace::set_v_offset(int v_offset) -{ - _v_offset = v_offset; -} - -void Trace::set_view(pv::view::View *view) -{ - assert(view); - _view = view; -} - -void Trace::paint_back(QPainter &p, int left, int right) -{ - (void)p; - (void)left; - (void)right; -} - -void Trace::paint_mid(QPainter &p, int left, int right) -{ - (void)p; - (void)left; - (void)right; -} - -void Trace::paint_fore(QPainter &p, int left, int right) -{ - (void)p; - (void)left; - (void)right; -} - void Trace::paint_label(QPainter &p, int right, bool hover) { const int y = get_y(); @@ -184,12 +145,6 @@ pv::widgets::Popup* Trace::create_popup(QWidget *parent) return _popup; } -int Trace::get_y() const -{ - assert(_view); - return _v_offset - _view->v_offset(); -} - QRectF Trace::label_rect(int right) { using pv::view::View; @@ -209,10 +164,6 @@ QRectF Trace::label_rect(int right) label_size.height()); } -void Trace::hover_point_changed() -{ -} - QColor Trace::get_text_colour() const { return (_colour.lightness() > 64) ? Qt::black : Qt::white; diff --git a/pv/view/trace.h b/pv/view/trace.h index c6c92e2d..ef327edb 100644 --- a/pv/view/trace.h +++ b/pv/view/trace.h @@ -29,16 +29,19 @@ #include -#include "selectableitem.h" +#include "rowitem.h" class QFormLayout; namespace pv { -namespace view { -class View; +namespace widgets { +class Popup; +} + +namespace view { -class Trace : public SelectableItem +class Trace : public RowItem { Q_OBJECT @@ -70,47 +73,6 @@ public: */ void set_colour(QColor colour); - /** - * Gets the vertical layout offset of this signal. - */ - int get_v_offset() const; - - /** - * Sets the vertical layout offset of this signal. - */ - void set_v_offset(int v_offset); - - /** - * Returns true if the trace is visible and enabled. - */ - virtual bool enabled() const = 0; - - void set_view(pv::view::View *view); - - /** - * Paints the background layer of the trace with a QPainter - * @param p the QPainter to paint into. - * @param left the x-coordinate of the left edge of the signal - * @param right the x-coordinate of the right edge of the signal - **/ - virtual void paint_back(QPainter &p, int left, int right); - - /** - * Paints the mid-layer of the trace with a QPainter - * @param p the QPainter to paint into. - * @param left the x-coordinate of the left edge of the signal - * @param right the x-coordinate of the right edge of the signal - **/ - virtual void paint_mid(QPainter &p, int left, int right); - - /** - * Paints the foreground layer of the trace with a QPainter - * @param p the QPainter to paint into. - * @param left the x-coordinate of the left edge of the signal - * @param right the x-coordinate of the right edge of the signal - **/ - virtual void paint_fore(QPainter &p, int left, int right); - /** * Paints the signal label. * @param p the QPainter to paint into. @@ -124,11 +86,6 @@ public: pv::widgets::Popup* create_popup(QWidget *parent); - /** - * Gets the y-offset of the axis. - */ - int get_y() const; - /** * Computes the outline rectangle of a label. * @param right the x-coordinate of the right edge of the header @@ -137,9 +94,6 @@ public: */ QRectF label_rect(int right); -public: - virtual void hover_point_changed(); - protected: /** @@ -178,11 +132,8 @@ Q_SIGNALS: void colour_changed(); protected: - pv::view::View *_view; - QString _name; QColor _colour; - int _v_offset; private: pv::widgets::Popup *_popup; diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 388c4c49..82be599b 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -171,7 +171,7 @@ double View::offset() const int View::v_offset() const { - return _v_offset; + return -_v_offset; } void View::zoom(double steps)