X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=36f9b1a086f9861358f3de8028a4e37ff6e654d5;hp=59f4369e2990ca902d15d1a0c3dc5fbcaea9b560;hb=cc9646457d64b0a74e59ef511c3ae3db345bdbe4;hpb=d290e89f9b28f90b898a57c9f5e288602367cb3d diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index 59f4369e..36f9b1a0 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -27,67 +27,33 @@ #include #include -#include - #include #include -#include #include -#include -#include -#include -#include +#include +#include #include -#include -#include #include -#include - #include "mainwindow.hpp" #include "devicemanager.hpp" #include "util.hpp" -#include "data/segment.hpp" #include "devices/hardwaredevice.hpp" -#include "devices/inputfile.hpp" -#include "devices/sessionfile.hpp" #include "dialogs/about.hpp" -#include "dialogs/connect.hpp" -#include "dialogs/inputoutputoptions.hpp" -#include "dialogs/storeprogress.hpp" #include "toolbars/mainbar.hpp" -#include "view/logicsignal.hpp" #include "view/view.hpp" -#include "widgets/exportmenu.hpp" -#include "widgets/importmenu.hpp" -#ifdef ENABLE_DECODE -#include "widgets/decodermenu.hpp" -#endif -#include "widgets/hidingmenubar.hpp" -#include #include #include -#include #include -using std::cerr; -using std::endl; +using std::dynamic_pointer_cast; using std::list; using std::make_shared; using std::map; -using std::max; -using std::pair; using std::shared_ptr; using std::string; -using std::vector; - -using boost::algorithm::join; - -using sigrok::Error; -using sigrok::OutputFormat; -using sigrok::InputFormat; namespace pv { @@ -95,95 +61,56 @@ namespace view { class ViewItem; } -const char *MainWindow::SettingOpenDirectory = "MainWindow/OpenDirectory"; -const char *MainWindow::SettingSaveDirectory = "MainWindow/SaveDirectory"; +using toolbars::MainBar; + +const QString MainWindow::WindowTitle = tr("PulseView"); MainWindow::MainWindow(DeviceManager &device_manager, string open_file_name, string open_file_format, QWidget *parent) : QMainWindow(parent), device_manager_(device_manager), - session_(device_manager), - action_open_(new QAction(this)), - action_save_as_(new QAction(this)), - action_save_selection_as_(new QAction(this)), - action_connect_(new QAction(this)), - action_quit_(new QAction(this)), - action_view_zoom_in_(new QAction(this)), - action_view_zoom_out_(new QAction(this)), - action_view_zoom_fit_(new QAction(this)), - action_view_zoom_one_to_one_(new QAction(this)), + session_selector_(this), action_view_sticky_scrolling_(new QAction(this)), action_view_coloured_bg_(new QAction(this)), - action_view_show_cursors_(new QAction(this)), action_about_(new QAction(this)) -#ifdef ENABLE_DECODE - , menu_decoders_add_(new pv::widgets::DecoderMenu(this, true)) -#endif { qRegisterMetaType("util::Timestamp"); setup_ui(); restore_ui_settings(); - if (open_file_name.empty()) - select_init_device(); - else - load_init_file(open_file_name, open_file_format); -} -MainWindow::~MainWindow() -{ - for (auto entry : view_docks_) { - const std::shared_ptr dock = entry.first; - dock->setWidget(0); - const std::shared_ptr view = entry.second; - session_.deregister_view(view); + if (!open_file_name.empty()) { + shared_ptr session = add_session(); + session->main_bar()->load_init_file(open_file_name, open_file_format); } -} - -QAction* MainWindow::action_open() const -{ - return action_open_; -} - -QAction* MainWindow::action_save_as() const -{ - return action_save_as_; -} - -QAction* MainWindow::action_save_selection_as() const -{ - return action_save_selection_as_; -} -QAction* MainWindow::action_connect() const -{ - return action_connect_; -} - -QAction* MainWindow::action_quit() const -{ - return action_quit_; -} + // Add empty default session if there aren't any sessions + if (sessions_.size() == 0) { + shared_ptr session = add_session(); -QAction* MainWindow::action_view_zoom_in() const -{ - return action_view_zoom_in_; -} + map dev_info; + shared_ptr other_device, demo_device; -QAction* MainWindow::action_view_zoom_out() const -{ - return action_view_zoom_out_; -} + // Use any available device that's not demo + for (shared_ptr dev : device_manager_.devices()) { + if (dev->hardware_device()->driver()->name() == "demo") { + demo_device = dev; + } else { + other_device = dev; + } + } -QAction* MainWindow::action_view_zoom_fit() const -{ - return action_view_zoom_fit_; + // ...and if there isn't any, just use demo then + session->main_bar()->select_device(other_device ? + other_device : demo_device); + } } -QAction* MainWindow::action_view_zoom_one_to_one() const +MainWindow::~MainWindow() { - return action_view_zoom_one_to_one_; + while (!sessions_.empty()) + remove_session(sessions_.front()); } QAction* MainWindow::action_view_sticky_scrolling() const @@ -196,24 +123,12 @@ QAction* MainWindow::action_view_coloured_bg() const return action_view_coloured_bg_; } -QAction* MainWindow::action_view_show_cursors() const -{ - return action_view_show_cursors_; -} - QAction* MainWindow::action_about() const { return action_about_; } -#ifdef ENABLE_DECODE -QMenu* MainWindow::menu_decoder_add() const -{ - return menu_decoders_add_; -} -#endif - -shared_ptr MainWindow::get_active_view() const +shared_ptr MainWindow::get_active_view() const { // If there's only one view, use it... if (view_docks_.size() == 1) @@ -232,324 +147,169 @@ shared_ptr MainWindow::get_active_view() const // Get the view contained in the dock widget for (auto entry : view_docks_) - if (entry.first.get() == dock) + if (entry.first == dock) return entry.second; - return shared_ptr(); + return nullptr; } -shared_ptr MainWindow::add_view(const QString &title, - view::ViewType type, Session &session) +shared_ptr MainWindow::add_view(const QString &title, + views::ViewType type, Session &session) { - shared_ptr v; + QMainWindow *main_window; + for (auto entry : session_windows_) + if (entry.first.get() == &session) + main_window = entry.second; - if (type == pv::view::TraceView) - v = make_shared(session, this); + assert(main_window); - if (v) { - shared_ptr dock = make_shared(title, this); - dock->setWidget(v.get()); + if (type == views::ViewTypeTrace) { + QDockWidget* dock = new QDockWidget(title, main_window); dock->setObjectName(title); - addDockWidget(Qt::TopDockWidgetArea, dock.get()); + main_window->addDockWidget(Qt::TopDockWidgetArea, dock); + + // Insert a QMainWindow into the dock widget to allow for a tool bar + QMainWindow *dock_main = new QMainWindow(dock); + dock_main->setWindowFlags(Qt::Widget); // Remove Qt::Window flag + + shared_ptr v = + make_shared(session, dock_main); view_docks_[dock] = v; + session.register_view(v); + + dock_main->setCentralWidget(v.get()); + dock->setWidget(dock_main); dock->setFeatures(QDockWidget::DockWidgetMovable | - QDockWidget::DockWidgetFloatable); + QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable); - if (type == view::TraceView) { - connect(&session, SIGNAL(trigger_event(util::Timestamp)), v.get(), + QAbstractButton *close_btn = + dock->findChildren + ("qt_dockwidget_closebutton").front(); + + connect(close_btn, SIGNAL(clicked(bool)), + this, SLOT(on_view_close_clicked())); + + if (type == views::ViewTypeTrace) { + connect(&session, SIGNAL(trigger_event(util::Timestamp)), + qobject_cast(v.get()), SLOT(trigger_event(util::Timestamp))); - connect(v.get(), SIGNAL(sticky_scrolling_changed(bool)), this, - SLOT(sticky_scrolling_changed(bool))); - connect(v.get(), SIGNAL(always_zoom_to_fit_changed(bool)), this, - SLOT(always_zoom_to_fit_changed(bool))); v->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked()); v->enable_coloured_bg(action_view_coloured_bg_->isChecked()); - action_view_show_cursors_->setChecked(v->cursors_shown()); + + shared_ptr main_bar = session.main_bar(); + if (!main_bar) { + main_bar = make_shared(session, *this); + 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))); } - session.register_view(v); + return v; } - return v; + return nullptr; } -void MainWindow::run_stop() +shared_ptr MainWindow::add_session() { - 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; - } -} + static int last_session_id = 1; + QString name = tr("Untitled-%1").arg(last_session_id++); -void MainWindow::select_device(shared_ptr device) -{ - try { - if (device) - session_.set_device(device); - else - session_.set_default_device(); - } catch (const QString &e) { - QMessageBox msg(this); - msg.setText(e); - msg.setInformativeText(tr("Failed to Select Device")); - msg.setStandardButtons(QMessageBox::Ok); - msg.setIcon(QMessageBox::Warning); - msg.exec(); - } -} + shared_ptr session = make_shared(device_manager_, name); -void MainWindow::export_file(shared_ptr format, - bool selection_only) -{ - using pv::dialogs::StoreProgress; - - // Make sure there's a view selected to pull the data from - shared_ptr view = get_active_view(); - if (!view) { - show_session_error(tr("No View Selected"), tr("Please click on the " \ - "view whose data you want to save and try again.")); - return; - } + connect(session.get(), SIGNAL(add_view(const QString&, views::ViewType, Session*)), + this, SLOT(on_add_view(const QString&, views::ViewType, Session*))); + connect(session.get(), SIGNAL(name_changed()), + this, SLOT(on_session_name_changed())); - // Stop any currently running capture session - session_.stop_capture(); + sessions_.push_back(session); - QSettings settings; - const QString dir = settings.value(SettingSaveDirectory).toString(); + QMainWindow *window = new QMainWindow(); + window->setWindowFlags(Qt::Widget); // Remove Qt::Window flag + session_windows_[session] = window; + session_selector_.addTab(window, name); - std::pair sample_range; + window->setDockNestingEnabled(true); - // Selection only? Verify that the cursors are active and fetch their values - if (selection_only) { - if (!view->cursors()->enabled()) { - show_session_error(tr("Missing Cursors"), tr("You need to set the " \ - "cursors before you can save the data enclosed by them " \ - "to a session file (e.g. using ALT-V - Show Cursors).")); - return; - } + shared_ptr main_view = + add_view(name, views::ViewTypeTrace, *session); - const double samplerate = session_.get_samplerate(); + return session; +} - const pv::util::Timestamp& start_time = view->cursors()->first()->time(); - const pv::util::Timestamp& end_time = view->cursors()->second()->time(); +void MainWindow::remove_session(shared_ptr session) +{ + int h = new_session_button_->height(); - const uint64_t start_sample = - std::max((double)0, start_time.convert_to() * samplerate); - const uint64_t end_sample = end_time.convert_to() * samplerate; + for (shared_ptr view : session->views()) { + // Find the dock the view is contained in and remove it + for (auto entry : view_docks_) + if (entry.second == view) { + // Remove the view from the session + session->deregister_view(view); - sample_range = std::make_pair(start_sample, end_sample); - } else { - sample_range = std::make_pair(0, 0); - } + // Remove the view from its parent; otherwise, Qt will + // call deleteLater() on it, which causes a double free + // since the shared_ptr in view_docks_ doesn't know + // that Qt keeps a pointer to the view around + entry.second->setParent(0); - // Construct the filter - const vector exts = format->extensions(); - QString filter = tr("%1 files ").arg( - QString::fromStdString(format->description())); - - if (exts.empty()) - filter += "(*.*)"; - else - filter += QString("(*.%1);;%2 (*.*)").arg( - QString::fromStdString(join(exts, ", *.")), - tr("All Files")); - - // Show the file dialog - const QString file_name = QFileDialog::getSaveFileName( - this, tr("Save File"), dir, filter); - - if (file_name.isEmpty()) - return; - - const QString abs_path = QFileInfo(file_name).absolutePath(); - settings.setValue(SettingSaveDirectory, abs_path); - - // Show the options dialog - map options; - if (!format->options().empty()) { - dialogs::InputOutputOptions dlg( - tr("Export %1").arg(QString::fromStdString( - format->description())), - format->options(), this); - if (!dlg.exec()) - return; - options = dlg.options(); + // Remove this entry from the container + view_docks_.erase(entry.first); + } } - StoreProgress *dlg = new StoreProgress(file_name, format, options, - sample_range, session_, this); - dlg->run(); -} + QMainWindow *window = session_windows_.at(session); + session_selector_.removeTab(session_selector_.indexOf(window)); -void MainWindow::import_file(shared_ptr format) -{ - assert(format); + session_windows_.erase(session); - QSettings settings; - const QString dir = settings.value(SettingOpenDirectory).toString(); - - // Construct the filter - const vector exts = format->extensions(); - const QString filter = exts.empty() ? "" : - tr("%1 files (*.%2)").arg( - QString::fromStdString(format->description()), - QString::fromStdString(join(exts, ", *."))); - - // Show the file dialog - const QString file_name = QFileDialog::getOpenFileName( - this, tr("Import File"), dir, tr( - "%1 files (*.*);;All Files (*.*)").arg( - QString::fromStdString(format->description()))); - - if (file_name.isEmpty()) - return; - - // Show the options dialog - map options; - if (!format->options().empty()) { - dialogs::InputOutputOptions dlg( - tr("Import %1").arg(QString::fromStdString( - format->description())), - format->options(), this); - if (!dlg.exec()) - return; - options = dlg.options(); - } + sessions_.remove_if([&](shared_ptr s) { + return s == session; }); + + if (sessions_.empty()) { + // When there are no more tabs, the height of the QTabWidget + // drops to zero. We must prevent this to keep the static + // widgets visible + for (QWidget *w : static_tab_widget_->findChildren()) + w->setMinimumHeight(h); - load_file(file_name, format, options); + int margin = static_tab_widget_->layout()->contentsMargins().bottom(); + static_tab_widget_->setMinimumHeight(h + 2 * margin); + session_selector_.setMinimumHeight(h + 2 * margin); - const QString abs_path = QFileInfo(file_name).absolutePath(); - settings.setValue(SettingOpenDirectory, abs_path); + // Update the window title if there is no view left to + // generate focus change events + setWindowTitle(WindowTitle); + } } void MainWindow::setup_ui() { setObjectName(QString::fromUtf8("MainWindow")); + setCentralWidget(&session_selector_); + // Set the window icon QIcon icon; icon.addFile(QString(":/icons/sigrok-logo-notext.png")); setWindowIcon(icon); - // Setup the menu bar - pv::widgets::HidingMenuBar *const menu_bar = - new pv::widgets::HidingMenuBar(this); - - // File Menu - QMenu *const menu_file = new QMenu; - menu_file->setTitle(tr("&File")); - - action_open_->setText(tr("&Open...")); - action_open_->setIcon(QIcon::fromTheme("document-open", - QIcon(":/icons/document-open.png"))); - action_open_->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_O)); - action_open_->setObjectName(QString::fromUtf8("actionOpen")); - menu_file->addAction(action_open_); - - action_save_as_->setText(tr("&Save As...")); - action_save_as_->setIcon(QIcon::fromTheme("document-save-as", - QIcon(":/icons/document-save-as.png"))); - action_save_as_->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_S)); - action_save_as_->setObjectName(QString::fromUtf8("actionSaveAs")); - menu_file->addAction(action_save_as_); - - action_save_selection_as_->setText(tr("Save Selected &Range As...")); - action_save_selection_as_->setIcon(QIcon::fromTheme("document-save-as", - QIcon(":/icons/document-save-as.png"))); - action_save_selection_as_->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_R)); - action_save_selection_as_->setObjectName(QString::fromUtf8("actionSaveSelectionAs")); - menu_file->addAction(action_save_selection_as_); - - menu_file->addSeparator(); - - widgets::ExportMenu *menu_file_export = new widgets::ExportMenu(this, - device_manager_.context()); - menu_file_export->setTitle(tr("&Export")); - connect(menu_file_export, - SIGNAL(format_selected(std::shared_ptr)), - this, SLOT(export_file(std::shared_ptr))); - menu_file->addAction(menu_file_export->menuAction()); - - widgets::ImportMenu *menu_file_import = new widgets::ImportMenu(this, - device_manager_.context()); - menu_file_import->setTitle(tr("&Import")); - connect(menu_file_import, - SIGNAL(format_selected(std::shared_ptr)), - this, SLOT(import_file(std::shared_ptr))); - menu_file->addAction(menu_file_import->menuAction()); - - menu_file->addSeparator(); - - action_connect_->setText(tr("&Connect to Device...")); - action_connect_->setObjectName(QString::fromUtf8("actionConnect")); - menu_file->addAction(action_connect_); - - menu_file->addSeparator(); - - action_quit_->setText(tr("&Quit")); - action_quit_->setIcon(QIcon::fromTheme("application-exit", - QIcon(":/icons/application-exit.png"))); - action_quit_->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q)); - action_quit_->setObjectName(QString::fromUtf8("actionQuit")); - menu_file->addAction(action_quit_); - - // View Menu - QMenu *menu_view = new QMenu; - menu_view->setTitle(tr("&View")); - - action_view_zoom_in_->setText(tr("Zoom &In")); - action_view_zoom_in_->setIcon(QIcon::fromTheme("zoom-in", - QIcon(":/icons/zoom-in.png"))); - // simply using Qt::Key_Plus shows no + in the menu - action_view_zoom_in_->setShortcut(QKeySequence::ZoomIn); - action_view_zoom_in_->setObjectName( - QString::fromUtf8("actionViewZoomIn")); - menu_view->addAction(action_view_zoom_in_); - - action_view_zoom_out_->setText(tr("Zoom &Out")); - action_view_zoom_out_->setIcon(QIcon::fromTheme("zoom-out", - QIcon(":/icons/zoom-out.png"))); - action_view_zoom_out_->setShortcut(QKeySequence::ZoomOut); - action_view_zoom_out_->setObjectName( - QString::fromUtf8("actionViewZoomOut")); - menu_view->addAction(action_view_zoom_out_); - - action_view_zoom_fit_->setCheckable(true); - action_view_zoom_fit_->setText(tr("Zoom to &Fit")); - action_view_zoom_fit_->setIcon(QIcon::fromTheme("zoom-fit", - QIcon(":/icons/zoom-fit.png"))); - action_view_zoom_fit_->setShortcut(QKeySequence(Qt::Key_F)); - action_view_zoom_fit_->setObjectName( - QString::fromUtf8("actionViewZoomFit")); - menu_view->addAction(action_view_zoom_fit_); - - action_view_zoom_one_to_one_->setText(tr("Zoom to O&ne-to-One")); - action_view_zoom_one_to_one_->setIcon(QIcon::fromTheme("zoom-original", - QIcon(":/icons/zoom-original.png"))); - action_view_zoom_one_to_one_->setShortcut(QKeySequence(Qt::Key_O)); - action_view_zoom_one_to_one_->setObjectName( - QString::fromUtf8("actionViewZoomOneToOne")); - menu_view->addAction(action_view_zoom_one_to_one_); - - menu_view->addSeparator(); - action_view_sticky_scrolling_->setCheckable(true); action_view_sticky_scrolling_->setChecked(true); action_view_sticky_scrolling_->setShortcut(QKeySequence(Qt::Key_S)); action_view_sticky_scrolling_->setObjectName( QString::fromUtf8("actionViewStickyScrolling")); action_view_sticky_scrolling_->setText(tr("&Sticky Scrolling")); - menu_view->addAction(action_view_sticky_scrolling_); - - menu_view->addSeparator(); action_view_coloured_bg_->setCheckable(true); action_view_coloured_bg_->setChecked(true); @@ -557,184 +317,75 @@ void MainWindow::setup_ui() action_view_coloured_bg_->setObjectName( QString::fromUtf8("actionViewColouredBg")); action_view_coloured_bg_->setText(tr("Use &coloured backgrounds")); - menu_view->addAction(action_view_coloured_bg_); - - menu_view->addSeparator(); - - action_view_show_cursors_->setCheckable(true); - action_view_show_cursors_->setIcon(QIcon::fromTheme("show-cursors", - QIcon(":/icons/show-cursors.svg"))); - action_view_show_cursors_->setShortcut(QKeySequence(Qt::Key_C)); - action_view_show_cursors_->setObjectName( - QString::fromUtf8("actionViewShowCursors")); - action_view_show_cursors_->setText(tr("Show &Cursors")); - menu_view->addAction(action_view_show_cursors_); - - // Decoders Menu -#ifdef ENABLE_DECODE - QMenu *const menu_decoders = new QMenu; - menu_decoders->setTitle(tr("&Decoders")); - - menu_decoders_add_->setTitle(tr("&Add")); - connect(menu_decoders_add_, SIGNAL(decoder_selected(srd_decoder*)), - this, SLOT(add_decoder(srd_decoder*))); - - menu_decoders->addMenu(menu_decoders_add_); -#endif - - // Help Menu - QMenu *const menu_help = new QMenu; - menu_help->setTitle(tr("&Help")); action_about_->setObjectName(QString::fromUtf8("actionAbout")); action_about_->setText(tr("&About...")); - menu_help->addAction(action_about_); - - menu_bar->addAction(menu_file->menuAction()); - menu_bar->addAction(menu_view->menuAction()); -#ifdef ENABLE_DECODE - menu_bar->addAction(menu_decoders->menuAction()); -#endif - menu_bar->addAction(menu_help->menuAction()); - - setMenuBar(menu_bar); - QMetaObject::connectSlotsByName(this); - - // Also add all actions to the main window for always-enabled hotkeys - for (QAction* action : menu_bar->actions()) - this->addAction(action); - - // Setup the toolbar - main_bar_ = new toolbars::MainBar(session_, *this); - - // Set up the initial view - add_view(tr("Untitled"), pv::view::TraceView, session_); - - // Populate the device list and select the initially selected device - update_device_list(); - addToolBar(main_bar_); + // 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_->setAutoRaise(true); - // Set the title - setWindowTitle(tr("PulseView")); + QHBoxLayout* layout = new QHBoxLayout(); + layout->setContentsMargins(2, 2, 2, 2); + layout->addWidget(new_session_button_); - // 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::select_init_device() -{ - QSettings settings; - map dev_info; - list key_list; - shared_ptr device; - - // Re-select last used device if possible but only if it's not demo - settings.beginGroup("Device"); - key_list.push_back("vendor"); - key_list.push_back("model"); - key_list.push_back("version"); - key_list.push_back("serial_num"); - key_list.push_back("connection_id"); - - for (string key : key_list) { - const QString k = QString::fromStdString(key); - if (!settings.contains(k)) - continue; - - const string value = settings.value(k).toString().toStdString(); - if (!value.empty()) - dev_info.insert(std::make_pair(key, value)); - } - - if (dev_info.count("model") > 0) - if (dev_info.at("model").find("Demo device") == std::string::npos) - device = device_manager_.find_device_from_info(dev_info); - - // When we can't find a device similar to the one we used last - // time and there is at least one device aside from demo, use it - if (!device) { - for (shared_ptr dev : device_manager_.devices()) { - dev_info = device_manager_.get_device_info(dev); - - if (dev_info.count("model") > 0) - if (dev_info.at("model").find("Demo device") == std::string::npos) { - device = dev; - break; - } - } - } + static_tab_widget_ = new QWidget(); + static_tab_widget_->setLayout(layout); - select_device(device); - update_device_list(); + session_selector_.setCornerWidget(static_tab_widget_, Qt::TopLeftCorner); + session_selector_.setTabsClosable(true); - settings.endGroup(); -} + connect(new_session_button_, SIGNAL(clicked(bool)), + this, SLOT(on_new_session_clicked())); -void MainWindow::load_init_file(const std::string &file_name, - const std::string &format) -{ - shared_ptr input_format; - - if (!format.empty()) { - const map > formats = - device_manager_.context()->input_formats(); - const auto iter = find_if(formats.begin(), formats.end(), - [&](const pair > f) { - return f.first == format; }); - if (iter == formats.end()) { - cerr << "Unexpected input format: " << format << endl; - return; - } + connect(&session_selector_, SIGNAL(tabCloseRequested(int)), + this, SLOT(on_tab_close_requested(int))); + connect(&session_selector_, SIGNAL(currentChanged(int)), + this, SLOT(on_tab_changed(int))); - input_format = (*iter).second; - } - load_file(QString::fromStdString(file_name), input_format); + connect(static_cast(QCoreApplication::instance()), + SIGNAL(focusChanged(QWidget*, QWidget*)), + this, SLOT(on_focus_changed())); } - void MainWindow::save_ui_settings() { QSettings settings; - - map dev_info; - list key_list; + int id = 0; settings.beginGroup("MainWindow"); settings.setValue("state", saveState()); settings.setValue("geometry", saveGeometry()); settings.endGroup(); - if (session_.device()) { - settings.beginGroup("Device"); - key_list.push_back("vendor"); - key_list.push_back("model"); - key_list.push_back("version"); - key_list.push_back("serial_num"); - key_list.push_back("connection_id"); - - dev_info = device_manager_.get_device_info( - session_.device()); - - for (string key : key_list) { - if (dev_info.count(key)) - settings.setValue(QString::fromUtf8(key.c_str()), - QString::fromUtf8(dev_info.at(key).c_str())); - else - settings.remove(QString::fromUtf8(key.c_str())); + for (shared_ptr session : sessions_) { + // Ignore sessions using the demo device or no device at all + if (session->device()) { + shared_ptr device = + dynamic_pointer_cast< devices::HardwareDevice > + (session->device()); + + if (device && + device->hardware_device()->driver()->name() == "demo") + continue; + + settings.beginGroup("Session" + QString::number(id++)); + settings.remove(""); // Remove all keys in this group + session->save_settings(settings); + settings.endGroup(); } - - settings.endGroup(); } + + settings.setValue("sessions", id); } void MainWindow::restore_ui_settings() { QSettings settings; + int i, session_count; settings.beginGroup("MainWindow"); @@ -745,51 +396,25 @@ void MainWindow::restore_ui_settings() resize(1000, 720); settings.endGroup(); -} -void MainWindow::session_error( - const QString text, const QString info_text) -{ - QMetaObject::invokeMethod(this, "show_session_error", - Qt::QueuedConnection, Q_ARG(QString, text), - Q_ARG(QString, info_text)); -} + session_count = settings.value("sessions", 0).toInt(); -void MainWindow::update_device_list() -{ - main_bar_->update_device_list(); + for (i = 0; i < session_count; i++) { + settings.beginGroup("Session" + QString::number(i)); + shared_ptr session = add_session(); + session->restore_settings(settings); + settings.endGroup(); + } } -void MainWindow::load_file(QString file_name, - std::shared_ptr format, - const std::map &options) +std::shared_ptr MainWindow::get_tab_session(int index) const { - const QString errorMessage( - QString("Failed to load file %1").arg(file_name)); - - try { - if (format) - session_.set_device(shared_ptr( - new devices::InputFile( - device_manager_.context(), - file_name.toStdString(), - format, options))); - else - session_.set_device(shared_ptr( - new devices::SessionFile( - device_manager_.context(), - file_name.toStdString()))); - } catch (Error e) { - show_session_error(tr("Failed to load ") + file_name, e.what()); - session_.set_default_device(); - update_device_list(); - return; - } - - update_device_list(); + // Find the session that belongs to the tab's main window + for (auto entry : session_windows_) + if (entry.second == session_selector_.widget(index)) + return entry.first; - session_.start_capture([&, errorMessage](QString infoMessage) { - session_error(errorMessage, infoMessage); }); + return nullptr; } void MainWindow::closeEvent(QCloseEvent *event) @@ -798,178 +423,175 @@ void MainWindow::closeEvent(QCloseEvent *event) event->accept(); } -void MainWindow::keyReleaseEvent(QKeyEvent *event) +QMenu* MainWindow::createPopupMenu() { - if (event->key() == Qt::Key_Alt) { - menuBar()->setHidden(!menuBar()->isHidden()); - menuBar()->setFocus(); - } - QMainWindow::keyReleaseEvent(event); + return nullptr; } -QMenu* MainWindow::createPopupMenu() +bool MainWindow::restoreState(const QByteArray &state, int version) { - return nullptr; + (void)state; + (void)version; + + // Do nothing. We don't want Qt to handle this, or else it + // will try to restore all the dock widgets and create havoc. + + return false; } -void MainWindow::show_session_error( - const QString text, const QString info_text) +void MainWindow::on_add_view(const QString &title, views::ViewType type, + Session *session) { - QMessageBox msg(this); - msg.setText(text); - msg.setInformativeText(info_text); - msg.setStandardButtons(QMessageBox::Ok); - msg.setIcon(QMessageBox::Warning); - msg.exec(); + // We get a pointer and need a reference + for (std::shared_ptr s : sessions_) + if (s.get() == session) + add_view(title, type, *s); } -void MainWindow::on_actionOpen_triggered() +void MainWindow::on_focus_changed() { - QSettings settings; - const QString dir = settings.value(SettingOpenDirectory).toString(); + static shared_ptr prev_session; + + shared_ptr view = get_active_view(); - // Show the dialog - const QString file_name = QFileDialog::getOpenFileName( - this, tr("Open File"), dir, tr( - "Sigrok Sessions (*.sr);;" - "All Files (*.*)")); + if (view) { + for (shared_ptr session : sessions_) { + if (session->has_view(view)) { + if (session != prev_session) { + // Activate correct tab if necessary + shared_ptr tab_session = get_tab_session( + session_selector_.currentIndex()); + if (tab_session != session) + session_selector_.setCurrentWidget( + session_windows_.at(session)); - if (!file_name.isEmpty()) { - load_file(file_name); + on_focused_session_changed(session); + } - const QString abs_path = QFileInfo(file_name).absolutePath(); - settings.setValue(SettingOpenDirectory, abs_path); + prev_session = session; + break; + } + } } + + if (sessions_.empty()) + setWindowTitle(WindowTitle); } -void MainWindow::on_actionSaveAs_triggered() +void MainWindow::on_focused_session_changed(shared_ptr session) { - export_file(device_manager_.context()->output_formats()["srzip"]); + setWindowTitle(session->name() + " - " + WindowTitle); } -void MainWindow::on_actionSaveSelectionAs_triggered() +void MainWindow::on_new_session_clicked() { - export_file(device_manager_.context()->output_formats()["srzip"], true); + add_session(); } -void MainWindow::on_actionConnect_triggered() +void MainWindow::on_session_name_changed() { - // Stop any currently running capture session - session_.stop_capture(); + // Update the corresponding dock widget's name(s) + Session *session = qobject_cast(QObject::sender()); + assert(session); - dialogs::Connect dlg(this, device_manager_); + for (shared_ptr view : session->views()) { + // Get the dock that contains the view + for (auto entry : view_docks_) + if (entry.second == view) { + entry.first->setObjectName(session->name()); + entry.first->setWindowTitle(session->name()); + } + } - // If the user selected a device, select it in the device list. Select the - // current device otherwise. - if (dlg.exec()) - select_device(dlg.get_selected_device()); + // Refresh window title if the affected session has focus + shared_ptr view = get_active_view(); - update_device_list(); + if (view && session->has_view(view)) + setWindowTitle(session->name() + " - " + WindowTitle); } -void MainWindow::on_actionQuit_triggered() +void MainWindow::on_new_view(Session *session) { - close(); + // We get a pointer and need a reference + for (std::shared_ptr s : sessions_) + if (s.get() == session) + add_view(session->name(), views::ViewTypeTrace, *s); } -void MainWindow::on_actionViewZoomIn_triggered() +void MainWindow::on_view_close_clicked() { - shared_ptr view = get_active_view(); - if (view) - view->zoom(1); -} + // Find the dock widget that contains the close button that was clicked + QObject *w = QObject::sender(); + QDockWidget *dock = 0; -void MainWindow::on_actionViewZoomOut_triggered() -{ - shared_ptr view = get_active_view(); - if (view) - view->zoom(-1); + while (w) { + dock = qobject_cast(w); + if (dock) + break; + w = w->parent(); + } + + // Get the view contained in the dock widget + shared_ptr view; + + for (auto entry : view_docks_) + if (entry.first == dock) + view = entry.second; + + // Deregister the view + for (shared_ptr session : sessions_) { + if (!session->has_view(view)) + continue; + + // Also destroy the entire session if its main view is closing + if (view == session->main_view()) { + remove_session(session); + break; + } else + session->deregister_view(view); + } } -void MainWindow::on_actionViewZoomFit_triggered() +void MainWindow::on_tab_changed(int index) { - shared_ptr view = get_active_view(); - if (view) - view->zoom_fit(action_view_zoom_fit_->isChecked()); + shared_ptr session = get_tab_session(index); + + if (session) + on_focused_session_changed(session); } -void MainWindow::on_actionViewZoomOneToOne_triggered() +void MainWindow::on_tab_close_requested(int index) { - shared_ptr view = get_active_view(); - if (view) - view->zoom_one_to_one(); + // TODO Ask user if this is intended in case data is unsaved + + shared_ptr session = get_tab_session(index); + + if (session) + remove_session(session); } void MainWindow::on_actionViewStickyScrolling_triggered() { - shared_ptr view = get_active_view(); + shared_ptr viewbase = get_active_view(); + views::TraceView::View* view = + qobject_cast(viewbase.get()); if (view) view->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked()); } void MainWindow::on_actionViewColouredBg_triggered() { - shared_ptr view = get_active_view(); + shared_ptr viewbase = get_active_view(); + views::TraceView::View* view = + qobject_cast(viewbase.get()); if (view) view->enable_coloured_bg(action_view_coloured_bg_->isChecked()); } -void MainWindow::on_actionViewShowCursors_triggered() -{ - shared_ptr view = get_active_view(); - if (!view) - return; - - const bool show = !view->cursors_shown(); - if (show) - view->centre_cursors(); - - view->show_cursors(show); -} - void MainWindow::on_actionAbout_triggered() { dialogs::About dlg(device_manager_.context(), this); dlg.exec(); } -void MainWindow::sticky_scrolling_changed(bool state) -{ - action_view_sticky_scrolling_->setChecked(state); -} - -void MainWindow::always_zoom_to_fit_changed(bool state) -{ - action_view_zoom_fit_->setChecked(state); -} - -void MainWindow::add_decoder(srd_decoder *decoder) -{ -#ifdef ENABLE_DECODE - assert(decoder); - session_.add_decoder(decoder); -#else - (void)decoder; -#endif -} - -void MainWindow::capture_state_changed(int state) -{ - main_bar_->set_capture_state((pv::Session::capture_state)state); -} - -void MainWindow::device_selected() -{ - // Set the title to include the device/file name - const shared_ptr device = session_.device(); - - if (!device) { - main_bar_->reset_device_selector(); - return; - } - - const string display_name = device->display_name(device_manager_); - setWindowTitle(tr("%1 - PulseView").arg(display_name.c_str())); -} - } // namespace pv