diff data/fileio/CSVFileReader.cpp @ 1874:48f50a4a82ea

Merge from branch csv-import-headers

--- a/data/fileio/CSVFileReader.cpp	Tue Jun 16 15:15:57 2020 +0100
+++ b/data/fileio/CSVFileReader.cpp	Thu Jun 18 13:43:20 2020 +0100
@@ -265,6 +265,7 @@
 
     map<QString, int> labelCountMap;
 
+    bool atStart = true;
     bool abandoned = false;
     
     while (!in.atEnd() && !abandoned) {
@@ -304,10 +305,16 @@
         }
         
         for (int li = 0; li < lines.size(); ++li) {
+            
+            QString line = lines[li];
+            if (line.startsWith("#")) continue;
 
-            QString line = lines[li];
-            
-            if (line.startsWith("#")) continue;
+            if (atStart) {
+                atStart = false;
+                if (m_format.getHeaderStatus() == CSVFormat::HeaderPresent) {
+                    continue;
+                }
+            }
 
             QStringList list = StringBits::split(line, separator, allowQuoting);
             if (!model) {