Mercurial > hg > svcore

comparison data/fileio/CSVFileReader.cpp @ 847:2d53205f70cd tonioni

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default branch
author Chris Cannam
date Tue, 26 Nov 2013 14:37:01 +0000
parents f5cd33909744
children 69cc0454ed72
comparison
equal deleted inserted replaced
841:226733f3cf3f 847:2d53205f70cd
111 } 111 }
112 } 112 }
113 113
114 if (!ok) { 114 if (!ok) {
115 if (m_warnings < warnLimit) { 115 if (m_warnings < warnLimit) {
116 std::cerr << "WARNING: CSVFileReader::load: " 116 cerr << "WARNING: CSVFileReader::load: "
117 << "Bad time format (\"" << s.toStdString() 117 << "Bad time format (\"" << s
118 << "\") in data line " 118 << "\") in data line "
119 << lineno+1 << std::endl; 119 << lineno+1 << endl;
120 } else if (m_warnings == warnLimit) { 120 } else if (m_warnings == warnLimit) {
121 std::cerr << "WARNING: Too many warnings" << std::endl; 121 cerr << "WARNING: Too many warnings" << endl;
122 } 122 }
123 ++m_warnings; 123 ++m_warnings;
124 } 124 }
125 125
126 return calculatedFrame; 126 return calculatedFrame;
330 330
331 firstEverValue = false; 331 firstEverValue = false;
332 332
333 if (!ok) { 333 if (!ok) {
334 if (warnings < warnLimit) { 334 if (warnings < warnLimit) {
335 std::cerr << "WARNING: CSVFileReader::load: " 335 cerr << "WARNING: CSVFileReader::load: "
336 << "Non-numeric value \"" 336 << "Non-numeric value \""
337 << list[i].toStdString() 337 << list[i]
338 << "\" in data line " << lineno+1 338 << "\" in data line " << lineno+1
339 << ":" << std::endl; 339 << ":" << endl;
340 std::cerr << line << std::endl; 340 cerr << line << endl;
341 ++warnings; 341 ++warnings;
342 } else if (warnings == warnLimit) { 342 } else if (warnings == warnLimit) {
343 // std::cerr << "WARNING: Too many warnings" << std::endl; 343 // cerr << "WARNING: Too many warnings" << endl;
344 } 344 }
345 } 345 }
346 } 346 }
347 347
348 // SVDEBUG << "Setting bin values for count " << lineno << ", frame " 348 // SVDEBUG << "Setting bin values for count " << lineno << ", frame "