comparison view/View.cpp @ 229:387f2f6fc333 sv1-1.0pre2

* Remove tip dialog for now.  I don't like it enough
* Fixes to export image

 
     paint.restore();
 }
 
 bool
-View::render(QPainter &paint, QRect rect)
-{
-    size_t f0 = getModelsStartFrame();
-    size_t f1 = getModelsEndFrame();
-
+View::render(QPainter &paint, int xorigin, size_t f0, size_t f1)
+{
     size_t x0 = f0 / m_zoomLevel;
     size_t x1 = f1 / m_zoomLevel;
 
     size_t w = x1 - x0;
 

             m_centreFrame = origCentreFrame;
             update();
             return false;
         }
 
-        m_centreFrame = (x + width()/2) * m_zoomLevel;
+        m_centreFrame = f0 + (x + width()/2) * m_zoomLevel;
         
         QRect chunk(0, 0, width(), height());
 
 	if (hasLightBackground()) {
 	    paint.setPen(Qt::white);

 	} else {
 	    paint.setPen(Qt::black);
 	    paint.setBrush(Qt::black);
 	}
 
-	paint.drawRect(QRect(rect.x() + x, rect.y(), width(), height()));
+	paint.drawRect(QRect(xorigin + x, 0, width(), height()));
 
 	paint.setPen(Qt::black);
 	paint.setBrush(Qt::NoBrush);
 
 	for (LayerList::iterator i = m_layers.begin();
              i != m_layers.end(); ++i) {
 
 	    paint.setRenderHint(QPainter::Antialiasing, false);
 
 	    paint.save();
-            paint.translate(rect.x() + x, rect.y());
-
-//            std::cerr << "Centre frame now: " << m_centreFrame << " drawing to " << chunk.x() << ", " << chunk.width() << std::endl;
+            paint.translate(xorigin + x, 0);
+
+            std::cerr << "Centre frame now: " << m_centreFrame << " drawing to " << chunk.x() + x + xorigin << ", " << chunk.width() << std::endl;
 
 	    (*i)->paint(this, paint, chunk);
 
 	    paint.restore();
 	}

 View::toNewImage()
 {
     size_t f0 = getModelsStartFrame();
     size_t f1 = getModelsEndFrame();
 
+    return toNewImage(f0, f1);
+}
+
+QImage *
+View::toNewImage(size_t f0, size_t f1)
+{
     size_t x0 = f0 / getZoomLevel();
     size_t x1 = f1 / getZoomLevel();
     
     QImage *image = new QImage(x1 - x0, height(), QImage::Format_RGB32);
 
     QPainter *paint = new QPainter(image);
-    if (!render(*paint, image->rect())) {
+    if (!render(*paint, 0, f0, f1)) {
         delete paint;
         delete image;
         return 0;
     } else {
         delete paint;
         return image;
     }
+}
+
+QSize
+View::getImageSize()
+{
+    size_t f0 = getModelsStartFrame();
+    size_t f1 = getModelsEndFrame();
+
+    return getImageSize(f0, f1);
+}
+    
+QSize
+View::getImageSize(size_t f0, size_t f1)
+{
+    size_t x0 = f0 / getZoomLevel();
+    size_t x1 = f1 / getZoomLevel();
+
+    return QSize(x1 - x0, height());
 }
 
 QString
 View::toXmlString(QString indent, QString extraAttributes) const
 {