X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=logicsignal.cpp;h=67d72bef8b7c741190cad954f84fddd9f42103ed;hp=1587bddd473002d4264d47abafd118d5c3c0cfd2;hb=131e801229c3cc899dd8a478d4491e384e57238e;hpb=2858b391af20bd46c9a7da17195ec8d58bcd12c3

diff --git a/logicsignal.cpp b/logicsignal.cpp
index 1587bddd..67d72bef 100644
--- a/logicsignal.cpp
+++ b/logicsignal.cpp
@@ -22,6 +22,8 @@
 #include <GL/gl.h>
 #include <GL/glext.h>
 
+#include <math.h>
+
 #include "logicdata.h"
 #include "logicdatasnapshot.h"
 #include "logicsignal.h"
@@ -29,6 +31,14 @@
 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};
+
 LogicSignal::LogicSignal(QString name, shared_ptr<LogicData> data,
 	int probe_index) :
 	Signal(name),
@@ -39,14 +49,18 @@ LogicSignal::LogicSignal(QString name, shared_ptr<LogicData> data,
 }
 
 void LogicSignal::paint(QGLWidget &widget, const QRect &rect,
-	uint64_t scale, int64_t offset)
+	double scale, double offset)
 {
 	Point2F *vertex;
 
 	vector< pair<int64_t, bool> > edges;
 
+	assert(scale > 0);
 	assert(_data);
 
+	const float high_offset = rect.top() + Margin;
+	const float low_offset = rect.bottom() - Margin;
+
 	const queue< shared_ptr<LogicDataSnapshot> > &snapshots =
 		_data->get_snapshots();
 	if(snapshots.empty())
@@ -54,9 +68,17 @@ void LogicSignal::paint(QGLWidget &widget, const QRect &rect,
 
 	const shared_ptr<LogicDataSnapshot> &snapshot = snapshots.front();
 
-	const int64_t start = 0;
-	const int64_t end = 8000;
-	const int64_t quantization_length = 4;
+	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 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));
 
 	snapshot->get_subsampled_edges(edges, start, end,
 		quantization_length, _probe_index);
@@ -69,43 +91,56 @@ void LogicSignal::paint(QGLWidget &widget, const QRect &rect,
 	for(vector<LogicDataSnapshot::EdgePair>::const_iterator i = edges.begin() + 1;
 	    i != edges.end() - 1; i++)
 	{
-		const int x = edge.first / quantization_length +
+		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<LogicDataSnapshot::EdgePair>::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 = (*i).first / quantization_length +
-			rect.left() - 1;
-		vertex->y = y;
-		vertex++;
+	delete[] cap_points;
+}
 
-		vertex->x = (*(i+1)).first / quantization_length +
-			rect.left();
-		vertex->y = y;
-		vertex++;
-	}
+int LogicSignal::paint_caps(Point2F *const cap_points,
+	vector< pair<int64_t, bool> > &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<LogicDataSnapshot::EdgePair>::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)