comparison view/Overview.h @ 944:78c152e4db95

Merge from branch tonioni
author Chris Cannam
date Mon, 20 Apr 2015 09:12:17 +0100
parents 26da827e8fb5
children 73b0dc7d6ec1
comparison
equal deleted inserted replaced
896:78e041e45ff0 944:78c152e4db95
39 void unregisterView(View *view); 39 void unregisterView(View *view);
40 40
41 virtual QString getPropertyContainerIconName() const { return "panner"; } 41 virtual QString getPropertyContainerIconName() const { return "panner"; }
42 42
43 public slots: 43 public slots:
44 virtual void modelChangedWithin(int startFrame, int endFrame); 44 virtual void modelChangedWithin(sv_frame_t startFrame, sv_frame_t endFrame);
45 virtual void modelReplaced(); 45 virtual void modelReplaced();
46 46
47 virtual void globalCentreFrameChanged(int); 47 virtual void globalCentreFrameChanged(sv_frame_t);
48 virtual void viewCentreFrameChanged(View *, int); 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(int); 50 virtual void viewManagerPlaybackFrameChanged(sv_frame_t);
51 51
52 protected: 52 protected:
53 virtual void paintEvent(QPaintEvent *e); 53 virtual void paintEvent(QPaintEvent *e);
54 virtual void mousePressEvent(QMouseEvent *e); 54 virtual void mousePressEvent(QMouseEvent *e);
55 virtual void mouseReleaseEvent(QMouseEvent *e); 55 virtual void mouseReleaseEvent(QMouseEvent *e);
57 virtual void mouseDoubleClickEvent(QMouseEvent *e); 57 virtual void mouseDoubleClickEvent(QMouseEvent *e);
58 virtual void enterEvent(QEvent *); 58 virtual void enterEvent(QEvent *);
59 virtual void leaveEvent(QEvent *); 59 virtual void leaveEvent(QEvent *);
60 virtual bool shouldLabelSelections() const { return false; } 60 virtual bool shouldLabelSelections() const { return false; }
61 61
62 QColor getFillWithin() const;
63 QColor getFillWithout() const;
64
62 QPoint m_clickPos; 65 QPoint m_clickPos;
63 QPoint m_mousePos; 66 QPoint m_mousePos;
64 bool m_clickedInRange; 67 bool m_clickedInRange;
65 int m_dragCentreFrame; 68 sv_frame_t m_dragCentreFrame;
66 QTime m_modelTestTime; 69 QTime m_modelTestTime;
67 70
68 typedef std::set<View *> ViewSet; 71 typedef std::set<View *> ViewSet;
69 ViewSet m_views; 72 ViewSet m_views;
70 }; 73 };