]> sigrok.org Git - pulseview.git/blobdiff - pv/view/trace.cpp
Fix #771 by using black with alpha instead of an opaque grey
[pulseview.git] / pv / view / trace.cpp
index e9424750c997237ff1f5623387d286f6145f97dd..ea443f23b91cebf4ddb141b64ae3ef4af705b357 100644 (file)
 #include <extdef.h>
 
 #include <assert.h>
-#include <math.h>
+#include <cmath>
 
-#include <QColorDialog>
-#include <QInputDialog>
+#include <QApplication>
+#include <QFormLayout>
+#include <QKeyEvent>
+#include <QLineEdit>
 
-#include "trace.h"
-#include "view.h"
+#include "trace.hpp"
+#include "tracepalette.hpp"
+#include "view.hpp"
+
+#include <pv/widgets/colourbutton.hpp>
+#include <pv/widgets/popup.hpp>
 
 namespace pv {
 namespace view {
 
-const QPen Trace::AxisPen(QColor(128, 128, 128, 64));
+const QPen Trace::AxisPen(QColor(0, 0, 0, 30*256/100));
 const int Trace::LabelHitPadding = 2;
 
-Trace::Trace(pv::SigSession &session, QString name) :
-       _session(session),
-       _name(name),
-       _v_offset(0)
+const int Trace::ColourBGAlpha = 8*256/100;
+const QColor Trace::BrightGrayBGColour = QColor(0, 0, 0, 10*255/100);
+const QColor Trace::DarkGrayBGColour = QColor(0, 0, 0, 15*255/100);
+
+Trace::Trace(QString name) :
+       name_(name),
+       coloured_bg_(true), // Default setting is set in MainWindow::setup_ui()
+       popup_(nullptr),
+       popup_form_(nullptr)
 {
 }
 
-QString Trace::get_name() const
+QString Trace::name() const
 {
-       return _name;
+       return name_;
 }
 
 void Trace::set_name(QString name)
 {
-       _name = name;
+       name_ = name;
 }
 
-QColor Trace::get_colour() const
+QColor Trace::colour() const
 {
-       return _colour;
+       return colour_;
 }
 
 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;
-}
+       colour_ = colour;
 
-void Trace::paint_mid(QPainter &p, int left, int right)
-{
-       (void)p;
-       (void)left;
-       (void)right;
+       bgcolour_ = colour;
+       bgcolour_.setAlpha(ColourBGAlpha);
 }
 
-void Trace::paint_fore(QPainter &p, int left, int right)
+void Trace::set_coloured_bg(bool state)
 {
-       (void)p;
-       (void)left;
-       (void)right;
+       coloured_bg_ = state;
 }
 
-void Trace::paint_label(QPainter &p, int right, bool hover)
+void Trace::paint_label(QPainter &p, const QRect &rect, bool hover)
 {
-       assert(_view);
-       const int y = _v_offset - _view->v_offset();
+       const int y = get_visual_y();
 
-       p.setBrush(_colour);
+       p.setBrush(colour_);
 
        if (!enabled())
                return;
 
-       const QColor colour = get_colour();
-
-       compute_text_size(p);
-       const QRectF label_rect = get_label_rect(right);
+       const QRectF r = label_rect(rect);
 
        // Paint the label
+       const float label_arrow_length = r.height() / 2;
        const QPointF points[] = {
-               label_rect.topLeft(),
-               label_rect.topRight(),
-               QPointF(right, y),
-               label_rect.bottomRight(),
-               label_rect.bottomLeft()
+               r.topLeft(),
+               QPointF(r.right() - label_arrow_length, r.top()),
+               QPointF(r.right(), y),
+               QPointF(r.right() - label_arrow_length, r.bottom()),
+               r.bottomLeft()
        };
-
        const QPointF highlight_points[] = {
-               QPointF(label_rect.left() + 1, label_rect.top() + 1),
-               QPointF(label_rect.right(), label_rect.top() + 1),
-               QPointF(right - 1, y),
-               QPointF(label_rect.right(), label_rect.bottom() - 1),
-               QPointF(label_rect.left() + 1, label_rect.bottom() - 1)
+               QPointF(r.left() + 1, r.top() + 1),
+               QPointF(r.right() - label_arrow_length, r.top() + 1),
+               QPointF(r.right() - 1, y),
+               QPointF(r.right() - label_arrow_length, r.bottom() - 1),
+               QPointF(r.left() + 1, r.bottom() - 1)
        };
 
        if (selected()) {
@@ -138,111 +116,157 @@ void Trace::paint_label(QPainter &p, int right, bool hover)
        }
 
        p.setPen(Qt::transparent);
-       p.setBrush(hover ? colour.lighter() : colour);
+       p.setBrush(hover ? colour_.lighter() : colour_);
        p.drawPolygon(points, countof(points));
 
-       p.setPen(colour.lighter());
+       p.setPen(colour_.lighter());
        p.setBrush(Qt::transparent);
        p.drawPolygon(highlight_points, countof(highlight_points));
 
-       p.setPen(colour.darker());
+       p.setPen(colour_.darker());
        p.setBrush(Qt::transparent);
        p.drawPolygon(points, countof(points));
 
        // Paint the text
-       p.setPen(get_text_colour());
-       p.drawText(label_rect, Qt::AlignCenter | Qt::AlignVCenter, _name);
+       p.setPen(select_text_colour(colour_));
+       p.setFont(QApplication::font());
+       p.drawText(QRectF(r.x(), r.y(),
+               r.width() - label_arrow_length, r.height()),
+               Qt::AlignCenter | Qt::AlignVCenter, name_);
 }
 
-bool Trace::pt_in_label_rect(int left, int right, const QPoint &point)
+QMenu* Trace::create_context_menu(QWidget *parent)
 {
-       (void)left;
+       QMenu *const menu = ViewItem::create_context_menu(parent);
 
-       const QRectF label = get_label_rect(right);
-       return QRectF(
-               QPointF(label.left() - LabelHitPadding,
-                       label.top() - LabelHitPadding),
-               QPointF(right, label.bottom() + LabelHitPadding)
-                       ).contains(point);
+       return menu;
 }
 
-QMenu* Trace::create_context_menu(QWidget *parent)
+pv::widgets::Popup* Trace::create_popup(QWidget *parent)
 {
-       QMenu *const menu = SelectableItem::create_context_menu(parent);
+       using pv::widgets::Popup;
 
-       QAction *const set_name = new QAction(tr("Set &Name..."), this);
-       connect(set_name, SIGNAL(triggered()),
-               this, SLOT(on_action_set_name_triggered()));
-       menu->addAction(set_name);
+       popup_ = new Popup(parent);
+       popup_->set_position(parent->mapToGlobal(
+               point(parent->rect())), Popup::Right);
 
-       QAction *const set_colour = new QAction(tr("Set &Colour..."), this);
-       connect(set_colour, SIGNAL(triggered()),
-               this, SLOT(on_action_set_colour_triggered()));
-       menu->addAction(set_colour);
+       create_popup_form();
 
-       return menu;
+       connect(popup_, SIGNAL(closed()),
+               this, SLOT(on_popup_closed()));
+
+       return popup_;
 }
 
-int Trace::get_y() const
+QRectF Trace::label_rect(const QRectF &rect) const
 {
-       return _v_offset - _view->v_offset();
+       using pv::view::View;
+
+       QFontMetrics m(QApplication::font());
+       const QSize text_size(
+               m.boundingRect(QRect(), 0, name_).width(), m.height());
+       const QSizeF label_size(
+               text_size.width() + LabelPadding.width() * 2,
+               ceilf((text_size.height() + LabelPadding.height() * 2) / 2) * 2);
+       const float half_height = label_size.height() / 2;
+       return QRectF(
+               rect.right() - half_height - label_size.width() - 0.5,
+               get_visual_y() + 0.5f - half_height,
+               label_size.width() + half_height,
+               label_size.height());
 }
 
-QColor Trace::get_text_colour() const
+void Trace::paint_back(QPainter &p, const ViewItemPaintParams &pp)
 {
-       return (_colour.lightness() > 64) ? Qt::black : Qt::white;
+       if (coloured_bg_)
+               p.setBrush(bgcolour_);
+       else
+               p.setBrush(bgcolour_state_ ? BrightGrayBGColour : DarkGrayBGColour);
+
+       p.setPen(QPen(Qt::NoPen));
+
+       const std::pair<int, int> extents = v_extents();
+
+       const int x = 0;
+       const int y = get_visual_y() + extents.first;
+       const int w = pp.right() - pp.left();
+       const int h = extents.second - extents.first;
+
+       p.drawRect(x, y, w, h);
 }
 
-void Trace::paint_axis(QPainter &p, int y, int left, int right)
+void Trace::paint_axis(QPainter &p, const ViewItemPaintParams &pp, int y)
 {
+       p.setRenderHint(QPainter::Antialiasing, false);
+
        p.setPen(AxisPen);
-       p.drawLine(QPointF(left, y + 0.5f), QPointF(right, y + 0.5f));
+       p.drawLine(QPointF(pp.left(), y), QPointF(pp.right(), y));
+
+       p.setRenderHint(QPainter::Antialiasing, true);
 }
 
-void Trace::compute_text_size(QPainter &p)
+void Trace::add_colour_option(QWidget *parent, QFormLayout *form)
 {
-       _text_size = QSize(
-               p.boundingRect(QRectF(), 0, _name).width(),
-               p.boundingRect(QRectF(), 0, "Tg").height());
+       using pv::widgets::ColourButton;
+
+       ColourButton *const colour_button = new ColourButton(
+               TracePalette::Rows, TracePalette::Cols, parent);
+       colour_button->set_palette(TracePalette::Colours);
+       colour_button->set_colour(colour_);
+       connect(colour_button, SIGNAL(selected(const QColor&)),
+               this, SLOT(on_colour_changed(const QColor&)));
+
+       form->addRow(tr("Colour"), colour_button);
 }
 
-QRectF Trace::get_label_rect(int right)
+void Trace::create_popup_form()
 {
-       using pv::view::View;
+       // Clear the layout
+
+       // Transfer the layout and the child widgets to a temporary widget
+       // which then goes out of scope destroying the layout and all the child
+       // widgets.
+       if (popup_form_)
+               QWidget().setLayout(popup_form_);
+
+       // Repopulate the popup
+       popup_form_ = new QFormLayout(popup_);
+       popup_->setLayout(popup_form_);
+       populate_popup_form(popup_, popup_form_);
+}
 
-       assert(_view);
+void Trace::populate_popup_form(QWidget *parent, QFormLayout *form)
+{
+       QLineEdit *const name_edit = new QLineEdit(parent);
+       name_edit->setText(name_);
+       connect(name_edit, SIGNAL(textChanged(const QString&)),
+               this, SLOT(on_text_changed(const QString&)));
+       form->addRow(tr("Name"), name_edit);
 
-       const QSizeF label_size(
-               _text_size.width() + View::LabelPadding.width() * 2,
-               ceilf((_text_size.height() + View::LabelPadding.height() * 2) / 2) * 2);
-       const float label_arrow_length = label_size.height() / 2;
-       return QRectF(
-               right - label_arrow_length - label_size.width() - 0.5,
-               get_y() + 0.5f - label_size.height() / 2,
-               label_size.width(), label_size.height());
+       add_colour_option(parent, form);
 }
 
-void Trace::on_action_set_name_triggered()
+void Trace::on_popup_closed()
 {
-       bool ok = false;
+       popup_ = nullptr;
+       popup_form_ = nullptr;
+}
 
-       const QString new_label = QInputDialog::getText(_context_parent,
-               tr("Set Name"), tr("Name"), QLineEdit::Normal, get_name(),
-               &ok);
+void Trace::on_text_changed(const QString &text)
+{
+       set_name(text);
 
-       if (ok)
-               set_name(new_label);
+       if (owner_)
+               owner_->extents_changed(true, false);
 }
 
-void Trace::on_action_set_colour_triggered()
+void Trace::on_colour_changed(const QColor &colour)
 {
-       const QColor new_colour = QColorDialog::getColor(
-               get_colour(), _context_parent, tr("Set Colour"));
+       set_colour(colour);
 
-       if (new_colour.isValid())
-               set_colour(new_colour);
+       if (owner_)
+               owner_->row_item_appearance_changed(true, true);
 }
 
-
 } // namespace view
 } // namespace pv