From 21e76bb5f14a8c4bf4ead5c8d54c99d3281bb970 Mon Sep 17 00:00:00 2001
From: Rouji <a@r0.at>
Date: Fri, 3 Sep 2021 17:09:38 +0200
Subject: [PATCH] unfugly axes a bit, golf more

---
 index.php | 48 +++++++++++++++++++++---------------------------
 1 file changed, 21 insertions(+), 27 deletions(-)

diff --git a/index.php b/index.php
index 2f65958..8872495 100755
--- a/index.php
+++ b/index.php
@@ -276,16 +276,18 @@ function send_hupl_config() : void
 EOT);
 }
 
-function graph($func, int $width, int $height, int $min_x, int $max_x, int $min_y, int $max_y, int $steps, float $smooth) : string
+function graph($func, int $width, int $height, int $min_x, int $max_x, int $min_y, int $max_y, string $label_x, string $label_y, int $font_size, int $steps, float $smooth) : string
 {
-    $path = '';
     $points = array();
+    //x,y values for $func, scaled to fit $width/$height
     for ($i = 0; $i<$steps; ++$i)
     {
         $x = (($max_x-$min_x)/$steps)*$i;
         $y = $func($x + $min_x) - $min_y;
         $points[] = [$x/($max_x-$min_x)*$width, $height - $y/($max_y-$min_y)*$height];
     }
+
+    //yay vector maths
     $len = fn($p) => sqrt(pow($p[0],2)+pow($p[1],2));
     $norm = function($p) use($len) {$l=$len($p); return [$p[0]/$l, $p[1]/$l];};
     $inv = fn($p) => [-$p[0],-$p[1]];
@@ -294,45 +296,37 @@ function graph($func, int $width, int $height, int $min_x, int $max_x, int $min_
     $mul = fn($p, $n) => [$p[0]*$n, $p[1]*$n];
     $control_vec = fn($p1, $p2, $l) => $mul($norm($sub($p2,$p1)), $l);
     $f = fn($n) => number_format($n, 1);
-    $debug = '';
+
+    $path = '';
     for ($i = 0; $i<count($points); ++$i)
     {
-        $p = $points[$i];
         if ($i === 0)
         {
-            $path .= "M $p[0] $p[1] ";
-        }
-        else
-        {
-            $c1 = $add($points[$i-1], $control_vec($points[$i-2] ?? $points[$i-1], $points[$i], $smooth));
-            $c2 = $sub($points[$i], $control_vec($points[$i-1], $points[$i+1] ?? $points[$i], $smooth));
-            $path .= "C {$f($c1[0])} {$f($c1[1])}, {$f($c2[0])} {$f($c2[1])}, {$f($p[0])} {$f($p[1])} ";
-            //$debug .= "<circle cx=\"$p[0]\" cy=\"$p[1]\" r=\"3\" fill=\"black\"/><circle cx=\"$c1[0]\" cy=\"$c1[1]\" r=\"2\" fill=\"green\"/><circle cx=\"$c2[0]\" cy=\"$c2[1]\" r=\"2\" fill=\"red\"/>";
+            $path .= "M {$f($points[$i][0])} {$f($points[$i][1])} ";
+            continue;
         }
+        $c1 = $add($points[$i-1], $control_vec($points[$i-2] ?? $points[$i-1], $points[$i], $smooth));
+        $c2 = $sub($points[$i], $control_vec($points[$i-1], $points[$i+1] ?? $points[$i], $smooth));
+        $path .= "C {$f($c1[0])} {$f($c1[1])}, {$f($c2[0])} {$f($c2[1])}, {$f($points[$i][0])} {$f($points[$i][1])} ";
     }
 
-    $font_size = 12;
     $padding = $font_size+2;
-    $text_style = "style=\"font: {$font_size}px monospace;\"";
-    $func_path = "<path d=\"$path\" stroke=\"green\" fill=\"none\" />";
+    $text_style = "style=\"font: {$font_size}px monospace;\""; $baseline = 'dominant-baseline="ideographic"';
     $padded_width = $width+$padding; $padded_height = $height+$padding;
     $mid_x = $padding + $width/2; $mid_y = $height/2;
     return <<<EOT
 <svg width="$padded_width" height="$padded_height">
-    <g transform="translate($padding,0)">
-        $func_path
-        $debug
-    </g>
+    <path transform="translate($padding,0)" d="$path" stroke="green" fill="none" />
     <line x1="$padding" y1="$height" x2="$width" y2="$height" stroke="black"/>
     <line x1="$padding" y1="0" x2="$padding" y2="$height" stroke="black"/>
-    <g $text_style transform="translate(0,$height)">
-        <text x="0" y="0" alignment-baseline="hanging">$min_x</text>
-        <text x="$mid_x" y="0" text-anchor="middle" alignment-baseline="hanging">days</text>
-        <text x="$width" y="0" text-anchor="end" alignment-baseline="hanging">$max_x</text>
+    <g $text_style transform="translate(0,$padded_height)">
+        <text x="$padding" y="0" text-anchor="end" $baseline>$min_x</text>
+        <text x="$mid_x" y="0" text-anchor="middle" $baseline>$label_x</text>
+        <text x="$width" y="0" text-anchor="end" $baseline>$max_x</text>
     </g>
-    <g $text_style transform="translate($padding,$height) rotate(-90)">
-        <text x="$mid_y" y="0" text-anchor="middle">MiB</text>
-        <text x="$height" y="0" text-anchor="end">$max_y</text>
+    <g $text_style transform="translate($font_size,$height) rotate(-90)">
+        <text x="$mid_y" y="0" text-anchor="middle" $baseline>$label_y</text>
+        <text x="$height" y="0" text-anchor="end" $baseline>$max_y</text>
     </g>
 </svg>
 EOT;
@@ -351,7 +345,7 @@ function print_index() : void
     $max_age = CONFIG::MAX_FILEAGE;
     $mail = CONFIG::ADMIN_EMAIL;
 
-    $g = graph(fn($x) => 50+cos($x/10)*50, 400, 200, 0, 300, 0, 100, 20, 10);
+    $g = graph(fn($x) => 50+cos($x/10)*50, 400, 200, 0, 300, 0, 100, 'Days', 'MiB', 12, 20, 10);
 
 echo <<<EOT
 <!DOCTYPE html>