X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdialogs%2Fstoreprogress.hpp;h=730a9e423d9a51aec37d2b9177106288202770fe;hp=389aad81cc9b2dc4762ba2bb047a1c8c934c5a77;hb=c3c07a5f4bed7fea98ad07ca1cce34c9e5409f0b;hpb=7a01bd3654ed046216308fa64edfd79be7cd525f diff --git a/pv/dialogs/storeprogress.hpp b/pv/dialogs/storeprogress.hpp index 389aad81..730a9e42 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,8 +46,10 @@ class StoreProgress : public QProgressDialog public: StoreProgress(const QString &file_name, - const std::shared_ptr output_format, - 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,9 +65,10 @@ private Q_SLOTS: 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