X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=logicsignal.cpp;h=79a27ddd05c97996cc6f7332b3b6b3a7ab4e4058;hp=584be441acfad737330ea0ac87d1bda99b7ab029;hb=215f9499495716d6a33b53b0fa9cac47f0e43fbd;hpb=7cd5faf8cfed1871195aed7a4c325342172944b3 diff --git a/logicsignal.cpp b/logicsignal.cpp index 584be441..79a27ddd 100644 --- a/logicsignal.cpp +++ b/logicsignal.cpp @@ -24,6 +24,8 @@ #include +#include "extdef.h" + #include "logicdata.h" #include "logicdatasnapshot.h" #include "logicsignal.h" @@ -33,6 +35,25 @@ using namespace std; const float Log2 = logf(2.0f); +const float LogicSignal::Margin = 10.0f; + +const float LogicSignal::EdgeColour[3] = {0.50f, 0.50f, 0.50f}; +const float LogicSignal::HighColour[3] = {0.00f, 0.75f, 0.00f}; +const float LogicSignal::LowColour[3] = {0.75f, 0.00f, 0.00f}; + +const QColor LogicSignal::LogicSignalColours[10] = { + QColor(0x16, 0x19, 0x1A), // Black + QColor(0x8F, 0x52, 0x02), // Brown + QColor(0xCC, 0x00, 0x00), // Red + QColor(0xF5, 0x79, 0x00), // Orange + QColor(0xED, 0xD4, 0x00), // Yellow + QColor(0x73, 0xD2, 0x16), // Green + QColor(0x34, 0x65, 0xA4), // Blue + QColor(0x75, 0x50, 0x7B), // Violet + QColor(0x88, 0x8A, 0x85), // Grey + QColor(0xEE, 0xEE, 0xEC), // White +}; + LogicSignal::LogicSignal(QString name, shared_ptr data, int probe_index) : Signal(name), @@ -43,14 +64,18 @@ LogicSignal::LogicSignal(QString name, shared_ptr data, } void LogicSignal::paint(QGLWidget &widget, const QRect &rect, - uint64_t scale, int64_t offset) + double scale, double offset) { Point2F *vertex; vector< pair > edges; + assert(scale > 0); assert(_data); + const float high_offset = rect.top() + Margin; + const float low_offset = rect.bottom() - Margin; + const queue< shared_ptr > &snapshots = _data->get_snapshots(); if(snapshots.empty()) @@ -58,16 +83,19 @@ void LogicSignal::paint(QGLWidget &widget, const QRect &rect, const shared_ptr &snapshot = snapshots.front(); - const uint64_t samplerate = _data->get_samplerate(); - const int64_t start_time = _data->get_start_time(); - const float samples_per_pixel = samplerate * scale / 1e15f; - const int64_t start = samplerate * (offset - start_time) / - 1000000000000000ULL; - const int64_t end = start + samples_per_pixel * rect.width(); + 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 int64_t quantization_length = 1LL << (int64_t)floorf( - max(logf(samples_per_pixel / Log2), 0.0f)); + max(logf((float)samples_per_pixel) / Log2, 0.0f)); - snapshot->get_subsampled_edges(edges, start, end, + 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), quantization_length, _probe_index); // Paint the edges @@ -78,43 +106,56 @@ void LogicSignal::paint(QGLWidget &widget, const QRect &rect, for(vector::const_iterator i = edges.begin() + 1; i != edges.end() - 1; i++) { - const int x = (int)((*i).first / samples_per_pixel) + + const int x = (int)((*i).first / samples_per_pixel - pixels_offset) + rect.left(); - vertex->x = x, vertex->y = 10 + rect.top() - 1; + vertex->x = x, vertex->y = high_offset; vertex++; - vertex->x = x, vertex->y = 40 + rect.top(); + vertex->x = x, vertex->y = low_offset; vertex++; } - glColor3f(0,0,1); + glColor3fv(EdgeColour); paint_lines(edge_points, edge_point_count); delete[] edge_points; // Paint the caps - const unsigned int cap_point_count = (edges.size() - 1) * 2; - Point2F *const cap_points = new Point2F[cap_point_count]; - vertex = cap_points; + const unsigned int max_cap_point_count = (edges.size() - 1) * 2; + Point2F *const cap_points = new Point2F[max_cap_point_count]; - for(vector::const_iterator i = edges.begin(); - i != (edges.end() - 1); i++) - { - const int y = ((*i).second ? 10 : 40) + rect.top(); + glColor3fv(HighColour); + paint_caps(cap_points, edges, true, samples_per_pixel, + pixels_offset, rect.left(), high_offset); + glColor3fv(LowColour); + paint_caps(cap_points, edges, false, samples_per_pixel, + pixels_offset, rect.left(), low_offset); - vertex->x = (int)((*i).first / samples_per_pixel) + - rect.left() - 1; - vertex->y = y; - vertex++; + delete[] cap_points; +} - vertex->x = (int)((*(i+1)).first / samples_per_pixel) + - rect.left(); - vertex->y = y; - vertex++; - } +int LogicSignal::paint_caps(Point2F *const cap_points, + vector< pair > &edges, bool level, + double samples_per_pixel, double pixels_offset, int x_offset, + int y_offset) +{ + Point2F *vertex = cap_points; - glColor3f(0,0,1); - paint_lines(cap_points, cap_point_count); - delete[] cap_points; + for(vector::const_iterator i = edges.begin(); + i != (edges.end() - 1); i++) + if((*i).second == level) + { + vertex->x = (int)((*i).first / samples_per_pixel - + pixels_offset) + x_offset - 1; + vertex->y = y_offset; + vertex++; + + vertex->x = (int)((*(i+1)).first / samples_per_pixel - + pixels_offset) + x_offset; + vertex->y = y_offset; + vertex++; + } + + paint_lines(cap_points, vertex - cap_points); } void LogicSignal::paint_lines(Point2F *points, int count) @@ -140,3 +181,13 @@ void LogicSignal::paint_lines(Point2F *points, int count) glDeleteBuffers(1, &vbo_id); } + +QColor LogicSignal::get_colour() const +{ + return LogicSignalColours[_probe_index % countof(LogicSignalColours)]; +} + +int LogicSignal::get_nominal_offset(const QRect &rect) const +{ + return rect.bottom() - Margin; +}