]> sigrok.org Git - pulseview.git/blobdiff - pv/mainwindow.cpp
DecodeTrace: Add FlowLayout and integrate it
[pulseview.git] / pv / mainwindow.cpp
index 0b68b1d7a9a9b2530bd58872b119f3ad5ae65fe2..2823adc0ec08e1f9f3f341ef7e52415c506471b0 100644 (file)
@@ -51,6 +51,7 @@
 
 #ifdef ENABLE_DECODE
 #include "subwindows/decoder_selector/subwindow.hpp"
+#include "views/decoder_output/view.hpp"
 #endif
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
@@ -62,10 +63,6 @@ using std::string;
 
 namespace pv {
 
-namespace view {
-class ViewItem;
-}
-
 using toolbars::MainBar;
 
 const QString MainWindow::WindowTitle = tr("PulseView");
@@ -79,16 +76,12 @@ MainWindow::MainWindow(DeviceManager &device_manager, QWidget *parent) :
        icon_green_(":/icons/status-green.svg"),
        icon_grey_(":/icons/status-grey.svg")
 {
-       GlobalSettings::add_change_handler(this);
-
        setup_ui();
        restore_ui_settings();
 }
 
 MainWindow::~MainWindow()
 {
-       GlobalSettings::remove_change_handler(this);
-
        // Make sure we no longer hold any shared pointers to widgets after the
        // destructor finishes (goes for sessions and sub windows alike)
 
@@ -135,8 +128,8 @@ shared_ptr<views::ViewBase> MainWindow::get_active_view() const
        return nullptr;
 }
 
-shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
-       views::ViewType type, Session &session)
+shared_ptr<views::ViewBase> MainWindow::add_view(views::ViewType type,
+       Session &session)
 {
        GlobalSettings settings;
        shared_ptr<views::ViewBase> v;
@@ -150,6 +143,13 @@ shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
 
        shared_ptr<MainBar> main_bar = session.main_bar();
 
+       // Only use the view type in the name if it's not the main view
+       QString title;
+       if (main_bar)
+               title = QString("%1 (%2)").arg(session.name()).arg(views::ViewTypeNames[type]);
+       else
+               title = session.name();
+
        QDockWidget* dock = new QDockWidget(title, main_window);
        dock->setObjectName(title);
        main_window->addDockWidget(Qt::TopDockWidgetArea, dock);
@@ -160,8 +160,11 @@ shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
 
        if (type == views::ViewTypeTrace)
                // This view will be the main view if there's no main bar yet
-               v = make_shared<views::trace::View>(session,
-                       (main_bar ? false : true), dock_main);
+               v = make_shared<views::trace::View>(session, (main_bar ? false : true), dock_main);
+#ifdef ENABLE_DECODE
+       if (type == views::ViewTypeDecoderOutput)
+               v = make_shared<views::decoder_output::View>(session, false, dock_main);
+#endif
 
        if (!v)
                return nullptr;
@@ -191,18 +194,14 @@ shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
                views::trace::View *tv =
                        qobject_cast<views::trace::View*>(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<MainBar>(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*)));
+                       connect(main_bar.get(), SIGNAL(new_view(Session*, int)),
+                               this, SLOT(on_new_view(Session*, int)));
                        connect(main_bar.get(), SIGNAL(show_decoder_selector(Session*)),
                                this, SLOT(on_show_decoder_selector(Session*)));
 
@@ -307,6 +306,9 @@ shared_ptr<subwindows::SubWindowBase> MainWindow::add_subwindow(
                dock->findChildren<QAbstractButton*>  // clazy:exclude=detaching-temporary
                        ("qt_dockwidget_closebutton").front();
 
+       // Allow all subwindows to be closed via ESC.
+       close_btn->setShortcut(QKeySequence(Qt::Key_Escape));
+
        connect(close_btn, SIGNAL(clicked(bool)),
                this, SLOT(on_sub_window_close_clicked()));
 
@@ -326,8 +328,8 @@ shared_ptr<Session> MainWindow::add_session()
 
        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(add_view(views::ViewType, Session*)),
+               this, SLOT(on_add_view(views::ViewType, Session*)));
        connect(session.get(), SIGNAL(name_changed()),
                this, SLOT(on_session_name_changed()));
        session_state_mapper_.setMapping(session.get(), session.get());
