projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
AnalogSignal: Make sure the trace is redrawn when changing vdiv count
[pulseview.git]
/
pv
/
storesession.hpp
diff --git
a/pv/storesession.hpp
b/pv/storesession.hpp
index ce737f34e3c9bba0ba079589e15daf27f81bf8ea..6976b3134da11956cb87d09449ab10f5d6fad128 100644
(file)
--- a/
pv/storesession.hpp
+++ b/
pv/storesession.hpp
@@
-18,20
+18,25
@@
* 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 <memory>
#include <mutex>
#include <string>
#include <thread>
+#include <glibmm/variant.h>
+
#include <QObject>
namespace sigrok {
#include <QObject>
namespace sigrok {
+class Channel;
class Output;
class OutputFormat;
}
class Output;
class OutputFormat;
}
@@
-41,6
+46,7
@@
namespace pv {
class Session;
namespace data {
class Session;
namespace data {
+class AnalogSegment;
class LogicSegment;
}
class LogicSegment;
}
@@
-54,6
+60,8
@@
private:
public:
StoreSession(const std::string &file_name,
const std::shared_ptr<sigrok::OutputFormat> &output_format,
public:
StoreSession(const std::string &file_name,
const std::shared_ptr<sigrok::OutputFormat> &output_format,
+ const std::map<std::string, Glib::VariantBase> &options,
+ const std::pair<uint64_t, uint64_t> sample_range,
const Session &session);
~StoreSession();
const Session &session);
~StoreSession();
@@
-69,7
+77,9
@@
public:
void cancel();
private:
void cancel();
private:
- void store_proc(std::shared_ptr<pv::data::LogicSegment> segment);
+ void store_proc(std::vector< std::shared_ptr<sigrok::Channel> > achannel_list,
+ std::vector< std::shared_ptr<pv::data::AnalogSegment> > asegment_list,
+ std::shared_ptr<pv::data::LogicSegment> lsegment);
Q_SIGNALS:
void progress_updated();
Q_SIGNALS:
void progress_updated();
@@
-77,9
+87,12
@@
Q_SIGNALS:
private:
const std::string file_name_;
const std::shared_ptr<sigrok::OutputFormat> output_format_;
private:
const std::string file_name_;
const std::shared_ptr<sigrok::OutputFormat> output_format_;
+ const std::map<std::string, Glib::VariantBase> options_;
+ const std::pair<uint64_t, uint64_t> sample_range_;
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,8
+102,10
@@
private:
mutable std::mutex mutex_;
QString error_;
mutable std::mutex mutex_;
QString error_;
+
+ uint64_t start_sample_, sample_count_;
};
} // pv
};
} // pv
-#endif // PULSEVIEW_PV_STORESESSION_H
+#endif // PULSEVIEW_PV_STORESESSION_H
PP