X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=119ce0a791ba22a2aa1d6b1702a387fd6bef9caf;hp=33870145232afdd654a750cac5046169d7051201;hb=6e2a5b1d677a26a637465cd4d304e2bc52e14f36;hpb=55547a4510d8ff310ab1ac57e69e3e51132b2c2f diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index 33870145..119ce0a7 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -14,80 +14,49 @@ * 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 - #ifdef ENABLE_DECODE #include #endif #include +#include +#include +#include #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 "dialogs/settings.hpp" +#include "globalsettings.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 "util.hpp" +#include "views/trace/view.hpp" +#include "views/trace/standardbar.hpp" -#include -#include -#include -#include #include -using std::cerr; -using std::endl; -using std::list; +using std::bind; +using std::dynamic_pointer_cast; using std::make_shared; using std::map; -using std::max; -using std::pair; +using std::placeholders::_1; 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,641 +64,439 @@ 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) : +MainWindow::MainWindow(DeviceManager &device_manager, 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)), - 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 + session_selector_(this), + session_state_mapper_(this), + icon_red_(":/icons/status-red.svg"), + icon_green_(":/icons/status-green.svg"), + icon_grey_(":/icons/status-grey.svg") { qRegisterMetaType("util::Timestamp"); + qRegisterMetaType("uint64_t"); + + GlobalSettings::register_change_handler(GlobalSettings::Key_View_ColouredBG, + bind(&MainWindow::on_settingViewColouredBg_changed, this, _1)); + + GlobalSettings::register_change_handler(GlobalSettings::Key_View_ShowSamplingPoints, + bind(&MainWindow::on_settingViewShowSamplingPoints_changed, this, _1)); + + GlobalSettings::register_change_handler(GlobalSettings::Key_View_ShowAnalogMinorGrid, + bind(&MainWindow::on_settingViewShowAnalogMinorGrid_changed, this, _1)); + + GlobalSettings settings; + settings.set_defaults_where_needed(); 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); - } + while (!sessions_.empty()) + remove_session(sessions_.front()); } -QAction* MainWindow::action_open() const +shared_ptr MainWindow::get_active_view() const { - return action_open_; -} + // If there's only one view, use it... + if (view_docks_.size() == 1) + return view_docks_.begin()->second; -QAction* MainWindow::action_save_as() const -{ - return action_save_as_; -} + // ...otherwise find the dock widget the widget with focus is contained in + QObject *w = QApplication::focusWidget(); + QDockWidget *dock = nullptr; -QAction* MainWindow::action_save_selection_as() const -{ - return action_save_selection_as_; -} + while (w) { + dock = qobject_cast(w); + if (dock) + break; + w = w->parent(); + } -QAction* MainWindow::action_connect() const -{ - return action_connect_; -} + // Get the view contained in the dock widget + for (auto entry : view_docks_) + if (entry.first == dock) + return entry.second; -QAction* MainWindow::action_quit() const -{ - return action_quit_; + return nullptr; } -QAction* MainWindow::action_view_zoom_in() const +shared_ptr MainWindow::add_view(const QString &title, + views::ViewType type, Session &session) { - return action_view_zoom_in_; -} + GlobalSettings settings; + shared_ptr v; -QAction* MainWindow::action_view_zoom_out() const -{ - return action_view_zoom_out_; -} + QMainWindow *main_window = nullptr; + for (auto entry : session_windows_) + if (entry.first.get() == &session) + main_window = entry.second; -QAction* MainWindow::action_view_zoom_fit() const -{ - return action_view_zoom_fit_; -} + assert(main_window); -QAction* MainWindow::action_view_zoom_one_to_one() const -{ - return action_view_zoom_one_to_one_; -} + shared_ptr main_bar = session.main_bar(); -QAction* MainWindow::action_view_sticky_scrolling() const -{ - return action_view_sticky_scrolling_; -} + QDockWidget* dock = new QDockWidget(title, main_window); + dock->setObjectName(title); + main_window->addDockWidget(Qt::TopDockWidgetArea, dock); -QAction* MainWindow::action_view_coloured_bg() const -{ - return action_view_coloured_bg_; -} + // 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 -QAction* MainWindow::action_view_show_cursors() const -{ - return action_view_show_cursors_; -} + if (type == views::ViewTypeTrace) + // This view will be the main view if there's no main bar yet + v = make_shared(session, + (main_bar ? false : true), dock_main); -QAction* MainWindow::action_about() const -{ - return action_about_; -} + if (!v) + return nullptr; -#ifdef ENABLE_DECODE -QMenu* MainWindow::menu_decoder_add() const -{ - return menu_decoders_add_; -} -#endif + view_docks_[dock] = v; + session.register_view(v); -shared_ptr MainWindow::get_active_view() const -{ - // If there's only one view, use it... - if (view_docks_.size() == 1) - return view_docks_.begin()->second; + dock_main->setCentralWidget(v.get()); + dock->setWidget(dock_main); - // ...otherwise find the dock widget the widget with focus is contained in - QObject *w = QApplication::focusWidget(); - QDockWidget *dock = 0; + dock->setContextMenuPolicy(Qt::PreventContextMenu); + dock->setFeatures(QDockWidget::DockWidgetMovable | + QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable); - while (w) { - dock = qobject_cast(w); - if (dock) - break; - w = w->parent(); - } + QAbstractButton *close_btn = + dock->findChildren + ("qt_dockwidget_closebutton").front(); - // Get the view contained in the dock widget - for (auto entry : view_docks_) - if (entry.first.get() == dock) - return entry.second; + connect(close_btn, SIGNAL(clicked(bool)), + this, SLOT(on_view_close_clicked())); - return shared_ptr(); -} + connect(&session, SIGNAL(trigger_event(util::Timestamp)), + qobject_cast(v.get()), + SLOT(trigger_event(util::Timestamp))); -shared_ptr MainWindow::add_view(const QString &title, - view::ViewType type, Session &session) -{ - shared_ptr v; + if (type == views::ViewTypeTrace) { + views::trace::View *tv = + qobject_cast(v.get()); - if (type == pv::view::TraceView) - v = make_shared(session, this); + tv->enable_coloured_bg(settings.value(GlobalSettings::Key_View_ColouredBG).toBool()); + tv->enable_show_sampling_points(settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool()); + tv->enable_show_analog_minor_grid(settings.value(GlobalSettings::Key_View_ShowAnalogMinorGrid).toBool()); - if (v) { - shared_ptr dock = make_shared(title, this); - dock->setWidget(v.get()); - dock->setObjectName(title); - addDockWidget(Qt::TopDockWidgetArea, dock.get()); - view_docks_[dock] = v; + if (!main_bar) { + /* Initial view, create the main bar */ + main_bar = make_shared(session, this, tv); + dock_main->addToolBar(main_bar.get()); + session.set_main_bar(main_bar); - dock->setFeatures(QDockWidget::DockWidgetMovable | - QDockWidget::DockWidgetFloatable); + connect(main_bar.get(), SIGNAL(new_view(Session*)), + this, SLOT(on_new_view(Session*))); - if (type == view::TraceView) { - connect(&session, SIGNAL(trigger_event(util::Timestamp)), 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))); + main_bar->action_view_show_cursors()->setChecked(tv->cursors_shown()); - 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()); - } + /* For the main view we need to prevent the dock widget from + * closing itself when its close button is clicked. This is + * so we can confirm with the user first. Regular views don't + * need this */ + close_btn->disconnect(SIGNAL(clicked()), dock, SLOT(close())); + } else { + /* Additional view, create a standard bar */ + pv::views::trace::StandardBar *standard_bar = + new pv::views::trace::StandardBar(session, this, tv); + dock_main->addToolBar(standard_bar); - session.register_view(v); + standard_bar->action_view_show_cursors()->setChecked(tv->cursors_shown()); + } } return v; } -void MainWindow::run_stop() +void MainWindow::remove_view(shared_ptr view) { - 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; - } -} + for (shared_ptr session : sessions_) { + if (!session->has_view(view)) + continue; -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(); + // 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); + + // 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 + view->setParent(nullptr); + + // Delete the view's dock widget and all widgets inside it + entry.first->deleteLater(); + + // Remove the dock widget from the list and stop iterating + view_docks_.erase(entry.first); + break; + } } } -void MainWindow::export_file(shared_ptr format, - bool selection_only) +shared_ptr MainWindow::add_session() { - using pv::dialogs::StoreProgress; + static int last_session_id = 1; + QString name = tr("Session %1").arg(last_session_id++); - // 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; - } + shared_ptr session = make_shared(device_manager_, name); - // Stop any currently running capture session - session_.stop_capture(); + 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())); + session_state_mapper_.setMapping(session.get(), session.get()); + connect(session.get(), SIGNAL(capture_state_changed(int)), + &session_state_mapper_, SLOT(map())); - QSettings settings; - const QString dir = settings.value(SettingSaveDirectory).toString(); + sessions_.push_back(session); - std::pair sample_range; + QMainWindow *window = new QMainWindow(); + window->setWindowFlags(Qt::Widget); // Remove Qt::Window flag + session_windows_[session] = window; - // 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; - } + int index = session_selector_.addTab(window, name); + session_selector_.setCurrentIndex(index); + last_focused_session_ = session; - const double samplerate = session_.get_samplerate(); + window->setDockNestingEnabled(true); - const pv::util::Timestamp& start_time = view->cursors()->first()->time(); - const pv::util::Timestamp& end_time = view->cursors()->second()->time(); + shared_ptr main_view = + add_view(name, views::ViewTypeTrace, *session); - const uint64_t start_sample = - std::max((double)0, start_time.convert_to() * samplerate); - const uint64_t end_sample = end_time.convert_to() * samplerate; + return session; +} - sample_range = std::make_pair(start_sample, end_sample); - } else { - sample_range = std::make_pair(0, 0); - } +void MainWindow::remove_session(shared_ptr session) +{ + // Determine the height of the button before it collapses + int h = new_session_button_->height(); - // Construct the filter - const vector exts = format->extensions(); - QString filter = tr("%1 files ").arg( - QString::fromStdString(format->description())); + // Stop capture while the session still exists so that the UI can be + // updated in case we're currently running. If so, this will schedule a + // call to our on_capture_state_changed() slot for the next run of the + // event loop. We need to have this executed immediately or else it will + // be dismissed since the session object will be deleted by the time we + // leave this method and the event loop gets a chance to run again. + session->stop_capture(); + QApplication::processEvents(); - if (exts.empty()) - filter += "(*.*)"; - else - filter += QString("(*.%1);;%2 (*.*)").arg( - QString::fromStdString(join(exts, ", *.")), - tr("All Files")); + for (shared_ptr view : session->views()) + remove_view(view); - // Show the file dialog - const QString file_name = QFileDialog::getSaveFileName( - this, tr("Save File"), dir, filter); + QMainWindow *window = session_windows_.at(session); + session_selector_.removeTab(session_selector_.indexOf(window)); - if (file_name.isEmpty()) - return; + session_windows_.erase(session); - 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(); - } + if (last_focused_session_ == session) + last_focused_session_.reset(); + + // Remove the session from our list of sessions (which also destroys it) + sessions_.remove_if([&](shared_ptr s) { + return s == session; }); - StoreProgress *dlg = new StoreProgress(file_name, format, options, - sample_range, session_, this); - dlg->run(); + 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); + + int margin = static_tab_widget_->layout()->contentsMargins().bottom(); + static_tab_widget_->setMinimumHeight(h + 2 * margin); + session_selector_.setMinimumHeight(h + 2 * margin); + + // Update the window title if there is no view left to + // generate focus change events + setWindowTitle(WindowTitle); + } } -void MainWindow::import_file(shared_ptr format) +void MainWindow::add_session_with_file(string open_file_name, + string open_file_format) { - assert(format); + shared_ptr session = add_session(); + session->load_init_file(open_file_name, open_file_format); +} - 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()) +void MainWindow::add_default_session() +{ + // Only add the default session if there would be no session otherwise + if (sessions_.size() > 0) 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(); + shared_ptr session = add_session(); + + // Check the list of available devices. Prefer the one that was + // found with user supplied scan specs (if applicable). Then try + // one of the auto detected devices that are not the demo device. + // Pick demo in the absence of "genuine" hardware devices. + shared_ptr user_device, other_device, demo_device; + for (shared_ptr dev : device_manager_.devices()) { + if (dev == device_manager_.user_spec_device()) { + user_device = dev; + } else if (dev->hardware_device()->driver()->name() == "demo") { + demo_device = dev; + } else { + other_device = dev; + } } + if (user_device) + session->select_device(user_device); + else if (other_device) + session->select_device(other_device); + else + session->select_device(demo_device); +} - load_file(file_name, format, options); +void MainWindow::save_sessions() +{ + QSettings settings; + int id = 0; + + 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(); + } + } - const QString abs_path = QFileInfo(file_name).absolutePath(); - settings.setValue(SettingOpenDirectory, abs_path); + settings.setValue("sessions", id); +} + +void MainWindow::restore_sessions() +{ + QSettings settings; + int i, session_count; + + session_count = settings.value("sessions", 0).toInt(); + + 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::setup_ui() { setObjectName(QString::fromUtf8("MainWindow")); + setCentralWidget(&session_selector_); + // Set the window icon QIcon icon; - icon.addFile(QString(":/icons/sigrok-logo-notext.png")); + icon.addFile(QString(":/icons/pulseview.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); - 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")); - 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")); + view_sticky_scrolling_shortcut_ = new QShortcut(QKeySequence(Qt::Key_S), this, SLOT(on_view_sticky_scrolling_shortcut())); + view_sticky_scrolling_shortcut_->setAutoRepeat(false); - menu_decoders_add_->setTitle(tr("&Add")); - connect(menu_decoders_add_, SIGNAL(decoder_selected(srd_decoder*)), - this, SLOT(add_decoder(srd_decoder*))); + view_show_sampling_points_shortcut_ = new QShortcut(QKeySequence(Qt::Key_Period), this, SLOT(on_view_show_sampling_points_shortcut())); + view_show_sampling_points_shortcut_->setAutoRepeat(false); - 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()); + view_show_analog_minor_grid_shortcut_ = new QShortcut(QKeySequence(Qt::Key_G), this, SLOT(on_view_show_analog_minor_grid_shortcut())); + view_show_analog_minor_grid_shortcut_->setAutoRepeat(false); - setMenuBar(menu_bar); - QMetaObject::connectSlotsByName(this); + view_coloured_bg_shortcut_ = new QShortcut(QKeySequence(Qt::Key_B), this, SLOT(on_view_coloured_bg_shortcut())); + view_coloured_bg_shortcut_->setAutoRepeat(false); - // Also add all actions to the main window for always-enabled hotkeys - for (QAction* action : menu_bar->actions()) - this->addAction(action); + // 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); - // Setup the toolbar - main_bar_ = new toolbars::MainBar(session_, *this); + run_stop_button_ = new QToolButton(); + run_stop_button_->setAutoRaise(true); + run_stop_button_->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); + run_stop_button_->setToolTip(tr("Start/Stop Acquisition")); - // Set up the initial view - add_view(tr("Untitled"), pv::view::TraceView, session_); + run_stop_shortcut_ = new QShortcut(QKeySequence(Qt::Key_Space), run_stop_button_, SLOT(click())); + run_stop_shortcut_->setAutoRepeat(false); - // Populate the device list and select the initially selected device - update_device_list(); + settings_button_ = new QToolButton(); + settings_button_->setIcon(QIcon::fromTheme("preferences-system", + QIcon(":/icons/preferences-system.png"))); + settings_button_->setToolTip(tr("Settings")); + settings_button_->setAutoRaise(true); - addToolBar(main_bar_); + QFrame *separator1 = new QFrame(); + separator1->setFrameStyle(QFrame::VLine | QFrame::Raised); + QFrame *separator2 = new QFrame(); + separator2->setFrameStyle(QFrame::VLine | QFrame::Raised); - // Set the title - setWindowTitle(tr("PulseView")); + 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_); - // 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())); -} + static_tab_widget_ = new QWidget(); + static_tab_widget_->setLayout(layout); -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; + session_selector_.setCornerWidget(static_tab_widget_, Qt::TopLeftCorner); + session_selector_.setTabsClosable(true); - const string value = settings.value(k).toString().toStdString(); - if (!value.empty()) - dev_info.insert(std::make_pair(key, value)); - } + close_application_shortcut_ = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q), this, SLOT(close())); + close_application_shortcut_->setAutoRepeat(false); - 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); + close_current_tab_shortcut_ = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_W), this, SLOT(on_close_current_tab())); - // 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); + connect(new_session_button_, SIGNAL(clicked(bool)), + this, SLOT(on_new_session_clicked())); + connect(run_stop_button_, SIGNAL(clicked(bool)), + this, SLOT(on_run_stop_clicked())); + connect(&session_state_mapper_, SIGNAL(mapped(QObject*)), + this, SLOT(on_capture_state_changed(QObject*))); + connect(settings_button_, SIGNAL(clicked(bool)), + this, SLOT(on_settings_clicked())); - if (dev_info.count("model") > 0) - if (dev_info.at("model").find("Demo device") == std::string::npos) { - device = dev; - break; - } - } - } + 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))); - select_device(device); - update_device_list(); - settings.endGroup(); + connect(static_cast(QCoreApplication::instance()), + SIGNAL(focusChanged(QWidget*, QWidget*)), + this, SLOT(on_focus_changed())); } -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; - } - - input_format = (*iter).second; - } - - load_file(QString::fromStdString(file_name), input_format); -} - - void MainWindow::save_ui_settings() { QSettings settings; - map dev_info; - list key_list; - 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())); - } - - settings.endGroup(); - } } void MainWindow::restore_ui_settings() @@ -747,64 +514,33 @@ void MainWindow::restore_ui_settings() 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)); -} - -void MainWindow::update_device_list() -{ - main_bar_->update_device_list(); -} - -void MainWindow::load_file(QString file_name, - std::shared_ptr format, - const std::map &options) +shared_ptr MainWindow::get_tab_session(int index) const { - const QString errorMessage( - QString("Failed to load file %1").arg(file_name)); + // 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; - 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(); - - session_.start_capture([&, errorMessage](QString infoMessage) { - session_error(errorMessage, infoMessage); }); + return nullptr; } void MainWindow::closeEvent(QCloseEvent *event) { - save_ui_settings(); - event->accept(); -} + bool data_saved = true; -void MainWindow::keyReleaseEvent(QKeyEvent *event) -{ - if (event->key() == Qt::Key_Alt) { - menuBar()->setHidden(!menuBar()->isHidden()); - menuBar()->setFocus(); + for (auto entry : session_windows_) + if (!entry.first->data_saved()) + data_saved = false; + + if (!data_saved && (QMessageBox::question(this, tr("Confirmation"), + tr("There is unsaved data. Close anyway?"), + QMessageBox::Yes | QMessageBox::No) == QMessageBox::No)) { + event->ignore(); + } else { + save_ui_settings(); + save_sessions(); + event->accept(); } - QMainWindow::keyReleaseEvent(event); } QMenu* MainWindow::createPopupMenu() @@ -823,8 +559,14 @@ bool MainWindow::restoreState(const QByteArray &state, int version) return false; } -void MainWindow::show_session_error( - const QString text, const QString info_text) +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)); +} + +void MainWindow::show_session_error(const QString text, const QString info_text) { QMessageBox msg(this); msg.setText(text); @@ -834,153 +576,277 @@ void MainWindow::show_session_error( msg.exec(); } -void MainWindow::on_actionOpen_triggered() +void MainWindow::on_add_view(const QString &title, views::ViewType type, + Session *session) { - QSettings settings; - const QString dir = settings.value(SettingOpenDirectory).toString(); + // We get a pointer and need a reference + for (shared_ptr s : sessions_) + if (s.get() == session) + add_view(title, type, *s); +} + +void MainWindow::on_focus_changed() +{ + 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 != last_focused_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); + 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"]); + last_focused_session_ = session; + + setWindowTitle(session->name() + " - " + WindowTitle); + + // Update the state of the run/stop button, too + on_capture_state_changed(session.get()); } -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_run_stop_clicked() { - // Stop any currently running capture session - session_.stop_capture(); - - dialogs::Connect dlg(this, device_manager_); + shared_ptr session = last_focused_session_; - // 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()); + if (!session) + return; - update_device_list(); + 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::on_actionQuit_triggered() +void MainWindow::on_settings_clicked() { - close(); + dialogs::Settings dlg(device_manager_); + dlg.exec(); } -void MainWindow::on_actionViewZoomIn_triggered() +void MainWindow::on_session_name_changed() { - shared_ptr view = get_active_view(); - if (view) - view->zoom(1); -} + // Update the corresponding dock widget's name(s) + Session *session = qobject_cast(QObject::sender()); + assert(session); -void MainWindow::on_actionViewZoomOut_triggered() -{ - shared_ptr view = get_active_view(); - if (view) - view->zoom(-1); + 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()); + } + } + + // 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()); + } + + // Refresh window title if the affected session has focus + if (session == last_focused_session_.get()) + setWindowTitle(session->name() + " - " + WindowTitle); } -void MainWindow::on_actionViewZoomFit_triggered() +void MainWindow::on_capture_state_changed(QObject *obj) { - shared_ptr view = get_active_view(); - if (view) - view->zoom_fit(action_view_zoom_fit_->isChecked()); + Session *caller = qobject_cast(obj); + + // Ignore if caller is not the currently focused session + // unless there is only one session + if ((sessions_.size() > 1) && (caller != last_focused_session_.get())) + return; + + int state = caller->get_capture_state(); + + const QIcon *icons[] = {&icon_grey_, &icon_red_, &icon_green_}; + run_stop_button_->setIcon(*icons[state]); + run_stop_button_->setText((state == pv::Session::Stopped) ? + tr("Run") : tr("Stop")); } -void MainWindow::on_actionViewZoomOneToOne_triggered() +void MainWindow::on_new_view(Session *session) { - shared_ptr view = get_active_view(); - if (view) - view->zoom_one_to_one(); + // We get a pointer and need a reference + for (shared_ptr s : sessions_) + if (s.get() == session) + add_view(session->name(), views::ViewTypeTrace, *s); } -void MainWindow::on_actionViewStickyScrolling_triggered() +void MainWindow::on_view_close_clicked() { - shared_ptr view = get_active_view(); - if (view) - view->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked()); + // Find the dock widget that contains the close button that was clicked + QObject *w = QObject::sender(); + QDockWidget *dock = nullptr; + + 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()) { + // ...but only if data is saved or the user confirms closing + if (session->data_saved() || (QMessageBox::question(this, tr("Confirmation"), + tr("This session contains unsaved data. Close it anyway?"), + QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes)) + remove_session(session); + break; + } else + // All other views can be closed at any time as no data will be lost + remove_view(view); + } } -void MainWindow::on_actionViewColouredBg_triggered() +void MainWindow::on_tab_changed(int index) { - shared_ptr view = get_active_view(); - if (view) - view->enable_coloured_bg(action_view_coloured_bg_->isChecked()); + shared_ptr session = get_tab_session(index); + + if (session) + on_focused_session_changed(session); } -void MainWindow::on_actionViewShowCursors_triggered() +void MainWindow::on_tab_close_requested(int index) { - shared_ptr view = get_active_view(); - if (!view) + shared_ptr session = get_tab_session(index); + + if (!session) return; - const bool show = !view->cursors_shown(); - if (show) - view->centre_cursors(); + if (session->data_saved() || (QMessageBox::question(this, tr("Confirmation"), + tr("This session contains unsaved data. Close it anyway?"), + QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes)) + remove_session(session); +} - view->show_cursors(show); +void MainWindow::on_view_coloured_bg_shortcut() +{ + GlobalSettings settings; + + bool state = settings.value(GlobalSettings::Key_View_ColouredBG).toBool(); + settings.setValue(GlobalSettings::Key_View_ColouredBG, !state); } -void MainWindow::on_actionAbout_triggered() +void MainWindow::on_view_sticky_scrolling_shortcut() { - dialogs::About dlg(device_manager_.context(), this); - dlg.exec(); + GlobalSettings settings; + + bool state = settings.value(GlobalSettings::Key_View_StickyScrolling).toBool(); + settings.setValue(GlobalSettings::Key_View_StickyScrolling, !state); } -void MainWindow::sticky_scrolling_changed(bool state) +void MainWindow::on_view_show_sampling_points_shortcut() { - action_view_sticky_scrolling_->setChecked(state); + GlobalSettings settings; + + bool state = settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool(); + settings.setValue(GlobalSettings::Key_View_ShowSamplingPoints, !state); } -void MainWindow::always_zoom_to_fit_changed(bool state) +void MainWindow::on_view_show_analog_minor_grid_shortcut() { - action_view_zoom_fit_->setChecked(state); + GlobalSettings settings; + + bool state = settings.value(GlobalSettings::Key_View_ShowAnalogMinorGrid).toBool(); + settings.setValue(GlobalSettings::Key_View_ShowAnalogMinorGrid, !state); } -void MainWindow::add_decoder(srd_decoder *decoder) +void MainWindow::on_settingViewColouredBg_changed(const QVariant new_value) { -#ifdef ENABLE_DECODE - assert(decoder); - session_.add_decoder(decoder); -#else - (void)decoder; -#endif + bool state = new_value.toBool(); + + for (auto entry : view_docks_) { + shared_ptr viewbase = entry.second; + + // Only trace views have this setting + views::trace::View* view = + qobject_cast(viewbase.get()); + if (view) + view->enable_coloured_bg(state); + } } -void MainWindow::capture_state_changed(int state) +void MainWindow::on_settingViewShowSamplingPoints_changed(const QVariant new_value) { - main_bar_->set_capture_state((pv::Session::capture_state)state); + bool state = new_value.toBool(); + + for (auto entry : view_docks_) { + shared_ptr viewbase = entry.second; + + // Only trace views have this setting + views::trace::View* view = + qobject_cast(viewbase.get()); + if (view) + view->enable_show_sampling_points(state); + } } -void MainWindow::device_selected() +void MainWindow::on_settingViewShowAnalogMinorGrid_changed(const QVariant new_value) { - // Set the title to include the device/file name - const shared_ptr device = session_.device(); + bool state = new_value.toBool(); - if (!device) { - main_bar_->reset_device_selector(); - return; + for (auto entry : view_docks_) { + shared_ptr viewbase = entry.second; + + // Only trace views have this setting + views::trace::View* view = + qobject_cast(viewbase.get()); + if (view) + view->enable_show_analog_minor_grid(state); } +} + +void MainWindow::on_close_current_tab() +{ + int tab = session_selector_.currentIndex(); - const string display_name = device->display_name(device_manager_); - setWindowTitle(tr("%1 - PulseView").arg(display_name.c_str())); + on_tab_close_requested(tab); } } // namespace pv