session: add support to auto detect input format (for init file)

[pulseview.git] / pv / session.cpp

diff --git a/pv/session.cpp b/pv/session.cpp
index bf9e3a2c0897973854223520fb37c1fae83018f7..50e89e567041c2ec186e47e0d387457808f452a3 100644 (file)
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -28,6 +28,7 @@
 #include <sys/stat.h>
 
 #include "devicemanager.hpp"
 #include <sys/stat.h>
 
 #include "devicemanager.hpp"

+#include "mainwindow.hpp"

 #include "session.hpp"
 
 #include "data/analog.hpp"
 #include "session.hpp"
 
 #include "data/analog.hpp"


@@ -300,7 +301,8 @@ void Session::restore_settings(QSettings &settings)
                        set_device(device);
 
                        start_capture([](QString infoMessage) {
                        set_device(device);
 
                        start_capture([](QString infoMessage) {

-                               qDebug().noquote() << "Session error:" << infoMessage; });
+                               // TODO Emulate noquote()
+                               qDebug() << "Session error:" << infoMessage; });

 
                        set_name(QFileInfo(filename).fileName());
                }
 
                        set_name(QFileInfo(filename).fileName());
                }


@@ -352,7 +354,7 @@ void Session::select_device(shared_ptr<devices::Device> device)
                else
                        set_default_device();
        } catch (const QString &e) {
                else
                        set_default_device();
        } catch (const QString &e) {

-               main_bar_->session_error(tr("Failed to select device"), e);
+               MainWindow::show_session_error(tr("Failed to select device"), e);

        }
 }
 
        }
 }
 


@@ -400,7 +402,7 @@ void Session::set_device(shared_ptr<devices::Device> device)
                device_->open();
        } catch (const QString &e) {
                device_.reset();
                device_->open();
        } catch (const QString &e) {
                device_.reset();

-               main_bar_->session_error(tr("Failed to open device"), e);
+               MainWindow::show_session_error(tr("Failed to open device"), e);

        }
 
        if (device_) {
        }
 
        if (device_) {


@@ -481,6 +483,7 @@ void Session::load_init_file(const string &file_name, const string &format)
        map<string, Glib::VariantBase> input_opts;
 
        if (!format.empty()) {
        map<string, Glib::VariantBase> input_opts;
 
        if (!format.empty()) {

+               // Got a user provided input format spec.

                const map<string, shared_ptr<InputFormat> > formats =
                        device_manager_.context()->input_formats();
                auto user_opts = pv::util::split_string(format, ":");
                const map<string, shared_ptr<InputFormat> > formats =
                        device_manager_.context()->input_formats();
                auto user_opts = pv::util::split_string(format, ":");


@@ -490,13 +493,18 @@ void Session::load_init_file(const string &file_name, const string &format)
                        [&](const pair<string, shared_ptr<InputFormat> > f) {
                                return f.first == user_name; });
                if (iter == formats.end()) {
                        [&](const pair<string, shared_ptr<InputFormat> > f) {
                                return f.first == user_name; });
                if (iter == formats.end()) {

-                       main_bar_->session_error(tr("Error"),
+                       MainWindow::show_session_error(tr("Error"),

                                tr("Unexpected input format: %s").arg(QString::fromStdString(format)));
                        return;
                }
                input_format = (*iter).second;
                input_opts = input_format_options(user_opts,
                        input_format->options());
                                tr("Unexpected input format: %s").arg(QString::fromStdString(format)));
                        return;
                }
                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);
        }
 
        load_file(QString::fromStdString(file_name), input_format, input_opts);


@@ -522,7 +530,7 @@ void Session::load_file(QString file_name,
                                        device_manager_.context(),
                                        file_name.toStdString())));
        } catch (Error& e) {
                                        device_manager_.context(),
                                        file_name.toStdString())));
        } catch (Error& e) {

-               main_bar_->session_error(tr("Failed to load ") + file_name, e.what());
+               MainWindow::show_session_error(tr("Failed to load ") + file_name, e.what());

                set_default_device();
                main_bar_->update_device_list();
                return;
                set_default_device();
                main_bar_->update_device_list();
                return;


@@ -531,7 +539,7 @@ void Session::load_file(QString file_name,
        main_bar_->update_device_list();
 
        start_capture([&, errorMessage](QString infoMessage) {
        main_bar_->update_device_list();
 
        start_capture([&, errorMessage](QString infoMessage) {

-               main_bar_->session_error(errorMessage, infoMessage); });
+               MainWindow::show_session_error(errorMessage, infoMessage); });

 
        set_name(QFileInfo(file_name).fileName());
 }
 
        set_name(QFileInfo(file_name).fileName());
 }


@@ -1130,6 +1138,11 @@ void Session::feed_in_frame_end()
 
 void Session::feed_in_logic(shared_ptr<Logic> logic)
 {
 
 void Session::feed_in_logic(shared_ptr<Logic> logic)
 {

+       if (logic->data_length() == 0) {
+               qDebug() << "WARNING: Received logic packet with 0 samples.";
+               return;
+       }
+

        if (!cur_samplerate_)
                cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);
 
        if (!cur_samplerate_)
                cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);
 


@@ -1162,6 +1175,11 @@ void Session::feed_in_logic(shared_ptr<Logic> logic)
 
 void Session::feed_in_analog(shared_ptr<Analog> analog)
 {
 
 void Session::feed_in_analog(shared_ptr<Analog> analog)
 {

+       if (analog->num_samples() == 0) {
+               qDebug() << "WARNING: Received analog packet with 0 samples.";
+               return;
+       }
+

        if (!cur_samplerate_)
                cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);
 
        if (!cur_samplerate_)
                cur_samplerate_ = device_->read_config<uint64_t>(ConfigKey::SAMPLERATE);