X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=e1f831408a54385d7b12da34999e92a6f6956e2d;hb=b93295580db08d9008b9c9e49a3a3a86ef562f14;hp=97103ad514724278debbcb3588c585c8534331b5;hpb=03ce95a9bb81c05bae0da9de189d280214db67c3;p=pulseview.git

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 97103ad5..e1f83140 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -39,8 +39,8 @@
 #include "devicemanager.h"
 #include "dialogs/about.h"
 #include "dialogs/connect.h"
-#include "dialogs/decoder.h"
 #include "toolbars/samplingbar.h"
+#include "view/logicsignal.h"
 #include "view/view.h"
 
 /* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */
@@ -214,13 +214,11 @@ void MainWindow::setup_ui()
 	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();
 
-	connect(_sampling_bar, SIGNAL(device_selected()), this,
-		SLOT(device_selected()));
 	connect(_sampling_bar, SIGNAL(run_stop()), this,
 		SLOT(run_stop()));
 	addToolBar(_sampling_bar);
@@ -370,11 +368,6 @@ void MainWindow::on_actionAbout_triggered()
 	dlg.exec();
 }
 
-void MainWindow::device_selected()
-{
-	_session.set_device(_sampling_bar->get_selected_device());
-}
-
 void MainWindow::add_decoder(QObject *action)
 {
 	assert(action);
@@ -382,19 +375,7 @@ void MainWindow::add_decoder(QObject *action)
 		(srd_decoder*)((QAction*)action)->data().value<void*>();
 	assert(dec);
 
-	const std::vector< boost::shared_ptr<view::Signal> > &sigs =
-		_session.get_signals();
-
-	GHashTable *const options = g_hash_table_new_full(g_str_hash,
-		g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
-
-	dialogs::Decoder dlg(this, dec, sigs, options);
-	if(dlg.exec() != QDialog::Accepted) {
-		g_hash_table_destroy(options);
-		return;
-	}
-
-	_session.add_decoder(dec, dlg.get_probes(), options);
+	_session.add_decoder(dec);
 }
 
 void MainWindow::run_stop()