]> sigrok.org Git - pulseview.git/blobdiff - pv/view/logicsignal.cpp
Added missing includes and defintions
[pulseview.git] / pv / view / logicsignal.cpp
index c8713114fbf1a8bea4e785a0e49b83958578da16..31b8f0a2f03a5907656c910cbcd70cbc2be4a427 100644 (file)
 
 #include <math.h>
 
+#include <QFormLayout>
+#include <QToolBar>
+
 #include "logicsignal.h"
 #include "view.h"
 
 #include "pv/sigsession.h"
 #include "pv/data/logic.h"
 #include "pv/data/logicsnapshot.h"
+#include "pv/view/view.h"
 
 using namespace boost;
 using namespace std;
@@ -54,103 +58,36 @@ const QColor LogicSignal::SignalColours[10] = {
        QColor(0xEE, 0xEE, 0xEC),       // White
 };
 
-LogicSignal::LogicSignal(pv::SigSession &session, const sr_probe *const probe,
+LogicSignal::LogicSignal(pv::SigSession &session, sr_probe *const probe,
        shared_ptr<data::Logic> data) :
        Signal(session, probe),
        _data(data),
-       _separator(this),
-       _icon_trigger_none(":/icons/trigger-none.svg"),
-       _trigger_none(_icon_trigger_none, tr("No trigger"), this),
-       _icon_trigger_rising(":/icons/trigger-rising.svg"),
-       _trigger_rising(_icon_trigger_rising,
-               tr("Trigger on rising edge"), this),
-       _icon_trigger_high(":/icons/trigger-high.svg"),
-       _trigger_high(_icon_trigger_high,
-               tr("Trigger on high level"), this),
-       _icon_trigger_falling(":/icons/trigger-falling.svg"),
-       _trigger_falling(_icon_trigger_falling,
-               tr("Trigger on falling edge"), this),
-       _icon_trigger_low(":/icons/trigger-low.svg"),
-       _trigger_low(_icon_trigger_low,
-               tr("Trigger on low level"), this),
-       _icon_trigger_change(":/icons/trigger-change.svg"),
-       _trigger_change(_icon_trigger_change,
-               tr("Trigger on rising or falling edge"), this)
+       _trigger_none(NULL),
+       _trigger_rising(NULL),
+       _trigger_high(NULL),
+       _trigger_falling(NULL),
+       _trigger_low(NULL),
+       _trigger_change(NULL)
 {
        _colour = SignalColours[probe->index % countof(SignalColours)];
-
-       _separator.setSeparator(true);
-
-       _trigger_none.setCheckable(true);
-       connect(&_trigger_none, SIGNAL(triggered()),
-               this, SLOT(on_trigger_none()));
-
-       _trigger_rising.setCheckable(true);
-       connect(&_trigger_rising, SIGNAL(triggered()),
-               this, SLOT(on_trigger_rising()));
-
-       _trigger_high.setCheckable(true);
-       connect(&_trigger_high, SIGNAL(triggered()),
-               this, SLOT(on_trigger_high()));
-
-       _trigger_falling.setCheckable(true);
-       connect(&_trigger_falling, SIGNAL(triggered()),
-               this, SLOT(on_trigger_falling()));
-
-       _trigger_low.setCheckable(true);
-       connect(&_trigger_low, SIGNAL(triggered()),
-               this, SLOT(on_trigger_low()));
-
-       _trigger_change.setCheckable(true);
-       connect(&_trigger_change, SIGNAL(triggered()),
-               this, SLOT(on_trigger_change()));
 }
 
 LogicSignal::~LogicSignal()
 {
 }
 
-const list<QAction*> LogicSignal::get_context_bar_actions()
+boost::shared_ptr<pv::data::Logic> LogicSignal::data() const
 {
-       GVariant *gvar;
-       list<QAction*> actions;
-
-       actions.push_back(&_name_action);
-
-       // Add the trigger actions
-       const sr_dev_inst *const sdi = _session.get_device();
-       if (sr_config_list(sdi->driver, SR_CONF_TRIGGER_TYPE,
-               &gvar, sdi) == SR_OK) {
-               const char *const trig_types =
-                       g_variant_get_string(gvar, NULL);
-
-               if (trig_types && trig_types[0] != '\0') {
-                       actions.push_back(&_separator);
-
-                       actions.push_back(&_trigger_none);
-
-                       add_trigger_action(trig_types, 'r',
-                               &_trigger_rising, actions);
-                       add_trigger_action(trig_types, '1',
-                               &_trigger_high, actions);
-                       add_trigger_action(trig_types, 'f',
-                               &_trigger_falling, actions);
-                       add_trigger_action(trig_types, '0',
-                               &_trigger_low, actions);
-                       add_trigger_action(trig_types, 'c',
-                               &_trigger_change, actions);
-               
-                       update_trigger_actions();
-               }
-
-               g_variant_unref(gvar);
-       }
+       return _data;
+}
 
-       return actions;
+void LogicSignal::paint_back(QPainter &p, int left, int right)
+{
+       if (_probe->enabled)
+               paint_axis(p, get_y(), left, right);
 }
 
-void LogicSignal::paint(QPainter &p, int y, int left, int right,
-               double scale, double offset)
+void LogicSignal::paint_mid(QPainter &p, int left, int right)
 {
        using pv::view::View;
 
@@ -159,15 +96,20 @@ void LogicSignal::paint(QPainter &p, int y, int left, int right,
        vector< pair<int64_t, bool> > edges;
 
        assert(_probe);
-       assert(scale > 0);
        assert(_data);
        assert(right >= left);
 
+       assert(_view);
+       const int y = _v_offset - _view->v_offset();
+       
+       const double scale = _view->scale();
+       assert(scale > 0);
+       
+       const double offset = _view->offset();
+
        if (!_probe->enabled)
                return;
 
-       paint_axis(p, y, left, right);
-
        const float high_offset = y - View::SignalHeight + 0.5f;
        const float low_offset = y + 0.5f;
 
@@ -249,12 +191,86 @@ void LogicSignal::paint_caps(QPainter &p, QLineF *const lines,
        p.drawLines(lines, line - lines);
 }
 
+void LogicSignal::init_trigger_actions(QWidget *parent)
+{
+       _trigger_none = new QAction(QIcon(":/icons/trigger-none.svg"),
+               tr("No trigger"), parent);
+       _trigger_none->setCheckable(true);
+       connect(_trigger_none, SIGNAL(triggered()),
+               this, SLOT(on_trigger_none()));
+
+       _trigger_rising = new QAction(QIcon(":/icons/trigger-rising.svg"),
+               tr("Trigger on rising edge"), parent);
+       _trigger_rising->setCheckable(true);
+       connect(_trigger_rising, SIGNAL(triggered()),
+               this, SLOT(on_trigger_rising()));
+
+       _trigger_high = new QAction(QIcon(":/icons/trigger-high.svg"),
+               tr("Trigger on high level"), parent);
+       _trigger_high->setCheckable(true);
+       connect(_trigger_high, SIGNAL(triggered()),
+               this, SLOT(on_trigger_high()));
+
+       _trigger_falling = new QAction(QIcon(":/icons/trigger-falling.svg"),
+               tr("Trigger on falling edge"), parent);
+       _trigger_falling->setCheckable(true);
+       connect(_trigger_falling, SIGNAL(triggered()),
+               this, SLOT(on_trigger_falling()));
+
+       _trigger_low = new QAction(QIcon(":/icons/trigger-low.svg"),
+               tr("Trigger on low level"), parent);
+       _trigger_low->setCheckable(true);
+       connect(_trigger_low, SIGNAL(triggered()),
+               this, SLOT(on_trigger_low()));
+
+       _trigger_change = new QAction(QIcon(":/icons/trigger-change.svg"),
+               tr("Trigger on rising or falling edge"), parent);
+       _trigger_change->setCheckable(true);
+       connect(_trigger_change, SIGNAL(triggered()),
+               this, SLOT(on_trigger_change()));
+}
+
+void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
+{
+       GVariant *gvar;
+
+       Signal::populate_popup_form(parent, form);
+
+       // Add the trigger actions
+       const sr_dev_inst *const sdi = _session.get_device();
+       if (sr_config_list(sdi->driver, SR_CONF_TRIGGER_TYPE,
+               &gvar, sdi) == SR_OK)
+       {
+               const char *const trig_types =
+                       g_variant_get_string(gvar, NULL);
+
+               if (trig_types && trig_types[0] != '\0')
+               {
+                       _trigger_bar = new QToolBar(parent);
+
+                       init_trigger_actions(_trigger_bar);
+                       _trigger_bar->addAction(_trigger_none);
+                       add_trigger_action(trig_types, 'r', _trigger_rising);
+                       add_trigger_action(trig_types, '1', _trigger_high);
+                       add_trigger_action(trig_types, 'f', _trigger_falling);
+                       add_trigger_action(trig_types, '0', _trigger_low);
+                       add_trigger_action(trig_types, 'c', _trigger_change);
+               
+                       update_trigger_actions();
+
+                       form->addRow(tr("Trigger"), _trigger_bar);
+               }
+
+               g_variant_unref(gvar);
+       }
+}
+
 void LogicSignal::add_trigger_action(const char *trig_types, char type,
-       QAction *action, list<QAction*> &actions)
+       QAction *action)
 {
        while(*trig_types)
                if(*trig_types++ == type) {
-                       actions.push_back(action);
+                       _trigger_bar->addAction(action);
                        break;
                }
 }
@@ -263,12 +279,12 @@ void LogicSignal::update_trigger_actions()
 {
        const char cur_trigger = _probe->trigger ?
                _probe->trigger[0] : '\0';
-       _trigger_none.setChecked(cur_trigger == '\0');
-       _trigger_rising.setChecked(cur_trigger == 'r');
-       _trigger_high.setChecked(cur_trigger == '1');
-       _trigger_falling.setChecked(cur_trigger == 'f');
-       _trigger_low.setChecked(cur_trigger == '0');
-       _trigger_change.setChecked(cur_trigger == 'c');
+       _trigger_none->setChecked(cur_trigger == '\0');
+       _trigger_rising->setChecked(cur_trigger == 'r');
+       _trigger_high->setChecked(cur_trigger == '1');
+       _trigger_falling->setChecked(cur_trigger == 'f');
+       _trigger_low->setChecked(cur_trigger == '0');
+       _trigger_change->setChecked(cur_trigger == 'c');
 }
 
 void LogicSignal::set_trigger(char type)