Integrated ColourButton into popup

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

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index e9424750c997237ff1f5623387d286f6145f97dd..de036a941820dd256a1429f1545175cada6058de 100644 (file)
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -27,8 +27,11 @@
 #include <QInputDialog>
 
 #include "trace.h"
+#include "tracepalette.h"
 #include "view.h"
 
+#include <pv/widgets/colourbutton.h>
+
 namespace pv {
 namespace view {
 
@@ -183,6 +186,16 @@ QMenu* Trace::create_context_menu(QWidget *parent)
        return menu;
 }
 
+pv::widgets::Popup* Trace::create_popup(QWidget *parent)
+{
+       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;
+}
+
 int Trace::get_y() const
 {
        return _v_offset - _view->v_offset();
@@ -199,6 +212,31 @@ void Trace::paint_axis(QPainter &p, int y, int left, int right)
        p.drawLine(QPointF(left, y + 0.5f), QPointF(right, y + 0.5f));
 }
 
+void Trace::add_colour_option(QWidget *parent, QFormLayout *form)
+{
+       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);
+}
+
+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);
+
+       add_colour_option(parent, form);
+}
+
 void Trace::compute_text_size(QPainter &p)
 {
        _text_size = QSize(
@@ -243,6 +281,17 @@ void Trace::on_action_set_colour_triggered()
                set_colour(new_colour);
 }
 
+void Trace::on_text_changed(const QString &text)
+{
+       set_name(text);
+       text_changed();
+}
+
+void Trace::on_colour_changed(const QColor &colour)
+{
+       set_colour(colour);
+       colour_changed();
+}
 
 } // namespace view
 } // namespace pv