Added palette of colours for different decode annotation types

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 9873541dd5dbe4dc24aea9be777a949cc15c0e96..dc5f981f7b3a5207ab0bc777e1656e292d12784b 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -388,8 +388,19 @@ void MainWindow::add_decoder(QObject *action)
                (srd_decoder*)((QAction*)action)->data().value<void*>();
        assert(dec);
 
-       dialogs::Decoder dlg(this);
-       dlg.exec();
+       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);
 }
 
 void MainWindow::run_stop()