';
for my $rownr (0..9) {
@@ -7397,8 +7400,7 @@ sub SSCam_ptzpanel {
for my $btnnr (0..$#btn) {
$ptz_ret .= "| ";
if ($btn[$btnnr] ne "") {
- my $cmd;
- my $img;
+ my ($cmd,$img);
if ($btn[$btnnr] =~ /(.*?):(.*)/) { # enthält Komando -> :
$cmd = $1;
@@ -7431,12 +7433,61 @@ sub SSCam_ptzpanel {
$ptz_ret .= " | ";
$ptz_ret .= "\n";
}
- $ptz_ret .= "\n";
+ $ptz_ret .= "\n";
}
$ptz_ret .= "
";
+ ### Zoom
+ ###############################
+ if(SSCam_IsCapZoom($hash)) { # wenn Zoom Eigenschaft
+
+ $ptz_ret .= '';
+ $ptz_ret .= "";
+ $ptz_ret .= "| ";
+ $ptz_ret .= 'Zoom: ';
+ $ptz_ret .= " | ";
+ $ptz_ret .= "
";
+ $ptz_ret .= "";
+
+ my @za = qw(.++ + - --.);
+
+ for my $cmd (@za) {
+ $ptz_ret .= "| ";
+
+ my $img = $zd{$cmd}{panimg};
+ if(!$img) {
+ $ptz_ret .= $cmd;
+ $ptz_ret .= " | ";
+ $ptz_ret .= "
";
+ $ptz_ret .= "";
+ next;
+ }
+
+ if ($img =~ m/\.svg/x) { # Verwendung für SVG's
+ $img = FW_makeImage($img, $cmd, "rc-button");
+
+ } else { # $FW_ME = URL-Pfad unter dem der FHEMWEB-Server via HTTP erreichbar ist, z.B. /fhem
+ if($ftui) {
+ $img = "![](\"$FW_ME/$iconpath/$iconprefix$img\")
";
+ } else {
+ $img = "";
+ }
+ }
+
+ my $cmd1 = "FW_cmd('$FW_ME$FW_subdir?XHR=1&cmd=set $name setZoom $cmd')"; # $FW_subdir = Sub-path in URL, used by FLOORPLAN/weblink
+ $cmd1 = "ftui.setFhemStatus('set $name setZoom $cmd')" if($ftui);
+
+ $ptz_ret .= "$img";
+
+ $ptz_ret .= "";
+ }
+
+ $ptz_ret .= "
";
+ $ptz_ret .= "
";
+ }
+
+ ### add Preset / Patrols
###############################
- # add Preset / Patrols / Zoom
if(!$ftui) {
my ($Presets,$Patrols,$zoom,$fn);
my $cmdPreset = "goPreset";
@@ -7469,20 +7520,6 @@ sub SSCam_ptzpanel {
} else {
$Patrols = FW_pH "cmd.$name=set $name $cmdPatrol", $cmdPatrol, 0, "", 1, 1;
}
-
- ## Zoom
- for $fn (sort keys %{$data{webCmdFn}}) {
- no strict "refs";
- $zoom = &{$data{webCmdFn}{$fn}}($FW_wname,$name,"",$cmdZoom,$SSCam_valZoom);
- use strict "refs";
- last if(defined($zoom));
- }
-
- if($zoom) {
- $zoom =~ s,^