From 522085d22c4ac7176ed7aac48f03c05fda812684 Mon Sep 17 00:00:00 2001
From: Ellert <>
Date: Mon, 16 Oct 2017 02:32:41 +0000
Subject: [PATCH] 98_DOIFtools: enhanced browser compatibility
Forum(63938,699740)
git-svn-id: https://svn.fhem.de/fhem/trunk@15266 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
fhem/FHEM/98_DOIFtools.pm | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/fhem/FHEM/98_DOIFtools.pm b/fhem/FHEM/98_DOIFtools.pm
index 5b7d05168..4061f9ce6 100644
--- a/fhem/FHEM/98_DOIFtools.pm
+++ b/fhem/FHEM/98_DOIFtools.pm
@@ -1495,21 +1495,21 @@ sub DOIFtools_Get($@)
} elsif ($arg eq "linearColorGradient") {
my ($sc,$ec,$min,$max,$step) = split(",",$value);
if ($value && $sc =~ /[0-9A-F]{6}/ && $ec =~ /[0-9A-F]{6}/ && $min =~ /(-?\d+(\.\d+)?)/ && $max =~ /(-?\d+(\.\d+)?)/ && $step =~ /(-?\d+(\.\d+)?)/) {
- $ret .= "
";
+ $ret .= "
";
$ret .= "Color Table |
";
$ret .= "";
- for (my $i=0;$i<=255;$i++) {
- my $col = DOIFtoolsLinColorGrad($sc,$ec,0,255,$i);
- $ret .= " ";
+ for (my $i=0;$i<=127;$i++) {
+ my $col = DOIFtoolsLinColorGrad($sc,$ec,0,127,$i);
+ $ret .= " ";
}
$ret .= " |
";
$ret .= " Value | Color Number | RGB values | Color |
";
for (my $i=$min;$i<=$max;$i+=$step) {
my $col = DOIFtoolsLinColorGrad($sc,$ec,$min,$max,$i);
$col =~ /^#?([0-9A-F]{2})([0-9A-F]{2})([0-9A-F]{2})$/;
- $ret .= "".sprintf("%.1f",$i)." | $col | ".hex($1).",".hex($2).",".hex($3)." | |
";
+ $ret .= "".sprintf("%.1f",$i)." | $col | ".hex($1).",".hex($2).",".hex($3)." | |
";
}
- $ret .= "
\n";
+ $ret .= "
";
return $ret;
} else {
@@ -1585,18 +1585,18 @@ Example specification: 0,50,100,5,[255,255,0,127,255,0,0,255,0,0,255,255,0
Log3 $hash->{NAME},3,"modelColorGradient \n".$err;
return $err;
}
- $ret .= "";
+ $ret .= "
";
$ret .= "Color Table |
";
$ret .= "";
- for (my $i=0;$i<=255;$i++) {
- my $col = eval("\"".Color::pahColor($min,$mid,$max,$min+$i*($max-$min)/255,$colors)."\"");
+ for (my $i=0;$i<=127;$i++) {
+ my $col = eval("\"".Color::pahColor($min,$mid,$max,$min+$i*($max-$min)/127,$colors)."\"");
if ($@) {
$err="Error eval 1567: $@\n".$err_ret;
Log3 $hash->{NAME},3,"modelColorGradient \n".$err;
return $err;
}
$col = "#".substr($col,0,6);
- $ret .= " ";
+ $ret .= " ";
}
$ret .= " |
";
$ret .= " Value | Color Number | RGB values | Color |
";
@@ -1609,9 +1609,9 @@ Example specification: 0,50,100,5,[255,255,0,127,255,0,0,255,0,0,255,255,0
}
$col = "#".substr($col,0,6);
$col =~ /^#?([0-9A-F]{2})([0-9A-F]{2})([0-9A-F]{2})$/;
- $ret .= "".sprintf("%.1f",$i)." | $col | ".hex($1).",".hex($2).",".hex($3)." | |
";
+ $ret .= "".sprintf("%.1f",$i)." | $col | ".hex($1).",".hex($2).",".hex($3)." | |
";
}
- $ret .= "
\n";
+ $ret .= "
";
return $ret;
} else {