#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"
+#include <pv/sigsession.h>
+#include <pv/devinst.h>
+#include <pv/data/logic.h>
+#include <pv/data/logicsnapshot.h>
+#include <pv/view/view.h>
-using namespace boost;
-using namespace std;
+using boost::shared_ptr;
+using std::deque;
+using std::max;
+using std::min;
+using std::pair;
+using std::vector;
namespace pv {
namespace view {
QColor(0xEE, 0xEE, 0xEC), // White
};
-LogicSignal::LogicSignal(pv::SigSession &session, const sr_probe *const probe,
- shared_ptr<data::Logic> data) :
- Signal(session, probe),
+LogicSignal::LogicSignal(shared_ptr<pv::DevInst> dev_inst,
+ const sr_probe *const probe, shared_ptr<data::Logic> data) :
+ Signal(dev_inst, probe),
_data(data),
- _separator(NULL),
_trigger_none(NULL),
_trigger_rising(NULL),
_trigger_high(NULL),
{
}
-void LogicSignal::init_context_bar_actions(QWidget *parent)
+shared_ptr<pv::data::SignalData> LogicSignal::data() const
{
- Signal::init_context_bar_actions(parent);
-
- _separator = new QAction(parent);
- _separator->setSeparator(true);
-
- _trigger_none = new QAction(QIcon(":/icons/trigger-none.svg"),
- tr("No trigger"), this);
- _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"), this);
- _trigger_rising->setCheckable(true);
- connect(_trigger_rising, SIGNAL(triggered()),
- this, SLOT(on_trigger_rising()));
-
- _trigger_high = new QAction(QIcon(":/icons/trigger-low.svg"),
- tr("Trigger on high level"), this);
- _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"), this);
- _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"), this);
- _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"), this);
- _trigger_change->setCheckable(true);
- connect(_trigger_change, SIGNAL(triggered()),
- this, SLOT(on_trigger_change()));
+ return _data;
}
-boost::shared_ptr<pv::data::Logic> LogicSignal::data() const
+shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
{
return _data;
}
-const list<QAction*> LogicSignal::get_context_bar_actions()
+void LogicSignal::paint_back(QPainter &p, int left, int right)
{
- 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 actions;
+ if (_probe->enabled)
+ paint_axis(p, get_y(), left, right);
}
-void LogicSignal::paint(QPainter &p, int left, int right)
+void LogicSignal::paint_mid(QPainter &p, int left, int right)
{
using pv::view::View;
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;
const shared_ptr<pv::data::LogicSnapshot> &snapshot =
snapshots.front();
- double samplerate = _data->get_samplerate();
+ double samplerate = _data->samplerate();
// Show sample rate as 1Hz when it is unknown
if (samplerate == 0.0)
delete[] edge_lines;
// Paint the caps
- const unsigned int max_cap_line_count = (edges.size() - 1);
+ const unsigned int max_cap_line_count = edges.size();
QLineF *const cap_lines = new QLineF[max_cap_line_count];
p.setPen(HighColour);
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
+ assert(_dev_inst);
+ if ((gvar = _dev_inst->list_config(NULL, SR_CONF_TRIGGER_TYPE)))
+ {
+ 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;
}
}
const char *const trigger_string =
(type != 0) ? trigger_type_string : NULL;
- const sr_dev_inst *const sdi = _session.get_device();
+ assert(_dev_inst);
+ const sr_dev_inst *const sdi = _dev_inst->dev_inst();
+ assert(sdi);
+
const int probe_count = g_slist_length(sdi->probes);
assert(probe_count > 0);
projects / pulseview.git / blobdiff