X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdialogs%2Fstoreprogress.cpp;h=0bcfbf2c75ca772510068b0309a4053e74fef5a3;hp=dff8950ac1993ac3d8c157cab87f0cfaffca0c54;hb=HEAD;hpb=4764bc4d14069978282c9cf43aad03d7558aeb9f

diff --git a/pv/dialogs/storeprogress.cpp b/pv/dialogs/storeprogress.cpp
index dff8950a..0bcfbf2c 100644
--- a/pv/dialogs/storeprogress.cpp
+++ b/pv/dialogs/storeprogress.cpp
@@ -14,27 +14,56 @@
  * 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 <http://www.gnu.org/licenses/>.
  */
 
 #include <cassert>
 
+#include <QDebug>
 #include <QMessageBox>
 
+#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<sigrok::OutputFormat> output_format,
+	const shared_ptr<sigrok::OutputFormat> output_format,
+	const map<string, VariantBase> &options,
+	const pair<uint64_t, uint64_t> 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),
+	showing_error_(false)
 {
 	connect(&session_, SIGNAL(progress_updated()),
 		this, SLOT(on_progress_updated()));
+	connect(&session_, SIGNAL(store_successful()),
+		&session, SLOT(on_data_saved()));
+	connect(this, SIGNAL(canceled()), this, SLOT(on_cancel()));
+
+	// Since we're not setting any progress in case of an error, the dialog
+	// will pop up after the minimumDuration time has been reached - 4000 ms
+	// by default.
+	// We do not want this as it overlaps with the error message box, so we
+	// set the minimumDuration to 0 so that it only appears when we feed it
+	// progress data. Then, call reset() to prevent the progress dialog from
+	// popping up anyway. This would happen in Qt5 because the behavior was
+	// changed in such a way that the duration timer is started by the
+	// constructor. We don't want that and reset() stops the timer, so we
+	// use it.
+	setMinimumDuration(0);
+	reset();
 }
 
 StoreProgress::~StoreProgress()
@@ -52,22 +81,31 @@ void StoreProgress::run()
 
 void StoreProgress::show_error()
 {
+	showing_error_ = true;
+
+	qDebug() << "Error trying to save:" << session_.error();
+
 	QMessageBox msg(parentWidget());
-	msg.setText(tr("Failed to save session."));
-	msg.setInformativeText(session_.error());
+	msg.setText(tr("Failed to save session.") + "\n\n" + session_.error());
 	msg.setStandardButtons(QMessageBox::Ok);
 	msg.setIcon(QMessageBox::Warning);
 	msg.exec();
+
+	close();
 }
 
 void StoreProgress::closeEvent(QCloseEvent*)
 {
 	session_.cancel();
+
+	// Closing doesn't mean we're going to be destroyed because our parent
+	// still owns our handle. Make sure this stale instance doesn't hang around.
+	deleteLater();
 }
 
 void StoreProgress::on_progress_updated()
 {
-	const std::pair<int, int> p = session_.progress();
+	const pair<int, int> p = session_.progress();
 	assert(p.first <= p.second);
 
 	if (p.second) {
@@ -75,11 +113,17 @@ void StoreProgress::on_progress_updated()
 		setMaximum(p.second);
 	} else {
 		const QString err = session_.error();
-		if (!err.isEmpty())
+		if (err.isEmpty())
+			close();
+		else if (!showing_error_)
 			show_error();
-		close();
 	}
 }
 
-} // dialogs
-} // pv
+void StoreProgress::on_cancel()
+{
+	session_.cancel();
+}
+
+}  // namespace dialogs
+}  // namespace pv