Mercurial > hg > svgui
comparison view/Overview.h @ 972:1011ffb1b6d5 osx-retina
Merge from default branch
author | Chris Cannam |
---|---|
date | Wed, 10 Jun 2015 13:38:02 +0100 |
parents | 73b0dc7d6ec1 |
children | bc2cb82050a0 |
comparison
equal
deleted
inserted
replaced
969:0aac065f09f9 | 972:1011ffb1b6d5 |
---|---|
47 virtual void globalCentreFrameChanged(sv_frame_t); | 47 virtual void globalCentreFrameChanged(sv_frame_t); |
48 virtual void viewCentreFrameChanged(View *, sv_frame_t); | 48 virtual void viewCentreFrameChanged(View *, sv_frame_t); |
49 virtual void viewZoomLevelChanged(View *, int, bool); | 49 virtual void viewZoomLevelChanged(View *, int, bool); |
50 virtual void viewManagerPlaybackFrameChanged(sv_frame_t); | 50 virtual void viewManagerPlaybackFrameChanged(sv_frame_t); |
51 | 51 |
52 virtual void setBoxColour(QColor); | |
53 | |
52 protected: | 54 protected: |
53 virtual void paintEvent(QPaintEvent *e); | 55 virtual void paintEvent(QPaintEvent *e); |
54 virtual void mousePressEvent(QMouseEvent *e); | 56 virtual void mousePressEvent(QMouseEvent *e); |
55 virtual void mouseReleaseEvent(QMouseEvent *e); | 57 virtual void mouseReleaseEvent(QMouseEvent *e); |
56 virtual void mouseMoveEvent(QMouseEvent *e); | 58 virtual void mouseMoveEvent(QMouseEvent *e); |
65 QPoint m_clickPos; | 67 QPoint m_clickPos; |
66 QPoint m_mousePos; | 68 QPoint m_mousePos; |
67 bool m_clickedInRange; | 69 bool m_clickedInRange; |
68 sv_frame_t m_dragCentreFrame; | 70 sv_frame_t m_dragCentreFrame; |
69 QTime m_modelTestTime; | 71 QTime m_modelTestTime; |
72 QColor m_boxColour; | |
70 | 73 |
71 typedef std::set<View *> ViewSet; | 74 typedef std::set<View *> ViewSet; |
72 ViewSet m_views; | 75 ViewSet m_views; |
73 }; | 76 }; |
74 | 77 |