X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=aadaed78f7d238cac06a1a1ec789eb5795864650;hp=0e1c7c729c77c4693c32a0afd38663c5ff54026f;hb=945745012eb57cefa1ef457daf48cfffa99f9ec2;hpb=ef8311a4296a2dc85c82b063de61efa4eb7a8404

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 0e1c7c72..aadaed78 100644
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -24,15 +24,21 @@
 #include <math.h>
 
 #include <QApplication>
+#include <QFormLayout>
+#include <QMenu>
+
+#include <libsigrok/libsigrok.h>
 
 #include "signal.h"
 #include "view.h"
 
+#include <pv/device/devinst.h>
+
+using boost::shared_ptr;
+
 namespace pv {
 namespace view {
 
-const QPen Signal::SignalAxisPen(QColor(128, 128, 128, 64));
-
 const char *const ProbeNames[] = {
 	"CLK",
 	"DATA",
@@ -50,55 +56,80 @@ const char *const ProbeNames[] = {
 	"SCL"
 };
 
-Signal::Signal(pv::SigSession &session, const sr_probe *const probe) :
-	Trace(session, probe->name),
+Signal::Signal(shared_ptr<pv::device::DevInst> dev_inst,
+	const sr_probe *const probe) :
+	Trace(probe->name),
+	_dev_inst(dev_inst),
 	_probe(probe),
-	_name_action(NULL),
 	_name_widget(NULL),
 	_updating_name_widget(false)
 {
 	assert(_probe);
 }
 
-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 _probe->enabled;
+}
+
+void Signal::enable(bool enable)
+{
+	_dev_inst->enable_probe(_probe, enable);
+	visibility_changed();
+}
+
+const sr_probe* Signal::probe() const
+{
+	return _probe;
+}
+
+void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
 {
 	_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(ProbeNames); i++)
 		_name_widget->insertItem(i, ProbeNames[i]);
 	_name_widget->setEditText(_probe->name);
 
 	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;
+	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;
 }
 
-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