ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add warnings when the type of movement is not selected

This commit is contained in:
Isaac Connor 2020-01-02 17:03:52 -05:00
parent e9815bf9c7
commit d42e9beddc
1 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
web/includes/Control.php
View File

@ -128,12 +128,16 @@ class Control extends ZM_Object {
$cmds['PresetHome'] = 'presetHome'; $cmds['PresetHome'] = 'presetHome';
if ( $this->CanZoom() ) { if ( $this->CanZoom() ) {
if ( $this->CanZoomCon() ) if ( $this->CanZoomCon() ) {
$cmds['ZoomRoot'] = 'zoomCon'; $cmds['ZoomRoot'] = 'zoomCon';
elseif ( $this->CanZoomRel() ) } else if ( $this->CanZoomRel() ) {
$cmds['ZoomRoot'] = 'zoomRel'; $cmds['ZoomRoot'] = 'zoomRel';
elseif ( $this->CanZoomAbs() ) } else if ( $this->CanZoomAbs() ) {
$cmds['ZoomRoot'] = 'zoomAbs'; $cmds['ZoomRoot'] = 'zoomAbs';
} else {
$cmds['ZoomRoot'] = '';
Error('No zoom type selected. Please select Continuous, Relative, Absolute');
}
$cmds['ZoomTele'] = $cmds['ZoomRoot'].'Tele'; $cmds['ZoomTele'] = $cmds['ZoomRoot'].'Tele';
$cmds['ZoomWide'] = $cmds['ZoomRoot'].'Wide'; $cmds['ZoomWide'] = $cmds['ZoomRoot'].'Wide';
$cmds['ZoomStop'] = 'zoomStop'; $cmds['ZoomStop'] = 'zoomStop';
@ -142,12 +146,16 @@ class Control extends ZM_Object {
} }
if ( $this->CanFocus() ) { if ( $this->CanFocus() ) {
if ( $this->CanFocusCon() ) if ( $this->CanFocusCon() ) {
$cmds['FocusRoot'] = 'focusCon'; $cmds['FocusRoot'] = 'focusCon';
elseif ( $this->CanFocusRel() ) } else if ( $this->CanFocusRel() ) {
$cmds['FocusRoot'] = 'focusRel'; $cmds['FocusRoot'] = 'focusRel';
elseif ( $this->CanFocusAbs() ) } else if ( $this->CanFocusAbs() ) {
$cmds['FocusRoot'] = 'focusAbs'; $cmds['FocusRoot'] = 'focusAbs';
} else {
$cmds['FocusRoot'] = '';
Error('No focus type selected. Please select Continuous, Relative, Absolute');
}
$cmds['FocusFar'] = $cmds['FocusRoot'].'Far'; $cmds['FocusFar'] = $cmds['FocusRoot'].'Far';
$cmds['FocusNear'] = $cmds['FocusRoot'].'Near'; $cmds['FocusNear'] = $cmds['FocusRoot'].'Near';
$cmds['FocusStop'] = 'focusStop'; $cmds['FocusStop'] = 'focusStop';
@ -156,12 +164,16 @@ class Control extends ZM_Object {
} }
if ( $this->CanIris() ) { if ( $this->CanIris() ) {
if ( $this->CanIrisCon() ) if ( $this->CanIrisCon() ) {
$cmds['IrisRoot'] = 'irisCon'; $cmds['IrisRoot'] = 'irisCon';
elseif ( $this->CanIrisRel() ) } else if ( $this->CanIrisRel() ) {
$cmds['IrisRoot'] = 'irisRel'; $cmds['IrisRoot'] = 'irisRel';
elseif ( $this->CanIrisAbs() ) } else if ( $this->CanIrisAbs() ) {
$cmds['IrisRoot'] = 'irisAbs'; $cmds['IrisRoot'] = 'irisAbs';
} else {
$cmds['IrisRoot'] = '';
Error('No iris type selected. Please select Continuous, Relative, Absolute');
}
$cmds['IrisOpen'] = $cmds['IrisRoot'].'Open'; $cmds['IrisOpen'] = $cmds['IrisRoot'].'Open';
$cmds['IrisClose'] = $cmds['IrisRoot'].'Close'; $cmds['IrisClose'] = $cmds['IrisRoot'].'Close';
$cmds['IrisStop'] = 'irisStop'; $cmds['IrisStop'] = 'irisStop';
@ -170,12 +182,16 @@ class Control extends ZM_Object {
} }
if ( $this->CanWhite() ) { if ( $this->CanWhite() ) {
if ( $this->CanWhiteCon() ) if ( $this->CanWhiteCon() ) {
$cmds['WhiteRoot'] = 'whiteCon'; $cmds['WhiteRoot'] = 'whiteCon';
elseif ( $this->CanWhiteRel() ) } else if ( $this->CanWhiteRel() ) {
$cmds['WhiteRoot'] = 'whiteRel'; $cmds['WhiteRoot'] = 'whiteRel';
elseif ( $this->CanWhiteAbs() ) } else if ( $this->CanWhiteAbs() ) {
$cmds['WhiteRoot'] = 'whiteAbs'; $cmds['WhiteRoot'] = 'whiteAbs';
} else {
Error('No White type selected. Please select Continuous, Relative, Absolute');
$cmds['WhiteRoot'] = '';
}
$cmds['WhiteIn'] = $cmds['WhiteRoot'].'In'; $cmds['WhiteIn'] = $cmds['WhiteRoot'].'In';
$cmds['WhiteOut'] = $cmds['WhiteRoot'].'Out'; $cmds['WhiteOut'] = $cmds['WhiteRoot'].'Out';
$cmds['WhiteAuto'] = 'whiteAuto'; $cmds['WhiteAuto'] = 'whiteAuto';
@ -183,12 +199,16 @@ class Control extends ZM_Object {
} }
if ( $this->CanGain() ) { if ( $this->CanGain() ) {
if ( $this->CanGainCon() ) if ( $this->CanGainCon() ) {
$cmds['GainRoot'] = 'gainCon'; $cmds['GainRoot'] = 'gainCon';
elseif ( $this->CanGainRel() ) } else if ( $this->CanGainRel() ) {
$cmds['GainRoot'] = 'gainRel'; $cmds['GainRoot'] = 'gainRel';
elseif ( $this->CanGainAbs() ) } else if ( $this->CanGainAbs() ) {
$cmds['GainRoot'] = 'gainAbs'; $cmds['GainRoot'] = 'gainAbs';
} else {
Error('No Gain type selected');
$cmds['GainRoot'] = '';
}
$cmds['GainUp'] = $cmds['GainRoot'].'Up'; $cmds['GainUp'] = $cmds['GainRoot'].'Up';
$cmds['GainDown'] = $cmds['GainRoot'].'Down'; $cmds['GainDown'] = $cmds['GainRoot'].'Down';
$cmds['GainAuto'] = 'gainAuto'; $cmds['GainAuto'] = 'gainAuto';
@ -207,6 +227,7 @@ class Control extends ZM_Object {
$cmds['Center'] = $cmds['PresetHome']; $cmds['Center'] = $cmds['PresetHome'];
} else { } else {
$cmds['MoveRoot'] = ''; $cmds['MoveRoot'] = '';
Error('No move type selected. Please select Continuous, Relative, Absolute');
} }
$cmds['MoveUp'] = $cmds['MoveRoot'].'Up'; $cmds['MoveUp'] = $cmds['MoveRoot'].'Up';