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

[pulseview.git] / pv / view / logicsignal.cpp

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 568d10b383652a438ddb88c8be09b44a6ac81e27..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::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::Logic> 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,
@@ -89,8 +88,13 @@ void LogicSignal::paint(QPainter &p, int y, int left, int right,
        const shared_ptr<pv::data::LogicSnapshot> &snapshot =
                snapshots.front();
 
+       double samplerate = _data->get_samplerate();
+
+       // Show sample rate as 1Hz when it is unknown
+       if (samplerate == 0.0)
+               samplerate = 1.0;
+
        const double pixels_offset = offset / scale;
-       const double samplerate = _data->get_samplerate();
        const double start_time = _data->get_start_time();
        const int64_t last_sample = snapshot->get_sample_count() - 1;
        const double samples_per_pixel = samplerate * scale;