X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=logicsignal.cpp;h=77ecb2e36416812bb958de8648718337d7f39f82;hp=67d72bef8b7c741190cad954f84fddd9f42103ed;hb=4cd24a7573ef355b638b6751ecfbd324be6510eb;hpb=131e801229c3cc899dd8a478d4491e384e57238e diff --git a/logicsignal.cpp b/logicsignal.cpp index 67d72bef..77ecb2e3 100644 --- a/logicsignal.cpp +++ b/logicsignal.cpp @@ -18,12 +18,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#define GL_GLEXT_PROTOTYPES -#include -#include - #include +#include "extdef.h" + #include "logicdata.h" #include "logicdatasnapshot.h" #include "logicsignal.h" @@ -31,13 +29,25 @@ using namespace boost; 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 float LogicSignal::Oversampling = 2.0f; + +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] = { + 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) : @@ -48,10 +58,10 @@ LogicSignal::LogicSignal(QString name, shared_ptr data, assert(_probe_index >= 0); } -void LogicSignal::paint(QGLWidget &widget, const QRect &rect, - double scale, double offset) +void LogicSignal::paint(QPainter &p, const QRect &rect, double scale, + double offset) { - Point2F *vertex; + QLineF *line; vector< pair > edges; @@ -61,7 +71,7 @@ void LogicSignal::paint(QGLWidget &widget, const QRect &rect, const float high_offset = rect.top() + Margin; const float low_offset = rect.bottom() - Margin; - const queue< shared_ptr > &snapshots = + const deque< shared_ptr > &snapshots = _data->get_snapshots(); if(snapshots.empty()) return; @@ -71,98 +81,74 @@ void LogicSignal::paint(QGLWidget &widget, const QRect &rect, 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 = (int64_t)snapshot->get_sample_count() - 1; + const int64_t last_sample = snapshot->get_sample_count() - 1; const double samples_per_pixel = samplerate * scale; - const int64_t start = min(max((int64_t)(samplerate * (offset - start_time)), - (int64_t)0), last_sample); - const int64_t end = min((int64_t)(start + samples_per_pixel * rect.width()), - last_sample); - const int64_t quantization_length = 1LL << (int64_t)floorf( - max(logf(samples_per_pixel / Log2), 0.0f)); + const double start = samplerate * (offset - start_time); + const double end = start + samples_per_pixel * rect.width(); - snapshot->get_subsampled_edges(edges, start, end, - quantization_length, _probe_index); + 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); + assert(edges.size() >= 2); // Paint the edges - const unsigned int edge_point_count = (edges.size() - 2) * 2; - Point2F *const edge_points = new Point2F[edge_point_count]; - vertex = edge_points; - - for(vector::const_iterator i = edges.begin() + 1; - i != edges.end() - 1; i++) - { - const int x = (int)((*i).first / samples_per_pixel - pixels_offset) + - rect.left(); - - vertex->x = x, vertex->y = high_offset; - vertex++; - vertex->x = x, vertex->y = low_offset; - vertex++; + const unsigned int edge_count = edges.size() - 2; + QLineF *const edge_lines = new QLineF[edge_count]; + line = edge_lines; + + for(vector::const_iterator i = + edges.begin() + 1; + i != edges.end() - 1; i++) { + const int x = (int)((*i).first / samples_per_pixel - + pixels_offset) + rect.left(); + *line++ = QLineF(x, high_offset, x, low_offset); } - glColor3fv(EdgeColour); - paint_lines(edge_points, edge_point_count); - delete[] edge_points; + p.setPen(EdgeColour); + p.drawLines(edge_lines, edge_count); + delete[] edge_lines; // Paint the caps - const unsigned int max_cap_point_count = (edges.size() - 1) * 2; - Point2F *const cap_points = new Point2F[max_cap_point_count]; + const unsigned int max_cap_line_count = (edges.size() - 1); + QLineF *const cap_lines = new QLineF[max_cap_line_count]; - glColor3fv(HighColour); - paint_caps(cap_points, edges, true, samples_per_pixel, + p.setPen(HighColour); + paint_caps(p, cap_lines, edges, true, samples_per_pixel, pixels_offset, rect.left(), high_offset); - glColor3fv(LowColour); - paint_caps(cap_points, edges, false, samples_per_pixel, + p.setPen(LowColour); + paint_caps(p, cap_lines, edges, false, samples_per_pixel, pixels_offset, rect.left(), low_offset); - delete[] cap_points; + delete[] cap_lines; } -int LogicSignal::paint_caps(Point2F *const cap_points, +int LogicSignal::paint_caps(QPainter &p, QLineF *const lines, vector< pair > &edges, bool level, double samples_per_pixel, double pixels_offset, int x_offset, int y_offset) { - Point2F *vertex = cap_points; + QLineF *line = lines; 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++; + if((*i).second == level) { + *line++ = QLineF( + (int)((*i).first / samples_per_pixel - + pixels_offset) + x_offset, y_offset, + (int)((*(i+1)).first / samples_per_pixel - + pixels_offset) + x_offset, y_offset); } - paint_lines(cap_points, vertex - cap_points); + p.drawLines(lines, line - lines); } -void LogicSignal::paint_lines(Point2F *points, int count) +QColor LogicSignal::get_colour() const { - GLuint vbo_id; - - assert(points); - - glGenBuffers(1, &vbo_id); - glBindBuffer(GL_ARRAY_BUFFER, vbo_id); - - const unsigned int vbo_length = count * sizeof(Point2F); - glBufferData(GL_ARRAY_BUFFER, vbo_length, NULL, GL_STATIC_DRAW); - glBufferSubData(GL_ARRAY_BUFFER, 0, vbo_length, points); - - glBindBuffer(GL_ARRAY_BUFFER, vbo_id); - - glVertexPointer(2, GL_FLOAT, sizeof(Point2F), 0); - - glEnableClientState(GL_VERTEX_ARRAY); - glDrawArrays(GL_LINES, 0, count); - glDisableClientState(GL_VERTEX_ARRAY); + return LogicSignalColours[_probe_index % countof(LogicSignalColours)]; +} - glDeleteBuffers(1, &vbo_id); +int LogicSignal::get_nominal_offset(const QRect &rect) const +{ + return rect.bottom() - Margin; }