htpp

commit f0de42eac75a283c04f96d3b1c1ded22b29cf90c
parent 625e510453e3d88f8bdd7a29d4cdceb4dadf973a
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Wed, 25 Mar 2020 13:17:53 +0100

Update how the color map is printed

Diffstat:
M
src/htpp.c
 | 
28
++++++++++++++++++++++------

1 file changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/htpp.c b/src/htpp.c
@@ -785,10 +785,11 @@ pp_map(struct img* img, const struct args* args)
   }
 
   if(args->verbose) {
-    size_t nchars = 64;
-    fprintf(stderr, "%g [", range[0]);
-    FOR_EACH(i, 0, nchars) {
-      const double u = (double)i / (double)(nchars-1);
+    const int map_length = 65;
+    const int map_quarter = map_length / 4;
+    const int label_length = map_length / 4;
+    FOR_EACH(i, 0, map_length) {
+      const double u = (double)i / (double)(map_length-1);
       double color[3] = {0,0,0};
       uint8_t rgb[3];
       uint8_t c256;
@@ -798,9 +799,24 @@ pp_map(struct img* img, const struct args* args)
       rgb[1] = (uint8_t)(CLAMP(color[1], 0, 1) * 255. + 0.5/*round*/);
       rgb[2] = (uint8_t)(CLAMP(color[2], 0, 1) * 255. + 0.5/*round*/);
       c256 = rgb_to_c256(rgb);
-      fprintf(stderr, "\x1b[48;5;%dm ", c256);
+      if(i == 0 * map_quarter
+      || i == 1 * map_quarter
+      || i == 2 * map_quarter
+      || i == 3 * map_quarter
+      || i == 4 * map_quarter) {
+        fprintf(stderr, "\x1b[0m|");
+      } else {
+        fprintf(stderr, "\x1b[48;5;%dm ", c256);
+      }
+
     }
-    fprintf(stderr, "\x1b[0m] %g\n", range[1]);
+    fprintf(stderr, "\n");
+    fprintf(stderr, "%-*.5g", label_length, range[0]);
+    fprintf(stderr, "%-*.5g", label_length, 0.25 * ransz + range[0]);
+    fprintf(stderr, "%-*.5g", label_length, 0.50 * ransz + range[0]);
+    fprintf(stderr, "%-*.5g", label_length, 0.75 * ransz + range[0]);
+    fprintf(stderr, "%-*.5g", label_length, range[1]);
+    fprintf(stderr, "\n");
   }
 
 exit: