X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdialogs%2Fstoreprogress.cpp;h=09b6b0f4ca61236f90815a90b7a1337faba837cf;hp=a7f889e07940573c775bfbed361ec5b0823b161a;hb=d008cab11b7508601e793d47e53a87be9972aed1;hpb=e93f553816d1938ab1917dff497a36acec4257e3 diff --git a/pv/dialogs/storeprogress.cpp b/pv/dialogs/storeprogress.cpp index a7f889e0..09b6b0f4 100644 --- a/pv/dialogs/storeprogress.cpp +++ b/pv/dialogs/storeprogress.cpp @@ -14,17 +14,20 @@ * 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 . */ #include #include +#include "pv/session.hpp" + #include "storeprogress.hpp" using std::map; +using std::pair; +using std::shared_ptr; using std::string; using Glib::VariantBase; @@ -33,14 +36,18 @@ namespace pv { namespace dialogs { StoreProgress::StoreProgress(const QString &file_name, - const std::shared_ptr output_format, + const shared_ptr output_format, const map &options, + const pair sample_range, const Session &session, QWidget *parent) : QProgressDialog(tr("Saving..."), tr("Cancel"), 0, 0, parent), - session_(file_name.toStdString(), output_format, options, session) + session_(file_name.toStdString(), output_format, options, sample_range, + session) { connect(&session_, SIGNAL(progress_updated()), this, SLOT(on_progress_updated())); + connect(&session_, SIGNAL(store_successful()), + &session, SLOT(on_data_saved())); } StoreProgress::~StoreProgress() @@ -73,7 +80,7 @@ void StoreProgress::closeEvent(QCloseEvent*) void StoreProgress::on_progress_updated() { - const std::pair p = session_.progress(); + const pair p = session_.progress(); assert(p.first <= p.second); if (p.second) { @@ -87,5 +94,5 @@ void StoreProgress::on_progress_updated() } } -} // dialogs -} // pv +} // namespace dialogs +} // namespace pv