#include <pv/data/logicsegment.hpp>
#include <pv/data/signalbase.hpp>
#include <pv/devices/device.hpp>
-#include <pv/view/signal.hpp>
#include <libsigrokcxx/libsigrokcxx.hpp>
using Glib::VariantBase;
+using sigrok::ChannelType;
using sigrok::ConfigKey;
using sigrok::Error;
using sigrok::OutputFormat;
bool StoreSession::start()
{
- const unordered_set< shared_ptr<view::Signal> > sigs(session_.signals());
+ const unordered_set< shared_ptr<data::SignalBase> > sigs(session_.signalbases());
shared_ptr<data::Segment> any_segment;
shared_ptr<data::LogicSegment> lsegment;
vector< shared_ptr<data::SignalBase> > achannel_list;
vector< shared_ptr<data::AnalogSegment> > asegment_list;
- for (shared_ptr<view::Signal> signal : sigs) {
+ for (shared_ptr<data::SignalBase> signal : sigs) {
if (!signal->enabled())
continue;
- shared_ptr<data::SignalData> data = signal->data();
-
- if (dynamic_pointer_cast<data::Logic>(data)) {
+ if (signal->type() == ChannelType::LOGIC) {
// All logic channels share the same data segments
- shared_ptr<data::Logic> ldata = dynamic_pointer_cast<data::Logic>(data);
+ shared_ptr<data::Logic> ldata = signal->logic_data();
const deque< shared_ptr<data::LogicSegment> > &lsegments =
ldata->logic_segments();
any_segment = lsegment;
}
- if (dynamic_pointer_cast<data::Analog>(data)) {
+ if (signal->type() == ChannelType::ANALOG) {
// Each analog channel has its own segments
- shared_ptr<data::Analog> adata =
- dynamic_pointer_cast<data::Analog>(data);
+ shared_ptr<data::Analog> adata = signal->analog_data();
const deque< shared_ptr<data::AnalogSegment> > &asegments =
adata->analog_segments();
asegment_list.push_back(asegments.front());
any_segment = asegments.front();
- achannel_list.push_back(signal->channel());
+ achannel_list.push_back(signal);
}
}