using Gst::Pipeline;
#endif
+using pv::views::trace::Signal;
+using pv::views::trace::AnalogSignal;
+using pv::views::trace::LogicSignal;
+
namespace pv {
shared_ptr<sigrok::Context> Session::sr_context;
set_device((iter == devices.end()) ? devices.front() : *iter);
}
+bool Session::using_file_device() const
+{
+ shared_ptr<devices::SessionFile> sessionfile_device =
+ dynamic_pointer_cast<devices::SessionFile>(device_);
+
+ shared_ptr<devices::InputFile> inputfile_device =
+ dynamic_pointer_cast<devices::InputFile>(device_);
+
+ return (sessionfile_device || inputfile_device);
+}
+
/**
* Convert generic options to data types that are specific to InputFormat.
*
device_manager_.context(),
file_name.toStdString())));
} catch (Error& e) {
- MainWindow::show_session_error(tr("Failed to load ") + file_name, e.what());
+ MainWindow::show_session_error(tr("Failed to load %1").arg(file_name), e.what());
set_default_device();
main_bar_->update_device_list();
return;
qobject_cast<views::trace::View*>(viewbase.get());
if (trace_view) {
- unordered_set< shared_ptr<views::trace::Signal> >
- prev_sigs(trace_view->signals());
+ unordered_set< shared_ptr<Signal> > prev_sigs(trace_view->signals());
trace_view->clear_signals();
for (auto channel : sr_dev->channels()) {
shared_ptr<data::SignalBase> signalbase;
- shared_ptr<views::trace::Signal> signal;
+ shared_ptr<Signal> signal;
// Find the channel in the old signals
const auto iter = find_if(
prev_sigs.cbegin(), prev_sigs.cend(),
- [&](const shared_ptr<views::trace::Signal> &s) {
+ [&](const shared_ptr<Signal> &s) {
return s->base()->channel() == channel;
});
if (iter != prev_sigs.end()) {
if (b->channel() == channel)
signalbase = b;
+ shared_ptr<Signal> signal;
+
switch(channel->type()->id()) {
case SR_CHANNEL_LOGIC:
if (!signalbase) {
signalbase.get(), SLOT(on_capture_state_changed(int)));
}
- signal = shared_ptr<views::trace::Signal>(
- new views::trace::LogicSignal(*this,
- device_, signalbase));
- trace_view->add_signal(signal);
+ signal = shared_ptr<Signal>(new LogicSignal(*this, device_, signalbase));
break;
case SR_CHANNEL_ANALOG:
signalbase.get(), SLOT(on_capture_state_changed(int)));
}
- signal = shared_ptr<views::trace::Signal>(
- new views::trace::AnalogSignal(
- *this, signalbase));
- trace_view->add_signal(signal);
+ signal = shared_ptr<Signal>(new AnalogSignal(*this, signalbase));
break;
}
assert(false);
break;
}
+
+ // New views take their signal settings from the main view
+ if (!viewbase->is_main_view()) {
+ shared_ptr<pv::views::trace::View> main_tv =
+ dynamic_pointer_cast<pv::views::trace::View>(main_view_);
+ shared_ptr<Signal> main_signal =
+ main_tv->get_signal_by_signalbase(signalbase);
+ signal->restore_settings(main_signal->save_settings());
+ }
+
+ trace_view->add_signal(signal);
}
}
}