X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fsession.hpp;h=7d9375a7451f414b14975557f6c49a3705361171;hp=345baea49d52b566fe8aaa920f347b8938118982;hb=611c86259f66dd1766b10b1e1b671b0fadd51fe2;hpb=97378470ded88af84edaa0f1063d10d834475665 diff --git a/pv/session.hpp b/pv/session.hpp index 345baea4..7d9375a7 100644 --- a/pv/session.hpp +++ b/pv/session.hpp @@ -38,6 +38,7 @@ #include #include #include +#include #ifdef ENABLE_FLOW #include @@ -171,9 +172,12 @@ public: void set_default_device(); - 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, + QString setup_file_name = nullptr, shared_ptr format = nullptr, const map &options = map()); @@ -305,6 +309,8 @@ private: bool data_saved_; bool frame_began_; + QTime acq_time_; + #ifdef ENABLE_FLOW RefPtr pipeline_; RefPtr source_;