projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Trace: Make paint_axis take RowItemPaintParams
[pulseview.git]
/
pv
/
view
/
trace.cpp
diff --git
a/pv/view/trace.cpp
b/pv/view/trace.cpp
index ebd3dc3681e68022bb51dbcc83051aa37b1714af..fd440185c4e9c376e4c5cef307c4b88e79e1b923 100644
(file)
--- a/
pv/view/trace.cpp
+++ b/
pv/view/trace.cpp
@@
-28,12
+28,12
@@
#include <QKeyEvent>
#include <QLineEdit>
#include <QKeyEvent>
#include <QLineEdit>
-#include "trace.h"
-#include "tracepalette.h"
-#include "view.h"
+#include "trace.h
pp
"
+#include "tracepalette.h
pp
"
+#include "view.h
pp
"
-#include <pv/widgets/colourbutton.h>
-#include <pv/widgets/popup.h>
+#include <pv/widgets/colourbutton.h
pp
>
+#include <pv/widgets/popup.h
pp
>
namespace pv {
namespace view {
namespace pv {
namespace view {
@@
-167,10
+167,10
@@
QColor Trace::get_text_colour() const
return (colour_.lightness() > 64) ? Qt::black : Qt::white;
}
return (colour_.lightness() > 64) ? Qt::black : Qt::white;
}
-void Trace::paint_axis(QPainter &p,
int y, int left, int right
)
+void Trace::paint_axis(QPainter &p,
const RowItemPaintParams &pp, int y
)
{
p.setPen(AxisPen);
{
p.setPen(AxisPen);
- p.drawLine(QPointF(
left, y + 0.5f), QPointF(right
, y + 0.5f));
+ p.drawLine(QPointF(
pp.left(), y + 0.5f), QPointF(pp.right()
, y + 0.5f));
}
void Trace::add_colour_option(QWidget *parent, QFormLayout *form)
}
void Trace::add_colour_option(QWidget *parent, QFormLayout *form)