VCD: Optimizations and fixes.

[libsigrok.git] / output / output_gnuplot.c

diff --git a/output/output_gnuplot.c b/output/output_gnuplot.c
index e379ef29cc70ff1994e3528db637c42f89778091..69a45256c432b4eb3b0bd2891e24a8134e843bd4 100644 (file)
--- a/output/output_gnuplot.c
+++ b/output/output_gnuplot.c
@@ -36,8 +36,11 @@ const char *gnuplot_header = "\
 #\n\
 # Generated by: %s on %s%s\
 # Timescale: %d %s\n\
-# Column/probe assignment:\n\
-# Column 0: Sample counter (for internal gnuplot purposes)\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";
@@ -99,7 +102,7 @@ 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: %s\n", i + 1, ctx->probelist[i]);
+               sprintf(c, "# %d\t\t%s\n", i + 1, ctx->probelist[i]);
        }
 
        /* TODO: date: File or signals? Make y/n configurable. */
@@ -140,7 +143,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;
@@ -167,11 +171,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);
                }