Change namespace for the trace view and implement ViewBase

[pulseview.git] / pv / session.hpp

diff --git a/pv/session.hpp b/pv/session.hpp
index 258addb9a72de29108c63a94f9afd3dec3deaaa5..95a50c21c73a098e4ab89f1e3060843d90d1e071 100644 (file)
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -42,6 +42,7 @@
 #include <QString>
 
 #include "util.hpp"
+#include "views/viewbase.hpp"
 
 struct srd_decoder;
 struct srd_channel;
@@ -77,8 +78,8 @@ namespace toolbars {
 class MainBar;
 }
 
-namespace view {
-class View;
+namespace views {
+class ViewBase;
 }
 
 class Session : public QObject
@@ -109,7 +110,9 @@ public:
 
        void set_name(QString name);
 
-       std::shared_ptr<pv::view::View> main_view() const;
+       const std::list< std::shared_ptr<views::ViewBase> > views() const;
+
+       std::shared_ptr<views::ViewBase> main_view() const;
 
        void set_main_bar(std::shared_ptr<pv::toolbars::MainBar> main_bar);
 
@@ -134,11 +137,11 @@ public:
 
        double get_samplerate() const;
 
-       void register_view(std::shared_ptr<pv::view::View> view);
+       void register_view(std::shared_ptr<views::ViewBase> view);
 
-       void deregister_view(std::shared_ptr<pv::view::View> view);
+       void deregister_view(std::shared_ptr<views::ViewBase> view);
 
-       bool has_view(std::shared_ptr<pv::view::View> view);
+       bool has_view(std::shared_ptr<views::ViewBase> view);
 
        const std::unordered_set< std::shared_ptr<data::SignalBase> >
                signalbases() const;
@@ -180,8 +183,8 @@ private:
        std::shared_ptr<devices::Device> device_;
        QString default_name_, name_;
 
-       std::unordered_set< std::shared_ptr<pv::view::View> > views_;
-       std::shared_ptr<pv::view::View> main_view_;
+       std::list< std::shared_ptr<views::ViewBase> > views_;
+       std::shared_ptr<pv::views::ViewBase> main_view_;
 
        std::shared_ptr<pv::toolbars::MainBar> main_bar_;
 
@@ -204,7 +207,7 @@ private:
 
 Q_SIGNALS:
        void capture_state_changed(int state);
-       void device_selected();
+       void device_changed();
 
        void signals_changed();
 
@@ -217,6 +220,9 @@ Q_SIGNALS:
        void data_received();
 
        void frame_ended();
+
+       void add_view(const QString &title, views::ViewType type,
+               Session *session);
 };
 
 } // namespace pv