Added get_context_bar_actions

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

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 051da4d89af92ef1694c88cdd08901c487a15b2b..e071e720b33991a34f21e0ec240874c7f17a783d 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
@@ -52,15 +52,22 @@ const QColor LogicSignal::LogicSignalColours[10] = {
        QColor(0xEE, 0xEE, 0xEC),       // White
 };
 
-LogicSignal::LogicSignal(QString name, shared_ptr<data::Logic> data,
-       int probe_index) :
-       Signal(name),
-       _probe_index(probe_index),
+LogicSignal::LogicSignal(const sr_probe *const probe,
+       shared_ptr<data::Logic> data) :
+       Signal(probe),
        _data(data)
 {
-       assert(_probe_index >= 0);
-       _colour = LogicSignalColours[
-               _probe_index % countof(LogicSignalColours)];
+       _colour = SignalColours[probe->index % countof(SignalColours)];
+}
+
+LogicSignal::~LogicSignal()
+{
+}
+
+const list<QAction*> LogicSignal::get_context_bar_actions()
+{
+       list<QAction*> actions;
+       return actions;
 }
 
 void LogicSignal::paint(QPainter &p, int y, int left, int right,
@@ -72,10 +79,16 @@ void LogicSignal::paint(QPainter &p, int y, int left, int right,
 
        vector< pair<int64_t, bool> > edges;
 
+       assert(_probe);
        assert(scale > 0);
        assert(_data);
        assert(right >= left);
 
+       if (!_probe->enabled)
+               return;
+
+       paint_axis(p, y, left, right);
+
        const float high_offset = y - View::SignalHeight + 0.5f;
        const float low_offset = y + 0.5f;
 
@@ -87,8 +100,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;
@@ -98,7 +116,7 @@ void LogicSignal::paint(QPainter &p, int y, int left, int right,
        snapshot->get_subsampled_edges(edges,
                min(max((int64_t)floor(start), (int64_t)0), last_sample),
                min(max((int64_t)ceil(end), (int64_t)0), last_sample),
-               samples_per_pixel / Oversampling, _probe_index);
+               samples_per_pixel / Oversampling, _probe->index);
        assert(edges.size() >= 2);
 
        // Paint the edges