Implement MathSignal

[pulseview.git] / pv / session.hpp

diff --git a/pv/session.hpp b/pv/session.hpp
index eefdd12bd20bf67262b17f5e2948c47d77d63a35..91f98b581b8c0ed2a342321caf075cedff279b2d 100644 (file)
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -25,6 +25,7 @@
 #include <condition_variable>
 #endif
 
+#include <deque>
 #include <functional>
 #include <map>
 #include <memory>
@@ -48,6 +49,7 @@
 #include "util.hpp"
 #include "views/viewbase.hpp"
 
+using std::deque;
 using std::function;
 using std::map;
 using std::mutex;
@@ -93,6 +95,7 @@ class Logic;
 class LogicSegment;
 class SignalBase;
 class SignalData;
+class SignalGroup;
 }
 
 namespace devices {
@@ -107,6 +110,7 @@ namespace views {
 class ViewBase;
 }
 
+using pv::views::ViewType;
 
 class Session : public QObject
 {
@@ -137,6 +141,9 @@ public:
        QString name() const;
        void set_name(QString name);
 
+       QString save_path() const;
+       void set_save_path(QString path);
+
        const vector< shared_ptr<views::ViewBase> > views() const;
 
        shared_ptr<views::ViewBase> main_view() const;
@@ -179,7 +186,8 @@ public:
 
        double get_samplerate() const;
 
-       uint32_t get_segment_count() const;
+       uint32_t get_highest_segment_id() const;
+       uint64_t get_segment_sample_count(uint32_t segment_id) const;
 
        vector<util::Timestamp> get_triggers(uint32_t segment_id) const;
 
@@ -188,8 +196,11 @@ public:
        bool has_view(shared_ptr<views::ViewBase> view);
 
        const vector< shared_ptr<data::SignalBase> > signalbases() const;
+       uint32_t get_signal_count(data::SignalBase::ChannelType type) const;
+       uint32_t get_next_signal_index(data::SignalBase::ChannelType type);
 
-       bool all_segments_complete(uint32_t segment_id) const;
+       void add_generated_signal(shared_ptr<data::SignalBase> signal);
+       void remove_generated_signal(shared_ptr<data::SignalBase> signal);
 
 #ifdef ENABLE_DECODE
        shared_ptr<data::DecodeSignal> add_decode_signal();
@@ -197,6 +208,8 @@ public:
        void remove_decode_signal(shared_ptr<data::DecodeSignal> signal);
 #endif
 
+       bool all_segments_complete(uint32_t segment_id) const;
+
        MetadataObjManager* metadata_obj_manager();
 
 private:
@@ -250,7 +263,7 @@ Q_SIGNALS:
 
        void data_received();
 
-       void add_view(views::ViewType type, Session *session);
+       void add_view(ViewType type, Session *session);
 
 public Q_SLOTS:
        void on_data_saved();
@@ -260,9 +273,11 @@ public Q_SLOTS:
 #endif
 
 private:
+       bool shutting_down_;
+
        DeviceManager &device_manager_;
        shared_ptr<devices::Device> device_;
-       QString default_name_, name_;
+       QString default_name_, name_, save_path_;
 
        vector< shared_ptr<views::ViewBase> > views_;
        shared_ptr<pv::views::ViewBase> main_view_;
@@ -274,6 +289,8 @@ private:
 
        vector< shared_ptr<data::SignalBase> > signalbases_;
        unordered_set< shared_ptr<data::SignalData> > all_signal_data_;
+       deque<data::SignalGroup*> signal_groups_;
+       map<uint8_t, uint32_t> next_index_list_; // signal type -> index counter
 
        /// trigger_list_ contains pairs of <segment_id, timestamp> values
        vector< std::pair<uint32_t, util::Timestamp> > trigger_list_;
@@ -285,6 +302,7 @@ private:
        map< shared_ptr<sigrok::Channel>, shared_ptr<data::AnalogSegment> >
                cur_analog_segments_;
        int32_t highest_segment_id_;
+       vector<uint64_t> segment_sample_count_;
 
        std::thread sampling_thread_;