X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=3bdf725df4f4bc52fb739586da259191c5b386e0;hp=a96b0327e0e6ffd6f5364876b928ebaa87077daf;hb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede;hpb=7708eb92ca87836f5d4987899e0fbb7a4e2335b4 diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp index a96b0327..3bdf725d 100644 --- a/pv/view/trace.cpp +++ b/pv/view/trace.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include @@ -36,43 +36,37 @@ #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(QString name) : - name_(name), - popup_(NULL), - popup_form_(NULL) -{ -} - -QString Trace::name() const -{ - return name_; -} +const QColor Trace::BrightGrayBGColour = QColor(0, 0, 0, 10*255/100); +const QColor Trace::DarkGrayBGColour = QColor(0, 0, 0, 15*255/100); -void Trace::set_name(QString name) +Trace::Trace(std::shared_ptr channel) : + base_(channel), + coloured_bg_(true), // Default setting is set in MainWindow::setup_ui() + popup_(nullptr), + popup_form_(nullptr) { - name_ = name; -} - -QColor Trace::colour() const -{ - 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; } void Trace::paint_label(QPainter &p, const QRect &rect, bool hover) { const int y = get_visual_y(); - p.setBrush(colour_); + p.setBrush(base_->colour()); if (!enabled()) return; @@ -103,23 +97,23 @@ void Trace::paint_label(QPainter &p, const QRect &rect, 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(select_text_colour(colour_)); + 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, name_); + Qt::AlignCenter | Qt::AlignVCenter, base_->name()); } QMenu* Trace::create_context_menu(QWidget *parent) @@ -147,11 +141,9 @@ pv::widgets::Popup* Trace::create_popup(QWidget *parent) QRectF Trace::label_rect(const QRectF &rect) const { - using pv::view::View; - QFontMetrics m(QApplication::font()); const QSize text_size( - m.boundingRect(QRect(), 0, name_).width(), m.height()); + 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); @@ -163,17 +155,33 @@ QRectF Trace::label_rect(const QRectF &rect) const label_size.height()); } -QRectF Trace::hit_box_rect(const QRectF &rect) const +void Trace::paint_back(QPainter &p, const ViewItemPaintParams &pp) { - const float h = QFontMetrics(QApplication::font()).height(); - return QRectF(rect.left(), get_visual_y() - h / 2.0f, - rect.width(), h); + 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); } void Trace::paint_axis(QPainter &p, const ViewItemPaintParams &pp, int y) { + p.setRenderHint(QPainter::Antialiasing, false); + p.setPen(AxisPen); - p.drawLine(QPointF(pp.left(), y + 0.5f), QPointF(pp.right(), y + 0.5f)); + p.drawLine(QPointF(pp.left(), y), QPointF(pp.right(), y)); + + p.setRenderHint(QPainter::Antialiasing, true); } void Trace::add_colour_option(QWidget *parent, QFormLayout *form) @@ -183,9 +191,9 @@ void Trace::add_colour_option(QWidget *parent, QFormLayout *form) ColourButton *const colour_button = new ColourButton( TracePalette::Rows, TracePalette::Cols, parent); colour_button->set_palette(TracePalette::Colours); - colour_button->set_colour(colour_); + colour_button->set_colour(base_->colour()); connect(colour_button, SIGNAL(selected(const QColor&)), - this, SLOT(on_colour_changed(const QColor&))); + this, SLOT(on_colouredit_changed(const QColor&))); form->addRow(tr("Colour"), colour_button); } @@ -195,10 +203,14 @@ void Trace::create_popup_form() // 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_); + // 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_); @@ -209,35 +221,62 @@ void Trace::create_popup_form() void Trace::populate_popup_form(QWidget *parent, QFormLayout *form) { QLineEdit *const name_edit = new QLineEdit(parent); - name_edit->setText(name_); + name_edit->setText(base_->name()); connect(name_edit, SIGNAL(textChanged(const QString&)), - this, SLOT(on_text_changed(const QString&))); + this, SLOT(on_nameedit_changed(const QString&))); form->addRow(tr("Name"), name_edit); add_colour_option(parent, form); } -void Trace::on_popup_closed() +void Trace::set_name(QString name) +{ + base_->set_name(name); +} + +void Trace::set_colour(QColor colour) { - popup_ = NULL; - popup_form_ = NULL; + base_->set_colour(colour); } -void Trace::on_text_changed(const QString &text) +void Trace::on_name_changed(const QString &text) { - set_name(text); + /* This event handler is called by SignalBase when the name was changed there */ + (void)text; - if (owner_) + if (owner_) { owner_->extents_changed(true, false); + owner_->row_item_appearance_changed(true, false); + } } void Trace::on_colour_changed(const QColor &colour) { - set_colour(colour); + /* This event handler is called by SignalBase when the colour was changed there */ + (void)colour; if (owner_) - owner_->row_item_appearance_changed(true, false); + owner_->row_item_appearance_changed(true, true); +} + +void Trace::on_popup_closed() +{ + popup_ = nullptr; + popup_form_ = nullptr; +} + +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