comparison data/fileio/CSVFileReader.cpp @ 980:6e6da0636e5e tonioni

Merge from default branch
author Chris Cannam
date Tue, 09 Sep 2014 16:36:21 +0100
parents fae5689f7e27
children dc1695b90a58
comparison
equal deleted inserted replaced
954:35b05cac32d0 980:6e6da0636e5e
428 } else { 428 } else {
429 model2b->setScaleUnits("Hz"); 429 model2b->setScaleUnits("Hz");
430 } 430 }
431 } 431 }
432 432
433 if (modelType == CSVFormat::ThreeDimensionalModel) { 433 if (model3) {
434 model3->setMinimumLevel(min); 434 model3->setMinimumLevel(min);
435 model3->setMaximumLevel(max); 435 model3->setMaximumLevel(max);
436 } 436 }
437 437
438 return model; 438 return model;