X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=ba232e25d0cb5afae12d5bb3f80a09f6b2fe3714;hp=b916999fb9bd2a1fcfd2c691f5aa89a6081f15ba;hb=6e3f046e779b939efebdfa4d9e68fe28d9beee59;hpb=1d43d7677a7ead4ee6e1da49d87a1848b45ef75d

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index b916999f..ba232e25 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -18,9 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifdef ENABLE_SIGROKDECODE
 #include <libsigrokdecode/libsigrokdecode.h>
-#endif
 
 #include <boost/bind.hpp>
 #include <boost/foreach.hpp>
@@ -41,6 +39,8 @@
 #include "devicemanager.h"
 #include "dialogs/about.h"
 #include "dialogs/connect.h"
+#include "dialogs/decoder.h"
+#include "toolbars/contextbar.h"
 #include "toolbars/samplingbar.h"
 #include "view/view.h"
 
@@ -52,16 +52,22 @@
 #include <glib.h>
 #include <libsigrok/libsigrok.h>
 
+using namespace boost;
 using namespace std;
 
 namespace pv {
 
+namespace view {
+class SelectableItem;
+}
+
 MainWindow::MainWindow(DeviceManager &device_manager,
 	const char *open_file_name,
 	QWidget *parent) :
 	QMainWindow(parent),
 	_device_manager(device_manager),
-	_session(device_manager)
+	_session(device_manager),
+	_decoders_add_mapper(this)
 {
 	setup_ui();
 	if (open_file_name) {
@@ -92,6 +98,9 @@ void MainWindow::setup_ui()
 	setCentralWidget(_central_widget);
 
 	_view = new pv::view::View(_session, this);
+	connect(_view, SIGNAL(selection_changed()), this,
+		SLOT(view_selection_changed()));
+
 	_vertical_layout->addWidget(_view);
 
 	// Setup the menu bar
@@ -166,6 +175,20 @@ void MainWindow::setup_ui()
 		"MainWindow", "Show &Cursors", 0, QApplication::UnicodeUTF8));
 	_menu_view->addAction(_action_view_show_cursors);
 
+	// Decoders Menu
+	_menu_decoders = new QMenu(_menu_bar);
+	_menu_decoders->setTitle(QApplication::translate(
+		"MainWindow", "&Decoders", 0, QApplication::UnicodeUTF8));
+
+	_menu_decoders_add = new QMenu(_menu_decoders);
+	_menu_decoders_add->setTitle(QApplication::translate(
+		"MainWindow", "&Add", 0, QApplication::UnicodeUTF8));
+	setup_add_decoders(_menu_decoders_add);
+
+	_menu_decoders->addMenu(_menu_decoders_add);
+	connect(&_decoders_add_mapper, SIGNAL(mapped(QObject*)),
+		this, SLOT(add_decoder(QObject*)));
+
 	// Help Menu
 	_menu_help = new QMenu(_menu_bar);
 	_menu_help->setTitle(QApplication::translate(
@@ -179,6 +202,7 @@ void MainWindow::setup_ui()
 
 	_menu_bar->addAction(_menu_file->menuAction());
 	_menu_bar->addAction(_menu_view->menuAction());
+	_menu_bar->addAction(_menu_decoders->menuAction());
 	_menu_bar->addAction(_menu_help->menuAction());
 
 	setMenuBar(_menu_bar);
@@ -204,6 +228,10 @@ void MainWindow::setup_ui()
 		SLOT(run_stop()));
 	addToolBar(_sampling_bar);
 
+	// Setup the context bar
+	_context_bar = new toolbars::ContextBar(this);
+	addToolBar(_context_bar);
+
 	// Set the title
 	setWindowTitle(QApplication::translate("MainWindow", "PulseView", 0,
 		QApplication::UnicodeUTF8));
@@ -267,6 +295,28 @@ void MainWindow::show_session_error(
 	msg.exec();
 }
 
+gint MainWindow::decoder_name_cmp(gconstpointer a, gconstpointer b)
+{
+	return strcmp(((const srd_decoder*)a)->name,
+		((const srd_decoder*)b)->name);
+}
+
+void MainWindow::setup_add_decoders(QMenu *parent)
+{
+	GSList *l = g_slist_sort(g_slist_copy(
+		(GSList*)srd_decoder_list()), decoder_name_cmp);
+	for(; l; l = l->next)
+	{
+		QAction *const action = parent->addAction(QString(
+			((srd_decoder*)l->data)->name));
+		action->setData(qVariantFromValue(l->data));
+		_decoders_add_mapper.setMapping(action, action);
+		connect(action, SIGNAL(triggered()),
+			&_decoders_add_mapper, SLOT(map()));
+	}
+	g_slist_free(l);
+}
+
 void MainWindow::on_actionOpen_triggered()
 {
 	// Enumerate the file formats
@@ -332,6 +382,28 @@ void MainWindow::device_selected()
 	_session.set_device(_sampling_bar->get_selected_device());
 }
 
+void MainWindow::add_decoder(QObject *action)
+{
+	assert(action);
+	srd_decoder *const dec =
+		(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);
+}
+
 void MainWindow::run_stop()
 {
 	switch(_session.get_capture_state()) {
@@ -341,6 +413,7 @@ void MainWindow::run_stop()
 				QString("Capture failed"), _1));
 		break;
 
+	case SigSession::AwaitingTrigger:
 	case SigSession::Running:
 		_session.stop_capture();
 		break;
@@ -349,7 +422,16 @@ void MainWindow::run_stop()
 
 void MainWindow::capture_state_changed(int state)
 {
-	_sampling_bar->set_sampling(state != SigSession::Stopped);
+	_sampling_bar->set_capture_state((pv::SigSession::capture_state)state);
+}
+
+void MainWindow::view_selection_changed()
+{
+	assert(_context_bar);
+
+	const list<weak_ptr<pv::view::SelectableItem> > items(
+		_view->selected_items());
+	_context_bar->set_selected_items(items);
 }
 
 } // namespace pv