#include <extdef.h>
-#include <math.h>
+#include <cassert>
+#include <cmath>
+
+#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/device/devinst.h>
+#include <pv/data/logic.h>
+#include <pv/data/logicsnapshot.h>
+#include <pv/view/view.h>
-using namespace boost;
-using namespace std;
+using std::deque;
+using std::max;
+using std::min;
+using std::pair;
+using std::shared_ptr;
+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::device::DevInst> dev_inst,
+ const sr_channel *const probe, shared_ptr<data::Logic> data) :
+ Signal(dev_inst, probe),
_data(data),
_trigger_none(NULL),
_trigger_rising(NULL),
{
}
-boost::shared_ptr<pv::data::Logic> LogicSignal::data() const
+shared_ptr<pv::data::SignalData> LogicSignal::data() const
+{
+ return _data;
+}
+
+shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
{
return _data;
}
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)
QLineF *const edge_lines = new QLineF[edge_count];
line = edge_lines;
- for (vector<pv::data::LogicSnapshot::EdgePair>::const_iterator i =
- edges.begin() + 1;
- i != edges.end() - 1; i++) {
+ for (auto i = edges.cbegin() + 1; i != edges.cend() - 1; i++) {
const float x = ((*i).first / samples_per_pixel -
pixels_offset) + left;
*line++ = QLineF(x, high_offset, x, low_offset);
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);
{
QLineF *line = lines;
- for (vector<pv::data::LogicSnapshot::EdgePair>::const_iterator i =
- edges.begin(); i != (edges.end() - 1); i++)
+ for (auto i = edges.begin(); i != (edges.end() - 1); i++)
if ((*i).second == level) {
*line++ = QLineF(
((*i).first / samples_per_pixel -
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)
+{
+ while(*trig_types)
+ if(*trig_types++ == type) {
+ _trigger_bar->addAction(action);
+ break;
+ }
+}
+
void LogicSignal::update_trigger_actions()
{
const char cur_trigger = _probe->trigger ?
const char *const trigger_string =
(type != 0) ? trigger_type_string : NULL;
- const sr_dev_inst *const sdi = _session.get_device();
- const int probe_count = g_slist_length(sdi->probes);
+ assert(_dev_inst);
+ const sr_dev_inst *const sdi = _dev_inst->dev_inst();
+ assert(sdi);
+
+ const int probe_count = g_slist_length(sdi->channels);
assert(probe_count > 0);
assert(_probe && _probe->index < probe_count);
projects / pulseview.git / blobdiff