X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=e1073144f7f97ca931b4733b27eead0dad3afaa0;hp=22e4e80e10f6a2ad3b803abcedfd4a88f5500bec;hb=efdec55aec1a137460fa362a381ed1904182bfed;hpb=3231fbf9374113d07d3d544a4822ae46032062a2 diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index 22e4e80..e107314 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -14,8 +14,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * along with this program; if not, see . */ #include @@ -44,6 +43,7 @@ #include "dialogs/about.hpp" #include "toolbars/mainbar.hpp" #include "view/view.hpp" +#include "views/trace/standardbar.hpp" #include #include @@ -87,7 +87,7 @@ MainWindow::MainWindow(DeviceManager &device_manager, if (!open_file_name.empty()) { shared_ptr session = add_session(); - session->main_bar()->load_init_file(open_file_name, open_file_format); + session->load_init_file(open_file_name, open_file_format); } // Add empty default session if there aren't any sessions @@ -107,8 +107,7 @@ MainWindow::MainWindow(DeviceManager &device_manager, } // ...and if there isn't any, just use demo then - session->main_bar()->select_device(other_device ? - other_device : demo_device); + session->select_device(other_device ? other_device : demo_device); } } @@ -161,7 +160,7 @@ shared_ptr MainWindow::get_active_view() const shared_ptr MainWindow::add_view(const QString &title, views::ViewType type, Session &session) { - QMainWindow *main_window; + QMainWindow *main_window = nullptr; for (auto entry : session_windows_) if (entry.first.get() == &session) main_window = entry.second; @@ -205,17 +204,23 @@ shared_ptr MainWindow::add_view(const QString &title, shared_ptr main_bar = session.main_bar(); if (!main_bar) { - main_bar = make_shared(session, *this); + /* Initial view, create the main bar */ + main_bar = make_shared(session, this, v.get()); dock_main->addToolBar(main_bar.get()); session.set_main_bar(main_bar); connect(main_bar.get(), SIGNAL(new_view(Session*)), this, SLOT(on_new_view(Session*))); - } - main_bar->action_view_show_cursors()->setChecked(v->cursors_shown()); - connect(v.get(), SIGNAL(always_zoom_to_fit_changed(bool)), - main_bar.get(), SLOT(on_always_zoom_to_fit_changed(bool))); + main_bar->action_view_show_cursors()->setChecked(v->cursors_shown()); + } else { + /* Additional view, create a standard bar */ + pv::views::trace::StandardBar *standard_bar = + new pv::views::trace::StandardBar(session, this, v.get()); + dock_main->addToolBar(standard_bar); + + standard_bar->action_view_show_cursors()->setChecked(v->cursors_shown()); + } } return v; @@ -247,6 +252,7 @@ shared_ptr MainWindow::add_session() int index = session_selector_.addTab(window, name); session_selector_.setCurrentIndex(index); + last_focused_session_ = session; window->setDockNestingEnabled(true); @@ -273,8 +279,9 @@ void MainWindow::remove_session(shared_ptr session) // that Qt keeps a pointer to the view around entry.second->setParent(0); - // Remove this entry from the container + // Remove this entry from the container and stop iterating. view_docks_.erase(entry.first); + break; } } @@ -283,6 +290,9 @@ void MainWindow::remove_session(shared_ptr session) session_windows_.erase(session); + if (last_focused_session_ == session) + last_focused_session_.reset(); + sessions_.remove_if([&](shared_ptr s) { return s == session; }); @@ -326,26 +336,42 @@ void MainWindow::setup_ui() action_view_coloured_bg_->setShortcut(QKeySequence(Qt::Key_B)); action_view_coloured_bg_->setObjectName( QString::fromUtf8("actionViewColouredBg")); - action_view_coloured_bg_->setText(tr("Use &coloured backgrounds")); + action_view_coloured_bg_->setText(tr("Use &Coloured Backgrounds")); action_about_->setObjectName(QString::fromUtf8("actionAbout")); - action_about_->setText(tr("&About...")); + action_about_->setToolTip(tr("&About...")); // Set up the tab area new_session_button_ = new QToolButton(); new_session_button_->setIcon(QIcon::fromTheme("document-new", QIcon(":/icons/document-new.png"))); + new_session_button_->setToolTip(tr("Create New Session")); new_session_button_->setAutoRaise(true); run_stop_button_ = new QToolButton(); run_stop_button_->setAutoRaise(true); run_stop_button_->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); run_stop_button_->setShortcut(QKeySequence(Qt::Key_Space)); + run_stop_button_->setToolTip(tr("Start/Stop Acquisition")); + + settings_button_ = new QToolButton(); + settings_button_->setIcon(QIcon::fromTheme("configure", + QIcon(":/icons/configure.png"))); + settings_button_->setToolTip(tr("Settings")); + settings_button_->setAutoRaise(true); + + QFrame *separator1 = new QFrame(); + separator1->setFrameStyle(QFrame::VLine | QFrame::Raised); + QFrame *separator2 = new QFrame(); + separator2->setFrameStyle(QFrame::VLine | QFrame::Raised); QHBoxLayout* layout = new QHBoxLayout(); layout->setContentsMargins(2, 2, 2, 2); layout->addWidget(new_session_button_); + layout->addWidget(separator1); layout->addWidget(run_stop_button_); + layout->addWidget(separator2); + layout->addWidget(settings_button_); static_tab_widget_ = new QWidget(); static_tab_widget_->setLayout(layout); @@ -487,14 +513,12 @@ void MainWindow::on_add_view(const QString &title, views::ViewType type, void MainWindow::on_focus_changed() { - static shared_ptr prev_session; - shared_ptr view = get_active_view(); if (view) { for (shared_ptr session : sessions_) { if (session->has_view(view)) { - if (session != prev_session) { + if (session != last_focused_session_) { // Activate correct tab if necessary shared_ptr tab_session = get_tab_session( session_selector_.currentIndex()); @@ -505,7 +529,6 @@ void MainWindow::on_focus_changed() on_focused_session_changed(session); } - prev_session = session; break; } } @@ -517,6 +540,8 @@ void MainWindow::on_focus_changed() void MainWindow::on_focused_session_changed(shared_ptr session) { + last_focused_session_ = session; + setWindowTitle(session->name() + " - " + WindowTitle); // Update the state of the run/stop button, too @@ -530,16 +555,19 @@ void MainWindow::on_new_session_clicked() void MainWindow::on_run_stop_clicked() { - Session &session = get_active_view()->session(); + shared_ptr session = last_focused_session_; + + if (!session) + return; - switch (session.get_capture_state()) { + switch (session->get_capture_state()) { case Session::Stopped: - session.start_capture([&](QString message) { + session->start_capture([&](QString message) { session_error("Capture failed", message); }); break; case Session::AwaitingTrigger: case Session::Running: - session.stop_capture(); + session->stop_capture(); break; } } @@ -559,10 +587,16 @@ void MainWindow::on_session_name_changed() } } - // Refresh window title if the affected session has focus - shared_ptr view = get_active_view(); + // Update the tab widget by finding the main window and the tab from that + for (auto entry : session_windows_) + if (entry.first.get() == session) { + QMainWindow *window = entry.second; + const int index = session_selector_.indexOf(window); + session_selector_.setTabText(index, session->name()); + } - if (view && session->has_view(view)) + // Refresh window title if the affected session has focus + if (session == last_focused_session_.get()) setWindowTitle(session->name() + " - " + WindowTitle); } @@ -572,12 +606,8 @@ void MainWindow::on_capture_state_changed(QObject *obj) // Ignore if caller is not the currently focused session // unless there is only one session - if (sessions_.size() > 1) { - Session &focused_session = get_active_view()->session(); - - if (caller != &focused_session) - return; - } + if ((sessions_.size() > 1) && (caller != last_focused_session_.get())) + return; int state = caller->get_capture_state();