X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.cpp;h=5356433f9027e8fa5298db01dff5256d8a28a674;hp=50e89e567041c2ec186e47e0d387457808f452a3;hb=1f2082e20445966624f6172ebefd53fb1a021164;hpb=d7168e582c71ebcc359b12efed83daa2a6b6f28e diff --git a/pv/session.cpp b/pv/session.cpp index 50e89e56..5356433f 100644 --- a/pv/session.cpp +++ b/pv/session.cpp @@ -207,7 +207,7 @@ void Session::save_settings(QSettings &settings) const } shared_ptr sessionfile_device = - dynamic_pointer_cast< devices::SessionFile >(device_); + dynamic_pointer_cast(device_); if (sessionfile_device) { settings.setValue("device_type", "sessionfile"); @@ -217,6 +217,16 @@ void Session::save_settings(QSettings &settings) const settings.endGroup(); } + shared_ptr inputfile_device = + dynamic_pointer_cast(device_); + + if (inputfile_device) { + settings.setValue("device_type", "inputfile"); + settings.beginGroup("device"); + inputfile_device->save_meta_to_settings(settings); + settings.endGroup(); + } + // Save channels and decoders for (shared_ptr base : signalbases_) { #ifdef ENABLE_DECODE @@ -290,21 +300,34 @@ void Session::restore_settings(QSettings &settings) settings.endGroup(); } - if (device_type == "sessionfile") { - settings.beginGroup("device"); - QString filename = settings.value("filename").toString(); - settings.endGroup(); + if ((device_type == "sessionfile") || (device_type == "inputfile")) { + if (device_type == "sessionfile") { + settings.beginGroup("device"); + QString filename = settings.value("filename").toString(); + settings.endGroup(); - if (QFileInfo(filename).isReadable()) { - device = make_shared(device_manager_.context(), - filename.toStdString()); + if (QFileInfo(filename).isReadable()) { + device = make_shared(device_manager_.context(), + filename.toStdString()); + } + } + + if (device_type == "inputfile") { + settings.beginGroup("device"); + device = make_shared(device_manager_.context(), + settings); + settings.endGroup(); + } + + if (device) { set_device(device); start_capture([](QString infoMessage) { // TODO Emulate noquote() qDebug() << "Session error:" << infoMessage; }); - set_name(QFileInfo(filename).fileName()); + set_name(QString::fromStdString( + dynamic_pointer_cast(device)->display_name(device_manager_))); } } @@ -374,12 +397,13 @@ void Session::set_device(shared_ptr device) name_ = default_name_; name_changed(); - // Remove all stored data + // Remove all stored data and reset all views for (shared_ptr view : views_) { view->clear_signals(); #ifdef ENABLE_DECODE view->clear_decode_signals(); #endif + view->reset_view_state(); } for (const shared_ptr d : all_signal_data_) d->clear(); @@ -483,7 +507,6 @@ void Session::load_init_file(const string &file_name, const string &format) map input_opts; if (!format.empty()) { - // Got a user provided input format spec. const map > formats = device_manager_.context()->input_formats(); auto user_opts = pv::util::split_string(format, ":"); @@ -500,11 +523,6 @@ void Session::load_init_file(const string &file_name, const string &format) input_format = (*iter).second; input_opts = input_format_options(user_opts, input_format->options()); - } else { - // (Try to) auto detect the input format. Lookup failure - // is not fatal, when no input module claimed responsibility, - // then a session file gets loaded. - input_format = device_manager_.context()->input_format_match(file_name); } load_file(QString::fromStdString(file_name), input_format, input_opts); @@ -517,6 +535,10 @@ void Session::load_file(QString file_name, const QString errorMessage( QString("Failed to load file %1").arg(file_name)); + // In the absence of a caller's format spec, try to auto detect. + // Assume "sigrok session file" upon lookup miss. + if (!format) + format = device_manager_.context()->input_format_match(file_name.toStdString()); try { if (format) set_device(shared_ptr( @@ -928,7 +950,11 @@ void Session::sample_thread_proc(function error_handler) if (!device_) return; - cur_samplerate_ = device_->read_config(ConfigKey::SAMPLERATE); + try { + cur_samplerate_ = device_->read_config(ConfigKey::SAMPLERATE); + } catch (Error& e) { + cur_samplerate_ = 0; + } out_of_memory_ = false; @@ -1050,15 +1076,10 @@ void Session::feed_in_meta(shared_ptr meta) for (auto entry : meta->config()) { switch (entry.first->id()) { case SR_CONF_SAMPLERATE: - // We can't rely on the header to always contain the sample rate, - // so in case it's supplied via a meta packet, we use it. - if (!cur_samplerate_) - cur_samplerate_ = g_variant_get_uint64(entry.second.gobj()); - - /// @todo handle samplerate changes + cur_samplerate_ = g_variant_get_uint64(entry.second.gobj()); break; default: - // Unknown metadata is not an error. + qDebug() << "Received meta data key" << entry.first->id() << ", ignoring."; break; } } @@ -1144,7 +1165,11 @@ void Session::feed_in_logic(shared_ptr logic) } if (!cur_samplerate_) - cur_samplerate_ = device_->read_config(ConfigKey::SAMPLERATE); + try { + cur_samplerate_ = device_->read_config(ConfigKey::SAMPLERATE); + } catch (Error& e) { + // Do nothing + } lock_guard lock(data_mutex_); @@ -1181,16 +1206,18 @@ void Session::feed_in_analog(shared_ptr analog) } if (!cur_samplerate_) - cur_samplerate_ = device_->read_config(ConfigKey::SAMPLERATE); + try { + cur_samplerate_ = device_->read_config(ConfigKey::SAMPLERATE); + } catch (Error& e) { + // Do nothing + } lock_guard lock(data_mutex_); const vector> channels = analog->channels(); - const unsigned int channel_count = channels.size(); - const size_t sample_count = analog->num_samples() / channel_count; bool sweep_beginning = false; - unique_ptr data(new float[analog->num_samples()]); + unique_ptr data(new float[analog->num_samples() * channels.size()]); analog->get_data_as_float(data.get()); if (signalbases_.empty()) @@ -1232,8 +1259,8 @@ void Session::feed_in_analog(shared_ptr analog) assert(segment); // Append the samples in the segment - segment->append_interleaved_samples(channel_data++, sample_count, - channel_count); + segment->append_interleaved_samples(channel_data++, analog->num_samples(), + channels.size()); } if (sweep_beginning) {