comparison base/View.cpp @ 9:73d85d19919f

* Add play-selection and looping modes.  Looping seems to work OK, but
  the plain play-selection is miscalculating current frame number to
  feed back to the GUI.
* Cache selection rectanges wherever possible in View::paintEvent.

     m_lightBackground(true),
     m_showProgress(showProgress),
     m_cache(0),
     m_cacheCentreFrame(0),
     m_cacheZoomLevel(1024),
+    m_selectionCached(false),
     m_deleting(false),
     m_haveSelectedLayer(false),
     m_manager(0)
 {
 //    QWidget::setAttribute(Qt::WA_PaintOnScreen);

 	m_manager->disconnect(this, SLOT(viewManagerZoomLevelChanged(void *, unsigned long, bool)));
 	disconnect(m_manager, SIGNAL(centreFrameChanged(void *, unsigned long, bool)));
 	disconnect(m_manager, SIGNAL(zoomLevelChanged(void *, unsigned long, bool)));
 	disconnect(m_manager, SIGNAL(toolModeChanged()));
 	disconnect(m_manager, SIGNAL(selectionChanged()));
+	disconnect(m_manager, SIGNAL(inProgressSelectionChanged()));
     }
 
     m_manager = manager;
     if (m_followPan) setCentreFrame(m_manager->getGlobalCentreFrame(), false);
     if (m_followZoom) setZoomLevel(m_manager->getGlobalZoom());

     connect(m_manager, SIGNAL(zoomLevelChanged(void *, unsigned long, bool)),
 	    this, SLOT(viewManagerZoomLevelChanged(void *, unsigned long, bool)));
     connect(m_manager, SIGNAL(toolModeChanged()),
 	    this, SLOT(toolModeChanged()));
     connect(m_manager, SIGNAL(selectionChanged()),
-	    this, SLOT(update()));
+	    this, SLOT(selectionChanged()));
+    connect(m_manager, SIGNAL(inProgressSelectionChanged()),
+	    this, SLOT(selectionChanged()));
 
     connect(this, SIGNAL(centreFrameChanged(void *, unsigned long, bool)),
 	    m_manager, SIGNAL(centreFrameChanged(void *, unsigned long, bool)));
     connect(this, SIGNAL(zoomLevelChanged(void *, unsigned long, bool)),
 	    m_manager, SIGNAL(zoomLevelChanged(void *, unsigned long, bool)));

 	if (m_manager && (sender() == m_manager)) {
 	    setZoomLevel(z);
 	    if (p == this) repaint();
 	}
     }
