Session: Fix issue #67 by improving error handling

[pulseview.git] / pv / session.hpp

diff --git a/pv/session.hpp b/pv/session.hpp
index 871dcba85f334eecb7be37f93a6e1c0271adf625..94338c20e259144a7bb9ae3bad96edc9ef4c44f5 100644 (file)
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -35,6 +35,8 @@
 #include <thread>
 #include <vector>
 
+#include <glibmm/datetime.h>
+
 #include <QObject>
 #include <QSettings>
 #include <QString>
@@ -141,8 +143,8 @@ public:
        QString name() const;
        void set_name(QString name);
 
-       QString path() const;
-       void set_path(QString path);
+       QString save_path() const;
+       void set_save_path(QString path);
 
        const vector< shared_ptr<views::ViewBase> > views() const;
 
@@ -185,8 +187,10 @@ public:
        void stop_capture();
 
        double get_samplerate() const;
+       Glib::DateTime get_acquisition_start_time() 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;
 
@@ -195,6 +199,9 @@ 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);
+
        void add_generated_signal(shared_ptr<data::SignalBase> signal);
        void remove_generated_signal(shared_ptr<data::SignalBase> signal);
 
@@ -260,6 +267,7 @@ Q_SIGNALS:
        void data_received();
 
        void add_view(ViewType type, Session *session);
+       void session_error_raised(const QString text, const QString info_text);
 
 public Q_SLOTS:
        void on_data_saved();
@@ -273,7 +281,7 @@ private:
 
        DeviceManager &device_manager_;
        shared_ptr<devices::Device> device_;
-       QString default_name_, name_, path_;
+       QString default_name_, name_, save_path_;
 
        vector< shared_ptr<views::ViewBase> > views_;
        shared_ptr<pv::views::ViewBase> main_view_;
@@ -286,6 +294,7 @@ 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_;
@@ -297,6 +306,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_;
 
@@ -305,6 +315,7 @@ private:
        bool frame_began_;
 
        QElapsedTimer acq_time_;
+       Glib::DateTime acq_start_time_;
 
        MetadataObjManager metadata_obj_manager_;