X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=41c748b75d2908e732e410251f3c5d8a65a14779;hp=2558cb07692fe497e87d262fad574bc81ad70bfd;hb=14f9d4a1f4472d29366ed8333b20f4041cf1b443;hpb=7e0c99bf95836c89574b53ae3fa7840e2ddca77d diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index 2558cb07..41c748b7 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -42,6 +42,8 @@ #include #include +#include + #include "mainwindow.hpp" #include "devicemanager.hpp" @@ -73,6 +75,7 @@ using std::cerr; using std::endl; using std::list; +using std::make_shared; using std::map; using std::max; using std::pair; @@ -200,6 +203,66 @@ QMenu* MainWindow::menu_decoder_add() const } #endif +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; + + // ...otherwise find the dock widget the widget with focus is contained in + QObject *w = QApplication::focusWidget(); + QDockWidget *dock = 0; + + while (w) { + dock = qobject_cast(w); + if (dock) + break; + w = w->parent(); + } + + // Get the view contained in the dock widget + for (auto entry : view_docks_) + if (entry.first.get() == dock) + return entry.second; + + return shared_ptr(); +} + +shared_ptr MainWindow::add_view(const QString &title, + view::ViewType type, Session &session) +{ + shared_ptr v; + + if (type == pv::view::TraceView) + v = make_shared(session, this); + + 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; + + dock->setFeatures(QDockWidget::DockWidgetMovable | + QDockWidget::DockWidgetFloatable); + + 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))); + + 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()); + } + } + + return v; +} + void MainWindow::run_stop() { switch (session_.get_capture_state()) { @@ -236,6 +299,14 @@ void MainWindow::export_file(shared_ptr format, { 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; + } + // Stop any currently running capture session session_.stop_capture(); @@ -246,7 +317,7 @@ void MainWindow::export_file(shared_ptr format, // Selection only? Verify that the cursors are active and fetch their values if (selection_only) { - if (!view_->cursors()->enabled()) { + 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).")); @@ -255,8 +326,8 @@ void MainWindow::export_file(shared_ptr format, const double samplerate = session_.get_samplerate(); - const pv::util::Timestamp& start_time = view_->cursors()->first()->time(); - const pv::util::Timestamp& end_time = view_->cursors()->second()->time(); + const pv::util::Timestamp& start_time = view->cursors()->first()->time(); + const pv::util::Timestamp& end_time = view->cursors()->second()->time(); const uint64_t start_sample = std::max((double)0, start_time.convert_to() * samplerate); @@ -353,20 +424,9 @@ void MainWindow::setup_ui() // Set the window icon QIcon icon; - icon.addFile(QString(":/icons/sigrok-logo-notext.svg")); + icon.addFile(QString(":/icons/sigrok-logo-notext.png")); setWindowIcon(icon); - // Setup the central widget - central_widget_ = new QWidget(this); - vertical_layout_ = new QVBoxLayout(central_widget_); - vertical_layout_->setSpacing(6); - vertical_layout_->setContentsMargins(0, 0, 0, 0); - setCentralWidget(central_widget_); - - view_ = new pv::view::View(session_, this); - - vertical_layout_->addWidget(view_); - // Setup the menu bar pv::widgets::HidingMenuBar *const menu_bar = new pv::widgets::HidingMenuBar(this); @@ -477,8 +537,6 @@ void MainWindow::setup_ui() action_view_sticky_scrolling_->setText(tr("&Sticky Scrolling")); menu_view->addAction(action_view_sticky_scrolling_); - view_->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked()); - menu_view->addSeparator(); action_view_coloured_bg_->setCheckable(true); @@ -489,12 +547,9 @@ void MainWindow::setup_ui() action_view_coloured_bg_->setText(tr("Use &coloured backgrounds")); menu_view->addAction(action_view_coloured_bg_); - view_->enable_coloured_bg(action_view_coloured_bg_->isChecked()); - menu_view->addSeparator(); action_view_show_cursors_->setCheckable(true); - action_view_show_cursors_->setChecked(view_->cursors_shown()); action_view_show_cursors_->setIcon(QIcon::fromTheme("show-cursors", QIcon(":/icons/show-cursors.svg"))); action_view_show_cursors_->setShortcut(QKeySequence(Qt::Key_C)); @@ -540,6 +595,9 @@ void MainWindow::setup_ui() // 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(); @@ -553,15 +611,6 @@ void MainWindow::setup_ui() SLOT(capture_state_changed(int))); connect(&session_, SIGNAL(device_selected()), this, SLOT(device_selected())); - connect(&session_, SIGNAL(trigger_event(util::Timestamp)), view_, - SLOT(trigger_event(util::Timestamp))); - - // Setup view_ events - connect(view_, SIGNAL(sticky_scrolling_changed(bool)), this, - SLOT(sticky_scrolling_changed(bool))); - connect(view_, SIGNAL(always_zoom_to_fit_changed(bool)), this, - SLOT(always_zoom_to_fit_changed(bool))); - } void MainWindow::select_init_device() @@ -808,43 +857,57 @@ void MainWindow::on_actionQuit_triggered() void MainWindow::on_actionViewZoomIn_triggered() { - view_->zoom(1); + shared_ptr view = get_active_view(); + if (view) + view->zoom(1); } void MainWindow::on_actionViewZoomOut_triggered() { - view_->zoom(-1); + shared_ptr view = get_active_view(); + if (view) + view->zoom(-1); } void MainWindow::on_actionViewZoomFit_triggered() { - view_->zoom_fit(action_view_zoom_fit_->isChecked()); + shared_ptr view = get_active_view(); + if (view) + view->zoom_fit(action_view_zoom_fit_->isChecked()); } void MainWindow::on_actionViewZoomOneToOne_triggered() { - view_->zoom_one_to_one(); + shared_ptr view = get_active_view(); + if (view) + view->zoom_one_to_one(); } void MainWindow::on_actionViewStickyScrolling_triggered() { - view_->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked()); + shared_ptr view = get_active_view(); + if (view) + view->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked()); } void MainWindow::on_actionViewColouredBg_triggered() { - view_->enable_coloured_bg(action_view_coloured_bg_->isChecked()); + shared_ptr view = get_active_view(); + if (view) + view->enable_coloured_bg(action_view_coloured_bg_->isChecked()); } void MainWindow::on_actionViewShowCursors_triggered() { - assert(view_); + shared_ptr view = get_active_view(); + if (!view) + return; - const bool show = !view_->cursors_shown(); + const bool show = !view->cursors_shown(); if (show) - view_->centre_cursors(); + view->centre_cursors(); - view_->show_cursors(show); + view->show_cursors(show); } void MainWindow::on_actionAbout_triggered()