Mercurial > hg > svgui
comparison view/View.cpp @ 1057:218be6cf2d4f spectrogram-minor-refactor
Merge from default branch
| author | Chris Cannam | 
|---|---|
| date | Mon, 13 Jun 2016 12:46:36 +0100 | 
| parents | 4e5c1c326794 | 
| children | ee01a4062747 | 
   comparison
  equal
  deleted
  inserted
  replaced
| 1040:25b035362c44 | 1057:218be6cf2d4f | 
|---|---|
| 49 //#define DEBUG_VIEW 1 | 49 //#define DEBUG_VIEW 1 | 
| 50 //#define DEBUG_VIEW_WIDGET_PAINT 1 | 50 //#define DEBUG_VIEW_WIDGET_PAINT 1 | 
| 51 | 51 | 
| 52 View::View(QWidget *w, bool showProgress) : | 52 View::View(QWidget *w, bool showProgress) : | 
| 53 QFrame(w), | 53 QFrame(w), | 
| 54 m_id(getNextId()), | |
| 54 m_centreFrame(0), | 55 m_centreFrame(0), | 
| 55 m_zoomLevel(1024), | 56 m_zoomLevel(1024), | 
| 56 m_followPan(true), | 57 m_followPan(true), | 
| 57 m_followZoom(true), | 58 m_followZoom(true), | 
| 58 m_followPlay(PlaybackScrollPageWithCentre), | 59 m_followPlay(PlaybackScrollPageWithCentre), | 
