Mercurial > hg > svcore
comparison data/fileio/CSVFileReader.cpp @ 1874:48f50a4a82ea
Merge from branch csv-import-headers
author | Chris Cannam |
---|---|
date | Thu, 18 Jun 2020 13:43:20 +0100 |
parents | 566476eeeb80 |
children |
comparison
equal
deleted
inserted
replaced
1868:44dba7cd9ec3 | 1874:48f50a4a82ea |
---|---|
263 } | 263 } |
264 } | 264 } |
265 | 265 |
266 map<QString, int> labelCountMap; | 266 map<QString, int> labelCountMap; |
267 | 267 |
268 bool atStart = true; | |
268 bool abandoned = false; | 269 bool abandoned = false; |
269 | 270 |
270 while (!in.atEnd() && !abandoned) { | 271 while (!in.atEnd() && !abandoned) { |
271 | 272 |
272 // QTextStream's readLine doesn't cope with old-style Mac | 273 // QTextStream's readLine doesn't cope with old-style Mac |
302 m_progress = progress; | 303 m_progress = progress; |
303 } | 304 } |
304 } | 305 } |
305 | 306 |
306 for (int li = 0; li < lines.size(); ++li) { | 307 for (int li = 0; li < lines.size(); ++li) { |
307 | 308 |
308 QString line = lines[li]; | 309 QString line = lines[li]; |
309 | |
310 if (line.startsWith("#")) continue; | 310 if (line.startsWith("#")) continue; |
311 | |
312 if (atStart) { | |
313 atStart = false; | |
314 if (m_format.getHeaderStatus() == CSVFormat::HeaderPresent) { | |
315 continue; | |
316 } | |
317 } | |
311 | 318 |
312 QStringList list = StringBits::split(line, separator, allowQuoting); | 319 QStringList list = StringBits::split(line, separator, allowQuoting); |
313 if (!model) { | 320 if (!model) { |
314 | 321 |
315 QString modelName = m_filename; | 322 QString modelName = m_filename; |