@@ -346,8 +348,7 @@ shared_ptr<Session> MainWindow::add_session()
 
        window->setDockNestingEnabled(true);
 
-       shared_ptr<views::ViewBase> main_view =
-               add_view(name, views::ViewTypeTrace, *session);
+       shared_ptr<views::ViewBase> main_view = add_view(views::ViewTypeTrace, *session);
 
        return session;
 }
@@ -476,18 +477,6 @@ void MainWindow::restore_sessions()
        }
 }
 
-void MainWindow::on_setting_changed(const QString &key, const QVariant &value)
-{
-       if (key == GlobalSettings::Key_View_ColoredBG)
-               on_settingViewColoredBg_changed(value);
-
-       if (key == GlobalSettings::Key_View_ShowSamplingPoints)
-               on_settingViewShowSamplingPoints_changed(value);
-
-       if (key == GlobalSettings::Key_View_ShowAnalogMinorGrid)
-               on_settingViewShowAnalogMinorGrid_changed(value);
-}
-
 void MainWindow::setup_ui()
 {
        setObjectName(QString::fromUtf8("MainWindow"));
@@ -499,6 +488,7 @@ void MainWindow::setup_ui()
        icon.addFile(QString(":/icons/pulseview.png"));
        setWindowIcon(icon);
 
+       // Set up keyboard shortcuts that affect all views at once
        view_sticky_scrolling_shortcut_ = new QShortcut(QKeySequence(Qt::Key_S), this, SLOT(on_view_sticky_scrolling_shortcut()));
        view_sticky_scrolling_shortcut_->setAutoRepeat(false);
 
@@ -511,22 +501,6 @@ void MainWindow::setup_ui()
        view_colored_bg_shortcut_ = new QShortcut(QKeySequence(Qt::Key_B), this, SLOT(on_view_colored_bg_shortcut()));
        view_colored_bg_shortcut_->setAutoRepeat(false);
 
-       zoom_in_shortcut_ = new QShortcut(QKeySequence(Qt::Key_Plus), this, SLOT(on_zoom_in_shortcut_triggered()));
-       zoom_in_shortcut_->setAutoRepeat(false);
-
-       zoom_in_shortcut_2_ = new QShortcut(QKeySequence(Qt::Key_Up), this, SLOT(on_zoom_in_shortcut_triggered()));
-
-       zoom_out_shortcut_ = new QShortcut(QKeySequence(Qt::Key_Minus), this, SLOT(on_zoom_out_shortcut_triggered()));
-       zoom_out_shortcut_->setAutoRepeat(false);
-
-       zoom_out_shortcut_2_ = new QShortcut(QKeySequence(Qt::Key_Down), this, SLOT(on_zoom_out_shortcut_triggered()));
-
-       home_shortcut_ = new QShortcut(QKeySequence(Qt::Key_Home), this, SLOT(on_scroll_to_start_triggered()));
-       home_shortcut_->setAutoRepeat(false);
-
-       end_shortcut_ = new QShortcut(QKeySequence(Qt::Key_End), this, SLOT(on_scroll_to_end_triggered()));
-       end_shortcut_->setAutoRepeat(false);
-
        // Set up the tab area
        new_session_button_ = new QToolButton();
        new_session_button_->setIcon(QIcon::fromTheme("document-new",
@@ -617,19 +591,6 @@ void MainWindow::restore_ui_settings()
        settings.endGroup();
 }
 
-void MainWindow::zoom_current_view(double steps)
-{
-       shared_ptr<Session> session = get_tab_session(session_selector_.currentIndex());
-
-       if (!session)
-               return;
-
-       shared_ptr<views::ViewBase> v = session.get()->main_view();
-       views::trace::View *tv =
-               qobject_cast<views::trace::View*>(v.get());
-       tv->zoom(steps);
-}
-
 shared_ptr<Session> MainWindow::get_tab_session(int index) const
 {
        // Find the session that belongs to the tab's main window
@@ -675,13 +636,12 @@ bool MainWindow::restoreState(const QByteArray &state, int version)
        return false;
 }
 
-void MainWindow::on_add_view(const QString &title, views::ViewType type,
-       Session *session)
+void MainWindow::on_add_view(views::ViewType type, Session *session)
 {
        // We get a pointer and need a reference
        for (shared_ptr<Session>& s : sessions_)
                if (s.get() == session)
-                       add_view(title, type, *s);
+                       add_view(type, *s);
 }
 
 void MainWindow::on_focus_changed()
@@ -796,12 +756,12 @@ void MainWindow::on_capture_state_changed(QObject *obj)
                tr("Run") : tr("Stop"));
 }
 
