comparison layer/Colour3DPlotLayer.cpp @ 125:999ae0f7d10c

* Change preferences dialog to ok/apply/cancel model
* Make preferences persist in a config file
* Change instance() to getInstance() for all singleton types
* Make pasting to time-value layer with no values in clipboard ask you how to
  generate the values
* Fix bad behaviour caused by importing "data"-type (i.e. 3d dense) model from
  annotation file without a fixed window size available

 
 #include <iostream>
 
 #include <cassert>
 
+//#define DEBUG_COLOUR_3D_PLOT_LAYER_PAINT 1
+
 
 Colour3DPlotLayer::Colour3DPlotLayer() :
     Layer(),
     m_model(0),
     m_cache(0)

 
 void
 Colour3DPlotLayer::paint(View *v, QPainter &paint, QRect rect) const
 {
 //    Profiler profiler("Colour3DPlotLayer::paint");
-//    std::cerr << "Colour3DPlotLayer::paint(): m_model is " << m_model << ", zoom level is " << v->getZoomLevel() << std::endl;
+#ifdef DEBUG_COLOUR_3D_PLOT_LAYER_PAINT
+    std::cerr << "Colour3DPlotLayer::paint(): m_model is " << m_model << ", zoom level is " << v->getZoomLevel() << std::endl;
+#endif
 
     //!!! This doesn't yet accommodate the fact that the model may
     //have a different sample rate from an underlying model.  At the
     //moment our paint mechanism assumes all models have the same
     //sample rate.  If that isn't the case, they won't align and the

     int sx0 = int((v->getFrameForX(x0) - long(modelStart)) / long(modelWindow));
     int sx1 = int((v->getFrameForX(x1) - long(modelStart)) / long(modelWindow));
     int sw = sx1 - sx0;
     int sh = m_model->getYBinCount();
 
-/*
+#ifdef DEBUG_COLOUR_3D_PLOT_LAYER_PAINT
     std::cerr << "Colour3DPlotLayer::paint: w " << w << ", h " << h << ", sx0 " << sx0 << ", sx1 " << sx1 << ", sw " << sw << ", sh " << sh << std::endl;
     std::cerr << "Colour3DPlotLayer: sample rate is " << m_model->getSampleRate() << ", window size " << m_model->getWindowSize() << std::endl;
-*/
+#endif
 
     QPoint illuminatePos;
     bool illuminate = v->shouldIlluminateLocalFeatures(this, illuminatePos);
     char labelbuf[10];
 

 		if (r.contains(illuminatePos)) {
 		    paint.setPen(Qt::black);//!!!
 		}
 	    }
             
-//            std::cout << "rect " << rx0 << "," << (ry0 - h / sh - 1) << " "
-//                      << w << "x" << (h / sh + 1) << std::endl;
+#ifdef DEBUG_COLOUR_3D_PLOT_LAYER_PAINT
+            std::cerr << "rect " << rx0 << "," << (ry0 - h / sh - 1) << " "
+                      << w << "x" << (h / sh + 1) << std::endl;
+#endif
 
 	    paint.drawRect(r);
 
 	    if (showLabel) {
 		if (sx >= 0 && sx < m_cache->width() &&