Sampling bar now commits the sample rate into the device instance

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 6b0fa676303052cb9478f2e1f4eaff7abd3a1bbf..99e545681e71a3a71042dd30c56818606629e24d 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -46,10 +46,17 @@
 
 namespace pv {
 
 
 namespace pv {
 

-MainWindow::MainWindow(QWidget *parent) :
+MainWindow::MainWindow(const char *open_file_name,
+       QWidget *parent) :

        QMainWindow(parent)
 {
        setup_ui();
        QMainWindow(parent)
 {
        setup_ui();

+       if (open_file_name) {
+               const QString s(QString::fromUtf8(open_file_name));
+               QMetaObject::invokeMethod(this, "load_file",
+                       Qt::QueuedConnection,
+                       Q_ARG(QString, s));
+       }

 }
 
 void MainWindow::setup_ui()
 }
 
 void MainWindow::setup_ui()


@@ -175,12 +182,17 @@ void MainWindow::setup_ui()
 
 }
 
 
 }
 

+void MainWindow::load_file(QString file_name)
+{
+       _session.load_file(file_name.toStdString());
+}
+

 void MainWindow::on_actionOpen_triggered()
 {
 void MainWindow::on_actionOpen_triggered()
 {

-       QString file_name = QFileDialog::getOpenFileName(
+       const QString file_name = QFileDialog::getOpenFileName(

                this, tr("Open File"), "",
                tr("Sigrok Sessions (*.sr)"));
                this, tr("Open File"), "",
                tr("Sigrok Sessions (*.sr)"));

-       _session.load_file(file_name.toStdString());
+       load_file(file_name);

 }
 
 void MainWindow::on_actionQuit_triggered()
 }
 
 void MainWindow::on_actionQuit_triggered()


@@ -216,8 +228,7 @@ void MainWindow::run_stop()
        case SigSession::Stopped:
                _session.start_capture(
                        _sampling_bar->get_selected_device(),
        case SigSession::Stopped:
                _session.start_capture(
                        _sampling_bar->get_selected_device(),

-                       _sampling_bar->get_record_length(),
-                       _sampling_bar->get_sample_rate());
+                       _sampling_bar->get_record_length());

                break;
 
        case SigSession::Running:
                break;
 
        case SigSession::Running: