#include <assert.h>
#include <math.h>
-#include <QColorDialog>
-#include <QInputDialog>
+#include <QApplication>
+#include <QFormLayout>
+#include <QKeyEvent>
+#include <QLineEdit>
#include "trace.h"
+#include "tracepalette.h"
#include "view.h"
+#include <pv/widgets/colourbutton.h>
#include <pv/widgets/popup.h>
namespace pv {
const QPen Trace::AxisPen(QColor(128, 128, 128, 64));
const int Trace::LabelHitPadding = 2;
-Trace::Trace(pv::SigSession &session, QString name) :
- _session(session),
+Trace::Trace(QString name) :
_name(name),
- _v_offset(0)
+ _v_offset(0),
+ _popup(NULL),
+ _popup_form(NULL)
{
}
const QColor colour = get_colour();
- compute_text_size(p);
const QRectF label_rect = get_label_rect(right);
// Paint the label
// Paint the text
p.setPen(get_text_colour());
+ p.setFont(QApplication::font());
p.drawText(label_rect, Qt::AlignCenter | Qt::AlignVCenter, _name);
}
(void)left;
const QRectF label = get_label_rect(right);
- return QRectF(
+ return enabled() && QRectF(
QPointF(label.left() - LabelHitPadding,
label.top() - LabelHitPadding),
QPointF(right, label.bottom() + LabelHitPadding)
{
QMenu *const menu = SelectableItem::create_context_menu(parent);
- 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);
-
- 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);
-
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;
+
+ _popup = new Popup(parent);
+
+ create_popup_form();
+
+ connect(_popup, SIGNAL(closed()),
+ this, SLOT(on_popup_closed()));
+
+ return _popup;
}
int Trace::get_y() const
return _v_offset - _view->v_offset();
}
+QRectF Trace::get_label_rect(int right)
+{
+ using pv::view::View;
+
+ assert(_view);
+
+ QFontMetrics m(QApplication::font());
+ const QSize text_size(
+ m.boundingRect(QRect(), 0, _name).width(),
+ m.boundingRect(QRect(), 0, "Tg").height());
+ 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());
+}
+
QColor Trace::get_text_colour() const
{
return (_colour.lightness() > 64) ? Qt::black : Qt::white;
p.drawLine(QPointF(left, y + 0.5f), QPointF(right, y + 0.5f));
}
-void Trace::populate_popup_form(QWidget *parent, QFormLayout *form)
+void Trace::add_colour_option(QWidget *parent, QFormLayout *form)
{
- form->addRow("Name", new QLineEdit(parent));
+ 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::compute_text_size(QPainter &p)
+void Trace::create_popup_form()
{
- _text_size = QSize(
- p.boundingRect(QRectF(), 0, _name).width(),
- p.boundingRect(QRectF(), 0, "Tg").height());
+ // 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);
}
-QRectF Trace::get_label_rect(int right)
+void Trace::populate_popup_form(QWidget *parent, QFormLayout *form)
{
- using pv::view::View;
-
- assert(_view);
-
- 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());
+ QLineEdit *const name_edit = new QLineEdit(parent);
+ name_edit->setText(_name);
+ name_edit->selectAll();
+ name_edit->setFocus();
+ 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::on_action_set_name_triggered()
+void Trace::on_popup_closed()
{
- bool ok = false;
-
- const QString new_label = QInputDialog::getText(_context_parent,
- tr("Set Name"), tr("Name"), QLineEdit::Normal, get_name(),
- &ok);
-
- if (ok)
- set_name(new_label);
+ _popup = NULL;
+ _popup_form = NULL;
}
-void Trace::on_action_set_colour_triggered()
+void Trace::on_text_changed(const QString &text)
{
- const QColor new_colour = QColorDialog::getColor(
- get_colour(), _context_parent, tr("Set Colour"));
-
- if (new_colour.isValid())
- set_colour(new_colour);
+ set_name(text);
+ text_changed();
}
+void Trace::on_colour_changed(const QColor &colour)
+{
+ set_colour(colour);
+ colour_changed();
+}
} // namespace view
} // namespace pv
projects / pulseview.git / blobdiff