comparison main/main.cpp @ 267:c452d8a7b770 sv1-v1.3 sv1-v1.3rc1

* Updates for 1.3
author Chris Cannam
date Thu, 10 Jul 2008 12:50:56 +0000
parents 6a6b5a1a6c67
children a0d3b334e7a9
comparison
equal deleted inserted replaced
266:52ef51ba9a74 267:c452d8a7b770
368 settings.beginGroup("FFTWisdom"); 368 settings.beginGroup("FFTWisdom");
369 QString wisdom = settings.value("wisdom").toString(); 369 QString wisdom = settings.value("wisdom").toString();
370 if (wisdom != "") { 370 if (wisdom != "") {
371 fftwf_import_wisdom_from_string(wisdom.toLocal8Bit().data()); 371 fftwf_import_wisdom_from_string(wisdom.toLocal8Bit().data());
372 } 372 }
373 #ifdef HAVE_FFTW3
374 wisdom = settings.value("wisdom_d").toString();
375 if (wisdom != "") {
376 fftw_import_wisdom_from_string(wisdom.toLocal8Bit().data());
377 }
378 #endif
373 settings.endGroup(); 379 settings.endGroup();
374 #endif 380 #endif
375 381
376 splash.finish(gui); 382 splash.finish(gui);
377 383
380 if (tipDialog.isOK()) { 386 if (tipDialog.isOK()) {
381 tipDialog.exec(); 387 tipDialog.exec();
382 } 388 }
383 */ 389 */
384 int rv = application.exec(); 390 int rv = application.exec();
385 std::cerr << "application.exec() returned " << rv << std::endl;
386 391
387 cleanupMutex.lock(); 392 cleanupMutex.lock();
388 TempDirectory::getInstance()->cleanup(); 393 TempDirectory::getInstance()->cleanup();
389 394
390 application.releaseMainWindow(); 395 application.releaseMainWindow();
391 396
392 #ifdef HAVE_FFTW3F 397 #ifdef HAVE_FFTW3F
398 settings.beginGroup("FFTWisdom");
393 char *cwisdom = fftwf_export_wisdom_to_string(); 399 char *cwisdom = fftwf_export_wisdom_to_string();
394 if (cwisdom) { 400 if (cwisdom) {
395 settings.beginGroup("FFTWisdom");
396 settings.setValue("wisdom", cwisdom); 401 settings.setValue("wisdom", cwisdom);
397 settings.endGroup();
398 fftwf_free(cwisdom); 402 fftwf_free(cwisdom);
399 } 403 }
404 #ifdef HAVE_FFTW3
405 cwisdom = fftw_export_wisdom_to_string();
406 if (cwisdom) {
407 settings.setValue("wisdom_d", cwisdom);
408 fftw_free(cwisdom);
409 }
410 #endif
411 settings.endGroup();
400 #endif 412 #endif
401 413
402 delete gui; 414 delete gui;
403 415
404 return rv; 416 return rv;