projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Renamed pv::view::LogicSignal::data to logic_data
[pulseview.git]
/
pv
/
view
/
logicsignal.cpp
diff --git
a/pv/view/logicsignal.cpp
b/pv/view/logicsignal.cpp
index b0fe95135eb782e9231d98d63dadf398a9cb6fda..fb84d70a8e78dc6838678038bcfedd9e88ecb0c1 100644
(file)
--- a/
pv/view/logicsignal.cpp
+++ b/
pv/view/logicsignal.cpp
@@
-22,6
+22,9
@@
#include <math.h>
#include <math.h>
+#include <QFormLayout>
+#include <QToolBar>
+
#include "logicsignal.h"
#include "view.h"
#include "logicsignal.h"
#include "view.h"
@@
-55,7
+58,7
@@
const QColor LogicSignal::SignalColours[10] = {
QColor(0xEE, 0xEE, 0xEC), // White
};
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),
shared_ptr<data::Logic> data) :
Signal(session, probe),
_data(data),
@@
-73,7
+76,7
@@
LogicSignal::~LogicSignal()
{
}
{
}
-boost::shared_ptr<pv::data::Logic> LogicSignal::data() const
+boost::shared_ptr<pv::data::Logic> LogicSignal::
logic_
data() const
{
return _data;
}
{
return _data;
}
@@
-235,8
+238,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);