Probes popup now live applies properly

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 97103ad514724278debbcb3588c585c8534331b5..f7b8612054ff058997a8cd0f2cd3f75b8310f5a0 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -214,13 +214,11 @@ void MainWindow::setup_ui()
        addToolBar(_toolbar);
 
        // Setup the sampling bar
        addToolBar(_toolbar);
 
        // Setup the sampling bar

-       _sampling_bar = new toolbars::SamplingBar(this);
+       _sampling_bar = new toolbars::SamplingBar(_session, this);

 
        // Populate the device list and select the initially selected device
        update_device_list();
 
 
        // Populate the device list and select the initially selected device
        update_device_list();
 

-       connect(_sampling_bar, SIGNAL(device_selected()), this,
-               SLOT(device_selected()));

        connect(_sampling_bar, SIGNAL(run_stop()), this,
                SLOT(run_stop()));
        addToolBar(_sampling_bar);
        connect(_sampling_bar, SIGNAL(run_stop()), this,
                SLOT(run_stop()));
        addToolBar(_sampling_bar);


@@ -370,11 +368,6 @@ void MainWindow::on_actionAbout_triggered()
        dlg.exec();
 }
 
        dlg.exec();
 }
 

-void MainWindow::device_selected()
-{
-       _session.set_device(_sampling_bar->get_selected_device());
-}
-

 void MainWindow::add_decoder(QObject *action)
 {
        assert(action);
 void MainWindow::add_decoder(QObject *action)
 {
        assert(action);