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 eee1d855d072c561e123c935aca1301bb0168c56..ddad67050f03a5a78317ae00fd00d17750ad53c0 100644 (file)
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -18,15 +18,17 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_MAINWINDOW_H
-#define PULSEVIEW_PV_MAINWINDOW_H
+#ifndef PULSEVIEW_PV_MAINWINDOW_HPP
+#define PULSEVIEW_PV_MAINWINDOW_HPP
 
 #include <list>
+#include <map>
 #include <memory>
 
 #include <QMainWindow>
 
-#include "sigsession.hpp"
+#include "session.hpp"
+#include "views/viewbase.hpp"
 
 struct srd_decoder;
 
@@ -38,7 +40,7 @@ class DeviceManager;
 
 namespace toolbars {
 class ContextBar;
-class SamplingBar;
+class MainBar;
 }
 
 namespace view {
@@ -46,19 +48,38 @@ class View;
 }
 
 namespace widgets {
+#ifdef ENABLE_DECODE
 class DecoderMenu;
+#endif
 }
 
 class MainWindow : public QMainWindow
 {
        Q_OBJECT
 
+private:
+       static const QString WindowTitle;
+
 public:
        explicit MainWindow(DeviceManager &device_manager,
-               const char *open_file_name = NULL,
+               std::string open_file_name = std::string(),
+               std::string open_file_format = std::string(),
                QWidget *parent = 0);
 
-       void run_stop();
+       ~MainWindow();
+
+       QAction* action_view_sticky_scrolling() const;
+       QAction* action_view_coloured_bg() const;
+       QAction* action_about() const;
+
+       std::shared_ptr<views::ViewBase> get_active_view() const;
+
+       std::shared_ptr<views::ViewBase> add_view(const QString &title,
+               views::ViewType type, Session &session);
+
+       std::shared_ptr<Session> add_session();
+
+       void remove_session(std::shared_ptr<Session> session);
 
 private:
        void setup_ui();
@@ -67,69 +88,43 @@ private:
 
        void restore_ui_settings();
 
-       void session_error(const QString text, const QString info_text);
-
-       /**
-        * Updates the device list in the sampling bar
-        */
-       void update_device_list();
-
+private:
        void closeEvent(QCloseEvent *event);
 
-private Q_SLOTS:
-       void load_file(QString file_name);
-
-       void show_session_error(
-               const QString text, const QString info_text);
+       virtual QMenu* createPopupMenu();
 
-       void on_actionOpen_triggered();
-       void on_actionSaveAs_triggered();
-       void on_actionQuit_triggered();
+       virtual bool restoreState(const QByteArray &state, int version = 0);
 
-       void on_actionConnect_triggered();
-
-       void on_actionViewZoomIn_triggered();
+private Q_SLOTS:
+       void on_add_view(const QString &title, views::ViewType type,
+               Session *session);
 
-       void on_actionViewZoomOut_triggered();
+       void on_focus_changed();
 
-       void on_actionViewZoomFit_triggered();
+       void on_new_session();
+       void on_session_name_changed();
+       void on_new_view(Session *session);
+       void on_view_close_clicked();
 
-       void on_actionViewZoomOneToOne_triggered();
+       void on_actionViewStickyScrolling_triggered();
 
-       void on_actionViewShowCursors_triggered();
+       void on_actionViewColouredBg_triggered();
 
        void on_actionAbout_triggered();
 
-       void add_decoder(srd_decoder *decoder);
-
-       void capture_state_changed(int state);
-       void device_selected();
-
 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;
-
        DeviceManager &device_manager_;
 
-       SigSession session_;
-
-       pv::view::View *view_;
+       std::list< std::shared_ptr<Session> > sessions_;
 
-       QWidget *central_widget_;
-       QVBoxLayout *vertical_layout_;
+       std::map< std::shared_ptr<QDockWidget>,
+               std::shared_ptr<views::ViewBase> > view_docks_;
 
-       toolbars::SamplingBar *sampling_bar_;
+       QAction *const action_view_sticky_scrolling_;
+       QAction *const action_view_coloured_bg_;
+       QAction *const action_about_;
 };
 
 } // namespace pv
 
-#endif // PULSEVIEW_PV_MAINWINDOW_H
+#endif // PULSEVIEW_PV_MAINWINDOW_HPP