comparison base/View.cpp @ 21:5da86cc182bd

* Add natty segmentation display to time-value layer.  Need to do the same
  for time-instants layer.

* Make sure dense 3D model bin names are saved and restored properly.

* Fix to chromagram normalization

     bool visible = (getXForFrame(m_playPointerFrame) != getXForFrame(f));
     size_t oldPlayPointerFrame = m_playPointerFrame;
     m_playPointerFrame = f;
     if (!visible) return;
 
-    if (QApplication::keyboardModifiers() != Qt::NoModifier) {
-	std::cerr << "View::viewManagerPlaybackFrameChanged: modifiers == "
-		  << QApplication::keyboardModifiers()
-		  << std::endl;
-    }
+    bool modifierPressed = // we only care about these ones
+	((QApplication::keyboardModifiers() & Qt::ShiftModifier) ||
+	 (QApplication::keyboardModifiers() & Qt::ControlModifier));
 
     switch (m_followPlay) {
 
     case PlaybackScrollContinuous:
 	if (QApplication::mouseButtons() == Qt::NoButton &&
-	    QApplication::keyboardModifiers() == Qt::NoModifier) {
+	    !modifierPressed) {
 	    setCentreFrame(f, false);
 	}
 	break;
 
     case PlaybackScrollPage:

 	std::cerr << "xnew = " << xnew << ", width = " << width() << std::endl;
 #endif
 
 	if (xnew < width()/8 || xnew > (width()*7)/8) {
 	    if (QApplication::mouseButtons() == Qt::NoButton &&
-		QApplication::keyboardModifiers() == Qt::NoModifier) {
+		!modifierPressed) {
 		long offset = getFrameForX(width()/2) - getStartFrame();
 		long newCentre = sf + offset;
 		bool changed = setCentreFrame(newCentre, false);
 		if (changed) {
 		    xold = getXForFrame(oldPlayPointerFrame);