From 299d0e751844eb09d88f1a5bac45231571ca5c66 Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Sat, 16 Mar 2013 08:32:02 +0000 Subject: [PATCH] Renamed pv::view::LogicSignal::LogicSignalColours to SignalColours --- pv/view/logicsignal.cpp | 5 ++--- pv/view/logicsignal.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp index 7bf43594..87fe5b04 100644 --- a/pv/view/logicsignal.cpp +++ b/pv/view/logicsignal.cpp @@ -39,7 +39,7 @@ const QColor LogicSignal::EdgeColour(0x80, 0x80, 0x80); const QColor LogicSignal::HighColour(0x00, 0xC0, 0x00); const QColor LogicSignal::LowColour(0xC0, 0x00, 0x00); -const QColor LogicSignal::LogicSignalColours[10] = { +const QColor LogicSignal::SignalColours[10] = { QColor(0x16, 0x19, 0x1A), // Black QColor(0x8F, 0x52, 0x02), // Brown QColor(0xCC, 0x00, 0x00), // Red @@ -59,8 +59,7 @@ LogicSignal::LogicSignal(QString name, shared_ptr data, _data(data) { assert(_probe_index >= 0); - _colour = LogicSignalColours[ - _probe_index % countof(LogicSignalColours)]; + _colour = SignalColours[_probe_index % countof(SignalColours)]; } void LogicSignal::paint(QPainter &p, int y, int left, int right, diff --git a/pv/view/logicsignal.h b/pv/view/logicsignal.h index ad88241d..a9c24b44 100644 --- a/pv/view/logicsignal.h +++ b/pv/view/logicsignal.h @@ -42,7 +42,7 @@ private: static const QColor HighColour; static const QColor LowColour; - static const QColor LogicSignalColours[10]; + static const QColor SignalColours[10]; public: LogicSignal(QString name, -- 2.30.2