comparison main/MainWindow.cpp @ 1911:2160976df436 import-audio-data

Use progress dialog when importing audio data

     format.setSampleRate(rate);
     format.setTimingType(CSVFormat::ImplicitTiming);
     format.setTimeUnits(CSVFormat::TimeAudioFrames);
 
     FileOpenStatus status = FileOpenSucceeded;
+
+    ProgressDialog *dialog = new ProgressDialog(tr("Importing audio data..."),
+                                                true, 0, this,
+                                                Qt::ApplicationModal);
     
     WaveFileModel *model = qobject_cast<WaveFileModel *>
         (DataFileReaderFactory::loadCSV
          (path, format,
-          getMainModel() ? getMainModel()->getSampleRate() : rate));
-
-    if (!model || !model->isOK()) {
+          getMainModel() ? getMainModel()->getSampleRate() : rate,
+          dialog));
+
+    if (dialog->wasCancelled()) {
+
+        delete model;
+        status = FileOpenCancelled;
+
+    } else if (!model || !model->isOK()) {
 
         delete model;
         status = FileOpenFailed;
 
     } else {

                                      CreateAdditionalModel,
                                      getDefaultSessionTemplate(),
                                      false);
     }
 
+    delete dialog;
+    
     if (status == FileOpenFailed) {
         emit hideSplash();
         QMessageBox::critical(this, tr("Failed to open file"),
                               tr("<b>File open failed</b><p>Audio data file %1 could not be opened.").arg(path));
     }