projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Renamed get_samplerate to samplerate
[pulseview.git]
/
pv
/
view
/
logicsignal.cpp
diff --git
a/pv/view/logicsignal.cpp
b/pv/view/logicsignal.cpp
index 31b8f0a2f03a5907656c910cbcd70cbc2be4a427..ae4f11e29eca7195b0bd720c599a262fbfcc5784 100644
(file)
--- a/
pv/view/logicsignal.cpp
+++ b/
pv/view/logicsignal.cpp
@@
-76,7
+76,12
@@
LogicSignal::~LogicSignal()
{
}
{
}
-boost::shared_ptr<pv::data::Logic> LogicSignal::data() const
+boost::shared_ptr<pv::data::SignalData> LogicSignal::data() const
+{
+ return _data;
+}
+
+boost::shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
{
return _data;
}
{
return _data;
}
@@
-121,7
+126,7
@@
void LogicSignal::paint_mid(QPainter &p, int left, int right)
const shared_ptr<pv::data::LogicSnapshot> &snapshot =
snapshots.front();
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)
// Show sample rate as 1Hz when it is unknown
if (samplerate == 0.0)
@@
-238,8
+243,8
@@
void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
// Add the trigger actions
const sr_dev_inst *const sdi = _session.get_device();
// 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);
{
const char *const trig_types =
g_variant_get_string(gvar, NULL);