comparison layer/Colour3DPlotLayer.cpp @ 248:28c8e8e3c537

* Fix many compile warnings, remove some debug output

 
     int f0 = sx0 * modelResolution;
     int f1 =  f0 + modelResolution;
 
     float binHeight = float(v->height()) / m_model->getHeight();
-    int sy = (v->height() - y) / binHeight;
+    int sy = int((v->height() - y) / binHeight);
 
     float value = m_model->getValueAt(sx0, sy);
 
 //    std::cerr << "bin value (" << sx0 << "," << sy << ") is " << value << std::endl;
     

 
     return text;
 }
 
 int
-Colour3DPlotLayer::getColourScaleWidth(QPainter &paint) const
+Colour3DPlotLayer::getColourScaleWidth(QPainter &) const
 {
     int cw = 20;
     return cw;
 }
 
 int
-Colour3DPlotLayer::getVerticalScaleWidth(View *v, QPainter &paint) const
+Colour3DPlotLayer::getVerticalScaleWidth(View *, QPainter &paint) const
 {
     if (!m_model) return 0;
 
     QString sampleText = QString("[%1]").arg(m_model->getHeight());
     int tw = paint.fontMetrics().width(sampleText);

 
     for (size_t i = 0; i < m_model->getHeight(); ++i) {
 
         if ((i % step) != 0) continue;
 
-	int y0 = v->height() - (i * binHeight) - 1;
+	int y0 = int(v->height() - (i * binHeight) - 1);
 	
 	QString text = m_model->getBinName(i);
 	if (text == "") text = QString("[%1]").arg(i + 1);
 
 	paint.drawLine(cw, y0, w, y0);
 
-	int cy = y0 - (step * binHeight)/2;
+	int cy = int(y0 - (step * binHeight)/2);
 	int ty = cy + paint.fontMetrics().ascent()/2;
 
 	paint.drawText(cw + 5, ty, text);
     }
 }

     size_t cacheWidth = lastBin - firstBin + 1;
     size_t cacheHeight = m_model->getHeight();
 
     if (m_cache &&
 	(m_cacheStart != firstBin ||
-         m_cache->width() != cacheWidth ||
-	 m_cache->height() != cacheHeight)) {
+         m_cache->width() != int(cacheWidth) ||
+	 m_cache->height() != int(cacheHeight))) {
 
 	delete m_cache;
 	m_cache = 0;
     }
 

 
     if (sx0 > 0) --sx0;
     fillCache(sx0 < 0 ? 0 : sx0,
               sx1 < 0 ? 0 : sx1);
 
-    if (m_model->getHeight() >= v->height() ||
-        modelResolution < v->getZoomLevel() / 2) {
+    if (int(m_model->getHeight()) >= v->height() ||
+        int(modelResolution) < v->getZoomLevel() / 2) {
         paintDense(v, paint, rect);
         return;
     }
 
 #ifdef DEBUG_COLOUR_3D_PLOT_LAYER_PAINT

     char labelbuf[10];
 
     for (int sx = sx0; sx <= sx1; ++sx) {
 
         int scx = 0;
-        if (sx > m_cacheStart) scx = sx - m_cacheStart;
+        if (sx > int(m_cacheStart)) scx = sx - m_cacheStart;
         
 	int fx = sx * int(modelResolution);
 
-	if (fx + modelResolution < int(modelStart) ||
+	if (fx + int(modelResolution) < int(modelStart) ||
 	    fx > int(modelEnd)) continue;
 
-	int rx0 = v->getXForFrame((fx + int(modelStart)) * srRatio);
-	int rx1 = v->getXForFrame((fx + int(modelStart) + int(modelResolution) + 1) * srRatio);
+        int rx0 = v->getXForFrame(int((fx + int(modelStart)) * srRatio));
+	int rx1 = v->getXForFrame(int((fx + int(modelStart) + int(modelResolution) + 1) * srRatio));
 
 	int rw = rx1 - rx0;
 	if (rw < 1) rw = 1;
 
 	bool showLabel = (rw > 10 &&

 }
 
 void
 Colour3DPlotLayer::paintDense(View *v, QPainter &paint, QRect rect) const
 {
-    long startFrame = v->getStartFrame();
-    int zoomLevel = v->getZoomLevel();
-
     size_t modelStart = m_model->getStartFrame();
-    size_t modelEnd = m_model->getEndFrame();
     size_t modelResolution = m_model->getResolution();
 
     float srRatio =
         float(v->getViewManager()->getMainModelSampleRate()) /
         float(m_model->getSampleRate());

 
     QImage img(w, h, QImage::Format_RGB32);
 
     for (int x = x0; x < x1; ++x) {
 
-        long xf = v->getFrameForX(x) / srRatio;
+        long xf = long(v->getFrameForX(x) / srRatio);
         if (xf < 0) {
             for (int y = 0; y < h; ++y) {
                 img.setPixel(x - x0, y, m_cache->color(0));
             }
             continue;

             int max = 0;
 
             for (int sx = sx0i; sx <= sx1i; ++sx) {
 
                 int scx = 0;
-                if (sx > m_cacheStart) scx = sx - m_cacheStart;
+                if (sx > int(m_cacheStart)) scx = sx - int(m_cacheStart);
         
                 if (scx < 0 || scx >= m_cache->width()) continue;
 
                 for (int sy = sy0i; sy <= sy1i; ++sy) {