Fix #895 by adapting to Qt5 and cleaning up properly

[pulseview.git] / pv / dialogs / storeprogress.cpp

diff --git a/pv/dialogs/storeprogress.cpp b/pv/dialogs/storeprogress.cpp
index 7cc40a75667994405d4ab26a937872ddb4819128..0d0a222c2cc5594dc875dfcd0473b169a8c5dd0f 100644 (file)
--- a/pv/dialogs/storeprogress.cpp
+++ b/pv/dialogs/storeprogress.cpp
@@ -14,26 +14,53 @@
  * 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 <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 SigSession &session, QWidget *parent) :
+       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(), 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()));
+
+       // 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()
@@ -57,16 +84,22 @@ void StoreProgress::show_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) {
@@ -80,5 +113,5 @@ void StoreProgress::on_progress_updated()
        }
 }
 
-} // dialogs
-} // pv
+}  // namespace dialogs
+}  // namespace pv