X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdialogs%2Fstoreprogress.cpp;h=4ef3404594ecc1a26100e90add78cd5653fef543;hp=dff8950ac1993ac3d8c157cab87f0cfaffca0c54;hb=6f925ba9d6faf1077b73c5a5808259576081716a;hpb=4764bc4d14069978282c9cf43aad03d7558aeb9f diff --git a/pv/dialogs/storeprogress.cpp b/pv/dialogs/storeprogress.cpp index dff8950..4ef3404 100644 --- a/pv/dialogs/storeprogress.cpp +++ b/pv/dialogs/storeprogress.cpp @@ -14,27 +14,40 @@ * 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; + 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, 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() @@ -67,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) {