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 b2302e9e8cc75be8dd9a0aaca05d24a0b02e62d2..87fe5b0469e08c417804ac5b0a2519b3331dc95e 100644 (file)
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -23,8 +23,9 @@
 #include <math.h>
 
 #include "logicsignal.h"
-#include "../logicdata.h"
-#include "../logicdatasnapshot.h"
+#include "view.h"
+#include "pv/data/logic.h"
+#include "pv/data/logicsnapshot.h"
 
 using namespace boost;
 using namespace std;
@@ -38,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
@@ -51,45 +52,54 @@ const QColor LogicSignal::LogicSignalColours[10] = {
        QColor(0xEE, 0xEE, 0xEC),       // White
 };
 
-LogicSignal::LogicSignal(QString name, shared_ptr<LogicData> data,
+LogicSignal::LogicSignal(QString name, shared_ptr<data::Logic> data,
        int probe_index) :
        Signal(name),
        _probe_index(probe_index),
        _data(data)
 {
        assert(_probe_index >= 0);
-       _colour = LogicSignalColours[
-               _probe_index % countof(LogicSignalColours)];
+       _colour = SignalColours[_probe_index % countof(SignalColours)];
 }
 
-void LogicSignal::paint(QPainter &p, const QRect &rect, double scale,
-       double offset)
+void LogicSignal::paint(QPainter &p, int y, int left, int right,
+               double scale, double offset)
 {
+       using pv::view::View;
+
        QLineF *line;
 
        vector< pair<int64_t, bool> > edges;
 
        assert(scale > 0);
        assert(_data);
+       assert(right >= left);
+
+       paint_axis(p, y, left, right);
 
-       const float high_offset = rect.top() + 0.5f;
-       const float low_offset = rect.bottom() + 0.5f;
+       const float high_offset = y - View::SignalHeight + 0.5f;
+       const float low_offset = y + 0.5f;
 
-       const deque< shared_ptr<pv::LogicDataSnapshot> > &snapshots =
+       const deque< shared_ptr<pv::data::LogicSnapshot> > &snapshots =
                _data->get_snapshots();
-       if(snapshots.empty())
+       if (snapshots.empty())
                return;
 
-       const shared_ptr<pv::LogicDataSnapshot> &snapshot =
+       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;
        const double start = samplerate * (offset - start_time);
-       const double end = start + samples_per_pixel * rect.width();
+       const double end = start + samples_per_pixel * (right - left);
 
        snapshot->get_subsampled_edges(edges,
                min(max((int64_t)floor(start), (int64_t)0), last_sample),
@@ -102,11 +112,11 @@ void LogicSignal::paint(QPainter &p, const QRect &rect, double scale,
        QLineF *const edge_lines = new QLineF[edge_count];
        line = edge_lines;
 
-       for(vector<pv::LogicDataSnapshot::EdgePair>::const_iterator i =
+       for (vector<pv::data::LogicSnapshot::EdgePair>::const_iterator i =
                        edges.begin() + 1;
                i != edges.end() - 1; i++) {
                const float x = ((*i).first / samples_per_pixel -
-                       pixels_offset) + rect.left();
+                       pixels_offset) + left;
                *line++ = QLineF(x, high_offset, x, low_offset);
        }
 
@@ -120,10 +130,10 @@ void LogicSignal::paint(QPainter &p, const QRect &rect, double scale,
 
        p.setPen(HighColour);
        paint_caps(p, cap_lines, edges, true, samples_per_pixel,
-               pixels_offset, rect.left(), high_offset);
+               pixels_offset, left, high_offset);
        p.setPen(LowColour);
        paint_caps(p, cap_lines, edges, false, samples_per_pixel,
-               pixels_offset, rect.left(), low_offset);
+               pixels_offset, left, low_offset);
 
        delete[] cap_lines;
 }
@@ -135,9 +145,9 @@ void LogicSignal::paint_caps(QPainter &p, QLineF *const lines,
 {
        QLineF *line = lines;
 
-       for(vector<pv::LogicDataSnapshot::EdgePair>::const_iterator i =
+       for (vector<pv::data::LogicSnapshot::EdgePair>::const_iterator i =
                edges.begin(); i != (edges.end() - 1); i++)
-               if((*i).second == level) {
+               if ((*i).second == level) {
                        *line++ = QLineF(
                                ((*i).first / samples_per_pixel -
                                        pixels_offset) + x_offset, y_offset,
@@ -148,10 +158,5 @@ void LogicSignal::paint_caps(QPainter &p, QLineF *const lines,
        p.drawLines(lines, line - lines);
 }
 
-int LogicSignal::get_nominal_offset(const QRect &rect) const
-{
-       return rect.bottom();
-}
-
 } // namespace view
 } // namespace pv