Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

adding plotEmbed parameter for iOS 8

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@6583 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2014-09-20 17:15:08 +00:00
parent 2aec31ed3d
commit ebd42bd7da
2 changed files with 41 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
FHEM/01_FHEMWEB.pm
View File

@ -78,6 +78,7 @@ use vars qw($FW_cmdret); # Returned data by the fhem call
use vars qw($FW_room); # currently selected room use vars qw($FW_room); # currently selected room
use vars qw($FW_formmethod); use vars qw($FW_formmethod);
use vars qw(%FW_visibleDeviceHash); use vars qw(%FW_visibleDeviceHash);
use vars qw(@FW_httpheader); # HTTP header, line by line
$FW_formmethod = "post"; $FW_formmethod = "post";
@ -90,7 +91,6 @@ my $FW_lastHashUpdate = 0;
######################### #########################
# As we are _not_ multithreaded, it is safe to use global variables. # As we are _not_ multithreaded, it is safe to use global variables.
# Note: for delivering SVG plots we fork # Note: for delivering SVG plots we fork
my @FW_httpheader; # HTTP header, line by line
my @FW_enc; # Accepted encodings (browser header) my @FW_enc; # Accepted encodings (browser header)
my $FW_data; # Filecontent from browser when editing a file my $FW_data; # Filecontent from browser when editing a file
my %FW_icons; # List of icons my %FW_icons; # List of icons
@ -152,6 +152,7 @@ FHEMWEB_Initialize($)
ploteditor:always,onClick,never ploteditor:always,onClick,never
plotfork:1,0 plotfork:1,0
plotmode:gnuplot,gnuplot-scroll,SVG plotmode:gnuplot,gnuplot-scroll,SVG
plotEmbed:0,1
plotsize plotsize
nrAxis nrAxis
redirectCmds:0,1 redirectCmds:0,1

52
FHEM/98_SVG.pm
View File

