projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adjust unit tests
[pulseview.git]
/
pv
/
storesession.hpp
diff --git
a/pv/storesession.hpp
b/pv/storesession.hpp
index 62cf18958e251229e02b19abb29a189fd999dda1..f0c8de778d5723e957a7035f19f8bf21e66511f7 100644
(file)
--- a/
pv/storesession.hpp
+++ b/
pv/storesession.hpp
@@
-14,24
+14,38
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
*/
-#ifndef PULSEVIEW_PV_STORESESSION_H
-#define PULSEVIEW_PV_STORESESSION_H
-
-#include <stdint.h>
+#ifndef PULSEVIEW_PV_STORESESSION_HPP
+#define PULSEVIEW_PV_STORESESSION_HPP
#include <atomic>
#include <atomic>
+#include <cstdint>
+#include <fstream>
+#include <map>
+#include <memory>
#include <mutex>
#include <string>
#include <thread>
#include <mutex>
#include <string>
#include <thread>
+#include <glibmm/variant.h>
+
#include <QObject>
#include <QObject>
+using std::atomic;
+using std::string;
+using std::shared_ptr;
+using std::pair;
+using std::map;
+using std::vector;
+using std::thread;
+using std::mutex;
+using std::ofstream;
+
namespace sigrok {
class Output;
namespace sigrok {
class Output;
+class OutputFormat;
}
namespace pv {
}
namespace pv {
@@
-39,7
+53,9
@@
namespace pv {
class Session;
namespace data {
class Session;
namespace data {
-class LogicSnapshot;
+class SignalBase;
+class AnalogSegment;
+class LogicSegment;
}
class StoreSession : public QObject
}
class StoreSession : public QObject
@@
-50,12
+66,15
@@
private:
static const size_t BlockSize;
public:
static const size_t BlockSize;
public:
- StoreSession(const std::string &file_name,
+ StoreSession(const string &file_name,
+ const shared_ptr<sigrok::OutputFormat> &output_format,
+ const map<string, Glib::VariantBase> &options,
+ const pair<uint64_t, uint64_t> sample_range,
const Session &session);
~StoreSession();
const Session &session);
~StoreSession();
-
std::
pair<int, int> progress() const;
+ pair<int, int> progress() const;
const QString& error() const;
const QString& error() const;
@@
-66,27
+85,37
@@
public:
void cancel();
private:
void cancel();
private:
- void store_proc(std::shared_ptr<pv::data::LogicSnapshot> snapshot);
+ void store_proc(vector< shared_ptr<data::SignalBase> > achannel_list,
+ vector< shared_ptr<pv::data::AnalogSegment> > asegment_list,
+ shared_ptr<pv::data::LogicSegment> lsegment);
Q_SIGNALS:
void progress_updated();
Q_SIGNALS:
void progress_updated();
+ void store_successful();
+
private:
private:
- const std::string file_name_;
+ const string file_name_;
+ const shared_ptr<sigrok::OutputFormat> output_format_;
+ const map<string, Glib::VariantBase> options_;
+ const pair<uint64_t, uint64_t> sample_range_;
const Session &session_;
const Session &session_;
- std::shared_ptr<sigrok::Output> output_;
+ shared_ptr<sigrok::Output> output_;
+ ofstream output_stream_;
std::thread thread_;
std::thread thread_;
-
std::
atomic<bool> interrupt_;
+ atomic<bool> interrupt_;
-
std::
atomic<int> units_stored_, unit_count_;
+ atomic<int> units_stored_, unit_count_;
- mutable
std::
mutex mutex_;
+ mutable mutex mutex_;
QString error_;
QString error_;
+
+ uint64_t start_sample_, sample_count_;
};
};
-}
//
pv
+}
// namespace
pv
-#endif // PULSEVIEW_PV_STORESESSION_H
+#endif // PULSEVIEW_PV_STORESESSION_H
PP