+}
+
+void
+View::selectionChanged()
+{
+    if (m_selectionCached) {
+	delete m_cache;
+	m_cache = 0;
+	m_selectionCached = false;
+    }
+    update();
 }
 
 size_t
 View::getModelsStartFrame() const
 {

     // are, we should store only those in the cache
 
     bool layersChanged = false;
     LayerList scrollables = getScrollableBackLayers(layersChanged);
     LayerList nonScrollables = getNonScrollableFrontLayers(layersChanged);
+    bool selectionCacheable = nonScrollables.empty();
+    bool haveSelections = m_manager && !m_manager->getSelections().empty();
+    bool selectionDrawn = false;
 
 #ifdef DEBUG_VIEW_WIDGET_PAINT
     std::cerr << "View(" << this << ")::paintEvent: have " << scrollables.size()
 	      << " scrollable back layers and " << nonScrollables.size()
 	      << " non-scrollable front layers" << std::endl;
-#endif
-
-    if (layersChanged || scrollables.empty()) {
+    std::cerr << "haveSelections " << haveSelections << ", selectionCacheable "
+	      << selectionCacheable << ", m_selectionCached " << m_selectionCached << std::endl;
+#endif
+
+    if (layersChanged || scrollables.empty() ||
+	(haveSelections && (selectionCacheable != m_selectionCached))) {
 	delete m_cache;
 	m_cache = 0;
+	m_selectionCached = false;
     }
 
     if (!scrollables.empty()) {
 	if (!m_cache ||
 	    m_cacheZoomLevel != m_zoomLevel ||

 	    paint.setRenderHint(QPainter::Antialiasing, false);
 	    paint.save();
 	    (*i)->paint(paint, cacheRect);
 	    paint.restore();
 	}
+
+	if (haveSelections && selectionCacheable) {
+	    drawSelections(paint);
+	    m_selectionCached = repaintCache;
+	    selectionDrawn = true;
+	}
 	
 	paint.end();
 
 	if (repaintCache) {
 	    cacheRect |= (e ? e->rect() : rect());

 	
     for (LayerList::iterator i = nonScrollables.begin(); i != nonScrollables.end(); ++i) {
 	(*i)->paint(paint, nonCacheRect);
     }
 	
+    paint.end();
+
+    paint.begin(this);
+    if (e) paint.setClipRect(e->rect());
+    if (!m_selectionCached) {
+	drawSelections(paint);
+    }
+    paint.end();
+
+    if (m_followPlay != PlaybackScrollContinuous) {
+
+	paint.begin(this);
+
+	if (long(m_playPointerFrame) > getStartFrame() &&
+	    m_playPointerFrame < getEndFrame()) {
+
+	    int playx = (long(m_playPointerFrame) - getStartFrame()) /
+		m_zoomLevel;
+
+	    paint.setPen(Qt::black);
+	    paint.drawLine(playx - 1, 0, playx - 1, height() - 1);
+	    paint.drawLine(playx + 1, 0, playx + 1, height() - 1);
+	    paint.drawPoint(playx, 0);
+	    paint.drawPoint(playx, height() - 1);
+	    paint.setPen(Qt::white);
+	    paint.drawLine(playx, 1, playx, height() - 2);
+	}
+
+	paint.end();
+    }
+
+    QFrame::paintEvent(e);
+}
+
+void
+View::drawSelections(QPainter &paint)
+{
     ViewManager::SelectionList selections;
 
     if (m_manager) {
 	selections = m_manager->getSelections();
 	if (m_manager->haveInProgressSelection()) {

 	    if (exclusive) selections.clear();
 	    selections.insert(inProgressSelection);
 	}
     }
 
+    paint.save();
     paint.setPen(QColor(150, 150, 255));
     paint.setBrush(QColor(150, 150, 255, 80));
 
     for (ViewManager::SelectionList::iterator i = selections.begin();
 	 i != selections.end(); ++i) {

 
 	if (p0 == -1 && p1 == -1) continue;
 
 	if (p1 > width()) p1 = width() + 1;
 
+#ifdef DEBUG_VIEW_WIDGET_PAINT
+	std::cerr << "View::drawSelections: " << p0 << ",-1 [" << (p1-p0) << "x" << (height()+1) << "]" << std::endl;
+#endif
+
 	paint.drawRect(p0, -1, p1 - p0, height() + 1);
     }
 
-    paint.end();
-
-    if (m_followPlay != PlaybackScrollContinuous) {
-
-	paint.begin(this);
-
-	if (long(m_playPointerFrame) > getStartFrame() &&
-	    m_playPointerFrame < getEndFrame()) {
-
-	    int playx = (long(m_playPointerFrame) - getStartFrame()) /
-		m_zoomLevel;
-
-	    paint.setPen(Qt::black);
-	    paint.drawLine(playx - 1, 0, playx - 1, height() - 1);
-	    paint.drawLine(playx + 1, 0, playx + 1, height() - 1);
-	    paint.drawPoint(playx, 0);
-	    paint.drawPoint(playx, height() - 1);
-	    paint.setPen(Qt::white);
-	    paint.drawLine(playx, 1, playx, height() - 2);
-	}
-
-	paint.end();
-    }
-
-    QFrame::paintEvent(e);
+    paint.restore();
 }
 
 QString
 View::toXmlString(QString indent, QString extraAttributes) const
 {