projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove SignalBase::A2LChannel
[pulseview.git]
/
pv
/
session.cpp
diff --git
a/pv/session.cpp
b/pv/session.cpp
index 732f4a8cbf55b69c7befe816cba3921f23fb80ec..4dcc2e8b7b77f5da1cfce26781e694d16f23eb7f 100644
(file)
--- a/
pv/session.cpp
+++ b/
pv/session.cpp
@@
-91,6
+91,9
@@
using sigrok::Session;
using Glib::VariantBase;
namespace pv {
using Glib::VariantBase;
namespace pv {
+
+shared_ptr<sigrok::Context> Session::sr_context;
+
Session::Session(DeviceManager &device_manager, QString name) :
device_manager_(device_manager),
default_name_(name),
Session::Session(DeviceManager &device_manager, QString name) :
device_manager_(device_manager),
default_name_(name),
@@
-316,7
+319,7
@@
void Session::restore_settings(QSettings &settings)
int decode_signals = settings.value("decode_signals").toInt();
for (int i = 0; i < decode_signals; i++) {
int decode_signals = settings.value("decode_signals").toInt();
for (int i = 0; i < decode_signals; i++) {
- settings.beginGroup("decode_signal" + QString::number(i
++
));
+ settings.beginGroup("decode_signal" + QString::number(i));
shared_ptr<data::DecodeSignal> signal = add_decode_signal();
signal->restore_settings(settings);
settings.endGroup();
shared_ptr<data::DecodeSignal> signal = add_decode_signal();
signal->restore_settings(settings);
settings.endGroup();
@@
-619,8
+622,6
@@
void Session::register_view(shared_ptr<views::ViewBase> view)
switch (signalbase->type()) {
case data::SignalBase::AnalogChannel:
case data::SignalBase::LogicChannel:
switch (signalbase->type()) {
case data::SignalBase::AnalogChannel:
case data::SignalBase::LogicChannel:
- case data::SignalBase::A2LChannel:
- break;
case data::SignalBase::DecodeChannel:
#ifdef ENABLE_DECODE
trace_view->add_decode_signal(
case data::SignalBase::DecodeChannel:
#ifdef ENABLE_DECODE
trace_view->add_decode_signal(