Change namespace for the trace view and implement ViewBase

[pulseview.git] / pv / mainwindow.hpp

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 1ab3c589e615bc1251ddf351d924634f92a0b6d8..ddad67050f03a5a78317ae00fd00d17750ad53c0 100644 (file)
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -25,21 +25,15 @@
 #include <map>
 #include <memory>
 
-#include <glibmm/variant.h>
-
 #include <QMainWindow>
 
 #include "session.hpp"
+#include "views/viewbase.hpp"
 
 struct srd_decoder;
 
 class QVBoxLayout;
 
-namespace sigrok {
-class InputFormat;
-class OutputFormat;
-}
-
 namespace pv {
 
 class DeviceManager;
@@ -64,17 +58,7 @@ class MainWindow : public QMainWindow
        Q_OBJECT
 
 private:
-       /**
-        * Name of the setting used to remember the directory
-        * containing the last file that was opened.
-        */
-       static const char *SettingOpenDirectory;
-
-       /**
-        * Name of the setting used to remember the directory
-        * containing the last file that was saved.
-        */
-       static const char *SettingSaveDirectory;
+       static const QString WindowTitle;
 
 public:
        explicit MainWindow(DeviceManager &device_manager,
@@ -82,129 +66,63 @@ public:
                std::string open_file_format = std::string(),
                QWidget *parent = 0);
 
-       QAction* action_open() const;
-       QAction* action_save_as() const;
-       QAction* action_save_selection_as() const;
-       QAction* action_connect() const;
-       QAction* action_quit() const;
-       QAction* action_view_zoom_in() const;
-       QAction* action_view_zoom_out() const;
-       QAction* action_view_zoom_fit() const;
-       QAction* action_view_zoom_one_to_one() const;
+       ~MainWindow();
+
        QAction* action_view_sticky_scrolling() const;
        QAction* action_view_coloured_bg() const;
-       QAction* action_view_show_cursors() const;
        QAction* action_about() const;
 
-#ifdef ENABLE_DECODE
-       QMenu* menu_decoder_add() const;
-#endif
-
-       std::shared_ptr<pv::view::View> get_active_view() const;
+       std::shared_ptr<views::ViewBase> get_active_view() const;
 
-       void run_stop();
+       std::shared_ptr<views::ViewBase> add_view(const QString &title,
+               views::ViewType type, Session &session);
 
-       void select_device(std::shared_ptr<devices::Device> device);
+       std::shared_ptr<Session> add_session();
 
-public Q_SLOTS:
-       void export_file(std::shared_ptr<sigrok::OutputFormat> format,
-               bool selection_only = false);
-       void import_file(std::shared_ptr<sigrok::InputFormat> format);
+       void remove_session(std::shared_ptr<Session> session);
 
 private:
        void setup_ui();
 
-       void select_init_device();
-
-       void load_init_file(const std::string &file_name,
-               const std::string &format);
-
        void save_ui_settings();
 
        void restore_ui_settings();
 
-       void session_error(const QString text, const QString info_text);
-
-       /**
-        * Updates the device list in the toolbar
-        */
-       void update_device_list();      
-
-       void load_file(QString file_name,
-               std::shared_ptr<sigrok::InputFormat> format = nullptr,
-               const std::map<std::string, Glib::VariantBase> &options =
-                       std::map<std::string, Glib::VariantBase>());
-
-       void save_selection_to_file();
-
 private:
        void closeEvent(QCloseEvent *event);
 
-       void keyReleaseEvent(QKeyEvent *event);
+       virtual QMenu* createPopupMenu();
 
-private Q_SLOTS:
-       void show_session_error(
-               const QString text, const QString info_text);
+       virtual bool restoreState(const QByteArray &state, int version = 0);
 
-       void on_actionOpen_triggered();
-       void on_actionSaveAs_triggered();
-       void on_actionSaveSelectionAs_triggered();
-       void on_actionQuit_triggered();
-
-       void on_actionConnect_triggered();
-
-       void on_actionViewZoomIn_triggered();
-
-       void on_actionViewZoomOut_triggered();
+private Q_SLOTS:
+       void on_add_view(const QString &title, views::ViewType type,
+               Session *session);
 
-       void on_actionViewZoomFit_triggered();
+       void on_focus_changed();
 
-       void on_actionViewZoomOneToOne_triggered();
+       void on_new_session();
+       void on_session_name_changed();
+       void on_new_view(Session *session);
+       void on_view_close_clicked();
 
        void on_actionViewStickyScrolling_triggered();
 
        void on_actionViewColouredBg_triggered();
 
-       void on_actionViewShowCursors_triggered();
-
        void on_actionAbout_triggered();
 
-       void add_decoder(srd_decoder *decoder);
-
-       void capture_state_changed(int state);
-       void device_selected();
-
-       void sticky_scrolling_changed(bool state);
-
-       void always_zoom_to_fit_changed(bool state);
-
 private:
        DeviceManager &device_manager_;
 
-       Session session_;
+       std::list< std::shared_ptr<Session> > sessions_;
 
        std::map< std::shared_ptr<QDockWidget>,
-               std::shared_ptr<pv::view::View> > view_docks_;
-
-       toolbars::MainBar *main_bar_;
-
-       QAction *const action_open_;
-       QAction *const action_save_as_;
-       QAction *const action_save_selection_as_;
-       QAction *const action_connect_;
-       QAction *const action_quit_;
-       QAction *const action_view_zoom_in_;
-       QAction *const action_view_zoom_out_;
-       QAction *const action_view_zoom_fit_;
-       QAction *const action_view_zoom_one_to_one_;
+               std::shared_ptr<views::ViewBase> > view_docks_;
+
        QAction *const action_view_sticky_scrolling_;
        QAction *const action_view_coloured_bg_;
-       QAction *const action_view_show_cursors_;
        QAction *const action_about_;
-
-#ifdef ENABLE_DECODE
-       QMenu *const menu_decoders_add_;
-#endif
 };
 
 } // namespace pv