projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added a label colour chooser dialog
[pulseview.git]
/
pv
/
logicsignal.cpp
diff --git
a/pv/logicsignal.cpp
b/pv/logicsignal.cpp
index a0dabe4a00ed1c39bf1d68c51a950238afc448f4..0c1933d5ae8ed50d408344631cd0def0f63dd5ac 100644
(file)
--- a/
pv/logicsignal.cpp
+++ b/
pv/logicsignal.cpp
@@
-58,6
+58,8
@@
LogicSignal::LogicSignal(QString name, shared_ptr<LogicData> data,
_data(data)
{
assert(_probe_index >= 0);
_data(data)
{
assert(_probe_index >= 0);
+ _colour = LogicSignalColours[
+ _probe_index % countof(LogicSignalColours)];
}
void LogicSignal::paint(QPainter &p, const QRect &rect, double scale,
}
void LogicSignal::paint(QPainter &p, const QRect &rect, double scale,
@@
-145,11
+147,6
@@
void LogicSignal::paint_caps(QPainter &p, QLineF *const lines,
p.drawLines(lines, line - lines);
}
p.drawLines(lines, line - lines);
}
-QColor LogicSignal::get_colour() const
-{
- return LogicSignalColours[_probe_index % countof(LogicSignalColours)];
-}
-
int LogicSignal::get_nominal_offset(const QRect &rect) const
{
return rect.bottom() - Margin;
int LogicSignal::get_nominal_offset(const QRect &rect) const
{
return rect.bottom() - Margin;