X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=97e05494cca05eac922a47a6bb0c1dd878472d93;hb=6ac6242b25cfbd4df14abe7580adc9d0f4cffe43;hp=45a8cd30726f43e64fa681c85427464c7d2ad415;hpb=632ba77ec49a10f482d7489b1a2d64dba2c2e705;p=pulseview.git

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 45a8cd3..97e0549 100644
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -24,16 +24,24 @@
 #include <math.h>
 
 #include <QApplication>
+#include <QFormLayout>
+#include <QKeyEvent>
+#include <QLineEdit>
+#include <QMenu>
+
+#include <libsigrok/libsigrok.h>
 
 #include "signal.h"
 #include "view.h"
 
+#include <pv/device/devinst.h>
+
+using std::shared_ptr;
+
 namespace pv {
 namespace view {
 
-const QPen Signal::SignalAxisPen(QColor(128, 128, 128, 64));
-
-const char *const ProbeNames[] = {
+const char *const ChannelNames[] = {
 	"CLK",
 	"DATA",
 	"IN",
@@ -50,60 +58,114 @@ const char *const ProbeNames[] = {
 	"SCL"
 };
 
-Signal::Signal(pv::SigSession &session, const sr_probe *const probe) :
-	Trace(session, probe->name),
-	_probe(probe),
-	_name_action(NULL),
+Signal::Signal(shared_ptr<pv::device::DevInst> dev_inst,
+	const sr_channel *const channel) :
+	Trace(channel->name),
+	_dev_inst(dev_inst),
+	_channel(channel),
 	_name_widget(NULL),
 	_updating_name_widget(false)
 {
-	assert(_probe);
+	assert(_channel);
 }
 
-void Signal::init_context_bar_actions(QWidget *parent)
+void Signal::set_name(QString name)
 {
+	Trace::set_name(name);
+	_updating_name_widget = true;
+	_name_widget->setEditText(name);
+	_updating_name_widget = false;
+}
+
+bool Signal::enabled() const
+{
+	return _channel->enabled;
+}
+
+void Signal::enable(bool enable)
+{
+	_dev_inst->enable_channel(_channel, enable);
+	visibility_changed();
+}
+
+const sr_channel* Signal::channel() const
+{
+	return _channel;
+}
+
+void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
+{
+	int index;
+
 	_name_widget = new QComboBox(parent);
 	_name_widget->setEditable(true);
 
-	_name_action = new QWidgetAction(parent);
-	_name_action->setDefaultWidget(_name_widget);
+	for(unsigned int i = 0; i < countof(ChannelNames); i++)
+		_name_widget->insertItem(i, ChannelNames[i]);
+
+	index = _name_widget->findText(_name, Qt::MatchExactly);
 
-	for(unsigned int i = 0; i < countof(ProbeNames); i++)
-		_name_widget->insertItem(i, ProbeNames[i]);
-	_name_widget->setEditText(_probe->name);
+	if (index == -1) {
+		_name_widget->insertItem(0, _name);
+		_name_widget->setCurrentIndex(0);
+	} else {
+		_name_widget->setCurrentIndex(index);
+	}
+
+	_name_widget->lineEdit()->selectAll();
+	_name_widget->setFocus();
 
 	connect(_name_widget, SIGNAL(editTextChanged(const QString&)),
 		this, SLOT(on_text_changed(const QString&)));
-}
 
-void Signal::set_name(QString name)
-{
-	Trace::set_name(name);
-	_updating_name_widget = true;
-	_name_widget->setEditText(name);
-	_updating_name_widget = false;
+	// We want to close the popup when the Enter key was pressed.
+	_name_widget->installEventFilter(this);
+
+	form->addRow(tr("Name"), _name_widget);
+
+	add_colour_option(parent, form);
 }
 
-bool Signal::enabled() const
+QMenu* Signal::create_context_menu(QWidget *parent)
 {
-	return _probe->enabled;
+	QMenu *const menu = Trace::create_context_menu(parent);
+
+	menu->addSeparator();
+
+	QAction *const disable = new QAction(tr("Disable"), this);
+	disable->setShortcuts(QKeySequence::Delete);
+	connect(disable, SIGNAL(triggered()), this, SLOT(on_disable()));
+	menu->addAction(disable);
+
+	return menu;
 }
 
-const sr_probe* Signal::probe() const
+bool Signal::eventFilter(QObject *obj, QEvent *evt)
 {
-	return _probe;
+	QKeyEvent *keyEvent;
+
+	(void)obj;
+
+	if (evt->type() == QEvent::KeyPress) {
+		keyEvent = static_cast<QKeyEvent*>(evt);
+		if (keyEvent->key() == Qt::Key_Enter ||
+		    keyEvent->key() == Qt::Key_Return) {
+			close_popup();
+			return true;
+		}
+	}
+
+	return false;
 }
 
-void Signal::paint_axis(QPainter &p, int y, int left, int right)
+void Signal::delete_pressed()
 {
-	p.setPen(SignalAxisPen);
-	p.drawLine(QPointF(left, y + 0.5f), QPointF(right, y + 0.5f));
+	on_disable();
 }
 
-void Signal::on_text_changed(const QString &text)
+void Signal::on_disable()
 {
-	Trace::set_name(text);
-	text_changed();
+	enable(false);
 }
 
 } // namespace view