diff --git a/fhem/FHEM/92_FileLog.pm b/fhem/FHEM/92_FileLog.pm index 7e85be164..cc1f39886 100755 --- a/fhem/FHEM/92_FileLog.pm +++ b/fhem/FHEM/92_FileLog.pm @@ -7,6 +7,7 @@ use warnings; use IO::File; #use Devel::Size qw(size total_size); use vars qw($FW_ss); # is smallscreen +use vars qw($FW_ME); # webname (default is fhem), needed by 97_GROUP sub seekTo($$$$); diff --git a/fhem/FHEM/98_SVG.pm b/fhem/FHEM/98_SVG.pm index b3ceca456..6835380eb 100755 --- a/fhem/FHEM/98_SVG.pm +++ b/fhem/FHEM/98_SVG.pm @@ -57,7 +57,7 @@ SVG_digestConf($$) $pTemp = $plot; $i = 0; $pTemp =~ s/ title '([^']*)'/$lTitle[$i++]=$1/gse; $pTemp = $plot; $i = 0; $pTemp =~ s/ with (\w+)/$lType[$i++]=$1/gse; $pTemp = $plot; $i = 0; $pTemp =~ s/ ls (\w+)/$lStyle[$i++]=$1/gse; - $pTemp = $plot; $i = 0; $pTemp =~ s/ lw (\w+)/$lWidth[$i++]=$1/gse; + $pTemp = $plot; $i = 0; $pTemp =~ s/ lw ([\w.]+)/$lWidth[$i++]=$1/gse; for my $i (0..int(@lType)-1) { # lAxis is optional $lAxis[$i] = "x1y2" if(!$lAxis[$i]); diff --git a/fhem/FHEM/98_weblink.pm b/fhem/FHEM/98_weblink.pm index ef9a7faec..4e3238da7 100755 --- a/fhem/FHEM/98_weblink.pm +++ b/fhem/FHEM/98_weblink.pm @@ -269,28 +269,32 @@ wl_PEdit($$$$) $ret .= FW_hidden("detail", $d); $ret .= FW_hidden("gplotName", $gp); $ret .= ""; + $ret .= ""; + $ret .= ""; + $ret .= ""; + $ret .= ""; $ret .= ""; - $ret .= ""; + $ret .= ""; $ret .= ""; $ret .= ""; $ret .= ""; $ret .= ""; + $ret .= ""; + $ret .= wl_cb("gridy", "left", $conf{hasygrid}); + $ret .= wl_cb("gridy2","right",$conf{hasy2grid}); + $ret .= ""; + $ret .= ""; + $ret .= ""; + $ret .= ""; + $ret .= ""; + $ret .= ""; + $ret .= ""; $ret .= ""; $ret .= ""; $ret .= ""; $ret .= ""; - $ret .= ""; - $ret .= ""; - $ret .= wl_cb("gridy", "left", $conf{hasygrid}); - $ret .= wl_cb("gridy2","right",$conf{hasy2grid}); - $ret .= ""; - $ret .= ""; - $ret .= ""; - $ret .= ""; - $ret .= ""; - $ret .= ""; - $ret .= ""; + $ret .= ""; $ret .= ""; $ret .=" "; @@ -323,6 +327,12 @@ wl_PEdit($$$$) } $ret .= wl_sel("style_${r}", "l0,l1,l2,l3,l4,l5,l6,l7,l8,". "l0fill,l1fill,l2fill,l3fill,l4fill,l5fill,l6fill", $ls); + my $lw = $conf{lWidth}[$r]; + if($lw) { + $lw =~ s/.*stroke-width://g; + $lw =~ s/"//g; + } + $ret .= wl_sel("width_${r}", "0.2,0.5,1,1.5,2,3,4", ($lw ? $lw : 1)); $ret .= ""; } $ret .= "
Plot title".wl_txt("title", "", $conf{title}, 32)."
LabelY-Axis label".wl_txt("ylabel", "left", $conf{ylabel}, 16)."".wl_txt("y2label","right", $conf{y2label}, 16)."
Grid aligned
Range as [min:max]".wl_txt("yrange", "left", $conf{yrange}, 16)."".wl_txt("y2range", "right", $conf{y2range}, 16)."
Tics as (\"Txt\" val, ...)".wl_txt("ytics", "left", $conf{ytics}, 16)."".wl_txt("y2tics","right", $conf{y2tics}, 16)."
Grid aligned
Range as [min:max]".wl_txt("yrange", "left", $conf{yrange}, 16)."".wl_txt("y2range", "right", $conf{y2range}, 16)."
Label
Diagramm labelColumn,Regexp,DefaultValue,FunctionY-Axis,Plot-Type,Style
"; @@ -358,7 +368,7 @@ weblink_WriteGplot($) print FH "set xdata time\n"; print FH "set timefmt \"%Y-%m-%d_%H:%M:%S\"\n"; print FH "set xlabel \" \"\n"; - print FH "set title ''\n"; + print FH "set title '$FW_webArgs{title}'\n"; print FH "set ytics ".$FW_webArgs{ytics}."\n"; print FH "set y2tics ".$FW_webArgs{y2tics}."\n"; print FH "set grid".($FW_webArgs{gridy} ? " ytics" :""). @@ -380,6 +390,7 @@ weblink_WriteGplot($) ($FW_webArgs{"axes_$i"} eq "right" ? "x1y2" : "x1y1"). " title '".$FW_webArgs{"title_$i"} ."'". " ls " .$FW_webArgs{"style_$i"} . + " lw " .$FW_webArgs{"width_$i"} . " with " .$FW_webArgs{"type_$i"}; } print FH "\n";