#include <set>
#include <string>
#include <thread>
-#include <unordered_set>
#include <vector>
#include <QObject>
#include <QSettings>
#include <QString>
-#include <QTime>
+#include <QElapsedTimer>
#ifdef ENABLE_FLOW
#include <gstreamermm.h>
#include <libsigrokflow/libsigrokflow.hpp>
#endif
+#include "metadata_obj.hpp"
#include "util.hpp"
#include "views/viewbase.hpp"
-
using std::function;
-using std::list;
using std::map;
using std::mutex;
using std::recursive_mutex;
class ViewBase;
}
+
class Session : public QObject
{
Q_OBJECT
shared_ptr<devices::Device> device() const;
QString name() const;
-
void set_name(QString name);
- const list< shared_ptr<views::ViewBase> > views() const;
+ const vector< shared_ptr<views::ViewBase> > views() const;
shared_ptr<views::ViewBase> main_view() const;
-
shared_ptr<pv::toolbars::MainBar> main_bar() const;
-
void set_main_bar(shared_ptr<pv::toolbars::MainBar> main_bar);
/**
bool data_saved() const;
void save_setup(QSettings &settings) const;
-
void save_settings(QSettings &settings) const;
-
void restore_setup(QSettings &settings);
-
void restore_settings(QSettings &settings);
/**
* Sets device instance that will be used in the next capture session.
*/
void set_device(shared_ptr<devices::Device> device);
-
void set_default_device();
+ bool using_file_device() const;
- void load_init_file(const string &file_name, const string &format);
+ void load_init_file(const string &file_name, const string &format,
+ const string &setup_file_name);
- void load_file(QString file_name,
+ void load_file(QString file_name, QString setup_file_name = QString(),
shared_ptr<sigrok::InputFormat> format = nullptr,
const map<string, Glib::VariantBase> &options =
map<string, Glib::VariantBase>());
capture_state get_capture_state() const;
-
void start_capture(function<void (const QString)> error_handler);
-
void stop_capture();
double get_samplerate() const;
vector<util::Timestamp> get_triggers(uint32_t segment_id) const;
void register_view(shared_ptr<views::ViewBase> view);
-
void deregister_view(shared_ptr<views::ViewBase> view);
-
bool has_view(shared_ptr<views::ViewBase> view);
- const unordered_set< shared_ptr<data::SignalBase> > signalbases() const;
+ const vector< shared_ptr<data::SignalBase> > signalbases() const;
bool all_segments_complete(uint32_t segment_id) const;
void remove_decode_signal(shared_ptr<data::DecodeSignal> signal);
#endif
+ MetadataObjManager* metadata_obj_manager();
+
private:
void set_capture_state(capture_state state);
#endif
void feed_in_header();
-
void feed_in_meta(shared_ptr<sigrok::Meta> meta);
-
void feed_in_trigger();
-
void feed_in_frame_begin();
void feed_in_frame_end();
-
void feed_in_logic(shared_ptr<sigrok::Logic> logic);
-
void feed_in_analog(shared_ptr<sigrok::Analog> analog);
void data_feed_in(shared_ptr<sigrok::Device> device,
void data_received();
- void add_view(const QString &title, views::ViewType type,
- Session *session);
+ void add_view(views::ViewType type, Session *session);
public Q_SLOTS:
void on_data_saved();
shared_ptr<devices::Device> device_;
QString default_name_, name_;
- list< shared_ptr<views::ViewBase> > views_;
+ vector< shared_ptr<views::ViewBase> > views_;
shared_ptr<pv::views::ViewBase> main_view_;
shared_ptr<pv::toolbars::MainBar> main_bar_;
- mutable mutex sampling_mutex_; //!< Protects access to capture_state_.
+ mutable mutex sampling_mutex_; //!< Protects access to capture_state_
capture_state capture_state_;
- unordered_set< shared_ptr<data::SignalBase> > signalbases_;
+ vector< shared_ptr<data::SignalBase> > signalbases_;
unordered_set< shared_ptr<data::SignalData> > all_signal_data_;
- /// trigger_list_ contains pairs of <segment_id, timestamp> values.
+ /// trigger_list_ contains pairs of <segment_id, timestamp> values
vector< std::pair<uint32_t, util::Timestamp> > trigger_list_;
mutable recursive_mutex data_mutex_;
bool data_saved_;
bool frame_began_;
- QTime acq_time_;
+ QElapsedTimer acq_time_;
+
+ MetadataObjManager metadata_obj_manager_;
#ifdef ENABLE_FLOW
RefPtr<Pipeline> pipeline_;