Mercurial > hg > svgui
comparison view/Pane.h @ 810:b68af2be4545 tonioni
Merge from branch warnfix_no_size_t
author | Chris Cannam |
---|---|
date | Wed, 18 Jun 2014 13:42:25 +0100 |
parents | 40c6c9344ff6 |
children | d974ed657176 |
comparison
equal
deleted
inserted
replaced
802:584b11df8e4f | 810:b68af2be4545 |
---|---|
46 bool &closeToRight) const; | 46 bool &closeToRight) const; |
47 | 47 |
48 void setCentreLineVisible(bool visible); | 48 void setCentreLineVisible(bool visible); |
49 bool getCentreLineVisible() const { return m_centreLineVisible; } | 49 bool getCentreLineVisible() const { return m_centreLineVisible; } |
50 | 50 |
51 virtual size_t getFirstVisibleFrame() const; | 51 virtual int getFirstVisibleFrame() const; |
52 | 52 |
53 virtual size_t getVerticalScaleWidth() const; | 53 virtual int getVerticalScaleWidth() const; |
54 | 54 |
55 virtual QImage *toNewImage(size_t f0, size_t f1); | 55 virtual QImage *toNewImage(int f0, int f1); |
56 virtual QImage *toNewImage() { return View::toNewImage(); } | 56 virtual QImage *toNewImage() { return View::toNewImage(); } |
57 virtual QSize getImageSize(size_t f0, size_t f1); | 57 virtual QSize getImageSize(int f0, int f1); |
58 virtual QSize getImageSize() { return View::getImageSize(); } | 58 virtual QSize getImageSize() { return View::getImageSize(); } |
59 | 59 |
60 virtual void toXml(QTextStream &stream, QString indent = "", | 60 virtual void toXml(QTextStream &stream, QString indent = "", |
61 QString extraAttributes = "") const; | 61 QString extraAttributes = "") const; |
62 | 62 |
65 signals: | 65 signals: |
66 void paneInteractedWith(); | 66 void paneInteractedWith(); |
67 void rightButtonMenuRequested(QPoint position); | 67 void rightButtonMenuRequested(QPoint position); |
68 void dropAccepted(QStringList uriList); | 68 void dropAccepted(QStringList uriList); |
69 void dropAccepted(QString text); | 69 void dropAccepted(QString text); |
70 void doubleClickSelectInvoked(size_t frame); | 70 void doubleClickSelectInvoked(int frame); |
71 void regionOutlined(QRect rect); | 71 void regionOutlined(QRect rect); |
72 | 72 |
73 public slots: | 73 public slots: |
74 virtual void toolModeChanged(); | 74 virtual void toolModeChanged(); |
75 virtual void zoomWheelsEnabledChanged(); | 75 virtual void zoomWheelsEnabledChanged(); |
76 virtual void viewZoomLevelChanged(View *v, unsigned long z, bool locked); | 76 virtual void viewZoomLevelChanged(View *v, int z, bool locked); |
77 virtual void modelAlignmentCompletionChanged(); | 77 virtual void modelAlignmentCompletionChanged(); |
78 | 78 |
79 virtual void horizontalThumbwheelMoved(int value); | 79 virtual void horizontalThumbwheelMoved(int value); |
80 virtual void verticalThumbwheelMoved(int value); | 80 virtual void verticalThumbwheelMoved(int value); |
81 virtual void verticalZoomChanged(); | 81 virtual void verticalZoomChanged(); |
115 void drawWorkTitle(QRect, QPainter &, const Model *); | 115 void drawWorkTitle(QRect, QPainter &, const Model *); |
116 void drawLayerNames(QRect, QPainter &); | 116 void drawLayerNames(QRect, QPainter &); |
117 void drawEditingSelection(QPainter &); | 117 void drawEditingSelection(QPainter &); |
118 void drawAlignmentStatus(QRect, QPainter &, const Model *, bool down); | 118 void drawAlignmentStatus(QRect, QPainter &, const Model *, bool down); |
119 | 119 |
120 virtual bool render(QPainter &paint, int x0, size_t f0, size_t f1); | 120 virtual bool render(QPainter &paint, int x0, int f0, int f1); |
121 | 121 |
122 Selection getSelectionAt(int x, bool &closeToLeft, bool &closeToRight) const; | 122 Selection getSelectionAt(int x, bool &closeToLeft, bool &closeToRight) const; |
123 | 123 |
124 bool editSelectionStart(QMouseEvent *e); | 124 bool editSelectionStart(QMouseEvent *e); |
125 bool editSelectionDrag(QMouseEvent *e); | 125 bool editSelectionDrag(QMouseEvent *e); |
155 | 155 |
156 bool m_navigating; | 156 bool m_navigating; |
157 bool m_resizing; | 157 bool m_resizing; |
158 bool m_editing; | 158 bool m_editing; |
159 bool m_releasing; | 159 bool m_releasing; |
160 size_t m_dragCentreFrame; | 160 int m_dragCentreFrame; |
161 float m_dragStartMinValue; | 161 float m_dragStartMinValue; |
162 bool m_centreLineVisible; | 162 bool m_centreLineVisible; |
163 size_t m_selectionStartFrame; | 163 int m_selectionStartFrame; |
164 Selection m_editingSelection; | 164 Selection m_editingSelection; |
165 int m_editingSelectionEdge; | 165 int m_editingSelectionEdge; |
166 mutable int m_scaleWidth; | 166 mutable int m_scaleWidth; |
167 | 167 |
168 enum DragMode { | 168 enum DragMode { |