comparison layer/WaveformLayer.cpp @ 612:ea786e8bd931 sv_v2.0

Use drawPoint when drawing a single point, rather than drawLine. Otherwise the line seems to go missing some of the time, though I can't see any mistake in the code here. Fixes SV bug #485

   
     int zoomLevel = v->getZoomLevel();
 
 #ifdef DEBUG_WAVEFORM_PAINT
     Profiler profiler("WaveformLayer::paint", true);
-    SVDEBUG << "WaveformLayer::paint (" << rect.x() << "," << rect.y()
-	      << ") [" << rect.width() << "x" << rect.height() << "]: zoom " << zoomLevel << ", start " << startFrame << endl;
+    std::cerr << "WaveformLayer::paint (" << rect.x() << "," << rect.y()
+	      << ") [" << rect.width() << "x" << rect.height() << "]: zoom " << zoomLevel << endl;
 #endif
 
     size_t channels = 0, minChannel = 0, maxChannel = 0;
     bool mergingChannels = false, mixingChannels = false;
 

     QPainter *paint;
 
     if (m_aggressive) {
 
 #ifdef DEBUG_WAVEFORM_PAINT
-        SVDEBUG << "WaveformLayer::paint: aggressive is true" << endl;
+        std::cerr << "WaveformLayer::paint: aggressive is true" << endl;
 #endif
 
 	if (m_cacheValid && (zoomLevel != m_cacheZoomLevel)) {
 	    m_cacheValid = false;
 	}
 
 	if (!m_cache || m_cache->width() != w || m_cache->height() != h) {
 #ifdef DEBUG_WAVEFORM_PAINT
             if (m_cache) {
-                SVDEBUG << "WaveformLayer::paint: cache size " << m_cache->width() << "x" << m_cache->height() << " differs from view size " << w << "x" << h << ": regenerating aggressive cache" << endl;
+                std::cerr << "WaveformLayer::paint: cache size " << m_cache->width() << "x" << m_cache->height() << " differs from view size " << w << "x" << h << ": regenerating aggressive cache" << endl;
             }
 #endif
 	    delete m_cache;
 	    m_cache = new QPixmap(w, h);
             m_cacheValid = false;

 
     getSourceFramesForX(v, x0, modelZoomLevel, frame0, spare);
     getSourceFramesForX(v, x1, modelZoomLevel, spare, frame1);
     
 #ifdef DEBUG_WAVEFORM_PAINT
-    SVDEBUG << "Painting waveform from " << frame0 << " to " << frame1 << " (" << (x1-x0+1) << " pixels at zoom " << zoomLevel << " and model zoom " << modelZoomLevel << ")" <<  endl;
+    std::cerr << "Painting waveform from " << frame0 << " to " << frame1 << " (" << (x1-x0+1) << " pixels at zoom " << zoomLevel << " and model zoom " << modelZoomLevel << ")" <<  std::endl;
 #endif
 
     RangeSummarisableTimeValueModel::RangeBlock *ranges = 
         new RangeSummarisableTimeValueModel::RangeBlock;
 

 
         float gain = m_effectiveGains[ch];
 
 	int m = (h / channels) / 2;
 	int my = m + (((ch - minChannel) * h) / channels);
-	
-//	std::cerr << "ch = " << ch << ", channels = " << channels << ", m = " << m << ", my = " << my << ", h = " << h << std::endl;
+
+#ifdef DEBUG_WAVEFORM_PAINT	
+	std::cerr << "ch = " << ch << ", channels = " << channels << ", m = " << m << ", my = " << my << ", h = " << h << std::endl;
+#endif
 
 	if (my - m > y1 || my + m < y0) continue;
 
         if ((m_scale == dBScale || m_scale == MeterScale) &&
             m_channelMode != MergeChannels) {

 
             size_t i0 = (f0 - frame0) / modelZoomLevel;
             size_t i1 = (f1 - frame0) / modelZoomLevel;
 
 #ifdef DEBUG_WAVEFORM_PAINT
-            SVDEBUG << "WaveformLayer::paint: pixel " << x << ": i0 " << i0 << " (f " << f0 << "), i1 " << i1 << " (f " << f1 << ")" << endl;
+            std::cerr << "WaveformLayer::paint: pixel " << x << ": i0 " << i0 << " (f " << f0 << "), i1 " << i1 << " (f " << f1 << ")" << std::endl;
 #endif
 
             if (i1 > i0 + 1) {
-                SVDEBUG << "WaveformLayer::paint: ERROR: i1 " << i1 << " > i0 " << i0 << " plus one (zoom = " << zoomLevel << ", model zoom = " << modelZoomLevel << ")" << endl;
+                std::cerr << "WaveformLayer::paint: ERROR: i1 " << i1 << " > i0 " << i0 << " plus one (zoom = " << zoomLevel << ", model zoom = " << modelZoomLevel << ")" << std::endl;
             }
 
 	    if (ranges && i0 < ranges->size()) {
 
 		range = (*ranges)[i0];

 		    range.setMin(std::min(range.min(), (*ranges)[i1].min()));
 		    range.setAbsmean((range.absmean() + (*ranges)[i1].absmean()) / 2);
 		}
 
 	    } else {
+#ifdef DEBUG_WAVEFORM_PAINT
+                std::cerr << "No (or not enough) ranges for i0 = " << i0 << std::endl;
+#endif
 		continue;
 	    }
 
 	    int rangeBottom = 0, rangeTop = 0, meanBottom = 0, meanTop = 0;
 

 		}
 	    } else {
 		paint->setPen(midColour);
 	    }
 
-	    paint->drawLine(x, rangeBottom, x, rangeTop);
+#ifdef DEBUG_WAVEFORM_PAINT
+            std::cerr << "range " << rangeBottom << " -> " << rangeTop << std::endl;
+#endif
+
+            if (rangeTop == rangeBottom) {
+                paint->drawPoint(x, rangeTop);
+            } else {
+                paint->drawLine(x, rangeBottom, x, rangeTop);
+            }
 
 	    prevRangeTopColour = baseColour;
 	    prevRangeBottomColour = baseColour;
 
 	    if (m_greyscale && (m_scale == LinearScale) && ready) {