Make sigrokdecode a non-optional dependancy

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 7320bf1aa740a488fe014d6e10aac2ba66621aab..5fe4ccb6cfb63cce767ef5bbb142d99216503528 100644 (file)
--- 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,7 @@
 #include "devicemanager.h"
 #include "dialogs/about.h"
 #include "dialogs/connect.h"
+#include "toolbars/contextbar.h"
 #include "toolbars/samplingbar.h"
 #include "view/view.h"
 
@@ -52,10 +51,15 @@
 #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) :
@@ -92,6 +96,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
@@ -204,6 +211,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));
@@ -269,9 +280,13 @@ void MainWindow::show_session_error(
 
 void MainWindow::on_actionOpen_triggered()
 {
+       // Enumerate the file formats
+       QString filters(tr("Sigrok Sessions (*.sr)"));
+       filters.append(tr(";;All Files (*.*)"));
+
+       // Show the dialog
        const QString file_name = QFileDialog::getOpenFileName(
-               this, tr("Open File"), "",
-               tr("Sigrok Sessions (*.sr)"));
+               this, tr("Open File"), "", filters);
        if (!file_name.isEmpty())
                load_file(file_name);
 }
@@ -337,6 +352,7 @@ void MainWindow::run_stop()
                                QString("Capture failed"), _1));
                break;
 
+       case SigSession::AwaitingTrigger:
        case SigSession::Running:
                _session.stop_capture();
                break;
@@ -345,7 +361,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