X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdialogs%2Fstoreprogress.hpp;h=f355acc69e2f3b6c8ff35eac2a389d2b93aa56e9;hp=37916420674aa9a43b7c1680e0258cf1d5f70d24;hb=HEAD;hpb=d2fc6be9af3ba409032da6dcabc4630c657bb56c
diff --git a/pv/dialogs/storeprogress.hpp b/pv/dialogs/storeprogress.hpp
index 37916420..f355acc6 100644
--- a/pv/dialogs/storeprogress.hpp
+++ b/pv/dialogs/storeprogress.hpp
@@ -14,13 +14,13 @@
* 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 .
*/
-#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
@@ -28,6 +28,12 @@
#include
+using std::atomic;
+using std::map;
+using std::pair;
+using std::shared_ptr;
+using std::string;
+
namespace pv {
class Session;
@@ -40,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();
@@ -57,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