comparison layer/Colour3DPlotLayer.cpp @ 20:1deb5f87a18c

* Add getXForFrame / getFrameForX in preference to using the zoom level everywhere

     //!!! Strictly speaking we want quite different paint mechanisms
     //for models that have more than one bin per pixel in either
     //direction.  This one is only really appropriate for models with
     //far fewer bins in both directions.
 
-    int sx0 = ((startFrame + x0 * zoomLevel) - int(modelStart)) /
-	int(modelWindow);
-    int sx1 = ((startFrame + x1 * zoomLevel) - int(modelStart)) / 
-	int(modelWindow);
+    int sx0 = int((getFrameForX(x0) - long(modelStart)) / long(modelWindow));
+    int sx1 = int((getFrameForX(x1) - long(modelStart)) / long(modelWindow));
     int sw = sx1 - sx0;
     int sh = m_model->getYBinCount();
 
 /*
     std::cerr << "Colour3DPlotLayer::paint: w " << w << ", h " << h << ", sx0 " << sx0 << ", sx1 " << sx1 << ", sw " << sw << ", sh " << sh << std::endl;

 	if (fx + modelWindow < int(modelStart) ||
 	    fx > int(modelEnd)) continue;
 
 	for (int sy = 0; sy < sh; ++sy) {
 
-	    int rx0 = ((fx + int(modelStart))
-		       - int(startFrame)) / zoomLevel;
-	    int rx1 = ((fx + int(modelWindow) + int(modelStart))
-		       - int(startFrame)) / zoomLevel;
+	    int rx0 = getXForFrame(fx + int(modelStart));
+	    int rx1 = getXForFrame(fx + int(modelStart) + int(modelWindow));
 
 	    int ry0 = h - (sy * h) / sh - 1;
 	    int ry1 = h - ((sy + 1) * h) / sh - 2;
 	    QRgb pixel = qRgb(255, 255, 255);
 	    if (sx >= 0 && sx < m_cache->width() &&