-void MainWindow::on_new_view(Session *session)
+void MainWindow::on_new_view(Session *session, int view_type)
 {
        // We get a pointer and need a reference
        for (shared_ptr<Session>& s : sessions_)
                if (s.get() == session)
-                       add_view(session->name(), views::ViewTypeTrace, *s);
+                       add_view((views::ViewType)view_type, *s);
 }
 
 void MainWindow::on_view_close_clicked()
@@ -936,84 +896,6 @@ void MainWindow::on_view_show_analog_minor_grid_shortcut()
        settings.setValue(GlobalSettings::Key_View_ShowAnalogMinorGrid, !state);
 }
 
-void MainWindow::on_settingViewColoredBg_changed(const QVariant new_value)
-{
-       bool state = new_value.toBool();
-
-       for (auto& entry : view_docks_) {
-               shared_ptr<views::ViewBase> viewbase = entry.second;
-
-               // Only trace views have this setting
-               views::trace::View* view =
-                               qobject_cast<views::trace::View*>(viewbase.get());
-               if (view)
-                       view->enable_colored_bg(state);
-       }
-}
-
-void MainWindow::on_settingViewShowSamplingPoints_changed(const QVariant new_value)
-{
-       bool state = new_value.toBool();
-
-       for (auto& entry : view_docks_) {
-               shared_ptr<views::ViewBase> viewbase = entry.second;
-
-               // Only trace views have this setting
-               views::trace::View* view =
-                               qobject_cast<views::trace::View*>(viewbase.get());
-               if (view)
-                       view->enable_show_sampling_points(state);
-       }
-}
-
-void MainWindow::on_settingViewShowAnalogMinorGrid_changed(const QVariant new_value)
-{
-       bool state = new_value.toBool();
-
-       for (auto& entry : view_docks_) {
-               shared_ptr<views::ViewBase> viewbase = entry.second;
-
-               // Only trace views have this setting
-               views::trace::View* view =
-                               qobject_cast<views::trace::View*>(viewbase.get());
-               if (view)
-                       view->enable_show_analog_minor_grid(state);
-       }
-}
-
-void MainWindow::on_zoom_out_shortcut_triggered()
-{
-       zoom_current_view(-1);
-}
-
-void MainWindow::on_zoom_in_shortcut_triggered()
-{
-       zoom_current_view(1);
-}
-
-void MainWindow::on_scroll_to_start_triggered()
-{
-       scroll_to_start_or_end(true);
-}
-
-void MainWindow::on_scroll_to_end_triggered()
-{
-       scroll_to_start_or_end(false);
-}
-
-void MainWindow::scroll_to_start_or_end(bool start)
-{
-       shared_ptr<Session> session = get_tab_session(session_selector_.currentIndex());
-
-       if (!session)
-               return;
-
-       shared_ptr<views::ViewBase> v = session.get()->main_view();
-       views::trace::View *tv =
-               qobject_cast<views::trace::View*>(v.get());
-       tv->set_h_offset(start ? 0 : tv->get_h_scrollbar_maximum());
-}
-
 void MainWindow::on_close_current_tab()
 {
        int tab = session_selector_.currentIndex();