Renamed pv::view::LogicSignal::LogicSignalColours to SignalColours

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 7bf43594b602934ef5fca0b284cbbb7873a3a44f..87fe5b0469e08c417804ac5b0a2519b3331dc95e 100644 (file)
--- 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::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
        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::Logic> data,
        _data(data)
 {
        assert(_probe_index >= 0);
        _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,
 }
 
 void LogicSignal::paint(QPainter &p, int y, int left, int right,

diff --git a/pv/view/logicsignal.h b/pv/view/logicsignal.h
index ad88241da34de704c783e77a7acc4bfb63763b87..a9c24b44da7bd13b27896ffc5cdc2e2173f54fad 100644 (file)
--- 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 HighColour;
        static const QColor LowColour;
 

-       static const QColor LogicSignalColours[10];
+       static const QColor SignalColours[10];

 
 public:
        LogicSignal(QString name,
 
 public:
        LogicSignal(QString name,