diff layer/Colour3DPlotLayer.cpp @ 680:ced5f158eda7 tonioni

Merge from default branch

--- a/layer/Colour3DPlotLayer.cpp	Tue Jul 16 17:59:01 2013 +0100
+++ b/layer/Colour3DPlotLayer.cpp	Fri Nov 22 10:40:51 2013 +0000
@@ -1350,11 +1350,11 @@
     
     QImage *source = m_cache;
     
-    std::cerr << "modelResolution " << modelResolution << ", srRatio "
+    SVDEBUG << "modelResolution " << modelResolution << ", srRatio "
               << srRatio << ", m_peakResolution " << m_peakResolution
               << ", zoomLevel " << zoomLevel << ", result "
               << ((modelResolution * srRatio * m_peakResolution) / zoomLevel)
-              << std::endl;
+              << endl;
 
     if (m_peaksCache) {
         if (((modelResolution * srRatio * m_peakResolution) / zoomLevel) < 1) {
@@ -1362,10 +1362,10 @@
             source = m_peaksCache;
             modelResolution *= m_peakResolution;
         } else {
-            std::cerr << "not using peaks cache" << std::endl;
+            SVDEBUG << "not using peaks cache" << endl;
         }
     } else {
-        std::cerr << "have no peaks cache" << std::endl;
+        SVDEBUG << "have no peaks cache" << endl;
     }
 
     int psy1i = -1;