diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-01 10:32:14 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-01 10:32:14 +0100 |
| commit | 4097e27114d227692d53c5d28487e12a3833cd24 (patch) | |
| tree | d5c2a62c4db97de94f92150340612c64d3997669 /plot/plot.c | |
| parent | f8a0a4e1c775a90c313cb83201eec4cea4e9a7da (diff) | |
| parent | 5514d94483c98e3320b202b1bb882023a7d12027 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'plot/plot.c')
| -rwxr-xr-x[-rw-r--r--] | plot/plot.c | 37 |
1 files changed, 31 insertions, 6 deletions
diff --git a/plot/plot.c b/plot/plot.c index d7b4799..be4d1cf 100644..100755 --- a/plot/plot.c +++ b/plot/plot.c @@ -553,11 +553,13 @@ int zero /* Flag - make sure zero is in y range */ } /* Public routines */ -/* Plot up to 10 graphs + optional crosses. Wait for a key */ +/* Plot up to 10 graphs + optional crosses */ +/* if dowait > 0, wait for user key */ +/* if dowait < 0, wait for no seconds */ /* return 0 on success, -1 on error */ /* If n is -ve, reverse the X axis */ int -do_plot10p( +do_plot10pw( double *x, /* X coord */ double *y1, /* Black */ double *y2, /* Red */ @@ -571,7 +573,8 @@ double *y9, /* Grey */ double *y10,/* White */ int n, /* Number of values */ double *xp, double *yp, /* And crosses */ -int m) { +int m, +int dowait) { int i, j; double xmin, xmax, ymin, ymax; int nn = abs(n); @@ -588,8 +591,8 @@ int m) { yy[5] = y6; yy[6] = y7; yy[7] = y8; - yy[9] = y9; - yy[5] = y10; + yy[8] = y9; + yy[9] = y10; /* Determine min and max dimensions of plot */ xmin = ymin = 1e6; @@ -633,12 +636,34 @@ int m) { ymax += 0.5, ymin -= 0.5; return do_plot_imp(PLOTF_NONE, - xmin, xmax, ymin, ymax, 1.0, 1, + xmin, xmax, ymin, ymax, 1.0, dowait, x, NULL, yy, NULL, n, xp, yp, NULL, NULL, m, NULL, NULL, NULL, NULL, NULL, 0); } +/* Plot up to 10 graphs + optional crosses. Wait for a key */ +/* return 0 on success, -1 on error */ +/* If n is -ve, reverse the X axis */ +int +do_plot10p( +double *x, /* X coord */ +double *y1, /* Black */ +double *y2, /* Red */ +double *y3, /* Green */ +double *y4, /* Blue */ +double *y5, /* Yellow */ +double *y6, /* Purple */ +double *y7, /* Brown */ +double *y8, /* Orange */ +double *y9, /* Grey */ +double *y10,/* White */ +int n, /* Number of values */ +double *xp, double *yp, /* And crosses */ +int m) { + return do_plot10pw(x, y1, y2, y3, y4, y5, y6, y7, y8, y9, y10, n, xp, yp, m, 1); +} + /* Plot a bunch of vectors + optional crosses */ /* return 0 on success, -1 on error */ |