projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bcaa184
)
RowItem: Make label_rect a const function
author
Joel Holdsworth
<joel@airwebreathe.org.uk>
Wed, 1 Oct 2014 20:37:59 +0000
(21:37 +0100)
committer
Joel Holdsworth
<joel@airwebreathe.org.uk>
Wed, 19 Nov 2014 10:23:02 +0000
(10:23 +0000)
pv/view/rowitem.h
patch
|
blob
|
history
pv/view/trace.cpp
patch
|
blob
|
history
pv/view/trace.h
patch
|
blob
|
history
pv/view/tracegroup.cpp
patch
|
blob
|
history
pv/view/tracegroup.h
patch
|
blob
|
history
diff --git
a/pv/view/rowitem.h
b/pv/view/rowitem.h
index fb09edaa3cc76b52e00f3bca94c613efc7de8fbe..90036389dd39dea17d04d860d2422a1bc474bcc3 100644
(file)
--- a/
pv/view/rowitem.h
+++ b/
pv/view/rowitem.h
@@
-106,7
+106,7
@@
public:
* area.
* @return Returns the rectangle of the signal label.
*/
* area.
* @return Returns the rectangle of the signal label.
*/
- virtual QRectF label_rect(int right) = 0;
+ virtual QRectF label_rect(int right)
const
= 0;
public:
virtual void hover_point_changed();
public:
virtual void hover_point_changed();
diff --git
a/pv/view/trace.cpp
b/pv/view/trace.cpp
index f6c27430942a4d258cb93297b86114c9397354c3..3409ecf75cb7a471dba4ebe73b6adf5532cf4762 100644
(file)
--- a/
pv/view/trace.cpp
+++ b/
pv/view/trace.cpp
@@
-143,7
+143,7
@@
pv::widgets::Popup* Trace::create_popup(QWidget *parent)
return _popup;
}
return _popup;
}
-QRectF Trace::label_rect(int right)
+QRectF Trace::label_rect(int right)
const
{
using pv::view::View;
{
using pv::view::View;
diff --git
a/pv/view/trace.h
b/pv/view/trace.h
index e3754b6e73a6fdf566a1f8ecfe464db429d07418..7fd8c67afb8e917a5384d27fe87b61edd996c7b0 100644
(file)
--- a/
pv/view/trace.h
+++ b/
pv/view/trace.h
@@
-92,7
+92,7
@@
public:
* area.
* @return Returns the rectangle of the signal label.
*/
* area.
* @return Returns the rectangle of the signal label.
*/
- QRectF label_rect(int right);
+ QRectF label_rect(int right)
const
;
protected:
protected:
diff --git
a/pv/view/tracegroup.cpp
b/pv/view/tracegroup.cpp
index 2c49ae430642ba965f634fc1cc1c36355eba4350..f99b19666ba27892902a97fde42801a47a8ddca2 100644
(file)
--- a/
pv/view/tracegroup.cpp
+++ b/
pv/view/tracegroup.cpp
@@
-72,7
+72,7
@@
void TraceGroup::paint_label(QPainter &p, int right, bool hover)
(void)hover;
}
(void)hover;
}
-QRectF TraceGroup::label_rect(int right)
+QRectF TraceGroup::label_rect(int right)
const
{
(void)right;
return QRectF();
{
(void)right;
return QRectF();
diff --git
a/pv/view/tracegroup.h
b/pv/view/tracegroup.h
index 297afa82eaec28c1002bc79cbbd33a4ee47466e4..0d246cee3c05471c88dbe4f99425eafcea395230 100644
(file)
--- a/
pv/view/tracegroup.h
+++ b/
pv/view/tracegroup.h
@@
-77,7
+77,7
@@
public:
* area.
* @return Returns the rectangle of the signal label.
*/
* area.
* @return Returns the rectangle of the signal label.
*/
- QRectF label_rect(int right);
+ QRectF label_rect(int right)
const
;
/**
* Determines if a point is in the header label rect.
/**
* Determines if a point is in the header label rect.