X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=3bdf725df4f4bc52fb739586da259191c5b386e0;hp=28084544f6f4247aee1798e4081302f0f22d5b27;hb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede;hpb=569d1e41fbc1be584efdbcdc2c8a01e7af3353ed diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp index 28084544..3bdf725d 100644 --- a/pv/view/trace.cpp +++ b/pv/view/trace.cpp @@ -21,116 +21,73 @@ #include #include -#include +#include -#include -#include +#include +#include +#include +#include -#include "trace.h" -#include "view.h" +#include "trace.hpp" +#include "tracepalette.hpp" +#include "view.hpp" -#include +#include +#include namespace pv { -namespace view { +namespace views { +namespace TraceView { -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) -{ -} - -QString Trace::get_name() const -{ - return _name; -} - -void Trace::set_name(QString name) -{ - _name = name; -} +const QColor Trace::BrightGrayBGColour = QColor(0, 0, 0, 10*255/100); +const QColor Trace::DarkGrayBGColour = QColor(0, 0, 0, 15*255/100); -QColor Trace::get_colour() const +Trace::Trace(std::shared_ptr channel) : + base_(channel), + coloured_bg_(true), // Default setting is set in MainWindow::setup_ui() + popup_(nullptr), + popup_form_(nullptr) { - return _colour; + connect(channel.get(), SIGNAL(name_changed(const QString&)), + this, SLOT(on_name_changed(const QString&))); + connect(channel.get(), SIGNAL(colour_changed(const QColor&)), + this, SLOT(on_colour_changed(const QColor&))); } -void Trace::set_colour(QColor colour) +void Trace::set_coloured_bg(bool state) { - _colour = colour; + coloured_bg_ = state; } -int Trace::get_v_offset() const +void Trace::paint_label(QPainter &p, const QRect &rect, bool hover) { - return _v_offset; -} + const int y = get_visual_y(); -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) -{ - assert(_view); - const int y = _v_offset - _view->v_offset(); - - p.setBrush(_colour); + p.setBrush(base_->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()) { @@ -140,126 +97,186 @@ void Trace::paint_label(QPainter &p, int right, bool hover) } p.setPen(Qt::transparent); - p.setBrush(hover ? colour.lighter() : colour); + p.setBrush(hover ? base_->colour().lighter() : base_->colour()); p.drawPolygon(points, countof(points)); - p.setPen(colour.lighter()); + p.setPen(base_->colour().lighter()); p.setBrush(Qt::transparent); p.drawPolygon(highlight_points, countof(highlight_points)); - p.setPen(colour.darker()); + p.setPen(base_->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(base_->colour())); + p.setFont(QApplication::font()); + p.drawText(QRectF(r.x(), r.y(), + r.width() - label_arrow_length, r.height()), + Qt::AlignCenter | Qt::AlignVCenter, base_->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_; } -pv::widgets::Popup* Trace::create_popup(QWidget *parent) +QRectF Trace::label_rect(const QRectF &rect) const { - using pv::widgets::Popup; - Popup *const popup = new Popup(parent); - QFormLayout *const form = new QFormLayout(popup); - popup->setLayout(form); - populate_popup_form(popup, form); - return popup; + QFontMetrics m(QApplication::font()); + const QSize text_size( + m.boundingRect(QRect(), 0, base_->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()); } -int Trace::get_y() const +void Trace::paint_back(QPainter &p, const ViewItemPaintParams &pp) { - return _v_offset - _view->v_offset(); + if (coloured_bg_) + p.setBrush(base_->bgcolour()); + else + p.setBrush(bgcolour_state_ ? BrightGrayBGColour : DarkGrayBGColour); + + p.setPen(QPen(Qt::NoPen)); + + const std::pair 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); } -QColor Trace::get_text_colour() const +void Trace::paint_axis(QPainter &p, const ViewItemPaintParams &pp, int y) { - return (_colour.lightness() > 64) ? Qt::black : Qt::white; + p.setRenderHint(QPainter::Antialiasing, false); + + p.setPen(AxisPen); + p.drawLine(QPointF(pp.left(), y), QPointF(pp.right(), y)); + + p.setRenderHint(QPainter::Antialiasing, true); } -void Trace::paint_axis(QPainter &p, int y, int left, int right) +void Trace::add_colour_option(QWidget *parent, QFormLayout *form) { - p.setPen(AxisPen); - p.drawLine(QPointF(left, y + 0.5f), QPointF(right, y + 0.5f)); + 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(base_->colour()); + connect(colour_button, SIGNAL(selected(const QColor&)), + this, SLOT(on_colouredit_changed(const QColor&))); + + form->addRow(tr("Colour"), colour_button); +} + +void Trace::create_popup_form() +{ + // Clear the layout + + // Transfer the layout and the child widgets to a temporary widget + // which we delete after the event was handled. This way, the layout + // and all widgets contained therein are deleted after the event was + // handled, leaving the parent popup_ time to handle the change. + if (popup_form_) { + QWidget *suicidal = new QWidget(); + suicidal->setLayout(popup_form_); + suicidal->deleteLater(); + } + + // Repopulate the popup + popup_form_ = new QFormLayout(popup_); + popup_->setLayout(popup_form_); + populate_popup_form(popup_, popup_form_); } void Trace::populate_popup_form(QWidget *parent, QFormLayout *form) { - form->addRow("Name", new QLineEdit(parent)); + QLineEdit *const name_edit = new QLineEdit(parent); + name_edit->setText(base_->name()); + connect(name_edit, SIGNAL(textChanged(const QString&)), + this, SLOT(on_nameedit_changed(const QString&))); + form->addRow(tr("Name"), name_edit); + + add_colour_option(parent, form); } -void Trace::compute_text_size(QPainter &p) +void Trace::set_name(QString name) { - _text_size = QSize( - p.boundingRect(QRectF(), 0, _name).width(), - p.boundingRect(QRectF(), 0, "Tg").height()); + base_->set_name(name); } -QRectF Trace::get_label_rect(int right) +void Trace::set_colour(QColor colour) { - using pv::view::View; + base_->set_colour(colour); +} - assert(_view); +void Trace::on_name_changed(const QString &text) +{ + /* This event handler is called by SignalBase when the name was changed there */ + (void)text; - 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()); + if (owner_) { + owner_->extents_changed(true, false); + owner_->row_item_appearance_changed(true, false); + } } -void Trace::on_action_set_name_triggered() +void Trace::on_colour_changed(const QColor &colour) { - bool ok = false; - - const QString new_label = QInputDialog::getText(_context_parent, - tr("Set Name"), tr("Name"), QLineEdit::Normal, get_name(), - &ok); + /* This event handler is called by SignalBase when the colour was changed there */ + (void)colour; - if (ok) - set_name(new_label); + if (owner_) + owner_->row_item_appearance_changed(true, true); } -void Trace::on_action_set_colour_triggered() +void Trace::on_popup_closed() { - const QColor new_colour = QColorDialog::getColor( - get_colour(), _context_parent, tr("Set Colour")); + popup_ = nullptr; + popup_form_ = nullptr; +} - if (new_colour.isValid()) - set_colour(new_colour); +void Trace::on_nameedit_changed(const QString &name) +{ + /* This event handler notifies SignalBase that the name changed */ + set_name(name); } +void Trace::on_colouredit_changed(const QColor &colour) +{ + /* This event handler notifies SignalBase that the colour changed */ + set_colour(colour); +} -} // namespace view +} // namespace TraceView +} // namespace views } // namespace pv