comparison data/fileio/CSVFileReader.cpp @ 611:dd97f7b3d120

* Add start frame get/set to EditableDenseThreeDimensionalModel and use it
  when importing grids from CSV with timings attached

     QString::SplitBehavior behaviour = m_format.getSplitBehaviour();
     size_t sampleRate = m_format.getSampleRate();
     size_t windowSize = m_format.getWindowSize();
 
     if (timingType == CSVFormat::ExplicitTiming) {
-	windowSize = 1;
+        if (modelType == CSVFormat::ThreeDimensionalModel) {
+            // This will be overridden later if more than one line
+            // appears in our file, but we want to choose a default
+            // that's likely to be visible
+            windowSize = 1024;
+        } else {
+            windowSize = 1;
+        }
 	if (timeUnits == CSVFormat::TimeSeconds) {
 	    sampleRate = m_mainModelSampleRate;
 	}
     }
 

     unsigned int lineno = 0;
 
     float min = 0.0, max = 0.0;
 
     size_t frameNo = 0;
+    size_t startFrame = 0; // for calculation of dense model resolution
 
     while (!in.atEnd()) {
 
         // QTextStream's readLine doesn't cope with old-style Mac
         // CR-only line endings.  Why did they bother making the class

 
                 for (int i = 0; i < tidyList.size(); ++i) {
 
                     bool ok = false;
                     float value = list[i].toFloat(&ok);
-                    values.push_back(value);
+
+                    if (i > 0 || timingType != CSVFormat::ExplicitTiming) {
+                        values.push_back(value);
+                    }
 	    
-                    if ((lineno == 0 && i == 0) || value < min) min = value;
-                    if ((lineno == 0 && i == 0) || value > max) max = value;
+                    bool firstEver = (lineno == 0 && i == 0);
+
+                    if (firstEver || value < min) min = value;
+                    if (firstEver || value > max) max = value;
+
+                    if (firstEver) {
+                        startFrame = frameNo;
+                        model3->setStartFrame(startFrame);
+                    } else if (lineno == 1 &&
+                               timingType == CSVFormat::ExplicitTiming) {
+                        model3->setResolution(frameNo - startFrame);
+                    }
 
                     if (!ok) {
                         if (warnings < warnLimit) {
                             std::cerr << "WARNING: CSVFileReader::load: "
                                       << "Non-numeric value \""

                 }
 	
 //                std::cerr << "Setting bin values for count " << lineno << ", frame "
 //                          << frameNo << ", time " << RealTime::frame2RealTime(frameNo, sampleRate) << std::endl;
 
-                model3->setColumn(frameNo / model3->getResolution(), values);
+                model3->setColumn(lineno, values);
             }
 
             ++lineno;
             if (timingType == CSVFormat::ImplicitTiming ||
                 list.size() == 0) {