#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 {
{
}
-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)
// 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)
+ if (sr_config_list(sdi->driver, sdi, NULL, SR_CONF_TRIGGER_TYPE,
+ &gvar) == SR_OK)
{
const char *const trig_types =
g_variant_get_string(gvar, NULL);