Mercurial > hg > svapp
comparison framework/MainWindowBase.cpp @ 196:944af6246560
* Start revamping the CSV import dialog so as to show a "purpose" for each column.
  These are estimated from the file now, but changing them does not actually do
  anything yet.
| author | Chris Cannam | 
|---|---|
| date | Fri, 16 Jul 2010 16:51:39 +0000 | 
| parents | 302dae1f6016 | 
| children | 143e1b56e81b 84422236db20 | 
   comparison
  equal
  deleted
  inserted
  replaced
| 195:d9c21e7bff21 | 196:944af6246560 | 
|---|---|
| 1367 | 1367 | 
| 1368 Model *model = DataFileReaderFactory::loadNonCSV | 1368 Model *model = DataFileReaderFactory::loadNonCSV | 
| 1369 (path, &midiDlg, getMainModel()->getSampleRate()); | 1369 (path, &midiDlg, getMainModel()->getSampleRate()); | 
| 1370 | 1370 | 
| 1371 if (!model) { | 1371 if (!model) { | 
| 1372 CSVFormatDialog *dialog = new CSVFormatDialog | 1372 CSVFormat format(path); | 
| 1373 (this, CSVFormat(path), getMainModel()->getSampleRate()); | 1373 format.setSampleRate(getMainModel()->getSampleRate()); | 
| 1374 CSVFormatDialog *dialog = new CSVFormatDialog(this, format); | |
| 1374 if (dialog->exec() == QDialog::Accepted) { | 1375 if (dialog->exec() == QDialog::Accepted) { | 
| 1375 model = DataFileReaderFactory::loadCSV | 1376 model = DataFileReaderFactory::loadCSV | 
| 1376 (path, dialog->getFormat(), | 1377 (path, dialog->getFormat(), | 
| 1377 getMainModel()->getSampleRate()); | 1378 getMainModel()->getSampleRate()); | 
| 1378 } | 1379 } | 
