comparison framework/SVFileReader.cpp @ 380:d8bde801ebd4 tonioni

Merge from default branch
author Chris Cannam
date Wed, 02 Jul 2014 17:31:48 +0100
parents 6a84102c006a
children 7657075ecfca
comparison
equal deleted inserted replaced
372:1162c93e7688 380:d8bde801ebd4
765 765
766 // Specify the follow modes before we set the actual values 766 // Specify the follow modes before we set the actual values
767 view->setFollowGlobalPan(followPan); 767 view->setFollowGlobalPan(followPan);
768 view->setFollowGlobalZoom(followZoom); 768 view->setFollowGlobalZoom(followZoom);
769 view->setPlaybackFollow(tracking == "scroll" ? PlaybackScrollContinuous : 769 view->setPlaybackFollow(tracking == "scroll" ? PlaybackScrollContinuous :
770 tracking == "page" ? PlaybackScrollPage 770 tracking == "page" ? PlaybackScrollPageWithCentre :
771 tracking == "daw" ? PlaybackScrollPage
771 : PlaybackIgnore); 772 : PlaybackIgnore);
772 773
773 // Then set these values 774 // Then set these values
774 view->setCentreFrame(centre); 775 view->setCentreFrame(centre);
775 view->setZoomLevel(zoom); 776 view->setZoomLevel(zoom);