X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Foutput_gnuplot.c;h=5d4c564b1071e646f8f9e7c13875b6247f269ca4;hb=340f6e7aeaf0c6cbbb27c5b535787bd09407994b;hp=45b7a870d2f12051541c6aa7dd9983ff72feb344;hpb=607b58de58f22baa026d24ac7b8e0ae123c9ede0;p=libsigrok.git

diff --git a/output/output_gnuplot.c b/output/output_gnuplot.c
index 45b7a870..5d4c564b 100644
--- a/output/output_gnuplot.c
+++ b/output/output_gnuplot.c
@@ -34,9 +34,13 @@ struct context {
 const char *gnuplot_header = "\
 # Sample data in space-separated columns format usable by gnuplot\n\
 #\n\
-# Generated by: %s on %s\n%s\
+# Generated by: %s on %s%s\
 # Timescale: %d %s\n\
-# Column assignment:\n%s\n";
+#\n\
+# Column\tProbe\n\
+# -------------------------------------\
+----------------------------------------\n\
+# 0\t\tSample counter (for internal gnuplot purposes)\n%s\n";
 
 const char *gnuplot_header_comment = "\
 # Comment: Acquisition with %d/%d probes at %s\n";
@@ -54,6 +58,7 @@ static int init(struct output *o)
 	int b, num_probes;
 	char *c, *samplerate_s;
 	char wbuf[1000], comment[128];
+	time_t t;
 
 	if (!(ctx = calloc(1, sizeof(struct context))))
 		return SIGROK_ERR_MALLOC;
@@ -62,8 +67,9 @@ static int init(struct output *o)
 	ctx->num_enabled_probes = 0;
 	for (l = o->device->probes; l; l = l->next) {
 		probe = l->data;
-		if (probe->enabled)
-			ctx->probelist[ctx->num_enabled_probes++] = probe->name;
+		if (!probe->enabled)
+			continue;
+		ctx->probelist[ctx->num_enabled_probes++] = probe->name;
 	}
 
 	ctx->probelist[ctx->num_enabled_probes] = 0;
@@ -97,13 +103,15 @@ static int init(struct output *o)
 	wbuf[0] = '\0';
 	for (i = 0; i < ctx->num_enabled_probes; i++) {
 		c = (char *)&wbuf + strlen((char *)&wbuf);
-		sprintf(c, "# Column %d: channel %s\n", i, ctx->probelist[i]);
+		sprintf(c, "# %d\t\t%s\n", i + 1, ctx->probelist[i]);
 	}
 
 	/* TODO: date: File or signals? Make y/n configurable. */
 	/* TODO: Timescale */
+	t = time(NULL);
 	b = snprintf(ctx->header, MAX_HEADER_LEN, gnuplot_header,
-		     PACKAGE_STRING, "TODO", comment, 1, "ns", (char *)&wbuf);
+		     PACKAGE_STRING, ctime(&t), comment, 1, "ns",
+		     (char *)&wbuf);
 
 	/* TODO: Handle snprintf errors. */
 
@@ -114,8 +122,6 @@ static int event(struct output *o, int event_type, char **data_out,
 		 uint64_t *length_out)
 {
 	struct context *ctx;
-	char *outbuf;
-	int outlen = 1; /* FIXME */
 
 	ctx = o->internal;
 	switch (event_type) {
@@ -123,11 +129,8 @@ static int event(struct output *o, int event_type, char **data_out,
 		/* TODO */
 		break;
 	case DF_END:
-		outbuf = calloc(1, 1); /* FIXME */
-		if (outbuf == NULL)
-			return SIGROK_ERR_MALLOC;
-		*data_out = outbuf;
-		*length_out = outlen;
+		*data_out = NULL;
+		*length_out = 0;
 		free(o->internal);
 		o->internal = NULL;
 		break;
@@ -141,7 +144,8 @@ static int data(struct output *o, char *data_in, uint64_t length_in,
 {
 	struct context *ctx;
 	unsigned int i, outsize, p, curbit;
-	uint64_t sample, count = 0;
+	uint64_t sample;
+	static uint64_t samplecount = 0;
 	char *outbuf, *c;
 
 	ctx = o->internal;
@@ -150,7 +154,7 @@ static int data(struct output *o, char *data_in, uint64_t length_in,
 		outsize = strlen(ctx->header);
 
 	/* FIXME: Use realloc(). */
-	if (!(outbuf = calloc(1, outsize + 1 + 10000)))
+	if (!(outbuf = calloc(1, outsize + 1 + 1000000)))
 		return SIGROK_ERR_MALLOC; /* TODO: free()? What to free? */
 
 	outbuf[0] = '\0';
@@ -168,11 +172,11 @@ static int data(struct output *o, char *data_in, uint64_t length_in,
 
 		/* The first column is a counter (needed for gnuplot). */
 		c = outbuf + strlen(outbuf);
-		sprintf(c, "%" PRIu64 "\t\t", count++);
+		sprintf(c, "%" PRIu64 "\t\t", samplecount++);
 
 		/* The next columns are the values of all channels. */
 		for (p = 0; p < ctx->num_enabled_probes; p++) {
-			curbit = (sample & ((uint64_t) (1 << p))) != 0;
+			curbit = (sample & ((uint64_t) (1 << p))) >> p;
 			c = outbuf + strlen(outbuf);
 			sprintf(c, "%d ", curbit);
 		}