projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #602 by keeping track of device state internally
[pulseview.git]
/
pv
/
dialogs
/
storeprogress.cpp
diff --git
a/pv/dialogs/storeprogress.cpp
b/pv/dialogs/storeprogress.cpp
index 7cc40a75667994405d4ab26a937872ddb4819128..a7f889e07940573c775bfbed361ec5b0823b161a 100644
(file)
--- a/
pv/dialogs/storeprogress.cpp
+++ b/
pv/dialogs/storeprogress.cpp
@@
-24,13
+24,20
@@
#include "storeprogress.hpp"
#include "storeprogress.hpp"
+using std::map;
+using std::string;
+
+using Glib::VariantBase;
+
namespace pv {
namespace dialogs {
StoreProgress::StoreProgress(const QString &file_name,
namespace pv {
namespace dialogs {
StoreProgress::StoreProgress(const QString &file_name,
- const SigSession &session, QWidget *parent) :
+ const std::shared_ptr<sigrok::OutputFormat> output_format,
+ const map<string, VariantBase> &options,
+ const Session &session, QWidget *parent) :
QProgressDialog(tr("Saving..."), tr("Cancel"), 0, 0, parent),
QProgressDialog(tr("Saving..."), tr("Cancel"), 0, 0, parent),
- session_(file_name.toStdString(), session)
+ session_(file_name.toStdString(),
output_format, options,
session)
{
connect(&session_, SIGNAL(progress_updated()),
this, SLOT(on_progress_updated()));
{
connect(&session_, SIGNAL(progress_updated()),
this, SLOT(on_progress_updated()));