From 1ac0ef52833f5f41021ca8a878e51f927a0f6350 Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 10 Mar 2023 22:11:16 -0800 Subject: [PATCH] updated graph --- src/flighthours.c | 43 +++++++++++++++++++++++++++++++------------ src/text.c | 2 +- 2 files changed, 32 insertions(+), 13 deletions(-) diff --git a/src/flighthours.c b/src/flighthours.c index 5fc1f13..b066dd4 100644 --- a/src/flighthours.c +++ b/src/flighthours.c @@ -22,9 +22,12 @@ int main(void) { if(errno) goto catch; fprintf(stderr, "Journal: %s.\n" "Flights: %s.\n", journal_to_string(&j), flights_to_string(&f)); - printf("set term postscript eps enhanced\n" - "set output \"flighthours.eps\"\n" - "$Data < 0 " + "? \\\n" + " '' : ' \"'.strcol(col).'\"')\n" + "Uniqs = ''\n" + "stats $Data u (Uniqs=addToList(Uniqs,3)) nooutput\n" + "Uniq(i) = word(Uniqs,i)\n" + "getIndex(s) = sum [_i=1:words(Uniqs)] s eq word(Uniqs,_i) ? _i : 0\n" + "myTimeFmt = \"%%Y-%%m-%%d\"\n" + "set format x myTimeFmt timedate\n" + "set xtics format myTimeFmt rotate by -30\n" + "set format y \"%%tH:%%tM\" timedate\n" "set grid\n" - "unset key\n" + "set key out reverse Left noautotitle\n" + "set style fill solid 0.5\n" "unset border\n" - "set xrange [*:'2001-09-11']\n" - "#set style fill solid 0.1 #pattern 5 (better, but restarts)\n" - "plot $Data using 1:($6/60) with fillsteps lw 2\n"); + "plot total=0 $Data u" + " (timecolumn(1,myTimeFmt)):(dy=($4+$5)*60,total=total+dy)" + " w steps lc \"black\" dt 3, \\\n" + " total=0 '' u (timecolumn(1,myTimeFmt)):" + "(dy=($4+$5)*60,total=total+dy,total-dy/2.): \\\n" + " (43200):(dy/2.):(getIndex(strcol(3))) w boxxy lc var, \\\n" + " for [i=1:words(Uniqs)] keyentry w boxxy lc i ti Uniq(i)\n" + /*"set xrange [*:'2001-09-11']\n"*/ + /*"#set style fill solid 0.1 #pattern 5 (better, but restarts)\n" + "plot $Data using 1:($6/60) with fillsteps lw 2\n"*/); goto finally; catch: success = EXIT_FAILURE; diff --git a/src/text.c b/src/text.c index 0624af0..87072e7 100644 --- a/src/text.c +++ b/src/text.c @@ -42,6 +42,6 @@ finally: } struct text text(void) { struct text text; text.a = char_array(); return text; } -void text_(struct text *const text) { printf("~text: errno %d text.a.data %p\n", errno, (void *)text->a.data); char_array_(&text->a); printf("~text: errno %d\n", errno); } +void text_(struct text *const text) { char_array_(&text->a); } char *text_append_file(struct text *text, const char *const fn) { return append_file(&text->a, fn); }