X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=inline;f=pv%2Fmainwindow.cpp;h=25377024278ca8f7475a572c3d9867d7a64efdb8;hb=0ee02e5050eac3a5469d49bee7446a24a243f7b3;hp=4088c26d1c86b430f3f811df8269c07b6be65616;hpb=449413ab466591037c7fdcf7267ee5c73493c61c;p=pulseview.git
diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 4088c26..2537702 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -14,76 +14,47 @@
* 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::map;
-using std::pair;
+using std::dynamic_pointer_cast;
+using std::make_shared;
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 {
@@ -91,547 +62,456 @@ namespace view {
class ViewItem;
}
-const char *MainWindow::SettingOpenDirectory = "MainWindow/OpenDirectory";
-const char *MainWindow::SettingSaveDirectory = "MainWindow/SaveDirectory";
+using toolbars::MainBar;
-MainWindow::MainWindow(DeviceManager &device_manager,
- string open_file_name, string open_file_format,
- QWidget *parent) :
+const QString MainWindow::WindowTitle = tr("PulseView");
+
+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_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::add_change_handler(this);
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
+MainWindow::~MainWindow()
{
- return action_open_;
-}
+ GlobalSettings::remove_change_handler(this);
-QAction* MainWindow::action_save_as() const
-{
- return action_save_as_;
+ while (!sessions_.empty())
+ remove_session(sessions_.front());
}
-QAction* MainWindow::action_save_selection_as() const
+void MainWindow::show_session_error(const QString text, const QString info_text)
{
- return action_save_selection_as_;
-}
+ // TODO Emulate noquote()
+ qDebug() << "Notifying user of session error:" << info_text;
-QAction* MainWindow::action_connect() const
-{
- return action_connect_;
+ QMessageBox msg;
+ msg.setText(text);
+ msg.setInformativeText(info_text);
+ msg.setStandardButtons(QMessageBox::Ok);
+ msg.setIcon(QMessageBox::Warning);
+ msg.exec();
}
-QAction* MainWindow::action_quit() const
+shared_ptr MainWindow::get_active_view() const
{
- return action_quit_;
-}
+ // If there's only one view, use it...
+ if (view_docks_.size() == 1)
+ return view_docks_.begin()->second;
-QAction* MainWindow::action_view_zoom_in() const
-{
- return action_view_zoom_in_;
-}
+ // ...otherwise find the dock widget the widget with focus is contained in
+ QObject *w = QApplication::focusWidget();
+ QDockWidget *dock = nullptr;
-QAction* MainWindow::action_view_zoom_out() const
-{
- return action_view_zoom_out_;
-}
+ while (w) {
+ dock = qobject_cast(w);
+ if (dock)
+ break;
+ w = w->parent();
+ }
-QAction* MainWindow::action_view_zoom_fit() const
-{
- return action_view_zoom_fit_;
-}
+ // Get the view contained in the dock widget
+ for (auto entry : view_docks_)
+ if (entry.first == dock)
+ return entry.second;
-QAction* MainWindow::action_view_zoom_one_to_one() const
-{
- return action_view_zoom_one_to_one_;
+ return nullptr;
}
-QAction* MainWindow::action_view_sticky_scrolling() const
+shared_ptr MainWindow::add_view(const QString &title,
+ views::ViewType type, Session &session)
{
- return action_view_sticky_scrolling_;
-}
+ GlobalSettings settings;
+ shared_ptr v;
-QAction* MainWindow::action_view_show_cursors() const
-{
- return action_view_show_cursors_;
-}
+ QMainWindow *main_window = nullptr;
+ for (auto entry : session_windows_)
+ if (entry.first.get() == &session)
+ main_window = entry.second;
-QAction* MainWindow::action_about() const
-{
- return action_about_;
-}
+ assert(main_window);
-#ifdef ENABLE_DECODE
-QMenu* MainWindow::menu_decoder_add() const
-{
- return menu_decoders_add_;
-}
-#endif
+ shared_ptr main_bar = session.main_bar();
-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;
+ QDockWidget* dock = new QDockWidget(title, main_window);
+ dock->setObjectName(title);
+ 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
+
+ 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);
+
+ if (!v)
+ return nullptr;
+
+ view_docks_[dock] = v;
+ session.register_view(v);
+
+ dock_main->setCentralWidget(v.get());
+ dock->setWidget(dock_main);
+
+ dock->setContextMenuPolicy(Qt::PreventContextMenu);
+ dock->setFeatures(QDockWidget::DockWidgetMovable |
+ QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable);
+
+ QAbstractButton *close_btn =
+ dock->findChildren
+ ("qt_dockwidget_closebutton").front();
+
+ connect(close_btn, SIGNAL(clicked(bool)),
+ this, SLOT(on_view_close_clicked()));
+
+ connect(&session, SIGNAL(trigger_event(int, util::Timestamp)),
+ qobject_cast(v.get()),
+ SLOT(trigger_event(int, util::Timestamp)));
+
+ if (type == views::ViewTypeTrace) {
+ views::trace::View *tv =
+ qobject_cast(v.get());
+
+ tv->enable_colored_bg(settings.value(GlobalSettings::Key_View_ColoredBG).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 (!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);
+
+ connect(main_bar.get(), SIGNAL(new_view(Session*)),
+ this, SLOT(on_new_view(Session*)));
+
+ main_bar->action_view_show_cursors()->setChecked(tv->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);
+
+ standard_bar->action_view_show_cursors()->setChecked(tv->cursors_shown());
+ }
}
+
+ return v;
}
-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();
+void MainWindow::remove_view(shared_ptr view)
+{
+ for (shared_ptr session : sessions_) {
+ if (!session->has_view(view))
+ continue;
+
+ // 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++);
- // Stop any currently running capture session
- session_.stop_capture();
+ shared_ptr session = make_shared(device_manager_, name);
- QSettings settings;
- const QString dir = settings.value(SettingSaveDirectory).toString();
+ 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()));
- std::pair sample_range;
+ sessions_.push_back(session);
- // 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;
- }
+ QMainWindow *window = new QMainWindow();
+ window->setWindowFlags(Qt::Widget); // Remove Qt::Window flag
+ session_windows_[session] = window;
- const double samplerate = session_.get_samplerate();
+ int index = session_selector_.addTab(window, name);
+ session_selector_.setCurrentIndex(index);
+ last_focused_session_ = session;
- const pv::util::Timestamp& start_time = view_->cursors()->first()->time();
- const pv::util::Timestamp& end_time = view_->cursors()->second()->time();
+ window->setDockNestingEnabled(true);
- const uint64_t start_sample = start_time.convert_to() * samplerate;
- const uint64_t end_sample = end_time.convert_to() * samplerate;
+ shared_ptr main_view =
+ add_view(name, views::ViewTypeTrace, *session);
- sample_range = std::make_pair(start_sample, end_sample);
- } else {
- sample_range = std::make_pair(0, 0);
- }
+ return session;
+}
+
+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, ", *."))).arg(
- 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);
+
+ 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; });
+
+ 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);
- 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();
+ // Update the window title if there is no view left to
+ // generate focus change events
+ setWindowTitle(WindowTitle);
}
+}
- StoreProgress *dlg = new StoreProgress(file_name, format, options,
- sample_range, session_, this);
- dlg->run();
+void MainWindow::add_session_with_file(string open_file_name,
+ string open_file_format)
+{
+ shared_ptr session = add_session();
+ session->load_init_file(open_file_name, open_file_format);
}
-void MainWindow::import_file(shared_ptr format)
+void MainWindow::add_default_session()
{
- assert(format);
+ // Only add the default session if there would be no session otherwise
+ if (sessions_.size() > 0)
+ return;
+ 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);
+}
+
+void MainWindow::save_sessions()
+{
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())).arg(
- 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;
+ 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();
+ }
+ }
+
+ settings.setValue("sessions", id);
+}
+
+void MainWindow::restore_sessions()
+{
+ QSettings settings;
+ int i, session_count;
+
+ session_count = settings.value("sessions", 0).toInt();
- // 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();
+ 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::on_setting_changed(const QString &key, const QVariant &value)
+{
+ if (key == GlobalSettings::Key_View_ColoredBG)
+ on_settingViewColoredBg_changed(value);
- load_file(file_name, format, options);
+ if (key == GlobalSettings::Key_View_ShowSamplingPoints)
+ on_settingViewShowSamplingPoints_changed(value);
- const QString abs_path = QFileInfo(file_name).absolutePath();
- settings.setValue(SettingOpenDirectory, abs_path);
+ if (key == GlobalSettings::Key_View_ShowAnalogMinorGrid)
+ on_settingViewShowAnalogMinorGrid_changed(value);
}
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/pulseview.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)),
- 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_);
-
- view_->enable_sticky_scrolling(action_view_sticky_scrolling_->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"));
+ 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
+ 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);
- // Help Menu
- QMenu *const menu_help = new QMenu;
- menu_help->setTitle(tr("&Help"));
+ view_colored_bg_shortcut_ = new QShortcut(QKeySequence(Qt::Key_B), this, SLOT(on_view_colored_bg_shortcut()));
+ view_colored_bg_shortcut_->setAutoRepeat(false);
- action_about_->setObjectName(QString::fromUtf8("actionAbout"));
- action_about_->setText(tr("&About..."));
- menu_help->addAction(action_about_);
+ // Set up the tab area
+ new_session_button_ = new QToolButton();
+ new_session_button_->setIcon(QIcon::fromTheme("document-new",
+ QIcon(":/icons/document-new.png")));
+ new_session_button_->setToolTip(tr("Create New Session"));
+ new_session_button_->setAutoRaise(true);
- 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());
+ run_stop_button_ = new QToolButton();
+ run_stop_button_->setAutoRaise(true);
+ run_stop_button_->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+ run_stop_button_->setToolTip(tr("Start/Stop Acquisition"));
- setMenuBar(menu_bar);
- QMetaObject::connectSlotsByName(this);
+ run_stop_shortcut_ = new QShortcut(QKeySequence(Qt::Key_Space), run_stop_button_, SLOT(click()));
+ run_stop_shortcut_->setAutoRepeat(false);
- // Also add all actions to the main window for always-enabled hotkeys
- for (QAction* action : menu_bar->actions())
- this->addAction(action);
+ 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);
- // Setup the toolbar
- main_bar_ = new toolbars::MainBar(session_, *this);
+ QFrame *separator1 = new QFrame();
+ separator1->setFrameStyle(QFrame::VLine | QFrame::Raised);
+ QFrame *separator2 = new QFrame();
+ separator2->setFrameStyle(QFrame::VLine | QFrame::Raised);
- // Populate the device list and select the initially selected device
- update_device_list();
+ 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_);
- addToolBar(main_bar_);
+ static_tab_widget_ = new QWidget();
+ static_tab_widget_->setLayout(layout);
- // Set the title
- setWindowTitle(tr("PulseView"));
+ session_selector_.setCornerWidget(static_tab_widget_, Qt::TopLeftCorner);
+ session_selector_.setTabsClosable(true);
- // 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)));
+ close_application_shortcut_ = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q), this, SLOT(close()));
+ close_application_shortcut_->setAutoRepeat(false);
- // 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)));
+ close_current_tab_shortcut_ = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_W), this, SLOT(on_close_current_tab()));
-}
+ 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()));
-void MainWindow::select_init_device()
-{
- QSettings settings;
- map dev_info;
- list key_list;
-
- // Re-select last used device if possible.
- 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;
+ 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)));
- const string value = settings.value(k).toString().toStdString();
- if (!value.empty())
- dev_info.insert(std::make_pair(key, value));
- }
-
- const shared_ptr device =
- device_manager_.find_device_from_info(dev_info);
- select_device(device);
- update_device_list();
-
- settings.endGroup();
-}
-
-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);
+ 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;
-
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()
@@ -649,202 +529,322 @@ void MainWindow::restore_ui_settings()
settings.endGroup();
}
-void MainWindow::session_error(
- const QString text, const QString info_text)
+shared_ptr MainWindow::get_tab_session(int index) const
{
- QMetaObject::invokeMethod(this, "show_session_error",
- Qt::QueuedConnection, Q_ARG(QString, text),
- Q_ARG(QString, info_text));
+ // 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;
+
+ return nullptr;
}
-void MainWindow::update_device_list()
+void MainWindow::closeEvent(QCloseEvent *event)
{
- main_bar_->update_device_list();
+ bool data_saved = true;
+
+ 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();
+ }
}
-void MainWindow::load_file(QString file_name,
- std::shared_ptr format,
- const std::map &options)
+QMenu* MainWindow::createPopupMenu()
{
- const QString errorMessage(
- QString("Failed to load file %1").arg(file_name));
+ return nullptr;
+}
- 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;
- }
+bool MainWindow::restoreState(const QByteArray &state, int version)
+{
+ (void)state;
+ (void)version;
- update_device_list();
+ // Do nothing. We don't want Qt to handle this, or else it
+ // will try to restore all the dock widgets and create havoc.
- session_.start_capture([&, errorMessage](QString infoMessage) {
- session_error(errorMessage, infoMessage); });
+ return false;
}
-void MainWindow::closeEvent(QCloseEvent *event)
+void MainWindow::on_add_view(const QString &title, views::ViewType type,
+ Session *session)
{
- save_ui_settings();
- event->accept();
+ // We get a pointer and need a reference
+ for (shared_ptr s : sessions_)
+ if (s.get() == session)
+ add_view(title, type, *s);
}
-void MainWindow::keyReleaseEvent(QKeyEvent *event)
+void MainWindow::on_focus_changed()
{
- if (event->key() == Qt::Key_Alt) {
- menuBar()->setHidden(!menuBar()->isHidden());
- menuBar()->setFocus();
+ shared_ptr view = get_active_view();
+
+ 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));
+
+ on_focused_session_changed(session);
+ }
+
+ break;
+ }
+ }
}
- QMainWindow::keyReleaseEvent(event);
+
+ if (sessions_.empty())
+ setWindowTitle(WindowTitle);
}
-void MainWindow::show_session_error(
- const QString text, const QString info_text)
+void MainWindow::on_focused_session_changed(shared_ptr session)
{
- QMessageBox msg(this);
- msg.setText(text);
- msg.setInformativeText(info_text);
- msg.setStandardButtons(QMessageBox::Ok);
- msg.setIcon(QMessageBox::Warning);
- msg.exec();
+ 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_actionOpen_triggered()
+void MainWindow::on_new_session_clicked()
{
- QSettings settings;
- const QString dir = settings.value(SettingOpenDirectory).toString();
+ add_session();
+}
- // Show the dialog
- const QString file_name = QFileDialog::getOpenFileName(
- this, tr("Open File"), dir, tr(
- "Sigrok Sessions (*.sr);;"
- "All Files (*.*)"));
+void MainWindow::on_run_stop_clicked()
+{
+ shared_ptr session = last_focused_session_;
- if (!file_name.isEmpty()) {
- load_file(file_name);
+ if (!session)
+ return;
- const QString abs_path = QFileInfo(file_name).absolutePath();
- settings.setValue(SettingOpenDirectory, abs_path);
+ switch (session->get_capture_state()) {
+ case Session::Stopped:
+ session->start_capture([&](QString message) {
+ show_session_error("Capture failed", message); });
+ break;
+ case Session::AwaitingTrigger:
+ case Session::Running:
+ session->stop_capture();
+ break;
}
}
-void MainWindow::on_actionSaveAs_triggered()
+void MainWindow::on_settings_clicked()
{
- export_file(device_manager_.context()->output_formats()["srzip"]);
+ dialogs::Settings dlg(device_manager_);
+ dlg.exec();
}
-void MainWindow::on_actionSaveSelectionAs_triggered()
+void MainWindow::on_session_name_changed()
{
- export_file(device_manager_.context()->output_formats()["srzip"], true);
+ // Update the corresponding dock widget's name(s)
+ Session *session = qobject_cast(QObject::sender());
+ assert(session);
+
+ 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_actionConnect_triggered()
+void MainWindow::on_capture_state_changed(QObject *obj)
{
- // Stop any currently running capture session
- session_.stop_capture();
+ Session *caller = qobject_cast(obj);
- dialogs::Connect dlg(this, device_manager_);
+ // 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;
- // 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());
+ int state = caller->get_capture_state();
- update_device_list();
+ 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_actionQuit_triggered()
+void MainWindow::on_new_view(Session *session)
{
- close();
+ // 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_actionViewZoomIn_triggered()
+void MainWindow::on_view_close_clicked()
{
- view_->zoom(1);
-}
+ // Find the dock widget that contains the close button that was clicked
+ QObject *w = QObject::sender();
+ QDockWidget *dock = nullptr;
-void MainWindow::on_actionViewZoomOut_triggered()
-{
- 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()) {
+ // ...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_actionViewZoomFit_triggered()
+void MainWindow::on_tab_changed(int index)
{
- 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)
{
- view_->zoom_one_to_one();
+ shared_ptr session = get_tab_session(index);
+
+ if (!session)
+ return;
+
+ 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);
}
-void MainWindow::on_actionViewStickyScrolling_triggered()
+void MainWindow::on_view_colored_bg_shortcut()
{
- view_->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked());
+ GlobalSettings settings;
+
+ bool state = settings.value(GlobalSettings::Key_View_ColoredBG).toBool();
+ settings.setValue(GlobalSettings::Key_View_ColoredBG, !state);
}
-void MainWindow::on_actionViewShowCursors_triggered()
+void MainWindow::on_view_sticky_scrolling_shortcut()
{
- assert(view_);
-
- const bool show = !view_->cursors_shown();
- if (show)
- view_->centre_cursors();
+ GlobalSettings settings;
- view_->show_cursors(show);
+ bool state = settings.value(GlobalSettings::Key_View_StickyScrolling).toBool();
+ settings.setValue(GlobalSettings::Key_View_StickyScrolling, !state);
}
-void MainWindow::on_actionAbout_triggered()
+void MainWindow::on_view_show_sampling_points_shortcut()
{
- dialogs::About dlg(device_manager_.context(), this);
- dlg.exec();
+ GlobalSettings settings;
+
+ bool state = settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool();
+ settings.setValue(GlobalSettings::Key_View_ShowSamplingPoints, !state);
}
-void MainWindow::sticky_scrolling_changed(bool state)
+void MainWindow::on_view_show_analog_minor_grid_shortcut()
{
- action_view_sticky_scrolling_->setChecked(state);
+ GlobalSettings settings;
+
+ bool state = settings.value(GlobalSettings::Key_View_ShowAnalogMinorGrid).toBool();
+ settings.setValue(GlobalSettings::Key_View_ShowAnalogMinorGrid, !state);
}
-void MainWindow::always_zoom_to_fit_changed(bool state)
+void MainWindow::on_settingViewColoredBg_changed(const QVariant new_value)
{
- action_view_zoom_fit_->setChecked(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_colored_bg(state);
+ }
}
-void MainWindow::add_decoder(srd_decoder *decoder)
+void MainWindow::on_settingViewShowSamplingPoints_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_show_sampling_points(state);
+ }
}
-void MainWindow::capture_state_changed(int state)
+void MainWindow::on_settingViewShowAnalogMinorGrid_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_analog_minor_grid(state);
+ }
}
-void MainWindow::device_selected()
+void MainWindow::on_close_current_tab()
{
- // Set the title to include the device/file name
- const shared_ptr device = session_.device();
- if (!device)
- return;
+ 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