comparison src/MainWindow.cpp @ 442:12f2c987e2b5

Wait for initial analysis to complete before loading (as well as saving)

     connect(this, SIGNAL(canPlayWaveform(bool)), m_playAudio, SLOT(setEnabled(bool)));
 
     int lpwSize, bigLpwSize;
 #ifdef Q_OS_MAC
     lpwSize = m_viewManager->scalePixelSize(32); // Mac toolbars are fatter
-    bigLpwSize = lpwSize * 2.2;
+    bigLpwSize = int(lpwSize * 2.2);
 #else
     lpwSize = m_viewManager->scalePixelSize(26);
-    bigLpwSize = lpwSize * 2.8;
+    bigLpwSize = int(lpwSize * 2.8);
 #endif
     
     m_audioLPW->setImageSize(lpwSize);
     m_audioLPW->setBigImageSize(bigLpwSize);
     toolbar->addWidget(m_audioLPW);

         return true;
     }
 
     QMessageBox mb(QMessageBox::Information,
                    tr("Waiting for analysis"),
-                   tr("Waiting for initial analysis to complete before saving..."),
+                   tr("Waiting for initial analysis to finish before loading or saving..."),
                    QMessageBox::Cancel,
                    this);
 
     connect(m_analyser, SIGNAL(initialAnalysisCompleted()), 
             &mb, SLOT(accept()));

 MainWindow::importPitchLayer(FileSource source)
 {
     if (!source.isAvailable()) return FileOpenFailed;
     source.waitForData();
 
+    if (!waitForInitialAnalysis()) return FileOpenCancelled;
+    
     QString path = source.getLocalFilename();
 
     RDFImporter::RDFDocumentType rdfType = 
         RDFImporter::identifyDocumentType(QUrl::fromLocalFile(path).toString());
 

 
     QString path = getSaveFileName(type);
 
     if (path == "") return;
 
+    if (!waitForInitialAnalysis()) return;
+    
     if (QFileInfo(path).suffix() == "") path += ".svl";
 
     QString suffix = QFileInfo(path).suffix().toLower();
 
     QString error;