Session: Renamed pv::SigSession to Session

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index a43b575a989446ede299f6b56662c7369d4c33ce..f9aa81dfdc4e7bc2e4e843543091709821d96a0a 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -95,6 +95,21 @@ MainWindow::MainWindow(DeviceManager &device_manager,
        }
 }
 
+void MainWindow::run_stop()
+{
+       switch(session_.get_capture_state()) {
+       case Session::Stopped:
+               session_.start_capture([&](QString message) {
+                       session_error("Capture failed", message); });
+               break;
+
+       case Session::AwaitingTrigger:
+       case Session::Running:
+               session_.stop_capture();
+               break;
+       }
+}
+
 void MainWindow::setup_ui()
 {
        setObjectName(QString::fromUtf8("MainWindow"));
@@ -255,13 +270,11 @@ void MainWindow::setup_ui()
        addToolBar(toolbar);
 
        // Setup the sampling bar
-       sampling_bar_ = new toolbars::SamplingBar(session_, 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(run_stop()), this,
-               SLOT(run_stop()));
        addToolBar(sampling_bar_);
 
        // Set the title
@@ -270,6 +283,8 @@ void MainWindow::setup_ui()
        // Setup session_ events
        connect(&session_, SIGNAL(capture_state_changed(int)), this,
                SLOT(capture_state_changed(int)));
+       connect(&session_, SIGNAL(device_selected()), this,
+               SLOT(device_selected()));
 }
 
 void MainWindow::save_ui_settings()
@@ -539,24 +554,20 @@ void MainWindow::add_decoder(srd_decoder *decoder)
 #endif
 }
 
-void MainWindow::run_stop()
+void MainWindow::capture_state_changed(int state)
 {
-       switch(session_.get_capture_state()) {
-       case SigSession::Stopped:
-               session_.start_capture([&](QString message) {
-                       session_error("Capture failed", message); });
-               break;
-
-       case SigSession::AwaitingTrigger:
-       case SigSession::Running:
-               session_.stop_capture();
-               break;
-       }
+       sampling_bar_->set_capture_state((pv::Session::capture_state)state);
 }
 
-void MainWindow::capture_state_changed(int state)
+void MainWindow::device_selected()
 {
-       sampling_bar_->set_capture_state((pv::SigSession::capture_state)state);
+       // Set the title to include the device/file name
+       const shared_ptr<sigrok::Device> device = session_.device();
+       if (!device)
+               return;
+
+       const string display_name = device_manager_.get_display_name(device);
+       setWindowTitle(tr("%1 - PulseView").arg(display_name.c_str()));
 }
 
 } // namespace pv