@ -32,7 +32,7 @@ sub SVG_doround($$$);
sub SVG_fmtTime($$); sub SVG_fmtTime($$);
sub SVG_pO($); sub SVG_pO($);
sub SVG_readgplotfile($$); sub SVG_readgplotfile($$);
sub SVG_render($$$$$$$$$); sub SVG_render($$$$$$$$$;$$);
sub SVG_showLog($); sub SVG_showLog($);
sub SVG_substcfg($$$$$$); sub SVG_substcfg($$$$$$);
sub SVG_time_align($$); sub SVG_time_align($$);
@ -182,8 +182,19 @@ SVG_FwFn($$$$)
if(AttrVal($d,"plotmode",$FW_plotmode) eq "SVG") { if(AttrVal($d,"plotmode",$FW_plotmode) eq "SVG") {
my ($w, $h) = split(",", AttrVal($d,"plotsize",$FW_plotsize)); my ($w, $h) = split(",", AttrVal($d,"plotsize",$FW_plotsize));
$ret .= "<div class=\"SVGplot\">"; $ret .= "<div class=\"SVGplot\">";
$ret .= "<embed src=\"$arg\" type=\"image/svg+xml\" " .
"width=\"$w\" height=\"$h\" name=\"$d\"/>\n"; if(AttrVal($FW_wname, "plotEmbed", 1)) {
$ret .= "<embed src=\"$arg\" type=\"image/svg+xml\" " .
"width=\"$w\" height=\"$h\" name=\"$d\"/>\n";
} else {
my $oret=$FW_RET; $FW_RET="";
my ($type, $data) = SVG_doShowLog($d, $hash->{LOGDEVICE},
$hash->{GPLOTFILE}, $hash->{LOGFILE}, $w, $h);
$FW_RET=$oret;
$ret .= $data;
}
$ret .= "</div>"; $ret .= "</div>";
} else { } else {
@ -761,11 +772,16 @@ SVG_calcOffsets($$)
sub sub
SVG_showLog($) SVG_showLog($)
{ {
my ($cmd) = @_; return SVG_doShowLog($FW_webArgs{dev},
my $wl = $FW_webArgs{dev}; $FW_webArgs{logdev},
my $d = $FW_webArgs{logdev}; $FW_webArgs{gplotfile},
my $type = $FW_webArgs{gplotfile}; $FW_webArgs{logfile});
my $file = $FW_webArgs{logfile}; }
sub
SVG_doShowLog($$$$$$)
{
my ($wl, $d, $type, $file, $styleW, $styleH) = @_;
my $pm = AttrVal($wl,"plotmode",$FW_plotmode); my $pm = AttrVal($wl,"plotmode",$FW_plotmode);
my $gplot_pgm = "$FW_gplotdir/$type.gplot"; my $gplot_pgm = "$FW_gplotdir/$type.gplot";
@ -881,7 +897,8 @@ SVG_showLog($)
FW_fC("get $d $file INT $f $t " . join(" ", @{$flog}), 1); FW_fC("get $d $file INT $f $t " . join(" ", @{$flog}), 1);
($cfg, $plot) = SVG_substcfg(1, $wl, $cfg, $plot, $file, "<OuT>"); ($cfg, $plot) = SVG_substcfg(1, $wl, $cfg, $plot, $file, "<OuT>");
my $ret = SVG_render($wl, $f, $t, $cfg, my $ret = SVG_render($wl, $f, $t, $cfg,
$internal_data, $plot, $FW_wname, $FW_cssdir, $flog); $internal_data, $plot, $FW_wname, $FW_cssdir, $flog,
$styleW, $styleH);
$internal_data = ""; $internal_data = "";
FW_pO $ret; FW_pO $ret;
if($SVGcache) { if($SVGcache) {
@ -961,7 +978,7 @@ SVG_openFile($$$)
##################################### #####################################
sub sub
SVG_render($$$$$$$$$) SVG_render($$$$$$$$$;$$)
{ {
my $name = shift; # e.g. wl_8 my $name = shift; # e.g. wl_8
my $from = shift; # e.g. 2008-01-01 my $from = shift; # e.g. 2008-01-01
@ -972,6 +989,8 @@ SVG_render($$$$$$$$$)
my $parent_name = shift; # e.g. FHEMWEB instance name my $parent_name = shift; # e.g. FHEMWEB instance name
my $parent_dir = shift; # FW_dir my $parent_dir = shift; # FW_dir
my $flog = shift; # #FileLog lines, as array pointer my $flog = shift; # #FileLog lines, as array pointer
my $styleW = shift;
my $styleH = shift;
$SVG_RET=""; $SVG_RET="";
my $SVG_ss = AttrVal($parent_name, "smallscreen", 0); my $SVG_ss = AttrVal($parent_name, "smallscreen", 0);
@ -1005,10 +1024,17 @@ SVG_render($$$$$$$$$)
###################### ######################
# Html Header # Html Header
SVG_pO '<?xml version="1.0" encoding="UTF-8"?>'; if(!$styleW) {
SVG_pO '<!DOCTYPE svg>'; SVG_pO '<?xml version="1.0" encoding="UTF-8"?>';
SVG_pO '<svg version="1.1" xmlns="http://www.w3.org/2000/svg" '. SVG_pO '<!DOCTYPE svg>';
SVG_pO '<svg version="1.1" xmlns="http://www.w3.org/2000/svg" '.
'xmlns:xlink="http://www.w3.org/1999/xlink" '.$flog.'>'; 'xmlns:xlink="http://www.w3.org/1999/xlink" '.$flog.'>';
} else {
SVG_pO '<svg version="1.1" xmlns="http://www.w3.org/2000/svg" '.
'xmlns:xlink="http://www.w3.org/1999/xlink" '.
"style='width:${styleW}px; height:${styleH}px;' ".
'>';
}
my $prf = AttrVal($parent_name, "stylesheetPrefix", ""); my $prf = AttrVal($parent_name, "stylesheetPrefix", "");
SVG_pO "<style type=\"text/css\"><![CDATA["; SVG_pO "<style type=\"text/css\"><![CDATA[";