projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bring back sigrok-logo-notext.png (needed on Android).
[pulseview.git]
/
pv
/
storesession.hpp
diff --git
a/pv/storesession.hpp
b/pv/storesession.hpp
index 62cf18958e251229e02b19abb29a189fd999dda1..9f31d59a7920c93d6252dba98acf0eee8fcef0d9 100644
(file)
--- a/
pv/storesession.hpp
+++ b/
pv/storesession.hpp
@@
-18,20
+18,26
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PULSEVIEW_PV_STORESESSION_H
-#define PULSEVIEW_PV_STORESESSION_H
+#ifndef PULSEVIEW_PV_STORESESSION_H
PP
+#define PULSEVIEW_PV_STORESESSION_H
PP
#include <stdint.h>
#include <atomic>
#include <stdint.h>
#include <atomic>
+#include <fstream>
+#include <map>
+#include <memory>
#include <mutex>
#include <string>
#include <thread>
#include <mutex>
#include <string>
#include <thread>
+#include <glibmm/variant.h>
+
#include <QObject>
namespace sigrok {
class Output;
#include <QObject>
namespace sigrok {
class Output;
+class OutputFormat;
}
namespace pv {
}
namespace pv {
@@
-39,7
+45,7
@@
namespace pv {
class Session;
namespace data {
class Session;
namespace data {
-class LogicS
napsho
t;
+class LogicS
egmen
t;
}
class StoreSession : public QObject
}
class StoreSession : public QObject
@@
-51,6
+57,8
@@
private:
public:
StoreSession(const std::string &file_name,
public:
StoreSession(const std::string &file_name,
+ const std::shared_ptr<sigrok::OutputFormat> &output_format,
+ const std::map<std::string, Glib::VariantBase> &options,
const Session &session);
~StoreSession();
const Session &session);
~StoreSession();
@@
-66,16
+74,19
@@
public:
void cancel();
private:
void cancel();
private:
- void store_proc(std::shared_ptr<pv::data::LogicS
napshot> snapsho
t);
+ void store_proc(std::shared_ptr<pv::data::LogicS
egment> segmen
t);
Q_SIGNALS:
void progress_updated();
private:
const std::string file_name_;
Q_SIGNALS:
void progress_updated();
private:
const std::string file_name_;
+ const std::shared_ptr<sigrok::OutputFormat> output_format_;
+ const std::map<std::string, Glib::VariantBase> options_;
const Session &session_;
std::shared_ptr<sigrok::Output> output_;
const Session &session_;
std::shared_ptr<sigrok::Output> output_;
+ std::ofstream output_stream_;
std::thread thread_;
std::thread thread_;
@@
-89,4
+100,4
@@
private:
} // pv
} // pv
-#endif // PULSEVIEW_PV_STORESESSION_H
+#endif // PULSEVIEW_PV_STORESESSION_H
PP