#include <algorithm>
#include <iterator>
-#include <boost/algorithm/string/join.hpp>
-
#include <QAction>
#include <QApplication>
-#include <QButtonGroup>
#include <QCloseEvent>
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QMenu>
-#include <QMenuBar>
+#include <QDockWidget>
+#include <QHBoxLayout>
#include <QSettings>
-#include <QStatusBar>
-#include <QVBoxLayout>
#include <QWidget>
#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 <inttypes.h>
#include <stdint.h>
#include <stdarg.h>
-#include <glib.h>
#include <libsigrokcxx/libsigrokcxx.hpp>
-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 {
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>("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);
-}
-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_;
-}
+ if (!open_file_name.empty()) {
+ shared_ptr<Session> session = add_session();
+ session->main_bar()->load_init_file(open_file_name, open_file_format);
+ }
-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> session = add_session();
-QAction* MainWindow::action_view_zoom_in() const
-{
- return action_view_zoom_in_;
-}
+ map<string, string> dev_info;
+ shared_ptr<devices::HardwareDevice> 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<devices::HardwareDevice> 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
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
+shared_ptr<views::ViewBase> MainWindow::get_active_view() const
{
- return menu_decoders_add_;
-}
-#endif
+ // If there's only one view, use it...
+ if (view_docks_.size() == 1)
+ return view_docks_.begin()->second;
-void MainWindow::run_stop()
-{
- switch (session_.get_capture_state()) {
- case Session::Stopped:
- session_.start_capture([&](QString message) {
- session_error("Capture failed", message); });
- break;
- case Session::AwaitingTrigger:
- case Session::Running:
- session_.stop_capture();
- break;
- }
-}
+ // ...otherwise find the dock widget the widget with focus is contained in
+ QObject *w = QApplication::focusWidget();
+ QDockWidget *dock = 0;
-void MainWindow::select_device(shared_ptr<devices::Device> 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();
+ while (w) {
+ dock = qobject_cast<QDockWidget*>(w);
+ if (dock)
+ break;
+ w = w->parent();
}
+
+ // Get the view contained in the dock widget
+ for (auto entry : view_docks_)
+ if (entry.first == dock)
+ return entry.second;
+
+ return nullptr;
}
-void MainWindow::export_file(shared_ptr<OutputFormat> format,
- bool selection_only)
+shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
+ views::ViewType type, Session &session)
{
- using pv::dialogs::StoreProgress;
+ QMainWindow *main_window;
+ for (auto entry : session_windows_)
+ if (entry.first.get() == &session)
+ main_window = entry.second;
- // Stop any currently running capture session
- session_.stop_capture();
+ assert(main_window);
- QSettings settings;
- const QString dir = settings.value(SettingSaveDirectory).toString();
+ if (type == views::ViewTypeTrace) {
+ QDockWidget* dock = new QDockWidget(title, main_window);
+ dock->setObjectName(title);
+ main_window->addDockWidget(Qt::TopDockWidgetArea, dock);
- std::pair<uint64_t, uint64_t> sample_range;
+ // 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
- // 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<views::TraceView::View> v =
+ make_shared<views::TraceView::View>(session, dock_main);
+ view_docks_[dock] = v;
+ session.register_view(v);
- const double samplerate = session_.get_samplerate();
+ dock_main->setCentralWidget(v.get());
+ dock->setWidget(dock_main);
- const pv::util::Timestamp& start_time = view_->cursors()->first()->time();
- const pv::util::Timestamp& end_time = view_->cursors()->second()->time();
+ dock->setFeatures(QDockWidget::DockWidgetMovable |
+ QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable);
- const uint64_t start_sample =
- std::max((double)0, start_time.convert_to<double>() * samplerate);
- const uint64_t end_sample = end_time.convert_to<double>() * samplerate;
+ QAbstractButton *close_btn =
+ dock->findChildren<QAbstractButton*>
+ ("qt_dockwidget_closebutton").front();
- sample_range = std::make_pair(start_sample, end_sample);
- } else {
- sample_range = std::make_pair(0, 0);
- }
+ 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<views::ViewBase*>(v.get()),
+ SLOT(trigger_event(util::Timestamp)));
+
+ v->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked());
+ v->enable_coloured_bg(action_view_coloured_bg_->isChecked());
- // Construct the filter
- const vector<string> 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<string, Glib::VariantBase> 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();
+ shared_ptr<MainBar> main_bar = session.main_bar();
+ if (!main_bar) {
+ main_bar = make_shared<MainBar>(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)));
+ }
+
+ return v;
}
- StoreProgress *dlg = new StoreProgress(file_name, format, options,
- sample_range, session_, this);
- dlg->run();
+ return nullptr;
}
-void MainWindow::import_file(shared_ptr<InputFormat> format)
+shared_ptr<Session> MainWindow::add_session()
{
- assert(format);
+ static int last_session_id = 1;
+ QString name = tr("Untitled-%1").arg(last_session_id++);
- QSettings settings;
- const QString dir = settings.value(SettingOpenDirectory).toString();
-
- // Construct the filter
- const vector<string> 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<string, Glib::VariantBase> 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> session = make_shared<Session>(device_manager_, name);
+
+ 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()));
+
+ sessions_.push_back(session);
+
+ QMainWindow *window = new QMainWindow();
+ window->setWindowFlags(Qt::Widget); // Remove Qt::Window flag
+ session_windows_[session] = window;
+ session_selector_.addTab(window, name);
+
+ window->setDockNestingEnabled(true);
+
+ shared_ptr<views::ViewBase> main_view =
+ add_view(name, views::ViewTypeTrace, *session);
+
+ return session;
+}
+
+void MainWindow::remove_session(shared_ptr<Session> session)
+{
+ int h = new_session_button_->height();
+
+ for (shared_ptr<views::ViewBase> 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);
+
+ // 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);
+
+ // Remove this entry from the container
+ view_docks_.erase(entry.first);
+ }
}
- load_file(file_name, format, options);
+ QMainWindow *window = session_windows_.at(session);
+ session_selector_.removeTab(session_selector_.indexOf(window));
+
+ session_windows_.erase(session);
+
+ sessions_.remove_if([&](shared_ptr<Session> 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<QWidget*>())
+ w->setMinimumHeight(h);
+
+ 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.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);
-
- // 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<sigrok::OutputFormat>)),
- this, SLOT(export_file(std::shared_ptr<sigrok::OutputFormat>)));
- 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<sigrok::InputFormat>)),
- this, SLOT(import_file(std::shared_ptr<sigrok::InputFormat>)));
- 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_);
-
- view_->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked());
-
- menu_view->addSeparator();
action_view_coloured_bg_->setCheckable(true);
action_view_coloured_bg_->setChecked(true);
action_view_coloured_bg_->setObjectName(
QString::fromUtf8("actionViewColouredBg"));
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));
- 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);
-
- // 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()));
- 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()
-{
- QSettings settings;
- map<string, string> dev_info;
- list<string> key_list;
- shared_ptr<devices::HardwareDevice> 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<devices::HardwareDevice> 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<InputFormat> input_format;
-
- if (!format.empty()) {
- const map<string, shared_ptr<InputFormat> > formats =
- device_manager_.context()->input_formats();
- const auto iter = find_if(formats.begin(), formats.end(),
- [&](const pair<string, shared_ptr<InputFormat> > 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<QApplication *>(QCoreApplication::instance()),
+ SIGNAL(focusChanged(QWidget*, QWidget*)),
+ this, SLOT(on_focus_changed()));
}
-
void MainWindow::save_ui_settings()
{
QSettings settings;
-
- map<string, string> dev_info;
- list<string> 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> session : sessions_) {
+ // Ignore sessions using the demo device or no device at all
+ if (session->device()) {
+ shared_ptr<devices::HardwareDevice> 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");
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> session = add_session();
+ session->restore_settings(settings);
+ settings.endGroup();
+ }
}
-void MainWindow::load_file(QString file_name,
- std::shared_ptr<sigrok::InputFormat> format,
- const std::map<std::string, Glib::VariantBase> &options)
+std::shared_ptr<Session> 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<devices::Device>(
- new devices::InputFile(
- device_manager_.context(),
- file_name.toStdString(),
- format, options)));
- else
- session_.set_device(shared_ptr<devices::Device>(
- 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)
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;
}
-void MainWindow::show_session_error(
- const QString text, const QString info_text)
+bool MainWindow::restoreState(const QByteArray &state, int version)
{
- QMessageBox msg(this);
- msg.setText(text);
- msg.setInformativeText(info_text);
- msg.setStandardButtons(QMessageBox::Ok);
- msg.setIcon(QMessageBox::Warning);
- msg.exec();
-}
+ (void)state;
+ (void)version;
-void MainWindow::on_actionOpen_triggered()
-{
- QSettings settings;
- const QString dir = settings.value(SettingOpenDirectory).toString();
-
- // Show the dialog
- const QString file_name = QFileDialog::getOpenFileName(
- this, tr("Open File"), dir, tr(
- "Sigrok Sessions (*.sr);;"
- "All Files (*.*)"));
+ // Do nothing. We don't want Qt to handle this, or else it
+ // will try to restore all the dock widgets and create havoc.
- if (!file_name.isEmpty()) {
- load_file(file_name);
-
- const QString abs_path = QFileInfo(file_name).absolutePath();
- settings.setValue(SettingOpenDirectory, abs_path);
- }
+ return false;
}
-void MainWindow::on_actionSaveAs_triggered()
+void MainWindow::on_add_view(const QString &title, views::ViewType type,
+ Session *session)
{
- export_file(device_manager_.context()->output_formats()["srzip"]);
+ // We get a pointer and need a reference
+ for (std::shared_ptr<Session> s : sessions_)
+ if (s.get() == session)
+ add_view(title, type, *s);
}
-void MainWindow::on_actionSaveSelectionAs_triggered()
+void MainWindow::on_focus_changed()
{
- export_file(device_manager_.context()->output_formats()["srzip"], true);
-}
+ static shared_ptr<Session> prev_session;
-void MainWindow::on_actionConnect_triggered()
-{
- // Stop any currently running capture session
- session_.stop_capture();
+ shared_ptr<views::ViewBase> view = get_active_view();
- dialogs::Connect dlg(this, device_manager_);
+ if (view) {
+ for (shared_ptr<Session> session : sessions_) {
+ if (session->has_view(view)) {
+ if (session != prev_session) {
+ // Activate correct tab if necessary
+ shared_ptr<Session> tab_session = get_tab_session(
+ session_selector_.currentIndex());
+ if (tab_session != session)
+ session_selector_.setCurrentWidget(
+ session_windows_.at(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());
+ on_focused_session_changed(session);
+ }
- update_device_list();
-}
+ prev_session = session;
+ break;
+ }
+ }
+ }
-void MainWindow::on_actionQuit_triggered()
-{
- close();
+ if (sessions_.empty())
+ setWindowTitle(WindowTitle);
}
-void MainWindow::on_actionViewZoomIn_triggered()
+void MainWindow::on_focused_session_changed(shared_ptr<Session> session)
{
- view_->zoom(1);
+ setWindowTitle(session->name() + " - " + WindowTitle);
}
-void MainWindow::on_actionViewZoomOut_triggered()
+void MainWindow::on_new_session_clicked()
{
- view_->zoom(-1);
+ add_session();
}
-void MainWindow::on_actionViewZoomFit_triggered()
+void MainWindow::on_session_name_changed()
{
- view_->zoom_fit(action_view_zoom_fit_->isChecked());
-}
+ // Update the corresponding dock widget's name(s)
+ Session *session = qobject_cast<Session*>(QObject::sender());
+ assert(session);
-void MainWindow::on_actionViewZoomOneToOne_triggered()
-{
- view_->zoom_one_to_one();
-}
+ for (shared_ptr<views::ViewBase> 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());
+ }
+ }
-void MainWindow::on_actionViewStickyScrolling_triggered()
-{
- view_->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked());
+ // Refresh window title if the affected session has focus
+ shared_ptr<views::ViewBase> view = get_active_view();
+
+ if (view && session->has_view(view))
+ setWindowTitle(session->name() + " - " + WindowTitle);
}
-void MainWindow::on_actionViewColouredBg_triggered()
+void MainWindow::on_new_view(Session *session)
{
- view_->enable_coloured_bg(action_view_coloured_bg_->isChecked());
+ // We get a pointer and need a reference
+ for (std::shared_ptr<Session> s : sessions_)
+ if (s.get() == session)
+ add_view(session->name(), views::ViewTypeTrace, *s);
}
-void MainWindow::on_actionViewShowCursors_triggered()
+void MainWindow::on_view_close_clicked()
{
- assert(view_);
+ // Find the dock widget that contains the close button that was clicked
+ QObject *w = QObject::sender();
+ QDockWidget *dock = 0;
- const bool show = !view_->cursors_shown();
- if (show)
- view_->centre_cursors();
+ while (w) {
+ dock = qobject_cast<QDockWidget*>(w);
+ if (dock)
+ break;
+ w = w->parent();
+ }
- view_->show_cursors(show);
-}
+ // Get the view contained in the dock widget
+ shared_ptr<views::ViewBase> view;
-void MainWindow::on_actionAbout_triggered()
-{
- dialogs::About dlg(device_manager_.context(), this);
- dlg.exec();
+ for (auto entry : view_docks_)
+ if (entry.first == dock)
+ view = entry.second;
+
+ // Deregister the view
+ for (shared_ptr<Session> 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::sticky_scrolling_changed(bool state)
+void MainWindow::on_tab_changed(int index)
{
- action_view_sticky_scrolling_->setChecked(state);
+ shared_ptr<Session> session = get_tab_session(index);
+
+ if (session)
+ on_focused_session_changed(session);
}
-void MainWindow::always_zoom_to_fit_changed(bool state)
+void MainWindow::on_tab_close_requested(int index)
{
- action_view_zoom_fit_->setChecked(state);
+ // TODO Ask user if this is intended in case data is unsaved
+
+ shared_ptr<Session> session = get_tab_session(index);
+
+ if (session)
+ remove_session(session);
}
-void MainWindow::add_decoder(srd_decoder *decoder)
+void MainWindow::on_actionViewStickyScrolling_triggered()
{
-#ifdef ENABLE_DECODE
- assert(decoder);
- session_.add_decoder(decoder);
-#else
- (void)decoder;
-#endif
+ shared_ptr<views::ViewBase> viewbase = get_active_view();
+ views::TraceView::View* view =
+ qobject_cast<views::TraceView::View*>(viewbase.get());
+ if (view)
+ view->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked());
}
-void MainWindow::capture_state_changed(int state)
+void MainWindow::on_actionViewColouredBg_triggered()
{
- main_bar_->set_capture_state((pv::Session::capture_state)state);
+ shared_ptr<views::ViewBase> viewbase = get_active_view();
+ views::TraceView::View* view =
+ qobject_cast<views::TraceView::View*>(viewbase.get());
+ if (view)
+ view->enable_coloured_bg(action_view_coloured_bg_->isChecked());
}
-void MainWindow::device_selected()
+void MainWindow::on_actionAbout_triggered()
{
- // Set the title to include the device/file name
- const shared_ptr<devices::Device> device = session_.device();
- if (!device)
- return;
-
- const string display_name = device->display_name(device_manager_);
- setWindowTitle(tr("%1 - PulseView").arg(display_name.c_str()));
+ dialogs::About dlg(device_manager_.context(), this);
+ dlg.exec();
}
} // namespace pv
projects / pulseview.git / blobdiff