#include <QObject>
#include <QSettings>
#include <QString>
-#include <QTime>
+#include <QElapsedTimer>
#ifdef ENABLE_FLOW
#include <gstreamermm.h>
using std::function;
-using std::list;
using std::map;
using std::mutex;
using std::recursive_mutex;
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;
void set_default_device();
- void load_init_file(const string &file_name,
- const string &format,
+ bool using_file_device() const;
+
+ void load_init_file(const string &file_name, const string &format,
const string &setup_file_name);
- void load_file(QString file_name,
- QString setup_file_name = nullptr,
+ 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>());
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 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_.
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.
bool data_saved_;
bool frame_began_;
- QTime acq_time_;
+ QElapsedTimer acq_time_;
#ifdef ENABLE_FLOW
RefPtr<Pipeline> pipeline_;