]> sigrok.org Git - pulseview.git/blobdiff - pv/mainwindow.cpp
Moved decoder config into the popup
[pulseview.git] / pv / mainwindow.cpp
index f7b8612054ff058997a8cd0f2cd3f75b8310f5a0..e1f831408a54385d7b12da34999e92a6f6956e2d 100644 (file)
@@ -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++). */
@@ -375,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()