#include <assert.h>
#include <math.h>
-#include <QColorDialog>
-#include <QInputDialog>
+#include <QFormLayout>
+#include <QLineEdit>
#include "trace.h"
#include "tracepalette.h"
Trace::Trace(pv::SigSession &session, QString name) :
_session(session),
_name(name),
- _v_offset(0)
+ _v_offset(0),
+ _popup(NULL),
+ _popup_form(NULL)
{
}
(void)p;
(void)left;
(void)right;
+
+ compute_text_size(p);
}
void Trace::paint_mid(QPainter &p, int left, int right)
{
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
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 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);
+}
+
void Trace::populate_popup_form(QWidget *parent, QFormLayout *form)
{
QLineEdit *const name_edit = new QLineEdit(parent);
label_size.width(), label_size.height());
}
-void Trace::on_action_set_name_triggered()
-{
- 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);
-}
-
-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"));
-
- if (new_colour.isValid())
- set_colour(new_colour);
+ _popup = NULL;
+ _popup_form = NULL;
}
void Trace::on_text_changed(const QString &text)