X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fdialogs%2Fstoreprogress.hpp;h=c42566289f83e5e7ee4656a4f6f94b87e6c32f3a;hb=HEAD;hp=e968ce4197c3e0e04da7d5d9050f9a511784251d;hpb=efdec55aec1a137460fa362a381ed1904182bfed;p=pulseview.git
diff --git a/pv/dialogs/storeprogress.hpp b/pv/dialogs/storeprogress.hpp
index e968ce41..f355acc6 100644
--- a/pv/dialogs/storeprogress.hpp
+++ b/pv/dialogs/storeprogress.hpp
@@ -17,9 +17,10 @@
* along with this program; if not, see .
*/
-#ifndef PULSEVIEW_PV_DIALOGS_SAVEPROGRESS_HPP
-#define PULSEVIEW_PV_DIALOGS_SAVEPROGRESS_HPP
+#ifndef PULSEVIEW_PV_DIALOGS_STOREPROGRESS_HPP
+#define PULSEVIEW_PV_DIALOGS_STOREPROGRESS_HPP
+#include
#include
#include
@@ -27,6 +28,12 @@
#include
+using std::atomic;
+using std::map;
+using std::pair;
+using std::shared_ptr;
+using std::string;
+
namespace pv {
class Session;
@@ -39,11 +46,10 @@ class StoreProgress : public QProgressDialog
public:
StoreProgress(const QString &file_name,
- const std::shared_ptr output_format,
- const std::map &options,
- const std::pair sample_range,
- const Session &session,
- QWidget *parent = 0);
+ const shared_ptr output_format,
+ const map &options,
+ const pair sample_range,
+ const Session &session, QWidget *parent = nullptr);
virtual ~StoreProgress();
@@ -56,12 +62,14 @@ private:
private Q_SLOTS:
void on_progress_updated();
+ void on_cancel();
private:
pv::StoreSession session_;
+ atomic showing_error_;
};
-} // dialogs
-} // pv
+} // namespace dialogs
+} // namespace pv
-#endif // PULSEVIEW_PV_DIALOGS_SAVEPROGRESS_HPP
+#endif // PULSEVIEW_PV_DIALOGS_STOREPROGRESS_HPP