From mboxrd@z Thu Jan  1 00:00:00 1970
From: Leo-Andres Hofmann <hofmann@leo-andres.de>
To: development@lists.ipfire.org
Subject: [PATCH] QoS graphs: Add color mapping table
Date: Sun, 07 Mar 2021 15:49:50 +0100
Message-ID: <20210307144950.486-1-hofmann@leo-andres.de>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3383023513777540274=="
List-Id: <development.lists.ipfire.org>

--===============3383023513777540274==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Use the traffic class description field to identify similar classes.
This ensures that a class used in both the up- and down-link is
printed with matching colors in both graphs.

Signed-off-by: Leo-Andres Hofmann <hofmann(a)leo-andres.de>
---
 config/cfgroot/graphs.pl | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index aced99125..e4c3613fb 100644
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -989,7 +989,7 @@ sub updateqosgraph {
=20
 	my $ERROR=3D"";
 	my $count=3D"1";
-	my $color=3D"#000000";
+	my %colorMap =3D (); # maps traffic classes to graph colors
=20
 	my @command =3D (
 		@GRAPH_ARGS,
@@ -1013,18 +1013,27 @@ sub updateqosgraph {
 		@classes =3D <FILE>;
 		close FILE;
=20
-		my $colorIndex =3D 0;
 		foreach $classentry (sort @classes){
 			@classline =3D split( /\;/, $classentry );
+
+			# create class <-> color mapping
+			my $colorKey =3D uc $classline[8]; # upper case class name as key
+			if(! exists $colorMap{$colorKey}) {
+				# add missing color to table, use colors 11-25
+				my $colorIndex =3D 11 + ((scalar keys %colorMap) % 15);
+				$colorMap{$colorKey} =3D "$color{\"color$colorIndex\"}";
+			}
+
 			if ( $classline[0] eq $qossettings{'DEV'} ){
-				my $colorIndex =3D 10 + $count % 15;
-				$color=3D"$color{\"color$colorIndex\"}";
 				push(@command, "DEF:$classline[1]=3D$mainsettings{'RRDLOG'}/class_$qosse=
ttings{'CLASSPRFX'}-$classline[1]_$qossettings{'DEV'}.rrd:bytes:AVERAGE");
=20
+				# get color to be used for this graph
+				my $graphColor =3D $colorMap{$colorKey};
+
 				if ($count eq "1") {
-					push(@command, "AREA:$classline[1]$color:$Lang::tr{'Class'} $classline[=
1] -".sprintf("%15s",$classline[8]));
+					push(@command, "AREA:$classline[1]$graphColor:$Lang::tr{'Class'} $class=
line[1] -".sprintf("%15s",$classline[8]));
 				} else {
-					push(@command, "STACK:$classline[1]$color:$Lang::tr{'Class'} $classline=
[1] -".sprintf("%15s",$classline[8]));
+					push(@command, "STACK:$classline[1]$graphColor:$Lang::tr{'Class'} $clas=
sline[1] -".sprintf("%15s",$classline[8]));
 				}
=20
 				push(@command, "GPRINT:$classline[1]:MAX:%8.1lf %sBps"
--=20
2.27.0.windows.1


--===============3383023513777540274==--