comparison data/fileio/CSVFileReader.cpp @ 491:6f8ee19984ad

* When loading data with timestamps in seconds, round each time to its
  nearest neighbouring frame instead of rounding down

* Count from 1 when numbering points loaded from files without labels,
  rather than 0 (and also when printing errors with line numbers)

                     numeric.remove(nonNumericRx);
 
                     if (timeUnits == CSVFormat::TimeSeconds) {
 
                         double time = numeric.toDouble(&ok);
-                        frameNo = int(time * sampleRate + 0.00001);
+                        frameNo = int(time * sampleRate + 0.5);
 
                     } else {
 
                         frameNo = numeric.toInt(&ok);
 

                     if (!ok) {
                         if (warnings < warnLimit) {
                             std::cerr << "WARNING: CSVFileReader::load: "
                                       << "Bad time format (\"" << s.toStdString()
                                       << "\") in data line "
-                                      << lineno << ":" << std::endl;
+                                      << lineno+1 << ":" << std::endl;
                             std::cerr << line.toStdString() << std::endl;
                         } else if (warnings == warnLimit) {
                             std::cerr << "WARNING: Too many warnings" << std::endl;
                         }
                         ++warnings;

             if (modelType == CSVFormat::OneDimensionalModel) {
 	    
                 SparseOneDimensionalModel::Point point
                     (frameNo,
                      tidyList.size() > 0 ? tidyList[tidyList.size()-1] :
-                     QString("%1").arg(lineno));
+                     QString("%1").arg(lineno+1));
 
                 model1->addPoint(point);
 
             } else if (modelType == CSVFormat::TwoDimensionalModel) {
 
                 SparseTimeValueModel::Point point
                     (frameNo,
                      tidyList.size() > 0 ? tidyList[0].toFloat() : 0.0,
-                     tidyList.size() > 1 ? tidyList[1] : QString("%1").arg(lineno));
+                     tidyList.size() > 1 ? tidyList[1] : QString("%1").arg(lineno+1));
 
                 model2->addPoint(point);
 
             } else if (modelType == CSVFormat::ThreeDimensionalModel) {
 

                     if (!ok) {
                         if (warnings < warnLimit) {
                             std::cerr << "WARNING: CSVFileReader::load: "
                                       << "Non-numeric value \""
                                       << list[i].toStdString()
-                                      << "\" in data line " << lineno
+                                      << "\" in data line " << lineno+1
                                       << ":" << std::endl;
                             std::cerr << line.toStdString() << std::endl;
                             ++warnings;
                         } else if (warnings == warnLimit) {
 //                            std::cerr << "WARNING: Too many warnings" << std::endl;