diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentAVControl/IPSComponentAVControl_AudioMax.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentAVControl/IPSComponentAVControl_AudioMax.class.php index e60d2dc..ccf1b54 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentAVControl/IPSComponentAVControl_AudioMax.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentAVControl/IPSComponentAVControl_AudioMax.class.php @@ -10,21 +10,21 @@ IPSUtils_Include ('IPSComponentAVControl.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentAVControl'); IPSUtils_Include ("AudioMax.inc.php", 'IPSLibrary::app::hardware::AudioMax'); - /** - * @class IPSComponentAVControl_AudioMax - * - * Definiert ein IPSComponentAVControl_AudioMax Object, das ein IPSComponentAVControl Object mit Hilfe der + /** + * @class IPSComponentAVControl_AudioMax + * + * Definiert ein IPSComponentAVControl_AudioMax Object, das ein IPSComponentAVControl Object mit Hilfe der * AudioMax MultiRoom Steuerung e-Service Online implementiert - * - * @author Andreas Brauneis - * @version - * Version 2.50.1, 31.01.2012
- */ + * + * @author Andreas Brauneis + * @version + * Version 2.50.1, 31.01.2012
+ */ class IPSComponentAVControl_AudioMax extends IPSComponentAVControl{ private $instanceId; - + /** * @public * @@ -34,8 +34,8 @@ class IPSComponentAVControl_AudioMax extends IPSComponentAVControl{ */ public function __construct($instanceId) { $this->instanceId = (int)$instanceId; - if ($this->instanceId==null) { - $this->instanceId = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.hardware.AudioMax.AudioMax_Server'); + if ($this->instanceId==null) { + $this->instanceId = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.hardware.AudioMax.AudioMax_Server'); } } @@ -49,7 +49,7 @@ public function __construct($instanceId) { * @return string Parameter String des IPSComponent Object */ public function GetComponentParams() { - return get_class(this).','.$this->instanceId; + return get_class($this).','.$this->instanceId; } @@ -75,10 +75,16 @@ public function HandleEvent($variable, $value, IPSModuleAVControl $module) { switch($command) { case AM_CMD_POWER: case AM_CMD_ROOM: - for ($roomId=0;$roomIdinstanceId) and AudioMax_GetRoomPower($this->instanceId, $roomId); + if (!AudioMax_GetMainPower($this->instanceId) and $command==AM_CMD_ROOM) { + break; + } + for ($roomId=0;$roomIdinstanceId) and AudioMax_GetRoomPower($this->instanceId, $roomId)) { + $status='1'; + } $module->SyncPower($status, $roomId, $this); - } + } break; case AM_CMD_AUDIO: if (count($parameters)<6) return; @@ -87,22 +93,25 @@ public function HandleEvent($variable, $value, IPSModuleAVControl $module) { $value = $parameters[5]; switch($function) { case AM_FNC_BALANCE: - $module->SyncBalance($value, $roomId, $this); + $module->SyncBalance($value * 100 / AM_VAL_BALANCE_MAX, $roomId, $this); break; case AM_FNC_VOLUME: - $module->SyncVolume($value, $roomId, $this); + $module->SyncVolume($value * 100 / AM_VAL_VOLUME_MAX, $roomId, $this); + break; + case AM_FNC_MUTE: + $module->SyncMute($value, $roomId, $this); break; case AM_FNC_TREBLE: - $module->SyncTreble($value, $roomId, $this); + $module->SyncTreble($value * 100 / AM_VAL_TREBLE_MAX, $roomId, $this); break; case AM_FNC_MIDDLE: - $module->SyncMiddle($value, $roomId, $this); + $module->SyncMiddle($value * 100 / AM_VAL_MIDDLE_MAX, $roomId, $this); break; case AM_FNC_BASS: - $module->SyncBass($value, $roomId, $this); + $module->SyncBass($value * 100 / AM_VAL_BASS_MAX, $roomId, $this); break; case AM_FNC_INPUTSELECT: - $module->SyncSource($value, $roomId, $this); + $module->SyncSource($value, $roomId, $this); break; case AM_FNC_INPUTGAIN: break; @@ -115,6 +124,13 @@ public function HandleEvent($variable, $value, IPSModuleAVControl $module) { } } + private function HandleError($result) { + if ($result==false) { + $errorMessage = GetValue(IPS_GetObjectIDByIdent(AM_VAR_LASTERROR, $this->instanceId)); + trigger_error($errorMessage); + } + } + /** * @public * @@ -124,18 +140,20 @@ public function HandleEvent($variable, $value, IPSModuleAVControl $module) { * @param boolean $value Wert für Power (Wertebereich false=Off, true=On) */ public function SetPower($outputId, $value) { - AudioMax_SetRoomPower($this->instanceId, $outputId, $value); + $result = AudioMax_SetRoomPower($this->instanceId, $outputId, $value); + $this->HandleError($result); if ($value) { - AudioMax_SetMainPower($this->instanceId, $value); + $result = AudioMax_SetMainPower($this->instanceId, $value); } else { - $allRoomesOff = true; + $allRoomesOff = true; for ($roomId=0;$roomIdinstanceId, $roomId); + $allRoomesOff = ($allRoomesOff and !AudioMax_GetRoomPower($this->instanceId, $roomId)); } if ($allRoomesOff) { - AudioMax_SetMainPower($this->instanceId, $value); + $result = AudioMax_SetMainPower($this->instanceId, $value); } } + $this->HandleError($result); } /** @@ -161,7 +179,7 @@ public function GetPower($outputId) { * @param integer $value Eingang der gesetzt werden soll (Wertebereich 0 - x) */ public function SetSource($outputId, $value) { - AudioMax_SetRoomPower($this->instanceId, $outputId, $value); + $this->HandleError(AudioMax_SetInputSelect($this->instanceId, $outputId, $value)); } /** @@ -173,7 +191,7 @@ public function SetSource($outputId, $value) { * @return integer Eingang der gerade gewählt ist (Wertebereich 0 - x) */ public function GetSource($outputId) { - return AudioMax_SetRoomPower($this->instanceId, $outputId); + return AudioMax_GetInputSelect($this->instanceId, $outputId); } /** @@ -185,7 +203,7 @@ public function GetSource($outputId) { * @param integer $value Wert der Lautstärke (Wertebereich 0 - 100) */ public function SetVolume($outputId, $value) { - AudioMax_SetVolume($this->instanceId, $outputId, $value * AM_VAL_VOLUME_MAX / 100); + $this->HandleError(AudioMax_SetVolume($this->instanceId, $outputId, $value * AM_VAL_VOLUME_MAX / 100)); } /** @@ -197,7 +215,7 @@ public function SetVolume($outputId, $value) { * @return integer Wert der Lautstärke (Wertebereich 0 - 100) */ public function GetVolume($outputId) { - return AudioMax_GetVolume($this->instanceId, $outputId) * 100 / AM_VAL_VOLUME_MAX; + return AudioMax_GetVolume($this->instanceId, $outputId) * 100 / AM_VAL_VOLUME_MAX; } /** @@ -209,7 +227,18 @@ public function GetVolume($outputId) { * @param boolean $value Wert für Muting (Wertebereich true oder false) */ public function SetMute($outputId, $value) { - return AudioMax_SetMute($this->instanceId, $outputId, $value); + $this->HandleError(AudioMax_SetMute($this->instanceId, $outputId, $value)); + } + + /** + * @public + * + * Setzen des Mutings für einen Ausgang + * + * @param integer $outputId Ausgang der geändert werden soll (Wertebereich 0 - x) + */ + public function ToggleMute($outputId) { + $this->HandleError(AudioMax_SetMute($this->instanceId, $outputId, !AudioMax_GetMute($this->instanceId))); } /** @@ -221,7 +250,7 @@ public function SetMute($outputId, $value) { * @return boolean Wert für Muting (Wertebereich true oder false) */ public function GetMute($outputId) { - return AudioMax_GetMute($this->instanceId, $outputId); + return AudioMax_GetMute($this->instanceId, $outputId); } /** @@ -233,7 +262,7 @@ public function GetMute($outputId) { * @param integer $value Wert für Balance (Wertebereich: Links 0 - 50 , 51 - 100 Rechts) */ public function SetBalance($outputId, $value) { - AudioMax_SetBalance($this->instanceId, $outputId, $value * AM_VAL_BALANCE_MAX / 100); + $this->HandleError(AudioMax_SetBalance($this->instanceId, $outputId, $value * AM_VAL_BALANCE_MAX / 100)); } /** @@ -245,7 +274,7 @@ public function SetBalance($outputId, $value) { * @return integer Wert für Balance (Wertebereich: Links 0 - 50 , 51 - 100 Rechts) */ public function GetBalance($outputId) { - return AudioMax_GetBalance($this->instanceId, $outputId) * 100 / AM_VAL_BALANCE_MAX; + return AudioMax_GetBalance($this->instanceId, $outputId) * 100 / AM_VAL_BALANCE_MAX; } /** @@ -257,7 +286,7 @@ public function GetBalance($outputId) { * @param integer $value Wert für Höhen (Wertebereich 0 - 100) */ public function SetTreble($outputId, $value) { - AudioMax_SetTreble($this->instanceId, $outputId, $value * AM_VAL_TREBLE_MAX / 100); + $this->HandleError(AudioMax_SetTreble($this->instanceId, $outputId, $value * AM_VAL_TREBLE_MAX / 100)); } /** @@ -269,7 +298,7 @@ public function SetTreble($outputId, $value) { * @return integer Wert der Höhen (Wertebereich 0 -100) */ public function GetTreble($outputId) { - return AudioMax_GetTreble($this->instanceId, $outputId) * 100 / AM_VAL_TREBLE_MAX; + return AudioMax_GetTreble($this->instanceId, $outputId) * 100 / AM_VAL_TREBLE_MAX; } /** @@ -281,7 +310,7 @@ public function GetTreble($outputId) { * @param integer $value Wert für Mitten (Wertebereich 0 - 100) */ public function SetMiddle($outputId, $value) { - AudioMax_SetMiddle($this->instanceId, $outputId, $value * AM_VAL_MIDDLE_MAX / 100); + $this->HandleError(AudioMax_SetMiddle($this->instanceId, $outputId, $value * AM_VAL_MIDDLE_MAX / 100)); } /** @@ -293,7 +322,7 @@ public function SetMiddle($outputId, $value) { * @return integer Wert der Mitten (Wertebereich 0 -100) */ public function GetMiddle($outputId) { - return AudioMax_GetMiddle($this->instanceId, $outputId) * 100 / AM_VAL_MIDDLE_MAX; + return AudioMax_GetMiddle($this->instanceId, $outputId) * 100 / AM_VAL_MIDDLE_MAX; } /** @@ -305,7 +334,7 @@ public function GetMiddle($outputId) { * @param integer $value Wert für Bässe (Wertebereich 0 - 100) */ public function SetBass($outputId, $value) { - AudioMax_SetBass($this->instanceId, $outputId, $value * AM_VAL_BASS_MAX / 100); + $this->HandleError(AudioMax_SetBass($this->instanceId, $outputId, $value * AM_VAL_BASS_MAX / 100)); } /** @@ -317,7 +346,7 @@ public function SetBass($outputId, $value) { * @return integer Wert der Bässe (Wertebereich 0 -100) */ public function GetBass($outputId) { - return AudioMax_GetBass($this->instanceId, $outputId) * 100 / AM_VAL_BASS_MAX; + return AudioMax_GetBass($this->instanceId, $outputId) * 100 / AM_VAL_BASS_MAX; } } diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentAVControl/IPSModuleAVControl_Entertainment.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentAVControl/IPSModuleAVControl_Entertainment.class.php index dc19275..1cc91f4 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentAVControl/IPSModuleAVControl_Entertainment.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentAVControl/IPSModuleAVControl_Entertainment.class.php @@ -7,7 +7,7 @@ * */ - IPSUtils_Include ("Entertainment_InterfaceIPSComponent.inc.php", "IPSLibrary::app::modules::Entertainment"); + IPSUtils_Include ("Entertainment_InterfaceIPSComponentAVControl.inc.php", "IPSLibrary::app::modules::Entertainment"); IPSUtils_Include ('IPSModuleAVControl.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentAVControl'); /** @@ -41,7 +41,7 @@ public function __construct() { * @param IPSComponentAVControl $component Component Object das einen Werte synchronisieren will */ public function SyncPower($value, $outputId, IPSComponentAVControl $component) { - Entertainment_IPSComponent_ReceiveData($component->GetComponentParams(), 'SetPower', $output, $value); + Entertainment_IPSComponent_ReceiveData($component->GetComponentParams(), 'SetPower', $outputId, $value); } /** @@ -54,7 +54,7 @@ public function SyncPower($value, $outputId, IPSComponentAVControl $component) { * @param IPSComponentAVControl $component Component Object das einen Werte synchronisieren will */ public function SyncVolume($value, $outputId, IPSComponentAVControl $component) { - Entertainment_IPSComponent_ReceiveData($component->GetComponentParams(), 'SetVolume', $output, $value); + Entertainment_IPSComponent_ReceiveData($component->GetComponentParams(), 'SetVolume', $outputId, $value); } /** @@ -67,7 +67,7 @@ public function SyncVolume($value, $outputId, IPSComponentAVControl $component) * @param IPSComponentAVControl $component Component Object das einen Werte synchronisieren will */ public function SyncMute($value, $outputId, IPSComponentAVControl $component) { - Entertainment_IPSComponent_ReceiveData($component->GetComponentParams(), 'SetMute', $output, $value); + Entertainment_IPSComponent_ReceiveData($component->GetComponentParams(), 'SetMute', $outputId, $value); } /** @@ -80,7 +80,7 @@ public function SyncMute($value, $outputId, IPSComponentAVControl $component) { * @param IPSComponentAVControl $component Component Object das einen Werte synchronisieren will */ public function SyncBalance($value, $outputId, IPSComponentAVControl $component) { - Entertainment_IPSComponent_ReceiveData($component->GetComponentParams(), 'SetBalance', $output, $value); + Entertainment_IPSComponent_ReceiveData($component->GetComponentParams(), 'SetBalance', $outputId, $value); } /** @@ -93,7 +93,7 @@ public function SyncBalance($value, $outputId, IPSComponentAVControl $component) * @param IPSComponentAVControl $component Component Object das einen Werte synchronisieren will */ public function SyncSource($value, $outputId, IPSComponentAVControl $component) { - Entertainment_IPSComponent_ReceiveData($component->GetComponentParams(), 'SetSource', $output, $value); + Entertainment_IPSComponent_ReceiveData($component->GetComponentParams(), 'SetSource', $outputId, $value); } /** @@ -106,7 +106,7 @@ public function SyncSource($value, $outputId, IPSComponentAVControl $component) * @param IPSComponentAVControl $component Component Object das einen Werte synchronisieren will */ public function SyncTreble($value, $outputId, IPSComponentAVControl $component) { - Entertainment_IPSComponent_ReceiveData($component->GetComponentParams(), 'SetTreble', $output, $value); + Entertainment_IPSComponent_ReceiveData($component->GetComponentParams(), 'SetTreble', $outputId, $value); } /** @@ -119,7 +119,7 @@ public function SyncTreble($value, $outputId, IPSComponentAVControl $component) * @param IPSComponentAVControl $component Component Object das einen Werte synchronisieren will */ public function SyncMiddle($value, $outputId, IPSComponentAVControl $component) { - Entertainment_IPSComponent_ReceiveData($component->GetComponentParams(), 'SetMiddle', $output, $value); + Entertainment_IPSComponent_ReceiveData($component->GetComponentParams(), 'SetMiddle', $outputId, $value); } /** @@ -132,7 +132,7 @@ public function SyncMiddle($value, $outputId, IPSComponentAVControl $component) * @param IPSComponentAVControl $component Component Object das einen Werte synchronisieren will */ public function SyncBass($value, $outputId, IPSComponentAVControl $component) { - Entertainment_IPSComponent_ReceiveData($component->GetComponentParams(), 'SetBass', $output, $value); + Entertainment_IPSComponent_ReceiveData($component->GetComponentParams(), 'SetBass', $outputId, $value); } diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam.class.php new file mode 100644 index 0000000..c2a9736 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam.class.php @@ -0,0 +1,135 @@ + + */ + + IPSUtils_Include ('IPSComponent.class.php', 'IPSLibrary::app::core::IPSComponent'); + + abstract class IPSComponentCam extends IPSComponent { + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleCam $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + abstract public function HandleEvent($variable, $value, IPSModuleCam $module); + + /** + * @public + * + * Liefert URL des Kamera Live Streams + * + * @param integer $size Größe des Streams, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return string URL des Streams + */ + abstract public function Get_URLLiveStream($size=IPSCOMPONENTCAM_SIZE_MIDDLE); + + /** + * @public + * + * Liefert URL des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return string URL des Bildes + */ + abstract public function Get_URLPicture($size=IPSCOMPONENTCAM_SIZE_MIDDLE); + + /** + * @public + * + * Bewegen der Kamera + * + * @param integer $urlType Type der URL die geliefert werden soll. + * mögliche Werte: IPSCOMPONENTCAM_URL_MOVEHOME + IPSCOMPONENTCAM_URL_MOVELEFT + IPSCOMPONENTCAM_URL_MOVERIGHT + IPSCOMPONENTCAM_URL_MOVEUP + IPSCOMPONENTCAM_URL_MOVEDOWN + IPSCOMPONENTCAM_URL_PREDEFPOS1 + IPSCOMPONENTCAM_URL_PREDEFPOS2 + IPSCOMPONENTCAM_URL_PREDEFPOS3 + IPSCOMPONENTCAM_URL_PREDEFPOS4 + IPSCOMPONENTCAM_URL_PREDEFPOS5 + */ + abstract public function Get_URL($urlType); + + + /** + * @public + * + * Liefert Breite des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return integer Breite des Bildes in Pixel + */ + abstract public function Get_Width($size=IPSCOMPONENTCAM_SIZE_MIDDLE); + + /** + * @public + * + * Liefert Höhe des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return integer Höhe des Bildes in Pixel + */ + abstract public function Get_Height($size=IPSCOMPONENTCAM_SIZE_MIDDLE); + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Abus.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Abus.class.php new file mode 100644 index 0000000..27368cf --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Abus.class.php @@ -0,0 +1,235 @@ + + */ + + IPSUtils_Include ('IPSComponentCam.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentCam'); + + class IPSComponentCam_Abus extends IPSComponentCam { + + private $ipAddress; + private $username; + private $password; + + /** + * @public + * + * Initialisierung eines IPSComponentCam_Abus Objektes + * + * @param string $ipAddress IP Adresse der Kamera + * @param string $username Username für Kamera Zugriff + * @param string $password Passwort für Kamera Zugriff + */ + public function __construct($ipAddress, $username, $password) { + $this->ipAddress = $ipAddress; + $this->username = $username; + $this->password = $password; + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleCam $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleCam $module) { + $name = IPS_GetName($variable); + throw new IPSComponentException('Event Handling NOT supported for Variable '.$variable.'('.$name.')'); + } + + /** + * @public + * + * Liefert URL des Kamera Live Streams + * + * @param integer $size Größe des Streams, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return string URL des Streams + */ + public function Get_URLLiveStream($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + $url = 'http://'.$this->username.':'.$this->password.'@'.$this->ipAddress.'/video.mjpg.cgi'; + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $url .= ''; // Not supported + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $url .= ''; // Not supported + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $url .= ''; // Not supported + break; + default: + trigger_error('Unknown Size '.$size); + } + return $url; + } + + /** + * @public + * + * Liefert URL des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return string URL des Bildes + */ + public function Get_URLPicture($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + $url = 'http://'.$this->username.':'.$this->password.'@'.$this->ipAddress.'/image.jpg'; + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $url .= ''; // Not supported + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $url .= ''; // Not supported + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $url .= ''; // Not supported + break; + default: + trigger_error('Unknown Size '.$size); + } + return $url; + } + + /** + * @public + * + * Bewegen der Kamera + * + * @param integer $urlType Type der URL die geliefert werden soll. + * mögliche Werte: IPSCOMPONENTCAM_URL_MOVEHOME + IPSCOMPONENTCAM_URL_MOVELEFT + IPSCOMPONENTCAM_URL_MOVERIGHT + IPSCOMPONENTCAM_URL_MOVEUP + IPSCOMPONENTCAM_URL_MOVEDOWN + IPSCOMPONENTCAM_URL_PREDEFPOS1 + IPSCOMPONENTCAM_URL_PREDEFPOS2 + IPSCOMPONENTCAM_URL_PREDEFPOS3 + IPSCOMPONENTCAM_URL_PREDEFPOS4 + IPSCOMPONENTCAM_URL_PREDEFPOS5 + */ + public function Get_URL($urlType) { + $url = ''; + switch ($urlType) { + case IPSCOMPONENTCAM_URL_MOVELEFT: + case IPSCOMPONENTCAM_URL_MOVERIGHT: + case IPSCOMPONENTCAM_URL_MOVEUP: + case IPSCOMPONENTCAM_URL_MOVEDOWN: + case IPSCOMPONENTCAM_URL_MOVEHOME: + case IPSCOMPONENTCAM_URL_PREDEFPOS1: + case IPSCOMPONENTCAM_URL_PREDEFPOS2: + case IPSCOMPONENTCAM_URL_PREDEFPOS3: + case IPSCOMPONENTCAM_URL_PREDEFPOS4: + case IPSCOMPONENTCAM_URL_PREDEFPOS5: + $url = $url.''; // Not supported + break; + default: + trigger_error('Diese Funktion ist für eine Abus Kamera noch NICHT implementiert !!!'); + } + return $url; + } + + /** + * @public + * + * Liefert Breite des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return integer Breite des Bildes in Pixel + */ + public function Get_Width($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $return = 320; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $return = 640; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $return = 1024; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $return; + } + + /** + * @public + * + * Liefert Höhe des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return integer Höhe des Bildes in Pixel + */ + public function Get_Height($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $return = 240; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $return = 480; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $return = 768; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $return; + } + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Allnet.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Allnet.class.php new file mode 100644 index 0000000..234bb76 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Allnet.class.php @@ -0,0 +1,245 @@ + + */ + + IPSUtils_Include ('IPSComponentCam.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentCam'); + + class IPSComponentCam_Allnet extends IPSComponentCam { + + private $ipAddress; + private $username; + private $password; + + /** + * @public + * + * Initialisierung eines IPSComponentCam_Allnet Objektes + * + * @param string $ipAddress IP Adresse der Kamera + * @param string $username Username für Kamera Zugriff + * @param string $password Passwort für Kamera Zugriff + */ + public function __construct($ipAddress, $username, $password) { + $this->ipAddress = $ipAddress; + $this->username = $username; + $this->password = $password; + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleCam $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleCam $module) { + $name = IPS_GetName($variable); + throw new IPSComponentException('Event Handling NOT supported for Variable '.$variable.'('.$name.')'); + } + + /** + * @public + * + * Liefert URL des Kamera Live Streams + * + * @param integer $size Größe des Streams, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return string URL des Streams + */ + public function Get_URLLiveStream($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + $url = 'http://'.$this->username.':'.$this->password.'@'.$this->ipAddress.'/cgi/mjpg/mjpg.cgi'; + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $url .= ''; // Not supported + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $url .= ''; // Not supported + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $url .= ''; // Not supported + break; + default: + trigger_error('Unknown Size '.$size); + } + return $url; + } + + /** + * @public + * + * Liefert URL des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return string URL des Bildes + */ + public function Get_URLPicture($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + $url = 'http://'.$this->username.':'.$this->password.'@'.$this->ipAddress.'/cgi/jpg/image.cgi'; + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $url .= ''; // Not supported + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $url .= ''; // Not supported + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $url .= ''; // Not supported + break; + default: + trigger_error('Unknown Size '.$size); + } + return $url; + } + + /** + * @public + * + * Bewegen der Kamera + * + * @param integer $urlType Type der URL die geliefert werden soll. + * mögliche Werte: IPSCOMPONENTCAM_URL_MOVEHOME + IPSCOMPONENTCAM_URL_MOVELEFT + IPSCOMPONENTCAM_URL_MOVERIGHT + IPSCOMPONENTCAM_URL_MOVEUP + IPSCOMPONENTCAM_URL_MOVEDOWN + IPSCOMPONENTCAM_URL_PREDEFPOS1 + IPSCOMPONENTCAM_URL_PREDEFPOS2 + IPSCOMPONENTCAM_URL_PREDEFPOS3 + IPSCOMPONENTCAM_URL_PREDEFPOS4 + IPSCOMPONENTCAM_URL_PREDEFPOS5 + */ + public function Get_URL($urlType) { + $url = 'http://'.$this->username.':'.$this->password.'@'.$this->ipAddress.'/admin/ptctl.cgi?move=p1-p8?'; + switch ($urlType) { + case IPSCOMPONENTCAM_URL_MOVELEFT: + case IPSCOMPONENTCAM_URL_MOVERIGHT: + case IPSCOMPONENTCAM_URL_MOVEUP: + case IPSCOMPONENTCAM_URL_MOVEDOWN: + case IPSCOMPONENTCAM_URL_MOVEHOME: + $url = $url.''; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS1: + $url = $url.'move=p1'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS2: + $url = $url.'move=p2'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS3: + $url = $url.'move=p3'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS4: + $url = $url.'move=p4'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS5: + $url = $url.'move=p5'; + break; + default: + trigger_error('Diese Funktion ist für eine Allnet Kamera noch NICHT implementiert !!!'); + } + return $url; + } + + /** + * @public + * + * Liefert Breite des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return integer Breite des Bildes in Pixel + */ + public function Get_Width($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $return = 320; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $return = 640; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $return = 1024; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $return; + } + + /** + * @public + * + * Liefert Höhe des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return integer Höhe des Bildes in Pixel + */ + public function Get_Height($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $return = 240; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $return = 480; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $return = 768; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $return; + } + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Android.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Android.class.php new file mode 100644 index 0000000..0a0413b --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Android.class.php @@ -0,0 +1,238 @@ + + */ + + IPSUtils_Include ('IPSComponentCam.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentCam'); + + class IPSComponentCam_Android extends IPSComponentCam { + + private $ipAddress; + private $username; + private $password; + private $port; + + /** + * @public + * + * Initialisierung eines IPSComponentCam_Android Objektes + * + * @param string $ipAddress IP Adresse der Kamera + * @param string $username Username für Kamera Zugriff + * @param string $password Passwort für Kamera Zugriff + * @param string $port Port für Kamera Zugriff + */ + public function __construct($ipAddress, $username, $password, $port) { + $this->ipAddress = $ipAddress; + $this->username = $username; + $this->password = $password; + $this->port = $port; + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleCam $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleCam $module) { + $name = IPS_GetName($variable); + throw new IPSComponentException('Event Handling NOT supported for Variable '.$variable.'('.$name.')'); + } + + /** + * @public + * + * Liefert URL des Kamera Live Streams + * + * @param integer $size Größe des Streams, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return string URL des Streams + */ + public function Get_URLLiveStream($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + $url = 'http://'.$this->username.':'.$this->password.'@'.$this->ipAddress.':'.$this->port.'/videofeed'; + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $url .= ''; // Not supported + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $url .= ''; // Not supported + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $url .= ''; // Not supported + break; + default: + trigger_error('Unknown Size '.$size); + } + return $url; + } + + /** + * @public + * + * Liefert URL des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return string URL des Bildes + */ + public function Get_URLPicture($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + $url = 'http://'.$this->username.':'.$this->password.'@'.$this->ipAddress.':'.$this->port.'/photoaf.jpg'; + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $url .= ''; // Not supported + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $url .= ''; // Not supported + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $url .= ''; // Not supported + break; + default: + trigger_error('Unknown Size '.$size); + } + return $url; + } + + /** + * @public + * + * Bewegen der Kamera + * + * @param integer $urlType Type der URL die geliefert werden soll. + * mögliche Werte: IPSCOMPONENTCAM_URL_MOVEHOME + IPSCOMPONENTCAM_URL_MOVELEFT + IPSCOMPONENTCAM_URL_MOVERIGHT + IPSCOMPONENTCAM_URL_MOVEUP + IPSCOMPONENTCAM_URL_MOVEDOWN + IPSCOMPONENTCAM_URL_PREDEFPOS1 + IPSCOMPONENTCAM_URL_PREDEFPOS2 + IPSCOMPONENTCAM_URL_PREDEFPOS3 + IPSCOMPONENTCAM_URL_PREDEFPOS4 + IPSCOMPONENTCAM_URL_PREDEFPOS5 + */ + public function Get_URL($urlType) { + $url = ''; + switch ($urlType) { + case IPSCOMPONENTCAM_URL_MOVELEFT: + case IPSCOMPONENTCAM_URL_MOVERIGHT: + case IPSCOMPONENTCAM_URL_MOVEUP: + case IPSCOMPONENTCAM_URL_MOVEDOWN: + case IPSCOMPONENTCAM_URL_MOVEHOME: + case IPSCOMPONENTCAM_URL_PREDEFPOS1: + case IPSCOMPONENTCAM_URL_PREDEFPOS2: + case IPSCOMPONENTCAM_URL_PREDEFPOS3: + case IPSCOMPONENTCAM_URL_PREDEFPOS4: + case IPSCOMPONENTCAM_URL_PREDEFPOS5: + $url = $url.''; // Not supported + break; + default: + trigger_error('Diese Funktion ist für eine Abus Kamera noch NICHT implementiert !!!'); + } + return $url; + } + + /** + * @public + * + * Liefert Breite des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return integer Breite des Bildes in Pixel + */ + public function Get_Width($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $return = 320; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $return = 640; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $return = 1024; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $return; + } + + /** + * @public + * + * Liefert Höhe des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return integer Höhe des Bildes in Pixel + */ + public function Get_Height($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $return = 240; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $return = 480; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $return = 768; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $return; + } + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Axis.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Axis.class.php new file mode 100644 index 0000000..11e49a1 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Axis.class.php @@ -0,0 +1,218 @@ + + */ + + IPSUtils_Include ('IPSComponentCam.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentCam'); + + class IPSComponentCam_Axis extends IPSComponentCam { + + private $ipAddress; + private $username; + private $password; + + /** + * @public + * + * Initialisierung eines IPSComponentCam_Axis Objektes + * + * @param string $ipAddress IP Adresse der Kamera + * @param string $username Username für Kamera Zugriff + * @param string $password Passwort für Kamera Zugriff + */ + public function __construct($ipAddress, $username, $password) { + $this->ipAddress = $ipAddress; + $this->username = $username; + $this->password = $password; + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleCam $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleCam $module) { + $name = IPS_GetName($variable); + throw new IPSComponentException('Event Handling NOT supported for Variable '.$variable.'('.$name.')'); + } + + /** + * @public + * + * Liefert URL des Kamera Live Streams + * + * @param integer $size Größe des Streams, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return string URL des Streams + */ + public function Get_URLLiveStream($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + $url = 'http://'.$this->username.':'.$this->password.'@'.$this->ipAddress.'/axis-cgi/mjpg/video.cgi'; + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $url .= '?resolution=320x240'; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $url .= '?resolution=640x480'; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $url .= '?resolution=640x480'; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $url; + } + + /** + * @public + * + * Liefert URL des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return string URL des Bildes + */ + public function Get_URLPicture($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + $url = 'http://'.$this->username.':'.$this->password.'@'.$this->ipAddress.'/jpg/1/image.jpg'; + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $url .= '?resolution=320x240'; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $url .= '?resolution=640x480'; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $url .= '?resolution=640x480'; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $url; + } + + /** + * @public + * + * Bewegen der Kamera + * + * @param integer $urlType Type der URL die geliefert werden soll. + * mögliche Werte: IPSCOMPONENTCAM_URL_MOVEHOME + IPSCOMPONENTCAM_URL_MOVELEFT + IPSCOMPONENTCAM_URL_MOVERIGHT + IPSCOMPONENTCAM_URL_MOVEUP + IPSCOMPONENTCAM_URL_MOVEDOWN + IPSCOMPONENTCAM_URL_PREDEFPOS1 + IPSCOMPONENTCAM_URL_PREDEFPOS2 + IPSCOMPONENTCAM_URL_PREDEFPOS3 + IPSCOMPONENTCAM_URL_PREDEFPOS4 + IPSCOMPONENTCAM_URL_PREDEFPOS5 + */ + public function Get_URL($urlType) { + trigger_error('Diese Funktion ist für eine Axis Kamera noch NICHT implementiert !!!'); + } + + /** + * @public + * + * Liefert Breite des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return integer Breite des Bildes in Pixel + */ + public function Get_Width($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $return = 320; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $return = 640; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $return = 1024; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $return; + } + + /** + * @public + * + * Liefert Höhe des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return integer Höhe des Bildes in Pixel + */ + public function Get_Height($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $return = 240; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $return = 480; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $return = 768; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $return; + } + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_AxisM7001.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_AxisM7001.class.php new file mode 100644 index 0000000..061e797 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_AxisM7001.class.php @@ -0,0 +1,219 @@ + + */ + + IPSUtils_Include ('IPSComponentCam.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentCam'); + + class IPSComponentCam_AxisM7001 extends IPSComponentCam { + + private $ipAddress; + private $username; + private $password; + + /** + * @public + * + * Initialisierung eines IPSComponentCam_AxisM7001 Objektes + * + * @param string $ipAddress IP Adresse der Kamera + * @param string $username Username für Kamera Zugriff + * @param string $password Passwort für Kamera Zugriff + */ + public function __construct($ipAddress, $username, $password) { + $this->ipAddress = $ipAddress; + $this->username = $username; + $this->password = $password; + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleCam $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleCam $module) { + $name = IPS_GetName($variable); + throw new IPSComponentException('Event Handling NOT supported for Variable '.$variable.'('.$name.')'); + } + + /** + * @public + * + * Liefert URL des Kamera Live Streams + * + * @param integer $size Größe des Streams, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return string URL des Streams + */ + public function Get_URLLiveStream($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + $url = 'http://'.$this->username.':'.$this->password.'@'.$this->ipAddress.'/axis-cgi/mjpg/video.cgi'; + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $url .= '?resolution=CIF'; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $url .= '?resolution=4CIF'; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $url .= '?resolution=D1'; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $url; + } + + /** + * @public + * + * Liefert URL des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return string URL des Bildes + */ +//http://video-m7001.narwald-home.de/axis-cgi/jpg/image.cgi?resolution=D1&clock=0&date=0&text=0&nocache=1370185453237&camera=1 + public function Get_URLPicture($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + $url = 'http://'.$this->username.':'.$this->password.'@'.$this->ipAddress.'/axis-cgi/jpg/image.cgi'; + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $url .= '?resolution=176x144'; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $url .= '?resolution=352x288'; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $url .= '?resolution=720x576'; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $url; + } + + /** + * @public + * + * Bewegen der Kamera + * + * @param integer $urlType Type der URL die geliefert werden soll. + * mögliche Werte: IPSCOMPONENTCAM_URL_MOVEHOME + IPSCOMPONENTCAM_URL_MOVELEFT + IPSCOMPONENTCAM_URL_MOVERIGHT + IPSCOMPONENTCAM_URL_MOVEUP + IPSCOMPONENTCAM_URL_MOVEDOWN + IPSCOMPONENTCAM_URL_PREDEFPOS1 + IPSCOMPONENTCAM_URL_PREDEFPOS2 + IPSCOMPONENTCAM_URL_PREDEFPOS3 + IPSCOMPONENTCAM_URL_PREDEFPOS4 + IPSCOMPONENTCAM_URL_PREDEFPOS5 + */ + public function Get_URL($urlType) { + trigger_error('Diese Funktion ist für eine Axis Kamera noch NICHT implementiert !!!'); + } + + /** + * @public + * + * Liefert Breite des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return integer Breite des Bildes in Pixel + */ + public function Get_Width($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $return = 320; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $return = 640; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $return = 1024; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $return; + } + + /** + * @public + * + * Liefert Höhe des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return integer Höhe des Bildes in Pixel + */ + public function Get_Height($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $return = 240; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $return = 480; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $return = 768; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $return; + } + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Cisco.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Cisco.class.php new file mode 100644 index 0000000..2e8828a --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Cisco.class.php @@ -0,0 +1,222 @@ + + */ + + IPSUtils_Include ('IPSComponentCam.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentCam'); + + class IPSComponentCam_Cisco extends IPSComponentCam { + + private $ipAddress; + private $username; + private $password; + + /** + * @public + * + * Initialisierung eines IPSComponentCam_Cisco Objektes + * + * @param string $ipAddress IP Adresse der Kamera + * @param string $username Username für Kamera Zugriff + * @param string $password Passwort für Kamera Zugriff + */ + public function __construct($ipAddress, $username, $password) { + $this->ipAddress = $ipAddress; + $this->username = $username; + $this->password = $password; + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleCam $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleCam $module) { + $name = IPS_GetName($variable); + throw new IPSComponentException('Event Handling NOT supported for Variable '.$variable.'('.$name.')'); + } + + /** + * @public + * + * Liefert URL des Kamera Live Streams + * + * @param integer $size Größe des Streams, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return string URL des Streams + */ + public function Get_URLLiveStream($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + $url = 'http://'.$this->username.':'.$this->password.'@'.$this->ipAddress.'/img/mjpeg.cgi'; + + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $url .= '?size=1&framerate=30'; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $url .= '?size=2&framerate=30'; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $url .= '?size=3&framerate=30'; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $url; + } + + /** + * @public + * + * Liefert URL des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return string URL des Bildes + */ + public function Get_URLPicture($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + $url = 'http://'.$this->username.':'.$this->password.'@'.$this->ipAddress.'/img/snapshot.cgi'; + + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $url .= '?size=1&quality=3'; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $url .= '?size=2&quality=3'; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $url .= '?size=3&quality=3'; + break; + default: + trigger_error('Unknown Size '.$size); + } + + return $url; + } + + /** + * @public + * + * Bewegen der Kamera + * + * @param integer $urlType Type der URL die geliefert werden soll. + * mögliche Werte: IPSCOMPONENTCAM_URL_MOVEHOME + IPSCOMPONENTCAM_URL_MOVELEFT + IPSCOMPONENTCAM_URL_MOVERIGHT + IPSCOMPONENTCAM_URL_MOVEUP + IPSCOMPONENTCAM_URL_MOVEDOWN + IPSCOMPONENTCAM_URL_PREDEFPOS1 + IPSCOMPONENTCAM_URL_PREDEFPOS2 + IPSCOMPONENTCAM_URL_PREDEFPOS3 + IPSCOMPONENTCAM_URL_PREDEFPOS4 + IPSCOMPONENTCAM_URL_PREDEFPOS5 + */ + public function Get_URL($urlType) { + trigger_error('Diese Funktion ist für eine Cisco Kamera noch NICHT implementiert !!!'); + } + + /** + * @public + * + * Liefert Breite des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return integer Breite des Bildes in Pixel + */ + public function Get_Width($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $return = 160; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $return = 320; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $return = 640; + break; + + default: + trigger_error('Unknown Size '.$size); + } + return $return; + } + + /** + * @public + * + * Liefert Höhe des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return integer Höhe des Bildes in Pixel + */ + public function Get_Height($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $return = 120; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $return = 240; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $return = 480; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $return; + } + } + + /** @}*/ +?> diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_DLink.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_DLink.class.php new file mode 100644 index 0000000..b79e395 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_DLink.class.php @@ -0,0 +1,235 @@ + + */ + + IPSUtils_Include ('IPSComponentCam.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentCam'); + + class IPSComponentCam_DLink extends IPSComponentCam { + + private $ipAddress; + private $username; + private $password; + + /** + * @public + * + * Initialisierung eines IPSComponentCam_DLink Objektes + * + * @param string $ipAddress IP Adresse der Kamera + * @param string $username Username für Kamera Zugriff + * @param string $password Passwort für Kamera Zugriff + */ + public function __construct($ipAddress, $username, $password) { + $this->ipAddress = $ipAddress; + $this->username = $username; + $this->password = $password; + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleCam $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleCam $module) { + $name = IPS_GetName($variable); + throw new IPSComponentException('Event Handling NOT supported for Variable '.$variable.'('.$name.')'); + } + + /** + * @public + * + * Liefert URL des Kamera Live Streams + * + * @param integer $size Größe des Streams, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return string URL des Streams + */ + public function Get_URLLiveStream($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + $url = 'http://'.$this->username.':'.$this->password.'@'.$this->ipAddress.'/MJPEG.cgi'; + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $url .= ''; // Not supported + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $url .= ''; // Not supported + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $url .= ''; // Not supported + break; + default: + trigger_error('Unknown Size '.$size); + } + return $url; + } + + /** + * @public + * + * Liefert URL des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return string URL des Bildes + */ + public function Get_URLPicture($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + $url = 'http://'.$this->username.':'.$this->password.'@'.$this->ipAddress.'/image.jpg'; + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $url .= ''; // Not supported + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $url .= ''; // Not supported + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $url .= ''; // Not supported + break; + default: + trigger_error('Unknown Size '.$size); + } + return $url; + } + + /** + * @public + * + * Bewegen der Kamera + * + * @param integer $urlType Type der URL die geliefert werden soll. + * mögliche Werte: IPSCOMPONENTCAM_URL_MOVEHOME + IPSCOMPONENTCAM_URL_MOVELEFT + IPSCOMPONENTCAM_URL_MOVERIGHT + IPSCOMPONENTCAM_URL_MOVEUP + IPSCOMPONENTCAM_URL_MOVEDOWN + IPSCOMPONENTCAM_URL_PREDEFPOS1 + IPSCOMPONENTCAM_URL_PREDEFPOS2 + IPSCOMPONENTCAM_URL_PREDEFPOS3 + IPSCOMPONENTCAM_URL_PREDEFPOS4 + IPSCOMPONENTCAM_URL_PREDEFPOS5 + */ + public function Get_URL($urlType) { + $url = ''; + switch ($urlType) { + case IPSCOMPONENTCAM_URL_MOVELEFT: + case IPSCOMPONENTCAM_URL_MOVERIGHT: + case IPSCOMPONENTCAM_URL_MOVEUP: + case IPSCOMPONENTCAM_URL_MOVEDOWN: + case IPSCOMPONENTCAM_URL_MOVEHOME: + case IPSCOMPONENTCAM_URL_PREDEFPOS1: + case IPSCOMPONENTCAM_URL_PREDEFPOS2: + case IPSCOMPONENTCAM_URL_PREDEFPOS3: + case IPSCOMPONENTCAM_URL_PREDEFPOS4: + case IPSCOMPONENTCAM_URL_PREDEFPOS5: + $url = $url.''; // Not supported + break; + default: + trigger_error('Diese Funktion ist für eine DLink Kamera noch NICHT implementiert !!!'); + } + return $url; + } + + /** + * @public + * + * Liefert Breite des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return integer Breite des Bildes in Pixel + */ + public function Get_Width($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $return = 320; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $return = 640; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $return = 1024; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $return; + } + + /** + * @public + * + * Liefert Höhe des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return integer Höhe des Bildes in Pixel + */ + public function Get_Height($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $return = 240; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $return = 480; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $return = 768; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $return; + } + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_DLink932.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_DLink932.class.php new file mode 100644 index 0000000..9960add --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_DLink932.class.php @@ -0,0 +1,235 @@ + + */ + + IPSUtils_Include ('IPSComponentCam.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentCam'); + + class IPSComponentCam_DLink932 extends IPSComponentCam { + + private $ipAddress; + private $username; + private $password; + + /** + * @public + * + * Initialisierung eines IPSComponentCam_DLink932 Objektes + * + * @param string $ipAddress IP Adresse der Kamera + * @param string $username Username für Kamera Zugriff + * @param string $password Passwort für Kamera Zugriff + */ + public function __construct($ipAddress, $username, $password) { + $this->ipAddress = $ipAddress; + $this->username = $username; + $this->password = $password; + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleCam $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleCam $module) { + $name = IPS_GetName($variable); + throw new IPSComponentException('Event Handling NOT supported for Variable '.$variable.'('.$name.')'); + } + + /** + * @public + * + * Liefert URL des Kamera Live Streams + * + * @param integer $size Größe des Streams, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return string URL des Streams + */ + public function Get_URLLiveStream($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + $url = 'http://'.$this->ipAddress.'/MJPEG.cgi?user='.$this->username.'&password='.$this->password; + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $url .= ''; // Not supported + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $url .= ''; // Not supported + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $url .= ''; // Not supported + break; + default: + trigger_error('Unknown Size '.$size); + } + return $url; + } + + /** + * @public + * + * Liefert URL des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return string URL des Bildes + */ + public function Get_URLPicture($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + $url = 'http://'.$this->ipAddress.'/image/jpeg.cgi?user='.$this->username.'&password='.$this->password; + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $url .= ''; // Not supported + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $url .= ''; // Not supported + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $url .= ''; // Not supported + break; + default: + trigger_error('Unknown Size '.$size); + } + return $url; + } + + /** + * @public + * + * Bewegen der Kamera + * + * @param integer $urlType Type der URL die geliefert werden soll. + * mögliche Werte: IPSCOMPONENTCAM_URL_MOVEHOME + IPSCOMPONENTCAM_URL_MOVELEFT + IPSCOMPONENTCAM_URL_MOVERIGHT + IPSCOMPONENTCAM_URL_MOVEUP + IPSCOMPONENTCAM_URL_MOVEDOWN + IPSCOMPONENTCAM_URL_PREDEFPOS1 + IPSCOMPONENTCAM_URL_PREDEFPOS2 + IPSCOMPONENTCAM_URL_PREDEFPOS3 + IPSCOMPONENTCAM_URL_PREDEFPOS4 + IPSCOMPONENTCAM_URL_PREDEFPOS5 + */ + public function Get_URL($urlType) { + $url = ''; + switch ($urlType) { + case IPSCOMPONENTCAM_URL_MOVELEFT: + case IPSCOMPONENTCAM_URL_MOVERIGHT: + case IPSCOMPONENTCAM_URL_MOVEUP: + case IPSCOMPONENTCAM_URL_MOVEDOWN: + case IPSCOMPONENTCAM_URL_MOVEHOME: + case IPSCOMPONENTCAM_URL_PREDEFPOS1: + case IPSCOMPONENTCAM_URL_PREDEFPOS2: + case IPSCOMPONENTCAM_URL_PREDEFPOS3: + case IPSCOMPONENTCAM_URL_PREDEFPOS4: + case IPSCOMPONENTCAM_URL_PREDEFPOS5: + $url = $url.''; // Not supported + break; + default: + trigger_error('Diese Funktion ist für eine DLink932 Kamera noch NICHT implementiert !!!'); + } + return $url; + } + + /** + * @public + * + * Liefert Breite des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return integer Breite des Bildes in Pixel + */ + public function Get_Width($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $return = 320; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $return = 640; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $return = 1024; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $return; + } + + /** + * @public + * + * Liefert Höhe des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return integer Höhe des Bildes in Pixel + */ + public function Get_Height($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $return = 240; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $return = 480; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $return = 768; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $return; + } + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Edimax.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Edimax.class.php new file mode 100644 index 0000000..31156fa --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Edimax.class.php @@ -0,0 +1,253 @@ + + */ + + IPSUtils_Include ('IPSComponentCam.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentCam'); + + class IPSComponentCam_Edimax extends IPSComponentCam { + + private $ipAddress; + private $username; + private $password; + + /** + * @public + * + * Initialisierung eines IPSComponentCam_Edimax Objektes + * + * @param string $ipAddress IP Adresse der Kamera + * @param string $username Username für Kamera Zugriff + * @param string $password Passwort für Kamera Zugriff + */ + public function __construct($ipAddress, $username, $password) { + $this->ipAddress = $ipAddress; + $this->username = $username; + $this->password = $password; + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleCam $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleCam $module) { + $name = IPS_GetName($variable); + throw new IPSComponentException('Event Handling NOT supported for Variable '.$variable.'('.$name.')'); + } + + /** + * @public + * + * Liefert URL des Kamera Live Streams + * + * @param integer $size Größe des Streams, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return string URL des Streams + */ + public function Get_URLLiveStream($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + $url = 'http://'.$this->username.':'.$this->password.'@'.$this->ipAddress.'/snapshot.cgi'; + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $url .= '?resolution=320x240'; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $url .= '?resolution=640x480'; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $url .= '?resolution=1024x768'; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $url; + } + + /** + * @public + * + * Liefert URL des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return string URL des Bildes + */ + public function Get_URLPicture($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + $url = 'http://'.$this->username.':'.$this->password.'@'.$this->ipAddress.'/snapshot.jpg'; + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $url .= '?resolution=320x240'; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $url .= '?resolution=640x480'; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $url .= '?resolution=1024x768'; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $url; + } + + /** + * @public + * + * Bewegen der Kamera + * + * @param integer $urlType Type der URL die geliefert werden soll. + * mögliche Werte: IPSCOMPONENTCAM_URL_MOVEHOME + IPSCOMPONENTCAM_URL_MOVELEFT + IPSCOMPONENTCAM_URL_MOVERIGHT + IPSCOMPONENTCAM_URL_MOVEUP + IPSCOMPONENTCAM_URL_MOVEDOWN + IPSCOMPONENTCAM_URL_PREDEFPOS1 + IPSCOMPONENTCAM_URL_PREDEFPOS2 + IPSCOMPONENTCAM_URL_PREDEFPOS3 + IPSCOMPONENTCAM_URL_PREDEFPOS4 + IPSCOMPONENTCAM_URL_PREDEFPOS5 + */ + public function Get_URL($urlType) { + $url = 'http://'.$this->username.':'.$this->password.'@'.$this->ipAddress.'/camera-cgi/com/ptz.cgi?'; + switch ($urlType) { + case IPSCOMPONENTCAM_URL_MOVELEFT: + $url = $url.'move=left'; + break; + case IPSCOMPONENTCAM_URL_MOVERIGHT: + $url = $url.'move=right'; + break; + case IPSCOMPONENTCAM_URL_MOVEUP: + $url = $url.'move=up'; + break; + case IPSCOMPONENTCAM_URL_MOVEDOWN: + $url = $url.'move=down'; + break; + case IPSCOMPONENTCAM_URL_MOVEHOME: + $url = $url.'move=center'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS1: + $url = $url.'gotoserverpresetIndex=0'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS2: + $url = $url.'gotoserverpresetIndex=1'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS3: + $url = $url.'gotoserverpresetIndex=2'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS4: + $url = $url.'gotoserverpresetIndex=3'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS5: + $url = $url.'gotoserverpresetIndex=4'; + break; + default: + trigger_error('Diese Funktion ist für eine Edimax Kamera noch NICHT implementiert !!!'); + } + return $url; + } + + /** + * @public + * + * Liefert Breite des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return integer Breite des Bildes in Pixel + */ + public function Get_Width($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $return = 320; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $return = 640; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $return = 1024; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $return; + } + + /** + * @public + * + * Liefert Höhe des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return integer Höhe des Bildes in Pixel + */ + public function Get_Height($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $return = 240; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $return = 480; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $return = 768; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $return; + } + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Foscam.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Foscam.class.php new file mode 100644 index 0000000..0a55e33 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Foscam.class.php @@ -0,0 +1,261 @@ + + */ + + IPSUtils_Include ('IPSComponentCam.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentCam'); + + class IPSComponentCam_Foscam extends IPSComponentCam { + + private $ipAddress; + private $username; + private $password; + + /** + * @public + * + * Initialisierung eines IPSComponentCam_Foscam Objektes + * + * @param string $ipAddress IP Adresse der Kamera + * @param string $username Username für Kamera Zugriff + * @param string $password Passwort für Kamera Zugriff + */ + public function __construct($ipAddress, $username, $password) { + $this->ipAddress = $ipAddress; + $this->username = $username; + $this->password = $password; + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleCam $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleCam $module) { + $name = IPS_GetName($variable); + throw new IPSComponentException('Event Handling NOT supported for Variable '.$variable.'('.$name.')'); + } + + /** + * @public + * + * Liefert URL des Kamera Live Streams + * + * @param integer $size Größe des Streams, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return string URL des Streams + */ + public function Get_URLLiveStream($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + $url = 'http://'.$this->ipAddress.'/cgi-bin/CGIStream.cgi?cmd=GetMJStream&usr='.$this->username.'&pwd='.$this->password; + + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $url .= '&resolution=0'; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $url .= '&resolution=0'; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $url .= '&resolution=0'; + break; + + default: + trigger_error('Unknown Size '.$size); + } + return $url; + } + + /** + * @public + * + * Liefert URL des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return string URL des Bildes + */ + public function Get_URLPicture($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + + $url = 'http://'.$this->ipAddress.'/cgi-bin/CGIProxy.fcgi?cmd=snapPicture2&usr='.$this->username.'&pwd='.$this->password; + /* + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $url .= '?resolution=320x240'; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $url .= '?resolution=640x480'; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $url .= '?resolution=640x480'; + break; + default: + trigger_error('Unknown Size '.$size); + } + */ + IPS_LogMessage ("...",$url); + return $url; + } + + /** + * @public + * + * Bewegen der Kamera + * + * @param integer $urlType Type der URL die geliefert werden soll. + * mögliche Werte: IPSCOMPONENTCAM_URL_MOVEHOME + IPSCOMPONENTCAM_URL_MOVELEFT + IPSCOMPONENTCAM_URL_MOVERIGHT + IPSCOMPONENTCAM_URL_MOVEUP + IPSCOMPONENTCAM_URL_MOVEDOWN + IPSCOMPONENTCAM_URL_PREDEFPOS1 + IPSCOMPONENTCAM_URL_PREDEFPOS2 + IPSCOMPONENTCAM_URL_PREDEFPOS3 + IPSCOMPONENTCAM_URL_PREDEFPOS4 + IPSCOMPONENTCAM_URL_PREDEFPOS5 + */ + public function Get_URL($urlType) { + $url = 'http://'.$this->ipAddress.'/cgi-bin/CGIProxy.fcgi?'; + + + switch ($urlType) { + case IPSCOMPONENTCAM_URL_MOVELEFT: + $url = 'cmd=ptzMoveLeft'; + break; + case IPSCOMPONENTCAM_URL_MOVERIGHT: + $url = 'cmd=ptzMoveRight'; + break; + case IPSCOMPONENTCAM_URL_MOVEUP: + $url = 'cmd=ptzMoveUp'; + break; + case IPSCOMPONENTCAM_URL_MOVEDOWN: + $url = 'cmd=ptzMoveDown'; + break; + case IPSCOMPONENTCAM_URL_STOP: + $url = 'cmd=ptzStopRun'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS1: + $url = 'cmd=ptzGotoPresetPoint'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS2: + $url = 'cmd=ptzGotoPresetPoint'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS3: + $url = 'cmd=ptzGotoPresetPoint'; + + + default: + trigger_error('Diese Funktion ist für eine Foscam Kamera noch NICHT implementiert !!!'); + } + + $url = $url. '&user='.$this->username.'&pwd='.$this->password ; + IPS_LogMessage ("...",$url); + return $url; + + } + + /** + * @public + * + * Liefert Breite des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return integer Breite des Bildes in Pixel + */ + public function Get_Width($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $return = 320; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $return = 320; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $return = 640; + break; + + default: + trigger_error('Unknown Size '.$size); + } + return $return; + } + + /** + * @public + * + * Liefert Höhe des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return integer Höhe des Bildes in Pixel + */ + public function Get_Height($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $return = 240; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $return = 240; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $return = 480; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $return; + } + } + + /** @}*/ +?> diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Foscam89x.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Foscam89x.class.php new file mode 100644 index 0000000..4979660 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Foscam89x.class.php @@ -0,0 +1,262 @@ + + */ + + IPSUtils_Include ('IPSComponentCam.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentCam'); + + class IPSComponentCam_Foscam89x extends IPSComponentCam { + + private $ipAddress; + private $username; + private $password; + + /** + * @public + * + * Initialisierung eines IPSComponentCam_Foscam89x Objektes + * + * @param string $ipAddress IP Adresse der Kamera + * @param string $username Username für Kamera Zugriff + * @param string $password Passwort für Kamera Zugriff + */ + public function __construct($ipAddress, $username, $password) { + $this->ipAddress = $ipAddress; + $this->username = $username; + $this->password = $password; + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleCam $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleCam $module) { + $name = IPS_GetName($variable); + throw new IPSComponentException('Event Handling NOT supported for Variable '.$variable.'('.$name.')'); + } + + /** + * @public + * + * Liefert URL des Kamera Live Streams + * + * @param integer $size Größe des Streams, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return string URL des Streams + */ + public function Get_URLLiveStream($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + $url = 'http://'.$this->ipAddress.'/videostream.cgi?user='.$this->username.'&pwd='.$this->password; + + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $url .= '&resolution=8&rate=0'; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $url .= '&resolution=8&rate=0'; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $url .= '&resolution=32&rate=0'; + break; + + default: + trigger_error('Unknown Size '.$size); + } + return $url; + } + + /** + * @public + * + * Liefert URL des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return string URL des Bildes + */ + public function Get_URLPicture($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + + $url = 'http://'.$this->ipAddress.'/snapshot.jpg?user='.$this->username.'&pwd='.$this->password; + + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $url .= '&resolution=8&rate=0'; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $url .= '&resolution=8&rate=0'; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $url .= '&resolution=32&rate=0'; + break; + + default: + trigger_error('Unknown Size '.$size); + } + return $url; + } + + /** + * @public + * + * Bewegen der Kamera + * + * @param integer $urlType Type der URL die geliefert werden soll. + * mögliche Werte: IPSCOMPONENTCAM_URL_MOVEHOME + IPSCOMPONENTCAM_URL_MOVELEFT + IPSCOMPONENTCAM_URL_MOVERIGHT + IPSCOMPONENTCAM_URL_MOVEUP + IPSCOMPONENTCAM_URL_MOVEDOWN + IPSCOMPONENTCAM_URL_PREDEFPOS1 + IPSCOMPONENTCAM_URL_PREDEFPOS2 + IPSCOMPONENTCAM_URL_PREDEFPOS3 + IPSCOMPONENTCAM_URL_PREDEFPOS4 + IPSCOMPONENTCAM_URL_PREDEFPOS5 + */ + public function Get_URL($urlType) { + $url = 'http://'.$this->ipAddress.'/decoder_control.cgi?user='.$this->username.'&pwd='.$this->password; + + switch ($urlType) { + case IPSCOMPONENTCAM_URL_MOVELEFT: + $url = $url.'command=4'; + break; + case IPSCOMPONENTCAM_URL_MOVERIGHT: + $url = $url.'command=6'; + break; + case IPSCOMPONENTCAM_URL_MOVEUP: + $url = $url.'command=0'; + break; + case IPSCOMPONENTCAM_URL_MOVEDOWN: + $url = $url.'command=2'; + break; + case IPSCOMPONENTCAM_URL_MOVEHOME: + $url = $url.'command=1'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS1: + $url = $url.'command=31'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS2: + $url = $url.'command=33'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS3: + $url = $url.'command=35'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS4: + $url = $url.'command=37'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS5: + $url = $url.'command=37'; + break; + default: + trigger_error('Diese Funktion ist für eine Foxcam Kamera noch NICHT implementiert !!!'); + } + + return $url; + + } + + /** + * @public + * + * Liefert Breite des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return integer Breite des Bildes in Pixel + */ + public function Get_Width($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $return = 320; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $return = 320; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $return = 640; + break; + + default: + trigger_error('Unknown Size '.$size); + } + return $return; + } + + /** + * @public + * + * Liefert Höhe des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return integer Höhe des Bildes in Pixel + */ + public function Get_Height($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $return = 240; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $return = 240; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $return = 480; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $return; + } + } + + /** @}*/ +?> diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Instar.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Instar.class.php new file mode 100644 index 0000000..d53c7d7 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Instar.class.php @@ -0,0 +1,296 @@ + + */ + + IPSUtils_Include ('IPSComponentCam.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentCam'); + + class IPSComponentCam_Instar extends IPSComponentCam { + + private $ipAddress; + private $username; + private $password; + + /** + * @public + * + * Initialisierung eines IPSComponentCam_Instar Objektes + * + * @param string $ipAddress IP Adresse der Kamera + * @param string $username Username für Kamera Zugriff + * @param string $password Passwort für Kamera Zugriff + */ + public function __construct($ipAddress, $username, $password) { + $this->ipAddress = $ipAddress; + $this->username = $username; + $this->password = $password; + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleCam $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleCam $module) { + $name = IPS_GetName($variable); + throw new IPSComponentException('Event Handling NOT supported for Variable '.$variable.'('.$name.')'); + } + + /** + * @public + * + * Liefert URL des Kamera Live Streams + * + * @param integer $size Größe des Streams, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return string URL des Streams + */ + public function Get_URLLiveStream($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + $url = 'http://'.$this->ipAddress.'/videostream.cgi?user='.$this->username.'&pwd='.$this->password; + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $url .= '&resolution=8'; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $url .= '&resolution=8'; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $url .= '&resolution=32'; + break; + + default: + trigger_error('Unknown Size '.$size); + } IPS_LogMessage ("...",$url); + return $url; + } + + /** + * @public + * + * Liefert URL des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return string URL des Bildes + */ + public function Get_URLPicture($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + + $url = 'http://'.$this->ipAddress.'/snapshot.cgi?user='.$this->username.'&pwd='.$this->password.'&next_url=snapshot.jpg'; + /* + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $url .= '?resolution=320x240'; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $url .= '?resolution=640x480'; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $url .= '?resolution=640x480'; + break; + default: + trigger_error('Unknown Size '.$size); + } + */ + IPS_LogMessage ("...",$url); + return $url; + } + + /** + * @public + * + * Bewegen der Kamera + * + * @param integer $urlType Type der URL die geliefert werden soll. + * mögliche Werte: IPSCOMPONENTCAM_URL_MOVEHOME + IPSCOMPONENTCAM_URL_MOVELEFT + IPSCOMPONENTCAM_URL_MOVERIGHT + IPSCOMPONENTCAM_URL_MOVEUP + IPSCOMPONENTCAM_URL_MOVEDOWN + IPSCOMPONENTCAM_URL_PREDEFPOS1 + IPSCOMPONENTCAM_URL_PREDEFPOS2 + IPSCOMPONENTCAM_URL_PREDEFPOS3 + IPSCOMPONENTCAM_URL_PREDEFPOS4 + IPSCOMPONENTCAM_URL_PREDEFPOS5 + */ + public function Get_URL($urlType) { + $url = 'http://'.$this->ipAddress.'/decoder_control.cgi?'; + + + switch ($urlType) { + case IPSCOMPONENTCAM_URL_MOVELEFT: + $url = $url.'command=4&onestep=1'; + break; + case IPSCOMPONENTCAM_URL_MOVERIGHT: + $url = $url.'command=6&onestep=1'; + break; + case IPSCOMPONENTCAM_URL_MOVEUP: + $url = $url.'command=0&onestep=1'; + break; + case IPSCOMPONENTCAM_URL_MOVEDOWN: + $url = $url.'command=2&onestep=1'; + break; + case IPSCOMPONENTCAM_URL_MOVEHOME: + $url = $url.'command=25'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS1: + $url = $url.'command=31'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS2: + $url = $url.'command=33'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS3: + $url = $url.'command=35'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS4: + $url = $url.'command=37'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS5: + $url = $url.'command=39'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS6: + $url = $url.'command=41'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS7: + $url = $url.'command=43'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS8: + $url = $url.'command=45'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS9: + $url = $url.'command=47'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS10: + $url = $url.'command=49'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS11: + $url = $url.'command=51'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS12: + $url = $url.'command=53'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS13: + $url = $url.'command=55'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS14: + $url = $url.'command=57'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS15: + $url = $url.'command=59'; + break; + + default: + trigger_error('Diese Funktion ist für eine Instar Kamera noch NICHT implementiert !!!'); + } + + $url = $url. '&user='.$this->username.'&pwd='.$this->password ; + IPS_LogMessage ("...",$url); + return $url; + + } + + /** + * @public + * + * Liefert Breite des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return integer Breite des Bildes in Pixel + */ + public function Get_Width($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $return = 320; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $return = 320; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $return = 640; + break; + + default: + trigger_error('Unknown Size '.$size); + } + return $return; + } + + /** + * @public + * + * Liefert Höhe des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return integer Höhe des Bildes in Pixel + */ + public function Get_Height($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $return = 240; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $return = 240; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $return = 480; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $return; + } + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Mobotix.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Mobotix.class.php new file mode 100644 index 0000000..7e1ffc0 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Mobotix.class.php @@ -0,0 +1,219 @@ + + */ + + IPSUtils_Include ('IPSComponentCam.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentCam'); + + class IPSComponentCam_Mobotix extends IPSComponentCam { + + private $ipAddress; + private $username; + private $password; + + /** + * @public + * + * Initialisierung eines IPSComponentCam_Mobotix Objektes + * + * @param string $ipAddress IP Adresse der Kamera + * @param string $username Username für Kamera Zugriff + * @param string $password Passwort für Kamera Zugriff + */ + public function __construct($ipAddress, $username, $password) { + $this->ipAddress = $ipAddress; + $this->username = $username; + $this->password = $password; + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleCam $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleCam $module) { + $name = IPS_GetName($variable); + throw new IPSComponentException('Event Handling NOT supported for Variable '.$variable.'('.$name.')'); + } + + /** + * @public + * + * Liefert URL des Kamera Live Streams + * + * @param integer $size Größe des Streams, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return string URL des Streams + */ + public function Get_URLLiveStream($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + $url = 'http://'.$this->username.':'.$this->password.'@'.$this->ipAddress.'/cgi-bin/faststream.jpg'; + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $url .= '?streamid=0'; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $url .= '?streamid=1'; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $url .= '?streamid=2'; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $url; + } + + /** + * @public + * + * Liefert URL des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return string URL des Bildes + */ + public function Get_URLPicture($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + $url = 'http://'.$this->username.':'.$this->password.'@'.$this->ipAddress.'/cgi-bin/image.jpg'; + + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $url .= '?streamid=0'; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $url .= '?streamid=1'; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $url .= '?streamid=2'; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $url; + } + + /** + * @public + * + * Bewegen der Kamera + * + * @param integer $urlType Type der URL die geliefert werden soll. + * mögliche Werte: IPSCOMPONENTCAM_URL_MOVEHOME + IPSCOMPONENTCAM_URL_MOVELEFT + IPSCOMPONENTCAM_URL_MOVERIGHT + IPSCOMPONENTCAM_URL_MOVEUP + IPSCOMPONENTCAM_URL_MOVEDOWN + IPSCOMPONENTCAM_URL_PREDEFPOS1 + IPSCOMPONENTCAM_URL_PREDEFPOS2 + IPSCOMPONENTCAM_URL_PREDEFPOS3 + IPSCOMPONENTCAM_URL_PREDEFPOS4 + IPSCOMPONENTCAM_URL_PREDEFPOS5 + */ + public function Get_URL($urlType) { + trigger_error('Diese Funktion ist für eine Mobotix Kamera noch NICHT implementiert !!!'); + } + + /** + * @public + * + * Liefert Breite des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return integer Breite des Bildes in Pixel + */ + public function Get_Width($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $return = 320; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $return = 640; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $return = 1024; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $return; + } + + /** + * @public + * + * Liefert Höhe des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return integer Höhe des Bildes in Pixel + */ + public function Get_Height($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $return = 240; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $return = 400; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $return = 768; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $return; + } + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Planet.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Planet.class.php new file mode 100644 index 0000000..c8873f6 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Planet.class.php @@ -0,0 +1,245 @@ + + */ + + IPSUtils_Include ('IPSComponentCam.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentCam'); + + class IPSComponentCam_Planet extends IPSComponentCam { + + private $ipAddress; + private $username; + private $password; + + /** + * @public + * + * Initialisierung eines IPSComponentCam_Planet Objektes + * + * @param string $ipAddress IP Adresse der Kamera + * @param string $username Username für Kamera Zugriff + * @param string $password Passwort für Kamera Zugriff + */ + public function __construct($ipAddress, $username, $password) { + $this->ipAddress = $ipAddress; + $this->username = $username; + $this->password = $password; + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleCam $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleCam $module) { + $name = IPS_GetName($variable); + throw new IPSComponentException('Event Handling NOT supported for Variable '.$variable.'('.$name.')'); + } + + /** + * @public + * + * Liefert URL des Kamera Live Streams + * + * @param integer $size Größe des Streams, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return string URL des Streams + */ + public function Get_URLLiveStream($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + $url = 'http://'.$this->username.':'.$this->password.'@'.$this->ipAddress.'/GetData.cgi'; + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $url .= ''; // Not supported + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $url .= ''; // Not supported + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $url .= ''; // Not supported + break; + default: + trigger_error('Unknown Size '.$size); + } + return $url; + } + + /** + * @public + * + * Liefert URL des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return string URL des Bildes + */ + public function Get_URLPicture($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + $url = 'http://'.$this->username.':'.$this->password.'@'.$this->ipAddress.'/GetImage.cgi'; + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $url .= ''; // Not supported + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $url .= ''; // Not supported + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $url .= ''; // Not supported + break; + default: + trigger_error('Unknown Size '.$size); + } + return $url; + } + + /** + * @public + * + * Bewegen der Kamera + * + * @param integer $urlType Type der URL die geliefert werden soll. + * mögliche Werte: IPSCOMPONENTCAM_URL_MOVEHOME + IPSCOMPONENTCAM_URL_MOVELEFT + IPSCOMPONENTCAM_URL_MOVERIGHT + IPSCOMPONENTCAM_URL_MOVEUP + IPSCOMPONENTCAM_URL_MOVEDOWN + IPSCOMPONENTCAM_URL_PREDEFPOS1 + IPSCOMPONENTCAM_URL_PREDEFPOS2 + IPSCOMPONENTCAM_URL_PREDEFPOS3 + IPSCOMPONENTCAM_URL_PREDEFPOS4 + IPSCOMPONENTCAM_URL_PREDEFPOS5 + */ + public function Get_URL($urlType) { + $url = 'http://'.$this->username.':'.$this->password.'@'.$this->ipAddress.'/admin/ptctl.cgi?move=p1-p8?'; + switch ($urlType) { + case IPSCOMPONENTCAM_URL_MOVELEFT: + case IPSCOMPONENTCAM_URL_MOVERIGHT: + case IPSCOMPONENTCAM_URL_MOVEUP: + case IPSCOMPONENTCAM_URL_MOVEDOWN: + case IPSCOMPONENTCAM_URL_MOVEHOME: + $url = $url.''; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS1: + $url = $url.'move=p1'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS2: + $url = $url.'move=p2'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS3: + $url = $url.'move=p3'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS4: + $url = $url.'move=p4'; + break; + case IPSCOMPONENTCAM_URL_PREDEFPOS5: + $url = $url.'move=p5'; + break; + default: + trigger_error('Diese Funktion ist für eine Planet Kamera noch NICHT implementiert !!!'); + } + return $url; + } + + /** + * @public + * + * Liefert Breite des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return integer Breite des Bildes in Pixel + */ + public function Get_Width($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $return = 320; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $return = 640; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $return = 1024; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $return; + } + + /** + * @public + * + * Liefert Höhe des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return integer Höhe des Bildes in Pixel + */ + public function Get_Height($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $return = 240; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $return = 480; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $return = 768; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $return; + } + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Vivotek.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Vivotek.class.php new file mode 100644 index 0000000..6a1eca1 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_Vivotek.class.php @@ -0,0 +1,225 @@ + + */ + + IPSUtils_Include ('IPSComponentCam.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentCam'); + + class IPSComponentCam_Vivotek extends IPSComponentCam { + + private $ipAddress; + private $username; + private $password; + + /** + * @public + * + * Initialisierung eines IPSComponentCam_Vivotek Objektes + * + * @param string $ipAddress IP Adresse der Kamera + * @param string $username Username für Kamera Zugriff + * @param string $password Passwort für Kamera Zugriff + */ + public function __construct($ipAddress, $username, $password) { + $this->ipAddress = $ipAddress; + $this->username = $username; + $this->password = $password; + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleCam $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleCam $module) { + $name = IPS_GetName($variable); + throw new IPSComponentException('Event Handling NOT supported for Variable '.$variable.'('.$name.')'); + } + + /** + * @public + * + * Liefert URL des Kamera Live Streams + * + * @param integer $size Größe des Streams, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return string URL des Streams + */ + public function Get_URLLiveStream($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + $url = 'http://'.$this->username.':'.$this->password.'@'.$this->ipAddress.'/video'; + switch ($size) + { + case IPSCOMPONENTCAM_SIZE_SMALL: + $url .= '3'; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $url .= '2'; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $url .= ''; + break; + default: + trigger_error('Unknown Size '.$size); + } + + $url .= '.mjpg'; + + return $url; + } + + /** + * @public + * + * Liefert URL des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return string URL des Bildes + */ + public function Get_URLPicture($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + $url = 'http://'.$this->username.':'.$this->password.'@'.$this->ipAddress.'/cgi-bin/viewer/video.jpg?resolution='; + + switch ($size) + { + case IPSCOMPONENTCAM_SIZE_SMALL: + $url .= (int)(1280*(IPSCAM_HEIGHT_SMALL/720)).'x'.IPSCAM_HEIGHT_SMALL; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $url .= (int)(1280*(IPSCAM_HEIGHT_MIDDLE/720)).'x'.IPSCAM_HEIGHT_MIDDLE; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $url .= (int)(1280*(IPSCAM_HEIGHT_LARGE/720)).'x'.IPSCAM_HEIGHT_LARGE; + break; + default: + trigger_error('Unknown Size '.$size); + } + + return $url; + } + + /** + * @public + * + * Bewegen der Kamera + * + * @param integer $urlType Type der URL die geliefert werden soll. + * mögliche Werte: IPSCOMPONENTCAM_URL_MOVEHOME + IPSCOMPONENTCAM_URL_MOVELEFT + IPSCOMPONENTCAM_URL_MOVERIGHT + IPSCOMPONENTCAM_URL_MOVEUP + IPSCOMPONENTCAM_URL_MOVEDOWN + IPSCOMPONENTCAM_URL_PREDEFPOS1 + IPSCOMPONENTCAM_URL_PREDEFPOS2 + IPSCOMPONENTCAM_URL_PREDEFPOS3 + IPSCOMPONENTCAM_URL_PREDEFPOS4 + IPSCOMPONENTCAM_URL_PREDEFPOS5 + */ + public function Get_URL($urlType) { + trigger_error('Diese Funktion ist für eine Vivotek Kamera noch NICHT implementiert !!!'); + } + + /** + * @public + * + * Liefert Breite des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return integer Breite des Bildes in Pixel + */ + public function Get_Width($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $return = 320; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $return = 640; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $return = 1024; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $return; + } + + /** + * @public + * + * Liefert Höhe des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return integer Höhe des Bildes in Pixel + */ + public function Get_Height($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $return = 240; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $return = 400; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $return = 768; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $return; + } + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_YCam.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_YCam.class.php new file mode 100644 index 0000000..0d50008 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentCam/IPSComponentCam_YCam.class.php @@ -0,0 +1,223 @@ + + */ + + IPSUtils_Include ('IPSComponentCam.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentCam'); + + class IPSComponentCam_YCam extends IPSComponentCam { + + private $ipAddress; + private $port; + private $username; + private $password; + + /** + * @public + * + * Initialisierung eines IPSComponentCam_YCam Objektes + * + * @param string $ipAddress IP Adresse der Kamera + * @param string $username Username für Kamera Zugriff + * @param string $password Passwort für Kamera Zugriff + * @param string $port Port für Kamera Zugriff + */ + public function __construct($ipAddress, $username, $password, $port=8150) { + $this->ipAddress = $ipAddress; + $this->username = $username; + $this->password = $password; + $this->port = $port; + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleCam $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleCam $module) { + $name = IPS_GetName($variable); + throw new IPSComponentException('Event Handling NOT supported for Variable '.$variable.'('.$name.')'); + } + + /** + * @public + * + * Liefert URL des Kamera Live Streams + * + * @param integer $size Größe des Streams, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return string URL des Streams + */ + public function Get_URLLiveStream($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + $url = 'http://'.$this->username.':'.$this->password.'@'.$this->ipAddress.':'.$this->port.'/stream'; + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $url .= '1'; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $url .= ''; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $url .= ''; + break; + default: + trigger_error('Unknown Size '.$size); + } + $url .= '.jpg'; + + return $url; + } + + /** + * @public + * + * Liefert URL des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return string URL des Bildes + */ + public function Get_URLPicture($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + $url = 'http://'.$this->username.':'.$this->password.'@'.$this->ipAddress.':'.$this->port.'/snapshot.jpg'; + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $url .= ''; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $url .= ''; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $url .= ''; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $url; + } + + /** + * @public + * + * Bewegen der Kamera + * + * @param integer $urlType Type der URL die geliefert werden soll. + * mögliche Werte: IPSCOMPONENTCAM_URL_MOVEHOME + IPSCOMPONENTCAM_URL_MOVELEFT + IPSCOMPONENTCAM_URL_MOVERIGHT + IPSCOMPONENTCAM_URL_MOVEUP + IPSCOMPONENTCAM_URL_MOVEDOWN + IPSCOMPONENTCAM_URL_PREDEFPOS1 + IPSCOMPONENTCAM_URL_PREDEFPOS2 + IPSCOMPONENTCAM_URL_PREDEFPOS3 + IPSCOMPONENTCAM_URL_PREDEFPOS4 + IPSCOMPONENTCAM_URL_PREDEFPOS5 + */ + public function Get_URL($urlType) { + trigger_error('Diese Funktion ist für eine YCam Kamera noch NICHT implementiert !!!'); + } + + /** + * @public + * + * Liefert Breite des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return integer Breite des Bildes in Pixel + */ + public function Get_Width($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $return = 320; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $return = 640; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $return = 1024; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $return; + } + + /** + * @public + * + * Liefert Höhe des Kamera Bildes + * + * @param integer $size Größe des Bildes, mögliche Werte: + * IPSCOMPONENTCAM_SIZE_SMALL, IPSCOMPONENTCAM_SIZE_MIDDLE oder IPSCOMPONENTCAM_SIZE_LARGE + * @return integer Höhe des Bildes in Pixel + */ + public function Get_Height($size=IPSCOMPONENTCAM_SIZE_MIDDLE) { + switch ($size) { + case IPSCOMPONENTCAM_SIZE_SMALL: + $return = 240; + break; + case IPSCOMPONENTCAM_SIZE_MIDDLE: + $return = 480; + break; + case IPSCOMPONENTCAM_SIZE_LARGE: + $return = 768; + break; + default: + trigger_error('Unknown Size '.$size); + } + return $return; + } + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer.class.php index cb01d58..a69bc03 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer.class.php @@ -18,6 +18,8 @@ * Version 2.50.1, 31.01.2012
*/ + IPSUtils_Include ('IPSComponent.class.php', 'IPSLibrary::app::core::IPSComponent'); + abstract class IPSComponentDimmer extends IPSComponent { /** diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_DMX.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_DMX.class.php new file mode 100644 index 0000000..5037087 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_DMX.class.php @@ -0,0 +1,110 @@ + + */ + + IPSUtils_Include ('IPSComponentDimmer.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentDimmer'); + + class IPSComponentDimmer_DMX extends IPSComponentDimmer { + + private $instanceId; + private $channel; + + /** + * @public + * + * Initialisierung eines IPSComponentDimmer_DMX Objektes + * + * @param integer $instanceId InstanceId des DMX Devices + */ + public function __construct($instanceId, $channel=1) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + $this->channel = (int)$channel; + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId.','.$this->channel; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleDimmer $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleDimmer $module){ + } + + /** + * @public + * + * Zustand Setzen + * + * @param integer $power Geräte Power + * @param integer $level Wert für Dimmer Einstellung (Wertebereich 0-100) + */ + public function SetState($power, $level) { + if (!$power) { + DMX_SetValue ($this->instanceId, $this->channel, 0); + } else { + $levelDMX = $level / 100 * 255; + DMX_SetValue ($this->instanceId, $this->channel, $levelDMX); + } + + } + + /** + * @public + * + * Liefert aktuellen Level des Dimmers + * + * @return integer aktueller Dimmer Level + */ + public function GetLevel() { + return GetValue(IPS_GetVariableIDByIdent('ChannelValue'.$this->channel, $this->instanceId))*100/255; + } + + /** + * @public + * + * Liefert aktuellen Power Zustand des Dimmers + * + * @return boolean Gerätezustand On/Off des Dimmers + */ + public function GetPower() { + return GetValue(IPS_GetVariableIDByIdent('ChannelValue'.$this->channel, $this->instanceId)) > 0; + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_Dummy.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_Dummy.class.php new file mode 100644 index 0000000..2a9b014 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_Dummy.class.php @@ -0,0 +1,101 @@ + + */ + + IPSUtils_Include ('IPSComponentDimmer.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentDimmer'); + + class IPSComponentDimmer_Dummy extends IPSComponentDimmer { + + private $instanceId; + + /** + * @public + * + * Initialisierung eines IPSComponentDimmer_Dummy Objektes + * + * @param integer $instanceId InstanceId des Dummy Devices + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleDimmer $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleDimmer $module){ + } + + /** + * @public + * + * Zustand Setzen + * + * @param integer $power Geräte Power + * @param integer $level Wert für Dimmer Einstellung (Wertebereich 0-100) + */ + public function SetState($power, $level) { + } + + /** + * @public + * + * Liefert aktuellen Level des Dimmers + * + * @return integer aktueller Dimmer Level + */ + public function GetLevel() { + return null; + } + + /** + * @public + * + * Liefert aktuellen Power Zustand des Dimmers + * + * @return boolean Gerätezustand On/Off des Dimmers + */ + public function GetPower() { + return null; + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_EIB.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_EIB.class.php new file mode 100644 index 0000000..b3754fa --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_EIB.class.php @@ -0,0 +1,185 @@ + + */ + + IPSUtils_Include ('IPSComponentDimmer.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentDimmer'); + + class IPSComponentDimmer_EIB extends IPSComponentDimmer { + + private $instanceId; + private $groupFunction; + private $groupInterpretation; + + /** + * @public + * + * Initialisierung eines IPSComponentDimmer_EIB Objektes + * + * @param integer $instanceId InstanceId des EIB Devices + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + $this->groupFunction = EIB_GetGroupFunction($this->instanceId); + $this->groupInterpretation = EIB_GetGroupInterpretation($this->instanceId); + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleDimmer $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleDimmer $module){ + } + + /** + * @public + * + * Zustand Setzen + * + * @param integer $power Geräte Power + * @param integer $level Wert für Dimmer Einstellung (Wertebereich 0-100) + */ + public function SetState($power, $level) { + if (!$power) { + switch ($this->groupFunction) { + case 'Scale': + EIB_Scale($this->instanceId, 0); + break; + case 'DimControl': + EIB_DimControl($this->instanceId, 0); + break; + case 'DimValue': + EIB_DimValue($this->instanceId, 0); + break; + default: + trigger_error('Unsupported EIB GroupFunction "'.$this->groupFunction.'"'); + } + } else { + switch ($this->groupFunction) { + case 'Scale': + if ($this->groupInterpretation=='Standard') { /* 0 .. 255 */ + EIB_Scale($this->instanceId, round($level/100*255)); + } elseif ($this->groupInterpretation=='Percent') { /* 0 .. 100 */ + EIB_Scale($this->instanceId, round($level)); + } else { + trigger_error('Unsupported EIB GroupInterpretation "'.$this->groupInterpretation.'"'); + } + break; + case 'DimControl': + if ($this->groupInterpretation=='Standard') { /* 0 .. 15 */ + EIB_DimControl($this->instanceId, round($level/100*15)); + } elseif ($this->groupInterpretation=='Enhanced') { /* 0 .. 7 */ + EIB_DimControl($this->instanceId, round($level/100*7)); + } else { + trigger_error('Unsupported EIB GroupInterpretation "'.$this->groupInterpretation.'"'); + } + break; + case 'DimValue': + if ($this->groupInterpretation=='Standard') { /* 0 .. 255 */ + EIB_Value($this->instanceId, round($level/100*255)); + } elseif ($this->groupInterpretation=='Percent') { /* 0 .. 100 */ + EIB_DimValue($this->instanceId, round($level)); + } else { + trigger_error('Unsupported EIB GroupInterpretation "'.$this->groupInterpretation.'"'); + } + break; + default: + trigger_error('Unsupported EIB GroupFunction "'||$this->groupFunction.'"'); + } + } + + } + + /** + * @public + * + * Liefert aktuellen Level des Dimmers + * + * @return integer aktueller Dimmer Level + */ + public function GetLevel() { + $value = GetValue(IPS_GetObjectIdByIdent('Value', $this->instanceId)); + switch ($this->groupFunction) { + case 'Scale': + if ($this->groupInterpretation=='Standard') { /* 0 .. 255 */ + $value = round($value / 255 * 100); + } elseif ($this->groupInterpretation=='Percent') { /* 0 .. 100 */ + null; + } else { + trigger_error('Unsupported EIB GroupInterpretation "'.$this->groupInterpretation.'"'); + } + break; + case 'DimControl': + if ($this->groupInterpretation=='Standard') { /* 0 .. 15 */ + $value = round($value / 15 * 100); + } elseif ($this->groupInterpretation=='Enhanced') { /* 0 .. 7 */ + $value = round($value / 7 * 100); + } else { + trigger_error('Unsupported EIB GroupInterpretation "'.$this->groupInterpretation.'"'); + } + break; + case 'DimValue': + if ($this->groupInterpretation=='Standard') { /* 0 .. 255 */ + $value = round($value / 255 * 100); + } elseif ($this->groupInterpretation=='Percent') { /* 0 .. 100 */ + null; + } else { + trigger_error('Unsupported EIB GroupInterpretation "'.$this->groupInterpretation.'"'); + } + break; + default: + trigger_error('Unsupported EIB GroupFunction "'||$this->groupFunction.'"'); + } + return $value; + } + + /** + * @public + * + * Liefert aktuellen Power Zustand des Dimmers + * + * @return boolean Gerätezustand On/Off des Dimmers + */ + public function GetPower() { + return GetValue(IPS_GetObjectIdByIdent('Value', $this->instanceId)) > 0; + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_EatonMoeller.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_EatonMoeller.class.php new file mode 100644 index 0000000..8fb0c5a --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_EatonMoeller.class.php @@ -0,0 +1,105 @@ + + */ + + IPSUtils_Include ('IPSComponentDimmer.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentDimmer'); + + class IPSComponentDimmer_EatonMoeller extends IPSComponentDimmer { + + private $instanceId; + + /** + * @public + * + * Initialisierung eines IPSComponentDimmer_EatonMoeller Objektes + * + * @param integer $instanceId InstanceId des EatonMoeller Devices + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleDimmer $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleDimmer $module){ + } + + /** + * @public + * + * Zustand Setzen + * + * @param integer $power Geräte Power + * @param integer $level Wert für Dimmer Einstellung (Wertebereich 0-100) + */ + public function SetState($power, $level) { + MXC_SwitchMode($this->instanceId, $power); + if ($power) { + MXC_DimSet($this->instanceId, $level); + } + } + + /** + * @public + * + * Liefert aktuellen Level des Dimmers + * + * @return integer aktueller Dimmer Level + */ + public function GetLevel() { + return GetValue(IPS_GetVariableIDByName('Intensity', $this->instanceId)); + } + + /** + * @public + * + * Liefert aktuellen Power Zustand des Dimmers + * + * @return boolean Gerätezustand On/Off des Dimmers + */ + public function GetPower() { + return GetValue(IPS_GetVariableIDByName('Status', $this->instanceId)) > 0; + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_Enocean.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_Enocean.class.php new file mode 100644 index 0000000..663b31d --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_Enocean.class.php @@ -0,0 +1,106 @@ + + */ + + IPSUtils_Include ('IPSComponentDimmer.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentDimmer'); + + class IPSComponentDimmer_Enocean extends IPSComponentDimmer { + + private $instanceId; + + /** + * @public + * + * Initialisierung eines IPSComponentDimmer_Enocean Objektes + * + * @param integer $instanceId InstanceId des Dummy Devices + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleDimmer $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleDimmer $module){ + } + + /** + * @public + * + * Zustand Setzen + * + * @param integer $power Geräte Power + * @param integer $level Wert für Dimmer Einstellung (Wertebereich 0-100) + */ + public function SetState($power, $level) { + if (!$power) { + ENO_DimSet($this->instanceId, 0); + } else { + ENO_DimSet($this->instanceId, $level); + } + } + + /** + * @public + * + * Liefert aktuellen Level des Dimmers + * + * @return integer aktueller Dimmer Level + */ + public function GetLevel() { + return GetValue(IPS_GetVariableIDByName('Intensity', $this->instanceId)); + } + + /** + * @public + * + * Liefert aktuellen Power Zustand des Dimmers + * + * @return boolean Gerätezustand On/Off des Dimmers + */ + public function GetPower() { + return GetValue(IPS_GetVariableIDByName('Intensity', $this->instanceId)) > 0; + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_FS20.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_FS20.class.php new file mode 100644 index 0000000..65ceb72 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_FS20.class.php @@ -0,0 +1,115 @@ + + */ + + IPSUtils_Include ('IPSComponentDimmer.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentDimmer'); + + class IPSComponentDimmer_FS20 extends IPSComponentDimmer { + + private $instanceId; + + /** + * @public + * + * Initialisierung eines IPSComponentDimmer_FS20 Objektes + * + * @param integer $instanceId InstanceId des FS20 Devices + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleDimmer $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleDimmer $module){ + } + + /** + * @public + * + * Zustand Setzen + * + * @param integer $power Geräte Power + * @param integer $level Wert für Dimmer Einstellung (Wertebereich 0-100) + */ + public function SetState($power, $level) { + // Zeit in Sekunden wie schnell der Aktor dimmmen soll + $DimspeedSec = 2; + if (!$power) { + FS20_SetIntensity ($this->instanceId, 0, $DimspeedSec); + // Wartezeit um den Aktor auf OFF zu Schalten + // IPS_Sleep wird in Millisekunden angegeben, darum * 1000 + IPS_Sleep ($DimspeedSec*1000); + FS20_SwitchMode ($this->instanceId, false); + } else { + // 100% Helligkeit Entsprechen bei FS20 dem Wert 16 + $levelFS20 = round($level / 100 * 16); + FS20_SetIntensity ($this->instanceId, $levelFS20, $DimspeedSec); + } + + } + + /** + * @public + * + * Liefert aktuellen Level des Dimmers + * + * @return integer aktueller Dimmer Level + */ + public function GetLevel() { + return GetValue(IPS_GetVariableIDByName('Intensität', $this->instanceId)); + } + + /** + * @public + * + * Liefert aktuellen Power Zustand des Dimmers + * + * @return boolean Gerätezustand On/Off des Dimmers + */ + public function GetPower() { + return GetValue(IPS_GetVariableIDByName('Intensität', $this->instanceId)) > 0; + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_Homematic.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_Homematic.class.php index a5912ae..c66ae41 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_Homematic.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_Homematic.class.php @@ -19,7 +19,9 @@ * Version 2.50.1, 31.01.2012
*/ - abstract class IPSComponentDimmer_Homematic extends IPSComponentDimmer { + IPSUtils_Include ('IPSComponentDimmer.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentDimmer'); + + class IPSComponentDimmer_Homematic extends IPSComponentDimmer { private $instanceId; @@ -34,6 +36,19 @@ public function __construct($instanceId) { $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); } + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + /** * @public * diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_ZW.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_ZW.class.php new file mode 100644 index 0000000..c82d3b8 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentDimmer/IPSComponentDimmer_ZW.class.php @@ -0,0 +1,108 @@ + + */ + + IPSUtils_Include ('IPSComponentDimmer.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentDimmer'); + + class IPSComponentDimmer_ZW extends IPSComponentDimmer { + + private $instanceId; + + /** + * @public + * + * Initialisierung eines IPSComponentDimmer_ZW Objektes + * + * @param integer $instanceId InstanceId des Z-Wave Devices + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleDimmer $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleDimmer $module){ + } + + /** + * @public + * + * Zustand Setzen + * + * @param integer $power Geräte Power + * @param integer $level Wert für Dimmer Einstellung (Wertebereich 0-100) + */ + public function SetState($power, $level) { + if (!$power) { + ZW_DimSet($this->instanceId, 0); + } else { + $levelZW = $level; + ZW_DimSet($this->instanceId, $levelZW); + } + + } + + /** + * @public + * + * Liefert aktuellen Level des Dimmers + * + * @return integer aktueller Dimmer Level + */ + public function GetLevel() { + return GetValue(IPS_GetVariableIDByName('Intensity', $this->instanceId)); + } + + /** + * @public + * + * Liefert aktuellen Power Zustand des Dimmers + * + * @return boolean Gerätezustand On/Off des Dimmers + */ + public function GetPower() { + return GetValue(IPS_GetVariableIDByName('Intensity', $this->instanceId)) > 0; + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentPlayer/IPSComponentPlayer.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentPlayer/IPSComponentPlayer.class.php index ceb1867..687a84d 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentPlayer/IPSComponentPlayer.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentPlayer/IPSComponentPlayer.class.php @@ -18,6 +18,8 @@ * Version 2.50.1, 31.01.2012
*/ + IPSUtils_Include ('IPSComponent.class.php', 'IPSLibrary::app::core::IPSComponent'); + abstract class IPSComponentPlayer extends IPSComponent { /** diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentPlayer/IPSComponentPlayer_Mediaplayer.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentPlayer/IPSComponentPlayer_Mediaplayer.class.php index 76fa9a6..1cad5ea 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentPlayer/IPSComponentPlayer_Mediaplayer.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentPlayer/IPSComponentPlayer_Mediaplayer.class.php @@ -137,7 +137,7 @@ public function ClearPlaylist(){ */ public function SetPlaylistPosition($position){ if (WAC_GetPlaylistLength($this->instanceId) > 0 and - $position < WAC_GetPlaylistLength($this->instanceId) and + $position <= WAC_GetPlaylistLength($this->instanceId) and $position > 0){ WAC_SetPlaylistPosition($this->instanceId, (int)$position); WAC_Play($this->instanceId); diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentRGB/IPSComponentRGB.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentRGB/IPSComponentRGB.class.php index 7e19aeb..5dc043f 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentRGB/IPSComponentRGB.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentRGB/IPSComponentRGB.class.php @@ -12,7 +12,7 @@ /** * @class IPSComponentRGB * - * Definiert ein IPSComponentRGB Object, das als Wrapper für Dimmer Geräte verschiedener Hersteller + * Definiert ein IPSComponentRGB Object, das als Wrapper für RGB Geräte verschiedener Hersteller * verwendet werden kann. * * @author Andreas Brauneis @@ -20,6 +20,8 @@ * Version 2.50.1, 31.01.2012
*/ + IPSUtils_Include ('IPSComponent.class.php', 'IPSLibrary::app::core::IPSComponent'); + abstract class IPSComponentRGB extends IPSComponent { /** @@ -30,9 +32,9 @@ abstract class IPSComponentRGB extends IPSComponent { * * @param integer $variable ID der auslösenden Variable * @param string $value Wert der Variable - * @param IPSModuleDimmer $module Module Object an das das aufgetretene Event weitergeleitet werden soll + * @param IPSModuleRGB $module Module Object an das das aufgetretene Event weitergeleitet werden soll */ - abstract public function HandleEvent($variable, $value, IPSModuleDimmer $module); + abstract public function HandleEvent($variable, $value, IPSModuleRGB $module); /** * @public diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentRGB/IPSComponentRGB_DMX.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentRGB/IPSComponentRGB_DMX.class.php new file mode 100644 index 0000000..2a2576b --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentRGB/IPSComponentRGB_DMX.class.php @@ -0,0 +1,100 @@ + + */ + + IPSUtils_Include ('IPSComponentRGB.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentRGB'); + + class IPSComponentRGB_DMX extends IPSComponentRGB { + + private $instanceId; + private $channel1; + private $channel2; + private $channel3; + + /** + * @public + * + * Initialisierung eines IPSComponentRGB_DMX Objektes + * + * @param integer $instanceId InstanceId des IPS-RGBW868 Devices + */ + public function __construct($instanceId, $channel1=1, $channel2=2, $channel3=3) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + $this->channel1 = $channel1; + $this->channel2 = $channel2; + $this->channel3 = $channel3; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleRGB $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleRGB $module){ + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId.','.$this->channel1.','.$this->channel2.','.$this->channel3; + } + + /** + * @public + * + * Zustand Setzen + * + * @param boolean $power RGB Gerät On/Off + * @param integer $color RGB Farben (Hex Codierung) + * @param integer $level Dimmer Einstellung der RGB Beleuchtung (Wertebereich 0-100) + */ + public function SetState($power, $color, $level) { + if (!$power) { + DMX_SetValue ($this->instanceId, 0, 0); + } else { + $red = floor($color/256/256); + $green = floor(($color-$red*256*256)/256); + $blue = floor(($color-$red*256*256-$green*256)); + $red = floor($red*$level/100); + $green = floor($green*$level/100); + $blue = floor($blue*$level/100); + + DMX_SetValue ($this->instanceId, $this->channel1, $red); + DMX_SetValue ($this->instanceId, $this->channel2, $green); + DMX_SetValue ($this->instanceId, $this->channel3, $blue); + } + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentRGB/IPSComponentRGB_Dummy.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentRGB/IPSComponentRGB_Dummy.class.php new file mode 100644 index 0000000..9960fd3 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentRGB/IPSComponentRGB_Dummy.class.php @@ -0,0 +1,80 @@ + + */ + + IPSUtils_Include ('IPSComponentRGB.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentRGB'); + + class IPSComponentRGB_Dummy extends IPSComponentRGB { + + private $instanceId; + + /** + * @public + * + * Initialisierung eines IPSComponentRGB_Dummy Objektes + * + * @param integer $instanceId InstanceId des Dummy Devices + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleRGB $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleRGB $module){ + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Zustand Setzen + * + * @param boolean $power RGB Gerät On/Off + * @param integer $color RGB Farben (Hex Codierung) + * @param integer $level Dimmer Einstellung der RGB Beleuchtung (Wertebereich 0-100) + */ + public function SetState($power, $color, $level) { + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentRGB/IPSComponentRGB_IPS868.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentRGB/IPSComponentRGB_IPS868.class.php index 4e2219c..4a7141f 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentRGB/IPSComponentRGB_IPS868.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentRGB/IPSComponentRGB_IPS868.class.php @@ -19,7 +19,9 @@ * Version 2.50.1, 31.01.2012
*/ - abstract class IPSComponentRGB_IPS868 extends IPSComponentRGB { + IPSUtils_Include ('IPSComponentRGB.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentRGB'); + + class IPSComponentRGB_IPS868 extends IPSComponentRGB { private $instanceId; @@ -47,6 +49,19 @@ public function __construct($instanceId) { public function HandleEvent($variable, $value, IPSModuleRGB $module){ } + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + /** * @public * @@ -57,7 +72,7 @@ public function HandleEvent($variable, $value, IPSModuleRGB $module){ * @param integer $level Dimmer Einstellung der RGB Beleuchtung (Wertebereich 0-100) */ public function SetState($power, $color, $level) { - if (!power) { + if (!$power) { @PJ_DimRGBW ($this->instanceId, 0, 2, 0, 2, 0, 2, 0, 2); } else { $red = floor($color/256/256); diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentRGB/IPSComponentRGB_PhilipsHUE.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentRGB/IPSComponentRGB_PhilipsHUE.class.php new file mode 100644 index 0000000..0d3d4da --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentRGB/IPSComponentRGB_PhilipsHUE.class.php @@ -0,0 +1,458 @@ + + */ + + IPSUtils_Include ('IPSComponentRGB.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentRGB'); + IPSUtils_Include ("IPSLogger.inc.php", "IPSLibrary::app::core::IPSLogger"); + + class IPSComponentRGB_PhilipsHUE extends IPSComponentRGB { + + private $bridgeIP; + private $lampNr; + private $hueKey; + private $modelID; + + public $Status; + public $Hue; + public $ModelID; + public $XY; + public $Level; + public $Saturation; + + + /** + * @public + * + * Initialisierung eines IPSComponentRGB_PhilipsHUE Objektes + * + * @param string $bridgeIP IP Addresse der HUE Lampe + * @param string $hueKey Key zum Zugriff auf die Lampe + * @param string $lampNr Nummer der Lampe + * @param string $modelID Philips Modelnummer der Lampe + * + */ + public function __construct($bridgeIP, $hueKey, $lampNr, $modelID) { + + $this->bridgeIP = $bridgeIP; + $this->hueKey = $hueKey; + $this->lampNr = $lampNr; + $this->modelID = $modelID; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleRGB $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleRGB $module){ + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->bridgeIP.','.$this->hueKey.','.$this->lampNr.','.$this->modelID; + } + + /** + * @brief Sends command to HUE bridge using JSON + * + * @param [in] $type Type of parameter ([Lights, Bridge] + * @param [in] $request [GET,PUT] + * @param [in] $cmd Command string + * @return Returns the result of the JSON command + * + */ + private function hue_SendLampCommand($type, $request, $cmd = null) { + + switch ($type) { + + case 'Lights': + $json_url = 'http://'.$this->bridgeIP.'/api/'.$this->hueKey.'/lights/'.$this->lampNr.'/state'; + break; + + case 'Bridge': + $json_url = 'http://'.$this->bridgeIP.'/api/'.$this->hueKey; + break; + + case 'api': + //For further development + break; + + default: + break; + } + + + $json_string = '{'.$cmd.'}'; + + // Configuring curl + $ch = curl_init($json_url); + $options = array( + CURLOPT_RETURNTRANSFER => true, + CURLOPT_CUSTOMREQUEST => $request, + CURLOPT_HTTPHEADER => array('Content-type: application/json') , + CURLOPT_POSTFIELDS => $json_string + ); + curl_setopt_array($ch, $options); + IPSLogger_Inf(__file__, 'Send PhilipsHUE: JsonURL='.$json_url.', Command='.$json_string); + + // Execute + if ($this->bridgeIP <> '') { + $json_result = curl_exec($ch); + return json_decode($json_result); + } + } + + + /** + * @public + * + * @brief Zustand Setzen + * + * @param boolean $power RGB Gerät On/Off + * @param integer $color RGB Farben (Hex Codierung) + * @param integer $level Dimmer Einstellung der RGB Beleuchtung (Wertebereich 0-100) + */ + public function SetState($power, $color, $level) { + if (!$power) { + $cmd = '"on":false'; + } else { + + $rotDec = (($color >> 16) & 0xFF); + $gruenDec = (($color >> 8) & 0xFF); + $blauDec = (($color >> 0) & 0xFF); + $color_array = array($rotDec,$gruenDec,$blauDec); + + $modelID = $this->modelID; + + //Convert RGB to XY values + $values = $this->calculateXY($color_array, $modelID); + + //IPSLight is using percentage in variable Level, Hue is using [0..255] + $level = round($level * 2,55); + $cmd = '"bri":'.$level.', "xy":['.$values->x.','.$values->y.'], "on":true'; + + } + + $type = 'Lights'; //Type of Command + $request = 'PUT'; //Type of Request + + //Send command to Hue lamp + $this->hue_SendLampCommand($type, $request, $cmd); + } + + /** + * @brief Queries bridge for details of the lamp + * + * @return None, details are populated in the public variables of the class + * + */ + public function QueryHUE() { + + + $type = 'Bridge'; //Type of Command + $request = 'GET'; //Type of Request + + //Send command to Hue lamp + $result = $this->hue_SendLampCommand($type, $request); + + $id = 1; + + foreach ($result->lights as $light) { + + if ($id == $this->lampNr) { + + $this->Status = $light->state->on; + $this->Hue = $light->state->hue; + $this->ModelID = $light->modelid; + $this->XY = $light->state->xy; + $this->Level = $light->state->bri; + $this->Saturation = $light->state->sat; + + } + + $id=$id+1; + + } + } + + /** + * @brief Sets the alert state. 'select' blinks once, 'lselect' blinks repeatedly, 'none' turns off blinking + * + */ + public function SetAlert( $alert_type = 'select' ) { + + $type = 'Lights'; //Type of Command + $request = 'PUT'; //Type of Request + $cmd = '"alert":"'.$alert_type.'"'; + + //Send command to Hue lamp + $this->hue_SendLampCommand($type, $request, $cmd); + } + + /** + * @brief Converts colour value from RGB to XY + * + * @param [in] $color Color in RGB + * @param [in] $model Philips lamp model + * @return XY value + */ + private function calculateXY($color, $model) { + + // Get the RGB values from color object and convert them to be between 0 and 1. + $red = round($color[0] / 255,2); + $green = round($color[1] / 255,2); + $blue = round($color[2] / 255,2); + + // Apply a gamma correction to the RGB values + $r = ($red > 0.04045) ? pow(($red + 0.055) / (1.0 + 0.055), 2.4) : ($red / 12.92); + $g = ($green > 0.04045) ? pow(($green + 0.055) / (1.0 + 0.055), 2.4) : ($green / 12.92); + $b = ($blue > 0.04045) ? pow(($blue + 0.055) / (1.0 + 0.055), 2.4) : ($blue / 12.92); + + // Convert the RGB values to XYZ using the Wide RGB D65 conversion formula + $X = $r * 0.649926 + $g * 0.103455 + $b * 0.197109; + $Y = $r * 0.234327 + $g * 0.743075 + $b * 0.022598; + $Z = $r * 0.0000000 + $g * 0.053077 + $b * 1.035763; + + // Calculate the xy values from the XYZ values + if($X==0 && $Y ==0 && $Z ==0) $Z = 0.1; + + $cx = $X / ($X + $Y + $Z); + $cy = $Y / ($X + $Y + $Z); + if(is_nan($cx)) $cx = 0.0; + if(is_nan($cy)) $cy = 0.0; + + // Check if the found xy value is within the color gamut of the light + $xyPoint = new cgpoint($cx, $cy); + $colorPoints = $this->getColorPointsForModel($model); + $inReachOfLamps = $this->checkPointInLampsReach($xyPoint, $colorPoints); + + if(!$inReachOfLamps) + { + // Calculate the closest point on the color gamut triangle and use that as xy value + $pAB = $this->getClosestPointToPoints($colorPoints[0], $colorPoints[1], $xyPoint); + $pAC = $this->getClosestPointToPoints($colorPoints[2], $colorPoints[0], $xyPoint); + $pBC = $this->getClosestPointToPoints($colorPoints[1], $colorPoints[2], $xyPoint); + + $dAB = $this->getDistanceBetweenTwoPoints($xyPoint, $pAB); + $dAC = $this->getDistanceBetweenTwoPoints($xyPoint, $pAC); + $dBC = $this->getDistanceBetweenTwoPoints($xyPoint, $pBC); + + $lowest = $dAB; + $closestPoint = $pAB; + + if($dAC < $lowest) + { + $lowest = $dAC; + $closestPoint = $pAC; + } + if($dBC < $lowest) + { + $lowest = $dBC; + $closestPoint = $pBC; + } + + $cx = $closestPoint->x; + $cy = $closestPoint->y; + } + return new cgpoint($cx, $cy); + } + + /** + * @brief Returns the color gamut of a specific Philips light model + * + * @param [in] $model ID of the lamp model + * @return Array with color gamut + * + * @details + * + * Following models are supported: + * + * Hue + * "LCT001": Hue A19 + * "LCT002": Hue BR30 + * "LCT003": Hue GU10 + * LivingColors + * "LLC001": Monet, Renoir, Mondriaan (gen II) + * "LLC005": Bloom (gen II) + * "LLC006": Iris (gen III) + * "LLC007": Bloom, Aura (gen III) + * "LLC011": Hue Bloom + * "LLC012": Hue Bloom + * "LLC013": Storylight + * "LST001": Light Strips + * + */ + private function getColorPointsForModel($model) { + $colorPoints = array(); + $hueBulbs = array("LCT001","LCT002","LCT003"); + $livingColors = array("LLC001","LLC005","LLC006","LLC007","LLC011","LLC012","LLC013","LST001"); + + if(in_array($model, $hueBulbs)) + { + array_push($colorPoints, new cgpoint(0.674,0.322)); + array_push($colorPoints, new cgpoint(0.408,0.517)); + array_push($colorPoints, new cgpoint(0.168,0.041)); + } + else if(in_array($model, $livingColors)) + { + array_push($colorPoints, new cgpoint(0.703,0.296)); + array_push($colorPoints, new cgpoint(0.214,0.709)); + array_push($colorPoints, new cgpoint(0.139,0.081)); + } + else + { + array_push($colorPoints, new cgpoint(1.0,0.0)); + array_push($colorPoints, new cgpoint(0.0,1.0)); + array_push($colorPoints, new cgpoint(0.0,0.0)); + } + + return $colorPoints; + } + + /** + * @brief Find the distance between two points. + * + * @param one + * @param two + * @return the distance between point one and two + */ + private function getDistanceBetweenTwoPoints($one, $two) { + + $dx = $one->x - $two->x; + $dy = $one->y - $two->y; + $dist = sqrt($dx * $dx + $dy * $dy); + return $dist; + } + + /** + * @brief Find the closest point on a line. This point will be within reach of the lamp. + * + * @param A the point where the line starts + * @param B the point where the line ends + * @param P the point which is close to a line. + * @return the point which is on the line. + */ + private function getClosestPointToPoints($A, $B, $P) { + + $AP = new cgpoint($P->x - $A->x, $P->y - $A->y); + $AB = new cgpoint($B->x - $A->x, $B->y - $A->y); + $ab2 = $AB->x * $AB->x + $AB->y * $AB->y; + $ap_ab = $AP->x * $AB->x + $AP->y * $AB->y; + + $t = $ap_ab / $ab2; + if($t < 0.0) + { + $t = 0.0; + } + else if($t > 1.0) + { + $t = 1.0; + } + $newPoint = new cgpoint($A->x + $AB->x * $t, $A->y + $AB->y * $t); + return $newPoint; + } + + /** + * @brief Calculates crossProduct of two 2D vectors / points + * + * @param p1 first point used as vector + * @param p2 second point used as vector + * @return crossProduct of vectors + * + */ + private function getCrossProduct($p1, $p2) { + return ($p1->x * $p2->y - $p1->y * $p2->x); + } + + /** + * @brief Method to see if the given XY value is within the reach of the lamps. + * + * @param p the point containing the X,Y value + * @return true if within reach, false otherwise. + * + */ + private function checkPointInLampsReach($p, $colorPoints) { + + $red = $colorPoints[0]; + $green = $colorPoints[1]; + $blue = $colorPoints[2]; + $grx =$green->x - $red->x; + $gry =$green->y - $red->y; + $brx =$blue->x - $red->x; + $bry =$blue->y -$red->y; + $prx =$p->x - $red->x; + $pry =$p->y - $red->y; + $v1 = new cgpoint($grx, $gry); + $v2 = new cgpoint($brx, $bry); + $q = new cgpoint($prx, $pry); + + $s = ($this->getCrossProduct($q, $v2) / $this->getCrossProduct($v1, $v2)); + $t = ($this->getCrossProduct($v1, $q) / $this->getCrossProduct($v1, $v2)); + + if(($s > 0.0) && ($t >= 0.0) && ($s + $t <= 1.0)) + { + return true; + } + return false; + } + + + } + + // @cond Ignore this class in doxygen + /** + * + * Helper class to ease translation from Philips C-coding + * Implements CGPoint class from iOS SDK + * + */ + + class cgpoint { + + public $x; + public $y; + + function __construct($_x, $_y) { + $this->x = $_x; + $this->y = $_y; + } + + }; + // @endcond + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSComponentSensor.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSComponentSensor.class.php new file mode 100644 index 0000000..7255436 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSComponentSensor.class.php @@ -0,0 +1,42 @@ + + */ + + IPSUtils_Include ('IPSComponent.class.php', 'IPSLibrary::app::core::IPSComponent'); + + abstract class IPSComponentSensor extends IPSComponent { + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleSensor $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + abstract public function HandleEvent($variable, $value, IPSModuleSensor $module); + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSComponentSensor_Button.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSComponentSensor_Button.class.php new file mode 100644 index 0000000..3188251 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSComponentSensor_Button.class.php @@ -0,0 +1,57 @@ + + */ + + IPSUtils_Include ('IPSComponentSensor.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSensor'); + + class IPSComponentSensor_Button extends IPSComponentSensor { + + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleSensor $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleSensor $module){ + $module->SyncButton($value, $this); + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this); + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSComponentSensor_IRTrans.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSComponentSensor_IRTrans.class.php new file mode 100644 index 0000000..1393f6f --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSComponentSensor_IRTrans.class.php @@ -0,0 +1,70 @@ + + */ + + IPSUtils_Include ('IPSComponentSensor.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSensor'); + + class IPSComponentSensor_IRTrans extends IPSComponentSensor { + + + private $instanceId; + + /** + * @public + * + * Initialisierung des IPSComponentSensor_IRTrans + * + * @param integer $instanceId InstanceId von IRTrans + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleSensor $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleSensor $module){ + $module->SyncButton($value, $this); + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this); + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor.class.php new file mode 100644 index 0000000..00e4d0d --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor.class.php @@ -0,0 +1,49 @@ + + */ + + IPSUtils_Include ('IPSModule.class.php', 'IPSLibrary::app::core::IPSComponent'); + + abstract class IPSModuleSensor extends IPSModule { + + /** + * @public + * + * Ermöglicht die Synchronisation von Sensorwerten mit Modulen + * + * @param string $value Sensorwert + * @param IPSComponentSensor $component Sensor Komponente + */ + abstract public function SyncButton($value, IPSComponentSensor $component); + + /** + * @public + * + * Ermöglicht das Verarbeiten eines Taster Signals + * + */ + abstract public function ExecuteButton(); + + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor_Entertainment.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor_Entertainment.class.php new file mode 100644 index 0000000..2012d4d --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor_Entertainment.class.php @@ -0,0 +1,107 @@ + + */ + + IPSUtils_Include ("Entertainment_InterfaceIPSComponentSensor.inc.php", "IPSLibrary::app::modules::Entertainment"); + IPSUtils_Include ('IPSModuleSensor.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSensor'); + + class IPSModuleSensor_Entertainment extends IPSModuleSensor { + + private $functionToCall; + private $param1; + private $param2; + private $param3; + + /** + * @public + * + * Initialisierung eines IPSModuleSensor_Entertainment Objektes + * + * @param integer $functionToCall Funktion, die aufgerufen werden soll + * @param boolean $param1 Parameter 1 + * @param boolean $param2 Parameter 2 + * @param boolean $param3 Parameter 3 + */ + public function __construct($functionToCall, $param1='', $param2='', $param3='') { + $this->functionToCall = $functionToCall; + $this->param1 = $param1; + $this->param2 = $param2; + $this->param3 = $param3; + } + + private function GetParam($param) { + if (is_numeric($param)) { + return (int)$param; + } elseif ($param=='true') { + return true; + } elseif ($param=='false') { + return false; + } else { + return $param; + } + } + + private function GetParamArray() { + $parameters = array(); + if ($this->param3<>'') { + $parameters[] = $this->GetParam($this->param1); + $parameters[] = $this->GetParam($this->param2); + $parameters[] = $this->GetParam($this->param3); + } elseif ($this->param2<>'') { + $parameters[] = $this->GetParam($this->param1); + $parameters[] = $this->GetParam($this->param2); + } elseif ($this->param1<>'') { + $parameters[] = $this->GetParam($this->param1); + } else { + } + return $parameters; + } + + /** + * @public + * + * Ermöglicht die Synchronisation von Sensorwerten mit Modulen + * + * @param string $value Sensorwert + * @param IPSComponentSensor $component Sensor Komponente + */ + public function SyncButton($value, IPSComponentSensor $component) { + $this->ExecuteButton(); + } + + /** + * @public + * + * Ermöglicht das Verarbeiten eines Taster Signals + * + */ + public function ExecuteButton () { + if (function_exists($this->functionToCall)) { + call_user_func_array($this->functionToCall, $this->GetParamArray()); + } else { + Entertainment_IPSComponentSensor_ReceiveData($this->functionToCall, $this->param1, $this->param2, $this->param3); + } + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor_IPSLight.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor_IPSLight.class.php new file mode 100644 index 0000000..1b5558c --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor_IPSLight.class.php @@ -0,0 +1,107 @@ + + */ + + IPSUtils_Include ('IPSLight.inc.php', 'IPSLibrary::app::modules::IPSLight'); + IPSUtils_Include ('IPSModuleSensor.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSensor'); + + class IPSModuleSensor_IPSLight extends IPSModuleSensor { + + private $lightObject; + private $lightFunction; + private $lightValue; + + /** + * @public + * + * Initialisierung eines IPSModuleSensor_IPSLight Objektes + * + * @param string $lightObject Licht Object/Name (Leuchte, Gruppe, Programm, ...) + * @param string $lightFunction Function die ausgeführt werden soll + * @param string $lightValue Wert für Beleuchtungs Änderung + */ + public function __construct($lightFunction, $lightObject, $lightValue=null) { + $this->lightObject = $lightObject; + $this->lightFunction = $lightFunction; + $this->lightValue = $lightValue; + } + + + /** + * @public + * + * Ermöglicht die Synchronisation von Sensorwerten mit Modulen + * + * @param string $value Sensorwert + * @param IPSComponentSensor $component Sensor Komponente + */ + public function SyncButton($value, IPSComponentSensor $component) { + $this->ExecuteButton(); + } + + /** + * @public + * + * Ermöglicht das Verarbeiten eines Taster Signals + * + */ + public function ExecuteButton () { + switch ($this->lightFunction) { + case 'IPSLight_DimAbsoluteByName': + IPSLight_DimAbsoluteByName($this->lightObject, $this->lightValue); + break; + case 'IPSLight_DimRelativByName': + IPSLight_DimRelativByName($this->lightObject, $this->lightValue); + break; + + case 'IPSLight_SetSwitchByName': + if ($this->lightValue == 'true') + IPSLight_SetSwitchByName($this->lightObject, true); + else + IPSLight_SetSwitchByName($this->lightObject, false); + break; + case 'IPSLight_ToggleSwitchByName': + IPSLight_ToggleSwitchByName($this->lightObject); + break; + + + case 'IPSLight_SetGroupByName': + IPSLight_SetGroupByName($this->lightObject, $this->lightValue); + break; + case 'IPSLight_ToggleGroupByName': + IPSLight_ToggleGroupByName($this->lightObject); + break; + + case 'IPSLight_SetProgramNextByName': + IPSLight_SetProgramNextByName($this->lightObject); + break; + case 'IPSLight_SetProgramName': + IPSLight_SetProgramName($this->lightObject, $this->lightValue); + break; + default: + IPSLogger_Wrn(__file__, 'Unknown Button Function "'.$this->lightFunction.'"'); + } + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor_IPSShadowing.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor_IPSShadowing.class.php new file mode 100644 index 0000000..d890f2e --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor_IPSShadowing.class.php @@ -0,0 +1,76 @@ + + */ + + IPSUtils_Include ("IPSShadowing.inc.php", "IPSLibrary::app::modules::IPSShadowing"); + IPSUtils_Include ('IPSModuleSensor.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSensor'); + + class IPSModuleSensor_IPSShadowing extends IPSModuleSensor { + + private $instanceId; + private $movementId; + + /** + * @public + * + * Initialisierung eines IPSModuleSensor_IPSShadowing Objektes + * + * @param integer $instanceId InstanceId des Homematic Devices + * @param boolean $movementId Movement Command + */ + public function __construct($instanceId, $movementId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + $this->movementId = $movementId; + } + + + /** + * @public + * + * Ermöglicht die Synchronisation von Sensorwerten mit Modulen + * + * @param string $value Sensorwert + * @param IPSComponentSensor $component Sensor Komponente + */ + public function SyncButton($value, IPSComponentSensor $component) { + $this->ExecuteButton(); + } + + /** + * @public + * + * Ermöglicht das Verarbeiten eines Taster Signals + * + */ + public function ExecuteButton () { + $device = new IPSShadowing_Device($this->instanceId); + $movementId = GetValue(IPS_GetObjectIDByIdent(c_Control_Movement, $this->instanceId)); + if ($movementId==c_MovementId_MovingIn or $movementId==c_MovementId_MovingOut or $movementId==c_MovementId_Up or $movementId==c_MovementId_Down) { + $device->MoveByControl(c_MovementId_Stop); + } else { + $device->MoveByControl($this->movementId); + } + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor_IRTrans.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor_IRTrans.class.php new file mode 100644 index 0000000..f02fbbc --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor_IRTrans.class.php @@ -0,0 +1,73 @@ + + */ + + IPSUtils_Include ("IRTrans_InterfaceIPSComponentSensor.inc.php", "IPSLibrary::app::modules::IRTrans"); + IPSUtils_Include ('IPSModuleSensor.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSensor'); + + class IPSModuleSensor_IRTrans extends IPSModuleSensor { + + private $instanceId; + private $device; + private $button; + + /** + * @public + * + * Initialisierung eines IPSModuleSensor_IRTrans Objektes + * + * @param integer $instanceId InstanceId + * @param string $device Device + * @param string $button Button + */ + public function __construct($instanceId, $device='', $button='') { + $this->instanceId = $instanceId; + $this->device = $device; + $this->button = $button; + } + + + /** + * @public + * + * Ermöglicht die Synchronisation von Sensorwerten mit Modulen + * + * @param string $value Sensorwert + * @param IPSComponentSensor $component Sensor Komponente + */ + public function SyncButton($value, IPSComponentSensor $component) { + $this->ExecuteButton(); + } + + /** + * @public + * + * Ermöglicht das Verarbeiten eines Taster Signals + * + */ + public function ExecuteButton () { + IRT_SendOnce($this->instanceId, $this->device, $this->button); + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor_NetPlayer.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor_NetPlayer.class.php new file mode 100644 index 0000000..b0367a5 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSensor/IPSModuleSensor_NetPlayer.class.php @@ -0,0 +1,89 @@ + + */ + + IPSUtils_Include ("NetPlayer.inc.php", "IPSLibrary::app::modules::NetPlayer"); + IPSUtils_Include ('IPSModuleSensor.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSensor'); + + class IPSModuleSensor_NetPlayer extends IPSModuleSensor { + + private $functionToCall; + private $param1; + private $param2; + private $param3; + + /** + * @public + * + * Initialisierung eines IPSModuleSensor_NetPlayer Objektes + * + * @param integer $functionToCall Funktion + * @param boolean $param1 Parameter 1 + * @param boolean $param2 Parameter 2 + * @param boolean $param3 Parameter 3 + */ + public function __construct($functionToCall, $param1='', $param2='', $param3='') { + $this->functionToCall = $functionToCall; + $this->param1 = $param1; + $this->param2 = $param2; + $this->param3 = $param3; + } + + + /** + * @public + * + * Ermöglicht die Synchronisation von Sensorwerten mit Modulen + * + * @param string $value Sensorwert + * @param IPSComponentSensor $component Sensor Komponente + */ + public function SyncButton($value, IPSComponentSensor $component) { + $this->ExecuteButton(); + } + + /** + * @public + * + * Ermöglicht das Verarbeiten eines Taster Signals + * + */ + public function ExecuteButton () { + $parameters = array(); + if ($this->param3<>'') { + $parameters[] = $this->param1; + $parameters[] = $this->param2; + $parameters[] = $this->param3; + } elseif ($this->param2<>'') { + $parameters[] = $this->param1; + $parameters[] = $this->param2; + } elseif ($this->param1<>'') { + $parameters[] = $this->param1; + } else { + } + + call_user_func_array($this->functionToCall, $parameters); + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter.class.php index d846bdf..8939826 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter.class.php @@ -20,6 +20,8 @@ * Version 2.50.1, 31.01.2012
*/ + IPSUtils_Include ('IPSComponent.class.php', 'IPSLibrary::app::core::IPSComponent'); + abstract class IPSComponentShutter extends IPSComponent { /** diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_1Wire.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_1Wire.class.php index f5ac4a8..705f36f 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_1Wire.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_1Wire.class.php @@ -19,9 +19,12 @@ * Version 2.50.1, 31.01.2012
*/ - abstract class IPSComponentShutter_1Wire extends IPSComponentShutter { + IPSUtils_Include ('IPSComponentShutter.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentShutter'); + + class IPSComponentShutter_1Wire extends IPSComponentShutter { private $instanceId; + private $reverseControl; /** * @public @@ -29,9 +32,24 @@ abstract class IPSComponentShutter_1Wire extends IPSComponentShutter { * Initialisierung eines IPSComponentShutter_1Wire Objektes * * @param integer $instanceId InstanceId des 1Wire Devices + * @param boolean $reverseControl Reverse Ansteuerung des Devices + */ + public function __construct($instanceId, $reverseControl=false) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + $this->reverseControl = $reverseControl; + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object */ - public function __construct($instanceId) { - $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; } /** @@ -55,8 +73,13 @@ public function HandleEvent($variable, $value, IPSModuleShutter $module){ * Hinauffahren der Beschattung */ public function MoveUp(){ - @TMEX_F29_SetStrobe($this->instanceId, True); - @TMEX_F29_SetPort((integer)$this->instanceId, (integer)120+128); + if ($this->reverseControl) { + @TMEX_F29_SetStrobe($this->instanceId, True); + @TMEX_F29_SetPort((integer)$this->instanceId, (integer)120); + } else { + @TMEX_F29_SetStrobe($this->instanceId, True); + @TMEX_F29_SetPort((integer)$this->instanceId, (integer)120+128); + } } /** @@ -65,8 +88,13 @@ public function MoveUp(){ * Hinunterfahren der Beschattung */ public function MoveDown(){ - @TMEX_F29_SetStrobe($this->instanceId, True); - @TMEX_F29_SetPort((integer)$this->instanceId, (integer)120); + if ($this->reverseControl) { + @TMEX_F29_SetStrobe($this->instanceId, True); + @TMEX_F29_SetPort((integer)$this->instanceId, (integer)120+128); + } else { + @TMEX_F29_SetStrobe($this->instanceId, True); + @TMEX_F29_SetPort((integer)$this->instanceId, (integer)120); + } } /** diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_Dummy.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_Dummy.class.php index 07830e9..52e7f68 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_Dummy.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_Dummy.class.php @@ -19,7 +19,9 @@ * Version 2.50.1, 31.01.2012
*/ - abstract class IPSComponentShutter_Dummy extends IPSComponentShutter { + IPSUtils_Include ('IPSComponentShutter.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentShutter'); + + class IPSComponentShutter_Dummy extends IPSComponentShutter { private $instanceId; @@ -34,6 +36,19 @@ public function __construct($instanceId) { $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); } + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + /** * @public * diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_EIB.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_EIB.class.php new file mode 100644 index 0000000..0034c0d --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_EIB.class.php @@ -0,0 +1,125 @@ + + */ + + IPSUtils_Include ('IPSComponentShutter.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentShutter'); + + class IPSComponentShutter_EIB extends IPSComponentShutter { + + private $instanceId1; + private $instanceId2; + private $reverseControl; + /** + * @public + * + * Initialisierung eines IPSComponentShutter_EIB Objektes + * + * @param integer $instanceId1 InstanceId des EIB Devices + * @param integer $instanceId2 InstanceId 2 des EIB Devices (Richtungs Relais für den Fall das normale EIB Switches verwendet werden) + * @param boolean $reverseControl Richtungs Schalter (default=false) + */ + public function __construct($instanceId1, $instanceId2='', $reverseControl=false) { + $this->instanceId1 = IPSUtil_ObjectIDByPath($instanceId1); + if ($this->instanceId2<>'') { + $this->instanceId2 = IPSUtil_ObjectIDByPath($instanceId2); + } + $this->reverseControl = $reverseControl; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleShutter $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleShutter $module){ + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId1.','.$this->instanceId2.','.$this->reverseControl; + } + + /** + * @public + * + * Hinauffahren der Beschattung + */ + public function MoveUp(){ + if ($this->instanceId2==null) { + if ($this->reverseControl) { + EIB_Move($this->instanceId1, 4); //0 = Open, 2 = Stop, 4 = Close + } else { + EIB_Move($this->instanceId1, 0); //0 = Open, 2 = Stop, 4 = Close + } + } else { + EIB_Switch($this->instanceId1, true); + EIB_Switch($this->instanceId2, $this->reverseControl); + } + } + + /** + * @public + * + * Hinunterfahren der Beschattung + */ + public function MoveDown(){ + if ($this->instanceId2==null) { + if ($this->reverseControl) { + EIB_Move($this->instanceId1, 0); //0 = Open, 2 = Stop, 4 = Close + } else { + EIB_Move($this->instanceId1, 4); //0 = Open, 2 = Stop, 4 = Close + } + } else { + EIB_Switch($this->instanceId1, true); + EIB_Switch($this->instanceId2, !$this->reverseControl); + } + } + + /** + * @public + * + * Stop + */ + public function Stop() { + if ($this->instanceId2==null) { + EIB_Move($this->instanceId1, 2); //0 = Open, 2 = Stop, 4 = Close + } else { + EIB_Switch($this->instanceId1, false); + EIB_Switch($this->instanceId2, false); + } + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_Enocean.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_Enocean.class.php index 7402154..182f2e7 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_Enocean.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_Enocean.class.php @@ -19,11 +19,13 @@ * Version 2.50.1, 31.01.2012
*/ - abstract class IPSComponentShutter_Enocean extends IPSComponentShutter { + IPSUtils_Include ('IPSComponentShutter.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentShutter'); + + class IPSComponentShutter_Enocean extends IPSComponentShutter { private $instanceId; private $isRunningId; - + /** * @public * @@ -33,20 +35,33 @@ abstract class IPSComponentShutter_Enocean extends IPSComponentShutter { */ public function __construct($instanceId) { $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); - $this->isRunningId = @IPS_GetObjectIDByIdent('isrunning', $this->instanceId); + $this->isRunningId = @IPS_GetObjectIDByIdent('runningMode', $this->instanceId); if($this->isRunningId===false) { - $this->isRunningId = IPS_CreateVariable($this->instanceId); - IPS_SetParent($this->isRunningId, $id); - IPS_SetName($this->isRunningId, 'IsRunning'); - IPS_SetIdent($this->isRunningId, 'isrunning'); - IPS_SetInfo($this->isRunningId, "This Variable was created by Script IPSComponentShutter_FS20"); + $this->isRunningId = IPS_CreateVariable(1 /*Integer*/); + IPS_SetParent($this->isRunningId, $this->instanceId); + IPS_SetName($this->isRunningId, 'RunningMode'); + IPS_SetIdent($this->isRunningId, 'runningMode'); + IPS_SetInfo($this->isRunningId, "This Variable was created by Script IPSComponentShutter_Enocean"); } } /** * @public * - * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event * an das entsprechende Module zu leiten. * * @param integer $variable ID der auslösenden Variable @@ -65,11 +80,11 @@ public function HandleEvent($variable, $value, IPSModuleShutter $module){ */ public function MoveUp(){ if(!GetValue($this->isRunningId)) { - ENO_SwitchMode($this->InstanceId, true); - SetValue($this->isRunningId, true); + ENO_SwitchMode($this->instanceId, true); + SetValue($this->isRunningId, 1); } } - + /** * @public * @@ -77,24 +92,28 @@ public function MoveUp(){ */ public function MoveDown(){ if(!GetValue($this->isRunningId)) { - ENO_SwitchMode($this->InstanceId, false); - SetValue($this->isRunningId, true); + ENO_SwitchMode($this->instanceId, false); + SetValue($this->isRunningId, 2); } } - + /** * @public * * Stop */ public function Stop() { - if(GetValue($this->isRunningId)) { - $value = GetValue(IPS_GetObjectIDByIdent($this->InstanceId, "StatusVariable") - ENO_SwitchMode($this->InstanceId, $value); - SetValue($this->isRunningId, false); + $running = GetValue($this->isRunningId); + if($running != 0) { + if ($running == 1) { + ENO_SwitchMode($this->instanceId, true); + } else if ($running == 2) { + ENO_SwitchMode($this->instanceId, false); + } else { + } + SetValue($this->isRunningId, 0); } } - } /** @}*/ diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_FS20.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_FS20.class.php index 1c3690a..05e3814 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_FS20.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_FS20.class.php @@ -19,7 +19,9 @@ * Version 2.50.1, 31.01.2012
*/ - abstract class IPSComponentShutter_FS20 extends IPSComponentShutter { + IPSUtils_Include ('IPSComponentShutter.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentShutter'); + + class IPSComponentShutter_FS20 extends IPSComponentShutter { private $instanceId; private $isRunningId; @@ -35,14 +37,27 @@ public function __construct($instanceId) { $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); $this->isRunningId = @IPS_GetObjectIDByIdent('isrunning', $this->instanceId); if($this->isRunningId===false) { - $this->isRunningId = IPS_CreateVariable($this->instanceId); - IPS_SetParent($this->isRunningId, $id); + $this->isRunningId = IPS_CreateVariable(0); + IPS_SetParent($this->isRunningId, $this->instanceId); IPS_SetName($this->isRunningId, 'IsRunning'); IPS_SetIdent($this->isRunningId, 'isrunning'); IPS_SetInfo($this->isRunningId, "This Variable was created by Script IPSComponentShutter_FS20"); } } + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + /** * @public * @@ -65,7 +80,7 @@ public function HandleEvent($variable, $value, IPSModuleShutter $module){ */ public function MoveUp(){ if(!GetValue($this->isRunningId)) { - FS20_SwitchMode($this->InstanceId, true); + FS20_SwitchMode($this->instanceId, true); SetValue($this->isRunningId, true); } } @@ -77,7 +92,7 @@ public function MoveUp(){ */ public function MoveDown(){ if(!GetValue($this->isRunningId)) { - FS20_SwitchMode($this->InstanceId, false); + FS20_SwitchMode($this->instanceId, false); SetValue($this->isRunningId, true); } } @@ -89,8 +104,8 @@ public function MoveDown(){ */ public function Stop() { if(GetValue($this->isRunningId)) { - $value = GetValue(IPS_GetObjectIDByIdent($this->InstanceId, "StatusVariable") - FS20_SwitchMode($this->InstanceId, $value); + $value = GetValue(IPS_GetObjectIDByIdent("StatusVariable", $this->instanceId)); + FS20_SwitchMode($this->instanceId, $value); SetValue($this->isRunningId, false); } } diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_Homematic.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_Homematic.class.php index dda998d..e561a7b 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_Homematic.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_Homematic.class.php @@ -19,19 +19,24 @@ * Version 2.50.1, 31.01.2012
*/ - abstract class IPSComponentShutter_Homematic extends IPSComponentShutter { + IPSUtils_Include ('IPSComponentShutter.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentShutter'); + + class IPSComponentShutter_Homematic extends IPSComponentShutter { private $instanceId; - + private $reverseControl; + /** * @public * * Initialisierung eines IPSComponentShutter_Homematic Objektes * * @param integer $instanceId InstanceId des Homematic Devices + * @param boolean $reverseControl Reverse Ansteuerung des Devices */ - public function __construct($instanceId) { - $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + public function __construct($instanceId, $reverseControl=false) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + $this->reverseControl = $reverseControl; } /** @@ -45,6 +50,24 @@ public function __construct($instanceId) { * @param IPSModuleShutter $module Module Object an das das aufgetretene Event weitergeleitet werden soll */ public function HandleEvent($variable, $value, IPSModuleShutter $module){ + if ($this->reverseControl) { + $module->SyncPosition(($value*100), $this); + } else { + $module->SyncPosition(100-($value*100), $this); + } + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; } /** @@ -53,7 +76,11 @@ public function HandleEvent($variable, $value, IPSModuleShutter $module){ * Hinauffahren der Beschattung */ public function MoveUp(){ - HM_WriteValueFloat($this->InstanceId , 'LEVEL', 1); + if ($this->reverseControl) { + HM_WriteValueFloat($this->instanceId , 'LEVEL', 0); + } else { + HM_WriteValueFloat($this->instanceId , 'LEVEL', 1); + } } /** @@ -62,7 +89,11 @@ public function MoveUp(){ * Hinunterfahren der Beschattung */ public function MoveDown(){ - HM_WriteValueFloat($this->InstanceId , 'LEVEL', 0); + if ($this->reverseControl) { + HM_WriteValueFloat($this->instanceId , 'LEVEL', 1); + } else { + HM_WriteValueFloat($this->instanceId , 'LEVEL', 0); + } } /** @@ -71,7 +102,7 @@ public function MoveDown(){ * Stop */ public function Stop() { - HM_WriteValueFloat($this->InstanceId , 'STOP', true); + HM_WriteValueBoolean($this->instanceId , 'STOP', true); } } diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_HomematicRelay.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_HomematicRelay.class.php new file mode 100644 index 0000000..7cbd7d6 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_HomematicRelay.class.php @@ -0,0 +1,105 @@ + + */ + + IPSUtils_Include ('IPSComponentShutter.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentShutter'); + + class IPSComponentShutter_HomematicRelay extends IPSComponentShutter { + + private $instanceId1; + private $instanceId2; + private $directionSwitch; + + + /** + * @public + * + * Initialisierung eines IPSComponentShutter_HomematicRelay Objektes + * + * @param integer $instanceId1 InstanceId 1 des HM Devices (Movement) + * @param integer $instanceId2 InstanceId 2 des HM Devices (Direction) + * @param boolean $directionSwitch Richtungs Schalter (default=false) + */ + public function __construct($instanceId1, $instanceId2, $directionSwitch=false) { + $this->instanceId1 = IPSUtil_ObjectIDByPath($instanceId1); + $this->instanceId2 = IPSUtil_ObjectIDByPath($instanceId2); + $this->directionSwitch = $directionSwitch; + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId1.','.$this->instanceId2; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleShutter $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleShutter $module){ + $name = IPS_GetName($variable); + throw new IPSComponentException('Event Handling NOT supported for Variable '.$variable.'('.$name.')'); + } + + /** + * @public + * + * Hinauffahren der Beschattung + */ + public function MoveUp() { + HM_WriteValueBoolean($this->instanceId1, 'STATE', true); + HM_WriteValueBoolean($this->instanceId2, 'STATE', $this->directionSwitch); + } + + /** + * @public + * + * Hinunterfahren der Beschattung + */ + public function MoveDown() { + HM_WriteValueBoolean($this->instanceId1, 'STATE', true); + HM_WriteValueBoolean($this->instanceId2, 'STATE', !$this->directionSwitch); + } + + /** + * @public + * + * Stop + */ + public function Stop() { + HM_WriteValueBoolean($this->instanceId1, 'STATE', false); + } + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_IPSShutterControl.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_IPSShutterControl.class.php index 265d96d..1e043f9 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_IPSShutterControl.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_IPSShutterControl.class.php @@ -19,7 +19,9 @@ * Version 2.50.1, 31.01.2012
*/ - abstract class IPSComponentShutter_IPSShutterControl extends IPSComponentShutter { + IPSUtils_Include ('IPSComponentShutter.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentShutter'); + + class IPSComponentShutter_IPSShutterControl extends IPSComponentShutter { private $instanceId; @@ -34,6 +36,19 @@ public function __construct($instanceId) { $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); } + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + /** * @public * diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_LCN.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_LCN.class.php index 23a7b32..e6c6e77 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_LCN.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_LCN.class.php @@ -19,7 +19,9 @@ * Version 2.50.1, 31.01.2012
*/ - abstract class IPSComponentShutter_LCN extends IPSComponentShutter { + IPSUtils_Include ('IPSComponentShutter.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentShutter'); + + class IPSComponentShutter_LCN extends IPSComponentShutter { private $instanceId1; private $instanceId2; @@ -42,6 +44,19 @@ public function __construct($instanceId1, $instanceId2, $directionSwitch=false) $this->unitType = LCN_GetUnit($this->instanceId1); } + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId1.','.$this->instanceId2; + } + /** * @public * @@ -68,8 +83,8 @@ public function MoveUp(){ LCN_SetIntensity($this->instanceId1,100,4); break; case 2: - LCN_SwitchRelay($this->instanceId1, true); LCN_SwitchRelay($this->instanceId2, $this->directionSwitch); + LCN_SwitchRelay($this->instanceId1, true); break; default: throw new IPSComponentException('Unknown Unittype '.$this->unitType.' for LCN Device with ID='.$this->instanceId1); @@ -87,8 +102,8 @@ public function MoveDown(){ LCN_SetIntensity($this->instanceId1,100,4); break; case 2: + LCN_SwitchRelay($this->instanceId2, !$this->directionSwitch); LCN_SwitchRelay($this->instanceId1, true); - LCN_SwitchRelay($this->instanceId2, $this->directionSwitch); break; default: throw new IPSComponentException('Unknown Unittype '.$this->unitType.' for LCN Device with ID='.$this->instanceId1); diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_MoellerEaton.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_MoellerEaton.class.php index 8ef57b3..1a35b72 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_MoellerEaton.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_MoellerEaton.class.php @@ -19,7 +19,9 @@ * Version 2.50.1, 31.01.2012
*/ - abstract class IPSComponentShutter_MoellerEaton extends IPSComponentShutter { + IPSUtils_Include ('IPSComponentShutter.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentShutter'); + + class IPSComponentShutter_MoellerEaton extends IPSComponentShutter { private $instanceId; @@ -34,6 +36,20 @@ public function __construct($instanceId) { $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + /** * @public * diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_digitalStrom.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_digitalStrom.class.php new file mode 100644 index 0000000..8ab6c2f --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_digitalStrom.class.php @@ -0,0 +1,97 @@ + + */ + + IPSUtils_Include ('IPSComponentShutter.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentShutter'); + + class IPSComponentShutter_digitalStrom extends IPSComponentShutter { + + private $instanceId; + + /** + * @public + * + * Initialisierung eines IPSComponentShutter_digitalStrom Objektes + * + * @param integer $instanceId InstanceId des digitalStrom Devices + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleShutter $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleShutter $module){ + $name = IPS_GetName($variable); + throw new IPSComponentException('Event Handling NOT supported for Variable '.$variable.'('.$name.')'); + } + + /** + * @public + * + * Hinauffahren der Beschattung + */ + public function MoveUp(){ + DS_ShutterMoveUp($this->instanceId); + } + + /** + * @public + * + * Hinunterfahren der Beschattung + */ + public function MoveDown(){ + DS_ShutterMoveDown($this->instanceId); + } + + /** + * @public + * + * Stop + */ + public function Stop() { + DS_ShutterStop($this->instanceId); + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_zwave.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_zwave.class.php new file mode 100644 index 0000000..a7ee782 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSComponentShutter_zwave.class.php @@ -0,0 +1,111 @@ +< + */ + + IPSUtils_Include ('IPSComponentShutter.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentShutter'); + + class IPSComponentShutter_zwave extends IPSComponentShutter { + + private $instanceId; + private $reverseControl; + + /** + * @public + * + * Initialisierung eines IPSComponentShutter_zwave Objektes + * + * @param integer $instanceId InstanceId des Homematic Devices + * @param boolean $reverseControl Reverse Ansteuerung des Devices + */ + public function __construct($instanceId, $reverseControl=false) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + $this->reverseControl = $reverseControl; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleShutter $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleShutter $module){ + if ($this->reverseControl) { + $module->SyncPosition(($value*100), $this); + } else { + $module->SyncPosition(100-($value*100), $this); + } + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Hinauffahren der Beschattung + */ + public function MoveUp(){ + if ($this->reverseControl) { + ZW_ShutterMoveDown($this->instanceId); + } else { + ZW_ShutterMoveUp($this->instanceId); + } + } + + /** + * @public + * + * Hinunterfahren der Beschattung + */ + public function MoveDown(){ + if ($this->reverseControl) { + ZW_ShutterMoveUp($this->instanceId); + } else { + ZW_ShutterMoveDown($this->instanceId); + } + } + + /** + * @public + * + * Stop + */ + public function Stop() { + ZW_ShutterStop ($this->instanceId); + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSModuleShutter.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSModuleShutter.class.php index 54420a0..14c6d32 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSModuleShutter.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSModuleShutter.class.php @@ -29,7 +29,7 @@ abstract class IPSModuleShutter extends IPSModule { * * @param string $position Aktuelle Position der Beschattung (Wertebereich 0-100) */ - abstract public function SyncPosition($position); + abstract public function SyncPosition($position, IPSComponentShutter $component); } diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSModuleShutter_IPSShadowing.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSModuleShutter_IPSShadowing.class.php new file mode 100644 index 0000000..0d1e99c --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentShutter/IPSModuleShutter_IPSShadowing.class.php @@ -0,0 +1,55 @@ + + */ + + IPSUtils_Include ("IPSShadowing.inc.php", "IPSLibrary::app::modules::IPSShadowing"); + IPSUtils_Include ('IPSModuleShutter.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentShutter'); + + class IPSModuleShutter_IPSShadowing extends IPSModuleShutter { + + /** + * @public + * + * Ermöglicht die Synchronisation der aktuellen Position der Beschattung + * + * @param string $position Aktuelle Position der Beschattung (Wertebereich 0-100) + */ + public function SyncPosition($position, IPSComponentShutter $componentToSync) { + $componentParamsToSync = $componentToSync->GetComponentParams(); + $deviceConfig = get_ShadowingConfiguration(); + foreach ($deviceConfig as $deviceIdent=>$deviceData) { + $componentConfig = IPSComponent::CreateObjectByParams($deviceData[c_Property_Component]); + $componentParamsConfig = $componentConfig->GetComponentParams(); + if ($componentParamsConfig==$componentParamsToSync) { + $categoryIdDevices = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSShadowing.Devices'); + $deviceId = IPS_GetObjectIDByIdent($deviceIdent, $categoryIdDevices); + + $device = new IPSShadowing_Device($deviceId); + $device->MoveByEvent($position); + } + } + } + + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch.class.php index 8443b15..d8c693c 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch.class.php @@ -20,6 +20,8 @@ * Version 2.50.1, 31.01.2012
*/ + IPSUtils_Include ('IPSComponent.class.php', 'IPSLibrary::app::core::IPSComponent'); + abstract class IPSComponentSwitch extends IPSComponent { /** @@ -40,8 +42,10 @@ abstract public function HandleEvent($variable, $value, IPSModuleSwitch $module) * Zustand Setzen * * @param boolean $value Wert für Schalter + * @param integer $onTime Zeit in Sekunden nach der der Aktor automatisch ausschalten soll (ACHTUNG: wird nicht von + * allen Hardware Komponenten unterstützt). */ - abstract public function SetState($value); + abstract public function SetState($value, $onTime=false); /** * @public diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_1WireD2408.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_1WireD2408.class.php index abddba5..22c5e11 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_1WireD2408.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_1WireD2408.class.php @@ -32,10 +32,24 @@ class IPSComponentSwitch_1WireD2408 extends IPSComponentSwitch { * Initialisierung eines IPSComponentSwitch_1WireD2408 Objektes * * @param integer $instanceId InstanceId des 1WireD2408 Devices + * @param integer $channelId Kanal des 1WireD2408 Devices */ public function __construct($instanceId, $channelId) { $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); - $this->channelId = $channelId; + $this->channelId = (int)$channelId; + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId.','.$this->channelId; } /** @@ -49,6 +63,7 @@ public function __construct($instanceId, $channelId) { * @param IPSModuleSwitch $module Module Object an das das aufgetretene Event weitergeleitet werden soll */ public function HandleEvent($variable, $value, IPSModuleSwitch $module){ + $module->SyncState($value, $this); } /** @@ -57,8 +72,9 @@ public function HandleEvent($variable, $value, IPSModuleSwitch $module){ * Zustand Setzen * * @param boolean $value Wert für Schalter + * @param integer $onTime Zeit in Sekunden nach der der Aktor automatisch ausschalten soll (nicht unterstützt) */ - public function SetState($value) { + public function SetState($value, $onTime=false) { TMEX_F29_SetPin($this->instanceId, $this->channelId, $value); } diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_1WireD2413.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_1WireD2413.class.php new file mode 100644 index 0000000..def604e --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_1WireD2413.class.php @@ -0,0 +1,95 @@ + + */ + + IPSUtils_Include ('IPSComponentSwitch.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSwitch'); + + class IPSComponentSwitch_1WireD2413 extends IPSComponentSwitch { + + private $instanceId; + private $channelId; + + /** + * @public + * + * Initialisierung eines IPSComponentSwitch_1WireD2413 Objektes + * + * @param integer $instanceId InstanceId des 1WireD2413 Devices + * @param integer $channelId Kanal des 1WireD2413 Devices + */ + public function __construct($instanceId, $channelId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + $this->channelId = (int)$channelId; + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId.','.$this->channelId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleSwitch $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleSwitch $module){ + $module->SyncState($value, $this); + } + + /** + * @public + * + * Zustand Setzen + * + * @param boolean $value Wert für Schalter + * @param integer $onTime Zeit in Sekunden nach der der Aktor automatisch ausschalten soll (nicht unterstützt) + */ + public function SetState($value, $onTime=false) { + TMEX_F3A_SetPin($this->instanceId, $this->channelId, $value); + } + + /** + * @public + * + * Liefert aktuellen Zustand + * + * @return boolean aktueller Schaltzustand + */ + public function GetState() { + return null; + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_ALLNET.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_ALLNET.class.php new file mode 100644 index 0000000..cc479b8 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_ALLNET.class.php @@ -0,0 +1,92 @@ + + */ + + IPSUtils_Include ('IPSComponentSwitch.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSwitch'); + + class IPSComponentSwitch_ALLNET extends IPSComponentSwitch { + + private $instanceId; + + /** + * @public + * + * Initialisierung eines IPSComponentSwitch_ALLNET Objektes + * + * @param integer $instanceId InstanceId des ALLNET Devices + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleSwitch $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleSwitch $module){ + $module->SyncState($value, $this); + } + + /** + * @public + * + * Zustand Setzen + * + * @param boolean $value Wert für Schalter + */ + public function SetState($value) { + ALL_SwitchMode($this->instanceId, $value); + } + + /** + * @public + * + * Liefert aktuellen Zustand + * + * @return boolean aktueller Schaltzustand + */ + public function GetState() { + $value = GetValueBoolean(IPS_GetObjectIDByIdent("StatusVariable",$this->instanceId)); + return $value; + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_DMX.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_DMX.class.php new file mode 100644 index 0000000..d9b0614 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_DMX.class.php @@ -0,0 +1,99 @@ + + */ + + IPSUtils_Include ('IPSComponentSwitch.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSwitch'); + + class IPSComponentSwitch_DMX extends IPSComponentSwitch { + + private $instanceId; + private $channelId; + + /** + * @public + * + * Initialisierung eines IPSComponentSwitch_DMX Objektes + * + * @param integer $instanceId InstanceId des DMX Devices + * @param integer $channelId Kanal des DMX Devices + */ + public function __construct($instanceId, $channelId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + $this->channelId = (int)$channelId; + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId.','.$this->channelId; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleSwitch $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleSwitch $module){ + $module->SyncState($value, $this); + } + + /** + * @public + * + * Zustand Setzen + * + * @param boolean $value Wert für Schalter + * @param integer $onTime Zeit in Sekunden nach der der Aktor automatisch ausschalten soll (nicht unterstützt) + */ + public function SetState($value, $onTime=false) { + if ($value) { + DMX_SetValue ($this->instanceId, $this->channel1, 255); + } else { + DMX_SetValue ($this->instanceId, $this->channel1, 0); + } + } + + /** + * @public + * + * Liefert aktuellen Zustand + * + * @return boolean aktueller Schaltzustand + */ + public function GetState() { + return null; + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_Dummy.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_Dummy.class.php index 9caac34..dcc8a5a 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_Dummy.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_Dummy.class.php @@ -36,6 +36,19 @@ public function __construct($instanceId) { $this->instanceId = $instanceId; } + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + /** * @public * @@ -55,9 +68,13 @@ public function HandleEvent($variable, $value, IPSModuleSwitch $module){ * Zustand Setzen * * @param boolean $value Wert für Schalter + * @param integer $onTime Zeit in Sekunden nach der der Aktor automatisch ausschalten soll (nicht unterstützt) */ - public function SetState($value) { - IPSLogger_Trc(__file__, 'Activate Dummy-Switch "'.$this->instanceId.'", Value='.($value?'On':'Off')); + public function SetState($value, $onTime=false) { + if ($onTime!==false and $value) + IPSLogger_Trc(__file__, 'Activate Dummy-Switch "'.$this->instanceId.'", Value='.($value?'On':'Off').', OnTime='.$onTime); + else + IPSLogger_Trc(__file__, 'Activate Dummy-Switch "'.$this->instanceId.'", Value='.($value?'On':'Off')); } /** diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_EIB.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_EIB.class.php new file mode 100644 index 0000000..65441fa --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_EIB.class.php @@ -0,0 +1,92 @@ + + */ + + IPSUtils_Include ('IPSComponentSwitch.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSwitch'); + + class IPSComponentSwitch_EIB extends IPSComponentSwitch { + + private $instanceId; + + /** + * @public + * + * Initialisierung eines IPSComponentSwitch_EIB Objektes + * + * @param integer $instanceId InstanceId des EIB Devices + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleSwitch $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleSwitch $module){ + $module->SyncState($value, $this); + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Zustand Setzen + * + * @param boolean $value Wert für Schalter + * @param integer $onTime Zeit in Sekunden nach der der Aktor automatisch ausschalten soll (nicht unterstützt) + */ + public function SetState($value, $onTime=false) { + EIB_Switch($this->instanceId, $value); + } + + /** + * @public + * + * Liefert aktuellen Zustand + * + * @return boolean aktueller Schaltzustand + */ + public function GetState() { + GetValue(IPS_GetVariableIDByName('Value', $this->instanceId)); + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_EatonMoeller.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_EatonMoeller.class.php new file mode 100644 index 0000000..412ebb6 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_EatonMoeller.class.php @@ -0,0 +1,78 @@ + + */ + + IPSUtils_Include ('IPSComponentSwitch.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSwitch'); + + class IPSComponentSwitch_EatonMoeller extends IPSComponentSwitch { + + private $instanceId; + + /** + * @public + * + * Initialisierung eines IPSComponentSwitch_EatonMoeller Objektes + * + * @param integer $instanceId InstanceId des EatonMoeller Devices + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleSwitch $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleSwitch $module){ + } + + /** + * @public + * + * Zustand Setzen + * + * @param boolean $value Wert für Schalter + * @param integer $onTime Zeit in Sekunden nach der der Aktor automatisch ausschalten soll (nicht unterstützt) + */ + public function SetState($value, $onTime=false) { + MXC_SwitchMode($this->instanceId, $value); + } + + /** + * @public + * + * Liefert aktuellen Zustand + * + * @return boolean aktueller Schaltzustand + */ + public function GetState() { + GetValue(IPS_GetVariableIDByName('Status', $this->instanceId)); + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_Enocean.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_Enocean.class.php new file mode 100644 index 0000000..19dac57 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_Enocean.class.php @@ -0,0 +1,92 @@ + + */ + + IPSUtils_Include ('IPSComponentSwitch.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSwitch'); + + class IPSComponentSwitch_Enocean extends IPSComponentSwitch { + + private $instanceId; + + /** + * @public + * + * Initialisierung eines IPSComponentSwitch_Enocean Objektes + * + * @param integer $instanceId InstanceId des Homematic Devices + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleSwitch $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleSwitch $module){ + $module->SyncState($value, $this); + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Zustand Setzen + * + * @param boolean $value Wert für Schalter + * @param integer $onTime Zeit in Sekunden nach der der Aktor automatisch ausschalten soll + */ + public function SetState($value, $onTime=false) { + ENO_SwitchMode($this->instanceId, $value); + } + + /** + * @public + * + * Liefert aktuellen Zustand + * + * @return boolean aktueller Schaltzustand + */ + public function GetState() { + GetValue(IPS_GetVariableIDByIdent('STATE', $this->instanceId)); + } + + } + + /** @}*/ +?> diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_FS20.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_FS20.class.php index 9c66567..b311f3b 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_FS20.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_FS20.class.php @@ -36,6 +36,19 @@ public function __construct($instanceId) { $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); } + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + /** * @public * @@ -47,6 +60,7 @@ public function __construct($instanceId) { * @param IPSModuleSwitch $module Module Object an das das aufgetretene Event weitergeleitet werden soll */ public function HandleEvent($variable, $value, IPSModuleSwitch $module){ + $module->SyncState($value, $this); } /** @@ -55,9 +69,13 @@ public function HandleEvent($variable, $value, IPSModuleSwitch $module){ * Zustand Setzen * * @param boolean $value Wert für Schalter + * @param integer $onTime Zeit in Sekunden nach der der Aktor automatisch ausschalten soll */ - public function SetState($value) { - FS20_SwitchMode($this->instanceId, $value); + public function SetState($value, $onTime=false) { + if (!$onTime or !$value) + FS20_SwitchMode($this->instanceId, $value); + else + FS20_SwitchDuration($this->instanceId, $value, $onTime); } /** @@ -68,7 +86,9 @@ public function SetState($value) { * @return boolean aktueller Schaltzustand */ public function GetState() { - return null; + $value = GetValueBoolean(IPS_GetObjectIDByIdent("StatusVariable",$this->instanceId)); + return $value; + } } diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_Homematic.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_Homematic.class.php index fff4910..7328b51 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_Homematic.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_Homematic.class.php @@ -24,6 +24,7 @@ class IPSComponentSwitch_Homematic extends IPSComponentSwitch { private $instanceId; + private $supportsOnTime; /** * @public @@ -31,9 +32,11 @@ class IPSComponentSwitch_Homematic extends IPSComponentSwitch { * Initialisierung eines IPSComponentSwitch_Homematic Objektes * * @param integer $instanceId InstanceId des Homematic Devices + * @param integer $supportsOnTime spezifiziert ob das Homematic Device eine ONTIME unterstützt */ - public function __construct($instanceId) { - $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + public function __construct($instanceId, $supportsOnTime=true) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + $this->supportsOnTime = $supportsOnTime; } /** @@ -47,6 +50,20 @@ public function __construct($instanceId) { * @param IPSModuleSwitch $module Module Object an das das aufgetretene Event weitergeleitet werden soll */ public function HandleEvent($variable, $value, IPSModuleSwitch $module){ + $module->SyncState($value, $this); + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; } /** @@ -55,8 +72,12 @@ public function HandleEvent($variable, $value, IPSModuleSwitch $module){ * Zustand Setzen * * @param boolean $value Wert für Schalter + * @param integer $onTime Zeit in Sekunden nach der der Aktor automatisch ausschalten soll */ - public function SetState($value) { + public function SetState($value, $onTime=false) { + if ($onTime!==false and $value and $this->supportsOnTime===true) + HM_WriteValueFloat($this->instanceId, "ON_TIME", $onTime); + HM_WriteValueBoolean($this->instanceId, "STATE", $value); } @@ -68,7 +89,7 @@ public function SetState($value) { * @return boolean aktueller Schaltzustand */ public function GetState() { - GetValue(IPS_GetVariableIDByName('STATE', $this->instanceId)); + GetValue(IPS_GetVariableIDByIdent('STATE', $this->instanceId)); } } diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_LCN.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_LCN.class.php new file mode 100644 index 0000000..7095948 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_LCN.class.php @@ -0,0 +1,92 @@ + + */ + + IPSUtils_Include ('IPSComponentSwitch.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSwitch'); + + class IPSComponentSwitch_LCN extends IPSComponentSwitch { + + private $instanceId; + + /** + * @public + * + * Initialisierung eines IPSComponentSwitch_LCN Objektes + * + * @param integer $instanceId InstanceId des LCN Devices + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleSwitch $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleSwitch $module){ + $module->SyncState($value, $this); + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Zustand Setzen + * + * @param boolean $value Wert für Schalter + * @param integer $onTime Zeit in Sekunden nach der der Aktor automatisch ausschalten soll (nicht unterstützt) + */ + public function SetState($value, $onTime=false) { + LCN_SwitchRelay($this->instanceId, $value); + } + + /** + * @public + * + * Liefert aktuellen Zustand + * + * @return boolean aktueller Schaltzustand + */ + public function GetState() { + GetValue(IPS_GetVariableIDByName('Status', $this->instanceId)); + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_LCNa.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_LCNa.class.php new file mode 100644 index 0000000..ad290ba --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_LCNa.class.php @@ -0,0 +1,98 @@ + + */ + + IPSUtils_Include ('IPSComponentSwitch.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSwitch'); + + class IPSComponentSwitch_LCNa extends IPSComponentSwitch { + + private $instanceId; + + /** + * @public + * + * Initialisierung eines IPSComponentSwitch_LCNa Objektes + * + * @param integer $instanceId InstanceId des LCN Devices + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleSwitch $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleSwitch $module) { + if ($value > 0) + $module->SyncState(true, $this); + else + $module->SyncState(false, $this); + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId; + } + + /** + * @public + * + * Zustand Setzen + * + * @param boolean $value Wert für Schalter + * @param integer $onTime Zeit in Sekunden nach der der Aktor automatisch ausschalten soll (nicht unterstützt) + */ + public function SetState($value, $onTime=false) { + if ($value) + LCN_SetIntensity($this->instanceId, 100, 0.2); + else + LCN_SetIntensity($this->instanceId, 0, 0.2); + } + + /** + * @public + * + * Liefert aktuellen Zustand + * + * @return boolean aktueller Schaltzustand + */ + public function GetState() { + GetValue(IPS_GetVariableIDByName('Intensity', $this->instanceId)); + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_ModBus.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_ModBus.class.php new file mode 100644 index 0000000..3050846 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_ModBus.class.php @@ -0,0 +1,79 @@ + + */ + + IPSUtils_Include ('IPSComponentSwitch.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSwitch'); + + class IPSComponentSwitch_ModBus extends IPSComponentSwitch { + + private $instanceId; + + /** + * @public + * + * Initialisierung eines IPSComponentSwitch_ModBus Objektes + * + * @param integer $instanceId InstanceId des ModBus Devices + */ + public function __construct($instanceId) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleSwitch $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleSwitch $module){ + $module->SyncState($value, $this); + } + + /** + * @public + * + * Zustand Setzen + * + * @param boolean $value Wert für Schalter + * @param integer $onTime Zeit in Sekunden nach der der Aktor automatisch ausschalten soll (nicht unterstützt) + */ + public function SetState($value, $onTime=false) { + ModBus_WriteCoil($this->instanceId, $value); + } + + /** + * @public + * + * Liefert aktuellen Zustand + * + * @return boolean aktueller Schaltzustand + */ + public function GetState() { + GetValue(IPS_GetObjectIDByIdent('Value', $this->instanceId)); + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_Plugwise.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_Plugwise.class.php new file mode 100644 index 0000000..71afd5b --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_Plugwise.class.php @@ -0,0 +1,138 @@ + + */ + + IPSUtils_Include ('IPSComponentSwitch.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSwitch'); + IPSUtils_Include("Plugwise_Include.ips.php","IPSLibrary::app::hardware::Plugwise"); + IPSUtils_Include ('IPSMessageHandler.class.php', 'IPSLibrary::app::core::IPSMessageHandler'); + + class IPSComponentSwitch_Plugwise extends IPSComponentSwitch { + + private $instanceId; + + /** + * @public + * + * Initialisierung eines IPSComponentSwitch_Plugwise Objektes + * + * @param integer $instanceId InstanceId des Plugwise Devices + */ + public function __construct($instanceId) + { + // automatischen Einbinden/Konfiguration + // wenn schon vorhanden dann ohne Einfluss + $var = (int)$instanceId; + + $component = "IPSComponentSwitch_Plugwise,".$var; + $module = "IPSModuleSwitch_IPSLight"; + + $messageHandler = new IPSMessageHandler(); + + $messageHandler->RegisterOnChangeEvent($var, $component, $module); + + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + + + + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + + return get_class($this).','.$this->instanceId; + + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleSwitch $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleSwitch $module){ + $module->SyncState($value, $this); + IPS_LogMessage(__File__,"Variable ".$variable." sync"); + + } + + /** + * @public + * + * Zustand Setzen + * + * @param boolean $value Wert für Schalter + */ + public function SetState($value,$onTime=false) { + + // Gibt es die Variable ? + $exist = IPS_VariableExists($this->instanceId); + if ( !$exist) + { + IPS_LogMessage(__File__,"Variable ".$this->instanceId." existiert nicht"); + return; + } + $parent = @IPS_GetParent($this->instanceId); + $obj = @IPS_GetObject ( $parent ); + if ( !$obj ) + { + IPS_LogMessage(__File__,"ParentVariable ".$parent." existiert nicht"); + return; + } + $ident = $obj['ObjectIdent']; + + $state = circle_on_off($ident,$value); + return $state; + } + + /** + * @public + * + * Liefert aktuellen Zustand + * + * @return boolean aktueller Schaltzustand + */ + public function GetState() { + //$value = GetValueBoolean(IPS_GetObjectIDByIdent("StatusVariable",$this->instanceId)); + $VarId = @IPS_GetVariableIDByName("Status",$this->instanceId); + if ( !$VarId ) + { + IPS_LogMessage(__File__,"Variable Status von ".$this->instanceId." existiert nicht"); + return; + } + + return $value; + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_ZW.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_ZW.class.php new file mode 100644 index 0000000..d8b5f22 --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSComponentSwitch_ZW.class.php @@ -0,0 +1,130 @@ + + */ + + IPSUtils_Include ('IPSComponentSwitch.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSwitch'); + + class IPSComponentSwitch_ZW extends IPSComponentSwitch { + + private $instanceId; + private $channel; + + // Welche Klassen unterstütz der Schalter? + private $b_class_basic = false; + private $b_class_switch = false; + private $b_class_multi = false; + + /** + * @public + * + * Initialisierung eines IPSComponentSwitch_ZW_Basic Objektes + * + * @param integer $instanceId InstanceId des Z-Wave Devices + */ + public function __construct($instanceId, $channel=0) { + $this->instanceId = IPSUtil_ObjectIDByPath($instanceId); + // Bei Multiinstanz fähigen Schalter gleich den Kanal merken + $this->channel = (int)$channel; + //Ermittlung der unterstützten Klassen + $classes = ZW_GetNodeClasses((int)$instanceId); + foreach ($classes as $class) { + switch ((int)$class){ + case 32: + $this->b_class_basic = true; + break; + case 37: + $this->b_class_switch = true; + break; + case 96: + $this->b_class_multi = true; + break; + } + } + + } + + /** + * @public + * + * Funktion liefert String IPSComponent Constructor String. + * String kann dazu benützt werden, das Object mit der IPSComponent::CreateObjectByParams + * wieder neu zu erzeugen. + * + * @return string Parameter String des IPSComponent Object + */ + public function GetComponentParams() { + return get_class($this).','.$this->instanceId.','.$this->channel; + } + + /** + * @public + * + * Function um Events zu behandeln, diese Funktion wird vom IPSMessageHandler aufgerufen, um ein aufgetretenes Event + * an das entsprechende Module zu leiten. + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param IPSModuleSwitch $module Module Object an das das aufgetretene Event weitergeleitet werden soll + */ + public function HandleEvent($variable, $value, IPSModuleSwitch $module){ + $module->SyncState($value, $this); + } + + /** + * @public + * + * Zustand Setzen + * + * @param boolean $value Wert für Schalter + * @param integer $onTime Zeit in Sekunden nach der der Aktor automatisch ausschalten soll (nicht unterstützt) + */ + public function SetState($value, $onTime=false) { + // Ein Binary Switch + if ($this->b_class_switch and ($this->channel == 0)) + ZW_SwitchMode((int)$this->instanceId, $value); + // Ein Basic Switch + elseif ($this->b_class_basic and ($this->channel == 0)) + ZW_Basic((int)$this->instanceId, $value); + // Ein Multiswitch + elseif (($this->channel > 0) and $this->b_class_multi) + ZW_SwitchModeEx((int)$this->instanceId, $value, $this->channel); + } + + /** + * @public + * + * Liefert aktuellen Zustand + * + * @return boolean aktueller Schaltzustand + */ + public function GetState() { + if ($this->b_class_multi and ($this->channel > 0)) + $id = @IPS_GetObjectIDByIdent("MultiInstance".$this->channel."Variable",(int)$this->instanceId); + else + $id = @IPS_GetObjectIDByIdent("DataVariableBoolean",(int)$this->instanceId); + + if ($id > 0) + return GetValue($id); + else + return false; + } + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSModuleSwitch.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSModuleSwitch.class.php index 4667738..81c1df0 100644 --- a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSModuleSwitch.class.php +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSModuleSwitch.class.php @@ -29,7 +29,7 @@ abstract class IPSModuleSwitch extends IPSModule { * * @param boolean $state aktueller Status des Gerätes */ - abstract public function SyncState($state); + abstract public function SyncState($state, IPSComponentSwitch $componentToSync); } diff --git a/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSModuleSwitch_IPSLight.class.php b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSModuleSwitch_IPSLight.class.php new file mode 100644 index 0000000..4ae100c --- /dev/null +++ b/IPSLibrary/app/core/IPSComponent/IPSComponentSwitch/IPSModuleSwitch_IPSLight.class.php @@ -0,0 +1,52 @@ + + */ + + IPSUtils_Include ("IPSLight.inc.php", "IPSLibrary::app::modules::IPSLight"); + IPSUtils_Include ('IPSModuleSwitch.class.php', 'IPSLibrary::app::core::IPSComponent::IPSComponentSwitch'); + + class IPSModuleSwitch_IPSLight extends IPSModuleSwitch { + + /** + * @public + * + * Ermöglicht die Synchronisation einer Beleuchtung zu IPSLight + * + * @param string $state Aktueller Status des Switch + */ + public function SyncState($state, IPSComponentSwitch $componentToSync) { + $componentParamsToSync = $componentToSync->GetComponentParams(); + $deviceConfig = IPSLight_GetLightConfiguration(); + foreach ($deviceConfig as $deviceIdent=>$deviceData) { + $componentConfig = IPSComponent::CreateObjectByParams($deviceData[IPSLIGHT_COMPONENT]); + $componentParamsConfig = $componentConfig->GetComponentParams(); + if ($componentParamsConfig==$componentParamsToSync) { + $lightManager = new IPSLight_Manager(); + $lightManager->SynchronizeSwitch($deviceIdent, $state); + } + } + } + + + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSConfigHandler/IPSConfigHandler.class.php b/IPSLibrary/app/core/IPSConfigHandler/IPSConfigHandler.class.php index e3a4608..d97abe0 100644 --- a/IPSLibrary/app/core/IPSConfigHandler/IPSConfigHandler.class.php +++ b/IPSLibrary/app/core/IPSConfigHandler/IPSConfigHandler.class.php @@ -30,12 +30,14 @@ class IPSConfigurationException extends Exception { */ abstract class IPSConfigHandler { - const VERSION = 'Version'; // Current Module Verison + const SCRIPTVERSION = 'Version'; // Current Module Verison (Script) + const INSTALLVERSION = 'InstallVersion'; // Current Module Verison (Installation) const MODULENAMESPACE = 'ModuleNamespace'; // Module Namespace const SOURCEREPOSITORY = 'SourceRepository'; // Pfad/Url zum Source Repository const LOGDIRECTORY = 'LogDirectory'; // Logging Directory + const CHANGELIST = 'ChangeList'; // ChangeList + const REQUIREDMODULES = 'RequiredModules'; // Required Modules - protected $configData = array(); /** @@ -48,10 +50,10 @@ abstract class IPSConfigHandler { * @return boolean liefert Existenz des übergebenen Parameters */ public function ExistsValue($key, $section=null) { - if ($section==null) { - return array_key_exists($key,$this->configData); + if ($section==null) { + return array_key_exists($key,$this->configData); } else { - return (array_key_exists($section,$this->configData) and array_key_exists($key,$this->configData[$section])); + return (array_key_exists($section,$this->configData) and array_key_exists($key,$this->configData[$section])); } } @@ -66,10 +68,10 @@ public function ExistsValue($key, $section=null) { * @throws IPSConfigurationException wenn der betroffene Parameter nicht gefunden wurde */ public function GetValue($key, $section=null) { - if (!$this->ExistsValue($key, $section)) { + if (!$this->ExistsValue($key, $section)) { throw new IPSConfigurationException('Configuration Value with Key='.$key.' could NOT be found (Section="'.$section.'")', - E_USER_ERROR); - } elseif ($section==null) { + E_USER_ERROR); + } elseif ($section==null) { return $this->configData[$key]; } else { return $this->configData[$section][$key]; @@ -87,7 +89,7 @@ public function GetValue($key, $section=null) { * @throws IPSConfigurationException wenn der betroffene Parameter nicht gefunden wurde */ public function GetValueInt ($key, $section=null) { - return (int)$this->GetValue($key, $section); + return (int)$this->GetValue($key, $section); } /** @@ -101,7 +103,14 @@ public function GetValueInt ($key, $section=null) { * @throws IPSConfigurationException wenn der betroffene Parameter nicht gefunden wurde */ public function GetValueBool ($key, $section=null) { - return (boolean)$this->GetValue($key, $section); + $value = $this->GetValue($key, $section); + if ($value=='false') { + return false; + } elseif ($value=='true') { + return true; + } else { + return (boolean)$value; + } } /** @@ -115,7 +124,7 @@ public function GetValueBool ($key, $section=null) { * @throws IPSConfigurationException wenn der betroffene Parameter nicht gefunden wurde */ public function GetValueFloat ($key, $section=null) { - return (float)$this->GetValue($key, $section); + return (float)$this->GetValue($key, $section); } /** @@ -130,14 +139,14 @@ public function GetValueFloat ($key, $section=null) { * @return string liefert den Wert des übergebenen Parameters */ public function GetValueDef($key, $section=null, $defaultValue="") { - if ($section==null) { - if ($this->ExistsValue($key, $section)) { + if ($section==null) { + if ($this->ExistsValue($key, $section)) { $result = $this->configData[$key]; } else { $result = $defaultValue; } } else { - if ($this->ExistsValue($key, $section)) { + if ($this->ExistsValue($key, $section)) { $result = $this->configData[$section][$key]; } else { $result = $defaultValue; @@ -158,7 +167,7 @@ public function GetValueDef($key, $section=null, $defaultValue="") { * @return integer retouniert den Wert des übergebenen Parameters */ public function GetValueIntDef($key, $section=null, $defaultValue="") { - return (int)$this->GetValueDef($key, $section, $defaultValue); + return (int)$this->GetValueDef($key, $section, $defaultValue); } /** @@ -173,7 +182,14 @@ public function GetValueIntDef($key, $section=null, $defaultValue="") { * @return boolean retouniert den Wert des übergebenen Parameters */ public function GetValueBoolDef ($key, $section=null, $defaultValue="") { - return (boolean)$this->GetValueDef($key, $section, $defaultValue); + $value = $this->GetValueDef($key, $section, $defaultValue); + if ($value=='false') { + return false; + } elseif ($value=='true') { + return true; + } else { + return (boolean)$value; + } } /** @@ -188,7 +204,7 @@ public function GetValueBoolDef ($key, $section=null, $defaultValue="") { * @return float retouniert den Wert des übergebenen Parameters */ public function GetValueFloatDef ($key, $section=null, $defaultValue="") { - return (float)$this->GetValueDef($key, $section, $defaultValue); + return (float)$this->GetValueDef($key, $section, $defaultValue); } } diff --git a/IPSLibrary/app/core/IPSConfigHandler/IPSIniConfigHandler.class.php b/IPSLibrary/app/core/IPSConfigHandler/IPSIniConfigHandler.class.php index abf3217..28c2b53 100644 --- a/IPSLibrary/app/core/IPSConfigHandler/IPSIniConfigHandler.class.php +++ b/IPSLibrary/app/core/IPSConfigHandler/IPSIniConfigHandler.class.php @@ -23,41 +23,40 @@ class IPSIniConfigHandler extends IPSConfigHandler { private $iniFileName=""; /** - * @public + * @public * * Initialisierung INI File ConigurationHandlers * - * @param string $iniFileName Name der INI Datei. - * @param string $namespace Namespace des INI Files + * @param string $iniFileName Name der INI Datei. + * @param string $namespace Namespace des INI Files */ public function __construct($iniFileName, $namespace="") { - $this->iniFileName = $this->GetFileName($iniFileName, $namespace); + $this->iniFileName = $this->GetFileName($iniFileName, $namespace); $this->LoadFile($this->iniFileName); - } + } + /** - * @public + * @public * * Initialisierung INI File ConfigHandlers * - * @param string $iniFileName Name der INI Datei. - * @param string $namespace Namespace des INI Files + * @param string $iniFileName Name der INI Datei. + * @param string $namespace Namespace des INI Files */ private function LoadFile () { - if (!file_exists($this->iniFileName)) { + if (!file_exists($this->iniFileName)) { throw new Exception('script '.$this->iniFileName.' could NOT be found!', E_USER_ERROR); } - - $this->configData = parse_ini_file($this->iniFileName, true); + $this->configData = parse_ini_file($this->iniFileName, true); } private function GetFileName ($iniFileName, $namespace="") { - if ($namespace=="") { + if ($namespace=="") { $result = $iniFileName; - } else { + } else { $result = IPS_GetKernelDir().'\\scripts\\'.str_replace('::','\\',$namespace).'\\'.$iniFileName;; - } - - return $result; + } + return $result; } } diff --git a/IPSLibrary/app/core/IPSLogger/IPSLogger.inc.php b/IPSLibrary/app/core/IPSLogger/IPSLogger.inc.php index 10863e6..5d796a9 100644 --- a/IPSLibrary/app/core/IPSLogger/IPSLogger.inc.php +++ b/IPSLibrary/app/core/IPSLogger/IPSLogger.inc.php @@ -129,9 +129,9 @@ function IPSLogger_Fat($LogContext, $LogMessage) { * @param $LogContext - Context of Logging (Identifier or Filename). * @param $LogMessage - Message to be logged */ - function IPSLogger_Err($LogContext, $LogMessage) { - IPSLogger_Out(c_LogLevel_Error, c_LogType_Error, $LogContext, $LogMessage); - } + function IPSLogger_Err($LogContext, $LogMessage) { + IPSLogger_Out(c_LogLevel_Error, c_LogType_Error, $LogContext, $LogMessage); + } // --------------------------------------------------------------------------------------------------------------------------- /** Procedure to log a Warning @@ -151,7 +151,7 @@ function IPSLogger_Wrn($LogContext, $LogMessage) { * @param $Priority - Priority of Notificaton Message (0 means high priority, higher values indicates a lower priority) */ function IPSLogger_Not($LogContext, $LogMessage, $Priority=0) { - IPSLogger_Out(c_LogLevel_Information, c_LogType_Information, $LogContext, $LogMessage, $Priority); + IPSLogger_Out(c_LogLevel_Notification, c_LogType_Notification, $LogContext, $LogMessage, $Priority); } // --------------------------------------------------------------------------------------------------------------------------- diff --git a/IPSLibrary/app/core/IPSLogger/IPSLogger_ChangeSettings.ips.php b/IPSLibrary/app/core/IPSLogger/IPSLogger_ChangeSettings.ips.php index de2e229..1759eb6 100644 --- a/IPSLibrary/app/core/IPSLogger/IPSLogger_ChangeSettings.ips.php +++ b/IPSLibrary/app/core/IPSLogger/IPSLogger_ChangeSettings.ips.php @@ -15,21 +15,21 @@ */ include "IPSLogger_Constants.inc.php"; - if ($IPS_VARIABLE==c_ID_EMailOutEnabled) { + if ($_IPS['VARIABLE']==c_ID_EMailOutEnabled) { if (c_ID_SmtpDevice <> 0) { - SetValue($IPS_VARIABLE, $IPS_VALUE); + SetValue($_IPS['VARIABLE'], $_IPS['VALUE']); if (!GetValue(c_ID_EMailOutEnabled)) { SetValue(c_ID_EMailOutMsgList, ''); IPS_SetScriptTimer(c_ID_ScriptSendMail, 0); } } - } else if ($IPS_VARIABLE==c_ID_ProwlOutEnabled) { + } else if ($_IPS['VARIABLE']==c_ID_ProwlOutEnabled) { if (c_Key_ProwlService <> '') { - SetValue($IPS_VARIABLE, $IPS_VALUE); + SetValue($_IPS['VARIABLE'], $_IPS['VALUE']); } } else { - SetValue($IPS_VARIABLE, $IPS_VALUE); + SetValue($_IPS['VARIABLE'], $_IPS['VALUE']); } ; /** @}*/ diff --git a/IPSLibrary/app/core/IPSLogger/IPSLogger_Output.inc.php b/IPSLibrary/app/core/IPSLogger/IPSLogger_Output.inc.php index 432774f..2b8af88 100644 --- a/IPSLibrary/app/core/IPSLogger/IPSLogger_Output.inc.php +++ b/IPSLibrary/app/core/IPSLogger/IPSLogger_Output.inc.php @@ -50,6 +50,8 @@ function IPSLogger_Out($LogLevel, $LogType, $Context, $Msg, $Priority=0) { IPSLogger_OutLog4IPS($LogLevel, $LogType, $Context, $Msg.$StackTxt); IPSLogger_OutEcho($LogLevel, $LogType, $Context, $Msg.$StackTxt); IPSLogger_OutProwl($LogLevel, $LogType, $Context, $Msg.$StackTxt, $Priority); + @IPSLogger_OutSysLog($LogLevel, $LogType, $Context, $Msg.$StackTxt); + @IPSLogger_OutMySQL($LogLevel, $LogType, $Context, $Msg.$StackTxt); } // --------------------------------------------------------------------------------------------------------------------------- @@ -106,6 +108,43 @@ function IPSLogger_OutLog4IPS($LogLevel, $LogType, $Context, $Msg) { } } + // --------------------------------------------------------------------------------------------------------------------------- + function IPSLogger_OutSysLog($LogLevel, $LogType, $Context, $Msg) { + if (defined('c_SysLog_Enabled') and c_SysLog_Enabled) { + $logTypeEnabled = true; + if (isset($SysLog_LogTypes) and array_key_exists($LogLevel, $SysLog_LogTypes) and $SysLog_LogTypes[$LogLevel]==false) { + $logTypeEnabled = false; + } + if ($logTypeEnabled) { + + // Sample Message + //<14>May 19 20:15:42 sbs2008.wps-computer.local IP-Symcon: ID 34690::SENDER Execute: My third PHP syslog message + + $severityList = array(2 /*Critical*/, 3 /*Error*/, 4 /*Warning*/, 5 /*Notice*/, 6 /*Info*/, 7 /*Debug*/, 7 /*Debug*/, 7 /*Debug*/, 7 /*Debug*/); + $severity = $severityList[$LogLevel]; + $facility = 1; + $priority = "<".($facility*8 + $severity).">"; + + $timestamp = date("M j H:i:s"); + $host = ''; + if (isset($_ENV["COMPUTERNAME"])) $host=$_ENV["COMPUTERNAME"]; + $message = substr($priority.$timestamp.' '.$host.' IP-Symcon-'.$Context.': '.$Msg, 0, 1024); + + if (c_SysLog_Instance != '') { + CSCK_SendText((int)c_SysLog_Instance, $message); + } else if (c_SysLog_Host != '') { + $handle = fsockopen("udp://".c_SysLog_Host, c_SysLog_Port, $errno, $errstr); + if ($handle) { + fwrite($handle, $message); + fclose($handle); + } + } else { + echo $message.PHP_EOL; + } + } + } + } + // --------------------------------------------------------------------------------------------------------------------------- function IPSLogger_OutEMail($LogLevel, $LogType, $Context, $Msg, $Priority) { if (GetValue(c_ID_EMailOutEnabled) and @@ -163,7 +202,10 @@ function IPSLogger_OutHtml($LogLevel, $LogType, $Context, $Msg) { $MsgList = GetValue(c_ID_HtmlOutMsgList); $MsgCount = GetValue(c_ID_HtmlOutMsgCount); - $TablePrefix = ''; + $TablePrefix = ' +
'; $TablePrefix .= c_Style_HtmlOutColGroup; //IPSymcon-Inf-WinLIRC 2010-12-03 22:09:13.000 Msg ... @@ -270,11 +312,11 @@ function IPSLogger_SendProwlMessage($Event, $Description, $Priority) { } // ---------------------------------------------------------------------------------------------------------------------------- - function IPSLogger_OutProgram($Msg, $HtmlId, $LogId, $MsgCount) { + function IPSLogger_OutProgram($Msg, $HtmlId, $LogId, $MsgCount, $FontSize=10) { $Msg = htmlentities($Msg, ENT_COMPAT, 'ISO-8859-1'); $Msg = str_replace("\n", "
", $Msg); $MsgList = GetValue($HtmlId); - $TablePrefix = '
'; + $TablePrefix = '
'; $CurrentMsgId = GetValue($LogId)+1; SetValue($LogId, $CurrentMsgId); @@ -288,7 +330,7 @@ function IPSLogger_OutProgram($Msg, $HtmlId, $LogId, $MsgCount) { if (strpos($MsgList, '
') === false) { $MsgList = ""; } else { - $StrTmp = ''); } - /** @}*/ -?> \ No newline at end of file + + function IPSLogger_OutMySQL($LogLevel, $LogType, $Context, $Msg) + { + $logTypeEnabled = false; + if (defined('c_DB_MySQL_Enabled') and c_DB_MySQL_Enabled) { + $logTypeEnabled = true; + if (isset($DB_MySQL_LogTypes) and array_key_exists($LogLevel, $DB_MySQL_LogTypes) and $DB_MySQL_LogTypes[$LogLevel]==false) { + $logTypeEnabled = false; + } + } + if (!$logTypeEnabled) return; + + if (!defined("c_DB_MySQL_Server")) return; + if (!defined("c_DB_MySQL_Port")) return; + if (!defined("c_DB_MySQL_Database")) return; + if (!defined("c_DB_MySQL_Table")) return; + if (!defined("c_DB_MySQL_User")) return; + if (!defined("c_DB_MySQL_Password")) return; + + // Testen ob Verbindung moeglich + ini_set('mysql.connect_timeout','10'); + $server = @mysql_connect(c_DB_MySQL_Server.":".c_DB_MySQL_Port,c_DB_MySQL_User,c_DB_MySQL_Password); + if ( !$server ) + { + IPS_Logmessage(__FILE__,"MySQL-Server nicht bereit"); + return false; + } + + // Datenbank anlegen wenn nicht vorhanden + $db_exist = @mysql_select_db(c_DB_MySQL_Database, $server); + if (!$db_exist) + { + IPS_Logmessage(__FILE__,"MySQL-Datenbank wird angelegt"); + $mysqlstring = 'CREATE DATABASE ' . c_DB_MySQL_Database .";"; + $db_exist = mysql_query($mysqlstring); + } + if ( !$db_exist ) + { + IPS_Logmessage(__FILE__,"MySQL-Datenbank nicht bereit"); + return false; + } + + // Tabelle erstellen wenn nicht vorhanden + $result = mysql_query("SHOW TABLES LIKE '".c_DB_MySQL_Table."'"); + if (@mysql_num_rows($result) == 0) + { + IPS_Logmessage(__FILE__,"MySQL-Tabelle nicht vorhanden wird erstellt"); + $sql = "CREATE TABLE `" . c_DB_MySQL_Table . "` "; + $sql = $sql . "( `ID` INT( 10 ) NOT NULL AUTO_INCREMENT PRIMARY KEY , "; + $sql = $sql . "`TIMESTAMP` TIMESTAMP NOT NULL ,"; + $sql = $sql . "`LOGLEVEL` INT ,"; + $sql = $sql . "`LOGTYPE` VARCHAR( 150 ) ,"; + $sql = $sql . "`CONTEXT` VARCHAR( 150 ),"; + $sql = $sql . "`MESSAGE` VARCHAR( 1024 ), "; + $sql = $sql . "INDEX (LOGLEVEL), "; + $sql = $sql . "INDEX (LOGTYPE), "; + $sql = $sql . "INDEX (CONTEXT), "; + $sql = $sql . "INDEX (MESSAGE) "; + $sql = $sql . " ) ENGINE = MYISAM ;"; + + $tab_exist = mysql_query($sql); + } + else + $tab_exist = true; + + if ( !$tab_exist ) + { + IPS_Logmessage(__FILE__,"MySQL-Tabelle Fehler bei Tabellenerstellung"); + return; + } + + $Context = str_replace("'",'"',$Context); + $Context = str_replace("\\","\\\\",$Context); + $Msg = str_replace("'",'"',$Msg); + $Msg = str_replace("\\",'\\\\',$Msg); + + $Context = substr($Context,0,150); + $Msg = substr($Msg,0,1024); + + // Meldung eintragen + $sql = ""; + $sql = $sql . "INSERT INTO ".c_DB_MySQL_Table." "; + $sql = $sql . "(`LOGLEVEL`,`LOGTYPE`,`CONTEXT`,`MESSAGE`) "; + $sql = $sql . "VALUES ('".$LogLevel."','".$LogType."','".$Context."','".$Msg."'); "; + + @mysql_query($sql); + if ( mysql_error($server) ) + { + $error = mysql_errno($server) . ": " . mysql_error($server) . "\n"; + IPS_LogMessage(__FILE__,"MySQL Fehler :". $error); + } + + mysql_close($server); + + } + + /** @}*/ +?> diff --git a/IPSLibrary/app/core/IPSLogger/IPSLogger_PhpErrorHandler.inc.php b/IPSLibrary/app/core/IPSLogger/IPSLogger_PhpErrorHandler.inc.php index 548a4bd..da0bccd 100644 --- a/IPSLibrary/app/core/IPSLogger/IPSLogger_PhpErrorHandler.inc.php +++ b/IPSLibrary/app/core/IPSLogger/IPSLogger_PhpErrorHandler.inc.php @@ -24,37 +24,44 @@ function IPSLogger_PhpErrorHandler ($ErrType, $ErrMsg, $FileName, $LineNum, $Vars) { if (error_reporting() == 0) {return false;} // No Reporting of suppressed Erros (suppressed @) - require_once "IPSLogger.inc.php"; $ErrorDetails = c_lf." Error in Script ".$FileName." on Line ".$LineNum; - switch ($ErrType) { + $FatalError = false; + switch ($ErrType) { case E_ERROR: IPSLogger_Err("PHP", 'Error: '.$ErrMsg.$ErrorDetails); + $FatalError = true; break; case E_WARNING: IPSLogger_Err("PHP", 'Warning: '.$ErrMsg.$ErrorDetails); break; case E_PARSE: IPSLogger_Err("PHP", 'Parsing Error: '.$ErrMsg.$ErrorDetails); + $FatalError = true; break; case E_NOTICE: IPSLogger_Err("PHP", 'Notice: '.$ErrMsg.$ErrorDetails); break; case E_CORE_ERROR: IPSLogger_Err("PHP", 'Core Error: '.$ErrMsg.$ErrorDetails); + $FatalError = true; break; case E_CORE_WARNING: IPSLogger_Err("PHP", 'Core Warning: '.$ErrMsg.$ErrorDetails); + $FatalError = true; break; case E_COMPILE_ERROR: IPSLogger_Err("PHP", 'Compile Error: '.$ErrMsg.$ErrorDetails); + $FatalError = true; break; case E_COMPILE_WARNING: IPSLogger_Err("PHP", 'Compile Warning: '.$ErrMsg.$ErrorDetails); + $FatalError = true; break; case E_USER_ERROR: IPSLogger_Err("PHP", 'User Error: '.$ErrMsg.$ErrorDetails); + $FatalError = true; break; case E_USER_WARNING: IPSLogger_Err("PHP", 'User Warning: '.$ErrMsg.$ErrorDetails); @@ -63,16 +70,32 @@ function IPSLogger_PhpErrorHandler ($ErrType, $ErrMsg, $FileName, $LineNum, $Var IPSLogger_Err("PHP", 'User Notice: '.$ErrMsg.$ErrorDetails); break; case E_STRICT: + $FatalError = true; IPSLogger_Err("PHP", 'Runtime Notice: '.$ErrMsg.$ErrorDetails); break; default: IPSLogger_Err("PHP", 'Unknown Error: '.$ErrMsg.$ErrorDetails); + $FatalError = true; break; } - // Abort Processing + if (array_key_exists('ERROR_COUNT', $_IPS)) { + $errorCount=$_IPS['ERROR_COUNT'] + 1; + } else { + $errorCount=1; + } + $_IPS['ERROR_COUNT'] = $errorCount; + + // Abort Processing during "Abort Flag" if (array_key_exists('ABORT_ON_ERROR', $_IPS) and $_IPS['ABORT_ON_ERROR']) { exit('Abort Processing during Error: '.$ErrMsg.$ErrorDetails); + // Abort Processing during "FATAL Error" + } elseif ($FatalError) { + exit('Abort Processing during Fatal-Error: '.$ErrMsg.$ErrorDetails); + // Abort Processing during maximal Error Counter + } elseif ($errorCount > 10) { + IPSLogger_Err("PHP", 'Maximal ErrorCount exceeded for this Session --> Abort Processing'); + exit('Abort Processing during exceed of maximal ErrorCount: '.$ErrMsg.$ErrorDetails); } else { return false; } @@ -81,20 +104,28 @@ function IPSLogger_PhpErrorHandler ($ErrType, $ErrMsg, $FileName, $LineNum, $Var $old_error_handler = set_error_handler("IPSLogger_PhpErrorHandler",E_ALL); function IPSLogger_PhpFatalErrorHandler() { - if (@is_array($e = @error_get_last())) { + if (@is_array($e = @error_get_last())) { //print_r($e); echo "Reporting=".error_reporting()."\n"; - $code = isset($e['type']) ? $e['type'] : 0; - $msg = isset($e['message']) ? $e['message'] : ''; - $file = isset($e['file']) ? $e['file'] : ''; - $line = isset($e['line']) ? $e['line'] : ''; - if ($code==1 /*Error*/) { - IPSLogger_PhpErrorHandler ($code, $msg, $file, $line, null); - } + $code = isset($e['type']) ? $e['type'] : 0; + $msg = isset($e['message']) ? $e['message'] : ''; + $file = isset($e['file']) ? $e['file'] : ''; + $line = isset($e['line']) ? $e['line'] : ''; + switch($code) { + case E_ERROR: + case E_PARSE: + case E_CORE_ERROR: + case E_CORE_WARNING: + case E_COMPILE_ERROR: + case E_COMPILE_WARNING: + IPSLogger_PhpErrorHandler ($code, $msg, $file, $line, null); + break; + default: + break; + } } } - register_shutdown_function('IPSLogger_PhpFatalErrorHandler'); - + register_shutdown_function('IPSLogger_PhpFatalErrorHandler'); /** @}*/ ?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSLogger/IPSLogger_PurgeLogFiles.ips.php b/IPSLibrary/app/core/IPSLogger/IPSLogger_PurgeLogFiles.ips.php index cffd38e..d7b1e37 100644 --- a/IPSLibrary/app/core/IPSLogger/IPSLogger_PurgeLogFiles.ips.php +++ b/IPSLibrary/app/core/IPSLogger/IPSLogger_PurgeLogFiles.ips.php @@ -17,7 +17,7 @@ define ("c_LogId", "IPSLogger_PurgeLogFiles"); PurgeLogFiles(c_File_Directory, c_File_Extension, c_ID_FileOutEnabled, c_ID_FileOutDays); - PurgeLogFiles(c_Log4IPS_Directory, c_Log4IPS_Extension, c_ID_FileOutEnabled, c_ID_Log4IPSOutDays); + PurgeLogFiles(c_Log4IPS_Directory, c_Log4IPS_Extension, c_ID_Log4IPSOutEnabled, c_ID_Log4IPSOutDays); function PurgeLogFiles($Directory, $Extension, $ID_OutSwitch, $ID_OutDays) { if (GetValue($ID_OutSwitch)) { diff --git a/IPSLibrary/app/core/IPSLogger/ProwlPHP.php b/IPSLibrary/app/core/IPSLogger/ProwlPHP.php new file mode 100644 index 0000000..1abe71b --- /dev/null +++ b/IPSLibrary/app/core/IPSLogger/ProwlPHP.php @@ -0,0 +1,199 @@ + maxsize] + 'apikey' => 204, // User API Key. + 'providerkey' => 40, // Provider key. + 'priority' => 2, // Range from -2 to 2. + 'application' => 254, // Name of the app. + 'event' => 1024, // Name of the event. + 'description' => 10000, // Description of the event. + 'url' => 512, + ); + + public function __construct($apikey=null, $verify=false, $provkey=null, $proxy=null, $userpwd=null) + { + $curl_info = curl_version(); // Checks for cURL function and SSL version. Thanks Adrian Rollett! + if(!function_exists('curl_exec') || empty($curl_info['ssl_version'])) + { + die($this->getError(10000)); + } + + if(isset($proxy)) + $this->_setProxy($proxy, $userpwd); + + if(isset($apikey) && $verify) + $this->verify($apikey, $provkey); + + $this->_api_key = $apikey; + } + + public function verify($apikey, $provkey) + { + $return = $this->_execute(sprintf($this->_url_verify, $apikey, $provkey)); + return $this->_response($return); + } + + public function push($params, $is_post=false) + { + if($is_post) + $post_params = ''; + + $url = $is_post ? $this->_url_push : $this->_url_push . '?'; + $params = func_get_args(); + + if(isset($this->_api_key) && !isset($params[0]['apikey'])) + $params[0]['apikey'] = $this->_api_key; + + if(isset($this->_prov_key) && !isset($params[0]['providerkey'])) + $params[0]['providerkey'] = $this->_prov_key; + + foreach($params[0] as $k => $v) + { + $v = str_replace("\\n","\n",$v); // Fixes line break issue! Cheers Fr3d! + if(!isset($this->_params[$k])) + { + $this->_return_code = 400; + return false; + } + if(strlen($v) > $this->_params[$k]) + { + $this->_return_code = 10001; + return false; + } + + if($is_post) + $post_params .= $k . '=' . urlencode($v) . '&'; + else + $url .= $k . '=' . urlencode($v) . '&'; + } + + if($is_post) + $params = substr($post_params, 0, strlen($post_params)-1); + else + $url = substr($url, 0, strlen($url)-1); + + $return = $this->_execute($url, $is_post ? true : false, $params); + + return $this->_response($return); + } + + public function getError($code=null) + { + $code = (empty($code)) ? $this->_return_code : $code; + switch($code) + { + case 200: return 'Request Successful.'; break; + case 400: return 'Bad request, the parameters you provided did not validate.'; break; + case 401: return 'The API key given is not valid, and does not correspond to a user.'; break; + case 405: return 'Method not allowed, you attempted to use a non-SSL connection to Prowl.'; break; + case 406: return 'Your IP address has exceeded the API limit.'; break; + case 500: return 'Internal server error, something failed to execute properly on the Prowl side.'; break; + case 10000: return 'cURL library missing vital functions or does not support SSL. cURL w/SSL is required to execute ProwlPHP.'; break; + case 10001: return 'Parameter value exceeds the maximum byte size.'; break; + default: return false; break; + } + } + + public function getRemaining() + { + if(!isset($this->_remaining)) + return false; + + return $this->_remaining; + } + + public function getResetDate() + { + if(!isset($this->_resetdate)) + return false; + + return $this->_resetdate; + } + + private function _execute($url, $is_post=false, $params=null) + { + $this->_obj_curl = curl_init($this->_api_domain . $url); + curl_setopt($this->_obj_curl, CURLOPT_HEADER, 0); + curl_setopt($this->_obj_curl, CURLOPT_USERAGENT, "ProwlPHP/" . $this->_version); + curl_setopt($this->_obj_curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY); + curl_setopt($this->_obj_curl, CURLOPT_SSL_VERIFYPEER, false); + curl_setopt($this->_obj_curl, CURLOPT_RETURNTRANSFER, 1); + + if($is_post) + { + curl_setopt($this->_obj_curl, CURLOPT_POST, 1); + curl_setopt($this->_obj_curl, CURLOPT_POSTFIELDS, $params); + } + + if($this->_use_proxy) + { + curl_setopt($this->_obj_curl, CURLOPT_HTTPPROXYTUNNEL, 1); + curl_setopt($this->_obj_curl, CURLOPT_PROXY, $this->_proxy); + curl_setopt($this->_obj_curl, CURLOPT_PROXYUSERPWD, $this->_proxy_userpwd); + } + + $return = curl_exec($this->_obj_curl); + curl_close($this->_obj_curl); + return $return; + } + + private function _response($return) + { + if($return===false) + { + $this->_return_code = 500; + return false; + } + + $response = new SimpleXMLElement($return); + + if(isset($response->success)) + { + $this->_return_code = (int)$response->success['code']; + $this->_remaining = (int)$response->success['remaining']; + $this->_resetdate = (int)$response->success['resetdate']; + } + else + { + $this->_return_code = $response->error['code']; + } + + switch($this->_return_code) + { + case 200: return true; break; + default: return false; break; + } + + unset($response); + } + + private function _setProxy($proxy, $userpwd=null) + { + if(strlen($proxy) > 0) + { + $this->_use_proxy = true; + $this->_proxy = $proxy; + $this->_proxy_userpwd = $userpwd; + } + } +} + +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSMessageHandler/IPSMessageHandler.class.php b/IPSLibrary/app/core/IPSMessageHandler/IPSMessageHandler.class.php index 180a8f8..a5fc766 100644 --- a/IPSLibrary/app/core/IPSMessageHandler/IPSMessageHandler.class.php +++ b/IPSLibrary/app/core/IPSMessageHandler/IPSMessageHandler.class.php @@ -32,12 +32,14 @@ class IPSMessageHandlerException extends Exception { IPSUtils_Include ('IPSLogger.inc.php', 'IPSLibrary::app::core::IPSLogger'); IPSUtils_Include ('IPSMessageHandler_Configuration.inc.php', 'IPSLibrary::config::core::IPSMessageHandler'); + IPSUtils_Include ('IPSMessageHandler_Custom.inc.php', 'IPSLibrary::config::core::IPSMessageHandler'); IPSUtils_Include ('IPSComponent.class.php', 'IPSLibrary::app::core::IPSComponent'); IPSUtils_Include ('IPSModule.class.php', 'IPSLibrary::app::core::IPSComponent'); class IPSMessageHandler { - private static $eventConfiguration = null; + private static $eventConfigurationAuto = array(); + private static $eventConfigurationCust = array(); /** * @public @@ -51,15 +53,29 @@ public function __construct() { /** * @private * - * Liefert die aktuelle Event Konfiguration + * Liefert die aktuelle Auto Event Konfiguration * * @return string[] Event Konfiguration */ - private static function Get_EventConfiguration() { - if (self::$eventConfiguration == null) { - self::$eventConfiguration = IPSMessageHandler_GetEventConfiguration(); - } - return self::$eventConfiguration; + private static function Get_EventConfigurationAuto() { + if (self::$eventConfigurationAuto == null) { + self::$eventConfigurationAuto = IPSMessageHandler_GetEventConfiguration(); + } + return self::$eventConfigurationAuto; + } + + /** + * @private + * + * Liefert die aktuelle Customer Event Konfiguration + * + * @return string[] Event Konfiguration + */ + private static function Get_EventConfigurationCust() { + if (self::$eventConfigurationCust == null and function_exists('IPSMessageHandler_GetEventConfigurationCust')) { + self::$eventConfigurationCust = IPSMessageHandler_GetEventConfigurationCust(); + } + return self::$eventConfigurationCust; } /** @@ -69,8 +85,8 @@ private static function Get_EventConfiguration() { * * @param string[] $configuration Neue Event Konfiguration */ - private static function Set_EventConfiguration($configuration) { - self::$eventConfiguration = $configuration; + private static function Set_EventConfigurationAuto($configuration) { + self::$eventConfigurationAuto = $configuration; } /** @@ -80,7 +96,12 @@ private static function Set_EventConfiguration($configuration) { * */ public static function CreateEvents() { - $configuration = self::Get_EventConfiguration(); + $configuration = self::Get_EventConfigurationAuto(); + + foreach ($configuration as $variableId=>$params) { + self::CreateEvent($variableId, $params[0]); + } + $configuration = self::Get_EventConfigurationCust(); foreach ($configuration as $variableId=>$params) { self::CreateEvent($variableId, $params[0]); @@ -98,14 +119,14 @@ public static function CreateEvents() { */ public static function CreateEvent($variableId, $eventType) { switch ($eventType) { - case 'OnChange': - $triggerType = 1; - break; - case 'OnUpdate': - $triggerType = 0; - break; + case 'OnChange': + $triggerType = 1; + break; + case 'OnUpdate': + $triggerType = 0; + break; default: - throw new IPSMessageHandlerException('Found unknown EventType '.$eventType); + throw new IPSMessageHandlerException('Found unknown EventType '.$eventType); } $eventName = $eventType.'_'.$variableId; $scriptId = IPS_GetObjectIDByIdent('IPSMessageHandler_Event', IPSUtil_ObjectIDByPath('Program.IPSLibrary.app.core.IPSMessageHandler')); @@ -132,16 +153,16 @@ public static function CreateEvent($variableId, $eventType) { private static function StoreEventConfiguration($configuration) { // Build Configuration String - $configString = '$eventConfiguration = array('; - foreach ($configuration as $variableId=>$params) { - $configString .= PHP_EOL.chr(9).chr(9).chr(9).$variableId.' => array('; - for ($i=0; $i$params) { + $configString .= PHP_EOL.chr(9).chr(9).chr(9).$variableId.' => array('; + for ($i=0; $i0) $configString .= PHP_EOL.chr(9).chr(9).chr(9).' '; - $configString .= "'".$params[$i]."','".$params[$i+1]."','".$params[$i+2]."',"; + $configString .= "'".$params[$i]."','".$params[$i+1]."','".$params[$i+2]."',"; } - $configString .= '),'; - } - $configString .= PHP_EOL.chr(9).chr(9).chr(9).');'.PHP_EOL.PHP_EOL.chr(9).chr(9); + $configString .= '),'; + } + $configString .= PHP_EOL.chr(9).chr(9).chr(9).');'.PHP_EOL.PHP_EOL.chr(9).chr(9); // Write to File $fileNameFull = IPS_GetKernelDir().'scripts\\IPSLibrary\\config\\core\\IPSMessageHandler\\IPSMessageHandler_Configuration.inc.php'; @@ -151,14 +172,13 @@ private static function StoreEventConfiguration($configuration) { $fileContent = file_get_contents($fileNameFull, true); $pos1 = strpos($fileContent, '$eventConfiguration = array('); $pos2 = strpos($fileContent, 'return $eventConfiguration;'); - + if ($pos1 === false or $pos2 === false) { throw new IPSMessageHandlerException('EventConfiguration could NOT be found !!!', E_USER_ERROR); } $fileContentNew = substr($fileContent, 0, $pos1).$configString.substr($fileContent, $pos2); file_put_contents($fileNameFull, $fileContentNew); - self::Set_EventConfiguration($configuration); - + self::Set_EventConfigurationAuto($configuration); } /** @@ -174,40 +194,48 @@ private static function StoreEventConfiguration($configuration) { * @param string $moduleParams Parameter für verlinktes Module (Klasse+Parameter) */ public static function RegisterEvent($variableId, $eventType, $componentParams, $moduleParams) { - $configuration = self::Get_EventConfiguration(); + $configurationAuto = self::Get_EventConfigurationAuto(); + $configurationCust = self::Get_EventConfigurationCust(); // Search Configuration $found = false; - if (array_key_exists($variableId, $configuration)) { - $moduleParamsNew = explode(',', $moduleParams); - $moduleClassNew = $moduleParamsNew[0]; - - $params = $configuration[$variableId]; - - for ($i=0; $i Update Configuration - if ($moduleClassCfg=$moduleClassNew) { - $found = true; - $configuration[$variableId][$i] = $eventType; - $configuration[$variableId][$i+1] = $componentParams; - $configuration[$variableId][$i+2] = $moduleParams; - } - } + if (array_key_exists($variableId, $configurationCust)) { + $found = true; } - // Variable NOT found --> Create Configuration if (!$found) { - $configuration[$variableId][] = $eventType; - $configuration[$variableId][] = $componentParams; - $configuration[$variableId][] = $moduleParams; - } + if (array_key_exists($variableId, $configurationAuto)) { + $moduleParamsNew = explode(',', $moduleParams); + $moduleClassNew = $moduleParamsNew[0]; + + $params = $configurationAuto[$variableId]; + + for ($i=0; $i Update Configuration + if ($moduleClassCfg=$moduleClassNew) { + $found = true; + $configurationAuto[$variableId][$i] = $eventType; + $configurationAuto[$variableId][$i+1] = $componentParams; + $configurationAuto[$variableId][$i+2] = $moduleParams; + } + } + } - self::StoreEventConfiguration($configuration); - self::CreateEvent($variableId, $eventType); - } + + // Variable NOT found --> Create Configuration + if (!$found) { + $configurationAuto[$variableId][] = $eventType; + $configurationAuto[$variableId][] = $componentParams; + $configurationAuto[$variableId][] = $moduleParams; + } + + self::StoreEventConfiguration($configurationAuto); + self::CreateEvent($variableId, $eventType); + } + } /** * @public @@ -220,9 +248,9 @@ public static function RegisterEvent($variableId, $eventType, $componentParams, * @param string $componentParams Parameter für verlinkte Hardware Komponente (Klasse+Parameter) * @param string $moduleParams Parameter für verlinktes Module (Klasse+Parameter) */ - public static function RegisterOnChangeEvent($variableId, $componentParams, $moduleParams) { - self::RegisterEvent($variableId, 'OnChange', $componentParams, $moduleParams); - } + public static function RegisterOnChangeEvent($variableId, $componentParams, $moduleParams) { + self::RegisterEvent($variableId, 'OnChange', $componentParams, $moduleParams); + } /** * @public @@ -235,10 +263,64 @@ public static function RegisterOnChangeEvent($variableId, $componentParams, $mod * @param string $componentParams Parameter für verlinkte Hardware Komponente (Klasse+Parameter) * @param string $moduleParams Parameter für verlinktes Module (Klasse+Parameter) */ - public static function RegisterOnUpdateEvent($variableId, $componentParams, $moduleParams) { - self::RegisterEvent($variableId, 'OnUpdate', $componentParams, $moduleParams); - } + public static function RegisterOnUpdateEvent($variableId, $componentParams, $moduleParams) { + self::RegisterEvent($variableId, 'OnUpdate', $componentParams, $moduleParams); + } + + /** + * @public + * + * Methode um autretende IR Events zu processen + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + */ + public function HandleIREvent($variable, $value) { + $configuration = IPSMessageHandler_GetEventConfigurationIR(); + + if ($value == '') { + return; + } + + $irButton = $value; + $irInstanceId = IPS_GetParent($variable); + $childrenIds = IPS_GetChildrenIDs($irInstanceId); + foreach ($childrenIds as $id) { + if ($id <> $variable) { + $irRemoteControl = GetValue($id); + } + } + IPSLogger_Com(__file__, "Received Data from IR-Variable, Control='$irRemoteControl', Command='$irButton'"); + + $irMessage = $irRemoteControl.','.$irButton; + if (array_key_exists($irRemoteControl.'.'.$irButton, $configuration)) { + $params = $configuration[$irRemoteControl.'.'.$irButton]; + } elseif (array_key_exists($irRemoteControl.'.*', $configuration)) { + $params = $configuration[$irRemoteControl.'.'.$irButton]; + } else { + $params = ''; + } + if ($params<>'') { + if (count($params) < 2) { + throw new IPSMessageHandlerException('Invalid IPSMessageHandler Configuration, Event Defintion needs 2 parameters'); + } + $component = IPSComponent::CreateObjectByParams($params[0]); + $module = IPSModule::CreateObjectByParams($params[1]); + + if (function_exists('IPSMessageHandler_BeforeHandleEvent')) { + if (IPSMessageHandler_BeforeHandleEvent($variable, $value, $component, $module)) { + $component->HandleEvent($variable, $value, $module); + } + } else { + $component->HandleEvent($variable, $value, $module); + } + if (function_exists('IPSMessageHandler_AfterHandleEvent')) { + IPSMessageHandler_AfterHandleEvent($variable, $value, $component, $module); + } + } +} + /** * @public * @@ -248,22 +330,59 @@ public static function RegisterOnUpdateEvent($variableId, $componentParams, $mod * @param string $value Wert der Variable */ public function HandleEvent($variable, $value) { - $configuration = IPSMessageHandler_GetEventConfiguration(); - - if (array_key_exists($variable, $configuration)) { - $params = $configuration[$variable]; + $configurationAuto = self::Get_EventConfigurationAuto(); + $configurationCust = self::Get_EventConfigurationCust(); + + if (array_key_exists($variable, $configurationCust)) { + $params = $configurationCust[$variable]; + } elseif (array_key_exists($variable, $configurationAuto)) { + $params = $configurationAuto[$variable]; + //} elseif ($variable==IPSMH_IRTRANS_BUTTON_VARIABLE_ID) { + //$params = ''; + //$this->HandleIREvent($variable, $value); + } else { + $params = ''; + IPSLogger_Wrn(__file__, 'Variable '.$variable.' NOT found in IPSMessageHandler Configuration!'); + } + + if ($params<>'') { if (count($params) < 3) { - throw new IPSMessageHandlerException('Invalid IPSMessageHandler Configuration, Event Defintion needs 2 parameters'); + throw new IPSMessageHandlerException('Invalid IPSMessageHandler Configuration, Event Defintion needs 3 parameters'); } $component = IPSComponent::CreateObjectByParams($params[1]); $module = IPSModule::CreateObjectByParams($params[2]); - - $component->HandleEvent($variable, $value, $module); - } else { - IPSLogger_Wrn(__file__, 'Variable '.$variable.' NOT found in IPSMessageHandler Configuration!'); + + if (function_exists('IPSMessageHandler_BeforeHandleEvent')) { + if (IPSMessageHandler_BeforeHandleEvent($variable, $value, $component, $module)) { + $component->HandleEvent($variable, $value, $module); + if (function_exists('IPSMessageHandler_AfterHandleEvent')) { + IPSMessageHandler_AfterHandleEvent($variable, $value, $component, $module); + } + } + } else { + $component->HandleEvent($variable, $value, $module); + if (function_exists('IPSMessageHandler_AfterHandleEvent')) { + IPSMessageHandler_AfterHandleEvent($variable, $value, $component, $module); + } + } } } - + } + + /** + * @public + * + * Methode um autretende Library Events zu processen + * + * @param string $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param string $module Name des auslösenden Modules + * @param string $event Name des auslösenden Events + */ + function IPSMessageHandler_HandleLibraryEvent($variable, $value, $module='', $event='') { + if (function_exists('IPSMessageHandler_AfterHandleLibraryEvent')) { + IPSMessageHandler_AfterHandleLibraryEvent($variable, $value, $module, $event); + } } /** @}*/ diff --git a/IPSLibrary/app/core/IPSMessageHandler/IPSMessageHandler_Event.ips.php b/IPSLibrary/app/core/IPSMessageHandler/IPSMessageHandler_Event.ips.php index 567aea8..6101ad1 100644 --- a/IPSLibrary/app/core/IPSMessageHandler/IPSMessageHandler_Event.ips.php +++ b/IPSLibrary/app/core/IPSMessageHandler/IPSMessageHandler_Event.ips.php @@ -11,8 +11,8 @@ * */ - $variable = $_IPS['VARIABLE']; - $value = $_IPS['VALUE']; + $variable = $_IPS['VARIABLE']; + $value = $_IPS['VALUE']; IPSUtils_Include ('IPSMessageHandler.class.php', 'IPSLibrary::app::core::IPSMessageHandler'); diff --git a/IPSLibrary/app/core/IPSMessageHandler/IPSMessageHandler_IREvent.ips.php b/IPSLibrary/app/core/IPSMessageHandler/IPSMessageHandler_IREvent.ips.php new file mode 100644 index 0000000..4b4dfc2 --- /dev/null +++ b/IPSLibrary/app/core/IPSMessageHandler/IPSMessageHandler_IREvent.ips.php @@ -0,0 +1,23 @@ + + * + * Script dient als EventScript um den IPSMessageHandler über Variablen Änderungen der Componenten zu informieren + * + */ + + $variable = $_IPS['VARIABLE']; + $value = $_IPS['VALUE']; + + IPSUtils_Include ('IPSMessageHandler.class.php', 'IPSLibrary::app::core::IPSMessageHandler'); + + $messageHandler = new IPSMessageHandler(); + $messageHandler->HandleIREvent($variable, $value); + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/core/IPSUtils/IPSUtils.inc.php b/IPSLibrary/app/core/IPSUtils/IPSUtils.inc.php index 29cac86..a6a512f 100644 --- a/IPSLibrary/app/core/IPSUtils/IPSUtils.inc.php +++ b/IPSLibrary/app/core/IPSUtils/IPSUtils.inc.php @@ -35,7 +35,7 @@ function IPSUtils_Include($file, $namespace="") { include_once $file; } else { $file = IPS_GetKernelDir().'\\scripts\\'.str_replace('::','\\',$namespace).'\\'.$file; - + if (!file_exists($file)) { throw new Exception('script '.$file.' could NOT be found!', E_USER_ERROR); } @@ -93,4 +93,4 @@ function IPS_GetIdent($objId) { /** @}*/ -?> +?> \ No newline at end of file diff --git a/IPSLibrary/app/hardware/AudioMax/AudioMax.inc.php b/IPSLibrary/app/hardware/AudioMax/AudioMax.inc.php new file mode 100644 index 0000000..a0a5cc8 --- /dev/null +++ b/IPSLibrary/app/hardware/AudioMax/AudioMax.inc.php @@ -0,0 +1,341 @@ + + * + * Dieses File kann von anderen Scripts per INCLUDE eingebunden werden und enthält Funktionen + * um alle AudioMax Funktionen bequem per Funktionsaufruf steueren zu können. + * + */ + + include_once 'AudioMax_Server.class.php'; + + /** + * Server Ein- und Ausschalten + * + * @param int $instanceId ID des AudioMax Servers + * @param string $value TRUE oder '1' für An, FALSE oder '0' für Aus + * @return boolean Funktions Ergebnis, TRUE für OK, FALSE für Fehler + */ + function AudioMax_SetMainPower($instanceId, $value) { + $server = AudioMax_GetServer($instanceId); + return $server->SendData(AM_TYP_SET, AM_CMD_POWER, null, null, $value); + } + + /** + * Status ServerPower lesen + * + * @param int $instanceId ID des AudioMax Servers + * @return boolean Power Status + */ + function AudioMax_GetMainPower($instanceId) { + $server = AudioMax_GetServer($instanceId); + return $server->SendData(AM_TYP_GET, AM_CMD_POWER, null, null, null); + } + + /** + * Ein- und Ausschalten eines einzelnen Raumes + * + * @param int $instanceId ID des AudioMax Servers + * @param int $roomId Raum der geändert werden soll (0-3) + * @param string $value TRUE oder '1' für An, FALSE oder '0' für Aus + * @return boolean Funktions Ergebnis, TRUE für OK, FALSE für Fehler + */ + function AudioMax_SetRoomPower($instanceId, $roomId, $value) { + $server = AudioMax_GetServer($instanceId); + return $server->SendData(AM_TYP_SET, AM_CMD_ROOM, $roomId, null, $value); + } + + /** + * Status Raumverstärker lesen + * + * @param int $instanceId ID des AudioMax Servers + * @param int $roomId Raum der ausgelesen werden soll (0-3) + * @return boolean Status Raumverstärker + */ + function AudioMax_GetRoomPower($instanceId, $roomId) { + $server = AudioMax_GetServer($instanceId); + return $server->SendData(AM_TYP_GET, AM_CMD_ROOM, $roomId, null, null); + } + + /** + * Auswahl des Eingangs, der für einen bestimmten Raum verwendet werden soll + * + * @param int $instanceId ID des AudioMax Servers + * @param int $roomId Raum der geändert werden soll (0-3) + * @param int $value Eingang (1-4) + * @return boolean Funktions Ergebnis, TRUE für OK, FALSE für Fehler + */ + function AudioMax_SetInputSelect($instanceId, $roomId, $value) { + $server = AudioMax_GetServer($instanceId); + return $server->SendData(AM_TYP_SET, AM_CMD_AUDIO, $roomId, AM_FNC_INPUTSELECT, $value); + } + + /** + * Eingangswahlschalter lesen + * + * @param int $instanceId ID des AudioMax Servers + * @param int $roomId Raum der ausgelesen werden soll (0-3) + * @return int Eingangswahl (1-4) + */ + function AudioMax_GetInputSelect($instanceId, $roomId) { + $server = AudioMax_GetServer($instanceId); + return $server->SendData(AM_TYP_GET, AM_CMD_AUDIO, $roomId, AM_FNC_INPUTSELECT, null)+1; + } + + /** + * Eingangsverstärkung setzen + * + * @param int $instanceId ID des AudioMax Servers + * @param int $roomId Raum der geändert werden soll (0-3) + * @param int $value Verstärkung (0-15) + * @return boolean Funktions Ergebnis, TRUE für OK, FALSE für Fehler + */ + function AudioMax_SetInputGain($instanceId, $roomId, $value) { + $server = AudioMax_GetServer($instanceId); + return $server->SendData(AM_TYP_SET, AM_CMD_AUDIO, $roomId, AM_FNC_INPUTGAIN, $value); + } + + /** + * Eingangsverstärkung lesen + * + * @param int $instanceId ID des AudioMax Servers + * @param int $roomId Raum der ausgelesen werden soll (0-3) + * @return int Verstärkung (0-15) + */ + function AudioMax_GetInputGain($instanceId, $roomId) { + $server = AudioMax_GetServer($instanceId); + return $server->SendData(AM_TYP_GET, AM_CMD_AUDIO, $roomId, AM_FNC_INPUTGAIN, null); + } + + /** + * Laustärke setzen + * + * @param int $instanceId ID des AudioMax Servers + * @param int $roomId Raum der geändert werden soll (0-3) + * @param int $value Lautstärke (0-40) + * @return boolean Funktions Ergebnis, TRUE für OK, FALSE für Fehler + */ + function AudioMax_SetVolume($instanceId, $roomId, $value) { + $server = AudioMax_GetServer($instanceId); + return $server->SendData(AM_TYP_SET, AM_CMD_AUDIO, $roomId, AM_FNC_VOLUME, round(AM_VAL_VOLUME_MAX-$value)); + } + + /** + * Laustärke lesen + * + * @param int $instanceId ID des AudioMax Servers + * @param int $roomId Raum der ausgelesen werden soll (0-3) + * @return int Lautstärke (0-40) + */ + function AudioMax_GetVolume($instanceId, $roomId) { + $server = AudioMax_GetServer($instanceId); + return $server->SendData(AM_TYP_GET, AM_CMD_AUDIO, $roomId, AM_FNC_VOLUME, null); + } + + /** + * Muting setzen + * + * @param int $instanceId ID des AudioMax Servers + * @param int $roomId Raum der geändert werden soll (0-3) + * @param string $value TRUE oder '1' für An, FALSE oder '0' für Aus + * @return boolean Funktions Ergebnis, TRUE für OK, FALSE für Fehler + */ + function AudioMax_SetMute($instanceId, $roomId, $value) { + $server = AudioMax_GetServer($instanceId); + return $server->SendData(AM_TYP_SET, AM_CMD_AUDIO, $roomId, AM_FNC_MUTE, $value); + } + + /** + * Status Muting lesen + * + * @param int $instanceId ID des AudioMax Servers + * @param int $roomId Raum der ausgelesen werden soll (0-3) + * @return boolean Status Muting + */ + function AudioMax_GetMute($instanceId, $roomId) { + $server = AudioMax_GetServer($instanceId); + return $server->SendData(AM_TYP_GET, AM_CMD_AUDIO, $roomId, AM_FNC_MUTE, null); + } + + /** + * Balance setzen + * + * @param int $instanceId ID des AudioMax Servers + * @param int $roomId Raum der geändert werden soll (0-3) + * @param int $value Wert Balance (0-15) + * @return boolean Funktions Ergebnis, TRUE für OK, FALSE für Fehler + */ + function AudioMax_SetBalance($instanceId, $roomId, $value) { + $server = AudioMax_GetServer($instanceId); + return $server->SendData(AM_TYP_SET, AM_CMD_AUDIO, $roomId, AM_FNC_BALANCE, $value); + } + + /** + * Balance lesen + * + * @param int $instanceId ID des AudioMax Servers + * @param int $roomId Raum der ausgelesen werden soll (0-3) + * @return int Wert Balance (0-15) + */ + function AudioMax_GetBalance($instanceId, $roomId) { + $server = AudioMax_GetServer($instanceId); + return $server->SendData(AM_TYP_GET, AM_CMD_AUDIO, $roomId, AM_FNC_BALANCE, null); + } + + /** + * Einstellung Höhen + * + * @param int $instanceId ID des AudioMax Servers + * @param int $roomId Raum der geändert werden soll (0-3) + * @param int $value Wert Höhen (0-15) + * @return boolean Funktions Ergebnis, TRUE für OK, FALSE für Fehler + */ + function AudioMax_SetTreble($instanceId, $roomId, $value) { + $server = AudioMax_GetServer($instanceId); + return $server->SendData(AM_TYP_SET, AM_CMD_AUDIO, $roomId, AM_FNC_TREBLE, $value); + } + + /** + * Einstellung Höhen lesen + * + * @param int $instanceId ID des AudioMax Servers + * @param int $roomId Raum der ausgelesen werden soll (0-3) + * @return int Wert Höhen (0-15) + */ + function AudioMax_GetTreble($instanceId, $roomId) { + $server = AudioMax_GetServer($instanceId); + return $server->SendData(AM_TYP_GET, AM_CMD_AUDIO, $roomId, AM_FNC_TREBLE, null); + } + + /** + * Einstellung Mitten + * + * @param int $instanceId ID des AudioMax Servers + * @param int $roomId Raum der geändert werden soll (0-3) + * @param int $value Wert Mitten (0-15) + * @return boolean Funktions Ergebnis, TRUE für OK, FALSE für Fehler + */ + function AudioMax_SetMiddle($instanceId, $roomId, $value) { + $server = AudioMax_GetServer($instanceId); + return $server->SendData(AM_TYP_SET, AM_CMD_AUDIO, $roomId, AM_FNC_MIDDLE, $value); + } + + /** + * Einstellung Mitten lesen + * + * @param int $instanceId ID des AudioMax Servers + * @param int $roomId Raum der ausgelesen werden soll (0-3) + * @return int Wert Mitten (0-15) + */ + function AudioMax_GetMiddle($instanceId, $roomId) { + $server = AudioMax_GetServer($instanceId); + return $server->SendData(AM_TYP_GET, AM_CMD_AUDIO, $roomId, AM_FNC_MIDDLE, null); + } + + /** + * Einstellung Bass setzen + * + * @param int $instanceId ID des AudioMax Servers + * @param int $roomId Raum der geändert werden soll (0-3) + * @param int $value Wert Bass (0-15) + * @return boolean Funktions Ergebnis, TRUE für OK, FALSE für Fehler + */ + function AudioMax_SetBass($instanceId, $roomId, $value) { + $server = AudioMax_GetServer($instanceId); + return $server->SendData(AM_TYP_SET, AM_CMD_AUDIO, $roomId, AM_FNC_BASS, $value); + } + + /** + * Einstellung Bass lesen + * + * @param int $instanceId ID des AudioMax Servers + * @param int $roomId Raum der ausgelesen werden soll (0-3) + * @return int Wert Bass (0-15) + */ + function AudioMax_GetBass($instanceId, $roomId) { + $server = AudioMax_GetServer($instanceId); + return $server->SendData(AM_TYP_GET, AM_CMD_AUDIO, $roomId, AM_FNC_BASS, null); + } + + /** + * Set Mode + * + * @param int $instanceId ID des AudioMax Servers + * @param int $mode Mode (0-4) + * @param int $value Wert (0 oder 1) + * @return boolean Funktions Ergebnis, TRUE für OK, FALSE für Fehler + */ + function AudioMax_SetMode($instanceId, $mode, $value) { + $server = AudioMax_GetServer($instanceId); + return $server->SendData(AM_TYP_SET, AM_CMD_MODE, null, $mode, $value); + } + + /** + * Get Mode + * + * @param int $instanceId ID des AudioMax Servers + * @param int $mode Mode (0-4) + * @return integer Mode Value (0 oder 1) + */ + function AudioMax_GetMode($instanceId, $mode) { + $server = AudioMax_GetServer($instanceId); + return $server->SendData(AM_TYP_SET, AM_CMD_MODE, null, $mode, null); + } + + /** + * Set Text + * + * @param int $instanceId ID des AudioMax Servers + * @param string $text1 Text Zeile 1 + * @param string $text2 Text Zeile 2 + * @param string $text3 Text Zeile 3 + * @return boolean Funktions Ergebnis, TRUE für OK, FALSE für Fehler + */ + function AudioMax_SetText($instanceId, $text1, $text2=null, $text3=null) { + $server = AudioMax_GetServer($instanceId); + return $server->SendData(AM_TYP_SET, AM_CMD_TEXT, null, null, $text1.AM_COM_SEPARATOR.$text2.AM_COM_SEPARATOR.$text3); + } + + /** + * Get Server + * + * @param int $instanceId ID des AudioMax Servers + * @return AudioMax AudioMax Server Object + */ + function AudioMax_GetServer($instanceId) { + if ($instanceId==null) { + $instanceId = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.hardware.AudioMax.AudioMax_Server'); + } + return new AudioMax_Server($instanceId); + } + + + /** @}*/ + + +?> \ No newline at end of file diff --git a/IPSLibrary/app/hardware/AudioMax/AudioMax_ChangeSettings.ips.php b/IPSLibrary/app/hardware/AudioMax/AudioMax_ChangeSettings.ips.php new file mode 100644 index 0000000..5cbb0ff --- /dev/null +++ b/IPSLibrary/app/hardware/AudioMax/AudioMax_ChangeSettings.ips.php @@ -0,0 +1,103 @@ + + * AudioMax Action Script + * + * Dieses Script ist als Action Script für diverse AudioMax Variablen hinterlegt, um + * eine Änderung über das WebFront zu ermöglichen. + * + */ + + include_once 'AudioMax.inc.php'; + + $variableId = $_IPS['VARIABLE']; + $variableValue = $_IPS['VALUE']; + $variableIdent = IPS_GetIdent($variableId); + + $serverId = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.hardware.AudioMax.AudioMax_Server'); + $instanceId = IPS_GetParent($variableId); + if ($serverId<>$instanceId) { + $roomIds = GetValue(IPS_GetObjectIDByIdent(AM_VAR_ROOMIDS, $serverId)); + $roomList = array_flip(explode(',',$roomIds)); + $roomId = $roomList[$instanceId]; + } + + switch($variableIdent) { + case AM_VAR_CONNECTION: + $server = new AudioMax_Server($serverId); + $server->SetConnection($variableValue); + break; + + case AM_VAR_MODESERVERDEBUG: + AudioMax_SetMode($serverId, AM_MOD_SERVERDEBUG, $variableValue); + break; + case AM_VAR_MODEACKNOWLEDGE: + AudioMax_SetMode($serverId, AM_MOD_ACKNOWLEDGE, $variableValue); + break; + case AM_VAR_MODEPOWERREQUEST: + AudioMax_SetMode($serverId, AM_MOD_POWERREQUEST, $variableValue); + break; + case AM_VAR_MODEEMULATESTATE: + SetValue(IPS_GetObjectIDByIdent(AM_VAR_MODEEMULATESTATE, $instanceId), $variableValue); + break; + + case AM_VAR_MAINPOWER: + AudioMax_SetMainPower($serverId, $variableValue); + break; + + case AM_VAR_ROOMPOWER: + AudioMax_SetRoomPower($serverId , $roomId, $variableValue); + break; + case AM_VAR_BALANCE: + AudioMax_SetBalance($serverId , $roomId, $variableValue); + break; + case AM_VAR_VOLUME: + AudioMax_SetVolume($serverId , $roomId, $variableValue); + break; + case AM_VAR_MUTE: + AudioMax_SetMute($serverId , $roomId, $variableValue); + break; + case AM_VAR_TREBLE: + AudioMax_SetTreble($serverId , $roomId, $variableValue); + break; + case AM_VAR_MIDDLE: + AudioMax_SetMiddle($serverId , $roomId, $variableValue); + break; + case AM_VAR_BASS: + AudioMax_SetBass($serverId , $roomId, $variableValue); + break; + case AM_VAR_INPUTSELECT: + AudioMax_SetInputSelect($serverId , $roomId, $variableValue); + break; + case AM_VAR_INPUTGAIN: + AudioMax_SetInputGain($serverId , $roomId, $variableValue); + break; + default: + break; + } + ; + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/hardware/AudioMax/AudioMax_Constants.inc.php b/IPSLibrary/app/hardware/AudioMax/AudioMax_Constants.inc.php new file mode 100644 index 0000000..de1385f --- /dev/null +++ b/IPSLibrary/app/hardware/AudioMax/AudioMax_Constants.inc.php @@ -0,0 +1,167 @@ + + * + * Prinzipieller Aufbau der Kommunikation: + * CommandType Command Room Function Value + * + * Jeder Kommando Teil wird durch einen Separator voneinander getrennt (Semikolon). Terminiert + * wird jedes Kommando von einem CR. + * + * Examples: + * set;svr;pwr;1\ AudioMax Server Ein + * evt;svr;kal;0\ Keep alive Message vom Server + * set;svr;roo;00;1\ Raumverstärker in Raum 1 einschalten + * set;svr;aud;00;inp;1\ Eingang 2 in Raum 1 selektieren + * set;svr;aud;02;vol;08\ Lautstärke in Raum 3 auf 8 + * set;svr;aud;03;bas;14\ Bass Raum 4 auf 14 + * + * + */ + define ('AM_COM_SEPARATOR', ';'); + define ('AM_COM_TERMINATOR', chr(13)); + define ('AM_COM_KEEPALIVE', 60); + define ('AM_COM_MAXRETRIES', 8); + define ('AM_COM_WAIT', 50); + define ('AM_COM_MAXWAIT', 500); + + // Kommunikations Kommando Typen + define ('AM_TYP_SET', 'SET'); + define ('AM_TYP_GET', 'GET'); + define ('AM_TYP_EVT', 'EVT'); + define ('AM_TYP_DBG', 'DBG'); + + // Kommunikations Device Type + define ('AM_DEV_SERVER', 'SVR'); + + // Error Codes + define ('AM_ERR_UNKNOWNCMD1', '1'); + define ('AM_ERR_UNKNOWNCMD2', '2'); + define ('AM_ERR_UNKNOWNCMD3', '3'); + define ('AM_ERR_UNKNOWNCMD4', '4'); + define ('AM_ERR_UNKNOWNCMD5', '5'); + + // Acknowledge + define ('AM_VAL_ACKNOWLEDGE', '0'); + + // Kommunikations Kommandos + define ('AM_CMD_POWER', 'PWR'); + define ('AM_CMD_KEEPALIVE', 'KAL'); + define ('AM_CMD_AUDIO', 'AUD'); + define ('AM_CMD_ROOM', 'ROO'); + define ('AM_CMD_TEXT', 'TEX'); + define ('AM_CMD_MODE', 'MOD'); + + // Kommunikations Actions + define ('AM_FNC_POWERREQUEST', 'PUS'); + define ('AM_FNC_BALANCE', 'BAL'); + define ('AM_FNC_VOLUME', 'VOL'); + define ('AM_FNC_MUTE', 'MUT'); + define ('AM_FNC_TREBLE', 'TRE'); + define ('AM_FNC_MIDDLE', 'MID'); + define ('AM_FNC_BASS', 'BAS'); + define ('AM_FNC_INPUTSELECT', 'INP'); + define ('AM_FNC_INPUTGAIN', 'GAI'); + + // Modes + define ('AM_MOD_ACKNOWLEDGE', 0); + define ('AM_MOD_SERVERDEBUG', 1); + define ('AM_MOD_POWERREQUEST', 2); + define ('AM_MOD_KEEPALIVE', 3); + + // Max, Min und Default Werte + define ('AM_VAL_ROOM_MIN', 0); + define ('AM_VAL_ROOM_MAX', 15); + + define ('AM_VAL_BOOLEAN_FALSE', 0); + define ('AM_VAL_BOOLEAN_TRUE', 1); + + define ('AM_VAL_VOLUME_MIN', 0); + define ('AM_VAL_VOLUME_MAX', 40); + define ('AM_VAL_VOLUME_DEFAULT', 20); + + define ('AM_VAL_MUTE_OFF', AM_VAL_BOOLEAN_FALSE); + define ('AM_VAL_MUTE_ON', AM_VAL_BOOLEAN_TRUE); + define ('AM_VAL_MUTE_DEFAULT', AM_VAL_BOOLEAN_FALSE); + + define ('AM_VAL_TREBLE_MIN', 0); + define ('AM_VAL_TREBLE_MAX', 15); + define ('AM_VAL_TREBLE_DEFAULT', 7); + + define ('AM_VAL_BALANCE_MIN', 0); + define ('AM_VAL_BALANCE_MAX', 15); + define ('AM_VAL_BALANCE_DEFAULT', 0); + + define ('AM_VAL_MIDDLE_MIN', 0); + define ('AM_VAL_MIDDLE_MAX', 15); + define ('AM_VAL_MIDDLE_DEFAULT', 7); + + define ('AM_VAL_BASS_MIN', 0); + define ('AM_VAL_BASS_MAX', 15); + define ('AM_VAL_BASS_DEFAULT', 7); + + define ('AM_VAL_INPUTSELECT_MIN', 0); + define ('AM_VAL_INPUTSELECT_MAX', 3); + define ('AM_VAL_INPUTSELECT_DEFAULT', 0); + + define ('AM_VAL_INPUTGAIN_MIN', 0); + define ('AM_VAL_INPUTGAIN_MAX', 15); + define ('AM_VAL_INPUTGAIN_DEFAULT', 7); + + define ('AM_VAL_POWER_OFF', AM_VAL_BOOLEAN_FALSE); + define ('AM_VAL_POWER_ON', AM_VAL_BOOLEAN_TRUE); + define ('AM_VAL_POWER_DEFAULT', AM_VAL_BOOLEAN_FALSE); + + + // Variablen Definitionen + define ('AM_VAR_MAINPOWER', 'MAINPOWER'); + define ('AM_VAR_BUSY', 'BUSY'); + define ('AM_VAR_CONNECTION', 'CONNECTION'); + define ('AM_VAR_ROOMCOUNT', 'ROOM_COUNT'); + define ('AM_VAR_ROOMIDS', 'ROOM_IDS'); + define ('AM_VAR_PORTID', 'PORT_ID'); + define ('AM_VAR_KEEPALIVECOUNT', 'KEEP_ALIVE_COUNT'); + define ('AM_VAR_KEEPALIVESTATUS', 'KEEP_ALIVE_STATUS'); + define ('AM_VAR_LASTERROR', 'LAST_ERROR'); + define ('AM_VAR_LASTCOMMAND', 'LAST_COMMAND'); + define ('AM_VAR_INPUTBUFFER', 'INPUT_BUFFER'); + define ('AM_VAR_MODESERVERDEBUG', 'MODE_SERVERDEBUG'); + define ('AM_VAR_MODEPOWERREQUEST', 'MODE_POWERREQUEST'); + define ('AM_VAR_MODEEMULATESTATE', 'MODE_EMULATESTATE'); + define ('AM_VAR_MODEACKNOWLEDGE', 'MODE_ACKNOWLEDGE'); + + define ('AM_VAR_ROOMPOWER', 'ROOMPOWER'); + define ('AM_VAR_BALANCE', 'BALANCE'); + define ('AM_VAR_MUTE', 'MUTE'); + define ('AM_VAR_VOLUME', 'VOLUME'); + define ('AM_VAR_TREBLE', 'TREBLE'); + define ('AM_VAR_MIDDLE', 'MIDDLE'); + define ('AM_VAR_BASS', 'BASS'); + define ('AM_VAR_INPUTSELECT', 'INPUTSELECT'); + define ('AM_VAR_INPUTGAIN', 'INPUTGAIN'); + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/hardware/AudioMax/AudioMax_KeepAlive.ips.php b/IPSLibrary/app/hardware/AudioMax/AudioMax_KeepAlive.ips.php new file mode 100644 index 0000000..0a840e8 --- /dev/null +++ b/IPSLibrary/app/hardware/AudioMax/AudioMax_KeepAlive.ips.php @@ -0,0 +1,71 @@ + + * + * Dieses Script wird von Timer aufgerufen, um die "Keep Alive" Message zu senden bzw. + * das Signal vom Server zu überprüfen. + * + */ + + include_once 'AudioMax.inc.php'; + + $serverId = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.hardware.AudioMax.AudioMax_Server'); + $eventName = IPS_GetName($_IPS['EVENT']); + + // Alle 60 Sek wird KeepAlive Message zum Server gesendet + if ($eventName == 'SendAlive') { + $server = new AudioMax_Server($serverId); + $server->SendData(AM_TYP_SET, AM_CMD_KEEPALIVE, null, null, '0'); + } + + // Alle 65 Sekunden wird überprüft, ob eine KeepAlive Message vom Server erhalten wurde. + // Keep Alive Count wird alle 65 Sekunden erhöht und muss innerhalb des nächsten + // Zyklus durch eine Message vom Server wieder auf 0 gesetzt werden. + if ($eventName == 'CheckAlive') { + // Read KeepAliveStatus: false=Error, true=OK + $id_Status = IPS_GetVariableIDByName(AM_VAR_KEEPALIVESTATUS, $serverId); + + // Read KeepAliveFlag: ">0"=Waiting, 0=OK + $id_Count = IPS_GetVariableIDByName(AM_VAR_KEEPALIVECOUNT, $serverId); + + // Count not reseted by KeepAlive Message and Status=OK -> Status=Error + if (GetValue($id_Count) > 1 and GetValue($id_Status)) { + SetValue($id_Status, false); + IPSLogger_Wrn(__file__, 'AudioMax KeepAlive Message Stream is broken'); + + // Count cleared by KeepAlive and Status Error -> Status=OK + } else if (GetValue($id_Count)==0 and !GetValue($id_Status)) { + SetValue($id_Status, true); + IPSLogger_Inf(__file__, 'AudioMax KeepAlive Message Stream is online again'); + + } else { + } + + // KeepAliveFlag=Waiting + SetValue($id_Count, GetValue($id_Count)+1); + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/hardware/AudioMax/AudioMax_Receive.ips.php b/IPSLibrary/app/hardware/AudioMax/AudioMax_Receive.ips.php new file mode 100644 index 0000000..58138a7 --- /dev/null +++ b/IPSLibrary/app/hardware/AudioMax/AudioMax_Receive.ips.php @@ -0,0 +1,41 @@ + + * + */ + + include_once 'AudioMax.inc.php'; + + $msg = $_IPS['VALUE']; + + $serverId = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.hardware.AudioMax.AudioMax_Server'); + + $server = new AudioMax_Server($serverId); + $server->ReceiveData($msg); + + /** @}*/ + +?> \ No newline at end of file diff --git a/IPSLibrary/app/hardware/AudioMax/AudioMax_Room.class.php b/IPSLibrary/app/hardware/AudioMax/AudioMax_Room.class.php new file mode 100644 index 0000000..a0d8ae4 --- /dev/null +++ b/IPSLibrary/app/hardware/AudioMax/AudioMax_Room.class.php @@ -0,0 +1,126 @@ + + */ + class AudioMax_Room { + + /** + * @private + * ID des AudioMax Server + */ + private $instanceId; + + /** + * @private + * Variablen Mapping der Befehle + */ + private $functionMapping; + + /** + * @public + * + * Initialisiert einen AudioMax Raum + * + * @param $instanceId - ID des AudioMax Server. + */ + public function __construct($instanceId) { + $this->instanceId = $instanceId; + $this->functionMapping = array( + AM_FNC_VOLUME => AM_VAR_VOLUME, + AM_FNC_MUTE => AM_VAR_MUTE, + AM_FNC_BALANCE => AM_VAR_BALANCE, + AM_FNC_INPUTSELECT => AM_VAR_INPUTSELECT, + AM_FNC_INPUTGAIN => AM_VAR_INPUTGAIN, + AM_FNC_TREBLE => AM_VAR_TREBLE, + AM_FNC_MIDDLE => AM_VAR_MIDDLE, + AM_FNC_BASS => AM_VAR_BASS, + ); + } + + /** + * @public + * + * Liefert den zugehörigen Variablen Namen für eine Message + * + * @param string $command Kommando + * @param string $function Funktion + */ + private function GetVariableName($command, $function) { + switch($command) { + case AM_CMD_ROOM: + $variableName = AM_VAR_ROOMPOWER; + break; + case AM_CMD_AUDIO: + $variableName = $this->functionMapping[$function]; + break; + default: + throw new Exception('Unknown Command "'.$command.'", VariableName could NOT be found !!!'); + } + return $variableName; + } + + /** + * @public + * + * Liefert den aktuellen Wert für eine Message + * + * @param string $command Kommando + * @param string $function Funktion + * @return string Wert + */ + public function GetValue ($command, $function) { + $name = $this->GetVariableName($command, $function); + return GetValue(IPS_GetObjectIDByIdent($name, $this->instanceId)); + } + + /** + * @public + * + * Setzt den Wert einer Variable auf den Wert einer Message + * + * @param string $command Kommando + * @param string $function Funktion + * @param string $value Wert + */ + public function SetValue ($command, $function, $value) { + $name = $this->GetVariableName($command, $function); + $variableId = IPS_GetObjectIDByIdent($name, $this->instanceId); + if (GetValue($variableId)<>$value) { + SetValue($variableId, $value); + } + } + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/hardware/AudioMax/AudioMax_Server.class.php b/IPSLibrary/app/hardware/AudioMax/AudioMax_Server.class.php new file mode 100644 index 0000000..0045816 --- /dev/null +++ b/IPSLibrary/app/hardware/AudioMax/AudioMax_Server.class.php @@ -0,0 +1,804 @@ + + */ + class AudioMax_Server { + + /** + * @private + * ID des AudioMax Server + */ + private $instanceId; + + /** + * @private + * Retry Count Senden + */ + private $retryCount; + + /** + * @private + * Debugging of AudioMax Server Enabled/Disabled + */ + private $debugEnabled; + + /** + * @public + * + * Initializes the AudioMax Server + * + * @param integer $instanceId - ID des AudioMax Server. + */ + public function __construct($instanceId) { + $this->instanceId = $instanceId; + $this->debugEnabled = GetValue(IPS_GetObjectIDByIdent(AM_VAR_MODESERVERDEBUG, $this->instanceId)); + $this->retryCount = 0; + } + + /** + * @private + * + * Protokollierung einer Meldung im AudioMax Log + * + * @param string $logType Type der Logging Meldung + * @param string $msg Meldung + */ + private function Log ($logType, $msg) { + if ($this->debugEnabled) { + IPSLogger_WriteFile("", 'AudioMax.log', date('Y-m-d H:i:s').' '.$logType.' - '.$msg, null); + } + } + + /** + * @private + * + * Protokollierung einer Error Meldung + * + * @param string $msg Meldung + */ + private function LogErr($msg) { + IPSLogger_Err(__file__, $msg); + $this->Log('Err', $msg); + $variableId = IPS_GetObjectIDByIdent(AM_VAR_LASTERROR, $this->instanceId); + SetValue($variableId, $msg); + } + + /** + * @private + * + * Protokollierung einer Info Meldung + * + * @param string $msg Meldung + */ + private function LogInf($msg) { + IPSLogger_Inf(__file__, $msg); + $this->Log('Inf', $msg); + } + + /** + * @private + * + * Protokollierung einer Debug Meldung + * + * @param string $msg Meldung + */ + private function LogDbg($msg) { + IPSLogger_Dbg(__file__, $msg); + $this->Log('Dbg', $msg); + } + + /** + * @private + * + * Protokollierung einer Kommunikations Meldung + * + * @param string $msg Meldung + */ + private function LogCom($msg) { + IPSLogger_Com(__file__, $msg); + $this->Log('Com', $msg); + } + + /** + * @private + * + * Protokollierung einer Trace Meldung + * + * @param string $msg Meldung + */ + private function LogTrc($msg) { + IPSLogger_Trc(__file__, $msg); + $this->Log('Trc', $msg); + } + + /** + * @public + * + * Setz den Status der Verbindung auf Active oder Inactiv. + * Im inaktiven Zustand wird der IO Port deaktiviert und alle ausgehenden Meldungen ignoriert. + * + * @param boolean $value Status der Verbindung. + */ + public function SetConnection($value) { + $variableId = IPS_GetObjectIDByIdent(AM_VAR_CONNECTION, $this->instanceId); + SetValue($variableId, $value); + + $this->LogInf('Set AudioMax Connection Status to '.($value ? 'Connection Active' : 'Connection Inactiv')); + + $comPortId = GetValue(IPS_GetObjectIDByIdent('PORT_ID', $this->instanceId)); + COMPort_SetOpen($comPortId, $value); + IPS_ApplyChanges($comPortId); + if ($value) { + $this->SendData(AM_TYP_SET, AM_CMD_KEEPALIVE, null, null, '0'); + } + } + + /** + * @private + * + * Ermittelt ob die Instanzen der Räume installiert sind + * + * @return boolean Räume installiert + */ + private function GetAudioMaxRoomVariablesEnabled() { + $roomIds = GetValue(IPS_GetObjectIDByIdent(AM_VAR_ROOMIDS, $this->instanceId)); + return ($roomIds <> ''); + } + + /** + * @private + * + * Liefert ein AudioMaxRoom Objekt für eine Raum Nummer, sind keine Räume vorhanden + * liefert die Funktion false. + * + * @param integer $roomId Nummer des Raumes (1-4). + * @return AudioMax_Room AudioMax Room Object + */ + private function GetAudioMaxRoom($roomId) { + $roomIds = GetValue(IPS_GetObjectIDByIdent(AM_VAR_ROOMIDS, $this->instanceId)); + if ($roomIds=="") { + return false; + } + $roomIds = explode(',', $roomIds); + $roomInstanceId = false; + $audioMaxRoom = false; + if (array_key_exists($roomId, $roomIds)) { + $roomInstanceId = (int)$roomIds[$roomId]; + $audioMaxRoom = new AudioMax_Room($roomInstanceId); + } + + return $audioMaxRoom; + } + + + /** + * @private + * + * Validieren der Daten und Variablen setzen + * + * @param string $type Kommando Type + * @param string $command Kommando + * @param integer $roomId Nummer des Raumes + * @param string $function Funktion + * @param string $value Wert + */ + private function ValidateAndSetValue ($type, $command, $roomId, $function, $value) { + if ($this->ValidateData($type, $command, $roomId, $function, $value)) { + $this->SetValue($type, $command, $roomId, $function, $value); + } + } + + /** + * @private + * + * Setzt den ensprechenden Wert einer Variable auf den Wert der Message + * + * @param string $type Kommando Type + * @param string $command Kommando + * @param integer $roomId Nummer des Raumes + * @param string $function Funktion + * @param string $value Wert + */ + private function SetValue ($type, $command, $roomId, $function, $value) { + if ($type==AM_TYP_GET) { + return; + } + if ($command==AM_CMD_POWER or $command==AM_CMD_ROOM) { + if ($value===AM_VAL_BOOLEAN_TRUE) $value=true; + if ($value===AM_VAL_BOOLEAN_FALSE) $value=false; + } + $modification = false; + switch ($command) { + case AM_CMD_POWER: + $variableId = IPS_GetObjectIDByIdent(AM_VAR_MAINPOWER, $this->instanceId); + if (GetValue($variableId)<>$value) { + SetValue($variableId, $value); + $modification = true; + } + break; + case AM_CMD_TEXT: + break; + case AM_CMD_MODE: + if ($function==AM_MOD_SERVERDEBUG) { + $variableId = IPS_GetObjectIDByIdent(AM_VAR_MODESERVERDEBUG, $this->instanceId); + if (GetValue($variableId)<>$value) { + SetValue($variableId, $value); + $modification = true; + } + } + if ($function==AM_MOD_POWERREQUEST) { + $variableId = IPS_GetObjectIDByIdent(AM_VAR_MODEPOWERREQUEST, $this->instanceId); + if (GetValue($variableId)<>$value) { + SetValue($variableId, $value); + $modification = true; + } + } + if ($function==AM_MOD_ACKNOWLEDGE) { + $variableId = IPS_GetObjectIDByIdent(AM_VAR_MODEACKNOWLEDGE, $this->instanceId); + if (GetValue($variableId)<>$value) { + SetValue($variableId, $value); + $modification = true; + } + } + break; + case AM_CMD_ROOM: + $room = $this->GetAudioMaxRoom($roomId); + if ($room===false) { + $modification = true; + break; + } + if ($room->GetValue($command, '')<>$value) { + $room->SetValue($command, '', $value); + $modification = true; + } + break; + case AM_CMD_AUDIO: + if ($function==AM_FNC_VOLUME) $value=AM_VAL_VOLUME_MAX-$value; + $room = $this->GetAudioMaxRoom($roomId); + if ($room===false) { + $modification = true; + break; + } + if ($room->GetValue($command, $function)<>$value) { + $room->SetValue($command, $function, $value); + $modification = true; + } + break; + case AM_CMD_KEEPALIVE: + $modification = true; + break; + default: + $this->LogErr('Unknown Command '.$command); + } + if ($modification) { + SetValue(IPS_GetObjectIDByIdent(AM_VAR_LASTCOMMAND, $this->instanceId), $this->BuildMsg($type, $command, $roomId, $function, $value, false)); + SetValue(IPS_GetObjectIDByIdent(AM_VAR_LASTERROR, $this->instanceId), ""); + } + } + + /** + * @private + * + * Lesen der AudioMax Werte aus den Instanz Variablen + * + * @param string $type Kommando Type + * @param string $command Kommando + * @param integer $roomId Nummer des Raumes + * @param string $function Funktion + * @return string Wert + */ + private function GetValue ($type, $command, $roomId, $function) { + $result = ''; + if ($type==AM_TYP_GET) { + switch ($command) { + case AM_CMD_POWER: + $result = GetValue(IPS_GetObjectIDByIdent(AM_VAR_MAINPOWER, $this->instanceId)); + break; + case AM_CMD_TEXT: + case AM_CMD_MODE: + case AM_CMD_KEEPALIVE: + break; + case AM_CMD_ROOM: + $room = $this->GetAudioMaxRoom($roomId); + if ($room!==false) { + $result = $room->GetValue($command, ''); + } + break; + case AM_CMD_AUDIO: + $room = $this->GetAudioMaxRoom($roomId); + if ($room!==false) { + $result = $room->GetValue($command, $function); + } + break; + default: + $this->LogErr('Unknown Command '.$command); + } + } + return $result; + } + + /** + * @public + * + * Setzt die AudioMax Variablen Werte auf den DEFAULT Wert zurück. + */ + public function Reset () { + $this->LogDbg("Execute AudioMax Reset ..."); + $this->SetValue(AM_TYP_SET, AM_CMD_POWER, null, null, AM_VAL_POWER_DEFAULT); + + $roomCount = GetValue(IPS_GetObjectIDByIdent(AM_VAR_ROOMCOUNT, $this->instanceId)); + for ($roomId=0;$roomId<$roomCount;$roomId++) { + $this->SetValue(AM_TYP_SET, AM_CMD_ROOM, $roomId, null, AM_VAL_POWER_DEFAULT); + $this->SetValue(AM_TYP_SET, AM_CMD_AUDIO, $roomId, AM_FNC_TREBLE, AM_VAL_TREBLE_DEFAULT); + $this->SetValue(AM_TYP_SET, AM_CMD_AUDIO, $roomId, AM_FNC_MIDDLE, AM_VAL_MIDDLE_DEFAULT); + $this->SetValue(AM_TYP_SET, AM_CMD_AUDIO, $roomId, AM_FNC_BASS, AM_VAL_BASS_DEFAULT); + $this->SetValue(AM_TYP_SET, AM_CMD_AUDIO, $roomId, AM_FNC_VOLUME, AM_VAL_VOLUME_DEFAULT); + $this->SetValue(AM_TYP_SET, AM_CMD_AUDIO, $roomId, AM_FNC_MUTE, AM_VAL_MUTE_DEFAULT); + $this->SetValue(AM_TYP_SET, AM_CMD_AUDIO, $roomId, AM_FNC_BALANCE, AM_VAL_BALANCE_DEFAULT); + $this->SetValue(AM_TYP_SET, AM_CMD_AUDIO, $roomId, AM_FNC_INPUTSELECT, AM_VAL_INPUTSELECT_DEFAULT); + $this->SetValue(AM_TYP_SET, AM_CMD_AUDIO, $roomId, AM_FNC_INPUTGAIN, AM_VAL_INPUTGAIN_DEFAULT); + } + } + + /** + * @public + * + * Initialisiert den AudioMax Server und setzt alle Einstellungen auf den aktuellen Wert von IPS zurück. + */ + public function Initialize () { + $this->LogDbg("Execute AudioMax Initialization ..."); + + $this->SendData(AM_TYP_SET, AM_CMD_POWER, null, null, GetValue(IPS_GetObjectIDByIdent(AM_VAR_MAINPOWER, $this->instanceId))); + + $roomCount = GetValue(IPS_GetObjectIDByIdent(AM_VAR_ROOMCOUNT, $this->instanceId)); + for ($roomId=0;$roomId<$roomCount;$roomId++) { + $room=$this->GetAudioMaxRoom($roomId); + $this->SendData(AM_TYP_SET, AM_CMD_ROOM, $roomId, null, $room->GetValue(AM_CMD_ROOM, '')); + $this->SendData(AM_TYP_SET, AM_CMD_AUDIO, $roomId, AM_FNC_TREBLE, $room->GetValue(AM_CMD_AUDIO, AM_FNC_TREBLE)); + $this->SendData(AM_TYP_SET, AM_CMD_AUDIO, $roomId, AM_FNC_MIDDLE, $room->GetValue(AM_CMD_AUDIO, AM_FNC_MIDDLE)); + $this->SendData(AM_TYP_SET, AM_CMD_AUDIO, $roomId, AM_FNC_BASS, $room->GetValue(AM_CMD_AUDIO, AM_FNC_BASS)); + $this->SendData(AM_TYP_SET, AM_CMD_AUDIO, $roomId, AM_FNC_VOLUME, $room->GetValue(AM_CMD_AUDIO, AM_FNC_VOLUME)); + $this->SendData(AM_TYP_SET, AM_CMD_AUDIO, $roomId, AM_FNC_MUTE, $room->GetValue(AM_CMD_AUDIO, AM_FNC_MUTE)); + $this->SendData(AM_TYP_SET, AM_CMD_AUDIO, $roomId, AM_FNC_BALANCE, $room->GetValue(AM_CMD_AUDIO, AM_FNC_BALANCE)); + $this->SendData(AM_TYP_SET, AM_CMD_AUDIO, $roomId, AM_FNC_INPUTSELECT, $room->GetValue(AM_CMD_AUDIO, AM_FNC_INPUTSELECT)); + $this->SendData(AM_TYP_SET, AM_CMD_AUDIO, $roomId, AM_FNC_INPUTGAIN, $room->GetValue(AM_CMD_AUDIO, AM_FNC_INPUTGAIN)); + } + } + + /** + * @private + * + * Setzt das BUSY Flag des AudioMax Server + */ + private function SetBusy() { + $result = IPS_SemaphoreEnter('AudioMax', 3000); + if ($result===true) { + $VariableId = IPS_GetObjectIDByIdent(AM_VAR_BUSY, $this->instanceId); + SetValue($VariableId, true); + } + return $result; + } + + /** + * @private + * + * Zurücksetzen des BUSY Flags des AudioMax Servers. + */ + private function ResetBusy() { + $VariableId = IPS_GetObjectIDByIdent(AM_VAR_BUSY, $this->instanceId); + SetValue($VariableId, false); + IPS_SemaphoreLeave('AudioMax'); + } + + + + /** + * @private + * + * Initializes the AudioMax Server Object + * + * @param string $type Kommando Type + * @param string $command Kommando + * @param integer $roomId Raum (1-4) + * @param string $function Funktion + * @param string $value Wert + * @return boolean TRUE für OK, FALSE bei Fehler + */ + private function BuildMsg($type, $command, $roomId, $function, $value, $addTerminator=true) { + if ($value===true) $value=AM_VAL_BOOLEAN_TRUE; + if ($value===false) $value=AM_VAL_BOOLEAN_FALSE; + + if ($type==AM_TYP_GET) { + $msg = $type.AM_COM_SEPARATOR.AM_DEV_SERVER.AM_COM_SEPARATOR.$command; + switch ($command) { + case AM_CMD_POWER: + case AM_CMD_KEEPALIVE: + case AM_CMD_TEXT: + case AM_CMD_MODE: + break; + case AM_CMD_ROOM: + $msg .= AM_COM_SEPARATOR.$roomId; + break; + case AM_CMD_AUDIO: + $msg .= AM_COM_SEPARATOR.$roomId.AM_COM_SEPARATOR.$function; + break; + default: + $this->LogErr("Unable to build Message - unknown Command '.$command'"); + exit; + } + } else { + $msg = $type.AM_COM_SEPARATOR.AM_DEV_SERVER.AM_COM_SEPARATOR.$command.AM_COM_SEPARATOR; + switch ($command) { + case AM_CMD_POWER: + case AM_CMD_KEEPALIVE: + case AM_CMD_TEXT: + $msg .= $value; + break; + case AM_CMD_MODE: + $msg .= $function.AM_COM_SEPARATOR.$value; + break; + case AM_CMD_ROOM: + $msg .= $roomId.AM_COM_SEPARATOR.$value; + break; + case AM_CMD_AUDIO: + $msg .= $roomId.AM_COM_SEPARATOR.$function.AM_COM_SEPARATOR; + //$msg .= str_pad($value, 2, '0', STR_PAD_LEFT);//$value; + $msg .= $value; + break; + default: + $this->LogErr("Unable to build Message - unknown Command '.$command'"); + exit; + } + } + if ($addTerminator) { + $msg .= AM_COM_TERMINATOR; + } + return $msg; + } + + /** + * @private + * + * Validierung der Daten + * + * @param string $type Kommando Type + * @param string $command Kommando + * @param integer $roomId Raum (1-4) + * @param string $function Funktion + * @param string $value Wert + * @return boolean TRUE für OK, FALSE bei Fehler + */ + private function ValidateData($type, $command, $roomId, $function, $value) { + $errorMsg = ''; + $result = false; + switch($command) { + case AM_CMD_POWER: + $result = ($value==true or $value==AM_VAL_BOOLEAN_TRUE or $value==false or $value==AM_VAL_BOOLEAN_FALSE); + $errorMsg = "Value '$value' for MainPower NOT in Range (use 0,1 or boolean)"; + break; + case AM_CMD_KEEPALIVE: /*0..1*/ + $result = ($value=='0'); + $errorMsg = "Value '$value' for KeepAlive NOT in Range (use '0')"; + break; + case AM_CMD_TEXT: + $result = true; + break; + case AM_CMD_MODE: /*0..1*/ + $result = ($value=='0' or $value=='1'); + $errorMsg = "Value '$value' for Mode NOT in Range (use '0')"; + break; + case AM_CMD_ROOM: + $roomOk = $roomId>=0 and $roomIdinstanceId)); + $result = $roomOk and ($value==true or $value==AM_VAL_BOOLEAN_TRUE or $value==false or $value==AM_VAL_BOOLEAN_FALSE); + $errorMsg = "Value '$value' for RoomPower NOT in Range (use 0,1 or boolean)"; + break; + case AM_CMD_AUDIO: + $roomOk = $roomId>=0 and $roomIdinstanceId)); + switch($function) { + case AM_FNC_VOLUME: /*0..78*/ + $result = $roomOk and ($value>=AM_VAL_VOLUME_MIN and $value<=AM_VAL_VOLUME_MAX); + $errorMsg = "Value '$value' for Volume NOT in Range (use ".AM_VAL_VOLUME_MIN." <= value <=".AM_VAL_VOLUME_MAX.")"; + break; + case AM_FNC_MUTE: /*0..78*/ + $result = $roomOk and ($value==true or $value==AM_VAL_BOOLEAN_TRUE or $value==false or $value==AM_VAL_BOOLEAN_FALSE); + $errorMsg = "Value '$value' for Mute NOT in Range (use 0,1 or boolean)"; + break; + case AM_FNC_BALANCE: /*0..78*/ + $result = $roomOk and ($value>=AM_VAL_BALANCE_MIN and $value<=AM_VAL_BALANCE_MAX); + $errorMsg = "Value '$value' for Balance NOT in Range (use ".AM_VAL_BALANCE_MIN." <= value <=".AM_VAL_BALANCE_MAX.")"; + break; + case AM_FNC_INPUTGAIN: /*1..15*/ + $result = $roomOk and ($value>=AM_VAL_INPUTGAIN_MIN and $value<=AM_VAL_INPUTGAIN_MAX); + $errorMsg = "Value '$value' for InputGain NOT in Range (use ".AM_VAL_INPUTGAIN_MIN." <= value <=".AM_VAL_INPUTGAIN_MAX.")"; + break; + case AM_FNC_INPUTSELECT: /*0..3*/ + $result = $roomOk and ($value>=AM_VAL_INPUTSELECT_MIN and $value<=AM_VAL_INPUTSELECT_MAX); + $errorMsg = "Value '$value' for InputSelect NOT in Range (use ".AM_VAL_INPUTSELECT_MIN." <= value <=".AM_VAL_INPUTSELECT_MAX.")"; + break; + case AM_FNC_TREBLE: /*0..14*/ + $result = $roomOk and ($value>=AM_VAL_TREBLE_MIN and $value<=AM_VAL_TREBLE_MAX); + $errorMsg = "Value '$value' for Treble NOT in Range (use ".AM_VAL_TREBLE_MIN." <= value <=".AM_VAL_TREBLE_MAX.")"; + break; + case AM_FNC_MIDDLE: /*0..14*/ + $result = $roomOk and ($value>=AM_VAL_MIDDLE_MIN and $value<=AM_VAL_MIDDLE_MAX); + $errorMsg = "Value '$value' for Middle NOT in Range (use ".AM_VAL_MIDDLE_MIN." <= value <=".AM_VAL_MIDDLE_MAX.")"; + break; + case AM_FNC_BASS: /*0..14*/ + $result = $roomOk and ($value>=AM_VAL_BASS_MIN and $value<=AM_VAL_BASS_MAX); + $errorMsg = "Value '$value' for Bass NOT in Range (use ".AM_VAL_BASS_MIN." <= value <=".AM_VAL_BASS_MAX.")"; + break; + default: + $errorMsg = "Unknonw function '$function' for Command '$command'"; + } + break; + default: + $errorMsg = "Unknonw Command '$command'"; + } + if (!$result) { + $this->LogErr($errorMsg); + } + return $result; + } + + + /** + * @private + * + * Senden von Befehlen zum AudioMax Server per COM Port + * + * @param string $type Kommando Type + * @param string $command Kommando + * @param integer $roomId Raum (0-15) + * @param string $function Funktion + * @param string $value Wert + * @return boolean TRUE für OK, FALSE bei Fehler + */ + private function SendDataComPort($type, $command, $roomId, $function, $value) { + $result = false; + + if (GetValue(IPS_GetObjectIDByIdent(AM_VAR_CONNECTION, $this->instanceId))) { + $this->LogCom('Snd Message: '.$this->BuildMsg($type, $command, $roomId, $function, $value, false)); + $comPortId = GetValue(IPS_GetObjectIDByIdent('PORT_ID', $this->instanceId)); + $msg = $this->BuildMsg($type, $command, $roomId, $function, $value); + $result = @COMPort_SendText($comPortId, $msg); + if ($result===false) { + $this->LogDbg('Write to ComPort failed --> Try Reconnect'); + COMPort_SetOpen($comPortId,false); + COMPort_SetOpen($comPortId,true); + IPS_ApplyChanges($comPortId); + $result = COMPort_SendText($comPortId, $msg); + } + } else { + $this->LogCom('Snd Message: '.$this->BuildMsg($type, $command, $roomId, $function, $value, false).' (Connection Inactive - Msg will be ignored)!'); + $result = true; + } + + return $result; + } + + /** + * @private + * + * Warten auf die Anwort vom Server + * + * @param string $type Kommando Type + * @param string $command Kommando + * @param integer $roomId Raum (0-15) + * @param string $function Funktion + * @param string $value Wert + * @return boolean TRUE für OK, FALSE bei Fehler + */ + private function WaitForServerResponse($type, $command, $roomId, $function, $value) { + $result = false; + $error = ''; + + $inputBufferId = IPS_GetObjectIDByIdent(AM_VAR_INPUTBUFFER, $this->instanceId); + $waited = 0; + while ($waited < AM_COM_MAXWAIT) { + IPS_Sleep(AM_COM_WAIT); + $waited = $waited + AM_COM_WAIT; + $message = GetValue($inputBufferId); + if ($message<>'') { + $waited = AM_COM_MAXWAIT; + $params = explode(AM_COM_SEPARATOR, $message); + if ($message==AM_VAL_ACKNOWLEDGE) { + if (GetValue(IPS_GetObjectIDByIdent(AM_VAR_MODEACKNOWLEDGE, $this->instanceId))==1) { + $result = true; + } else { + $result = false; + $error = 'Ack Mode NOT Active'; + } + } elseif ($message==AM_ERR_UNKNOWNCMD1) { + $result = false; + $error = 'Unknown Command Part 1'; + } elseif ($message==AM_ERR_UNKNOWNCMD2) { + $result = false; + $error = 'Unknown Command Part 2'; + } elseif ($message==AM_ERR_UNKNOWNCMD3) { + $result = false; + $error = 'Unknown Command Part 3'; + } elseif ($message==AM_ERR_UNKNOWNCMD4) { + $result = false; + $error = 'Out of Range Part 4'; + } elseif ($message==AM_ERR_UNKNOWNCMD5) { + $result = false; + $error = 'Out of Range Part 5'; + } elseif ($params[2] == AM_CMD_POWER) { + $result = $value==$params[3]; + } elseif ($params[2] == AM_CMD_KEEPALIVE) { + $result = $value==$params[3]; + } elseif ($params[2] == AM_CMD_ROOM) { + $result = $roomId==$params[3] and $value==$params[4]; + } elseif ($params[2] == AM_CMD_AUDIO) { + $result = $roomId==$params[3] and $function==$params[4] and $value==$params[5]; + } elseif ($params[2] == AM_CMD_MODE) { + $result = $function==$params[3] and $value==$params[4]; + } else { + $result = false; + } + } else { + $error = 'Timeout'; + } + } + if (!$result) { + if ($error<>'') { + $error = ' ('.$error.')'; + } + if ($this->retryCount==AM_COM_MAXRETRIES) { + $this->LogErr('Received invalid Acknowledge from Server: '.$message.$error); + } else { + $this->LogTrc('Received invalid Acknowledge from Server: '.$message.$error); + } + } + return $result; + } + + /** + * @public + * + * Senden von Befehlen zum AudioMax Server + * + * @param string $type Kommando Type + * @param string $command Kommando + * @param integer $roomId Raum (0-15) + * @param string $function Funktion + * @param string $value Wert + * @return boolean TRUE für OK, FALSE bei Fehler + */ + public function SendData($type, $command, $roomId, $function, $value) { + $result = false; + + if ($type==AM_TYP_GET and $this->GetAudioMaxRoomVariablesEnabled()) { + if ($this->ValidateData($type, $command, $roomId, $function, $value)) { + $result = $this->GetValue($type, $command, $roomId, $function); + } + return $result; + } + + if ($this->SetBusy()) { + $this->LogTrc("Process Type='$type', Command='$command', Function='$function' and Value='$value' for Room $roomId"); + if ($this->ValidateData($type, $command, $roomId, $function, $value)) { + SetValue(IPS_GetObjectIDByIdent(AM_VAR_INPUTBUFFER, $this->instanceId), ''); + + $result = $this->SendDataComPort($type, $command, $roomId, $function, $value); + if ($result) { + if (GetValue(IPS_GetObjectIDByIdent(AM_VAR_MODEEMULATESTATE, $this->instanceId))) { + $this->SetValue($type, $command, $roomId, $function, $value); + IPS_Sleep(AM_COM_WAIT); + } elseif (!GetValue(IPS_GetObjectIDByIdent(AM_VAR_CONNECTION, $this->instanceId))) { + $this->SetValue($type, $command, $roomId, $function, $value); + } else { + $this->retryCount = 1; + while ($this->retryCount<=AM_COM_MAXRETRIES) { + if ($this->WaitForServerResponse($type, $command, $roomId, $function, $value)) { + $this->SetValue($type, $command, $roomId, $function, $value); + $this->retryCount = AM_COM_MAXRETRIES; + } else { + $this->LogTrc('Timeout or invalid Response while waiting for Server Response (Retry='.$this->retryCount.') --> Resend Message '. + $this->BuildMsg($type, $command, $roomId, $function, $value, false)); + SetValue(IPS_GetObjectIDByIdent(AM_VAR_INPUTBUFFER, $this->instanceId), ''); + $result = $this->SendDataComPort($type, $command, $roomId, $function, $value); + } + $this->retryCount++; + } + } + } + } + $this->ResetBusy(); + } else { + $this->LogErr("AudioMax is already BUSY, ignore Message".$this->BuildMsg($type, $command, $roomId, $function, $value, false)); + } + return $result; + } + + /** + * @public + * + * Empfangen von Befehlen vom AudioMax Server + * + * @param string $message Message vom AudioMax Server + */ + public function ReceiveData($message) { + $message = str_replace(chr(13), '', $message); + $message = str_replace(chr(10), '', $message); + $params = explode(AM_COM_SEPARATOR, $message); + + if ($message=='') return; + + $this->LogCom('Rcv Message: '.$message); + switch ($params[0]) { + case AM_TYP_EVT: + if ($params[2] == AM_CMD_POWER) { + $this->ValidateAndSetValue(AM_TYP_SET, AM_CMD_POWER, null, null, $params[3]); + } elseif ($params[2] == AM_CMD_MODE) { + $this->ValidateAndSetValue(AM_TYP_SET, AM_CMD_MODE, null, $params[3], $params[4]); + } elseif ($params[2] == AM_CMD_KEEPALIVE) { + SetValue(IPS_GetObjectIDByIdent(AM_VAR_KEEPALIVECOUNT, $this->instanceId), 0); + } elseif ($params[2] == AM_CMD_ROOM) { + $this->ValidateAndSetValue(AM_TYP_SET, AM_CMD_ROOM, $params[3], null, $params[4]); + } elseif ($params[2] == AM_CMD_AUDIO) { + $this->ValidateAndSetValue(AM_TYP_SET, AM_CMD_AUDIO, $params[3], $params[4], $params[5]); + } else { + //$this->LogErr("Received invalid Message".$message); + } + break; + case AM_TYP_GET: + case AM_TYP_SET: + SetValue(IPS_GetObjectIDByIdent(AM_VAR_INPUTBUFFER, $this->instanceId), $message); + break; + case AM_TYP_DBG: + break; + case AM_ERR_UNKNOWNCMD1: + case AM_ERR_UNKNOWNCMD2: + case AM_ERR_UNKNOWNCMD3: + case AM_ERR_UNKNOWNCMD4: + case AM_ERR_UNKNOWNCMD5: + break; + default: + $this->LogInf("Received unknown Message=".$message.', Type='.$params[0]); + break; + } + } + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/hardware/IPSEDIP/IPSEDIP.class.php b/IPSLibrary/app/hardware/IPSEDIP/IPSEDIP.class.php index 22f5f91..e7f5252 100644 --- a/IPSLibrary/app/hardware/IPSEDIP/IPSEDIP.class.php +++ b/IPSLibrary/app/hardware/IPSEDIP/IPSEDIP.class.php @@ -32,7 +32,6 @@ /** @}*/ /**@defgroup ipsedip IPSEDIP - * @ingroup hardware * @{ * * Es handelt sich bei IPSEDIP um Scripts, mit denen es möglich ist IPS Strukturen auf einem EDIP43 Display @@ -54,6 +53,8 @@ IPSUtils_Include ("IPSLogger.inc.php", "IPSLibrary::app::core::IPSLogger"); IPSUtils_Include ("IPSEDIP_Configuration.inc.php", "IPSLibrary::config::hardware::IPSEDIP"); + $_IPS['ABORT_ON_ERROR'] = true; + /** * @class IPSEDIP * @@ -70,6 +71,7 @@ abstract class IPSEDIP{ protected $rootId=0; protected $currentId=0; private $registerId=0; + private $errorcounter=0; protected $objectIdsId=0; protected $objectValuesId=0; @@ -368,15 +370,15 @@ private function AddObjects() { switch($object['ObjectType']) { case 0: // Category case 1: // Instance - echo 'Found Category '.$name."\n"; + //echo 'Found Category '.$name."\n"; $this->AddObjectCategory($linkId, $childrenId, $name, $position); break; case 2: // Variable - echo 'Found Variable '.$name."\n"; + //echo 'Found Variable '.$name."\n"; $this->AddObjectVariable($linkId, $childrenId, $name, $position); break; case 3: // Script - echo 'Found Script '.$name."\n"; + //echo 'Found Script '.$name."\n"; $this->AddObjectScript($linkId, $childrenId, $name, $position); break; default: @@ -585,7 +587,17 @@ public function SendText($string){ $string .= chr($checkSum % 256); //IPSLogger_Com(__file__,'Send Msg to EDIP: '.$string); - RegVar_SendText($this->registerId, $string); + $result = @RegVar_SendText($this->registerId, $string); + if ($result===false) { + $instanceId = IPS_GetInstance($this->registerId)['ConnectionID']; + IPS_SetProperty($instanceId, 'Open', false); + IPS_SetProperty($instanceId, 'Open', true); + IPS_ApplyChanges($instanceId); + $this->errorCounter++; + if ($this->errorCounter==2) { + IPSLogger_Wrn(__file__, 'Error sending EDIP Message to "'.IPS_GetName($this->instanceId).'"'); + } + } ips_sleep($this->sendDelay); } } diff --git a/IPSLibrary/app/hardware/IPSEDIP/IPSEDIP_Constants.inc.php b/IPSLibrary/app/hardware/IPSEDIP/IPSEDIP_Constants.inc.php index 6e27393..a575304 100644 --- a/IPSLibrary/app/hardware/IPSEDIP/IPSEDIP_Constants.inc.php +++ b/IPSLibrary/app/hardware/IPSEDIP/IPSEDIP_Constants.inc.php @@ -31,6 +31,7 @@ define ('EDIP_CONFIG_NAME', 'Name'); define ('EDIP_CONFIG_REGISTER', 'RegisterVariableId'); + define ('EDIP_CONFIG_IOINSTANCE', 'IO_InstanceId'); define ('EDIP_CONFIG_COMPORT', 'ComPort'); define ('EDIP_CONFIG_ROOT', 'RootId'); define ('EDIP_CONFIG_REFRESHMETHOD', 'RefreshMethod'); diff --git a/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic.inc.php b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic.inc.php new file mode 100644 index 0000000..f52e22d --- /dev/null +++ b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic.inc.php @@ -0,0 +1,38 @@ + + * + */ + + IPSUtils_Include ('IPSLogger.inc.php', 'IPSLibrary::app::core::IPSLogger'); + IPSUtils_Include ('IPSHomematic_Constants.inc.php', 'IPSLibrary::app::hardware::IPSHomematic'); + IPSUtils_Include ('IPSHomematic_Configuration.inc.php', 'IPSLibrary::config::hardware::IPSHomematic'); + IPSUtils_Include ('IPSHomematic_Custom.inc.php', 'IPSLibrary::config::hardware::IPSHomematic'); + IPSUtils_Include ('IPSHomematic_Utils.inc.php', 'IPSLibrary::app::hardware::IPSHomematic'); + IPSUtils_Include ('IPSHomematic_Manager.class.php', 'IPSLibrary::app::hardware::IPSHomematic'); + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_ChangeSettings.ips.php b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_ChangeSettings.ips.php new file mode 100644 index 0000000..6693423 --- /dev/null +++ b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_ChangeSettings.ips.php @@ -0,0 +1,35 @@ + + * + */ + + $variableId = $_IPS['VARIABLE']; + $variableValue = $_IPS['VALUE']; + + SetValue($variableId, $variableValue); + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_Constants.inc.php b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_Constants.inc.php new file mode 100644 index 0000000..f84a9d5 --- /dev/null +++ b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_Constants.inc.php @@ -0,0 +1,53 @@ + + * + */ + + define ('HM_PROPERTY_SERIAL', 0); + define ('HM_PROPERTY_CHANNEL', 1); + define ('HM_PROPERTY_PROTOCOL', 2); + define ('HM_PROPERTY_TYPE', 3); + + define ('HM_PROTOCOL_BIDCOSRF', 'BidCos-RF'); + define ('HM_PROTOCOL_BIDCOSWI', 'BidCos-WI'); + + define ('HM_TYPE_LIGHT', 'Light'); + define ('HM_TYPE_SHUTTER', 'Shutter'); + define ('HM_TYPE_DIMMER', 'Dimmer'); + define ('HM_TYPE_BUTTON', 'Button'); + define ('HM_TYPE_SMOKEDETECTOR', 'SmokeDetector'); + define ('HM_TYPE_SWITCH', 'Switch'); + + define ('HM_CONTROL_RSSI', 'RSSI'); + define ('HM_CONTROL_RSSIDEVICE', 'RSSIDevice'); + define ('HM_CONTROL_RSSIPEER', 'RSSIPeer'); + define ('HM_CONTROL_MESSAGES', 'Messages'); + define ('HM_CONTROL_PRIORITY', 'Priority'); + + define ('HM_TIMEOUT_REFRESH', 10); + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_Manager.class.php b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_Manager.class.php new file mode 100644 index 0000000..94bef0a --- /dev/null +++ b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_Manager.class.php @@ -0,0 +1,298 @@ + + * + */ + + /** + * @class IPSHomematic_Manager + * + * Definiert ein IPSHomematic_Manager Objekt + * + * @author Andreas Brauneis + * @version + * Version 2.50.1, 15.07.2012
+ */ + class IPSHomematic_Manager { + + /** + * @public + * + * Initializes the IPSHomematic_Manager + */ + public function __construct() { + } + + /** + * @public + * + * Refreshed alle RSSI Variablen von der CCU + */ + public function RefreshRSSIValues() { + $instanceIdList = $this->GetMaintainanceInstanceList(); + foreach ($instanceIdList as $instanceId) { + $variableId = @IPS_GetVariableIDByName('RSSI_DEVICE', $instanceId); + if ($variableId!==false) { + usleep(100000); + set_time_limit(HM_TIMEOUT_REFRESH); + HM_RequestStatus($instanceId, 'RSSI_DEVICE'); + } + $variableId = @IPS_GetVariableIDByName('RSSI_PEER', $instanceId); + if ($variableId!==false) { + usleep(100000); + set_time_limit(HM_TIMEOUT_REFRESH); + HM_RequestStatus($instanceId, 'RSSI_PEER'); + } + } + } + + /** + * @public + * + * Refreshed alle RSSI HTML Listen + */ + public function RefreshRSSIHtml() { + $instanceIdList = $this->GetMaintainanceInstanceList(); + $rssiDeviceList = array(); + $rssiPeerList = array(); + foreach ($instanceIdList as $instanceId) { + $variableId = @IPS_GetVariableIDByName('RSSI_DEVICE', $instanceId); + if ($variableId!==false) { + $rssiValue = GetValue($variableId); + if ($rssiValue<>-65535) { + $rssiDeviceList[$instanceId] = $rssiValue; + } + } + } + arsort($rssiDeviceList, SORT_NATURAL); + + foreach ($instanceIdList as $instanceId) { + $variableId = @IPS_GetVariableIDByName('RSSI_PEER', $instanceId); + if ($variableId!==false) { + $rssiValue = GetValue($variableId); + if ($rssiValue<>-65535) { + $rssiPeerList[$instanceId] = $rssiValue; + } + } + } + arsort($rssiPeerList, SORT_NATURAL); + + $categoryIdHtml = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.hardware.IPSHomematic.StatusMessages'); + $categoryIdSettings = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.hardware.IPSHomematic.Settings'); + + $variableIdRssi = IPS_GetObjectIDByIdent(HM_CONTROL_RSSI, $categoryIdHtml); + $variableIdRssiDevice = IPS_GetObjectIDByIdent(HM_CONTROL_RSSIDEVICE, $categoryIdHtml); + $variableIdRssiPeer = IPS_GetObjectIDByIdent(HM_CONTROL_RSSIPEER, $categoryIdHtml); + + $str = ""; + $str .= ""; + foreach($rssiDeviceList as $instanceId=>$value) { + $str .= ""; + } + $str .= "
GerätnameGeräteIDEmpfangsstärke
".IPS_GetName($instanceId)."".HM_GetAddress($instanceId)."".$value."
"; + SetValue($variableIdRssiDevice, $str); + + $str = ""; + $str .= ""; + foreach($rssiPeerList as $instanceId=>$value) { + $str .= ""; + } + $str .= "
GerätnameGeräteIDEmpfangsstärke
".IPS_GetName($instanceId)."".HM_GetAddress($instanceId)."".$value."
"; + SetValue($variableIdRssiPeer, $str); + + $str = ""; + $str .= ""; + $idx = 0; + foreach($rssiDeviceList as $instanceId=>$value) { + $idx++; + if ($idx<=10) { + $str .= ""; + } + } + $str .= "
GerätnameGeräteIDEmpfangsstärke
".IPS_GetName($instanceId)."".HM_GetAddress($instanceId)."".$value."
"; + SetValue($variableIdRssi, $str); + } + + /** + * @public + * + * Refresh Variablen und HTML der Empfangsstärken + */ + public function RefreshRSSI() { + $this->RefreshRSSIValues(); + $this->RefreshRSSIHtml(); + } + + /** + * @public + * + * Refresh aller Homematic Status Variablen (STATE und LEVEL) + */ + public function RefreshStatusVariables() { + $instanceIdList = IPS_GetInstanceListByModuleID("{EE4A81C6-5C90-4DB7-AD2F-F6BBD521412E}"); + foreach ($instanceIdList as $instanceId) { + $variableId = @IPS_GetVariableIDByName('STATE', $instanceId); + if ($variableId!==false) { + set_time_limit(HM_TIMEOUT_REFRESH); + HM_RequestStatus($instanceId, 'STATE'); + } + //$variableId = @IPS_GetVariableIDByName('LEVEL', $instanceId); + //if ($variableId!==false) { + // HM_RequestStatus($instanceId, 'LEVEL'); + //} + } + } + + /** + * @public + * + * Refresh der Homematic Service Messages + */ + public function RefreshServiceMessages() { + $texte = Array("CONFIG_PENDING" =>"Konfigurationsdaten stehen zur Übertragung an", + "LOWBAT" =>"Batterieladezustand gering", + "STICKY_UNREACH" =>"Gerätekommunikation war gestört", + "UNREACH" =>"Gerätekommunikation aktuell gestört"); + + $str = ""; // Farbe anpassen oder style entfernen + $str .= ""; + $str_log = ""; + $ids = IPS_GetInstanceListByModuleID("{A151ECE9-D733-4FB9-AA15-7F7DD10C58AF}"); + if(sizeof($ids) == 0) die("Keine HomeMatic Socket Instanz gefunden!"); + + $msgs = HM_ReadServiceMessages($ids[0]); + if($msgs === false) die("Verbindung zur CCU fehlgeschlagen"); + + if(sizeof($msgs) == 0) { + $str .= ""; + $str_log .= "Keine Servicemeldungen!"; + } + foreach($msgs as $msg) { + if(array_key_exists($msg['Message'], $texte)) { + $text = $texte[$msg['Message']]; + } else { + $text = $msg['Message']; + } + $id = HM_GetInstanceIDFromHMAddress($msg['Address']); + if(IPS_InstanceExists($id)) { + $name = IPS_GetLocation($id); + } else { + $name = "Gerät nicht in IP-Symcon eingerichtet"; + } + + $str .= ""; + $str_log .= $name." - ".$msg['Address']." - ".$text."\n"; + } + $str .= "
GerätnameGeräteIDMeldung

Keine Servicemeldungen!
".$name."".$msg['Address']."".$text."
"; + + $categoryIdHtml = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.hardware.IPSHomematic.StatusMessages'); + $categoryIdSettings = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.hardware.IPSHomematic.Settings'); + $variableIdMessages = IPS_GetObjectIDByIdent(HM_CONTROL_MESSAGES, $categoryIdHtml); + $variableIdPriority = IPS_GetObjectIDByIdent(HM_CONTROL_PRIORITY, $categoryIdSettings); + if (GetValue($variableIdMessages) <> $str) { + SetValue($variableIdMessages, $str); + IPSLogger_Not(__file__, 'New Homematic Service Messages:'.PHP_EOL.$str_log, GetValue($variableIdPriority)); + } + } + + /** + * @public + * + * Reset der Homematic Service Messages + */ + public function ResetServiceMessages() { + $homematicIntanceIdList = IPS_GetInstanceListByModuleID("{A151ECE9-D733-4FB9-AA15-7F7DD10C58AF}"); + if(sizeof($homematicIntanceIdList) == 0) die("Keine HomeMatic Socket Instanz gefunden!"); + + $CCUIPAddress = HM_GetHost($homematicIntanceIdList[0]); + + $HM_Script = " + string itemID; + string address; + object aldp_obj; + + foreach(itemID, dom.GetObject(ID_DEVICES).EnumUsedIDs()) + { + address = dom.GetObject(itemID).Address(); + aldp_obj = dom.GetObject('AL-' # address # ':0.STICKY_UNREACH'); + if (aldp_obj) + { + if (aldp_obj.Value()) + { + aldp_obj.AlReceipt(); + ! dom.GetObject('Kommunikationsstörung').State(dom.GetObject(itemID).Name()); + } + } + }"; + + // Initialisieren der Socket-Verbindung + $fp = fsockopen ($CCUIPAddress, 8181, $errno, $errstr, 2); + $res = ""; + + if (!$fp) { + $res = "$errstr ($errno)
\n"; + } else { + // Zusammenstellen des Header für HTTP-Post + fputs($fp, "POST /Test.exe HTTP/1.1\r\n"); + fputs($fp, "Content-type: application/x-www-form-urlencoded\r\n"); + fputs($fp, "Content-length: ". strlen($HM_Script) ."\r\n"); + fputs($fp, "Connection: close\r\n\r\n"); + fputs($fp, $HM_Script); + while(!feof($fp)) { + $res .= fgets($fp, 500); + } + fclose($fp); + } + return $res; + } + + /** + * @public + * + * Liefert alle Homematic Maintainmance Instance IDs, die in der Konfiguration eingetragen sind + * + * @return array[int] Homematic Instance IDs + */ + public function GetMaintainanceInstanceList() { + $homematicInstanceList = IPS_GetInstanceListByModuleID("{EE4A81C6-5C90-4DB7-AD2F-F6BBD521412E}"); + $homematicAddressList = array(); + $homematicMaintainanceList = array(); + + foreach ($homematicInstanceList as $homematicInstanceId ) { + $homematicAddress = HM_GetAddress($homematicInstanceId); + $homematicAddressList[$homematicAddress] = $homematicInstanceId; + + $pos = strpos($homematicAddress, ':0'); + if ($pos !== false) { + $homematicMaintainanceList[$homematicInstanceId] = $homematicInstanceId; + } + } + + return $homematicMaintainanceList; + } + } + + /** @}*/ +?> diff --git a/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_RefreshRSSI.ips.php b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_RefreshRSSI.ips.php new file mode 100644 index 0000000..ea1a490 --- /dev/null +++ b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_RefreshRSSI.ips.php @@ -0,0 +1,35 @@ + + * + */ + + IPSUtils_Include ('IPSHomematic.inc.php', 'IPSLibrary::app::hardware::IPSHomematic'); + + $homematicManager = new IPSHomematic_Manager(); + $homematicManager->RefreshRSSI(); + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_RefreshServiceMessages.ips.php b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_RefreshServiceMessages.ips.php new file mode 100644 index 0000000..942c7d6 --- /dev/null +++ b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_RefreshServiceMessages.ips.php @@ -0,0 +1,36 @@ + + * + */ + + + IPSUtils_Include ('IPSHomematic.inc.php', 'IPSLibrary::app::hardware::IPSHomematic'); + + $homematicManager = new IPSHomematic_Manager(); + $homematicManager->RefreshServiceMessages(); + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_RefreshStatusVariables.ips.php b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_RefreshStatusVariables.ips.php new file mode 100644 index 0000000..a397ac4 --- /dev/null +++ b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_RefreshStatusVariables.ips.php @@ -0,0 +1,35 @@ + + * + */ + + IPSUtils_Include ('IPSHomematic.inc.php', 'IPSLibrary::app::hardware::IPSHomematic'); + + $homematicManager = new IPSHomematic_Manager(); + $homematicManager->RefreshStatusVariables(); + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_ResetServiceMessages.ips.php b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_ResetServiceMessages.ips.php new file mode 100644 index 0000000..63d03a3 --- /dev/null +++ b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_ResetServiceMessages.ips.php @@ -0,0 +1,36 @@ + + * + */ + + IPSUtils_Include ('IPSHomematic.inc.php', 'IPSLibrary::app::hardware::IPSHomematic'); + + $homematicManager = new IPSHomematic_Manager(); + $homematicManager->ResetServiceMessages(); + $homematicManager->RefreshServiceMessages(); + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_SmokeDetector.ips.php b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_SmokeDetector.ips.php new file mode 100644 index 0000000..d733074 --- /dev/null +++ b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_SmokeDetector.ips.php @@ -0,0 +1,39 @@ + + * + */ + + IPSUtils_Include ('IPSHomematic.inc.php', 'IPSLibrary::app::hardware::IPSHomematic'); + + $sender = $_IPS['SENDER']; + $variableId = $_IPS['VARIABLE']; + $value = $_IPS['VALUE']; + if ($value) { + IPSHomematic_OnActivateSmokeDetector($variableId); + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_TimerRefreshRSSI.ips.php b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_TimerRefreshRSSI.ips.php new file mode 100644 index 0000000..ea1a490 --- /dev/null +++ b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_TimerRefreshRSSI.ips.php @@ -0,0 +1,35 @@ + + * + */ + + IPSUtils_Include ('IPSHomematic.inc.php', 'IPSLibrary::app::hardware::IPSHomematic'); + + $homematicManager = new IPSHomematic_Manager(); + $homematicManager->RefreshRSSI(); + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_TimerRefreshServiceMessages.ips.php b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_TimerRefreshServiceMessages.ips.php new file mode 100644 index 0000000..79f9ae5 --- /dev/null +++ b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_TimerRefreshServiceMessages.ips.php @@ -0,0 +1,35 @@ + + * + */ + + IPSUtils_Include ('IPSHomematic.inc.php', 'IPSLibrary::app::hardware::IPSHomematic'); + + $homematicManager = new IPSHomematic_Manager(); + $homematicManager->RefreshServiceMessages(); + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_Utils.inc.php b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_Utils.inc.php new file mode 100644 index 0000000..4f04000 --- /dev/null +++ b/IPSLibrary/app/hardware/IPSHomematic/IPSHomematic_Utils.inc.php @@ -0,0 +1,51 @@ + + * + */ + + // ==================================================================================================== + /** + * @public + * + * Liefert die Instance ID zu einer Homematic Adresse + * + * @param string $sid Homematic Adresse + * @return int ID der Homematic Instance + */ + function HM_GetInstanceIDFromHMAddress($sid) { + $ids = IPS_GetInstanceListByModuleID("{EE4A81C6-5C90-4DB7-AD2F-F6BBD521412E}"); + foreach($ids as $id) { + $a = explode(":", HM_GetAddress($id)); + $b = explode(":", $sid); + if($a[0] == $b[0]) { + return $id; + } + } + return 0; + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/Charts/IPSHighcharts/IPSHighcharts.inc.php b/IPSLibrary/app/modules/Charts/IPSHighcharts/IPSHighcharts.inc.php new file mode 100644 index 0000000..6a31705 --- /dev/null +++ b/IPSLibrary/app/modules/Charts/IPSHighcharts/IPSHighcharts.inc.php @@ -0,0 +1,1792 @@ + + * Version 2.50.1, 05.10.2012 ab: Integration IPSLibrary
+ * + * IPSHighcharts, ermöglich Darstellung von Charts im Webfront mit Hilfe von "Highcharts" (www.highcharts.com) + * + */ + + $version = "2.03"; $versionDate = "05.10.2012"; + + //ToDo: + // FEATURE: Plotbands. Timestamp in From und To + // Fehlerquelle: AggType ist "Größer" als der angezeigte Zeitraum + // vielleicht alles als cfg direkt json_encoden und nicht jedes Teil einzeln + //-------------------------------------------------------------------------------------------------------------------------------- + // Für die Darstellung der Graphen wird das HTML5/JS Framework "Highcharts" der Fa. Highslide Software verwendet (www.highcharts.com) + // Alle Rechte dieses Frameworks liegen bei Highslide Software. + // 'Highcharts' kann unter folgenden Bedinungen kostenlos eingesetzt werden: + // * Namensnennung — Sie müssen den Namen des Autors/Rechteinhabers in der von ihm festgelegten Weise nennen. + // * Keine kommerzielle Nutzung — Dieses Werk bzw. dieser Inhalt darf nicht für kommerzielle Zwecke verwendet werden. + // Download: wwww.highcharts.com/download/ ... und die Dateien einfach in das Webfront (Es sollte ein V 2.2 oder höher verwendet werden. + // Demos: http://www.highcharts.com/demo/ + // API: http://www.highcharts.com/ref/ + //-------------------------------------------------------------------------------------------------------------------------------- + // Changelog: + // --- V2.00 --------------------------------------------------------------------------------------------------------------------- + // 10/2012 AB NEU Integration IPSLibrary + // 04/2012 KHC REFACT Umfangreiches Überarbeiten der Highchart-Script Funktionen. + // bis Integration der meisten Original-Highcharts-Options als PHP-Array (siehe http://www.highcharts.com/ref) + // 05/2012 Highcharts-Options "lang" aus IPS_Template.php in Highcharts-Script verschoben + // --- V2.01 --------------------------------------------------------------------------------------------------------------------- + // 07.05.2012 KHC NEU Test mit Integration Highstock. Neuer Parameter ['Ips']['ChartType'] = 'Highcharts' oder 'Highstock' + // 07.05.2012 KHC NEU IPS_Template.php auf jquery 1.7.2 geändert + // 07.05.2012 KHC FIX krsort durch array_reverse getauscht, da krsort Probleme beim json_encode macht + // 08.05.2012 KHC REFACT intern noch mehr auf Arrays umgestellt und etwas umstrukturiert + // 09.05.2012 KHC NEU über 'CreateConfigFileByPathAndFilename($stringForCfgFile, $path, $filename)' kann eine Tmp_datei mit bel. Namen geschrieben werden + // 10.05.2012 KHC FIX Fehler beim Auswerten der AggregatedValues behoben (ReadDataFromDBAndCreateDataArray) + // 12.05.2012 KHC FIX Tooltip für "ReplaceValues" korrigiert + // 12.05.2012 KHC CHANGE Start- und Endzeitpunkt der X-Achse wurde automatisch um 5 Minuten korrigiert -> dies wurde entfernt + // 12.05.2012 KHC NEU mit ['xAxis']['min']=false und ['xAxis']['min']=false kann festeglegt werden dass Min oder Max nicht autom. festgelegt werden + // --- V2.02 --------------------------------------------------------------------------------------------------------------------- + // 13.05.2012 KHC FIX RunType=file: Wenn Highstock vorgewählt wurde wurde das tmp File nicht in die Highstock-Verzeichnis geschrieben + // 16.05.2012 KHC NEU Integration Highstock: ['Navigator'], ['rangeSelector'] und ['scrollbar'] + // 18.05.2012 KHC FIX Integration Highstock: Zusätzliche series.type 'candlestick' und 'ohlc' erlauben + // 19.05.2012 KHC NEU Neue Parameter ['Ips']['Dashboard'] für die Darstellung im Dashboard + + //-------------------------------------------------------------------------------------------------------------------------------- + + // ------------------------------------------------------------------------ + // WriteContentWithFilename + // Mit dieser Funktion wird der Content-String geschrieben. + // IN: $cfg = .. + // IN: $tmpFilename = Der Dateiname welche die Config Daten enthält + // ------------------------------------------------------------------------ + function WriteContentWithFilename($cfg, $tmpFilename) + { + DebugModuleName($cfg,"WriteContentWithFilename"); + + if ($tmpFilename != "") + { + SetValue($cfg['ContentVarableId'], + GetContentVariableString ($cfg, "CfgFile", $tmpFilename)); + } + else + SetValue($cfg['ContentVarableId'], 'Falsche Parameter beim Funktionsaufruf "WriteContentTextbox"'); + } + + // ------------------------------------------------------------------------ + // WriteContentWithScriptId + // Mit dieser Funktion wird der Content-String geschrieben. + // IN: $cfg = .. + // IN: $scriptId = Die Script Id welche den ConfigString enthält. + // ------------------------------------------------------------------------ + function WriteContentWithScriptId($cfg, $scriptId) + { + DebugModuleName($cfg,"WriteContentWithScriptId"); + + if ($cfg['RunMode'] == "popup") + { + WFC_SendPopup($cfg['WebFrontConfigId'], + $cfg['WFCPopupTitle'] , + GetContentVariableString ($cfg, "ScriptId", $scriptId)); + } + else + { + SetValue($cfg['ContentVarableId'], + GetContentVariableString ($cfg, "ScriptId", $scriptId)); + } + } + + // ------------------------------------------------------------------------ + // 05.10.2012 ab: Adapted Path to Templates + function GetContentVariableString($cfg, $callBy, $callIdent) + { + $chartType = $cfg['Ips']['ChartType']; + $height = $cfg['HighChart']['Height'] + 16; + + if (isset($cfg['Ips']['Dashboard']['Ip']) && isset($cfg['Ips']['Dashboard']['Port'])) + { + $s = "http://" . $cfg['Ips']['Dashboard']['Ip'] . ":" . $cfg['Ips']['Dashboard']['Port'] . + "/User/IPSHighcharts/IPSTemplates/$chartType.php?$callBy=" . $callIdent . " " . + "width='100%' height='". $height ."' frameborder='1' scrolling='no'"; + } + else + { + $s = ""; + } + return $s; + } + + // ------------------------------------------------------------------------ + // CreateConfigFile + // Erzeugt das tmp-Highcharts Config-File mit der $id als Dateinamen + // IN: $stringForCfgFile = String welcher in das File geschrieben wird + // ------------------------------------------------------------------------ + function CreateConfigFile($stringForCfgFile, $id, $charttype = 'Highcharts') + { + $path = "webfront\user\IPSHighcharts\\" . $charttype; + $filename = $charttype . "Cfg$id.tmp"; + + return CreateConfigFileByPathAndFilename($stringForCfgFile, $path, $filename); + } + + // ------------------------------------------------------------------------ + // CreateConfigFileByPathAndFilename + // Erzeugt das tmp-Highcharts Config-File + // IN: $stringForCfgFile = String welcher in das File geschrieben wird + // $path, $filename = Pfad un Name des Tmp-Files welches erzeugt werden soll + // ------------------------------------------------------------------------ + function CreateConfigFileByPathAndFilename($stringForCfgFile, $path, $filename) + { + // Standard-Dateiname ..... + $tmpFilename = IPS_GetKernelDir() . $path . "\\" . $filename; + + // schreiben der Config Daten + $handle = fopen($tmpFilename,"w"); + fwrite($handle, $stringForCfgFile); + fclose($handle); + + return $tmpFilename; + } + + // ------------------------------------------------------------------------ + // CheckCfgDaten + // Aufruf bei jedem Cfg-Start + // IN: $cfg = .. + // OUT: korrigierte cfg + // ------------------------------------------------------------------------ + function CheckCfgDaten($cfg) + { + DebugModuleName($cfg,"CheckCfgDaten"); + + global $_IPS; + + // Debugging + IfNotIssetSetValue($cfg['Ips']['Debug']['Modules'], false); + IfNotIssetSetValue($cfg['Ips']['Debug']['ShowJSON'], false); + IfNotIssetSetValue($cfg['Ips']['Debug']['ShowJSON_Data'], false); + IfNotIssetSetValue($cfg['Ips']['Debug']['ShowCfg'], false); + + // ChartType + IfNotIssetSetValue($cfg['Ips']['ChartType'], 'Highcharts'); + + if ($cfg['Ips']['ChartType'] != 'Highcharts' && $cfg['Ips']['ChartType'] != 'Highstock') + die ("Abbruch! Es sind nur 'Highcharts' oder 'Highstock' als ChartType zulässig"); + + // über WebInterface kommt der Aufruf wenn die Content-Variable aktualisiert wird + if ($_IPS['SENDER'] != "WebInterface" && $cfg['RunMode'] != "popup") + $cfg = Check_ContentVariable($cfg, $_IPS['SELF']); + + return $cfg; + } + + // ------------------------------------------------------------------------ + // CreateConfigString + // Erzeugt den für Higcharts benötigten Config String und gibt diesen als String zurück + // IN: $cfg = .. + // OUT: der erzeugte Config String + // ------------------------------------------------------------------------ + function CreateConfigString($cfg) + { + DebugModuleName($cfg,"CreateConfigString"); + + $cfg = CompatibilityCheck($cfg); + $cfg = CheckCfg($cfg); + + $cfgString = GetHighChartsCfgFile($cfg); + + // Zusätzliche Config in Highchart Config hinzufügen + $cfgString = ReadAdditionalConfigData($cfg) . "\n|||\n" . $cfgString; + + // Language Options aus IPS_Template.php hierher verschoben + $cfgString .= "\n|||\n". GetHighChartsLangOptions($cfg);; + + return $cfgString; + } + + function CompatibilityCheck($cfg) + { + DebugModuleName($cfg,"CompatibilityCheck"); + + // Series + if (isset($cfg['Series']) && isset($cfg['series'])) + die ("Abbruch - Es düfen nicht gleichzeitig 'Series' und 'series' definiert werden."); + if (isset($cfg['Series']) && !isset($cfg['series'])) + $cfg['series'] = $cfg['Series']; + unset ($cfg['Series']); + + // Title + if (isset($cfg['Title']) && !isset($cfg['title']['text'])) + $cfg['title']['text'] = $cfg['Title']; + unset ($cfg['Title']); + + // SubTitle + if (isset($cfg['SubTitle']) && !isset($cfg['subtitle']['text'])) + $cfg['subtitle']['text'] = $cfg['SubTitle']; + unset ($cfg['SubTitle']); + + // SubTitleDateTimeFormat + if (isset($cfg['SubTitleDateTimeFormat']) && !isset($cfg['subtitle']['Ips']['DateTimeFormat'])) + $cfg['subtitle']['Ips']['DateTimeFormat'] = $cfg['SubTitleDateTimeFormat']; + unset ($cfg['SubTitleDateTimeFormat']); + + // yAxis + if (isset($cfg['yAxis'])) + { + $axisArr = array(); + foreach ($cfg['yAxis'] as $Axis) + { + $cfgAxis = $Axis; + + // Name + if (isset($Axis['Name']) && !isset($cfgAxis['title']['text'])) + $cfgAxis['title']['text'] = $Axis['Name']; + unset ($cfgAxis['Name']); + + // TickInterval + if (isset($Axis['TickInterval']) && !isset($cfgAxis['tickinterval'])) + $cfgAxis['tickinterval'] = $Axis['TickInterval']; + unset ($cfgAxis['TickInterval']); + + // Opposite + if (isset($Axis['Opposite']) && !isset($cfgAxis['opposite'])) + $cfgAxis['opposite'] = $Axis['Opposite']; + unset ($cfgAxis['Opposite']); + + $axisArr[] = $cfgAxis; + } + $cfg['yAxis'] = $axisArr; + } + return $cfg; + } + + // ------------------------------------------------------------------------ + // CheckCfg + // Prüft daKonfiguration und korrigiert und Vervollständigtdiese zum Teil + // IN: $cfg = .. + // OUT: der erzeugte Config String + // ------------------------------------------------------------------------ + function CheckCfg($cfg) + { + DebugModuleName($cfg,"CheckCfg"); + + $cfg = CheckCfg_Common($cfg); + $cfg = CheckCfg_AreaHighChart($cfg); + $cfg = CheckCfg_AggregatedValues($cfg); + $cfg = CheckCfg_StartEndTime($cfg); + $cfg = CheckCfg_Series($cfg); + + return $cfg; + } + + // ------------------------------------------------------------------------ + // CheckCfg_Common + // wenn RunMode=Popup, prüfen der dazugehörigen Daten wie WebfrontConfigId, usw. + // und wenn RunMode=Popup, prüfen der dazugehörigen Daten wie WebfrontConfigId, usw. + // IN: $cfg + // OUT: korrigiertes $cfg + // ------------------------------------------------------------------------ + function CheckCfg_Common($cfg) + { + DebugModuleName($cfg,"CheckCfg_Common"); + + if (!isset($cfg['series'])) + die ("Abbruch - Es wurden keine Serien definiert."); + + // Id des ArchiveHandler auslesen + if (!isset($cfg['ArchiveHandlerId']) || $cfg['ArchiveHandlerId'] == -1) + { + $instances = IPS_GetInstanceListByModuleID('{43192F0B-135B-4CE7-A0A7-1475603F3060}'); + $cfg['ArchiveHandlerId'] = $instances[0]; + } + // Prüfen des ArchiveHandlers + $instance = @IPS_GetInstance($cfg['ArchiveHandlerId']); + if ($instance['ModuleInfo']['ModuleID'] != "{43192F0B-135B-4CE7-A0A7-1475603F3060}") + die ("Abbruch - 'ArchiveHandlerId' (".$cfg['ArchiveHandlerId'].") ist keine Instance eines ArchiveHandler."); + + if ($cfg['RunMode'] == "popup") + { + // keine Webfront Id + if (!isset($cfg['WebFrontConfigId'])) + die ("Abbruch - Konfiguration von 'WebFrontConfigId' fehlt."); + + // prüfen ob die übergebene Id ein WebFront ist + $instance = @IPS_GetInstance($cfg['WebFrontConfigId']); + if ($instance['ModuleInfo']['ModuleID'] != "{3565B1F2-8F7B-4311-A4B6-1BF1D868F39E}") + die ("Abbruch - 'WebFrontConfigId' ist keine WebFrontId"); + + IfNotIssetSetValue($cfg['WFCPopupTitle'], ""); + } + + return $cfg; + } + + + // ------------------------------------------------------------------------ + // Check_ContentVariable + // prüfen ob Angaben der Content Variable stimmen oder ob es das übergeordnete Element ist + // IN: $cfg + // OUT: korrigiertes $cfg + // ------------------------------------------------------------------------ + function Check_ContentVariable($cfg, $scriptId) + { + DebugModuleName($cfg,"Check_ContentVariable"); + + // wenn keine Id übergeben wurde wird das übergeordnete Objekt als Content verwendet + if (!isset($cfg['ContentVarableId']) || $cfg['ContentVarableId'] <= 0) + $cfg['ContentVarableId'] = IPS_GetParent($scriptId); + + $variable = @IPS_GetVariable($cfg['ContentVarableId']); + if ($variable == false) + die ("Abbruch - Content-Variable nicht gefunden."); + + if ($variable['VariableValue']['ValueType'] != 3) + die ("Abbruch - Content-Variable ist keine STRING-Variable."); + + if ($variable['VariableCustomProfile'] != "~HTMLBox") + die ("Abbruch - Content-Variable muss als Profil '~HTMLBox' verwenden."); + + return $cfg; + } + + // ------------------------------------------------------------------------ + // CheckCfg_AreaHighChart + // + // IN: $cfg + // OUT: korrigiertes $cfg + // ------------------------------------------------------------------------ + function CheckCfg_AreaHighChart($cfg) + { + DebugModuleName($cfg,"CheckCfg_AreaHighChart"); + + IfNotIssetSetValue($cfg['HighChart']['Theme'], ""); + IfNotIssetSetValue($cfg['HighChart']['Width'], 0); + IfNotIssetSetValue($cfg['HighChart']['Height'], 400); + + return $cfg; + } + + // ------------------------------------------------------------------------ + // CheckCfg_StartEndTime + // Start- und Endzeit des gesamten Charts errechnen, und an jede Serie übergeben + // IN: $cfg + // OUT: korrigiertes $cfg + // ------------------------------------------------------------------------ + function CheckCfg_StartEndTime($cfg) + { + DebugModuleName($cfg,"CheckCfg_StartEndTime"); + + $cfg['Ips']['ChartStartTime'] = $cfg['StartTime']; + $cfg['Ips']['ChartEndTime'] = $cfg['EndTime']; + + $offsetExistsAtSerie = false; + $Count = count($cfg['series']); + + for ($i = 0; $i < $Count; $i++) + { + $Serie = $cfg['series'][$i]; + + // wenn für die Serie keine Start oder Endzeit übergeben würde wird der Standardwert genommen + IfNotIssetSetValue($Serie['StartTime'], $cfg['StartTime']); + IfNotIssetSetValue($Serie['EndTime'], $cfg['EndTime']); + + if ($Serie['StartTime'] < $cfg['Ips']['ChartStartTime']) + $cfg['Ips']['ChartStartTime'] = $Serie['StartTime']; + if ($Serie['EndTime'] > $cfg['Ips']['ChartEndTime']) + $cfg['Ips']['ChartEndTime'] = $Serie['EndTime']; + + $Serie['Ips']['EndTimeString'] = date("/r", $Serie['EndTime']); + $Serie['Ips']['StartTimeString']= date("/r", $Serie['StartTime']); + + $cfg['series'][$i] = $Serie; + + if (isset($Serie['Offset']) && $Serie['Offset'] != 0) + $offsetExistsAtSerie =true; + } + + // wenn ein Offset definiert wurde gilt nur der global eingestellte Start und Endzeitpunkt + if ($offsetExistsAtSerie = true) + { + $cfg['Ips']['ChartStartTime'] = $cfg['StartTime']; + $cfg['Ips']['ChartEndTime'] = $cfg['EndTime']; + } + + return $cfg; + + } + + // ------------------------------------------------------------------------ + // CheckCfg_Series + // prüfen der Serien + // IN: $cfg + // OUT: korrigiertes $cfg + // ------------------------------------------------------------------------ + function CheckCfg_Series($cfg) + { + DebugModuleName($cfg,"CheckCfg_Series"); + + $Id_AH = $cfg['ArchiveHandlerId']; + + $series = array(); + foreach ($cfg['series'] as $Serie) + { + $VariableId = @$Serie['Id']; + + // hier wird nur geprüft ob Wert von Eingabe passen könnte (wenn vorhanden) + if (isset($Serie['AggType']) && ($Serie['AggType']<0 || $Serie['AggType']>4) ) + die ("Abbruch - 'AggType' hat keinen korrekten Wert"); + + $Serie['Ips']['IsCounter'] = $VariableId && (@AC_GetAggregationType($Id_AH, $VariableId) == 1); + + // über AggValue kann Min/Max oder Avg vorgewählt werden (zum Lesen der AggregValues) + IfNotIssetSetValue($Serie['AggValue'], "Avg"); + + if ($Serie['AggValue'] != "Avg" + && $Serie['AggValue'] != "Min" + && $Serie['AggValue'] != "Max") + die ("Abbruch - 'AggValue' hat keinen gültigen Wert"); + + // Offset für Darstellung von z.B. Monate und Vormonat in einem Chart + IfNotIssetSetValue($Serie['Offset'], 0); + + IfNotIssetSetValue($Serie['ReplaceValues'], false); + + // Name (Kompatibilität aus V1.x) + if (isset($Serie['Name']) && !isset($Serie['name'])) + $Serie['name'] = $Serie['Name']; + unset($Serie['Name']); + + IfNotIssetSetValue($Serie['name'], ""); + + // type & Parameter + if (isset($Serie['type']) && isset($Serie['Param'])) + die ("Abbruch - Definition von 'Param' und 'type' in Serie gleichzeitig nicht möglich."); + if (!isset($Serie['type']) && !isset($Serie['Param'])) + die ("Abbruch - Serie muss Definition von 'Param' oder 'type' enthalten."); + + // Mögliche Charttypen + $allowedSeriesTypes = array(); + if ($cfg['Ips']['ChartType'] == 'Highcharts') + $allowedSeriesTypes = array('area','areaspline','bar','column','line','pie','scatter','spline'); + else if ($cfg['Ips']['ChartType'] == 'Highstock') + $allowedSeriesTypes = array('area','areaspline','bar','column','line','pie','scatter','spline','ohlc','candlestick'); + + if (!isset($Serie['type']) && isset($Serie['Param'])) + { + // type aus Param übernehmen + foreach($allowedSeriesTypes as $item) + { + if (strrpos($Serie['Param'],"'$item'") > 0) + $Serie['Ips']['Type'] = $item; + } + } + else + { + if (!in_array($Serie['type'], $allowedSeriesTypes)) + die ("Abbruch - Serien-Type (" . $Serie['type'] . ") nicht erkennbar."); + else + $Serie['Ips']['Type'] = $Serie['type']; + } + if (!isset($Serie['Ips']['Type'])) + die ("Abbruch - Serien-Type nicht erkennbar."); + + // data + if (isset($Serie['Data']) && isset($Serie['data'])) + die ("Abbruch - Definition von 'Data' und 'data' in ein und derselben Serie nicht mölglich."); + if (!isset($Serie['data']) && isset($Serie['Data'])) + { + $Serie['data'] = $Serie['Data']; + unset($Serie['Data']); + } + + // diverse Prüfungen bei PIE-Charts + if ($Serie['Ips']['Type'] == 'pie') + { + if (isset($Serie['Id'])) + { + if (!isset($Serie['AggType'])) + die ("Abbruch - Wird ein Pie über Id definiert muss auch AggType parametriert werden"); + + // wenn nichts angegeben wird 'AggNameFormat: automatisch abhängig vom 'AggType' berechnet + if (!isset($Serie['AggNameFormat'])) + { + if ($Serie['AggType'] == 0) //0=Hour + $Serie['AggNameFormat'] = "d.m.Y H:i"; + else if ($Serie['AggType'] == 1) //1=Day + $Serie['AggNameFormat'] = "d.m.Y"; + else if ($Serie['AggType'] == 2) //2=Week + $Serie['AggNameFormat'] = "\K\WW Y"; + else if ($Serie['AggType'] == 3) //3=Month + $Serie['AggNameFormat'] = "M Y"; + else if ($Serie['AggType'] == 4) //4=Year + $Serie['AggNameFormat'] = "Y"; + } + } + else if (isset($Serie['data'])) + { + foreach($Serie['data'] as $data) + { + if (isset($data['Id']) && isset($data['y'])) + die ("Abbruch - Pie['data']: Id und y sind als gleichzeitige Parameter nicht möglich."); + //if (!isset($data['Id']) && !isset($data['y'])) + // die ("Abbruch - Pie['data']: Id oder y muss definiert sein"); + // kann man so nicht prüfen + } + } + else + { + die ("Abbruch - Pie kann nie Daten besitzen. Es muss entweder über 'Id' oder über 'data' definiert werden."); + } + + } + + // geänderte Werte wieder zurückschreiben + $series[] = $Serie; + } + // geänderte Werte wieder zurückschreiben + + $cfg['series'] = $series; + return $cfg; + } + + // ------------------------------------------------------------------------ + // CheckCfg_AggregatedValues + // prüfen der AggregatedValues und Übernahme dieser in die Serien + // IN: $cfg + // OUT: korrigiertes $cfg + // ------------------------------------------------------------------------ + function CheckCfg_AggregatedValues($cfg) + { + DebugModuleName($cfg,"CheckCfg_AggregatedValues"); + + if (!isset($cfg['AggregatedValues'])) + $cfg['AggregatedValues'] = array(); + + // Default - wenn nichts vorbelegt + IfNotIssetSetValue($cfg['AggregatedValues']['MixedMode'], false); + IfNotIssetSetValue($cfg['AggregatedValues']['HourValues'], -1); + IfNotIssetSetValue($cfg['AggregatedValues']['DayValues'], -1); + IfNotIssetSetValue($cfg['AggregatedValues']['WeekValues'], -1); + IfNotIssetSetValue($cfg['AggregatedValues']['MonthValues'], -1); + IfNotIssetSetValue($cfg['AggregatedValues']['YearValues'], -1); + IfNotIssetSetValue($cfg['AggregatedValues']['NoLoggedValues'], 100); + + $series = array(); + foreach ($cfg['series'] as $Serie) + { + + // prüfen ob für die Serie Einstellungen für AggregatedValues vorhanden sind, + // wenn nicht Übernahme aus cfg + if (isset($Serie['AggregatedValues'])) + { + IfNotIssetSetValue($Serie['AggregatedValues']['MixedMode'], $cfg['AggregatedValues']['MixedMode']); + IfNotIssetSetValue($Serie['AggregatedValues']['HourValues'], $cfg['AggregatedValues']['HourValues']); + IfNotIssetSetValue($Serie['AggregatedValues']['DayValues'], $cfg['AggregatedValues']['DayValues']); + IfNotIssetSetValue($Serie['AggregatedValues']['WeekValues'], $cfg['AggregatedValues']['WeekValues']); + IfNotIssetSetValue($Serie['AggregatedValues']['MonthValues'], $cfg['AggregatedValues']['MonthValues']); + IfNotIssetSetValue($Serie['AggregatedValues']['YearValues'], $cfg['AggregatedValues']['YearValues']); + IfNotIssetSetValue($Serie['AggregatedValues']['NoLoggedValues'], $cfg['AggregatedValues']['NoLoggedValues']); + } + else // nein -> Daten aus übergeordneter cfg übernehmen + $Serie['AggregatedValues'] = $cfg['AggregatedValues']; + + // Umrechnen der Tage in Sekunden ... für direktes addieren zum Timestamp + $MinPerTag = 24*60*60; + + if ($Serie['AggregatedValues']['HourValues'] != -1) + $Serie['AggregatedValues']['HourValues'] *= $MinPerTag; + if ($Serie['AggregatedValues']['DayValues'] != -1) + $Serie['AggregatedValues']['DayValues'] *= $MinPerTag; + if ($Serie['AggregatedValues']['WeekValues'] != -1) + $Serie['AggregatedValues']['WeekValues'] *= $MinPerTag; + if ($Serie['AggregatedValues']['MonthValues'] != -1) + $Serie['AggregatedValues']['MonthValues'] *= $MinPerTag; + if ($Serie['AggregatedValues']['YearValues'] != -1) + $Serie['AggregatedValues']['YearValues'] *= $MinPerTag; + if ($Serie['AggregatedValues']['NoLoggedValues'] != -1) + $Serie['AggregatedValues']['NoLoggedValues'] *= $MinPerTag; + + // geänderte Werte wieder zurückschreiben + $series[] = $Serie; + } + // geänderte Werte wieder zurückschreiben + $cfg['series'] = $series; + + // die sind jetzt nicht mehr nötig..... + unset($cfg['AggregatedValues']); + + return $cfg; + } + + + + // ------------------------------------------------------------------------ + // ReadAdditionalConfigData + // zusätzliche Daten für File (hat jetzt aber nichts mit den eigentlichen Highchart Config String zu tun + // IN: $cfg + // OUT: der String welcher dann in das IPS_Template geschrieben wird. + // ------------------------------------------------------------------------ + function ReadAdditionalConfigData($cfg) + { + DebugModuleName($cfg,"ReadAdditionalConfigData"); + + // z.B.: Breite und Höhe für Container + // Breite und Höhe anpassen für HTML Ausgabe + $s['Theme'] = $cfg['HighChart']['Theme']; + if ($cfg['HighChart']['Width'] == 0) + $s['Width'] = "100%"; + else + $s['Width'] = $cfg['HighChart']['Width']. "px"; + + $s['Height'] = $cfg['HighChart']['Height']. "px"; + + return trim(print_r($s, true), "Array\n()") ; + } + +// *************************************************************************************************************************** + + // ------------------------------------------------------------------------ + // GetHighChartsCfgFile + // Falls nicht konfiguriert, wird dies als Default String genommen + // OUT: natürlich den String .... + // ------------------------------------------------------------------------ + function GetHighChartsCfgFile($cfg) + { + DebugModuleName($cfg,"GetHighChartsCfgFile"); + + $cfgArr['chart'] = CreateArrayForChart($cfg); + + if (isset($cfg['colors'])) + $cfgArr['colors'] = $cfg['colors']; + + $cfgArr['credits'] = CreateArrayForCredits($cfg); + + if (isset($cfg['global'])) + $cfgArr['global'] = $cfg['global']; + + if (isset($cfg['labels'])) + $cfgArr['labels'] = $cfg['labels']; + + // $cfg['lang'])) werden seperat behandelt + + if (isset($cfg['legend'])) + $cfgArr['legend'] = $cfg['legend']; + + if (isset($cfg['loading'])) + $cfgArr['loading'] = $cfg['loading']; + + if (isset($cfg['plotOptions'])) + $cfgArr['plotOptions'] = $cfg['plotOptions']; + + $cfgArr['exporting'] = CreateArrayForExporting($cfg); + + if (isset($cfg['symbols'])) + $cfgArr['symbols'] = $cfg['symbols']; + + $cfgArr['title'] = CreateArrayForTitle($cfg); + $cfgArr['subtitle'] = CreateArrayForSubTitle($cfg); + + $cfgArr['tooltip'] = CreateArrayForTooltip($cfg); + + $cfgArr['xAxis'] = CreateArrayForXAxis($cfg); + $cfgArr['yAxis'] = CreateArrayForYAxis($cfg); + + if ($cfg['Ips']['ChartType'] == 'Highstock') + { + if (isset($cfg['navigator'])) + $cfgArr['navigator'] = $cfg['navigator']; + if (isset($cfg['rangeSelector'])) + $cfgArr['rangeSelector'] = $cfg['rangeSelector']; + if (isset($cfg['scrollbar'])) + $cfgArr['scrollbar'] = $cfg['scrollbar']; + } + + + if ($cfg['Ips']['Debug']['ShowJSON']) + DebugString(my_json_encode($cfgArr)); + + $cfgArr['series'] = CreateArrayForSeries($cfg) ; + + if ($cfg['Ips']['Debug']['ShowJSON_Data']) + DebugString(my_json_encode($cfgArr)); + + // Array in JSON wandeln + $s = my_json_encode($cfgArr); + + // ersetzten des 'Param'-Parameters (Altlast aus V1.x) + $s = str_replace(",Param@@@:",",",$s); + $s = trim($s, "{"); + $s .= ");"; + + return $s; + } + + // ------------------------------------------------------------------------ + // GetHighChartsLangOptions + // + // IN: $cfg + // OUT: JSON Options String für den Bereich 'lang' + // ------------------------------------------------------------------------ + function GetHighChartsLangOptions($cfg) + { + DebugModuleName($cfg,"GetHighChartsLangOptions"); + + // Default + IfNotIssetSetValue($cfg['lang']['decimalPoint'], ","); + IfNotIssetSetValue($cfg['lang']['thousandsSep'], "."); + + IfNotIssetSetValue($cfg['lang']['months'], ['Januar', 'Februar', 'März', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember']); + IfNotIssetSetValue($cfg['lang']['shortMonths'], ['Jan', 'Feb', 'Mär', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dez']); + IfNotIssetSetValue($cfg['lang']['weekdays'], ['Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag']); + + $s = "lang:" . my_json_encode($cfg['lang']); + + return $s; + } + + + // ------------------------------------------------------------------------ + // CreateArrayForSeries + // + // IN: $cfg + // OUT: der String welcher dann in das IPS_Template geschrieben wird. + // ------------------------------------------------------------------------ + function CreateArrayForSeries($cfg) + { + DebugModuleName($cfg,"CreateArrayForSeries"); + + // Daten für einzelne Serien erzeugen + $dataArr = array(); + foreach ($cfg['series'] as $Serie) + { + if ($Serie['Ips']['Type'] == 'pie') + { + $Serie['data'] = CreateDataArrayForPie($cfg, $Serie); + } + else + { + // Daten wurden von extern übergeben + if (isset($Serie['data'])) + { + if (is_array($Serie['data'])) + $Serie['data'] = CreateDataArrayFromExternalData($Serie['data'], $Serie); + else + $Serie['data'] = $Serie['data']; + + } + // Daten werden aus DB gelesen + else + $Serie['data'] = ReadDataFromDBAndCreateDataArray($cfg, $Serie); + } + + // ... aus Serie umkopieren + $serieArr = $Serie; + + // nicht für JSON benötigte Parameter löschen + unset($serieArr['Param']); + unset($serieArr['AggregatedValues']); + unset($serieArr['Unit']); + unset($serieArr['StartTime']); + unset($serieArr['EndTime']); + unset($serieArr['ReplaceValues']); + unset($serieArr['Ips']); + unset($serieArr['Offset']); + unset($serieArr['AggValue']); + unset($serieArr['AggType']); + unset($serieArr['AggNameFormat']); + unset($serieArr['ScaleFactor']); + unset($serieArr['RoundValue']); + + // ersetzten des 'Param'-Parameters (Altlast aus V1.x) + if (isset($Serie['Param'])) + $serieArr['Param@@@'] = "@" . $Serie['Param'] . "@"; + + $dataArr[] = $serieArr; + } + + return $dataArr; + } + + // ------------------------------------------------------------------------ + // PopulateDate + // + // IN: $dt + // $serie + // OUT: Date-Value für Data-String + // ------------------------------------------------------------------------ + function PopulateDate($dt, $serie) + { + if ($dt < $serie['StartTime']) + $dt = $serie['StartTime'] ; + + // z.B.: Date.UTC(2011,4,27,19,42,19),23.4 + return CreateDateUTC($dt + $serie['Offset']); + } + + // ------------------------------------------------------------------------ + // PopulateValue + // + // IN: $val + // $serie + // OUT: korrigiertes $cfg + // ------------------------------------------------------------------------ + function PopulateValue($val, $serie) + { + // Werte ersetzten (sinnvoll für Boolean, oder Integer - z.B.: Tür/Fenster-Kontakt oder Drehgriffkontakt) + if ($serie['ReplaceValues'] != false) + { + if (isset($serie['ReplaceValues'][$val])) + $val = $serie['ReplaceValues'][$val]; + } + + // Skalieren von Loggingdaten + if (isset($serie['ScaleFactor'])) + $val = $val * $serie['ScaleFactor']; + + // Rounden von Nachkommastellen + if (isset($serie['RoundValue'])) + $val = round($val, $serie['RoundValue']); + + + return $val; + } + + // ------------------------------------------------------------------------ + // CreateDataArrayForPie + // Liest die aktuellen Werte aus den übergebenen Variablen und erzeugt die Daten für das PIE + // IN: $cfg, $Serie + // OUT: der Data String + // ------------------------------------------------------------------------ + function CreateDataArrayForPie($cfg, $serie) + { + DebugModuleName($cfg,"CreateDataArrayForPie"); + + if (isset($serie['Id'])) + { + return ReadPieDataById($cfg, $serie); + } + else if (isset($serie['data'])) + { + $result = array(); + foreach($serie['data'] as $item) + { + if (isset($item['Id'])) + { + $currentValue = ReadCurrentValue($item['Id']); + $item['y'] = PopulateValue($currentValue['Value'], $serie) ; + } + $result[] = $item; + } + return $result; + } + else + { + Die ("Abbruch - Pie-Definition nicht korrekt"); + } + return $Data; + } + + // ------------------------------------------------------------------------ + // ReadPieDataById + // liest die Aggregated-Werte einer einer Vriablen aus und erzeugt das entsprechende Array + // IN: $cfg, $serie + // OUT: Config Array + // ------------------------------------------------------------------------ + function ReadPieDataById($cfg, $serie) + { + $id_AH = $cfg['ArchiveHandlerId']; + + $tempData = @AC_GetAggregatedValues($id_AH, $serie['Id'], $serie['AggType'], $serie['StartTime'], $serie['EndTime'], 0); + $tempData = array_reverse($tempData); + + $result = array(); + foreach ($tempData as $ValueItem) + { + $item['name'] = ReplaceToGermanDate(date($serie['AggNameFormat'], $ValueItem['TimeStamp'])); + $item['y'] = PopulateValue($ValueItem[$serie['AggValue']], $serie); + $result[] = $item; + } + unset ($tempData); + + return $result; + } + + // ------------------------------------------------------------------------ + // CalculateStartAndEndTimeForAggreagtedValues + // Liest den Start- und Endzeitpunkt des angefragten Bereiches + // IN: $Serie, $search : "" für alle Werte, "Hour", "Day", usw + // OUT: Array(StartTime,EndTime) + // ------------------------------------------------------------------------ + function CalculateStartAndEndTimeForAggreagtedValues($Serie, $search ="") + { + $start = -1; $ende = -1; + $trap = false; + $sum = 0; + + if ($search == "") + { + $search =="Values"; + $start = 0; + $trap = true; + } + foreach($Serie['AggregatedValues'] as $key => $value) + { + if (strrpos ($key, "Values") != false) + { + if ($value > 0) + $sum += $value; + + if (strrpos ($key, $search) !== false) + { + $trap = true; + if ($value == -1) + return false; + } + + if (!$trap) + continue; + + if ($value < 0) + continue; + + if ($start == -1) + { + $start = $sum; + continue; + } + + if ($start != -1 && $ende ==-1) + { + $ende = $sum; + break; + } + } + } + + $result = false; + if ($start != -1) + { + $result["EndTime"] = $Serie["EndTime"] - $start; + if ($ende == -1) + $result["StartTime"] = $Serie["StartTime"]; + else + $result["StartTime"] = $Serie["EndTime"] - $ende; + + if ($result["StartTime"] < $Serie["StartTime"]) + $result["StartTime"] = $Serie["StartTime"]; + + if ($result["StartTime"] == $Serie["EndTime"]) + $result = false; + } + + return $result; + } + + // ------------------------------------------------------------------------ + // ReadDataFromDBAndCreateDataArray + // Liest die Series-Daten aus der DB und schreibt sie in den DataString + // IN: $cfg, $Serie + // OUT: der Data String + // ------------------------------------------------------------------------ + function ReadDataFromDBAndCreateDataArray($cfg, $Serie) + { + DebugModuleName($cfg,"ReadDataFromDBAndCreateDataArray"); + + if (!isset($Serie['Id'])) + return ""; + + // errechne die Zeitspanne + if ($Serie['EndTime'] > time()) + $Diff = time() - $Serie['StartTime']; + else + $Diff = $Serie['EndTime'] - $Serie['StartTime']; + + + + $Id_AH = $cfg['ArchiveHandlerId']; + $dataArray = array(); + $VariableId = (int)$Serie['Id']; + $Agg = -1; + $ReadCurrentValue = true; + + // wenn ReplaceValues definiert wurden werden nur geloggte und keine Aggregated Werte gelesen + if ($Serie['ReplaceValues'] != false) + { + if ($Diff > $Serie['AggregatedValues']['NoLoggedValues']) + { + $Serie['StartTime'] = $Serie['EndTime'] - $Serie['AggregatedValues']['NoLoggedValues']; + } + + // Einzelwerte lesen + $dataArray = ReadAndAddToLoggedData($dataArray, $Id_AH, $VariableId, -1 , $Serie["StartTime"], $Serie["EndTime"], "Value", $Serie); + } + else if ($Serie['AggregatedValues']['MixedMode']) // im MixedMode werden anfangs alle Werte, dann die Stunden- und zuletzt Tageswerte ausgelesen + { + // zuerst Einzelwerte + $result = CalculateStartAndEndTimeForAggreagtedValues($Serie, ""); + if ($result != false) + { + if ($Serie['Ips']['IsCounter']) // wenn Zähler dann immer Agg.Values + $dataArray = ReadAndAddToLoggedData($dataArray, $Id_AH, $VariableId, 0, $result["StartTime"], $result["EndTime"], $Serie['AggValue'], $Serie); + else + $dataArray = ReadAndAddToLoggedData($dataArray, $Id_AH, $VariableId, -1 , $result["StartTime"], $result["EndTime"], "Value", $Serie); + } + + // -> Stundenwerte + $result = CalculateStartAndEndTimeForAggreagtedValues($Serie,"Hour"); + if ($result != false) + $dataArray = ReadAndAddToLoggedData($dataArray, $Id_AH, $VariableId, 0, $result["StartTime"], $result["EndTime"], $Serie['AggValue'], $Serie); + + // -> Tageswerte + $result = CalculateStartAndEndTimeForAggreagtedValues($Serie,"Day"); + if ($result != false) + $dataArray = ReadAndAddToLoggedData($dataArray, $Id_AH, $VariableId, 1, $result["StartTime"], $result["EndTime"], $Serie['AggValue'], $Serie); + + // -> Wochenwerten + $result = CalculateStartAndEndTimeForAggreagtedValues($Serie,"Week"); + if ($result != false) + $dataArray = ReadAndAddToLoggedData($dataArray, $Id_AH, $VariableId, 2, $result["StartTime"], $result["EndTime"], $Serie['AggValue'], $Serie); + + // -> Monatswerte + $result = CalculateStartAndEndTimeForAggreagtedValues($Serie,"Month"); + if ($result != false) + $dataArray = ReadAndAddToLoggedData($dataArray, $Id_AH, $VariableId, 3, $result["StartTime"], $result["EndTime"], $Serie['AggValue'], $Serie); + + // -> Jahreswerte + $result = CalculateStartAndEndTimeForAggreagtedValues($Serie,"Year"); + if ($result != false) + $dataArray = ReadAndAddToLoggedData($dataArray, $Id_AH, $VariableId, 4, $result["StartTime"], $result["EndTime"], $Serie['AggValue'], $Serie); + } + else + { + $Agg = -1; // -> AC_GetLoggedValues + + if (isset($Serie['AggType'])) // wenn 'AggType' definiert wurde, wird dies vorrangig bearbeitet + { + $Agg = $Serie['AggType']; + } + elseif ($Serie['AggregatedValues']['YearValues']!= -1 && $Diff > $Serie['AggregatedValues']['YearValues']) + $Agg = 4; // -> AC_GetAggregatedValues [0=Hour, 1=Day, 2=Week, 3=Month, 4=Year] + elseif ($Serie['AggregatedValues']['MonthValues']!= -1 && $Diff > $Serie['AggregatedValues']['MonthValues']) + $Agg = 3; // -> AC_GetAggregatedValues [0=Hour, 1=Day, 2=Week, 3=Month, 4=Year] + elseif ($Serie['AggregatedValues']['WeekValues']!= -1 && $Diff > $Serie['AggregatedValues']['WeekValues']) + $Agg = 2; // -> AC_GetAggregatedValues [0=Hour, 1=Day, 2=Week, 3=Month, 4=Year] + elseif ($Serie['AggregatedValues']['DayValues']!= -1 && $Diff > $Serie['AggregatedValues']['DayValues']) + $Agg = 1; // -> AC_GetAggregatedValues [0=Hour, 1=Day, 2=Week, 3=Month, 4=Year] + else if ($Serie['AggregatedValues']['HourValues']!= -1 && $Diff > $Serie['AggregatedValues']['HourValues']) + $Agg = 0; // -> AC_GetAggregatedValues [0=Hour, 1=Day, 2=Week, 3=Month, 4=Year] + + // es wurde noch nichts definiert und es handelt sich um einen Zähler --> Tageswerte + if ($Agg == -1 && $Serie['Ips']['IsCounter']) + $Agg = 0; + + if ($Agg == -1) + { + // Zeitraum ist zu groß -> nur bis max. Zeitraum einlesen + if ($Diff > $Serie['AggregatedValues']['NoLoggedValues']) + $Serie['StartTime'] = $Serie['EndTime'] - $Serie['AggregatedValues']['NoLoggedValues']; + + // Alle Werte + $dataArray = ReadAndAddToLoggedData($dataArray, $Id_AH, $VariableId, -1 , $Serie["StartTime"], $Serie["EndTime"], "Value", $Serie); + } + else + { + $dataArray = ReadAndAddToLoggedData($dataArray, $Id_AH, $VariableId, $Agg, $Serie["StartTime"], $Serie["EndTime"], $Serie['AggValue'], $Serie); + $ReadCurrentValue = false; + } + } + + // sortieren, so , dass der aktuellste Wert zuletzt kommt + $dataArray = array_reverse($dataArray); + + // aktuellen Wert der Variable noch in Array aufnehmen + if ($ReadCurrentValue + //&& $Serie['EndTime'] >= time() // nicht wenn Endzeitpunkt vor NOW ist + && !$Serie['Ips']['IsCounter']) // nicht bei Zählervariablen + { +// $curValue = ReadCurrentValue($VariableId); + $curValue = ReadLoggedValue($Id_AH, $VariableId, $Serie['EndTime']); + $dataArray[] = CreateDataItem($curValue['TimeStamp'], $curValue['Value'], $Serie); + } + + + return $dataArray ; + } + + // ------------------------------------------------------------------------ + // ReadLoggedValue + // IN: $instanceID, $VariableId, $time + // OUT: Aktueller Wert + // ------------------------------------------------------------------------ + function ReadLoggedValue($instanceID, $variableId, $time) + { + if ($time > time()) $time = time(); + $values = AC_GetLoggedValues($instanceID, $variableId, 0, $time+1, 1); + $currentVal['Value']= $values[0]['Value']; + $currentVal['TimeStamp'] = $time; + + return $currentVal; + } + + // ------------------------------------------------------------------------ + // ReadCurrentValue + // IN: $VariableId + // OUT: Aktueller Wert + // ------------------------------------------------------------------------ + function ReadCurrentValue($variableId) + { + $currentVal['Value']= GetValue($variableId); + $currentVal['TimeStamp'] = time(); + + return $currentVal; + } + + // ------------------------------------------------------------------------ + // ReadAndAddToLoggedData + // IN: siehe Parameter + // OUT: Vervollständigte Logged Data + // ------------------------------------------------------------------------ + function ReadAndAddToLoggedData($loggedData, $id_AH, $variableId, $aggType, $startTime, $endTime, $aggValueName, $serie) + { + $cfg['Ips']['Debug']['Modules'] = true; + + if ($aggType >= 0) + $tempData = @AC_GetAggregatedValues($id_AH, $variableId, $aggType, $startTime, $endTime, 0); + else + //$tempData = @AC_GetLoggedValues($id_AH, $variableId, $startTime, $endTime, 0 ); + $tempData = @AC_GetLoggedValuesCompatibility($id_AH, $variableId, $startTime, $endTime, 0 ); + + foreach ($tempData as $item) + { + $loggedData[] = CreateDataItem($item['TimeStamp'], $item[$aggValueName], $serie); + } + + unset ($tempData); + + return $loggedData; + } + + //Hilfsfunktion, die die Funktionsweise von IP-Symcon 2.x nachbildet + function AC_GetLoggedValuesCompatibility($instanceID, $variableID, $startTime, $endTime, $limit) { + $values = AC_GetLoggedValues($instanceID, $variableID, $startTime, $endTime, $limit ); + if((sizeof($values) == 0) || (end($values)['TimeStamp'] > $startTime)) { + $previousRow = AC_GetLoggedValues($instanceID, $variableID, 0, $startTime - 1, 1 ); + $values = array_merge($values, $previousRow); + } + return $values; + } + + function CreateDataItem($dt, $val, $serie) + { + // Wert anpassen (Round, Scale) + $val = PopulateValue($val, $serie); + + // z.B.: Date.UTC(2011,4,27,19,42,19),23.4 + $dtUTC = PopulateDate($dt, $serie); + + return array("@$dtUTC@", $val); + } + + // ------------------------------------------------------------------------ + // CreateDataArrayFromExternalData + // Umwandeln der externen Daten in ein Daten Array + // IN: $arr = Aus IPS-Datenbank ausgelesenen Daten (LoggedData) + // $Serie = Config Daten der aktuellen Serie + // OUT: Highcharts ConfigString für Series-Data + // ------------------------------------------------------------------------ + function CreateDataArrayFromExternalData($arr, $Serie) + { + $result = array(); + foreach($Serie['data'] as $item) + { + if (is_array($item)) + { + if (isset($item['TimeStamp']) && !isset($item['x'])) + { + $item['x'] = "@" . PopulateDate($item['TimeStamp'], $Serie) . "@"; + unset($item['TimeStamp']); + } + if (isset($item['Value']) && !isset($item['y'])) + { + $item['y'] = $item['Value']; + unset($item['Value']); + } + if (isset($item['y'])) + $item['y'] = PopulateValue($item['y'], $Serie); + + $result[] = $item; + } + else + $result[] = $item; + } + + return $result; + } + + // ------------------------------------------------------------------------ + // CreateTooltipFormatter + // Auslesen von immer wieder benötigten Werten aus der Variable + // IN: $cfg = Alle Config Daten + // OUT: Highcharts ConfigString für Tooltip-Formatter (Interaktive Anzeige des Wertes) + // ------------------------------------------------------------------------ + function CreateTooltipFormatter($cfg) + { + DebugModuleName($cfg,"CreateTooltipFormatter"); + + //ToDo: da sollten wir etwas lesbarer arbeiten + $s = ""; + $offset =""; + + foreach ($cfg['series'] as $Serie ) + { + if ($Serie['Ips']['Type'] == 'pie') + { + if (isset($Serie['data'])) + { + $s .= "["; + foreach($Serie['data'] as $data) + { + $unit = @$Serie['Unit']; + if (isset($data['Unit'])) + $unit = $data['Unit']; + + $s .= "this.y +' " . $unit . "',"; + } + $s = trim($s,","); + $s .= "][this.point.x],"; + } + else + { + $unit = @$Serie['Unit']; + $s .= "[this.y + ' " . $unit . "'],"; + } + $offset .= "0,"; // pies haben nie einen Offset + } + else + { + // hier wird das VariableCustomProfile aus IPS übernommen + if (!isset($Serie['Unit'])) + { + // hole das Variablen Profil + $IPSProfil = @GetIPSVariableProfile($Serie['Id']); + if ($IPSProfil != false) + { + if (array_key_exists("Associations",$IPSProfil) && count($IPSProfil['Associations'])>0) + { + $Arr = array(); + foreach($IPSProfil['Associations'] as $Item) + { + $Arr[$Item['Value']] = $Item['Name']; + } + + if (!is_array($Serie['ReplaceValues'])) // erzeuge Tooltips vollständig aus VariablenProfil + $s .= CreateTooltipSubValues($Arr, array_keys($Arr)); + else // oder nehme ReplaceValues zur Hilfe + $s .= CreateTooltipSubValues($Arr, $Serie['ReplaceValues']); + } + else + { + // Suffix als Einheit übernehmen + $Serie['Unit'] = trim($IPSProfil['Suffix'], " "); + $s .= "[this.y + ' ". $Serie['Unit']."'],"; + } + } + else // falls VariablenId nicht existiert + { + $s .= "[this.y ],"; + } + } + // es wurden Unit und ReplaceValues übergeben + else if (is_array($Serie['Unit']) && is_array($Serie['ReplaceValues'])) + { + $s .= CreateTooltipSubValues($Serie['Unit'],$Serie['ReplaceValues']); + } + else // Einheit aus übergebenem Parmeter Unit + { + $s .= "[this.y + ' ". $Serie['Unit']."'],"; + } + $offset .= $Serie['Offset'] . ","; + } + + } + + $s = trim($s , "," ); + $offset = trim($offset , "," ); + + //*1000 da JS in [ms] angebgeben wird un php in [s] +/* $TooltipString="function() { + var serieIndex = this.series.index; + + if (this.series.type == 'pie') + { + var pointIndex = this.point.x; + var unit = [".$s. "][serieIndex][pointIndex]; + + if (!unit) + unit = [".$s. "][serieIndex][0]; + + return '' + this.point.name +': '+ unit +'
= ' + this.percentage.toFixed(1) + ' %'; + } + else + { + var pointIndex = 0; + var unit = [".$s. "][serieIndex][pointIndex]; + var offset = [".$offset. "][serieIndex] * 1000; + + var offsetInfo =''; + if (offset != 0) + offsetInfo = '
(Achtung Zeitwert hat einen Offset)'; + else + offsetInfo =''; + + return '' + this.series.name + ': '+ unit + '
' + + Highcharts.dateFormat('%A %d.%m.%Y %H:%M', this.x - offset) + + offsetInfo; + + + } + } "; +*/ + $TooltipString="function() { + var serieIndex = this.series.index; + var unit = [".$s. "][serieIndex]; + var offset = [".$offset. "][serieIndex] * 1000; + var offsetInfo =''; + + if (offset != 0) + offsetInfo = '
(Achtung Zeitwert hat einen Offset)'; + else + offsetInfo =''; + + if (this.series.type == 'pie') + { + return '' + this.point.name +': '+ unit +'
= ' + this.percentage.toFixed(1) + ' %'; + } + else + { + return '' + this.series.name + ': '+ unit + '
' + + Highcharts.dateFormat('%A %d.%m.%Y %H:%M', this.x - offset) + + offsetInfo; + } + } "; + + + + return $TooltipString; + } + + // ------------------------------------------------------------------------ + // CreateTooltipSubValues + // Erzeugt den Tooltip für Unter-Elemente + // IN: shownTooltipArr = Array der Werte (Synonyme) welche im Tooltip angezeigt werden sollen + // chartValueArr = Array der Werte welche im Chart eingetragen werden + // OUT: Tooltip String + // ------------------------------------------------------------------------ + function CreateTooltipSubValues($shownTooltipArr, $chartValueArr) + { + $s="{"; + $Count = count($shownTooltipArr); + for ($i = 0; $i < $Count ; $i++) + { + if (isset($chartValueArr[$i]) && isset($shownTooltipArr[$i])) + $s .= $chartValueArr[$i] .": '" . $shownTooltipArr[$i] ."'," ; + } + $s = trim($s, ",") . "}"; + + return $s ."[this.y],"; + } + + // ------------------------------------------------------------------------ + // GetIPSVariableProfile + // Liest das Variablen Profil der übergeben Variable aus + // Versucht zuerst das eigene und wenn nicht verfügbar das Standar Profil auszulesen + // IN: variableId = Id der Variablen + // OUT: Variablen Profil + // ------------------------------------------------------------------------ + function GetIPSVariableProfile($variableId) + { + $var = @IPS_GetVariable($variableId); + if ($var == false) // Variabel existiert nicht + return false; + + $profilName = $var['VariableCustomProfile']; // "Eigenes Profil" + + if ($profilName == false) // "Standard" Profil + $profilName = $var['VariableProfile']; + + if ($profilName != false) + return IPS_GetVariableProfile($profilName); // und jetzt die dazugehörigen Daten laden + else + return false; + } + + + + // ------------------------------------------------------------------------ + // CreateArrayForChart + // + // IN: $cfg + // OUT: Config Array für den Bereich 'chart' + // ------------------------------------------------------------------------ + function CreateArrayForChart($cfg) + { + if (!isset($cfg['chart'])) + $cfg['chart'] = array(); + + //Default + IfNotIssetSetValue($cfg['chart']['renderTo'], "container"); + IfNotIssetSetValue($cfg['chart']['zoomType'], "xy"); + + return $cfg['chart']; + } + + // ------------------------------------------------------------------------ + // CreateArrayForCredits + // + // IN: $cfg + // OUT: Config Array für den Bereich 'credits' + // ------------------------------------------------------------------------ + function CreateArrayForCredits($cfg) + { + if (!isset($cfg['credits'])) + $cfg['credits'] = array(); + + //Default + IfNotIssetSetValue($cfg['credits']['enabled'], false); + + return $cfg['credits']; + } + + // ------------------------------------------------------------------------ + // CreateArrayForTitle + // + // IN: $cfg + // OUT: Config Array für den Bereich 'title' + // ------------------------------------------------------------------------ + function CreateArrayForTitle($cfg) + { + if (!isset($cfg['title'])) + $cfg['title'] = array(); + + return $cfg['title']; + } + + // ------------------------------------------------------------------------ + // CreateArrayForExporting + // + // IN: $cfg + // OUT: Config Array für den Bereich 'exporting' + // ------------------------------------------------------------------------ + function CreateArrayForExporting($cfg) + { + if (!isset($cfg['exporting'])) + $cfg['exporting'] = array(); + + //Default + IfNotIssetSetValue($cfg['exporting']['buttons']['printButton']['enabled'], false); + + return $cfg['exporting']; + } + + // ------------------------------------------------------------------------ + // CreateArrayForTooltip + // + // IN: $cfg + // OUT: Config Array für den Bereich 'tooltip' + // ------------------------------------------------------------------------ + function CreateArrayForTooltip($cfg) + { + if (!isset($cfg['tooltip'])) + $cfg['tooltip'] = array(); + + //Default + // wenn not isset -> autom. erzeugen durch IPS + if (!isset($cfg['tooltip']['formatter'])) + $cfg['tooltip']['formatter'] = "@" . CreateTooltipFormatter($cfg) . "@"; + // wenn "" -> default by highcharts + else if ($cfg['tooltip']['formatter'] == "") + { + // do nothing + } + + return $cfg['tooltip']; + } + + // ------------------------------------------------------------------------ + // CreateArrayForSubTitle + // + // IN: $cfg + // OUT: Config Array für den Bereich subtitle + // ------------------------------------------------------------------------ + function CreateArrayForSubTitle($cfg) + { + if (!isset($cfg['subtitle'])) + $cfg['subtitle'] = array(); + + //Default + IfNotIssetSetValue($cfg['subtitle']['text'], "Zeitraum: %STARTTIME% - %ENDTIME%"); + IfNotIssetSetValue($cfg['subtitle']['Ips']['DateTimeFormat'], "(D) d.m.Y H:i"); + + $s = $cfg['subtitle']['text']; + $s = str_ireplace("%STARTTIME%", date($cfg['subtitle']['Ips']['DateTimeFormat'], $cfg['Ips']['ChartStartTime']), $s); + $s = str_ireplace("%ENDTIME%", date($cfg['subtitle']['Ips']['DateTimeFormat'], $cfg['Ips']['ChartEndTime']), $s); + $cfg['subtitle']['text'] = ReplaceToGermanDate($s); + + unset($cfg['subtitle']['Ips']); + + return $cfg['subtitle']; + } + // ------------------------------------------------------------------------ + // CreateArrayForXAxis + // Erzeugen das ArrX-Achsen Strings für Highchart-Config + // IN: $cfg + // es besteht die Möglichkeit den Achsen String bereits im Highchart Format zu hinterlegen + // oder die folgenden Parameter als Array einzustellen: Name, Min, Max, TickInterval, Opposite, Unit + // OUT: Highcharts String für die Achsen + // ------------------------------------------------------------------------ + function CreateArrayForXAxis($cfg) + { + if (!isset($cfg['xAxis'])) + $cfg['xAxis'] = array(); + + //Default + IfNotIssetSetValue($cfg['xAxis']['type'], "datetime"); + IfNotIssetSetValue($cfg['xAxis']['dateTimeLabelFormats']['second'], "%H:%M:%S"); + IfNotIssetSetValue($cfg['xAxis']['dateTimeLabelFormats']['minute'], "%H:%M"); + IfNotIssetSetValue($cfg['xAxis']['dateTimeLabelFormats']['hour'], "%H:%M"); + IfNotIssetSetValue($cfg['xAxis']['dateTimeLabelFormats']['day'], "%e. %b"); + IfNotIssetSetValue($cfg['xAxis']['dateTimeLabelFormats']['week'], "%e. %b"); + IfNotIssetSetValue($cfg['xAxis']['dateTimeLabelFormats']['month'], "%b %y"); + IfNotIssetSetValue($cfg['xAxis']['dateTimeLabelFormats']['year'], "%Y"); + + IfNotIssetSetValue($cfg['xAxis']['allowDecimals'], false); + + if (isset($cfg['xAxis']['min']) && $cfg['xAxis']['min'] == false) + unset($cfg['xAxis']['min']); + else + IfNotIssetSetValue($cfg['xAxis']['min'], "@" . CreateDateUTC($cfg['Ips']['ChartStartTime']) ."@"); + + if (isset($cfg['xAxis']['max']) && $cfg['xAxis']['max'] == false) + unset($cfg['xAxis']['max']); + else + IfNotIssetSetValue($cfg['xAxis']['max'], "@" . CreateDateUTC($cfg['Ips']['ChartEndTime'])."@"); + + + + return $cfg['xAxis']; + } + + // ------------------------------------------------------------------------ + // CreateArrayForYAxis + // Erzeugen der Y-Achsen Strings für Highchart-Config + // IN: $cfg + // es besteht die Möglichkeit den Achsen String bereits im Highchart Format zu hinterlegen + // oder die folgenden Parameter als Array einzustellen: Name, Min, Max, TickInterval, Opposite, Unit + // OUT: Highcharts String für die Achsen + // ------------------------------------------------------------------------ + function CreateArrayForYAxis($cfg) + { + if (!isset($cfg['yAxis'])) + return null; + + $result = array(); + + foreach ($cfg['yAxis'] as $Axis ) + { + // erst mal alles kopieren + $cfgAxis = $Axis; + + if (!isset($cfgAxis['labels']['formatter']) && isset($Axis['Unit'])) + $cfgAxis['labels']['formatter'] ="@function() { return this.value +' ". $Axis['Unit']."'; }@"; + + $result[] = $cfgAxis; + } + + return $result; + } + + // ------------------------------------------------------------------------ + // CreateDateUTC + // Erzeugen des DateTime Strings für Highchart-Config + // IN: $timeStamp = Zeitstempel + // OUT: Highcharts DateTime-Format als UTC String ... Date.UTC(1970, 9, 27, ) + // Achtung! Javascript Monat beginnt bei 0 = Januar + // ------------------------------------------------------------------------ + function CreateDateUTC($timeStamp) + { + $monthForJS = ((int)date("m", $timeStamp))-1 ; // Monat -1 (PHP->JS) + return "Date.UTC(" . date("Y,", $timeStamp) .$monthForJS. date(",j,H,i,s", $timeStamp) .")"; + } + + // ------------------------------------------------------------------------ + // ReplaceToGermanDate + // Falls nicht konfiguriert, wird dies als Default String genommen + // IN: String mit englischen Wochentagen, bzw. Monaten + // OUT: der String übersetzt ins Deutsche + // ------------------------------------------------------------------------ + function ReplaceToGermanDate($value) + { + $trans = array( + 'Monday' => 'Montag', + 'Tuesday' => 'Dienstag', + 'Wednesday' => 'Mittwoch', + 'Thursday' => 'Donnerstag', + 'Friday' => 'Freitag', + 'Saturday' => 'Samstag', + 'Sunday' => 'Sonntag', + 'Mon' => 'Mo', + 'Tue' => 'Di', + 'Wed' => 'Mi', + 'Thu' => 'Do', + 'Fri' => 'Fr', + 'Sat' => 'Sa', + 'Sun' => 'So', + 'January' => 'Januar', + 'February' => 'Februar', + 'March' => 'März', + 'May' => 'Mai', + 'June' => 'Juni', + 'July' => 'Juli', + 'October' => 'Oktober', + 'December' => 'Dezember', + 'Mar' => 'Mär', + 'May' => 'Mai', + 'Oct' => 'Okt', + 'Dec' => 'Dez', + ); + return strtr($value, $trans); + } + + + // ------------------------------------------------------------------------ + // my_json_encode + // + // IN: PHP-Array + // OUT: JSON String + // ------------------------------------------------------------------------ + function my_json_encode($cfgArr) + { + array_walk_recursive($cfgArr, "CheckArrayItems"); + + $s = json_encode($cfgArr); + + // alle " entfernen + $s = str_replace('"', '',$s); + + // Zeilenumbruch, Tabs, etc entfernen ... bin mir nicht so sicher ob das so gut ist + $s = RemoveUnsupportedStrings($s); + + return $s; + } + + // ------------------------------------------------------------------------ + // CheckArrayItems + // + // IN: Array-Item + // OUT: + // ------------------------------------------------------------------------ + function CheckArrayItems(&$item) + { + if (is_string($item)) + { + if ($item == "@" || $item == "@@" ) + { + $item = "'" . $item . "'"; + } + else if ((substr($item,0,1) == "@" && substr($item,-1) == "@")) + { + $item = trim($item, "@"); + } +/* else if ((substr($item,0,1) == "$" && substr($item,-1) == "$")) + { + + $item = trim($item, "$"); + }*/ + else + { + $item = "'" . trim($item, "'") . "'"; + } + $item = utf8_encode($item); + + } + } + + // ------------------------------------------------------------------------ + // RemoveUnsupportedStrings + // Versuchen Sonderzeichen wie Zeilenumbrüche, Tabs, etc. aus dem übergebenen String zu entfernen + // IN: $str + // OUT: $str + // ------------------------------------------------------------------------ + function RemoveUnsupportedStrings($str) + { + + $str = str_replace("\\t","",$str); + $str = str_replace("\\n","",$str); + $str = str_replace("\\r","",$str); + $str = str_ireplace("\\\u00","\\u00",$str); // da muss man nochmals checken + $str = str_replace("\\\\","",$str); + + return $str; + } + + // ------------------------------------------------------------------------ + // IfNotIssetSetValue + // pfüft ob isset($item), wenn nicht wird $value in &$item geschrieben + // IN: &$item, $value + // OUT: &$item + // ------------------------------------------------------------------------ + function IfNotIssetSetValue(&$item, $value ) + { + if (!isset($item) + || (is_string($item) && $item == "")) // zusätzliche Abfrage in 2.01 + { + $item = $value; + return false; + } + + return true; + } + + // ------------------------------------------------------------------------ + // getmicrotime + // + // IN: + // OUT: + // ------------------------------------------------------------------------ + function getmicrotime($short = false) + { + list($usec,$sec)=explode(" ", microtime()); + + if ($short ) + return (float)$usec + (float)substr($sec,-1); + else + return (float)$usec + (float)$sec; + } + + // ------------------------------------------------------------------------ + // DebugString + // + // IN: + // OUT: + // ------------------------------------------------------------------------ + function DebugString($str) + { + $s = RemoveUnsupportedStrings($str); + echo $s; + } + + // ------------------------------------------------------------------------ + // DebugModuleName + // + // IN: + // OUT: + // ------------------------------------------------------------------------ + function DebugModuleName($cfg, $name) + { + if (isset($cfg['Ips']['Debug']['Modules']) && $cfg['Ips']['Debug']['Modules']) + { + global $_IPS, $version, $versionDate; + + IPS_LogMessage($_IPS['SENDER'] ." - " .getmicrotime(true) , "Highcharts $version ($versionDate) - $name"); + } + } +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/Entertainment/Entertainment.inc.php b/IPSLibrary/app/modules/Entertainment/Entertainment.inc.php index 486174d..650580e 100644 --- a/IPSLibrary/app/modules/Entertainment/Entertainment.inc.php +++ b/IPSLibrary/app/modules/Entertainment/Entertainment.inc.php @@ -18,6 +18,7 @@ */ IPSUtils_Include ("IPSLogger.inc.php", "IPSLibrary::app::core::IPSLogger"); + IPSUtils_Include ('IPSMessageHandler.class.php', 'IPSLibrary::app::core::IPSMessageHandler'); include_once "Entertainment_Constants.inc.php"; IPSUtils_Include ("Entertainment_IDs.inc.php", "IPSLibrary::app::modules::Entertainment"); IPSUtils_Include ("Entertainment_Configuration.inc.php", "IPSLibrary::config::modules::Entertainment"); diff --git a/IPSLibrary/app/modules/Entertainment/Entertainment_Communication.inc.php b/IPSLibrary/app/modules/Entertainment/Entertainment_Communication.inc.php index e0c64a8..79bf579 100644 --- a/IPSLibrary/app/modules/Entertainment/Entertainment_Communication.inc.php +++ b/IPSLibrary/app/modules/Entertainment/Entertainment_Communication.inc.php @@ -20,17 +20,17 @@ function ExtractCommProperties($PropertyData, $CommParams, $ControlData=null) { foreach ($PropertyData as $Idx=>$Property) { $CommParam = $CommParams[$Idx]; - if ($Property==$CommParams[$Idx]) { + if ($Property === $CommParams[$Idx]) { //Ok, Continue - } else if ($Property==c_Template_Value) { + } else if ($Property === c_Template_Value) { $CommProperties[c_Template_Value] = $CommParams[$Idx]; - } else if ($Property==c_Template_Code and + } else if ($Property === c_Template_Code and array_key_exists(c_Property_Codes,$ControlData) and array_key_exists($CommParam, array_flip($ControlData[c_Property_Codes])) ) { $CommProperties[c_Template_Code] = $CommParams[$Idx]; $Codes = array_flip($ControlData[c_Property_Codes]); $CommProperties[c_Template_Value] = $Codes[$CommParams[$Idx]]; - } else if ($Property==c_Template_Code2 and + } else if ($Property === c_Template_Code2 and array_key_exists(c_Property_Codes2,$ControlData) and array_key_exists($CommParam, array_flip($ControlData[c_Property_Codes2])) ) { $CommProperties[c_Template_Code2] = $CommParams[$Idx]; @@ -53,14 +53,14 @@ function get_CommPropertiesSource($CommParams) { foreach ($SourcePropertyData as $DevicePropertyName => $DevicePropertyData) { $CommProperties = ExtractCommProperties($DevicePropertyData, $CommParams); if ($CommProperties !== false) { - $CommProperties[c_Property_Comm] = $DevicePropertyName; + $CommProperties[c_Property_Comm] = $DevicePropertyName; $CommProperties[c_Property_Device] = $SourceConf[$RoomName][$SourceIdx][$SourcePropertyName][c_Property_Device]; $CommProperties[c_Property_Control] = c_Control_Source; $CommProperties[c_Property_Name] = $SourcePropertyName; $CommProperties[c_Property_SourceIdx]= $SourceIdx; $CommProperties[c_Property_Room] = $RoomName; - return $CommProperties; - } + return $CommProperties; + } } } } @@ -94,13 +94,13 @@ function get_CommPropertiesDevice($CommParams) { // --------------------------------------------------------------------------------------------------------------------------- function get_CommProperties($CommParams) { - $CommProperties = get_CommPropertiesDevice($CommParams); - if ($CommProperties !== false) { - return $CommProperties; + $CommProperties = get_CommPropertiesDevice($CommParams); + if ($CommProperties !== false) { + return $CommProperties; } - $CommProperties = get_CommPropertiesSource($CommParams); - if ($CommProperties !== false) { - return $CommProperties; + $CommProperties = get_CommPropertiesSource($CommParams); + if ($CommProperties !== false) { + return $CommProperties; } return false; } @@ -110,139 +110,152 @@ function get_CommProperties($CommParams) { // --------------------------------------------------------------------------------------------------------------------------- function Entertainment_ReceiveData($CommParams, $MessageType=c_MessageType_Action) { if (!Entertainment_Before_ReceiveData($CommParams, $MessageType)) { - return true; + return true; } $CommProperties = get_CommProperties($CommParams); if ($CommProperties !== false) { - $CommType = $CommProperties[c_Property_Comm]; - $DeviceName = $CommProperties[c_Property_Device]; + $CommType = $CommProperties[c_Property_Comm]; + $DeviceName = $CommProperties[c_Property_Device]; IPSLogger_Trc(__File__, 'Received Data "'.implode($CommParams, '.').'" for Device '.$DeviceName); - switch ($CommType) { - case c_Property_CommPower: - case c_Property_CommPower2: - Entertainment_SetDevicePower(get_ControlIdByDeviceName($DeviceName, c_Control_DevicePower), c_Value_Toggle, $MessageType); - break; - case c_Property_CommPowerOn: - case c_Property_CommPowerOn2: - Entertainment_SetDevicePower(get_ControlIdByDeviceName($DeviceName, c_Control_DevicePower), true, $MessageType); - break; - case c_Property_CommPowerOff: - case c_Property_CommPowerOff2: - Entertainment_SetDevicePower(get_ControlIdByDeviceName($DeviceName, c_Control_DevicePower), false, $MessageType); - break; - case c_Property_CommMute: - case c_Property_CommMute2: - Entertainment_SetMuting(get_ControlIdByDeviceName($DeviceName, c_Control_Muting), c_Value_Toggle, $MessageType); - break; - case c_Property_CommMuteOn: - case c_Property_CommMuteOn2: - Entertainment_SetMuting(get_ControlIdByDeviceName($DeviceName, c_Control_Muting), true, $MessageType); - break; - case c_Property_CommMuteOff: - case c_Property_CommMuteOff2: - Entertainment_SetMuting(get_ControlIdByDeviceName($DeviceName, c_Control_Muting), false, $MessageType); - break; - case c_Property_CommVol: - case c_Property_CommVol2: + switch ($CommType) { + case c_Property_CommPower: + case c_Property_CommPower2: + Entertainment_SetDevicePower(get_ControlIdByDeviceName($DeviceName, c_Control_DevicePower), c_Value_Toggle, $MessageType); + break; + case c_Property_CommPowerOn: + case c_Property_CommPowerOn2: + Entertainment_SetDevicePower(get_ControlIdByDeviceName($DeviceName, c_Control_DevicePower), true, $MessageType); + break; + case c_Property_CommPowerOff: + case c_Property_CommPowerOff2: + Entertainment_SetDevicePower(get_ControlIdByDeviceName($DeviceName, c_Control_DevicePower), false, $MessageType); + break; + case c_Property_CommMute: + case c_Property_CommMute2: + Entertainment_SetMuting(get_ControlIdByDeviceName($DeviceName, c_Control_Muting), c_Value_Toggle, $MessageType); + break; + case c_Property_CommMuteOn: + case c_Property_CommMuteOn2: + Entertainment_SetMuting(get_ControlIdByDeviceName($DeviceName, c_Control_Muting), true, $MessageType); + break; + case c_Property_CommMuteOff: + case c_Property_CommMuteOff2: + Entertainment_SetMuting(get_ControlIdByDeviceName($DeviceName, c_Control_Muting), false, $MessageType); + break; + case c_Property_CommVol: + case c_Property_CommVol2: Entertainment_SetVolume(get_ControlIdByDeviceName($DeviceName, c_Control_Volume), (int)$CommProperties[c_Template_Value], $MessageType); - break; - case c_Property_CommBal: - case c_Property_CommBal2: + break; + case c_Property_CommVolPlus: + Entertainment_SetVolumeDiff(get_ControlIdByDeviceName($DeviceName, c_Control_Volume), + 5, $MessageType); + break; + case c_Property_CommVolMinus: + Entertainment_SetVolumeDiff(get_ControlIdByDeviceName($DeviceName, c_Control_Volume), + -5, $MessageType); + break; + case c_Property_CommBal: + case c_Property_CommBal2: Entertainment_SetBalance(get_ControlIdByDeviceName($DeviceName, c_Control_Balance), (int)$CommProperties[c_Template_Value], $MessageType); - break; - case c_Property_CommTre: - case c_Property_CommTre2: + break; + case c_Property_CommTre: + case c_Property_CommTre2: Entertainment_SetTreble(get_ControlIdByDeviceName($DeviceName, c_Control_Treble), (int)$CommProperties[c_Template_Value], $MessageType); - break; - case c_Property_CommMid: - case c_Property_CommMid2: + break; + case c_Property_CommMid: + case c_Property_CommMid2: Entertainment_SetMiddle(get_ControlIdByDeviceName($DeviceName, c_Control_Middle), (int)$CommProperties[c_Template_Value], $MessageType); - break; - case c_Property_CommBas: - case c_Property_CommBas2: + break; + case c_Property_CommBas: + case c_Property_CommBas2: Entertainment_SetBass(get_ControlIdByDeviceName($DeviceName, c_Control_Bass), (int)$CommProperties[c_Template_Value], $MessageType); - break; - case c_Property_CommMode: - case c_Property_CommMode2: - Entertainment_SetMode(get_ControlIdByDeviceName($DeviceName, c_Control_Mode), + break; + case c_Property_CommMode: + case c_Property_CommMode2: + Entertainment_SetMode(get_ControlIdByDeviceName($DeviceName, c_Control_Mode), $CommProperties[c_Template_Value], $MessageType); - break; - case c_Property_CommRemSrc: - $ControlId = get_ControlIdByDeviceName($DeviceName, c_Control_RemoteSourceType); - $Value = $CommProperties[c_Template_Value]; - Entertainment_SetRemoteControlType($ControlId, + break; + case c_Property_CommRemSrc: + $ControlId = get_ControlIdByDeviceName($DeviceName, c_Control_RemoteSourceType); + $Value = $CommProperties[c_Template_Value]; + Entertainment_SetRemoteControlType($ControlId, $Value, c_Control_RemoteSource); - break; - case c_Property_CommRemVol: - Entertainment_SetRemoteControlType(get_ControlIdByDeviceName($DeviceName, c_Control_RemoteVolumeType), + break; + case c_Property_CommRemVol: + Entertainment_SetRemoteControlType(get_ControlIdByDeviceName($DeviceName, c_Control_RemoteVolumeType), $CommProperties[c_Template_Value], c_Control_RemoteVolume); - break; - case c_Property_CommSrc: - case c_Property_CommSrc2: - $SourceIdx = $CommProperties[c_Property_SourceIdx]; - $RoomName = $CommProperties[c_Property_Room]; - IPSLogger_Inf(__file__, "Switch Source for $RoomName to $SourceIdx"); - Entertainment_SetSource(get_ControlIdByRoomId(get_RoomId($RoomName), c_Control_Source), $SourceIdx, $MessageType); - break; - case c_Property_CommPrg: - case c_Property_CommPrg2: - Entertainment_SetProgram(get_ControlIdByDeviceName($DeviceName, c_Control_Program), + break; + case c_Property_CommSrc: + case c_Property_CommSrc2: + $SourceIdx = $CommProperties[c_Property_SourceIdx]; + $RoomName = $CommProperties[c_Property_Room]; + IPSLogger_Inf(__file__, "Switch Source for $RoomName to $SourceIdx"); + Entertainment_SetSource(get_ControlIdByRoomId(get_RoomId($RoomName), c_Control_Source), $SourceIdx, $MessageType); + break; + case c_Property_CommSrcNext: + $RoomName = $CommProperties[c_Property_Room]; + IPSLogger_Inf(__file__, "Switch Next Source for $RoomName"); + Entertainment_SetSourceNext(get_ControlIdByRoomId(get_RoomId($RoomName), c_Control_Source), $MessageType); + break; + case c_Property_CommPrg: + case c_Property_CommPrg2: + Entertainment_SetProgram(get_ControlIdByDeviceName($DeviceName, c_Control_Program), $CommProperties[c_Template_Value], $MessageType); - break; - case c_Property_CommPrgPrev: - case c_Property_CommPrgPrev2: - Entertainment_SetProgramPrev(get_ControlIdByDeviceName($DeviceName, c_Control_Program), $MessageType); - break; - case c_Property_CommPrgNext: - case c_Property_CommPrgNext2: - Entertainment_SetProgramNext(get_ControlIdByDeviceName($DeviceName, c_Control_Program), $MessageType); - break; - default: + break; + case c_Property_CommPrgPrev: + case c_Property_CommPrgPrev2: + Entertainment_SetProgramPrev(get_ControlIdByDeviceName($DeviceName, c_Control_Program), $MessageType); + break; + case c_Property_CommPrgNext: + case c_Property_CommPrgNext2: + Entertainment_SetProgramNext(get_ControlIdByDeviceName($DeviceName, c_Control_Program), $MessageType); + break; + default: IPSLogger_Err(__File__, 'Found unknown CommunicationType "'.$CommType.'"'); - } - Entertainment_After_ReceiveData($CommParams, $MessageType); + } + Entertainment_After_ReceiveData($CommParams, $MessageType); return true; } - Entertainment_After_ReceiveData($CommParams, $MessageType); + Entertainment_After_ReceiveData($CommParams, $MessageType); return false; } // --------------------------------------------------------------------------------------------------------------------------- function Entertainment_SendData($DeviceName, $ControlType, $CommParams, $CommType) { - $CommConfig = get_CommunicationConfiguration(); - $CommInterface = $CommParams[0]; + $CommConfig = get_CommunicationConfiguration(); + $CommInterface = $CommParams[0]; $FunctionName = $CommConfig[$CommInterface][c_Property_FunctionSnd]; $FunctionScript = $CommConfig[$CommInterface][c_Property_ScriptSnd]; $FunctionParameters = array(); - foreach ($CommParams as $CommIdx=>$CommParam) { - if ($CommParam==c_Template_Value) { + foreach ($CommParams as $CommIdx => $CommParam) { + if ($CommParam === c_Template_Value) { $FunctionParameters[] = GetValue(get_ControlIdByDeviceName($DeviceName, $ControlType)); - } else if ($CommParam==c_Template_Code) { + } else if ($CommParam === c_Template_Code) { $DeviceConfig = get_DeviceConfiguration(); $Value = GetValue(get_ControlIdByDeviceName($DeviceName, $ControlType)); $FunctionParameters[] = $DeviceConfig[$DeviceName][$ControlType][c_Property_Codes][$Value]; } else { - $FunctionParameters[] = $CommParam; + $FunctionParameters[] = $CommParam; } } if (!Entertainment_Before_SendData($FunctionParameters)) { - return; + return; } - IPSLogger_Trc(__file__, 'SendData '.$CommInterface.'.'.$FunctionName.'('.implode(',',$FunctionParameters).')'); + IPSLogger_Trc(__file__, 'SendData '.$CommInterface.'.'.$FunctionName.'('.print_r($FunctionParameters, true).')'); try { include_once $FunctionScript; - $Function = new ReflectionFunction($FunctionName); + $Function = new ReflectionFunction($FunctionName); $Function->invoke($FunctionParameters); } catch (Exception $e) { - IPSLogger_Err(__file__, 'Error Executing Function '.$FunctionName.':'.$e->getMessage()); + IPSLogger_Err(__file__, 'Error Executing Function '.$FunctionName.':'.$e->getMessage()); } Entertainment_After_SendData($FunctionParameters); } @@ -268,13 +281,22 @@ function Entertainment_SendDataBySourceIdx($RoomId, $SourceIdx, $MessageType) { return; } $RoomName = IPS_GetName($RoomId); - $DeviceTypes = get_SourceDeviceTypes($RoomId, $SourceIdx); - $SourceConf = get_SourceConfiguration(); - foreach ($DeviceTypes as $DeviceType=>$DeviceName) { - $SourceData = $SourceConf[$RoomName][$SourceIdx][$DeviceType]; - if (array_key_exists(c_Property_CommSrc, $SourceData)) { - Entertainment_SendData($DeviceName, c_Control_Source, $SourceData[c_Property_CommSrc], c_Property_CommSrc); - } + $DeviceTypes = get_SourceDeviceTypes($RoomId, $SourceIdx); + $SourceConf = get_SourceConfiguration(); + foreach ($DeviceTypes as $DeviceType=>$DeviceName) { + $SourcesData = $SourceConf[$RoomName][$SourceIdx][$DeviceType]; + + // wrap older/non array configuration in an array for downward compatibility + if(isset($SourcesData[c_Property_Device])) { + $SourcesData = array($SourcesData); + } + + foreach($SourcesData as $SourceData) { + $DeviceName = $SourceData[c_Property_Device]; + if (array_key_exists(c_Property_CommSrc, $SourceData)) { + Entertainment_SendData($DeviceName, c_Control_Source, $SourceData[c_Property_CommSrc], c_Property_CommSrc); + } + } } } diff --git a/IPSLibrary/app/modules/Entertainment/Entertainment_Constants.inc.php b/IPSLibrary/app/modules/Entertainment/Entertainment_Constants.inc.php index b4adc38..77439c6 100644 --- a/IPSLibrary/app/modules/Entertainment/Entertainment_Constants.inc.php +++ b/IPSLibrary/app/modules/Entertainment/Entertainment_Constants.inc.php @@ -13,17 +13,17 @@ // Control Definition define ("c_Control_RoomPower", "RoomPower"); - define ("c_Control_DevicePower", "DevicePower"); + define ("c_Control_DevicePower", "DevicePower"); define ("c_Control_Muting", "Muting"); define ("c_Control_Source", "Source"); define ("c_Control_Volume", "Volume"); - define ("c_Control_Balance", "Balance"); + define ("c_Control_Balance", "Balance"); define ("c_Control_Treble", "Treble"); define ("c_Control_Middle", "Middle"); - define ("c_Control_Bass", "Bass"); - define ("c_Control_Program", "Program"); - define ("c_Control_Mode", "Mode"); - define ("c_Control_Group", "Group"); + define ("c_Control_Bass", "Bass"); + define ("c_Control_Program", "Program"); + define ("c_Control_Mode", "Mode"); + define ("c_Control_Group", "Group"); define ("c_Control_RemoteVolume", "RemoteVolume"); define ("c_Control_RemoteVolumeType", "RemoteVolumeType"); define ("c_Control_iRemoteVolume", "iRemoteVolume"); @@ -32,20 +32,20 @@ define ("c_Control_iRemoteSource", "iRemoteSource"); // Device Properties - define ("c_Property_Name", "Name"); + define ("c_Property_Name", "Name"); define ("c_Property_Group", "Group"); - define ("c_Property_Icon", "Icon"); + define ("c_Property_Icon", "Icon"); define ("c_Property_Names", "Names"); define ("c_Property_Codes", "Codes"); define ("c_Property_Codes2", "Codes2"); define ("c_Property_MinValue", "MinValue"); define ("c_Property_MaxValue", "MaxValue"); - define ("c_Property_Limit", "Limit"); - define ("c_Property_PowerDelay", "PowerDelay"); - define ("c_Property_Control", "Control"); + define ("c_Property_Limit", "Limit"); + define ("c_Property_PowerDelay", "PowerDelay"); + define ("c_Property_Control", "Control"); define ("c_Property_SourceIdx", "SourceIdx"); define ("c_Property_Device", "Device"); - define ("c_Property_Room", "Room"); + define ("c_Property_Room", "Room"); define ("c_Property_Input", "Input"); define ("c_Property_Output", "Output"); define ("c_Property_Switch", "Switch"); @@ -63,35 +63,38 @@ define ("c_Property_Register", "Register"); define ("c_Property_Variables", "Variables"); define ("c_Property_IPAddress", "IPAddress"); - define ("c_Property_Timeout", "Timeout"); + define ("c_Property_Timeout", "Timeout"); // Communication Properties - define ("c_Property_Comm", "Comm"); - define ("c_Property_CommVol", "CommVol"); + define ("c_Property_Comm", "Comm"); + define ("c_Property_CommVol", "CommVol"); define ("c_Property_CommVol2", "CommVol2"); - define ("c_Property_CommBal", "CommBal"); + define ("c_Property_CommVolPlus", "CommVolPlus"); + define ("c_Property_CommVolMinus", "CommVolMinus"); + define ("c_Property_CommBal", "CommBal"); define ("c_Property_CommBal2", "CommBal2"); - define ("c_Property_CommTre", "CommTre"); + define ("c_Property_CommTre", "CommTre"); define ("c_Property_CommTre2", "CommTre2"); - define ("c_Property_CommMid", "CommMid"); + define ("c_Property_CommMid", "CommMid"); define ("c_Property_CommMid2", "CommMid2"); - define ("c_Property_CommBas", "CommBas"); + define ("c_Property_CommBas", "CommBas"); define ("c_Property_CommBas2", "CommBas2"); - define ("c_Property_CommSrc", "CommSource"); + define ("c_Property_CommSrc", "CommSource"); define ("c_Property_CommSrc2", "CommSource2"); + define ("c_Property_CommSrcNext", "CommSourceNext"); define ("c_Property_CommPower", "CommPower"); - define ("c_Property_CommPower2", "CommPower2"); + define ("c_Property_CommPower2", "CommPower2"); define ("c_Property_CommPowerOn", "CommPowerOn"); define ("c_Property_CommPowerOn2", "CommPowerOn2"); define ("c_Property_CommPowerOff", "CommPowerOff"); define ("c_Property_CommPowerOff2", "CommPowerOff2"); define ("c_Property_CommMute", "CommMute"); define ("c_Property_CommMute2", "CommMute2"); - define ("c_Property_CommMuteOn", "CommMuteOn"); + define ("c_Property_CommMuteOn", "CommMuteOn"); define ("c_Property_CommMuteOn2", "CommMuteOn2"); define ("c_Property_CommMuteOff", "CommMuteOff"); define ("c_Property_CommMuteOff2", "CommMuteOff2"); - define ("c_Property_CommPrg", "CommPrg"); + define ("c_Property_CommPrg", "CommPrg"); define ("c_Property_CommPrg2", "CommPrg2"); define ("c_Property_CommPrgPrev", "CommPrgPrev"); define ("c_Property_CommPrgPrev2", "CommPrgPrev2"); @@ -99,11 +102,11 @@ define ("c_Property_CommPrgNext2", "CommPrgNext2"); define ("c_Property_CommMode", "CommMode"); define ("c_Property_CommMode2", "CommMode2"); - define ("c_Property_CommRemSrc", "CommRemSrc"); - define ("c_Property_CommRemVol", "CommRemVol"); + define ("c_Property_CommRemSrc", "CommRemSrc"); + define ("c_Property_CommRemVol", "CommRemVol"); define ("c_Template_Value", "#Value#"); - define ("c_Template_Code", "#Code#"); + define ("c_Template_Code", "#Code#"); define ("c_Template_Code2", "#Code2#"); define ("c_MessageType_Info", "Info"); diff --git a/IPSLibrary/app/modules/Entertainment/Entertainment_Control.inc.php b/IPSLibrary/app/modules/Entertainment/Entertainment_Control.inc.php index e552b31..9a3ede5 100644 --- a/IPSLibrary/app/modules/Entertainment/Entertainment_Control.inc.php +++ b/IPSLibrary/app/modules/Entertainment/Entertainment_Control.inc.php @@ -165,12 +165,12 @@ function get_ControlType($ControlId) { // --------------------------------------------------------------------------------------------------------------------------- function get_SourceIdxByRoomId($RoomId) { $RoomName = IPS_GetName($RoomId); - $RoomData = get_RoomConfiguration(); + $RoomData = get_RoomConfiguration(); $SourceName = $RoomData[$RoomName][c_Control_Source][c_Property_Name]; - $ChildrenIds = IPS_GetChildrenIDs($RoomId); + $ChildrenIds = IPS_GetChildrenIDs($RoomId); foreach($ChildrenIds as $ChildrenIdx => $ChildrenId) { - if (IPS_GetName($ChildrenId) == $SourceName) { + if (IPS_GetName($ChildrenId) == $SourceName) { return GetValue($ChildrenId); } } @@ -250,8 +250,8 @@ function get_ControlIdByRoomId($RoomId, $ControlType) { // --------------------------------------------------------------------------------------------------------------------------- function get_ActiveRoomIds () { - $RoomIds = IPS_GetChildrenIDs(c_ID_Roomes); - $ActiveRoomIds = array(); + $RoomIds = IPS_GetChildrenIDs(c_ID_Roomes); + $ActiveRoomIds = array(); foreach ($RoomIds as $RoomId) { $PowerId = get_ControlIdByRoomId($RoomId, c_Control_RoomPower); if (GetValue($PowerId)) { @@ -263,8 +263,8 @@ function get_ActiveRoomIds () { // --------------------------------------------------------------------------------------------------------------------------- function get_DeviceNamesByRoomId($RoomId, $SourceIdx=-1, $SourceDeviceTypes=array(c_Property_Input, c_Property_Switch, c_Property_Output)) { - $SourceConf = get_SourceConfiguration(); - if ($SourceIdx==-1) { + $SourceConf = get_SourceConfiguration(); + if ($SourceIdx==-1) { $SourceId = get_ControlIdByRoomId($RoomId, c_Control_Source); $SourceIdx = GetValue($SourceId); } @@ -272,13 +272,32 @@ function get_DeviceNamesByRoomId($RoomId, $SourceIdx=-1, $SourceDeviceTypes=arra $DeviceNames = array(); foreach ($SourceDeviceTypes as $SourceDeviceType) { if (array_key_exists($SourceDeviceType, $SourceConfRoom)) { - $DeviceName = $SourceConfRoom[$SourceDeviceType][c_Property_Device]; - $DeviceNames[$DeviceName] = $DeviceName; + $SourceDevices = $SourceConfRoom[$SourceDeviceType]; + // wrap older/non array configuration in an array for downward compatibility + if(isset($SourceDevices[c_Property_Device])) { + $SourceDevices = array($SourceDevices); + } + + foreach($SourceDevices as $SourceDevice) { + $DeviceName = $SourceDevice[c_Property_Device]; + $DeviceNames[$DeviceName] = $DeviceName; + } } } return $DeviceNames; } - + + // --------------------------------------------------------------------------------------------------------------------------- + function get_SourceDeviceTypeArray($DeviceList) { + $DeviceTypes = array(); + if(isset($DeviceList[c_Property_Device])) { + $DeviceList = array($DeviceList); + } + foreach($DeviceList as $Device) { + array_push($DeviceTypes, $Device[c_Property_Device]); + } + return $DeviceTypes; + } // --------------------------------------------------------------------------------------------------------------------------- function get_SourceDeviceTypes($RoomId, $SourceIdx) { @@ -286,13 +305,13 @@ function get_SourceDeviceTypes($RoomId, $SourceIdx) { $SourceConfRoom = $SourceConf[IPS_GetName($RoomId)][$SourceIdx]; $DeviceTypes = array(); if (array_key_exists(c_Property_Input, $SourceConfRoom)) { - $DeviceTypes[c_Property_Input] = $SourceConfRoom[c_Property_Input][c_Property_Device]; + $DeviceTypes[c_Property_Input] = get_SourceDeviceTypeArray($SourceConfRoom[c_Property_Input]); } if (array_key_exists(c_Property_Switch, $SourceConfRoom)) { - $DeviceTypes[c_Property_Switch] = $SourceConfRoom[c_Property_Switch][c_Property_Device]; + $DeviceTypes[c_Property_Switch] = get_SourceDeviceTypeArray($SourceConfRoom[c_Property_Switch]); } if (array_key_exists(c_Property_Output, $SourceConfRoom)) { - $DeviceTypes[c_Property_Output] = $SourceConfRoom[c_Property_Output][c_Property_Device]; + $DeviceTypes[c_Property_Output] = get_SourceDeviceTypeArray($SourceConfRoom[c_Property_Output]); } return $DeviceTypes; } @@ -325,42 +344,48 @@ function get_RoomId($RoomName) { // Function returns RoomId for Device where Room is active and current Output is equal to specified DeviceName // --------------------------------------------------------------------------------------------------------------------------- function get_RoomIdByOutputDevice($DeviceName) { - $SourceConf = get_SourceConfiguration(); - foreach ($SourceConf as $RoomName=>$RoomSources) { - $RoomId = get_RoomId($RoomName); - $SourceIdx = get_SourceIdxByRoomId($RoomId); - $RoomSource = $RoomSources[$SourceIdx]; + $SourceConf = get_SourceConfiguration(); + foreach ($SourceConf as $RoomName=>$RoomSources) { + $RoomId = get_RoomId($RoomName); + $SourceIdx = get_SourceIdxByRoomId($RoomId); + $RoomSource = $RoomSources[$SourceIdx]; if (array_key_exists(c_Property_Output, $RoomSource)) { - $OutputName= $RoomSource[c_Property_Output][c_Property_Device]; - if ($OutputName==$DeviceName) { - return $RoomId; + $OutputDevices = $RoomSource[c_Property_Output]; + // wrap older/non array configuration in an array for downward compatibility + if(isset($OutputDevices[c_Property_Device])) { + $OutputDevices = array($OutputDevices); + } + + $OutputName = $OutputDevices[0][c_Property_Device]; + if ($OutputName == $DeviceName) { + return $RoomId; } } - } - return false; + } + return false; } // --------------------------------------------------------------------------------------------------------------------------- function get_SourceListByDeviceName($DeviceName) { - $SourceConfig = get_SourceConfiguration(); - $SourceList = array(); - foreach ($SourceConfig as $RoomName=>$RoomSources) { - $RoomId = get_RoomId($RoomName); - $CurrentIdx = get_SourceIdxByRoomId($RoomId); - foreach ($RoomSources as $SourceIdx=>$SourceData) { - $DeviceNames = get_DeviceNamesByRoomId($RoomId, $SourceIdx, array(c_Property_Output)); + $SourceConfig = get_SourceConfiguration(); + $SourceList = array(); + foreach ($SourceConfig as $RoomName=>$RoomSources) { + $RoomId = get_RoomId($RoomName); + $CurrentIdx = get_SourceIdxByRoomId($RoomId); + foreach ($RoomSources as $SourceIdx=>$SourceData) { + $DeviceNames = get_DeviceNamesByRoomId($RoomId, $SourceIdx, array(c_Property_Output)); if (in_array($DeviceName, $DeviceNames)) { - if (!array_key_exists($RoomId, $SourceList)) { - $SourceList[$RoomId] = $SourceIdx; - } + if (!array_key_exists($RoomId, $SourceList)) { + $SourceList[$RoomId] = $SourceIdx; + } if ($CurrentIdx==$SourceIdx) { - $SourceList[$RoomId] = $SourceIdx; - break; + $SourceList[$RoomId] = $SourceIdx; + break; } } - } - } - return $SourceList; + } + } + return $SourceList; } /** @}*/ diff --git a/IPSLibrary/app/modules/Entertainment/Entertainment_Device.inc.php b/IPSLibrary/app/modules/Entertainment/Entertainment_Device.inc.php index f619bc5..18ddec0 100644 --- a/IPSLibrary/app/modules/Entertainment/Entertainment_Device.inc.php +++ b/IPSLibrary/app/modules/Entertainment/Entertainment_Device.inc.php @@ -17,6 +17,9 @@ function get_MaxValueByControlId($ControlId) { $ProfileName = $VariableObject['VariableCustomProfile']; $ProfileObject = IPS_GetVariableProfile($ProfileName); $MaxValue = Count($ProfileObject['Associations']); + if ($MaxValue==0) { + $MaxValue = $ProfileObject['MaxValue']; + } return $MaxValue; } @@ -72,6 +75,20 @@ function Entertainment_SetMode($Id, $Value, $MessageType=c_MessageType_Action) { } } + // --------------------------------------------------------------------------------------------------------------------------- + function Entertainment_SetVolumeDiff($Id, $Diff, $MessageType=c_MessageType_Action) { + $MaxValue = get_MaxValueByControlId($Id); + IPSLogger_Inf(__file__, 'Max='.$MaxValue); + $Value = GetValue($Id) + $Diff; + if ($Value > $MaxValue) { + $Value = $MaxValue; + } + if ($Value < 0) { + $Value = 0; + } + Entertainment_SetVolume($Id, $Value, $MessageType); + } + // --------------------------------------------------------------------------------------------------------------------------- function Entertainment_SetVolume($Id, $Value, $MessageType=c_MessageType_Action) { $DeviceName = IPS_GetName(IPS_GetParent($Id)); diff --git a/IPSLibrary/app/modules/Entertainment/Entertainment_Interface.ips.php b/IPSLibrary/app/modules/Entertainment/Entertainment_Interface.ips.php index e52dbbe..611be55 100644 --- a/IPSLibrary/app/modules/Entertainment/Entertainment_Interface.ips.php +++ b/IPSLibrary/app/modules/Entertainment/Entertainment_Interface.ips.php @@ -22,20 +22,20 @@ // --------------------------------------------------------------------------------------------------------------------------- // WebFront // --------------------------------------------------------------------------------------------------------------------------- - if ($IPS_SENDER == "WebFront") { - $ControlType = get_ControlType($IPS_VARIABLE); + if ($_IPS['SENDER'] == "WebFront") { + $ControlType = get_ControlType($_IPS['VARIABLE']); switch ($ControlType) { case c_Control_RoomPower: - Entertainment_SetRoomPower($IPS_VARIABLE, $IPS_VALUE); + Entertainment_SetRoomPower($_IPS['VARIABLE'], $_IPS['VALUE']); break; case c_Control_DevicePower: - Entertainment_SetDevicePower($IPS_VARIABLE, $IPS_VALUE); + Entertainment_SetDevicePower($_IPS['VARIABLE'], $_IPS['VALUE']); break; case c_Control_Source: - Entertainment_SetSource($IPS_VARIABLE, $IPS_VALUE); + Entertainment_SetSource($_IPS['VARIABLE'], $_IPS['VALUE']); break; case c_Control_Group: - Entertainment_SetGroupControlVisibility($IPS_VARIABLE, $IPS_VALUE); + Entertainment_SetGroupControlVisibility($_IPS['VARIABLE'], $_IPS['VALUE']); break; case c_Control_Muting: case c_Control_Volume: @@ -45,10 +45,10 @@ case c_Control_Bass: case c_Control_Mode: case c_Control_Program: - Entertainment_SetControl($IPS_VARIABLE, $IPS_VALUE); + Entertainment_SetControl($_IPS['VARIABLE'], $_IPS['VALUE']); break; default: - IPSLogger_Err(__file__, 'Unknown Control with ID='.$IPS_VARIABLE.' !'); + IPSLogger_Err(__file__, 'Unknown Control with ID='.$_IPS['VARIABLE'].' !'); } } diff --git a/IPSLibrary/app/modules/Entertainment/Entertainment_InterfaceIPSComponentAVControl.inc.php b/IPSLibrary/app/modules/Entertainment/Entertainment_InterfaceIPSComponentAVControl.inc.php index b9413cf..3059baa 100644 --- a/IPSLibrary/app/modules/Entertainment/Entertainment_InterfaceIPSComponentAVControl.inc.php +++ b/IPSLibrary/app/modules/Entertainment/Entertainment_InterfaceIPSComponentAVControl.inc.php @@ -3,7 +3,7 @@ * @ingroup entertainment * @{ * - * @file Entertainment_InterfaceIPSComponent.inc.php + * @file Entertainment_InterfaceIPSComponentAVControl.inc.php * @author Andreas Brauneis * @version * Version 2.50.1, 31.01.2012
@@ -16,18 +16,17 @@ IPSUtils_Include ('IPSComponent.class.php', 'IPSLibrary::app::core::IPSComponent'); - // --------------------------------------------------------------------------------------------------------------------------- - function Entertainment_AutoConfigureMessageHandler() { - } - // --------------------------------------------------------------------------------------------------------------------------- function Entertainment_IPSComponent_ReceiveData($componentParams, $function, $output, $value) { $interfaceList = get_CommunicationConfiguration(); $interface = ''; foreach ($interfaceList as $interfaceName=>$interfaceData) { - if ($interfaceData[c_Property_ComponentParams]==$componentParams) { - $interface = $interfaceName; + if (array_key_exists(c_Property_ComponentParams, $interfaceData)) { + if ($interfaceData[c_Property_ComponentParams]==$componentParams or + $interfaceData[c_Property_ComponentParams]=='IPSComponentAVControl_AudioMax,null') { + $interface = $interfaceName; + } } } Entertainment_ReceiveData(array($interface, $function, $output, $value), c_MessageType_Info); diff --git a/IPSLibrary/app/modules/Entertainment/Entertainment_InterfaceNetPlayerRcv.ips.php b/IPSLibrary/app/modules/Entertainment/Entertainment_InterfaceNetPlayerRcv.ips.php index 0f1b0c1..3fc08c4 100644 --- a/IPSLibrary/app/modules/Entertainment/Entertainment_InterfaceNetPlayerRcv.ips.php +++ b/IPSLibrary/app/modules/Entertainment/Entertainment_InterfaceNetPlayerRcv.ips.php @@ -22,11 +22,11 @@ IPS_SemaphoreEnter('NetPlayer', 1000); - if($IPS_SENDER == "Variable") { - $variableName = IPS_GetName($IPS_VARIABLE); + if($_IPS['SENDER'] == "Variable") { + $variableName = IPS_GetName($_IPS['VARIABLE']); switch ($variableName) { case 'Power': - if ($IPS_VALUE) { + if ($_IPS['VALUE']) { Entertainment_ReceiveData(array(c_Comm_NetPlayer, 'netplayer', 'poweron'), c_MessageType_Info); } else { Entertainment_ReceiveData(array(c_Comm_NetPlayer, 'netplayer', 'poweroff'), c_MessageType_Info); @@ -45,8 +45,8 @@ //Entertainment_RefreshRemoteControlByDeviceName(c_Device_NetPlayer, c_Control_iRemoteSource); break; case 'ControlType': - //IPSLogger_Com(__file__, "Receive RemoteControlType $IPS_VALUE for NetPlayer"); - //Entertainment_ReceiveData(array(c_Comm_NetPlayer, 'netplayertype', (string)$IPS_VALUE), c_MessageType_Info); + //IPSLogger_Com(__file__, "Receive RemoteControlType $_IPS['VALUE'] for NetPlayer"); + //Entertainment_ReceiveData(array(c_Comm_NetPlayer, 'netplayertype', (string)$_IPS['VALUE']), c_MessageType_Info); break; default: IPSLogger_Err(__file__, "Unknown Variable $variableName"); diff --git a/IPSLibrary/app/modules/Entertainment/Entertainment_InterfaceOnkyoRcv.ips.php b/IPSLibrary/app/modules/Entertainment/Entertainment_InterfaceOnkyoRcv.ips.php index f0ca527..bdc9f02 100644 --- a/IPSLibrary/app/modules/Entertainment/Entertainment_InterfaceOnkyoRcv.ips.php +++ b/IPSLibrary/app/modules/Entertainment/Entertainment_InterfaceOnkyoRcv.ips.php @@ -15,8 +15,8 @@ include_once "Entertainment.inc.php"; - if($IPS_SENDER == "RegisterVariable") { - Onkyo_ReceiveData_Register($IPS_INSTANCE, $IPS_VALUE); + if($_IPS['SENDER'] == "RegisterVariable") { + Onkyo_ReceiveData_Register($_IPS['INSTANCE'], $_IPS['VALUE']); } diff --git a/IPSLibrary/app/modules/Entertainment/Entertainment_Power.inc.php b/IPSLibrary/app/modules/Entertainment/Entertainment_Power.inc.php index b22991e..a83e2eb 100644 --- a/IPSLibrary/app/modules/Entertainment/Entertainment_Power.inc.php +++ b/IPSLibrary/app/modules/Entertainment/Entertainment_Power.inc.php @@ -39,8 +39,8 @@ function Entertainment_PowerOffUnusedDevices() { // --------------------------------------------------------------------------------------------------------------------------- function Entertainment_SetDevicePower($PowerId, $Value, $MessageType=c_MessageType_Action) { - $DeviceName = IPS_GetName(IPS_GetParent($PowerId)); - Entertainment_SetDevicePowerByDeviceName($DeviceName, $Value, $MessageType); + $DeviceName = IPS_GetName(IPS_GetParent($PowerId)); + Entertainment_SetDevicePowerByDeviceName($DeviceName, $Value, $MessageType); } // --------------------------------------------------------------------------------------------------------------------------- @@ -48,10 +48,10 @@ function Entertainment_SetDevicePowerByDeviceName($DeviceName, $Value, $MessageT IPSLogger_Trc(__file__, 'Handle Device Power for "'.$DeviceName.'" '.bool2OnOff($Value)); $PowerId = get_ControlIdByDeviceName($DeviceName, c_Control_DevicePower, false); if ($PowerId!==false) { - if (!is_bool($Value)) { /*Toggle Power Value*/ - $Value = !GetValue($PowerId); + if (!is_bool($Value)) { /*Toggle Power Value*/ + $Value = !GetValue($PowerId); IPSLogger_Dbg(__file__, "Toogle Device Power for '$DeviceName' to ".bool2OnOff($Value)); - } + } if (GetValue($PowerId) <> $Value) { IPSLogger_Inf(__file__, 'Set Device Power for "'.$DeviceName.'" '.bool2OnOff($Value)); if ($Value) { @@ -64,7 +64,7 @@ function Entertainment_SetDevicePowerByDeviceName($DeviceName, $Value, $MessageT SetValue($PowerId, $Value); Entertainment_Connect($DeviceName, $Value, true); Entertainment_SetDeviceControlByDeviceName($DeviceName, c_Control_Muting, false); - Entertainment_SetRoomPowerByDeviceName($DeviceName, $Value); + Entertainment_SetRoomPowerByDeviceName($DeviceName, $Value); } } } @@ -74,8 +74,26 @@ function Entertainment_SetDevicePowerByRoomId($RoomId, $Value=true) { if ($Value) { $RoomName = IPS_GetName($RoomId); $DeviceNames = get_DeviceNamesByRoomId($RoomId); + $DeviceData = get_DeviceConfiguration(); + $first = true; foreach ($DeviceNames as $DeviceName) { - Entertainment_SetDevicePowerByDeviceName($DeviceName, true); + if(isset($DeviceData[$DeviceName][c_Control_DevicePower])) { + $devicePower = $DeviceData[$DeviceName][c_Control_DevicePower]; + if(isset($devicePower[c_Property_PowerDelay])) { + $delaySeconds = $devicePower[c_Property_PowerDelay]; + if(!is_numeric($delaySeconds) || $delaySeconds < 0 || $delaySeconds > 5000) { + IPSLogger_Wrn(__file__, "'c_Property_PowerDelay' for control 'c_Control_DevicePower' for device $DeviceName is not a number ($delaySeconds). Please use a value between 0 and 5000. Using default: 1000 (= 1 second)"); + $delaySeconds = 1000; + } + // no delay for first device + if($first) { + $first = false; + } else { + usleep($delaySeconds * 1000); + } + } + } + Entertainment_SetDevicePowerByDeviceName($DeviceName, true); } } else { Entertainment_PowerOffUnusedDevices(); diff --git a/IPSLibrary/app/modules/Entertainment/Entertainment_Room.inc.php b/IPSLibrary/app/modules/Entertainment/Entertainment_Room.inc.php index 8593d20..899b842 100644 --- a/IPSLibrary/app/modules/Entertainment/Entertainment_Room.inc.php +++ b/IPSLibrary/app/modules/Entertainment/Entertainment_Room.inc.php @@ -38,15 +38,16 @@ function Entertainment_SetRoomVisible($PowerId, $Value) { // --------------------------------------------------------------------------------------------------------------------------- function Entertainment_SetRoomPower($PowerId, $Value, $PowerOnDevices=true) { - if (GetValue($PowerId) <> $Value) { - IPSLogger_Inf(__file__, 'Set Power for Room "'.IPS_GetName(IPS_GetParent($PowerId)).'" '.bool2OnOff($Value)); + if (GetValue($PowerId) <> $Value) { + IPSLogger_Inf(__file__, 'Set Power for Room "'.IPS_GetName(IPS_GetParent($PowerId)).'" '.bool2OnOff($Value)); SetValue($PowerId, $Value); - Entertainment_SetRoomVisible($PowerId, $Value); + IPSMessageHandler_HandleLibraryEvent($PowerId, $Value, 'Entertainment', 'Power'); + Entertainment_SetRoomVisible($PowerId, $Value); if ($PowerOnDevices) { - Entertainment_SetDevicePowerByRoomId(IPS_GetParent($PowerId), $Value); + Entertainment_SetDevicePowerByRoomId(IPS_GetParent($PowerId), $Value); } - Entertainment_SyncRoomControls(IPS_GetParent($PowerId)); - } + Entertainment_SyncRoomControls(IPS_GetParent($PowerId)); + } } // --------------------------------------------------------------------------------------------------------------------------- @@ -80,12 +81,12 @@ function Entertainment_PowerOffUnusedRoomes() { // --------------------------------------------------------------------------------------------------------------------------- function Entertainment_SetRoomPowerByDeviceName($DeviceName, $Value) { if ($Value) { - $SourceList = get_SourceListByDeviceName($DeviceName, $Value); + $SourceList = get_SourceListByDeviceName($DeviceName); if (count($SourceList)==1) { $RoomKeys = array_keys($SourceList); $RoomId = $RoomKeys[0]; - $SourceIdx = $SourceList[$RoomId]; if (!IsRoomPoweredOn($RoomId)) { + $SourceIdx = $SourceList[$RoomId]; Entertainment_SetRoomPowerByRoomId($RoomId, true, false); Entertainment_SetSourceByRoomId($RoomId, $SourceIdx); } diff --git a/IPSLibrary/app/modules/Entertainment/Entertainment_Source.inc.php b/IPSLibrary/app/modules/Entertainment/Entertainment_Source.inc.php index 02abe31..9dc866c 100644 --- a/IPSLibrary/app/modules/Entertainment/Entertainment_Source.inc.php +++ b/IPSLibrary/app/modules/Entertainment/Entertainment_Source.inc.php @@ -15,33 +15,32 @@ // Show/Hide Group // --------------------------------------------------------------------------------------------------------------------------- function Entertainment_SetGroupControlVisibility($GroupSwitchId, $Value) { - $RoomConfig = get_RoomConfiguration(); - $RoomName = IPS_GetName(IPS_GetParent($GroupSwitchId)); - $ControlName = IPS_GetName($GroupSwitchId); - $WFRoomName = $RoomConfig[$RoomName][c_Property_Name]; - $WFRoomId = IPS_GetCategoryIDByName($WFRoomName, c_ID_WebFrontRoomes); - $WFGroupId = IPS_GetInstanceIDByName($ControlName, $WFRoomId); + $RoomConfig = get_RoomConfiguration(); + $RoomName = IPS_GetName(IPS_GetParent($GroupSwitchId)); + $ControlName = IPS_GetName($GroupSwitchId); + $WFRoomName = $RoomConfig[$RoomName][c_Property_Name]; + $WFRoomId = IPS_GetCategoryIDByName($WFRoomName, c_ID_WebFrontRoomes); + $WFGroupId = IPS_GetInstanceIDByName($ControlName, $WFRoomId); IPS_SetHidden($WFGroupId, !$Value); - SetValue($GroupSwitchId, $Value); + SetValue($GroupSwitchId, $Value); } - // --------------------------------------------------------------------------------------------------------------------------- function Entertainment_SetRoomControlVisibility($RoomControlId, $Value) { - $RoomName = IPS_GetName(IPS_GetParent($RoomControlId)); - $RoomConfig = get_RoomConfiguration(); - $ControlName = IPS_GetName($RoomControlId); - $WFRoomName = $RoomConfig[$RoomName][c_Property_Name]; - if ($WFRoomName=="") return; - $WFRoomId = IPS_GetCategoryIDByName($WFRoomName, c_ID_WebFrontRoomes); + $RoomName = IPS_GetName(IPS_GetParent($RoomControlId)); + $RoomConfig = get_RoomConfiguration(); + $ControlName = IPS_GetName($RoomControlId); + $WFRoomName = $RoomConfig[$RoomName][c_Property_Name]; + if ($WFRoomName=="") return; + $WFRoomId = IPS_GetCategoryIDByName($WFRoomName, c_ID_WebFrontRoomes); - $WFControlId = false; + $WFControlId = false; $ChildrenIds = IPS_GetChildrenIDs($WFRoomId); foreach($ChildrenIds as $ChildrenIdx => $ChildrenId) { - if (IPS_LinkExists($ChildrenId)) { - if (IPS_GetName($ChildrenId)==$ControlName) { - $WFControlId = $ChildrenId; - } + if (IPS_LinkExists($ChildrenId)) { + if (IPS_GetName($ChildrenId)==$ControlName) { + $WFControlId = $ChildrenId; + } } else { $WFControlId = @IPS_GetLinkIDByName($ControlName, $WFRoomId); } @@ -53,7 +52,6 @@ function Entertainment_SetRoomControlVisibility($RoomControlId, $Value) { IPS_SetHidden($WFControlId, !$Value); } } - } @@ -69,9 +67,9 @@ function Entertainment_SyncAllRoomControls() { function Entertainment_SyncRoomControls($RoomId) { $RoomName = IPS_GetName($RoomId); $RoomPower = GetValue(get_ControlIdByRoomId($RoomId, c_Control_RoomPower)); - $RoomConfig = get_RoomConfiguration(); - $ControlTypes = $RoomConfig[$RoomName]; - foreach ($ControlTypes as $ControlType=>$ControlData) { + $RoomConfig = get_RoomConfiguration(); + $ControlTypes = $RoomConfig[$RoomName]; + foreach ($ControlTypes as $ControlType=>$ControlData) { if ($ControlType==c_Control_Muting or $ControlType==c_Control_Volume or $ControlType==c_Control_Balance or @@ -79,13 +77,13 @@ function Entertainment_SyncRoomControls($RoomId) { $ControlType==c_Control_Middle or $ControlType==c_Control_Bass or $ControlType==c_Control_Program or - $ControlType==c_Control_RemoteVolume or - $ControlType==c_Control_iRemoteVolume or - $ControlType==c_Control_RemoteSource or - $ControlType==c_Control_iRemoteSource or - $ControlType==c_Control_Mode) { - $RoomControlId = get_ControlIdByRoomId($RoomId, $ControlType); - $DeviceControlId = get_DeviceControlIdByRoomControlId($RoomControlId); + $ControlType==c_Control_RemoteVolume or + $ControlType==c_Control_iRemoteVolume or + $ControlType==c_Control_RemoteSource or + $ControlType==c_Control_iRemoteSource or + $ControlType==c_Control_Mode) { + $RoomControlId = get_ControlIdByRoomId($RoomId, $ControlType); + $DeviceControlId = get_DeviceControlIdByRoomControlId($RoomControlId); if ($DeviceControlId===false and $ControlType==c_Control_iRemoteVolume) { $DeviceControlId = get_DeviceControlIdByRoomControlId($RoomControlId, c_Control_RemoteVolume); @@ -103,30 +101,42 @@ function Entertainment_SyncRoomControls($RoomId) { Entertainment_SetRoomControlVisibility($RoomControlId, false); } } - } + } } + // --------------------------------------------------------------------------------------------------------------------------- + function Entertainment_SetSourceNext($SourceId, $MessageType=c_MessageType_Action) { + $MaxValue = get_MaxValueByControlId($SourceId); + $Value = GetValue($SourceId) + 1; + if ($Value >= $MaxValue) { + $Value = 0; + } + Entertainment_SetSource($SourceId, $Value, $MessageType); + } + // --------------------------------------------------------------------------------------------------------------------------- function Entertainment_SetSource($SourceId, $Value, $MessageType=c_MessageType_Action) { - if (GetValue($SourceId) <> $Value) { - $RoomId = IPS_GetParent($SourceId); - $SourceName = get_SourceName($RoomId, $Value); - IPSLogger_Inf(__file__, 'Set Source "'.$SourceName.'" of Room '.IPS_GetName($RoomId)); + $RoomId = IPS_GetParent($SourceId); + $IsRoomPoweredOn = IsRoomPoweredOn($RoomId); + if (GetValue($SourceId) <> $Value || !$IsRoomPoweredOn) { + $RoomId = IPS_GetParent($SourceId); + $SourceName = get_SourceName($RoomId, $Value); + IPSLogger_Inf(__file__, 'Set Source "'.$SourceName.'" of Room '.IPS_GetName($RoomId)); SetValue($SourceId, $Value); - if (!IsRoomPoweredOn($RoomId)) { + if (!$IsRoomPoweredOn) { Entertainment_SetRoomPowerByRoomId($RoomId, true, false); } Entertainment_SetDeviceControlByRoomId($RoomId, c_Control_Muting, false); - Entertainment_SetDevicePowerByRoomId($RoomId, true); - Entertainment_SendDataBySourceIdx($RoomId, $Value, $MessageType); - Entertainment_SyncRoomControls($RoomId); + Entertainment_SetDevicePowerByRoomId($RoomId, true); + Entertainment_SendDataBySourceIdx($RoomId, $Value, $MessageType); + Entertainment_SyncRoomControls($RoomId); Entertainment_PowerOffUnusedDevices(); } } // --------------------------------------------------------------------------------------------------------------------------- function Entertainment_SetSourceByRoomId($RoomId, $SourceIdx) { - $SourceId = get_ControlIdByRoomId($RoomId, c_Control_Source); + $SourceId = get_ControlIdByRoomId($RoomId, c_Control_Source); Entertainment_SetSource($SourceId, $SourceIdx); } diff --git a/IPSLibrary/app/modules/IPSCam/IPSCam.inc.php b/IPSLibrary/app/modules/IPSCam/IPSCam.inc.php new file mode 100644 index 0000000..4bc55d3 --- /dev/null +++ b/IPSLibrary/app/modules/IPSCam/IPSCam.inc.php @@ -0,0 +1,93 @@ + + * + * IPSCam API + * + */ + + IPSUtils_Include ("IPSLogger.inc.php", "IPSLibrary::app::core::IPSLogger"); + IPSUtils_Include ("IPSComponent.class.php", "IPSLibrary::app::core::IPSComponent"); + IPSUtils_Include ("IPSModule.class.php", "IPSLibrary::app::core::IPSComponent"); + IPSUtils_Include ("IPSCam_Constants.inc.php", "IPSLibrary::app::modules::IPSCam"); + IPSUtils_Include ("IPSCam_Configuration.inc.php", "IPSLibrary::config::modules::IPSCam"); + IPSUtils_Include ("IPSCam_Custom.inc.php", "IPSLibrary::config::modules::IPSCam"); + IPSUtils_Include ("IPSCam_Manager.class.php", "IPSLibrary::app::modules::IPSCam"); + + /** + * Selektiert die spezifizierte Kamera und schaltet auf den gewünschten Mode um + * + * @param int $cameraIdx Index der Kamera + * @param int $mode Kamera Modus + */ + function IPSCam_ActivateCam($cameraIdx, $mode) { + $camManager = new IPSCam_Manager(); + $camManager->ActivateCamera($cameraIdx, $mode); + } + + /** + * Liefert den Camera Index (Position im Konfigurations Array) einer bestimmten Kamera + * Dieser Index wird zur Ansteuerung der meisten IPSCam Funktionen benötigt. + * + * @param string $name Name der Kamera + * @return int Index der Kamera + */ + function IPSCam_IPSCam_GetCamIdxByName($name) { + $config = IPSCam_GetConfiguration(); + foreach ($config as $idx=>$data) { + if ($data[IPSCAM_PROPERTY_NAME]==$name) { + return $idx; + } + } + trigger_error('Camera with Name "'.$name.'" could NOT be found in Configuration Array!!!'); + } + + /** + * Aktualisiert das entsprechende Kamera Bild, wenn der Kamera Index nicht gesetzt wird, + * wird das aktuell gewählte Kamera Bild aktualisiert + * + * @param int $cameraIdx Index der Kamera + */ + function IPSCam_RefreshPicture($cameraIdx=null) { + $camManager = new IPSCam_Manager(); + $camManager->PictureRefresh($cameraIdx); + } + + /** + * Speichert ein Bild der entsprechende Kamera , wenn der Kamera Index nicht gesetzt wird, + * wird das aktuell gewählte Kamera Bild gespeichert + * + * @param int $cameraIdx Index der Kamera + * @return string Name des gespeicherten Bildes bzw. false wenn die Kamera nicht in Betrieb ist. + */ + function IPSCam_StorePicture($cameraIdx=null) { + $camManager = new IPSCam_Manager(); + return $camManager->PictureStore($cameraIdx); + } + + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/IPSCam/IPSCam_ActionScript.ips.php b/IPSLibrary/app/modules/IPSCam/IPSCam_ActionScript.ips.php new file mode 100644 index 0000000..386dc26 --- /dev/null +++ b/IPSLibrary/app/modules/IPSCam/IPSCam_ActionScript.ips.php @@ -0,0 +1,52 @@ + + * + * IPSCam ActionScript + * + */ + + include_once "IPSCam.inc.php"; + + // ---------------------------------------------------------------------------------------------------------------------------- + if ($_IPS['SENDER']=='WebFront') { + $variableId = $_IPS['VARIABLE']; + $value = $_IPS['VALUE']; + + $camManager = new IPSCam_Manager(); + $camManager->ChangeSetting($variableId, $value); + + } elseif ($_IPS['SENDER']=='TimerEvent') { + $eventId = $_IPS['EVENT']; + + $camManager = new IPSCam_Manager(); + $camManager->ActivateTimer($eventId); + + // ---------------------------------------------------------------------------------------------------------------------------- + } else { + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/IPSCam/IPSCam_Constants.inc.php b/IPSLibrary/app/modules/IPSCam/IPSCam_Constants.inc.php new file mode 100644 index 0000000..a81dd47 --- /dev/null +++ b/IPSLibrary/app/modules/IPSCam/IPSCam_Constants.inc.php @@ -0,0 +1,120 @@ + + * + * Definition der Konstanten für IPSCam + * + */ + + // Confguration Property Definition + define ('IPSCAM_PROPERTY_NAME', 'Name'); + define ('IPSCAM_PROPERTY_TYPE', 'Type'); + define ('IPSCAM_PROPERTY_COMPONENT', 'Component'); + define ('IPSCAM_PROPERTY_SWITCHPOWER', 'SwitchPower'); + define ('IPSCAM_PROPERTY_SWITCHWLAN', 'SwitchWLAN'); + define ('IPSCAM_PROPERTY_PREDEFPOS1', 'PredefinedPosition1'); + define ('IPSCAM_PROPERTY_PREDEFPOS2', 'PredefinedPosition2'); + define ('IPSCAM_PROPERTY_PREDEFPOS3', 'PredefinedPosition3'); + define ('IPSCAM_PROPERTY_PREDEFPOS4', 'PredefinedPosition4'); + define ('IPSCAM_PROPERTY_COMMAND1', 'Command1'); + define ('IPSCAM_PROPERTY_COMMAND2', 'Command2'); + define ('IPSCAM_PROPERTY_COMMAND3', 'Command3'); + define ('IPSCAM_PROPERTY_COMMAND4', 'Command4'); + define ('IPSCAM_PROPERTY_ACTION1', 'Action1'); + define ('IPSCAM_PROPERTY_ACTION2', 'Action2'); + define ('IPSCAM_PROPERTY_ACTION3', 'Action3'); + define ('IPSCAM_PROPERTY_ACTION4', 'Action4'); + + define ('IPSCAM_TYPE_FIXEDCAM', 'FixedCam'); + define ('IPSCAM_TYPE_MOVABLECAM', 'MovableCam'); + + define ('IPSCAM_MODE_LIVE', 0); + define ('IPSCAM_MODE_PICTURE', 1); + define ('IPSCAM_MODE_HISTORY', 2); + define ('IPSCAM_MODE_SETTINGS', 3); + + define ('IPSCAM_URL_LIVE', 0); + define ('IPSCAM_URL_PICTURE', 1); + define ('IPSCAM_URL_DISPLAY', 2); + define ('IPSCAM_URL_MOVEUP', 100); + define ('IPSCAM_URL_MOVEDOWN', 101); + define ('IPSCAM_URL_MOVELEFT', 102); + define ('IPSCAM_URL_MOVERIGHT', 103); + define ('IPSCAM_URL_MOVEHOME', 104); + define ('IPSCAM_URL_PREDEFPOS1', 110); + define ('IPSCAM_URL_PREDEFPOS2', 111); + define ('IPSCAM_URL_PREDEFPOS3', 112); + define ('IPSCAM_URL_PREDEFPOS4', 113); + define ('IPSCAM_URL_PREDEFPOS5', 114); + + define ('IPSCAM_VAL_DISABLED', 100000); + + define ('IPSCAM_SIZE_SMALL', 0); + define ('IPSCAM_SIZE_MIDDLE', 1); + define ('IPSCAM_SIZE_LARGE', 2); + + define ('IPSCAM_NAV_BACK', 0); + define ('IPSCAM_NAV_FORWARD', 1); + + define ('IPSCAM_NAV_DATEFORMATFILE', 'Ymd_His'); + define ('IPSCAM_NAV_DATEFORMATDISP', 'Y-m-d H:i'); + + define ('IPSCAM_DAY_BACK', 0); + define ('IPSCAM_DAY_FORWARD', 1); + + // Common Variables + define ('IPSCAM_VAR_CAMSELECT', 'CamSelect'); + define ('IPSCAM_VAR_MODE', 'Mode'); + define ('IPSCAM_VAR_MODELIVE', 'ModeLive'); + define ('IPSCAM_VAR_MODEPICT', 'ModePicture'); + define ('IPSCAM_VAR_MODEHIST', 'ModeHistory'); + define ('IPSCAM_VAR_MODESETT', 'ModeSettings'); + define ('IPSCAM_VAR_NAVPICT', 'NavigatePict'); + define ('IPSCAM_VAR_NAVDAYS', 'NavigateDays'); + define ('IPSCAM_VAR_HTML', 'Html'); + define ('IPSCAM_VAR_IHTML', 'iHtml'); + + // Camera specific Variables + define ('IPSCAM_VAR_CAMPOWER', 'CamPower'); + define ('IPSCAM_VAR_CAMHTML', 'CamHtml'); + define ('IPSCAM_VAR_CAMPICT', 'CamPict'); + define ('IPSCAM_VAR_CAMHIST', 'CamHist'); + define ('IPSCAM_VAR_CAMSTREAM', 'CamStream'); + define ('IPSCAM_VAR_NAVTIME', 'NavigateTime'); + define ('IPSCAM_VAR_NAVFILE', 'NavigateFile'); + define ('IPSCAM_VAR_MOTMODE', 'MotionMode'); + define ('IPSCAM_VAR_MOTTIME', 'MotionTime'); + define ('IPSCAM_VAR_MOTHIST', 'MotionHist'); + define ('IPSCAM_VAR_MOTSIZE', 'MotionSize'); + define ('IPSCAM_VAR_PICTREF', 'PictureRefresh'); + define ('IPSCAM_VAR_PICTSTORE', 'PictureStore'); + define ('IPSCAM_VAR_PICTRESET', 'PictureReset'); + define ('IPSCAM_VAR_PICTHIST', 'PictureHist'); + define ('IPSCAM_VAR_PICTSIZE', 'PictureSize'); + + + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/IPSCam/IPSCam_GenerateMovies.ips.php b/IPSLibrary/app/modules/IPSCam/IPSCam_GenerateMovies.ips.php new file mode 100644 index 0000000..16647ab --- /dev/null +++ b/IPSLibrary/app/modules/IPSCam/IPSCam_GenerateMovies.ips.php @@ -0,0 +1,37 @@ + + * + * Generieren der "Motion Capture" Movies + * + */ + + include_once "IPSCam.inc.php"; + + $camManager = new IPSCam_Manager(); + $camManager->GenerateMovies(); + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/IPSCam/IPSCam_Manager.class.php b/IPSLibrary/app/modules/IPSCam/IPSCam_Manager.class.php new file mode 100644 index 0000000..785b57d --- /dev/null +++ b/IPSLibrary/app/modules/IPSCam/IPSCam_Manager.class.php @@ -0,0 +1,1194 @@ + + * + * IPSCam Kamera Management + */ + + /** + * @class IPSCam_Manager + * + * Definiert ein IPSCam_Manager Objekt + * + * @author Andreas Brauneis + * @version + * Version 2.50.1, 26.07.2012
+ */ + class IPSCam_Manager { + + /** + * @private + * ID Kategorie für Kamera Daten + */ + private $categoryIdCams; + + /** + * @private + * ID Kategorie für allgemeine Steuerungs Daten + */ + private $categoryIdCommon; + + /** + * @private + * ID Kategorie WebFront Navigations Panel + */ + private $categoryIdNavPanel; + + /** + * @private + * ID Kategorie WebFront Camera Panel + */ + private $categoryIdCamPanel; + + /** + * @private + * Konfigurations Daten Array + */ + private $config; + + /** + * @public + * + * Initialisierung des IPSCam_Manager Objektes + * + */ + public function __construct() { + $baseId = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSCam'); + $displayCategoryId = IPS_GetObjectIDByIdent('Display', $baseId); + $this->categoryIdNavPanel = IPS_GetObjectIDByIdent('NavigationPanel', $displayCategoryId); + $this->categoryIdCamPanel = IPS_GetObjectIDByIdent('CameraPanel', $displayCategoryId); + $this->categoryIdCams = IPS_GetObjectIDByIdent('Cams', $baseId); + $this->categoryIdCommon = IPS_GetObjectIDByIdent('Common', $baseId); + $this->config = IPSCam_GetConfiguration(); + } + + /** + * @public + * + * Modifiziert einen Variablen Wert der Kamera Steuerung + * + * @param integer $variableId ID der Variable die geändert werden soll + * @param variant $value Neuer Wert der Variable + */ + // ---------------------------------------------------------------------------------------------------------------------------- + public function ChangeSetting($variableId, $value) { + $variableIdent = IPS_GetIdent($variableId); + switch ($variableIdent) { + case IPSCAM_VAR_CAMSELECT: + $this->SetCamera($value); + break; + case IPSCAM_VAR_CAMPOWER: + $cameraIdx = (int)IPS_GetName(IPS_GetParent($variableId)); + $this->SetCamera($cameraIdx); + break; + case IPSCAM_VAR_MODE: + $this->SetMode($value); + break; + case IPSCAM_VAR_PICTSIZE: + SetValue($variableId, $value); + $mode = GetValue(IPS_GetObjectIDByIdent(IPSCAM_VAR_MODE, $this->categoryIdCommon)); + $cameraIdx = GetValue(IPS_GetObjectIDByIdent(IPSCAM_VAR_CAMSELECT, $this->categoryIdCommon)); + if ($mode==IPSCAM_MODE_PICTURE) { + $this->PictureRefresh($cameraIdx); + } + $this->RefreshWebFront($cameraIdx); + break; + case IPSCAM_VAR_MODELIVE: + case IPSCAM_VAR_MODEPICT: + case IPSCAM_VAR_MODEHIST: + case IPSCAM_VAR_MODESETT: + if (!$value) { + $this->SetMode(IPSCAM_MODE_PICTURE); + } elseif ($variableIdent==IPSCAM_VAR_MODELIVE) { + $this->SetMode(IPSCAM_MODE_LIVE); + } elseif ($variableIdent==IPSCAM_VAR_MODEPICT) { + $this->SetMode(IPSCAM_MODE_PICTURE); + } elseif ($variableIdent==IPSCAM_VAR_MODEHIST) { + $this->SetMode(IPSCAM_MODE_HISTORY); + } elseif ($variableIdent==IPSCAM_VAR_MODESETT) { + $this->SetMode(IPSCAM_MODE_SETTINGS); + } else { + trigger_error('Unknown Variable'); + } + break; + case IPSCAM_VAR_NAVPICT: + SetValue($variableId, $value); + $this->NavigatePictures($value, 1); + IPS_Sleep(200); + SetValue($variableId, -1); + break; + case IPSCAM_VAR_NAVDAYS: + SetValue($variableId, $value); + $this->NavigateDays($value, 1); + IPS_Sleep(200); + SetValue($variableId, -1); + break; + case IPSCAM_VAR_MOTMODE: + case IPSCAM_VAR_MOTTIME: + SetValue($variableId, $value); + $categoryId = IPS_GetParent($variableId); + $cameraIdx = (int)IPS_GetName($categoryId); + $this->SetTimer ($cameraIdx, 'PictureMotion', + GetValue(IPS_GetObjectIDByIdent(IPSCAM_VAR_MOTMODE, $categoryId)), + GetValue(IPS_GetObjectIDByIdent(IPSCAM_VAR_MOTTIME, $categoryId))); + break; + case IPSCAM_VAR_MOTHIST: + case IPSCAM_VAR_MOTSIZE: + SetValue($variableId, $value); + break; + case IPSCAM_VAR_PICTREF: + SetValue($variableId, $value); + $cameraIdx = (int)IPS_GetName(IPS_GetParent($variableId)); + $this->SetTimer ($cameraIdx, 'PictureRefresh', $value); + break; + case IPSCAM_VAR_PICTSTORE: + SetValue($variableId, $value); + $cameraIdx = (int)IPS_GetName(IPS_GetParent($variableId)); + $this->SetTimer ($cameraIdx, 'PictureStore', $value); + break; + case IPSCAM_VAR_PICTRESET: + SetValue($variableId, $value); + $cameraIdx = (int)IPS_GetName(IPS_GetParent($variableId)); + $this->SetTimer ($cameraIdx, 'PictureReset', $value); + break; + case IPSCAM_VAR_PICTHIST: + SetValue($variableId, $value); + break; + default: + trigger_error('Unknown VariableID'.$variableId); + } + } + + // ---------------------------------------------------------------------------------------------------------------------------- + public function ActivateCamera($cameraIdx, $mode) { + $this->SetCamera($cameraIdx); + $this->SetMode($mode); + } + + // ---------------------------------------------------------------------------------------------------------------------------- + private function SetCamera ($cameraIdx) { + $variableIdCamSelect = IPS_GetObjectIDByIdent(IPSCAM_VAR_CAMSELECT, $this->categoryIdCommon); + if (GetValue($variableIdCamSelect)<>$cameraIdx) { + SetValue($variableIdCamSelect, $cameraIdx); + foreach ($this->config as $idx=>$data) { + $categoryIdCam = IPS_GetObjectIDByIdent($idx, $this->categoryIdCams); + $variableIdCamPower = IPS_GetObjectIDByIdent(IPSCAM_VAR_CAMPOWER, $categoryIdCam); + $valueCamPower = ($idx==$cameraIdx); + SetValue($variableIdCamPower, $valueCamPower); + } + $mode = GetValue(IPS_GetObjectIDByIdent(IPSCAM_VAR_MODE, $this->categoryIdCommon)); + $this->RefreshWebFrontByMode($mode); + if ($mode==IPSCAM_MODE_HISTORY) { + $this->NavigatePictures(IPSCAM_DAY_FORWARD, 1); + } elseif ($mode==IPSCAM_MODE_PICTURE) { + $this->PictureRefresh($cameraIdx); + } else { + } + $this->RefreshWebFront($cameraIdx); + } + } + + // ---------------------------------------------------------------------------------------------------------------------------- + private function SetMode ($mode) { + $variableIdMode = IPS_GetObjectIDByIdent(IPSCAM_VAR_MODE, $this->categoryIdCommon); + if (GetValue($variableIdMode)<>$mode) { + SetValue($variableIdMode, $mode); + $variableIdMode = IPS_GetObjectIDByIdent(IPSCAM_VAR_MODELIVE, $this->categoryIdCommon); + SetValue($variableIdMode, ($mode==IPSCAM_MODE_LIVE)); + $variableIdMode = IPS_GetObjectIDByIdent(IPSCAM_VAR_MODEPICT, $this->categoryIdCommon); + SetValue($variableIdMode, ($mode==IPSCAM_MODE_PICTURE)); + $variableIdMode = IPS_GetObjectIDByIdent(IPSCAM_VAR_MODEHIST, $this->categoryIdCommon); + SetValue($variableIdMode, ($mode==IPSCAM_MODE_HISTORY)); + $variableIdMode = IPS_GetObjectIDByIdent(IPSCAM_VAR_MODESETT, $this->categoryIdCommon); + SetValue($variableIdMode, ($mode==IPSCAM_MODE_SETTINGS)); + + //Reset Timers + $variableIdCamSelect = IPS_GetObjectIDByIdent(IPSCAM_VAR_CAMSELECT, $this->categoryIdCommon); + $cameraIdx = GetValue($variableIdCamSelect); + $categoryIdCam = IPS_GetObjectIDByIdent($cameraIdx, $this->categoryIdCams); + $this->SetTimer ($cameraIdx, 'PictureReset', IPSCAM_VAL_DISABLED); + $this->SetTimer ($cameraIdx, 'PictureReset', GetValue(IPS_GetObjectIDByIdent(IPSCAM_VAR_PICTRESET, $categoryIdCam)), 'Once'); + + // Refresh + $this->RefreshWebFrontByMode($mode); + if ($mode==IPSCAM_MODE_HISTORY) { + $this->NavigatePictures(IPSCAM_DAY_FORWARD, 1); + } elseif ($mode==IPSCAM_MODE_PICTURE) { + $this->PictureRefresh($cameraIdx); + } else { + } + $this->RefreshWebFront($cameraIdx); + } + } + + // ---------------------------------------------------------------------------------------------------------------------------- + private function RefreshWebFront($cameraIdx) { + // Check if Camera is currently selected in WebFront, otherwise nothing has to be refreshed + if (GetValue(IPS_GetObjectIDByIdent(IPSCAM_VAR_CAMSELECT, $this->categoryIdCommon)) <> $cameraIdx) { + return; + } + $mode = GetValue(IPS_GetObjectIDByIdent(IPSCAM_VAR_MODE, $this->categoryIdCommon)); + $variableIdHtml = IPS_GetObjectIDByIdent(IPSCAM_VAR_HTML, $this->categoryIdCommon); + $variableIdHtml2 = IPS_GetObjectIDByIdent(IPSCAM_VAR_IHTML, $this->categoryIdCommon); + + $urlStream = $this->GetURL($cameraIdx, IPSCAM_URL_LIVE); + $urlImage = $this->GetURL($cameraIdx, IPSCAM_URL_PICTURE); + + + $styleImage = 'text-align:center; border:3px solid rgba(255,255,255,0.5);'; + $styleContainer = 'text-align:center; width:100%; display:block; cursor:default;'; + $styleImage2 = 'text-align:center; width:95%; border:3px solid rgba(255,255,255,0.5);'; + $styleContainer2 = 'text-align:center; display:block; cursor:default;'; + + switch ($mode) { + case IPSCAM_MODE_LIVE: + $variableIdCam = IPS_GetObjectIDByIdent(IPSCAM_VAR_CAMHTML, $this->categoryIdCommon); + SetValue($variableIdCam, ''); } - function NetPlayer_SwitchToRadio() { - if (GetValue(NP_ID_CONTROLTYPE)==2) return; + function NetPlayer_SwitchToRadio($forceLoad=false) { + if (GetValue(NP_ID_CONTROLTYPE)==2 and !$forceLoad) return; $radiourl = GetValue(NP_ID_RADIOURL); $radiotitel = GetValue(NP_ID_RADIONAME); IPSLogger_Inf(__file__, "Play RadioStation '$radiotitel', Url='$radiourl'"); @@ -193,21 +201,6 @@ function NetPlayer_PlayDirectory($directory) { NetPlayer_RefreshCDListValue(); } - function NetPlayer_PlayRadio($radiourl, $radiotitel) { - IPSLogger_Inf(__file__, "Play RadioStation '$radiotitel', Url='$radiourl'"); - SetValue(NP_ID_RADIOURL, $radiourl); - SetValue(NP_ID_RADIONAME, $radiotitel); - SetValue(NP_ID_CDINTERPRET, ''); - SetValue(NP_ID_CDALBUM, $radiotitel); - NetPlayer_Power(true); - NetPlayer_SwitchToRadio(); - NetPlayer_RefreshRadioListValue(); - $player = NetPlayer_GetIPSComponentPlayer(); - $player->ClearPlaylist(); - $player->AddPlaylist($radiourl); - $player->Play(); - } - function NetPlayer_NavigateRadioForward($count=NP_COUNT_RADIODEFAULT) { IPSLogger_Trc(__file__, "Navigate Forward Radio, Count=$count"); NetPlayer_NavigateRadio($count-1); @@ -232,20 +225,78 @@ function NetPlayer_Pause() { NetPlayer_GetIPSComponentPlayer()->Pause(); } - function NetPlayer_Prev() { + function NetPlayer_PlayRadio($radiourl, $radiotitel) { + IPSLogger_Inf(__file__, "Play RadioStation '$radiotitel', Url='$radiourl'"); + SetValue(NP_ID_RADIOURL, $radiourl); + SetValue(NP_ID_RADIONAME, $radiotitel); + SetValue(NP_ID_CDINTERPRET, ''); + SetValue(NP_ID_CDALBUM, $radiotitel); + NetPlayer_Power(true); + NetPlayer_SwitchToRadio(); + NetPlayer_RefreshRadioListValue(); + $player = NetPlayer_GetIPSComponentPlayer(); + $player->ClearPlaylist(); + $player->AddPlaylist($radiourl); + $player->Play(); + } + + function NetPlayer_RadioByIndex($radioIdx=0) { + $radioName = GetValue(NP_ID_RADIONAME); + $radioList = NetPlayer_GetRadioList(); + $radioKeys = array_keys($radioList); + if (!array_key_exists($radioIdx, $radioKeys)) { + IPSLogger_Err(__file__, "Unbekannter Sender in der Radioliste -> $radioIdx"); + } else { + $radioName = $radioKeys[$radioIdx]; + $radioUrl = $radioList[$radioKeys[$radioIdx]]; + NetPlayer_PlayRadio($radioUrl, $radioName); + NetPlayer_RefreshRemoteControl(); + } + } + + function NetPlayer_NextRadio($next=1) { + $radioName = GetValue(NP_ID_RADIONAME); + $radioList = NetPlayer_GetRadioList(); + $radioKeys = array_keys($radioList); // 0=>'OE3',... + $radioFlip = array_flip($radioKeys); // 'OE3'=>0 + print_r($radioFlip); + $radioIdx = $radioFlip[$radioName]+$next; + echo $radioIdx; + if (!array_key_exists($radioIdx, $radioKeys)) { + if ($next>0) { + $radioIdx = 0; + } else { + $radioIdx = count($radioKeys)-1; + } + } + $radioName = $radioKeys[$radioIdx]; + $radioUrl = $radioList[$radioName]; + NetPlayer_PlayRadio($radioUrl, $radioName); + NetPlayer_RefreshRemoteControl(); + } + + function NetPlayer_Next() { NetPlayer_Power(true); $plaverState = GetValue(NP_ID_CONTROL); - SetValue(NP_ID_CONTROL, NP_IDX_CONTROLPREV); - NetPlayer_GetIPSComponentPlayer()->Prev(); + SetValue(NP_ID_CONTROL, NP_IDX_CONTROLNEXT); + if (GetValue(NP_ID_CONTROLTYPE)==2) { // Radio + NetPlayer_NextRadio(1); + } else { + NetPlayer_GetIPSComponentPlayer()->Next(); + } IPS_SLEEP(200); SetValue(NP_ID_CONTROL, $plaverState); } - function NetPlayer_Next() { + function NetPlayer_Prev() { NetPlayer_Power(true); $plaverState = GetValue(NP_ID_CONTROL); - SetValue(NP_ID_CONTROL, NP_IDX_CONTROLNEXT); - NetPlayer_GetIPSComponentPlayer()->Next(); + SetValue(NP_ID_CONTROL, NP_IDX_CONTROLPREV); + if (GetValue(NP_ID_CONTROLTYPE)==2) { // Radio + NetPlayer_NextRadio(-1); + } else { + NetPlayer_GetIPSComponentPlayer()->Prev(); + } IPS_SLEEP(200); SetValue(NP_ID_CONTROL, $plaverState); } @@ -257,38 +308,45 @@ function NetPlayer_SetPlayListPosition($position) { } function NetPlayer_SetSource($value) { - if (GetValue(NP_ID_SOURCE)<>$value) { + if (GetValue(NP_ID_SOURCE)<>$value) { switch ($value) { - case NP_IDX_SOURCECD: - NetPlayer_SwitchToMP3Player(true, true); - break; - case NP_IDX_SOURCERADIO: - NetPlayer_SwitchToRadio(); - break; + case NP_IDX_SOURCECD: + NetPlayer_SwitchToMP3Player(true, true); + break; + case NP_IDX_SOURCERADIO: + NetPlayer_SwitchToRadio(); + break; default: - IPSLogger_Err(__file__, "Unknown SourceValue '$value'"); - exit; + IPSLogger_Err(__file__, "Unknown SourceValue '$value'"); + exit; } } } function NetPlayer_Power($value) { - // Set Power State + // Set Power State if ($value != GetValue(NP_ID_POWER)) { - SetValue(NP_ID_POWER, $value); + SetValue(NP_ID_POWER, $value); NetPlayer_RefreshRemoteControl(); } $plaverState = GetValue(NP_ID_CONTROL); // Set Player Control if ($value and $plaverState<>NP_IDX_CONTROLPLAY) { - IPSLogger_Trc(__file__, 'Start Netplayer'); - SetValue(NP_ID_CONTROL, NP_IDX_CONTROLPLAY); - NetPlayer_GetIPSComponentPlayer()->Play(); + IPSLogger_Trc(__file__, 'Start Netplayer'); + SetValue(NP_ID_CONTROL, NP_IDX_CONTROLPLAY); + $player = NetPlayer_GetIPSComponentPlayer(); + if (!$player->Play()) { + if (GetValue(NP_ID_CONTROLTYPE)==2) { + NetPlayer_SwitchToRadio(true); + } else { + NetPlayer_SwitchToMP3Player(true, true); + } + } } if (!$value and $plaverState<>NP_IDX_CONTROLSTOP) { - IPSLogger_Trc(__file__, 'Stop Netplayer'); - SetValue(NP_ID_CONTROL, NP_IDX_CONTROLSTOP); + IPSLogger_Trc(__file__, 'Stop Netplayer'); + SetValue(NP_ID_CONTROL, NP_IDX_CONTROLSTOP); NetPlayer_GetIPSComponentPlayer()->Stop(); } } diff --git a/IPSLibrary/app/modules/NetPlayer/NetPlayer_ActionScript.ips.php b/IPSLibrary/app/modules/NetPlayer/NetPlayer_ActionScript.ips.php index 15ebb1d..75399c1 100644 --- a/IPSLibrary/app/modules/NetPlayer/NetPlayer_ActionScript.ips.php +++ b/IPSLibrary/app/modules/NetPlayer/NetPlayer_ActionScript.ips.php @@ -75,23 +75,23 @@ if ($categoryPath<>"") $basePath = $basePath."\\".$categoryPath; $directory = $basePath . "\\" . $directory; NetPlayer_PlayDirectory($directory); - break; + break; case NP_ID_RADIONAV: SetValue($variable, $value); - if ($value==NP_IDX_RADIOPREV) { + if ($value==NP_IDX_RADIOPREV) { NetPlayer_NavigateRadioBack(NP_COUNT_RADIOVARIABLE); - } else { + } else { NetPlayer_NavigateRadioForward(NP_COUNT_RADIOVARIABLE); - } + } IPS_SLEEP(200); SetValue($variable, -1); - break; + break; case NP_ID_RADIOLIST: $radioName = NetPlayer_GetNameFromProfile($value,'NetPlayer_RadioList'); $radioList = NetPlayer_GetRadioList(); $radioUrl = $radioList[$radioName]; NetPlayer_PlayRadio($radioUrl, $radioName); - break; + break; default: IPSLogger_Err(__file__, 'Unknown ControlID '.$variable); } diff --git a/IPSLibrary/app/modules/NetPlayer/NetPlayer_ListFiles.inc.php b/IPSLibrary/app/modules/NetPlayer/NetPlayer_ListFiles.inc.php index b0206bd..3d43697 100644 --- a/IPSLibrary/app/modules/NetPlayer/NetPlayer_ListFiles.inc.php +++ b/IPSLibrary/app/modules/NetPlayer/NetPlayer_ListFiles.inc.php @@ -12,38 +12,38 @@ // --------------------------------------------------------------------------------------------------------------------------- function NetPlayer_GetCategoryList () { - $basePath = NETPLAYER_DIRECTORY; - $categoryList = array(); - $directoryList = scandir($basePath); - $directoryList = array_diff($directoryList, Array(".","..")); - $idx = 1; - foreach($directoryList as $directory) { + $basePath = NETPLAYER_DIRECTORY; + $categoryList = array(); + $directoryList = scandir($basePath); + $directoryList = array_diff($directoryList, Array(".","..")); + $idx = 1; + foreach($directoryList as $directory) { $fullDirName = $basePath . "\\" . $directory; - if (is_dir($fullDirName) and strpos($directory, '_')===0) { - $categoryList[] = $directory; + if (is_dir($fullDirName) and strpos($directory, '_')===0) { + $categoryList[] = $directory; } - } + } return $categoryList; - } + } // --------------------------------------------------------------------------------------------------------------------------- function NetPlayer_GetDirectoryList () { - $basePath = NETPLAYER_DIRECTORY; - $categoryPath = GetValue(NP_ID_CDCATEGORYNAME); + $basePath = NETPLAYER_DIRECTORY; + $categoryPath = GetValue(NP_ID_CDCATEGORYNAME); if ($categoryPath<>"") $basePath = $basePath."\\".$categoryPath; - $resultList = array(); - $directoryList = scandir($basePath); - $directoryList = array_diff($directoryList, Array(".","..")); + $resultList = array(); + $directoryList = scandir($basePath); + $directoryList = array_diff($directoryList, Array(".","..")); - foreach($directoryList as $directory) { + foreach($directoryList as $directory) { $fullDirName = $basePath . "\\" . $directory; - if (strpos($directory, '_')===0) { + if (strpos($directory, '_')===0) { continue; - } elseif (is_dir($fullDirName)) { - $resultList[] = $directory; + } elseif (is_dir($fullDirName)) { + $resultList[] = $directory; } else { - //ignore + //ignore } } return $resultList; @@ -51,39 +51,41 @@ function NetPlayer_GetDirectoryList () { // --------------------------------------------------------------------------------------------------------------------------- function NetPlayer_FilterDirectoryList ($directoryList, $count) { - $resultList = array(); - $maxIdx = count($directoryList); - $currentIdx = GetValue(NP_ID_CDDIRECTORYIDX); - if ($currentIdx > $maxIdx - $count) $currentIdx = $maxIdx - $count; - if ($currentIdx < 0) $currentIdx = 0; + $resultList = array(); + $maxIdx = count($directoryList); + $currentIdx = GetValue(NP_ID_CDDIRECTORYIDX); + if ($currentIdx > $maxIdx - $count) $currentIdx = $maxIdx - $count; + if ($currentIdx < 0) $currentIdx = 0; for ($idx=0 ; $idx<$count; $idx++) { - if (array_key_exists($currentIdx + $idx, $directoryList)) - $resultList[] = $directoryList[$currentIdx + $idx]; + if (array_key_exists($currentIdx + $idx, $directoryList)) + $resultList[] = $directoryList[$currentIdx + $idx]; } return $resultList; } // --------------------------------------------------------------------------------------------------------------------------- function NetPlayer_GetCDList ($count, &$fullDirNameList, &$interpretList, &$albumList) { - $directoryList = NetPlayer_GetDirectoryList(); - $directoryList = NetPlayer_FilterDirectoryList($directoryList, $count); - $basePath = NETPLAYER_DIRECTORY; - foreach ($directoryList as $idx=>$directory) { - $fullDirNameList[] = $basePath."\\".$directory; - $interpretList[] = substr($directory, 0, strpos($directory, "[")); + $directoryList = NetPlayer_GetDirectoryList(); + $directoryList = NetPlayer_FilterDirectoryList($directoryList, $count); + $basePath = NETPLAYER_DIRECTORY; + $categoryPath = GetValue(NP_ID_CDCATEGORYNAME); + if ($categoryPath<>"") $basePath = $basePath."\\".$categoryPath; + foreach ($directoryList as $idx=>$directory) { + $fullDirNameList[] = $basePath."\\".$directory; + $interpretList[] = substr($directory, 0, strpos($directory, "[")); $albumList[] = substr($directory, strpos($directory, "[")); } } // --------------------------------------------------------------------------------------------------------------------------- function NetPlayer_NavigateCD ($delta) { - $directoryList = NetPlayer_GetDirectoryList(); - $maxIdx = count($directoryList); - $currentIdx = GetValue(NP_ID_CDDIRECTORYIDX); - if ($currentIdx > $maxIdx - $delta) $currentIdx = $maxIdx - $delta; + $directoryList = NetPlayer_GetDirectoryList(); + $maxIdx = count($directoryList); + $currentIdx = GetValue(NP_ID_CDDIRECTORYIDX); + if ($currentIdx > $maxIdx - $delta) $currentIdx = $maxIdx - $delta; $currentIdx = $currentIdx + $delta; - if ($currentIdx < 0) $currentIdx = 0; - SetValue(NP_ID_CDDIRECTORYIDX, $currentIdx); + if ($currentIdx < 0) $currentIdx = 0; + SetValue(NP_ID_CDDIRECTORYIDX, $currentIdx); } /** @}*/ diff --git a/IPSLibrary/app/modules/NetPlayer/NetPlayer_LoadFiles.inc.php b/IPSLibrary/app/modules/NetPlayer/NetPlayer_LoadFiles.inc.php index 8a56cb2..2d7b6bf 100644 --- a/IPSLibrary/app/modules/NetPlayer/NetPlayer_LoadFiles.inc.php +++ b/IPSLibrary/app/modules/NetPlayer/NetPlayer_LoadFiles.inc.php @@ -12,16 +12,17 @@ // --------------------------------------------------------------------------------------------------------------------------- function NetPlayer_CopyCoverFile ($path) { - $files = scandir($path); + $files = scandir($path); foreach ($files as $file) { - $extension = pathinfo($file, PATHINFO_EXTENSION); - $filename = pathinfo($file, PATHINFO_FILENAME); - $cover_jpg = ""; - $cover_front = ""; - if (strtolower($extension)=='jpg') { - $cover_jpg = $path."\\".$file; - if (strpos(strtolower($filename),'front')!==false) { - $cover_front = $path."\\".$file; } + $extension = pathinfo($file, PATHINFO_EXTENSION); + $filename = pathinfo($file, PATHINFO_FILENAME); + $cover_jpg = ""; + $cover_front = ""; + if (strtolower($extension)=='jpg') { + $cover_jpg = $path."\\".$file; + if (strpos(strtolower($filename),'front')!==false) { + $cover_front = $path."\\".$file; + } } } @@ -29,64 +30,64 @@ function NetPlayer_CopyCoverFile ($path) { if ($cover_front != "") { $FileInput = $cover_front; } else if ($cover_jpg != "") { - $FileInput = $cover_jpg; + $FileInput = $cover_jpg; } else { - $FileInput = IPS_GetKernelDir()."\\webfront\\user\\NetPlayer\\NetPlayer_CoverNotFound.jpg"; + $FileInput = IPS_GetKernelDir()."\\webfront\\user\\NetPlayer\\NetPlayer_CoverNotFound.jpg"; } - IPSLogger_Dbg(__file__, "Copy Cover File '$FileInput' to '$FileOutput'"); + IPSLogger_Dbg(__file__, "Copy Cover File '$FileInput' to '$FileOutput'"); copy ($FileInput, $FileOutput); } // --------------------------------------------------------------------------------------------------------------------------- - function NetPlayer_GetPlayList($path, &$playlist) { - $content = scandir($path); - $maindata = array_diff($content, Array(".","..")); - $allowed = Array("mp3", "wma"); + function NetPlayer_GetPlayList($path, &$playlist) { + $content = scandir($path); + $maindata = array_diff($content, Array(".","..")); + $allowed = Array("mp3", "wma"); - foreach($maindata as $d) { - $actpath = $path . "\\" . $d; - if (is_dir($actpath)) { - } else { - $ext = pathinfo($actpath, PATHINFO_EXTENSION); - if (in_array(strtolower($ext), $allowed)) { - $playlist[] = $actpath; - } - } - } - } + foreach($maindata as $d) { + $actpath = $path . "\\" . $d; + if (is_dir($actpath)) { + } else { + $ext = pathinfo($actpath, PATHINFO_EXTENSION); + if (in_array(strtolower($ext), $allowed)) { + $playlist[] = $actpath; + } + } + } + } // --------------------------------------------------------------------------------------------------------------------------- function NetPlayer_LoadFiles ($cd_path) { - //Get Directory to Load - SetValue(NP_ID_CDDIRECTORYPATH, $cd_path); + //Get Directory to Load + SetValue(NP_ID_CDDIRECTORYPATH, $cd_path); - // Get PlayList - $playlist = array(); - NetPlayer_GetPlayList ($cd_path, $playlist); - NetPlayer_CopyCoverFile ($cd_path); + // Get PlayList + $playlist = array(); + NetPlayer_GetPlayList ($cd_path, $playlist); + NetPlayer_CopyCoverFile ($cd_path); - // Leeren der vorher bestehenden Playlist: + // Leeren der vorher bestehenden Playlist: $player = NetPlayer_GetIPSComponentPlayer(); $player->ClearPlaylist(); - $tracklist = ""; + $tracklist = ""; - // Durchlaufen des Playlist-Arrays und anhängen an die Mediaplayer-Instanz-Playlist - $idx = 1; - foreach($playlist as $data) - { - IPSLogger_Dbg(__file__, "Add File=".$data); + // Durchlaufen des Playlist-Arrays und anhängen an die Mediaplayer-Instanz-Playlist + $idx = 1; + foreach($playlist as $data) + { + IPSLogger_Dbg(__file__, "Add File=".$data); $player->AddPlaylist($data); - $tracklist.='
'.convert(basename($data))."
"; - $idx++; - } - SetValue(NP_ID_CDTRACKLISTHTML, $tracklist); + $tracklist.='
'.convert(basename($data))."
"; + $idx++; + } + SetValue(NP_ID_CDTRACKLISTHTML, $tracklist); $player->Play(); - $Directory = basename($cd_path); - SetValue(NP_ID_CDINTERPRET, substr($Directory,0,strpos($Directory, "["))); - SetValue(NP_ID_CDALBUM, substr($Directory,strpos($Directory, "[")+1, strpos($Directory, "]")-strpos($Directory, "[")-1)); + $Directory = basename($cd_path); + SetValue(NP_ID_CDINTERPRET, substr($Directory,0,strpos($Directory, "["))); + SetValue(NP_ID_CDALBUM, substr($Directory,strpos($Directory, "[")+1, strpos($Directory, "]")-strpos($Directory, "[")-1)); } /** @}*/ diff --git a/IPSLibrary/app/modules/NetPlayer/NetPlayer_Utils.inc.php b/IPSLibrary/app/modules/NetPlayer/NetPlayer_Utils.inc.php index d2ff9de..108d555 100644 --- a/IPSLibrary/app/modules/NetPlayer/NetPlayer_Utils.inc.php +++ b/IPSLibrary/app/modules/NetPlayer/NetPlayer_Utils.inc.php @@ -13,7 +13,7 @@ // --------------------------------------------------------------------------------------------------------------------------- function convert($s) { $source = array("&", "ä", "ö", "ü", "Ä", "Ö", "Ü", "ß", "<", ">", "€", "", "¹", "²", "³"); - $dest = array("&", "ä", "ö", "ü", "Ä", "Ö", "Ü", "ß", "<", ">", "¬", "¹", "²", "³"); + $dest = array("&", "ä", "ö", "ü", "Ä", "Ö", "Ü", "ß", "<", ">", "€", "¹", "²", "³"); $s = str_replace($source, $dest, $s); return $s; } @@ -21,7 +21,7 @@ function convert($s) { // --------------------------------------------------------------------------------------------------------------------------- function decode($s) { $dest = array("&", "ä", "ö", "ü", "Ä", "Ö", "Ü", "ß", "<", ">", "€", "", "¹", "²", "³"); - $source = array("&", "ä", "ö", "ü", "Ä", "Ö", "Ü", "ß", "<", ">", "¬", "¹", "²", "³"); + $source = array("&", "ä", "ö", "ü", "Ä", "Ö", "Ü", "ß", "<", ">", "€", "¹", "²", "³"); $s = str_replace($source, $dest, $s); return $s; } @@ -226,19 +226,22 @@ function NetPlayer_RefreshTrackListProfile() { // --------------------------------------------------------------------------------------------------------------------------- function NetPlayer_RefreshTrackListValue() { $currentIdx = -1; - $player = NetPlayer_GetIPSComponentPlayer(); - $currentName = $player->GetTrackName(); - $currentName = NetPlayer_GetTrackName($currentName); - $currentName = str_replace(GetValue(NP_ID_CDINTERPRET).' - ', '', $currentName); - - $profileData = IPS_GetVariableProfile('NetPlayer_CDTrackList'); - $associations = $profileData['Associations']; - foreach ($associations as $idx=>$data) { - IPSLogger_Trc(__file__, "Idx=$idx, '$currentName' --> '".$data['Name']."'"); - if ($currentName == $data['Name']) { - $currentIdx = $data['Value']; + if (GetValue(NP_ID_SOURCE)==NP_IDX_SOURCECD) { + $player = NetPlayer_GetIPSComponentPlayer(); + $currentName = $player->GetTrackName(); + $currentName = NetPlayer_GetTrackName($currentName); + $currentName = str_replace(GetValue(NP_ID_CDINTERPRET).' - ', '', $currentName); + + $profileData = IPS_GetVariableProfile('NetPlayer_CDTrackList'); + $associations = $profileData['Associations']; + foreach ($associations as $idx=>$data) { + IPSLogger_Trc(__file__, "Idx=$idx, '$currentName' --> '".$data['Name']."'"); + if ($currentName == $data['Name']) { + $currentIdx = $data['Value']; + } } } + if (GetValue(NP_ID_CDTRACKLIST)<>$currentIdx ) { SetValue(NP_ID_CDTRACKLIST, $currentIdx); } diff --git a/IPSLibrary/app/modules/NetPlayer2/Default/NetPlayer_IDs.inc.php b/IPSLibrary/app/modules/NetPlayer2/Default/NetPlayer_IDs.inc.php new file mode 100644 index 0000000..550dae6 --- /dev/null +++ b/IPSLibrary/app/modules/NetPlayer2/Default/NetPlayer_IDs.inc.php @@ -0,0 +1,48 @@ + + * + * NetPlayer ID Konstanten + * + */ + + //MediaPlayer + define ("NP_ID_MEDIAPLAYER", 36728); + + //MP3 Player + define ("NP_ID_CDDIRECTORYPATH", 38819); + define ("NP_ID_CDDIRECTORYNAME", 14495); + define ("NP_ID_CDCATEGORYNAME", 21024); + define ("NP_ID_CDDIRECTORYIDX", 29911); + define ("NP_ID_CDTRACKLISTHTML", 35872); + define ("NP_ID_CDTRACKIDX", 57387); + + // Radio Player + define ("NP_ID_RADIOIDX", 44432); + define ("NP_ID_RADIONAME", 35966); + define ("NP_ID_RADIOURL", 22694); + + // NetPlayer Controls + define ("NP_ID_POWER", 53255); + define ("NP_ID_CONTROLTYPE", 24721); + define ("NP_ID_REMOTECONTROL", 45560); + define ("NP_ID_MOBILECONTROL", 26527); + + define ("NP_ID_CATEGORYLIST", 22374); + define ("NP_ID_CDALBUMLIST", 23242); + define ("NP_ID_CDALBUMNAV", 37443); + define ("NP_ID_CDTRACKLIST", 25120); + define ("NP_ID_CDTRACKNAV", 30763); + define ("NP_ID_RADIOLIST", 39608); + define ("NP_ID_RADIONAV", 58362); + define ("NP_ID_SOURCE", 27580); + define ("NP_ID_CONTROL", 28803); + define ("NP_ID_CDINTERPRET", 21144); + define ("NP_ID_CDALBUM", 56777); + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/NetPlayer2/NetPlayer.inc.php b/IPSLibrary/app/modules/NetPlayer2/NetPlayer.inc.php new file mode 100644 index 0000000..7275083 --- /dev/null +++ b/IPSLibrary/app/modules/NetPlayer2/NetPlayer.inc.php @@ -0,0 +1,356 @@ + + * + * NetPlayer API + * + * Dieses File kann von anderen Scripts per INCLUDE eingebunden werden und enthält Funktionen + * um alle Funktionen des NetPlayers bequem per Funktionsaufruf steueren zu können. + * + */ + + IPSUtils_Include ("IPSLogger.inc.php", "IPSLibrary::app::core::IPSLogger"); + IPSUtils_Include ("IPSComponent.class.php", "IPSLibrary::app::core::IPSComponent"); + include_once "NetPlayer_Constants.inc.php"; + IPSUtils_Include ("NetPlayer_Configuration.inc.php", "IPSLibrary::config::modules::NetPlayer2"); + include_once "NetPlayer_Utils.inc.php"; + include_once "NetPlayer_ListFiles.inc.php"; + include_once "NetPlayer_LoadFiles.inc.php"; + + + function NetPlayer_GetIPSComponentPlayer() { + $player = IPSComponent::CreateObjectByParams(NETPLAYER_COMPONENT); + return $player ; + } + + function NetPlayer_Switch() { + if (GetValue(NP_ID_CONTROLTYPE)==2) { + NetPlayer_SwitchToMP3Player(); + } else { + NetPlayer_SwitchToRadio(); + } + } + + function NetPlayer_SwitchToMP3Player($loadDirectory=true,$forceLoad=false) { + if (GetValue(NP_ID_CONTROLTYPE)==0 and !$forceLoad) return; + if ($loadDirectory) { + $directory = GetValue(NP_ID_CDDIRECTORYPATH); + IPSLogger_Inf(__file__, "Play MP3 '$directory'"); + NetPlayer_Power(true); + NetPlayer_LoadFiles ($directory); + SetValue(NP_ID_CDTRACKIDX, 0); + NetPlayer_RefreshTrackListProfile(); + NetPlayer_RefreshTrackListValue(); + } + SetValue(NP_ID_SOURCE, NP_IDX_SOURCECD); + SetValue(NP_ID_CONTROLTYPE, 0); + SetValue(NP_ID_REMOTECONTROL, ''); + } + + function NetPlayer_SwitchToMP3Selection() { + if (GetValue(NP_ID_CONTROLTYPE)==1) return; + SetValue(NP_ID_CONTROLTYPE, 1); + SetValue(NP_ID_REMOTECONTROL, ''); + } + + function NetPlayer_SwitchToRadio($forceLoad=false) { + if (GetValue(NP_ID_CONTROLTYPE)==2 and !$forceLoad) return; + $radiourl = GetValue(NP_ID_RADIOURL); + $radiotitel = GetValue(NP_ID_RADIONAME); + IPSLogger_Inf(__file__, "Play RadioStation '$radiotitel', Url='$radiourl'"); + NetPlayer_Power(true); + $player = NetPlayer_GetIPSComponentPlayer(); + $player->ClearPlaylist(); + $player->AddPlaylist($radiourl); + $player->Play(); + SetValue(NP_ID_SOURCE, NP_IDX_SOURCERADIO); + + SetValue(NP_ID_CDINTERPRET, ''); + SetValue(NP_ID_CDALBUM, $radiotitel); + + SetValue(NP_ID_CONTROLTYPE, 2); + SetValue(NP_ID_REMOTECONTROL, ''); + } + + function NetPlayer_RefreshRemoteControl() { + SetValue(NP_ID_REMOTECONTROL, GetValue(NP_ID_REMOTECONTROL)); + } + + function NetPlayer_NavigateTrackForward($count=10) { + IPSLogger_Trc(__file__, "Navigate Forward Track, Count=$count"); + NetPlayer_NavigateTrack($count-1); + NetPlayer_RefreshTrackListProfile(); + NetPlayer_RefreshTrackListValue(); + } + + function NetPlayer_NavigateTrackBack($count=10) { + IPSLogger_Trc(__file__, "Navigate Back Track, Count=$count"); + NetPlayer_NavigateTrack($count*-1+1); + NetPlayer_RefreshTrackListProfile(); + NetPlayer_RefreshTrackListValue(); + } + + function NetPlayer_NavigateCDForward($count=10) { + IPSLogger_Trc(__file__, "Navigate Forward CD, Count=$count"); + NetPlayer_NavigateCD($count-1); + NetPlayer_RefreshCategoryProfile(); + NetPlayer_RefreshCDListProfile(); + NetPlayer_RefreshCDListValue(); + NetPlayer_SwitchToMP3Selection(); + NetPlayer_RefreshRemoteControl(); + } + + function NetPlayer_NavigateCDBack($count=10) { + IPSLogger_Trc(__file__, "Navigate Back CD, Count=$count"); + NetPlayer_NavigateCD($count*-1+1); + NetPlayer_RefreshCategoryProfile(); + NetPlayer_RefreshCDListProfile(); + NetPlayer_RefreshCDListValue(); + NetPlayer_SwitchToMP3Selection(); + NetPlayer_RefreshRemoteControl(); + } + + function NetPlayer_SetCategory($category) { + IPSLogger_Trc(__file__, "Set NetPlayer Category '$category'"); + SetValue(NP_ID_CDCATEGORYNAME, $category); + SetValue(NP_ID_CDDIRECTORYIDX, 0); + NetPlayer_RefreshCategoryProfile(); + NetPlayer_RefreshCDListProfile(); + NetPlayer_RefreshCDListValue(); + NetPlayer_SwitchToMP3Selection(); + NetPlayer_NavigateCDBack(); + } + + function NetPlayer_PlayDirectory($directory) { + IPSLogger_Inf(__file__, "Load MusicFiles from Directory '$directory'"); + SetValue(NP_ID_CDDIRECTORYPATH,$directory); + SetValue(NP_ID_CDDIRECTORYNAME, pathinfo($directory, PATHINFO_FILENAME)); + NetPlayer_SwitchToMP3Player(true, true); + NetPlayer_RefreshCDListValue(); + } + + function NetPlayer_NavigateRadioForward($count=NP_COUNT_RADIODEFAULT) { + IPSLogger_Trc(__file__, "Navigate Forward Radio, Count=$count"); + NetPlayer_NavigateRadio($count-1); + NetPlayer_RefreshRadioListProfile(); + NetPlayer_RefreshRadioListValue(); + NetPlayer_SwitchToRadio(); + NetPlayer_RefreshRemoteControl(); + } + + function NetPlayer_NavigateRadioBack($count=NP_COUNT_RADIODEFAULT) { + IPSLogger_Trc(__file__, "Navigate Back Radio, Count=$count"); + NetPlayer_NavigateRadio($count*-1+1); + NetPlayer_RefreshRadioListProfile(); + NetPlayer_RefreshRadioListValue(); + NetPlayer_SwitchToRadio(); + NetPlayer_RefreshRemoteControl(); + } + + function NetPlayer_Pause() { + NetPlayer_Power(true); + SetValue(NP_ID_CONTROL, NP_IDX_CONTROLPAUSE); + NetPlayer_GetIPSComponentPlayer()->Pause(); + } + + function NetPlayer_PlayRadio($radiourl, $radiotitel) { + IPSLogger_Inf(__file__, "Play RadioStation '$radiotitel', Url='$radiourl'"); + SetValue(NP_ID_RADIOURL, $radiourl); + SetValue(NP_ID_RADIONAME, $radiotitel); + SetValue(NP_ID_CDINTERPRET, ''); + SetValue(NP_ID_CDALBUM, $radiotitel); + NetPlayer_Power(true); + NetPlayer_SwitchToRadio(); + NetPlayer_RefreshRadioListValue(); + $player = NetPlayer_GetIPSComponentPlayer(); + $player->ClearPlaylist(); + $player->AddPlaylist($radiourl); + $player->Play(); + } + + function NetPlayer_RadioByIndex($radioIdx=0) { + $radioName = GetValue(NP_ID_RADIONAME); + $radioList = NetPlayer_GetRadioList(); + $radioKeys = array_keys($radioList); + if (!array_key_exists($radioIdx, $radioKeys)) { + IPSLogger_Err(__file__, "Unbekannter Sender in der Radioliste -> $radioIdx"); + } else { + $radioName = $radioKeys[$radioIdx]; + $radioUrl = $radioList[$radioKeys[$radioIdx]]; + NetPlayer_PlayRadio($radioUrl, $radioName); + NetPlayer_RefreshRemoteControl(); + } + } + + function NetPlayer_NextRadio($next=1) { + $radioName = GetValue(NP_ID_RADIONAME); + $radioList = NetPlayer_GetRadioList(); + $radioKeys = array_keys($radioList); // 0=>'OE3',... + $radioFlip = array_flip($radioKeys); // 'OE3'=>0 + print_r($radioFlip); + $radioIdx = $radioFlip[$radioName]+$next; + echo $radioIdx; + if (!array_key_exists($radioIdx, $radioKeys)) { + if ($next>0) { + $radioIdx = 0; + } else { + $radioIdx = count($radioKeys)-1; + } + } + $radioName = $radioKeys[$radioIdx]; + $radioUrl = $radioList[$radioName]; + NetPlayer_PlayRadio($radioUrl, $radioName); + NetPlayer_RefreshRemoteControl(); + } + + function NetPlayer_Next() { + NetPlayer_Power(true); + $plaverState = GetValue(NP_ID_CONTROL); + SetValue(NP_ID_CONTROL, NP_IDX_CONTROLNEXT); + if (GetValue(NP_ID_CONTROLTYPE)==2) { // Radio + NetPlayer_NextRadio(1); + } else { + NetPlayer_GetIPSComponentPlayer()->Next(); + } + IPS_SLEEP(200); + SetValue(NP_ID_CONTROL, $plaverState); + } + + function NetPlayer_Prev() { + NetPlayer_Power(true); + $plaverState = GetValue(NP_ID_CONTROL); + SetValue(NP_ID_CONTROL, NP_IDX_CONTROLPREV); + if (GetValue(NP_ID_CONTROLTYPE)==2) { // Radio + NetPlayer_NextRadio(-1); + } else { + NetPlayer_GetIPSComponentPlayer()->Prev(); + } + IPS_SLEEP(200); + SetValue(NP_ID_CONTROL, $plaverState); + } + + function NetPlayer_SetPlayListPosition($position) { + IPSLogger_Inf(__file__, "Set NetPlayer PlayListPosition=$position"); + NetPlayer_SwitchToMP3Player(); + NetPlayer_GetIPSComponentPlayer()->SetPlaylistPosition((int)$position); + } + + function NetPlayer_SetSource($value) { + if (GetValue(NP_ID_SOURCE)<>$value) { + switch ($value) { + case NP_IDX_SOURCECD: + NetPlayer_SwitchToMP3Player(true, true); + break; + case NP_IDX_SOURCERADIO: + NetPlayer_SwitchToRadio(); + break; + default: + IPSLogger_Err(__file__, "Unknown SourceValue '$value'"); + exit; + } + } + } + + function NetPlayer_Power($value) { + // Set Power State + if ($value != GetValue(NP_ID_POWER)) { + SetValue(NP_ID_POWER, $value); + NetPlayer_RefreshRemoteControl(); + } + $plaverState = GetValue(NP_ID_CONTROL); + + // Set Player Control + if ($value and $plaverState<>NP_IDX_CONTROLPLAY) { + IPSLogger_Trc(__file__, 'Start Netplayer'); + SetValue(NP_ID_CONTROL, NP_IDX_CONTROLPLAY); + $player = NetPlayer_GetIPSComponentPlayer(); + if (!$player->Play()) { + if (GetValue(NP_ID_CONTROLTYPE)==2) { + NetPlayer_SwitchToRadio(true); + } else { + NetPlayer_SwitchToMP3Player(true, true); + } + } + } + if (!$value and $plaverState<>NP_IDX_CONTROLSTOP) { + IPSLogger_Trc(__file__, 'Stop Netplayer'); + SetValue(NP_ID_CONTROL, NP_IDX_CONTROLSTOP); + NetPlayer_GetIPSComponentPlayer()->Stop(); + } + } + + /** @}*/ + +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/NetPlayer2/NetPlayer_ActionScript.ips.php b/IPSLibrary/app/modules/NetPlayer2/NetPlayer_ActionScript.ips.php new file mode 100644 index 0000000..75399c1 --- /dev/null +++ b/IPSLibrary/app/modules/NetPlayer2/NetPlayer_ActionScript.ips.php @@ -0,0 +1,115 @@ + + * + * Action Script, um die Änderung diverser NetPlayer Variablen über das WebFront zu + * ermöglichen. + */ + + include_once "NetPlayer.inc.php"; + + if ($_IPS['SENDER'] == 'WebFront') { + $variable = $_IPS['VARIABLE']; + $value = $_IPS['VALUE']; + switch ($variable) { + case NP_ID_POWER: + NetPlayer_Power($value); + break; + case NP_ID_CONTROL: + if ($value==NP_IDX_CONTROLPLAY) { + NetPlayer_Power(true); + } elseif ($value==NP_IDX_CONTROLPAUSE) { + NetPlayer_Pause(); + } elseif ($value==NP_IDX_CONTROLSTOP) { + NetPlayer_Power(false); + } elseif ($value==NP_IDX_CONTROLPREV) { + NetPlayer_Prev(); + } elseif ($value==NP_IDX_CONTROLNEXT) { + NetPlayer_Next(); + } else { + IPSLogger_Err(__file__, 'Unknown ControlValue '.$value); + } + break; + case NP_ID_SOURCE: + NetPlayer_SetSource($value); + break; + case NP_ID_CATEGORYLIST: + if ($value==NP_IDX_CATEGORYROOT) { + NetPlayer_SetCategory(''); + } else { + NetPlayer_SetCategory('_'.NetPlayer_GetNameFromProfile($value,'NetPlayer_Category')); + } + break; + case NP_ID_CDTRACKNAV: + SetValue($variable, $value); + if ($value==NP_IDX_CDPREV) { + NetPlayer_NavigateTrackBack(NP_COUNT_TRACKVARIABLE); + } else { + NetPlayer_NavigateTrackForward(NP_COUNT_TRACKVARIABLE); + } + IPS_SLEEP(200); + SetValue($variable, -1); + break; + case NP_ID_CDTRACKLIST: + NetPlayer_SetPlayListPosition($value+1); + break; + case NP_ID_CDALBUMNAV: + SetValue($variable, $value); + if ($value==NP_IDX_CDPREV) { + NetPlayer_NavigateCDBack(NP_COUNT_CDVARIABLE); + } else { + NetPlayer_NavigateCDForward(NP_COUNT_CDVARIABLE); + } + IPS_SLEEP(200); + SetValue($variable, -1); + break; + case NP_ID_CDALBUMLIST: + $directory = NetPlayer_GetNameFromProfile($value,'NetPlayer_CDAlbumList'); + $basePath = NETPLAYER_DIRECTORY; + $categoryPath = GetValue(NP_ID_CDCATEGORYNAME); + if ($categoryPath<>"") $basePath = $basePath."\\".$categoryPath; + $directory = $basePath . "\\" . $directory; + NetPlayer_PlayDirectory($directory); + break; + case NP_ID_RADIONAV: + SetValue($variable, $value); + if ($value==NP_IDX_RADIOPREV) { + NetPlayer_NavigateRadioBack(NP_COUNT_RADIOVARIABLE); + } else { + NetPlayer_NavigateRadioForward(NP_COUNT_RADIOVARIABLE); + } + IPS_SLEEP(200); + SetValue($variable, -1); + break; + case NP_ID_RADIOLIST: + $radioName = NetPlayer_GetNameFromProfile($value,'NetPlayer_RadioList'); + $radioList = NetPlayer_GetRadioList(); + $radioUrl = $radioList[$radioName]; + NetPlayer_PlayRadio($radioUrl, $radioName); + break; + default: + IPSLogger_Err(__file__, 'Unknown ControlID '.$variable); + } + + } elseif ($_IPS['SENDER'] == 'Execute') { + } + + function NetPlayer_GetNameFromProfile($value, $name) { + $profileData = IPS_GetVariableProfile($name); + $associations = $profileData['Associations']; + foreach ($associations as $idx=>$association) { + if ($association['Value']==$value) { + $name = $association['Name']; + } + } + return $name; + } + + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/NetPlayer2/NetPlayer_Constants.inc.php b/IPSLibrary/app/modules/NetPlayer2/NetPlayer_Constants.inc.php new file mode 100644 index 0000000..5ef7263 --- /dev/null +++ b/IPSLibrary/app/modules/NetPlayer2/NetPlayer_Constants.inc.php @@ -0,0 +1,34 @@ + + * + * NetPlayer Konstanten + * + */ + + include "NetPlayer_IDs.inc.php"; + + // NetPlayer Value Constants + define ("NP_IDX_CONTROLPLAY", 0); + define ("NP_IDX_CONTROLPAUSE", 1); + define ("NP_IDX_CONTROLSTOP", 2); + define ("NP_IDX_CONTROLPREV", 3); + define ("NP_IDX_CONTROLNEXT", 4); + + define ("NP_IDX_RADIOPREV", 0); + define ("NP_IDX_RADIONEXT", 1); + + define ("NP_IDX_CDPREV", 0); + define ("NP_IDX_CDNEXT", 1); + + define ("NP_IDX_CATEGORYROOT", 0); + define ("NP_IDX_CATEGORYBACK", 1); + + define ("NP_IDX_SOURCECD", 0); + define ("NP_IDX_SOURCERADIO", 1); + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/NetPlayer2/NetPlayer_EventScript.ips.php b/IPSLibrary/app/modules/NetPlayer2/NetPlayer_EventScript.ips.php new file mode 100644 index 0000000..0e3bbef --- /dev/null +++ b/IPSLibrary/app/modules/NetPlayer2/NetPlayer_EventScript.ips.php @@ -0,0 +1,24 @@ + + * + * Event Script, wird bei Änderung der aktuellen Titeldatei des MediaPlayers ausgelöst. + */ + + include_once "NetPlayer.inc.php"; + + + if ($_IPS['SENDER'] == 'Variable') { + $value = $_IPS['VALUE']; + + NetPlayer_RefreshTrackListValue(); + } + + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/NetPlayer2/NetPlayer_ListFiles.inc.php b/IPSLibrary/app/modules/NetPlayer2/NetPlayer_ListFiles.inc.php new file mode 100644 index 0000000..3d43697 --- /dev/null +++ b/IPSLibrary/app/modules/NetPlayer2/NetPlayer_ListFiles.inc.php @@ -0,0 +1,92 @@ + + * + * Anzeige von Verzeichnissen mit MP3 Files + */ + + // --------------------------------------------------------------------------------------------------------------------------- + function NetPlayer_GetCategoryList () { + $basePath = NETPLAYER_DIRECTORY; + $categoryList = array(); + $directoryList = scandir($basePath); + $directoryList = array_diff($directoryList, Array(".","..")); + $idx = 1; + foreach($directoryList as $directory) { + $fullDirName = $basePath . "\\" . $directory; + if (is_dir($fullDirName) and strpos($directory, '_')===0) { + $categoryList[] = $directory; + } + } + return $categoryList; + } + + // --------------------------------------------------------------------------------------------------------------------------- + function NetPlayer_GetDirectoryList () { + $basePath = NETPLAYER_DIRECTORY; + $categoryPath = GetValue(NP_ID_CDCATEGORYNAME); + if ($categoryPath<>"") $basePath = $basePath."\\".$categoryPath; + + $resultList = array(); + $directoryList = scandir($basePath); + $directoryList = array_diff($directoryList, Array(".","..")); + + foreach($directoryList as $directory) { + $fullDirName = $basePath . "\\" . $directory; + if (strpos($directory, '_')===0) { + continue; + } elseif (is_dir($fullDirName)) { + $resultList[] = $directory; + } else { + //ignore + } + } + return $resultList; + } + + // --------------------------------------------------------------------------------------------------------------------------- + function NetPlayer_FilterDirectoryList ($directoryList, $count) { + $resultList = array(); + $maxIdx = count($directoryList); + $currentIdx = GetValue(NP_ID_CDDIRECTORYIDX); + if ($currentIdx > $maxIdx - $count) $currentIdx = $maxIdx - $count; + if ($currentIdx < 0) $currentIdx = 0; + for ($idx=0 ; $idx<$count; $idx++) { + if (array_key_exists($currentIdx + $idx, $directoryList)) + $resultList[] = $directoryList[$currentIdx + $idx]; + } + return $resultList; + } + + // --------------------------------------------------------------------------------------------------------------------------- + function NetPlayer_GetCDList ($count, &$fullDirNameList, &$interpretList, &$albumList) { + $directoryList = NetPlayer_GetDirectoryList(); + $directoryList = NetPlayer_FilterDirectoryList($directoryList, $count); + $basePath = NETPLAYER_DIRECTORY; + $categoryPath = GetValue(NP_ID_CDCATEGORYNAME); + if ($categoryPath<>"") $basePath = $basePath."\\".$categoryPath; + foreach ($directoryList as $idx=>$directory) { + $fullDirNameList[] = $basePath."\\".$directory; + $interpretList[] = substr($directory, 0, strpos($directory, "[")); + $albumList[] = substr($directory, strpos($directory, "[")); + } + } + + // --------------------------------------------------------------------------------------------------------------------------- + function NetPlayer_NavigateCD ($delta) { + $directoryList = NetPlayer_GetDirectoryList(); + $maxIdx = count($directoryList); + $currentIdx = GetValue(NP_ID_CDDIRECTORYIDX); + if ($currentIdx > $maxIdx - $delta) $currentIdx = $maxIdx - $delta; + $currentIdx = $currentIdx + $delta; + if ($currentIdx < 0) $currentIdx = 0; + SetValue(NP_ID_CDDIRECTORYIDX, $currentIdx); + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/NetPlayer2/NetPlayer_LoadFiles.inc.php b/IPSLibrary/app/modules/NetPlayer2/NetPlayer_LoadFiles.inc.php new file mode 100644 index 0000000..2d7b6bf --- /dev/null +++ b/IPSLibrary/app/modules/NetPlayer2/NetPlayer_LoadFiles.inc.php @@ -0,0 +1,94 @@ + + * + * Laden eines Verzeichnisses in den Player + */ + + // --------------------------------------------------------------------------------------------------------------------------- + function NetPlayer_CopyCoverFile ($path) { + $files = scandir($path); + foreach ($files as $file) { + $extension = pathinfo($file, PATHINFO_EXTENSION); + $filename = pathinfo($file, PATHINFO_FILENAME); + $cover_jpg = ""; + $cover_front = ""; + if (strtolower($extension)=='jpg') { + $cover_jpg = $path."\\".$file; + if (strpos(strtolower($filename),'front')!==false) { + $cover_front = $path."\\".$file; + } + } + } + + $FileOutput = IPS_GetKernelDir()."\\webfront\\user\\NetPlayer\\NetPlayer_Cover.jpg"; + if ($cover_front != "") { + $FileInput = $cover_front; + } else if ($cover_jpg != "") { + $FileInput = $cover_jpg; + } else { + $FileInput = IPS_GetKernelDir()."\\webfront\\user\\NetPlayer\\NetPlayer_CoverNotFound.jpg"; + } + IPSLogger_Dbg(__file__, "Copy Cover File '$FileInput' to '$FileOutput'"); + copy ($FileInput, $FileOutput); + + } + + + // --------------------------------------------------------------------------------------------------------------------------- + function NetPlayer_GetPlayList($path, &$playlist) { + $content = scandir($path); + $maindata = array_diff($content, Array(".","..")); + $allowed = Array("mp3", "wma"); + + foreach($maindata as $d) { + $actpath = $path . "\\" . $d; + if (is_dir($actpath)) { + } else { + $ext = pathinfo($actpath, PATHINFO_EXTENSION); + if (in_array(strtolower($ext), $allowed)) { + $playlist[] = $actpath; + } + } + } + } + + // --------------------------------------------------------------------------------------------------------------------------- + function NetPlayer_LoadFiles ($cd_path) { + //Get Directory to Load + SetValue(NP_ID_CDDIRECTORYPATH, $cd_path); + + // Get PlayList + $playlist = array(); + NetPlayer_GetPlayList ($cd_path, $playlist); + NetPlayer_CopyCoverFile ($cd_path); + + // Leeren der vorher bestehenden Playlist: + $player = NetPlayer_GetIPSComponentPlayer(); + $player->ClearPlaylist(); + $tracklist = ""; + + // Durchlaufen des Playlist-Arrays und anhängen an die Mediaplayer-Instanz-Playlist + $idx = 1; + foreach($playlist as $data) + { + IPSLogger_Dbg(__file__, "Add File=".$data); + $player->AddPlaylist($data); + $tracklist.='
'.convert(basename($data))."
"; + $idx++; + } + SetValue(NP_ID_CDTRACKLISTHTML, $tracklist); + $player->Play(); + + $Directory = basename($cd_path); + SetValue(NP_ID_CDINTERPRET, substr($Directory,0,strpos($Directory, "["))); + SetValue(NP_ID_CDALBUM, substr($Directory,strpos($Directory, "[")+1, strpos($Directory, "]")-strpos($Directory, "[")-1)); + } + + /** @}*/ + ?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/NetPlayer2/NetPlayer_Utils.inc.php b/IPSLibrary/app/modules/NetPlayer2/NetPlayer_Utils.inc.php new file mode 100644 index 0000000..108d555 --- /dev/null +++ b/IPSLibrary/app/modules/NetPlayer2/NetPlayer_Utils.inc.php @@ -0,0 +1,252 @@ + + * + * NetPlayer Utility Funktionen + */ + + // --------------------------------------------------------------------------------------------------------------------------- + function convert($s) { + $source = array("&", "ä", "ö", "ü", "Ä", "Ö", "Ü", "ß", "<", ">", "€", "", "¹", "²", "³"); + $dest = array("&", "ä", "ö", "ü", "Ä", "Ö", "Ü", "ß", "<", ">", "€", "¹", "²", "³"); + $s = str_replace($source, $dest, $s); + return $s; + } + + // --------------------------------------------------------------------------------------------------------------------------- + function decode($s) { + $dest = array("&", "ä", "ö", "ü", "Ä", "Ö", "Ü", "ß", "<", ">", "€", "", "¹", "²", "³"); + $source = array("&", "ä", "ö", "ü", "Ä", "Ö", "Ü", "ß", "<", ">", "€", "¹", "²", "³"); + $s = str_replace($source, $dest, $s); + return $s; + } + + // --------------------------------------------------------------------------------------------------------------------------- + function NetPlayer_NavigateRadio ($delta) { + $maxIdx = count(NetPlayer_GetRadioList()); + $currentIdx = GetValue(NP_ID_RADIOIDX); + if ($currentIdx > $maxIdx - $delta) $currentIdx = $maxIdx - $delta; + $currentIdx = $currentIdx + $delta; + if ($currentIdx < 0) $currentIdx = 0; + SetValue(NP_ID_RADIOIDX, $currentIdx); + } + + // --------------------------------------------------------------------------------------------------------------------------- + function NetPlayer_FilterRadioList ($radioList, $count) { + $resultList = array(); + $maxIdx = count($radioList); + $currentIdx = GetValue(NP_ID_RADIOIDX); + if ($currentIdx > $maxIdx - $count) $currentIdx = $maxIdx - $count; + if ($currentIdx < 0) $currentIdx = 0; + for ($idx=0 ; $idx<$count; $idx++) { + if (array_key_exists($currentIdx + $idx, $radioList)) + $resultList[] = $radioList[$currentIdx + $idx]; + } + $idx = 0; + $radioIdx = 0; + foreach ($radioList as $radioName=>$radioUrl) { + if ($idx>=$currentIdx and $idx<=$currentIdx+$count) { + $resultList[$radioIdx] = $radioName; + $radioIdx++; + } + $idx++; + } + + return $resultList; + } + + // --------------------------------------------------------------------------------------------------------------------------- + function NetPlayer_RefreshCategoryProfile() { + $categoryList = NetPlayer_GetCategoryList(); + $categoryCurr = GetValue(NP_ID_CDCATEGORYNAME); + $categoryCurrIdx = 0; /*Root*/ + $profileData = IPS_GetVariableProfile('NetPlayer_Category'); + $associations = $profileData['Associations']; + foreach ($categoryList as $idx=>$category) { + $profileIdx = $idx + 2; + if ($categoryCurr==$category) $categoryCurrIdx = $profileIdx; + $category = substr($category, 1); + if ((array_key_exists($profileIdx, $associations) and $associations[$profileIdx]<>$category) or + !array_key_exists($profileIdx, $associations)) { + IPS_SetVariableProfileAssociation('NetPlayer_Category', $profileIdx, $category, '', -1); + } + } + foreach ($associations as $idx=>$name) { + $categoryIdx = $idx - 2; + if ($categoryIdx >= 0 and !array_key_exists($categoryIdx, $categoryList)) { + IPS_SetVariableProfileAssociation('NetPlayer_Category', $idx, '', '', -1); + } + } + if (GetValue(NP_ID_CATEGORYLIST) <> $categoryCurrIdx) { + SetValue(NP_ID_CATEGORYLIST, $categoryCurrIdx); + } + } + + // --------------------------------------------------------------------------------------------------------------------------- + function NetPlayer_RefreshRadioListProfile() { + $currentName = GetValue(NP_ID_RADIONAME); + $currentIdx = GetValue(NP_ID_RADIOIDX); + $radioList = NetPlayer_FilterRadioList(NetPlayer_GetRadioList(), NP_COUNT_RADIOVARIABLE); + $profileData = IPS_GetVariableProfile('NetPlayer_RadioList'); + $associations = $profileData['Associations']; + foreach ($associations as $idx=>$data) { + IPS_SetVariableProfileAssociation('NetPlayer_RadioList', $idx, '', '', -1); + } + foreach ($radioList as $idx=>$radio) { + IPS_SetVariableProfileAssociation('NetPlayer_RadioList', $idx, $radio, '', -1); + } + } + + // --------------------------------------------------------------------------------------------------------------------------- + function NetPlayer_RefreshRadioListValue() { + $currentIdx = -1; + $currentName = GetValue(NP_ID_RADIONAME); + $profileData = IPS_GetVariableProfile('NetPlayer_RadioList'); + $associations = $profileData['Associations']; + foreach ($associations as $idx=>$data) { + if ($currentName == $data['Name']) { + $currentIdx = $idx; + } + } + if (GetValue(NP_ID_RADIOLIST)<>$currentIdx ) { + SetValue(NP_ID_RADIOLIST,$currentIdx); + } + } + + + // --------------------------------------------------------------------------------------------------------------------------- + function NetPlayer_RefreshCDListProfile() { + $currentIdx = GetValue(NP_ID_CDDIRECTORYIDX); + $directoryList = NetPlayer_GetDirectoryList(); + $directoryList = NetPlayer_FilterDirectoryList($directoryList, NP_COUNT_CDVARIABLE); + $profileData = IPS_GetVariableProfile('NetPlayer_CDAlbumList'); + $associations = $profileData['Associations']; + foreach ($associations as $idx=>$data) { + IPS_SetVariableProfileAssociation('NetPlayer_CDAlbumList', $idx, '', '', -1); + } + foreach ($directoryList as $idx=>$directory) { + IPS_SetVariableProfileAssociation('NetPlayer_CDAlbumList', $idx, $directory, '', -1); + } + } + + // --------------------------------------------------------------------------------------------------------------------------- + function NetPlayer_RefreshCDListValue() { + $currentIdx = -1; + $currentName = GetValue(NP_ID_CDDIRECTORYNAME); + $profileData = IPS_GetVariableProfile('NetPlayer_CDAlbumList'); + $associations = $profileData['Associations']; + foreach ($associations as $idx=>$data) { + if ($currentName == $data['Name']) { + $currentIdx = $idx; + } + } + if (GetValue(NP_ID_CDALBUMLIST)<>$currentIdx ) { + SetValue(NP_ID_CDALBUMLIST,$currentIdx); + } + } + + // --------------------------------------------------------------------------------------------------------------------------- + function NetPlayer_GetTrackName($file) { + $trackName = pathinfo($file, PATHINFO_FILENAME); + $trackName = str_replace('.mp3', '', $trackName); + $trackName = str_replace('.wma', '', $trackName); + if (substr($trackName,3,1)=='-' and substr($trackName,4,1)==' ') { + $trackName = substr($trackName,5); + } + + return $trackName; + } + + // --------------------------------------------------------------------------------------------------------------------------- + function NetPlayer_GetTrackList() { + $directory = GetValue(NP_ID_CDDIRECTORYPATH); + $fileList = array(); + NetPlayer_GetPlayList($directory, $fileList); + $trackList = array(); + foreach ($fileList as $idx=>$file) { + $trackList[] = NetPlayer_GetTrackName($file); + } + + return $trackList; + } + + // --------------------------------------------------------------------------------------------------------------------------- + function NetPlayer_FilterTrackList ($trackList, $count) { + $maxIdx = count($trackList); + $currentIdx = GetValue(NP_ID_CDTRACKIDX); + if ($currentIdx > $maxIdx - $count) $currentIdx = $maxIdx - $count; + if ($currentIdx < 0) $currentIdx = 0; + +// for ($idx=0 ; $idx<$count; $idx++) { +// if (array_key_exists($currentIdx + $idx, $trackList)) +// $trackList[] = $trackList[$currentIdx + $idx]; +// } + + $resultList = array(); + $idx = 0; + foreach ($trackList as $trackIdx=>$trackName) { + if ($idx>=$currentIdx and $idx<=$currentIdx+$count) { + $resultList[$trackIdx] = $trackName; + } + $idx++; + } + + return $resultList; + } + + // --------------------------------------------------------------------------------------------------------------------------- + function NetPlayer_NavigateTrack($delta) { + $maxIdx = count(NetPlayer_GetTrackList()); + $currentIdx = GetValue(NP_ID_CDTRACKIDX); + if ($currentIdx > $maxIdx - $delta) $currentIdx = $maxIdx - $delta; + $currentIdx = $currentIdx + $delta; + if ($currentIdx < 0) $currentIdx = 0; + SetValue(NP_ID_CDTRACKIDX, $currentIdx); + } + + // --------------------------------------------------------------------------------------------------------------------------- + function NetPlayer_RefreshTrackListProfile() { + $currentIdx = GetValue(NP_ID_CDTRACKIDX); + $trackList = NetPlayer_FilterTrackList(NetPlayer_GetTrackList(), NP_COUNT_TRACKVARIABLE); + $profileData = IPS_GetVariableProfile('NetPlayer_CDTrackList'); + $associations = $profileData['Associations']; + foreach ($associations as $idx=>$data) { + IPS_SetVariableProfileAssociation('NetPlayer_CDTrackList', $data['Value'], '', '', -1); + } + foreach ($trackList as $idx=>$track) { + IPS_SetVariableProfileAssociation('NetPlayer_CDTrackList', $idx, $track, '', -1); + } + } + + // --------------------------------------------------------------------------------------------------------------------------- + function NetPlayer_RefreshTrackListValue() { + $currentIdx = -1; + if (GetValue(NP_ID_SOURCE)==NP_IDX_SOURCECD) { + $player = NetPlayer_GetIPSComponentPlayer(); + $currentName = $player->GetTrackName(); + $currentName = NetPlayer_GetTrackName($currentName); + $currentName = str_replace(GetValue(NP_ID_CDINTERPRET).' - ', '', $currentName); + + $profileData = IPS_GetVariableProfile('NetPlayer_CDTrackList'); + $associations = $profileData['Associations']; + foreach ($associations as $idx=>$data) { + IPSLogger_Trc(__file__, "Idx=$idx, '$currentName' --> '".$data['Name']."'"); + if ($currentName == $data['Name']) { + $currentIdx = $data['Value']; + } + } + } + + if (GetValue(NP_ID_CDTRACKLIST)<>$currentIdx ) { + SetValue(NP_ID_CDTRACKLIST, $currentIdx); + } + } + + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/Weather/IPSTwilight/IPSTwilight.ips.php b/IPSLibrary/app/modules/Weather/IPSTwilight/IPSTwilight.ips.php index f2d0bfa..896547e 100644 --- a/IPSLibrary/app/modules/Weather/IPSTwilight/IPSTwilight.ips.php +++ b/IPSLibrary/app/modules/Weather/IPSTwilight/IPSTwilight.ips.php @@ -65,7 +65,7 @@ switch ($_IPS['SENDER']) { case 'WebFront': SetValue($_IPS['VARIABLE'], $_IPS['VALUE']); - if ($IPS_VARIABLE==$variableId_Display) { + if ($_IPS['VARIABLE']==$variableId_Display) { CopyGraphics($variableId_Display); } else { IPS_RunScript ($_IPS['SELF']); @@ -82,6 +82,7 @@ break; case 'Execute': case 'RunScript': + case 'WebInterface': CalculateCurrentValues($categoryId_Values, $scriptId_Refresh); GenerateGraphics($variableId_Display); break; @@ -112,8 +113,8 @@ function CopyGraphics($variableId_Display) { function GenerateGraphics($variableId_Display) { GenerateTwilightGraphic('IPSTwilight_YearUnlimited', false, 4.4, 1.8); GenerateTwilightGraphic('IPSTwilight_YearLimited', true, 4.4, 1.8); - GenerateClockGraphic('IPSTwilight_DayUnlimited', false); - GenerateClockGraphic('IPSTwilight_DayLimited', true); + GenerateClockGraphic('IPSTwilight_DayUnlimited', false); + GenerateClockGraphic('IPSTwilight_DayLimited', true); CopyGraphics($variableId_Display); } @@ -131,8 +132,8 @@ function CreateTimer($date, $function, $scriptId_Refresh) { // ---------------------------------------------------------------------------------------------------------------------------- function SetLimitedValues($NameLimits, $NameBegin, $NameEnd, $TimeStart, $TimeEnd, $categoryId_Values, $scriptId_Refresh) { - CreateTimer($TimeStart, 'IPSTwilight_'.$NameBegin, $scriptId_Refresh); - CreateTimer($TimeEnd, 'IPSTwilight_'.$NameEnd, $scriptId_Refresh); + CreateTimer($TimeStart, 'IPSTwilight_'.str_replace('Limited', '', $NameBegin), $scriptId_Refresh); + CreateTimer($TimeEnd, 'IPSTwilight_'.str_replace('Limited', '', $NameEnd), $scriptId_Refresh); $Limits = GetValue(IPS_GetVariableIDByName($NameLimits, $categoryId_Values)); // 01234567890123456789012 @@ -149,8 +150,8 @@ function SetLimitedValues($NameLimits, $NameBegin, $NameEnd, $TimeStart, $TimeEn SetValue(IPS_GetVariableIDByName($NameBegin, $categoryId_Values), date("H:i",$TimeStart)); SetValue(IPS_GetVariableIDByName($NameEnd, $categoryId_Values), date("H:i",$TimeEnd)); - CreateTimer($TimeStart, 'IPSTwilight_'.str_replace('Limited', '', $NameBegin), $scriptId_Refresh); - CreateTimer($TimeEnd, 'IPSTwilight_'.str_replace('Limited', '', $NameEnd), $scriptId_Refresh); + CreateTimer($TimeStart, 'IPSTwilight_'.$NameBegin, $scriptId_Refresh); + CreateTimer($TimeEnd, 'IPSTwilight_'.$NameEnd, $scriptId_Refresh); } // ---------------------------------------------------------------------------------------------------------------------------- diff --git a/IPSLibrary/app/modules/Weather/IPSWeatherForcastAT/IPSWeatherForcastAT_Refresh.ips.php b/IPSLibrary/app/modules/Weather/IPSWeatherForcastAT/IPSWeatherForcastAT_Refresh.ips.php index 191991b..3928c53 100644 --- a/IPSLibrary/app/modules/Weather/IPSWeatherForcastAT/IPSWeatherForcastAT_Refresh.ips.php +++ b/IPSLibrary/app/modules/Weather/IPSWeatherForcastAT/IPSWeatherForcastAT_Refresh.ips.php @@ -30,7 +30,6 @@ * */ - IPSUtils_Include ("IPSWeatherForcastAT_Constants.inc.php", "IPSLibrary::app::modules::Weather::IPSWeatherForcastAT"); IPSUtils_Include ("IPSWeatherForcastAT_Configuration.inc.php", "IPSLibrary::config::modules::Weather::IPSWeatherForcastAT"); IPSUtils_Include ("IPSWeatherForcastAT_Utils.inc.php", "IPSLibrary::app::modules::Weather::IPSWeatherForcastAT"); @@ -38,98 +37,22 @@ if (Sys_Ping(IPSWEATHERFAT_EXTERNAL_IP, 100)) { IPSLogger_Trc(__file__, "Refresh Weather Data"); - - $stationGoogle = IPSWEATHERFAT_GOOGLE_PLACE."-".IPSWEATHERFAT_GOOGLE_COUNTRY; - $urlGoogle = "http://www.google.com/ig/api?weather=".$stationGoogle."&hl=".IPSWEATHERFAT_GOOGLE_LANG; - $DaySourceArray = array('Mo.','Di.','Mi.','Do.','Fr.','Sa.','So.'); - $DayDisplayArray = array('Montag','Dienstag','Mittwoch','Donnerstag','Freitag','Samstag','Sonntag'); - - $api = simplexml_load_string(utf8_encode(@Sys_GetURLContent($urlGoogle))); - echo $urlGoogle; - - IPSWeatherFAT_SetValue('LastRefreshDateTime', date("Y-m-j H:i:s")); - IPSWeatherFAT_SetValue('LastRefreshTime', date("H:i")); - - // Aktuelles Wetter - IPSWeatherFAT_SetValue('TodayForecastShort', (string)$api->weather->current_conditions->condition->attributes()->data); - IPSWeatherFAT_SetValue('TodayTempCurrent', (string)$api->weather->current_conditions->temp_c->attributes()->data); - IPSWeatherFAT_SetValue('AirHumidity', str_replace("Feuchtigkeit", "rel.Luftfeuchte", $api->weather->current_conditions->humidity->attributes()->data)); - IPSWeatherFAT_SetValue('Wind', (string)$api->weather->current_conditions->wind_condition->attributes()->data); - IPSWeatherFAT_SetValue('TodayIcon', str_replace(".gif", ".png", str_replace(IPSWEATHERFAT_ICONS_GOOGLE1, IPSWEATHERFAT_ICONS_LARGE, $api->weather->current_conditions->icon->attributes()->data))); - // Wettervorhersage heute, morgen, in zwei und in drei Tagen ($wetter[1] bis $wetter[4]) - $i = 1; - foreach($api->weather->forecast_conditions as $weather) - { - if ($i==1) { - IPSWeatherFAT_SetValue('TodayDay', str_replace($DaySourceArray, $DayDisplayArray, $weather->day_of_week->attributes()->data)); - IPSWeatherFAT_SetValue('TodayForecastShort', (string)$weather->condition->attributes()->data); - IPSWeatherFAT_SetValue('TodayTempMin', (string)$weather->low->attributes()->data); - IPSWeatherFAT_SetValue('TodayTempMax', (string)$weather->high->attributes()->data); - IPSWeatherFAT_SetValue('TodayIcon', str_replace(".gif", ".png", str_replace(IPSWEATHERFAT_ICONS_GOOGLE1, IPSWEATHERFAT_ICONS_LARGE, $weather->icon->attributes()->data))); - } else if ($i==2) { - IPSWeatherFAT_SetValue('TomorrowDay', str_replace($DaySourceArray, $DayDisplayArray, $weather->day_of_week->attributes()->data)); - IPSWeatherFAT_SetValue('TomorrowForecastShort', (string)$weather->condition->attributes()->data); - IPSWeatherFAT_SetValue('TomorrowTempMin', (string)$weather->low->attributes()->data); - IPSWeatherFAT_SetValue('TomorrowTempMax', (string)$weather->high->attributes()->data); - IPSWeatherFAT_SetValue('TomorrowIcon', str_replace(".gif", ".png", str_replace(IPSWEATHERFAT_ICONS_GOOGLE1, IPSWEATHERFAT_ICONS_SMALL, $weather->icon->attributes()->data))); - } else if ($i==3) { - IPSWeatherFAT_SetValue('Tomorrow1Day', str_replace($DaySourceArray, $DayDisplayArray, $weather->day_of_week->attributes()->data)); - IPSWeatherFAT_SetValue('Tomorrow1ForecastShort', (string)$weather->condition->attributes()->data); - IPSWeatherFAT_SetValue('Tomorrow1TempMin', (string)$weather->low->attributes()->data); - IPSWeatherFAT_SetValue('Tomorrow1TempMax', (string)$weather->high->attributes()->data); - IPSWeatherFAT_SetValue('Tomorrow1Icon', str_replace(".gif", ".png", str_replace(IPSWEATHERFAT_ICONS_GOOGLE1, IPSWEATHERFAT_ICONS_SMALL, $weather->icon->attributes()->data))); - } else if ($i==4) { - IPSWeatherFAT_SetValue('Tomorrow2Day', str_replace($DaySourceArray, $DayDisplayArray, $weather->day_of_week->attributes()->data)); - IPSWeatherFAT_SetValue('Tomorrow2ForecastShort', (string)$weather->condition->attributes()->data); - IPSWeatherFAT_SetValue('Tomorrow2TempMin', (string)$weather->low->attributes()->data); - IPSWeatherFAT_SetValue('Tomorrow2TempMax', (string)$weather->high->attributes()->data); - IPSWeatherFAT_SetValue('Tomorrow2Icon', str_replace(".gif", ".png", str_replace(IPSWEATHERFAT_ICONS_GOOGLE1, IPSWEATHERFAT_ICONS_SMALL, $weather->icon->attributes()->data))); - } else { - IPSLogger_Err(__file__, "Receive unknown Weather Forecast Condition"); - } - $i++; + $refreshWunderground = false; + if (IPSWEATHERFAT_WUNDERGROUND_KEY<>'') { + IPSUtils_Include ("IPSWeatherForcastAT_RefreshWunderground.inc.php", "IPSLibrary::app::modules::Weather::IPSWeatherForcastAT"); + $refreshWunderground = IPSWeatherFAT_RefreshWunderground(); } - // Wetter für Niederösterreich von ORF auslesen - $lHTML=file_get_contents(IPSWEATHERFAT_ORF_URL); - - $forcast = ExtractData($lHTML, '
', '
', true, false); - $forcastToday = '

'.ExtractData($forcast, '

', '

').''.ExtractData($forcast, '

', '

', false, false); - - $forcast = ExtractData($forcast, '

', '
', true, false); - $forcastTomorrow = '

'.ExtractData($forcast, '

', '

').''.ExtractData($forcast, '

', '

', false, false); - - $forcast = ExtractData($forcast, '

', '
', true, false); - $forcastTomorrow1 = '

'.ExtractData($forcast, '

', '

').''.ExtractData($forcast, '

', '

', false, false); - - $forcast = ExtractData($forcast, '

', '
', true, false); - $forcastTomorrow2 = '

'.ExtractData($forcast, '

', '

').''.ExtractData($forcast, '

', '

', false, false); - - IPSWeatherFAT_SetValue('TodayForecastLong', $forcastToday); - IPSWeatherFAT_SetValue('TomorrowForecastLong', $forcastTomorrow); - IPSWeatherFAT_SetValue('Tomorrow1ForecastLong', $forcastTomorrow1); - IPSWeatherFAT_SetValue('Tomorrow2ForecastLong', $forcastTomorrow2); - - } else { - IPSLogger_Trc(__file__, "No Connection - Refresh of Weather Data NOT possible"); - - } - + if (IPSWEATHERFAT_YAHOO_WOEID<>'' and !$refreshWunderground) { + IPSUtils_Include ("IPSWeatherForcastAT_RefreshYahoo.inc.php", "IPSLibrary::app::modules::Weather::IPSWeatherForcastAT"); + IPSWeatherFAT_RefreshYahoo(); + } - function ExtractData($data, $key1, $key2, $removeKey1=true, $removeKey2=true) { - $strPos1 = strpos($data, $key1); - $strPos2 = strpos($data, $key2); - if ($removeKey1 and $removeKey2) { - $result =substr($data, $strPos1+strlen($key1), $strPos2-$strPos1-strlen($key1)); - } elseif ($removeKey1) { - $result =substr($data, $strPos1+strlen($key1), $strPos2-$strPos1-strlen($key1)+strlen($key2)); - } elseif ($removeKey2) { - $result =substr($data, $strPos1, $strPos2-$strPos1-strlen($key2)); - } else { - $result =substr($data, $strPos1, $strPos2-$strPos1+strlen($key2)); - } - return $result; + if (IPSWEATHERFAT_ORF_URL<>'') { + IPSUtils_Include ("IPSWeatherForcastAT_RefreshORF.inc.php", "IPSLibrary::app::modules::Weather::IPSWeatherForcastAT"); + IPSWeatherFAT_RefreshORF(); + } } /** @}*/ diff --git a/IPSLibrary/app/modules/Weather/IPSWeatherForcastAT/IPSWeatherForcastAT_RefreshGoogle.inc.php b/IPSLibrary/app/modules/Weather/IPSWeatherForcastAT/IPSWeatherForcastAT_RefreshGoogle.inc.php new file mode 100644 index 0000000..22eadcd --- /dev/null +++ b/IPSLibrary/app/modules/Weather/IPSWeatherForcastAT/IPSWeatherForcastAT_RefreshGoogle.inc.php @@ -0,0 +1,96 @@ + + * + */ + + function IPSWeatherFAT_RefreshGoogle() { + IPSLogger_Trc(__file__, "Refresh Weather Data Google"); + + $stationGoogle = IPSWEATHERFAT_GOOGLE_PLACE."-".IPSWEATHERFAT_GOOGLE_COUNTRY; + $urlGoogle = "http://www.google.com/ig/api?weather=".$stationGoogle."&hl=".IPSWEATHERFAT_GOOGLE_LANG; + $DaySourceArray = array('Mo.','Di.','Mi.','Do.','Fr.','Sa.','So.'); + $DayDisplayArray = array('Montag','Dienstag','Mittwoch','Donnerstag','Freitag','Samstag','Sonntag'); + + echo $urlGoogle.PHP_EOL; + $urlContent = @Sys_GetURLContent($urlGoogle); + if ($urlContent===false) { + echo 'Google Weather API is empty ...'.PHP_EOL; + return; + } + $api = @simplexml_load_string(utf8_encode($urlContent)); + if ($api===false) { + echo 'Error processing Google Weather API ...'.PHP_EOL; + return; + } + + IPSWeatherFAT_SetValue('LastRefreshDateTime', date("Y-m-j H:i:s")); + IPSWeatherFAT_SetValue('LastRefreshTime', date("H:i")); + + IPSWeatherFAT_SetValueXML('TodayForecastShort', $api->xpath('//weather/current_conditions/condition/@data')); + IPSWeatherFAT_SetValueXML('TodayTempCurrent', $api->xpath('//weather/current_conditions/temp_c/@data')); + IPSWeatherFAT_SetValueXML('AirHumidity', $api->xpath('//weather/current_conditions/humidity/@data'), array("Feuchtigkeit", "rel.Luftfeuchte")); + IPSWeatherFAT_SetValueXML('Wind', $api->xpath('//weather/current_conditions/wind_condition/@data')); + IPSWeatherFAT_SetValueXML('TodayIcon', $api->xpath('//weather/current_conditions/icon/@data'), array(".gif", ".png", IPSWEATHERFAT_ICONS_GOOGLE1, IPSWEATHERFAT_ICONS_LARGE)); + + // Wettervorhersage heute, morgen, in zwei und in drei Tagen ($wetter[1] bis $wetter[4]) + $names = array('TodayDay', 'TomorrowDay', 'Tomorrow1Day', 'Tomorrow2Day'); + foreach($api->xpath('//weather/forecast_conditions/day_of_week/@data') as $idx=>$weather) { + //print_r($weather); + IPSWeatherFAT_SetValueXML($names[$idx],$weather, array($DaySourceArray, $DayDisplayArray)); + } + $names = array('TodayForecastShort', 'TomorrowForecastShort', 'Tomorrow1ForecastShort', 'Tomorrow2ForecastShort'); + foreach($api->xpath('//weather/forecast_conditions/condition/@data') as $idx=>$weather) { + //print_r($weather); + IPSWeatherFAT_SetValueXML($names[$idx],$weather); + } + $names = array('TodayTempMin', 'TomorrowTempMin', 'Tomorrow1TempMin', 'Tomorrow2TempMin'); + foreach($api->xpath('//weather/forecast_conditions/low/@data') as $idx=>$weather) { + //print_r($weather); + IPSWeatherFAT_SetValueXML($names[$idx],$weather); + } + $names = array('TodayTempMax', 'TomorrowTempMax', 'Tomorrow1TempMax', 'Tomorrow2TempMax'); + foreach($api->xpath('//weather/forecast_conditions/high/@data') as $idx=>$weather) { + //print_r($weather); + IPSWeatherFAT_SetValueXML($names[$idx],$weather); + } + $names = array('TodayIcon', 'TomorrowIcon', 'Tomorrow1Icon', 'Tomorrow2Icon'); + foreach($api->xpath('//weather/forecast_conditions/icon/@data') as $idx=>$weather) { + //print_r($weather); + if ($idx==0) { + IPSWeatherFAT_SetValueXML($names[$idx],$weather, array(".gif", ".png", IPSWEATHERFAT_ICONS_GOOGLE1, IPSWEATHERFAT_ICONS_LARGE)); + } else { + IPSWeatherFAT_SetValueXML($names[$idx],$weather, array(".gif", ".png", IPSWEATHERFAT_ICONS_GOOGLE1, IPSWEATHERFAT_ICONS_SMALL)); + } + } + } + + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/Weather/IPSWeatherForcastAT/IPSWeatherForcastAT_RefreshORF.inc.php b/IPSLibrary/app/modules/Weather/IPSWeatherForcastAT/IPSWeatherForcastAT_RefreshORF.inc.php new file mode 100644 index 0000000..c7a3937 --- /dev/null +++ b/IPSLibrary/app/modules/Weather/IPSWeatherForcastAT/IPSWeatherForcastAT_RefreshORF.inc.php @@ -0,0 +1,94 @@ + + * + */ + + function IPSWeatherFAT_RefreshORF() { + // Wetter für Niederösterreich von ORF auslesen + $lHTML=@file_get_contents(IPSWEATHERFAT_ORF_URL); + if ($lHTML===false) { + IPSLogger_Dbg(__file__, 'ORF Detail Forcast is empty ...'); + echo 'ORF Detail Forcast is empty ...'; + return false; + } + + $forcast = ExtractData($lHTML, '
', '
', '

', false, true); + + $forcast = ExtractData($forcast, '

', '
', '

', false, true); + + $forcast = ExtractData($forcast, '

', '
', '

', false, true); + + $forcast = ExtractData($forcast, '

', '
', '
\ No newline at end of file diff --git a/IPSLibrary/app/modules/Weather/IPSWeatherForcastAT/IPSWeatherForcastAT_RefreshWunderground.inc.php b/IPSLibrary/app/modules/Weather/IPSWeatherForcastAT/IPSWeatherForcastAT_RefreshWunderground.inc.php new file mode 100644 index 0000000..f1e41f3 --- /dev/null +++ b/IPSLibrary/app/modules/Weather/IPSWeatherForcastAT/IPSWeatherForcastAT_RefreshWunderground.inc.php @@ -0,0 +1,124 @@ + + * + */ + + + function IPSWeatherFAT_RefreshWunderground() { + + $urlWunderground = 'http://api.wunderground.com/api/'.IPSWEATHERFAT_WUNDERGROUND_KEY.'/forecast/lang:DL/q/'.IPSWEATHERFAT_WUNDERGROUND_COUNTRY.'/'.IPSWEATHERFAT_WUNDERGROUND_TOWN.'.xml'; + IPSLogger_Trc(__file__, 'Load Weather Data from Wunderground, URL='.$urlWunderground); + $urlContent = @Sys_GetURLContent($urlWunderground); + if ($urlContent===false) { + IPSLogger_Dbg(__file__, 'Wunderground Weather API is empty ...'); + return false; + } + $api = @simplexml_load_string($urlContent); + if ($api===false) { + IPSLogger_Dbg(__file__, 'Error processing Wunderground Weather API ...'); + return false; + } + $icon_array = array( + 'chanceflurries','chance_of_snow', + 'chancerain','chance_of_rain', + 'chancesleet','chance_of_rain', + 'chancesnow','chance_of_snow', + 'chancetstorms','chance_of_storm', + 'clear','sunny', + 'cloudy','cloudy', + 'flurries','flurries', + 'fog','fog', + 'hazy','haze', + 'mostlycloudy','mostly_cloudy', + 'mostlysunny','mostly_sunny', + 'partlycloudy','partly_cloudy', + 'partlysunny','mostly_sunny', + 'rain','rain', + 'sleet','sleet', + 'snow','snow', + 'sunny','sunny', + 'tstorms','thunderstorm', + 'cloudy','cloudy', + ); + + + IPSWeatherFAT_SetValue('LastRefreshDateTime', date("Y-m-j H:i:s")); + IPSWeatherFAT_SetValue('LastRefreshTime', date("H:i")); + + IPSWeatherFAT_SetValueXML('TodayDay', $api->forecast->simpleforecast->forecastdays->forecastday[0]->date->weekday); + IPSWeatherFAT_SetValueXML('TomorrowDay', $api->forecast->simpleforecast->forecastdays->forecastday[1]->date->weekday); + IPSWeatherFAT_SetValueXML('Tomorrow1Day', $api->forecast->simpleforecast->forecastdays->forecastday[2]->date->weekday); + IPSWeatherFAT_SetValueXML('Tomorrow2Day', $api->forecast->simpleforecast->forecastdays->forecastday[3]->date->weekday); + + IPSWeatherFAT_SetValueXML('TodayTempMin', $api->forecast->simpleforecast->forecastdays->forecastday[0]->low->celsius); + IPSWeatherFAT_SetValueXML('TomorrowTempMin', $api->forecast->simpleforecast->forecastdays->forecastday[1]->low->celsius); + IPSWeatherFAT_SetValueXML('Tomorrow1TempMin', $api->forecast->simpleforecast->forecastdays->forecastday[2]->low->celsius); + IPSWeatherFAT_SetValueXML('Tomorrow2TempMin', $api->forecast->simpleforecast->forecastdays->forecastday[3]->low->celsius); + + IPSWeatherFAT_SetValueXML('TodayTempMax', $api->forecast->simpleforecast->forecastdays->forecastday[0]->high->celsius); + IPSWeatherFAT_SetValueXML('TomorrowTempMax', $api->forecast->simpleforecast->forecastdays->forecastday[1]->high->celsius); + IPSWeatherFAT_SetValueXML('Tomorrow1TempMax', $api->forecast->simpleforecast->forecastdays->forecastday[2]->high->celsius); + IPSWeatherFAT_SetValueXML('Tomorrow2TempMax', $api->forecast->simpleforecast->forecastdays->forecastday[3]->high->celsius); + + IPSWeatherFAT_SetValueXML('TodayForecastShort', utf8_decode($api->forecast->simpleforecast->forecastdays->forecastday[0]->conditions)); + IPSWeatherFAT_SetValueXML('TomorrowForecastShort', utf8_decode($api->forecast->simpleforecast->forecastdays->forecastday[1]->conditions)); + IPSWeatherFAT_SetValueXML('Tomorrow1ForecastShort', utf8_decode($api->forecast->simpleforecast->forecastdays->forecastday[2]->conditions)); + IPSWeatherFAT_SetValueXML('Tomorrow2ForecastShort', utf8_decode($api->forecast->simpleforecast->forecastdays->forecastday[3]->conditions)); + + IPSWeatherFAT_SetValueXML('TodayIcon', $api->forecast->simpleforecast->forecastdays->forecastday[0]->icon, IPSWEATHERFAT_ICONS_SMALL, '.png', $icon_array); + IPSWeatherFAT_SetValueXML('TomorrowIcon', $api->forecast->simpleforecast->forecastdays->forecastday[1]->icon, IPSWEATHERFAT_ICONS_SMALL, '.png', $icon_array); + IPSWeatherFAT_SetValueXML('Tomorrow1Icon', $api->forecast->simpleforecast->forecastdays->forecastday[2]->icon, IPSWEATHERFAT_ICONS_SMALL, '.png', $icon_array); + IPSWeatherFAT_SetValueXML('Tomorrow2Icon', $api->forecast->simpleforecast->forecastdays->forecastday[3]->icon, IPSWEATHERFAT_ICONS_SMALL, '.png', $icon_array); + + + $urlWunderground = 'http://api.wunderground.com/api/'.IPSWEATHERFAT_WUNDERGROUND_KEY.'/conditions/lang:DL/q/'.IPSWEATHERFAT_WUNDERGROUND_COUNTRY.'/'.IPSWEATHERFAT_WUNDERGROUND_TOWN.'.xml'; + IPSLogger_Trc(__file__, 'Load Weather Data from Wunderground, URL='.$urlWunderground); + $urlContent = @Sys_GetURLContent($urlWunderground); + if ($urlContent===false) { + IPSLogger_Dbg(__file__, 'Wunderground Weather API is empty ...'); + return false; + } + $api = @simplexml_load_string(utf8_encode($urlContent)); + if ($api===false) { + IPSLogger_Dbg(__file__, 'Error processing Wunderground Weather API ...'); + return false; + } + + IPSWeatherFAT_SetValueXML('TodayForecastShort', $api->xpath('//current_observation/weather')); + IPSWeatherFAT_SetValueXML('TodayTempCurrent', round(floatval(str_replace(',','.',$api->current_observation->temp_c)))); + IPSWeatherFAT_SetValueXML('AirHumidity', $api->xpath('//current_observation/relative_humidity'), 'Feuchtigkeit: ', ''); + //IPSWeatherFAT_SetValueXML('Wind', utf8_decode($api->current_observation->wind_dir), 'Wind:', ''); + IPSWeatherFAT_SetValueXML('Wind', utf8_decode(utf8_decode($api->current_observation->wind_dir)), 'Wind:', ''); + IPSWeatherFAT_SetValueXML('TodayIcon', $api->xpath('//current_observation/icon'), IPSWEATHERFAT_ICONS_LARGE, '.png', $icon_array); + + return true; + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/Weather/IPSWeatherForcastAT/IPSWeatherForcastAT_RefreshYahoo.inc.php b/IPSLibrary/app/modules/Weather/IPSWeatherForcastAT/IPSWeatherForcastAT_RefreshYahoo.inc.php new file mode 100644 index 0000000..3f52af6 --- /dev/null +++ b/IPSLibrary/app/modules/Weather/IPSWeatherForcastAT/IPSWeatherForcastAT_RefreshYahoo.inc.php @@ -0,0 +1,354 @@ + + * + */ + + function IPSWeatherFAT_RefreshYahoo() { + + $urlYahoo = 'http://weather.yahooapis.com/forecastrss?w='.IPSWEATHERFAT_YAHOO_WOEID.'&u=c'; + $DaySourceArray = array('Mon','Tue','Wed','Thu','Fri','Sat','Sun'); + $DayDisplayArray = array('Montag','Dienstag','Mittwoch','Donnerstag','Freitag','Samstag','Sonntag'); + + $icon_array = array( + 'mixed rain and snow','chance_of_snow', + 'mixed rain and sleet','chance_of_snow', + 'mixed snow and sleet','chance_of_snow', + 'freezing drizzle','chancerain', + 'drizzle','chancerain', + 'chancerain','chance_of_rain', + 'chancesleet','chance_of_rain', + 'chancesnow','chance_of_snow', + 'chancetstorms','chance_of_storms', + 'clear','sunny', + 'cloudy','cloudy', + 'flurries','flurries', + 'flurries','flurries', + 'smoky','fog', + 'fog','fog', + 'fog','fog', + 'dust','fog', + 'foggy','fog', + 'hazy','haze', + 'mostlycloudy','mostly_cloudy', + 'mostly cloudy','mostly_cloudy', + 'mostly cloudy (day)','mostly_cloudy', + 'mostly cloudy (night)','mostly_cloudy', + 'partly cloudy (night)','partly_cloudy', + 'partly cloudy (day)','partly_cloudy', + 'partly cloudy','partly_cloudy', + 'partlycloudy','partly_cloudy', + 'mostly sunny','mostly_sunny', + 'partly sunny','mostly_sunny', + 'showers','rain', + 'hail','rain', + 'rain','rain', + 'sleet','sleet', + 'snow','snow', + 'mixed rain and hail','snow', + 'scattered showers','snow', + 'heavy snow','snow', + 'scattered snow showers','snow', + 'heavy snow','snow', + 'snow showers','snow', + 'snow flurries','snow', + 'light snow showers','snow', + 'blowing snow','snow', + 'sunny','sunny', + 'clear (night)','sunny', + 'fair (night)','sunny', + 'fair (day)','sunny', + 'hot','sunny', + 'tstorms','tstorms', + 'tstorms','tstorms', + 'windy','tstorms', + 'blustery','tstorms', + 'tornado','tstorms', + 'tropical storm','tstorms', + 'hurricane','tstorms', + 'severe thunderstorms','tstorms', + 'thunderstorms','tstorms', + 'scattered thunderstorms','tstorms', + 'isolated thunderstorms','tstorms', + 'scattered thunderstorms','tstorms', + 'thundershowers','tstorms', + 'isolated thundershowers','tstorms', + 'cloudy','cloudy', + ); + + echo $urlYahoo.PHP_EOL; + $urlContent = @Sys_GetURLContent($urlYahoo); + if ($urlContent===false) { + echo 'Yahoo Weather API is empty ...'.PHP_EOL; + return; + } + $api = @simplexml_load_string(utf8_encode($urlContent)); + if ($api===false) { + echo 'Error processing Yahoo Weather API ...'.PHP_EOL; + return; + } + + IPSWeatherFAT_SetValue('LastRefreshDateTime', date("Y-m-j H:i:s")); + IPSWeatherFAT_SetValue('LastRefreshTime', date("H:i")); + + IPSWeatherFAT_SetValueXML('TodayForecastShort', IPSWeatherFAT_GetConditionYahoo($api->xpath('//yweather:condition/@text')[0])); + IPSWeatherFAT_SetValueXML('TodayTempCurrent', $api->xpath('//yweather:condition/@temp')); + IPSWeatherFAT_SetValueXML('AirHumidity', $api->xpath('//yweather:atmosphere/@humidity'), 'Feuchtigkeit: ', ' %'); + IPSWeatherFAT_SetValueXML('Wind', $api->xpath('//yweather:wind/@speed'), 'Wind:', ' km/h'); + + IPSWeatherFAT_SetValueXML('Tomorrow1Day', ''); + IPSWeatherFAT_SetValueXML('Tomorrow2Day', ''); + IPSWeatherFAT_SetValueXML('Tomorrow1ForecastShort', ''); + IPSWeatherFAT_SetValueXML('Tomorrow2ForecastShort', ''); + IPSWeatherFAT_SetValueXML('Tomorrow1Icon', ''); + IPSWeatherFAT_SetValueXML('Tomorrow2Icon', ''); + + $names = array('TodayDay', 'TomorrowDay', 'Tomorrow1Day', 'Tomorrow2Day'); + foreach($api->xpath('//yweather:forecast/@day') as $idx=>$weather) { + if ($idx <= 3) + IPSWeatherFAT_SetValueXML($names[$idx],$weather, '', '', array($DaySourceArray, $DayDisplayArray)); + } + + // Wettervorhersage heute, morgen, in zwei und in drei Tagen ($wetter[1] bis $wetter[4]) + $names = array('TodayForecastShort', 'TomorrowForecastShort', 'Tomorrow1ForecastShort', 'Tomorrow2ForecastShort'); + foreach($api->xpath('//yweather:forecast/@text') as $idx=>$weather) { + if ($idx <= 3) + IPSWeatherFAT_SetValueXML($names[$idx],$weather); + } + + $names = array('TodayTempMin','TomorrowTempMin', 'Tomorrow1TempMin', 'Tomorrow2TempMin'); + foreach($api->xpath('//yweather:forecast/@low') as $idx=>$weather) { + if ($idx <= 3) + IPSWeatherFAT_SetValueXML($names[$idx],$weather); + } + $names = array('TodayTempMax','TomorrowTempMax', 'Tomorrow1TempMax', 'Tomorrow2TempMax'); + foreach($api->xpath('//yweather:forecast/@high') as $idx=>$weather) { + if ($idx <= 3) + IPSWeatherFAT_SetValueXML($names[$idx],$weather); + } + + $names = array('TodayIcon', 'TomorrowIcon', 'Tomorrow1Icon', 'Tomorrow2Icon'); + foreach($api->xpath('//yweather:forecast/@text') as $idx=>$weather) { + if ($idx==0) { + IPSWeatherFAT_SetValueXML($names[$idx],strtolower($weather[0]), IPSWEATHERFAT_ICONS_LARGE, '.png', $icon_array); + } elseif ($idx <= 3) { + IPSWeatherFAT_SetValueXML($names[$idx],strtolower($weather[0]), IPSWEATHERFAT_ICONS_SMALL, '.png', $icon_array); + } else { + } + } + } + + function IPSWeatherFAT_GetConditionYahoo($condition) { + if($condition == 'AM Clouds/PM Sun') $return = 'vormittags bewölkt/nachmittags sonnig'; + elseif($condition == 'AM Drizzle') $return = 'vormittags Nieselregen'; + elseif($condition == 'AM Drizzle/Wind') $return = 'vorm. Nieselregen/Wind'; + elseif($condition == 'AM Fog/PM Clouds') $return = 'vormittags Nebel/nachmittags bewölkt'; + elseif($condition == 'AM Fog/PM Sun') $return = 'vormittags Nebel, nachmittags sonnig'; + elseif($condition == 'AM Ice') $return = 'vorm. Eis'; + elseif($condition == 'AM Light Rain') $return = 'vormittags leichter Regen'; + elseif($condition == 'AM Light Rain/Wind') $return = 'vorm. leichter Regen/Wind'; + elseif($condition == 'AM Light Snow') $return = 'vormittags leichter Schneefall'; + elseif($condition == 'AM Rain') $return = 'vormittags Regen'; + elseif($condition == 'AM Rain/Snow Showers') $return = 'vorm. Regen-/Schneeschauer'; + elseif($condition == 'AM Rain/Snow') $return = 'vormittags Regen/Schnee'; + elseif($condition == 'AM Rain/Snow/Wind') $return = 'vorm. Regen/Schnee/Wind'; + elseif($condition == 'AM Rain/Wind') $return = 'vorm. Regen/Wind'; + elseif($condition == 'AM Showers') $return = 'vormittags Schauer'; + elseif($condition == 'AM Showers/Wind') $return = 'vormittags Schauer/Wind'; + elseif($condition == 'AM Snow Showers') $return = 'vormittags Schneeschauer'; + elseif($condition == 'AM Snow') $return = 'vormittags Schnee'; + elseif($condition == 'AM Thundershowers') $return = 'vorm. Gewitterschauer'; + elseif($condition == 'Blowing Snow') $return = 'Schneetreiben'; + elseif($condition == 'Clear') $return = 'Klar'; + elseif($condition == 'Clear/Windy') $return = 'Klar/Windig'; + elseif($condition == 'Clouds Early/Clearing Late') $return = 'früh Wolken/später klar'; + elseif($condition == 'Cloudy') $return = 'Bewölkt'; + elseif($condition == 'Cloudy/Wind') $return = 'Bewölkt/Wind'; + elseif($condition == 'Cloudy/Windy') $return = 'Wolkig/Windig'; + elseif($condition == 'Drifting Snow') $return = 'Schneetreiben'; + elseif($condition == 'Drifting Snow/Windy') $return = 'Schneetreiben/Windig'; + elseif($condition == 'Drizzle Early') $return = 'früh Nieselregen'; + elseif($condition == 'Drizzle Late') $return = 'später Nieselregen'; + elseif($condition == 'Drizzle') $return = 'Nieselregen'; + elseif($condition == 'Drizzle/Fog') $return = 'Nieselregen/Nebel'; + elseif($condition == 'Drizzle/Wind') $return = 'Nieselregen/Wind'; + elseif($condition == 'Drizzle/Windy') $return = 'Nieselregen/Windig'; + elseif($condition == 'Fair') $return = 'Heiter'; + elseif($condition == 'Fair/Windy') $return = 'Heiter/Windig'; + elseif($condition == 'Few Showers') $return = 'vereinzelte Schauer'; + elseif($condition == 'Few Showers/Wind') $return = 'vereinzelte Schauer/Wind'; + elseif($condition == 'Few Snow Showers') $return = 'vereinzelt Schneeschauer'; + elseif($condition == 'Fog Early/Clouds Late') $return = 'früh Nebel, später Wolken'; + elseif($condition == 'Fog Late') $return = 'später neblig'; + elseif($condition == 'Fog') $return = 'Nebel'; + elseif($condition == 'Fog/Windy') $return = 'Nebel/Windig'; + elseif($condition == 'Foggy') $return = 'neblig'; + elseif($condition == 'Freezing Drizzle') $return = 'gefrierender Nieselregen'; + elseif($condition == 'Freezing Drizzle/Windy') $return = 'gefrierender Nieselregen/Windig'; + elseif($condition == 'Freezing Rain') $return = 'gefrierender Regen'; + elseif($condition == 'Haze') $return = 'Dunst'; + elseif($condition == 'Heavy Drizzle') $return = 'starker Nieselregen'; + elseif($condition == 'Heavy Rain Shower') $return = 'Starker Regenschauer'; + elseif($condition == 'Heavy Rain') $return = 'Starker Regen'; + elseif($condition == 'Heavy Rain/Wind') $return = 'starker Regen/Wind'; + elseif($condition == 'Heavy Rain/Windy') $return = 'Starker Regen/Windig'; + elseif($condition == 'Heavy Snow Shower') $return = 'Starker Schneeschauer'; + elseif($condition == 'Heavy Snow') $return = 'Starker Schneefall'; + elseif($condition == 'Heavy Snow/Wind') $return = 'Starker Schneefall/Wind'; + elseif($condition == 'Heavy Thunderstorm') $return = 'Schweres Gewitter'; + elseif($condition == 'Heavy Thunderstorm/Windy') $return = 'Schweres Gewitter/Windig'; + elseif($condition == 'Ice Crystals') $return = 'Eiskristalle'; + elseif($condition == 'Ice Late') $return = 'später Eis'; + elseif($condition == 'Isolated T-storms') $return = 'Vereinzelte Gewitter'; + elseif($condition == 'Isolated Thunderstorms') $return = 'Vereinzelte Gewitter'; + elseif($condition == 'Light Drizzle') $return = 'Leichter Nieselregen'; + elseif($condition == 'Light Freezing Drizzle') $return = 'Leichter gefrierender Nieselregen'; + elseif($condition == 'Light Freezing Rain') $return = 'Leichter gefrierender Regen'; + elseif($condition == 'Light Freezing Rain/Fog') $return = 'Leichter gefrierender Regen/Nebel'; + elseif($condition == 'Light Rain Early') $return = 'anfangs leichter Regen'; + elseif($condition == 'Light Rain') $return = 'Leichter Regen'; + elseif($condition == 'Light Rain Late') $return = 'später leichter Regen'; + elseif($condition == 'Light Rain Shower') $return = 'Leichter Regenschauer'; + elseif($condition == 'Light Rain Shower/Fog') $return = 'Leichter Regenschauer/Nebel'; + elseif($condition == 'Light Rain Shower/Windy') $return = 'Leichter Regenschauer/windig'; + elseif($condition == 'Light Rain with Thunder') $return = 'Leichter Regen mit Gewitter'; + elseif($condition == 'Light Rain/Fog') $return = 'Leichter Regen/Nebel'; + elseif($condition == 'Light Rain/Freezing Rain') $return = 'Leichter Regen/Gefrierender Regen'; + elseif($condition == 'Light Rain/Wind Early') $return = 'früh leichter Regen/Wind'; + elseif($condition == 'Light Rain/Wind Late') $return = 'später leichter Regen/Wind'; + elseif($condition == 'Light Rain/Wind') $return = 'leichter Regen/Wind'; + elseif($condition == 'Light Rain/Windy') $return = 'Leichter Regen/Windig'; + elseif($condition == 'Light Sleet') $return = 'Leichter Schneeregen'; + elseif($condition == 'Light Snow Early') $return = 'früher leichter Schneefall'; + elseif($condition == 'Light Snow Grains') $return = 'Leichter Schneegriesel'; + elseif($condition == 'Light Snow Late') $return = 'später leichter Schneefall'; + elseif($condition == 'Light Snow Shower') $return = 'Leichter Schneeschauer'; + elseif($condition == 'Light Snow Shower/Fog') $return = 'Leichter Schneeschauer/Nebel'; + elseif($condition == 'Light Snow with Thunder') $return = 'Leichter Schneefall mit Gewitter'; + elseif($condition == 'Light Snow') $return = 'Leichter Schneefall'; + elseif($condition == 'Light Snow/Fog') $return = 'Leichter Schneefall/Nebel'; + elseif($condition == 'Light Snow/Freezing Rain') $return = 'Leichter Schneefall/Gefrierender Regen'; + elseif($condition == 'Light Snow/Wind') $return = 'Leichter Schneefall/Wind'; + elseif($condition == 'Light Snow/Windy') $return = 'Leichter Schneeschauer/Windig'; + elseif($condition == 'Light Snow/Windy/Fog') $return = 'Leichter Schneefall/Windig/Nebel'; + elseif($condition == 'Mist') $return = 'Nebel'; + elseif($condition == 'Mostly Clear') $return = 'überwiegend Klar'; + elseif($condition == 'Mostly Cloudy') $return = 'Überwiegend bewölkt'; + elseif($condition == 'Mostly Cloudy/Wind') $return = 'meist bewölkt/Wind'; + elseif($condition == 'Mostly sunny') $return = 'Überwiegend sonnig'; + elseif($condition == 'Partial Fog') $return = 'teilweise Nebel'; + elseif($condition == 'Partly Cloudy') $return = 'Teilweise bewölkt'; + elseif($condition == 'Partly Cloudy/Wind') $return = 'teilweise bewölkt/Wind'; + elseif($condition == 'Patches of Fog') $return = 'Nebelfelder'; + elseif($condition == 'Patches of Fog/Windy') $return = 'Nebelfelder/Windig'; + elseif($condition == 'PM Drizzle') $return = 'nachm. Nieselregen'; + elseif($condition == 'PM Fog') $return = 'nachmittags Nebel'; + elseif($condition == 'PM Light Snow') $return = 'nachmittags leichter Schneefall'; + elseif($condition == 'PM Light Rain') $return = 'nachmittags leichter Regen'; + elseif($condition == 'PM Light Rain/Wind') $return = 'nachm. leichter Regen/Wind'; + elseif($condition == 'PM Light Snow/Wind') $return = 'nachm. leichter Schneefall/Wind'; + elseif($condition == 'PM Rain') $return = 'nachmittags Regen'; + elseif($condition == 'PM Rain/Snow Showers') $return = 'nachmittags Regen/Schneeschauer'; + elseif($condition == 'PM Rain/Snow') $return = 'nachmittags Regen/Schnee'; + elseif($condition == 'PM Rain/Wind') $return = 'nachm. Regen/Wind'; + elseif($condition == 'PM Showers') $return = 'nachmittags Schauer'; + elseif($condition == 'PM Showers/Wind') $return = 'nachmittags Schauer/Wind'; + elseif($condition == 'PM Snow Showers') $return = 'nachmittags Schneeschauer'; + elseif($condition == 'PM Snow Showers/Wind') $return = 'nachm. Schneeschauer/Wind'; + elseif($condition == 'PM Snow') $return = 'nachm. Schnee'; + elseif($condition == 'PM T-storms') $return = 'nachmittags Gewitter'; + elseif($condition == 'PM Thundershowers') $return = 'nachmittags Gewitterschauer'; + elseif($condition == 'PM Thunderstorms') $return = 'nachm. Gewitter'; + elseif($condition == 'Rain and Snow') $return = 'Schneeregen'; + elseif($condition == 'Rain and Snow/Windy') $return = 'Regen und Schnee/Windig'; + elseif($condition == 'Rain/Snow Showers/Wind') $return = 'Regen/Schneeschauer/Wind'; + elseif($condition == 'Rain Early') $return = 'früh Regen'; + elseif($condition == 'Rain Late') $return = 'später Regen'; + elseif($condition == 'Rain Shower') $return = 'Regenschauer'; + elseif($condition == 'Rain Shower/Windy') $return = 'Regenschauer/Windig'; + elseif($condition == 'Rain to Snow') $return = 'Regen, in Schnee übergehend'; + elseif($condition == 'Rain') $return = 'Regen'; + elseif($condition == 'Rain/Snow Early') $return = 'früh Regen/Schnee'; + elseif($condition == 'Rain/Snow Late') $return = 'später Regen/Schnee'; + elseif($condition == 'Rain/Snow Showers Early') $return = 'früh Regen-/Schneeschauer'; + elseif($condition == 'Rain/Snow Showers Late') $return = 'später Regen-/Schneeschnauer'; + elseif($condition == 'Rain/Snow Showers') $return = 'Regen/Schneeschauer'; + elseif($condition == 'Rain/Snow') $return = 'Regen/Schnee'; + elseif($condition == 'Rain/Snow/Wind') $return = 'Regen/Schnee/Wind'; + elseif($condition == 'Rain/Thunder') $return = 'Regen/Gewitter'; + elseif($condition == 'Rain/Wind Early') $return = 'früh Regen/Wind'; + elseif($condition == 'Rain/Wind Late') $return = 'später Regen/Wind'; + elseif($condition == 'Rain/Wind') $return = 'Regen/Wind'; + elseif($condition == 'Rain/Windy') $return = 'Regen/Windig'; + elseif($condition == 'Scattered Showers') $return = 'vereinzelte Schauer'; + elseif($condition == 'Scattered Showers/Wind') $return = 'vereinzelte Schauer/Wind'; + elseif($condition == 'Scattered Snow Showers') $return = 'vereinzelte Schneeschauer'; + elseif($condition == 'Scattered Snow Showers/Wind') $return = 'vereinzelte Schneeschauer/Wind'; + elseif($condition == 'Scattered T-storms') $return = 'vereinzelte Gewitter'; + elseif($condition == 'Scattered Thunderstorms') $return = 'vereinzelte Gewitter'; + elseif($condition == 'Shallow Fog') $return = 'flacher Nebel'; + elseif($condition == 'Showers') $return = 'Schauer'; + elseif($condition == 'Showers Early') $return = 'früh Schauer'; + elseif($condition == 'Showers Late') $return = 'später Schauer'; + elseif($condition == 'Showers in the Vicinity') $return = 'Regenfälle in der Nähe'; + elseif($condition == 'Showers/Wind') $return = 'Schauer/Wind'; + elseif($condition == 'Sleet and Freezing Rain') $return = 'Schneeregen und gefrierender Regen'; + elseif($condition == 'Sleet/Windy') $return = 'Schneeregen/Windig'; + elseif($condition == 'Snow Grains') $return = 'Schneegriesel'; + elseif($condition == 'Snow Late') $return = 'später Schnee'; + elseif($condition == 'Snow Shower') $return = 'Schneeschauer'; + elseif($condition == 'Snow Showers Early') $return = 'früh Schneeschauer'; + elseif($condition == 'Snow Showers Late') $return = 'später Schneeschauer'; + elseif($condition == 'Snow Showers') $return = 'Schneeschauer'; + elseif($condition == 'Snow Showers/Wind') $return = 'Schneeschauer/Wind'; + elseif($condition == 'Snow to Rain') $return = 'Schneeregen'; + elseif($condition == 'Snow') $return = 'Schneefall'; + elseif($condition == 'Snow/Wind') $return = 'Schneefall/Wind'; + elseif($condition == 'Snow/Windy') $return = 'Schnee/Windig'; + elseif($condition == 'Squalls') $return = 'Böen'; + elseif($condition == 'Sunny') $return = 'Sonnig'; + elseif($condition == 'Sunny/Wind') $return = 'Sonnig/Wind'; + elseif($condition == 'Sunny/Windy') $return = 'Sonnig/Windig'; + elseif($condition == 'T-showers') $return = 'Gewitterschauer'; + elseif($condition == 'Thunder in the Vicinity') $return = 'Gewitter in der Umgebung'; + elseif($condition == 'Thunder') $return = 'Gewitter'; + elseif($condition == 'Thundershowers Early') $return = 'früh Gewitterschauer'; + elseif($condition == 'Thundershowers') $return = 'Gewitterschauer'; + elseif($condition == 'Thunderstorm') $return = 'Gewitter'; + elseif($condition == 'Thunderstorm/Windy') $return = 'Gewitter/Windig'; + elseif($condition == 'Thunderstorms Early') $return = 'früh Gewitter'; + elseif($condition == 'Thunderstorms Late') $return = 'später Gewitter'; + elseif($condition == 'Thunderstorms') $return = 'Gewitter'; + elseif($condition == 'Unknown Precipitation') $return = 'Niederschlag'; + elseif($condition == 'Unknown') $return = 'unbekannt'; + elseif($condition == 'Wintry Mix') $return = 'Winterlicher Mix'; + else $return = $condition; + return $return; + } /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/app/modules/Weather/IPSWeatherForcastAT/IPSWeatherForcastAT_Utils.inc.php b/IPSLibrary/app/modules/Weather/IPSWeatherForcastAT/IPSWeatherForcastAT_Utils.inc.php index 452b436..c04072d 100644 --- a/IPSLibrary/app/modules/Weather/IPSWeatherForcastAT/IPSWeatherForcastAT_Utils.inc.php +++ b/IPSLibrary/app/modules/Weather/IPSWeatherForcastAT/IPSWeatherForcastAT_Utils.inc.php @@ -22,7 +22,7 @@ * * Diverse Helper Functions für IPSWeatherForcastAT * - * @file IPSWeatherForcastAT_Utils.ips.php + * @file IPSWeatherForcastAT_Utils.inc.php * @author Andreas Brauneis * @version * Version 2.50.1, 15.02.2012
@@ -43,7 +43,7 @@ function IPSWeatherFAT_GetValue($name) { return $value; } - /** + /** * Schreiben von Wetterdaten anhand des Namens * * @param string $name Name der Variablen @@ -54,7 +54,36 @@ function IPSWeatherFAT_SetValue($name, $value) { $variableId = IPS_GetObjectIDByIdent($name, $categoryId_Weather); SetValue($variableId, $value); } - - + + /** + * Schreiben von Wetterdaten anhand des Namens + * + * @param string $name Name der Variablen + * @param string $valueArrayXML Wert der geschrieben werden soll + */ + function IPSWeatherFAT_SetValueXML($name, $valueArrayXML, $prefix='', $suffix='', $replacementArray=null) { + if (!is_array($valueArrayXML)) { + $value = $valueArrayXML; + } elseif (count($valueArrayXML)==0) { + echo 'Value for '.$name.' NOT found Google Weather API'.PHP_EOL; + return; + } else { + $value = (string)$valueArrayXML[0]; + } + + $categoryId_Weather = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.Weather.IPSWeatherForcastAT'); + $variableId = IPS_GetObjectIDByIdent($name, $categoryId_Weather); + $value = html_entity_decode($value, ENT_COMPAT, 'ISO-8859-1'); + $value = $prefix.$value.$suffix; + if ($replacementArray <> null) { + for ($i=0; $i'); + define ("c_Style_HtmlOutColGroup", ''); /** WebFront Konfigurations Parameter * @@ -62,7 +62,7 @@ * * Parameter kann jederzeit geändert werden. */ - define ('IPSLOGGER_HTML_NEWMESSAGETOP', false); + define ('IPSLOGGER_HTML_NEWMESSAGETOP', false); /** Konfigurations Parameter für File Output * @@ -71,7 +71,7 @@ * * Parameter kann jederzeit geändert werden. */ - define ("c_File_Directory", ""); + define ("c_File_Directory", ""); /** Konfigurations Parameter für File Output * @@ -79,7 +79,7 @@ * * Parameter kann jederzeit geändert werden. */ - define ("c_File_Extension", "log"); + define ("c_File_Extension", "log"); /** Konfigurations Parameter für Log4IPS Output * @@ -88,7 +88,7 @@ * * Parameter kann jederzeit geändert werden. */ - define ("c_Log4IPS_Directory", ""); + define ("c_Log4IPS_Directory", ""); /** Konfigurations Parameter für Log4IPS Output * @@ -96,7 +96,7 @@ * * Parameter kann jederzeit geändert werden. */ - define ("c_Log4IPS_Extension", "xml"); + define ("c_Log4IPS_Extension", "xml"); /** Konfigurations Parameter für EMail Output * @@ -105,7 +105,7 @@ * * Parameter kann jederzeit geändert werden. */ - define ("c_ID_SmtpDevice", 0); + define ("c_ID_SmtpDevice", 0); /** Konfigurations Parameter für EMail Output * @@ -113,7 +113,7 @@ * * Parameter kann jederzeit geändert werden. */ - define ("c_EMail_Address1", ""); + define ("c_EMail_Address1", ""); /** Konfigurations Parameter für EMail Output * @@ -121,7 +121,7 @@ * * Parameter kann jederzeit geändert werden. */ - define ("c_EMail_Address2", ""); + define ("c_EMail_Address2", ""); /** Konfigurations Parameter für EMail Output * @@ -129,7 +129,7 @@ * * Parameter kann jederzeit geändert werden. */ - define ("c_EMail_Address3", ""); + define ("c_EMail_Address3", ""); /** Konfigurations Parameter für EMail Output * @@ -137,7 +137,7 @@ * * Parameter kann jederzeit geändert werden. */ - define ("c_EMail_Subject", "IP-Symcon Fehler sind aufgetreten!"); + define ("c_EMail_Subject", "IP-Symcon Fehler sind aufgetreten!"); /** Konfigurations Parameter für EMail Output * @@ -145,7 +145,7 @@ * * Parameter kann jederzeit geändert werden. */ - define ("c_EMail_Signature", "Message send from IP-Symcon HomeControl"); + define ("c_EMail_Signature", "Message send from IP-Symcon HomeControl"); /** Konfigurations Parameter für Prowl Output * @@ -153,7 +153,87 @@ * * Parameter kann jederzeit geändert werden. */ - define ("c_Key_ProwlService", ''); + define ("c_Key_ProwlService", ''); + /** Konfigurations Parameter für SysLog Output + * + * Über diesen Parameter wird gesteuert, ob die Meldungen auch auf den SysLog Output geschrieben werden soll. + * + * Parameter kann jederzeit geändert werden. + */ + define ("c_SysLog_Enabled", false); + + /** Konfigurations Parameter für SysLogTypes + * + * Über diesen Parameter wird gesteuert, welche Meldungen auf den SysLog Output geschrieben werden + * + * Parameter kann jederzeit geändert werden. + */ + $SysLog_LogTypes = array(true/*Fat*/, true/*Err*/, true/*Wrn*/, true/*Not*/, true/*Inf*/, true/*Log*/, false/*Dbg*/, false/*Trc*/, false/*Tst*/); + + /** Konfigurations Parameter für SysLog Instance + * + * Dieser Parameter spezifiziert die Socket Instanz, über die die SysLog Meldung gesendet wird + * Alternativ ist auch die Angabe von SysLog Host+Port (siehe Parameter weiter unten) möglich, allerdings + * ist hierfür die php_sockets.dll nötig. + * + * Parameter kann jederzeit geändert werden. + */ + define ("c_SysLog_Instance", ''); + + /** Konfigurations Parameter für SysLog Host + * + * Dieser Parameter spezifiziert den SysLog Host, der die Message empfangen soll (nur notwendig, + * wenn keine Instanz definiert wurde) + * + * Parameter kann jederzeit geändert werden. + */ + define ("c_SysLog_Host", ''); + + /** Konfigurations Parameter für SysLog Host + * + * Dieser Parameter spezifiziert den SysLog Port, auf den die Message gesendet werden soll (nur notwendig, + * wenn keine Instanz definiert wurde) + * + * Parameter kann jederzeit geändert werden. + */ + define ("c_SysLog_Port", ''); + + /** Konfigurations Parameter für MySQL Output + * + * Über diesen Parameter wird gesteuert, ob die Meldungen auch auf den MySQL Output geschrieben werden soll. + * + * Parameter kann jederzeit geändert werden. + */ + define ("c_DB_MySQL_Enabled", false); + + /** Konfigurations Parameter für MySQL + * + * Über diesen Parameter wird gesteuert, welche Meldungen auf den MySQL Output geschrieben werden + * + * Parameter kann jederzeit geändert werden. + */ + $DB_MySQL_LogTypes = array(true/*Fat*/, true/*Err*/, true/*Wrn*/, true/*Not*/, true/*Inf*/, true/*Log*/, true/*Dbg*/, true/*Trc*/, false/*Tst*/); + + /** Konfigurations Parameter für MySQL Output + * + * Serveradresse + * Port + * Database + * Tabellenname + * User + * Password + * + * Parameter koennen jederzeit geändert werden. + */ + define ("c_DB_MySQL_Server", "192.168.1.1" ); + define ("c_DB_MySQL_Port", "3306" ); + define ("c_DB_MySQL_Database", "IPSLogger" ); + define ("c_DB_MySQL_Table", "tbl_IPSLog" ); + define ("c_DB_MySQL_User", "xxxxxx" ); + define ("c_DB_MySQL_Password", "xxxxxx" ); + +/** @}*/ + /** @}*/ ?> \ No newline at end of file diff --git a/IPSLibrary/config/core/IPSMessageHandler/Default/IPSMessageHandler_Configuration.inc.php b/IPSLibrary/config/core/IPSMessageHandler/Default/IPSMessageHandler_Configuration.inc.php index 671efd5..9122e03 100644 --- a/IPSLibrary/config/core/IPSMessageHandler/Default/IPSMessageHandler_Configuration.inc.php +++ b/IPSLibrary/config/core/IPSMessageHandler/Default/IPSMessageHandler_Configuration.inc.php @@ -1,4 +1,4 @@ - \ No newline at end of file diff --git a/IPSLibrary/config/core/IPSMessageHandler/Default/IPSMessageHandler_Custom.inc.php b/IPSLibrary/config/core/IPSMessageHandler/Default/IPSMessageHandler_Custom.inc.php new file mode 100644 index 0000000..6954cb9 --- /dev/null +++ b/IPSLibrary/config/core/IPSMessageHandler/Default/IPSMessageHandler_Custom.inc.php @@ -0,0 +1,56 @@ + + * + */ + + /** + * + * Callback Funktion, die vor dem behandeln eines Events aufgerufen wird + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param string $component, Source Componente + * @param string $module Destination Module + * @return boolean Funktions Ergebnis, bei false wird das Event NICHT weitergereicht + */ + function IPSMessageHandler_BeforeHandleEvent($variable, $value, IPSComponent $component, IPSModule $module) { + return true; + } + + /** + * + * Callback Funktion, die nach dem behandeln eines Events aufgerufen wird + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param string $component, Source Componente + * @param string $module Destination Module + * + */ + function IPSMessageHandler_AfterHandleEvent($variable, $value, IPSComponent $component, IPSModule $module) { + } + + /** + * + * Callback Funktion, die für das Behandeln von IPSLibary Events aufgerufen wird + * + * @param string $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param string $module Name des auslösenden Modules + * @param string $event Name des auslösenden Events + * + */ + function IPSMessageHandler_AfterHandleLibraryEvent($variable, $value, $component, $module) { + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/config/core/IPSMessageHandler/Examples/IPSMessageHandler_Configuration.inc.php b/IPSLibrary/config/core/IPSMessageHandler/Examples/IPSMessageHandler_Configuration.inc.php new file mode 100644 index 0000000..cf104b5 --- /dev/null +++ b/IPSLibrary/config/core/IPSMessageHandler/Examples/IPSMessageHandler_Configuration.inc.php @@ -0,0 +1,170 @@ + + * + */ + + /** + * + * Liefert Liste mit Event Variablen, die vom MessageHandler bearbeitet werden. Diese Liste wurde von + * den Installations Prozeduren befüllt. + * + * @return string[] Key-Value Array mit Event Variablen und der dazugehörigen Parametern + */ + function IPSMessageHandler_GetEventConfiguration() { + $eventConfiguration = array( + 48380 => array('OnChange','IPSComponentSwitch_Homematic,32626','IPSModuleSwitch_IPSLight,',), + 39067 => array('OnChange','IPSComponentSwitch_Homematic,48611','IPSModuleSwitch_IPSLight,',), + 58479 => array('OnChange','IPSComponentSwitch_Homematic,17605','IPSModuleSwitch_IPSLight,',), + 43656 => array('OnChange','IPSComponentSwitch_Homematic,27179','IPSModuleSwitch_IPSLight,',), + 31355 => array('OnChange','IPSComponentSwitch_Homematic,24592','IPSModuleSwitch_IPSLight,',), + 13313 => array('OnChange','IPSComponentSwitch_Homematic,11022','IPSModuleSwitch_IPSLight,',), + 20923 => array('OnChange','IPSComponentSwitch_Homematic,21180','IPSModuleSwitch_IPSLight,',), + 34099 => array('OnChange','IPSComponentSwitch_Homematic,13545','IPSModuleSwitch_IPSLight,',), + 21829 => array('OnChange','IPSComponentSwitch_Homematic,51577','IPSModuleSwitch_IPSLight,',), + 24251 => array('OnChange','IPSComponentSwitch_Homematic,32432','IPSModuleSwitch_IPSLight,',), + 59698 => array('OnChange','IPSComponentSwitch_Homematic,52619','IPSModuleSwitch_IPSLight,',), + 44813 => array('OnChange','IPSComponentSwitch_Homematic,45579','IPSModuleSwitch_IPSLight,',), + 59385 => array('OnChange','IPSComponentSwitch_Homematic,18743','IPSModuleSwitch_IPSLight,',), + 23938 => array('OnChange','IPSComponentSwitch_Homematic,59085','IPSModuleSwitch_IPSLight,',), + 27759 => array('OnChange','IPSComponentSwitch_Homematic,19661','IPSModuleSwitch_IPSLight,',), + 40701 => array('OnChange','IPSComponentSwitch_Homematic,21631','IPSModuleSwitch_IPSLight,',), + 38623 => array('OnChange','IPSComponentSwitch_Homematic,40611','IPSModuleSwitch_IPSLight,',), + 38770 => array('OnChange','IPSComponentSwitch_Homematic,39307','IPSModuleSwitch_IPSLight,',), + 28061 => array('OnChange','IPSComponentSwitch_Homematic,43774','IPSModuleSwitch_IPSLight,',), + 45125 => array('OnChange','IPSComponentSwitch_Homematic,21540','IPSModuleSwitch_IPSLight,',), + 44303 => array('OnChange','IPSComponentSwitch_Homematic,28131','IPSModuleSwitch_IPSLight,',), + 47363 => array('OnChange','IPSComponentSwitch_Homematic,34233','IPSModuleSwitch_IPSLight,',), + 28929 => array('OnChange','IPSComponentSwitch_Homematic,35891','IPSModuleSwitch_IPSLight,',), + 45624 => array('OnChange','IPSComponentSwitch_Homematic,34391','IPSModuleSwitch_IPSLight,',), + 43699 => array('OnChange','IPSComponentSwitch_Homematic,58524','IPSModuleSwitch_IPSLight,',), + 45045 => array('OnChange','IPSComponentSwitch_Homematic,50936','IPSModuleSwitch_IPSLight,',), + 10699 => array('OnChange','IPSComponentSwitch_Homematic,50862','IPSModuleSwitch_IPSLight,',), + 53528 => array('OnChange','IPSComponentSwitch_Homematic,41458','IPSModuleSwitch_IPSLight,',), + ); + + return $eventConfiguration; + } + + /** + * + * Liefert Liste mit Event Variablen, die vom MessageHandler bearbeitet werden. Diese Liste kann vom Anwender + * frei definiert werden + * + * @return string[] Key-Value Array mit Event Variablen und der dazugehörigen Parametern + */ + function IPSMessageHandler_GetEventConfigurationCust() { + $config = array( + // Synchronisierung MediaPlayer + 39520 => array('OnChange','IPSComponentPlayer_MediaPlayer,24582','IPSModulePlayer_NetPlayer',), + + // Synchronisierung AudioMax + 28071 => array('OnChange','IPSComponentAVControl_AudioMax,25694','IPSModuleAVControl_Entertainment',), + + // Synchronization Shutter Position + 12757 => array('OnChange','IPSComponentShutter_Homematic,50248','IPSModuleShutter_IPSShadowing,',), + 50835 => array('OnChange','IPSComponentShutter_Homematic,24528','IPSModuleShutter_IPSShadowing,',), + 26628 => array('OnChange','IPSComponentShutter_Homematic,56299','IPSModuleShutter_IPSShadowing,',), + 24799 => array('OnChange','IPSComponentShutter_Homematic,15951','IPSModuleShutter_IPSShadowing,',), + 22395 => array('OnChange','IPSComponentShutter_Homematic,20041','IPSModuleShutter_IPSShadowing,',), + 25978 => array('OnChange','IPSComponentShutter_Homematic,15228','IPSModuleShutter_IPSShadowing,',), + 21031 => array('OnChange','IPSComponentShutter_Homematic,35354','IPSModuleShutter_IPSShadowing,',), + + // Taster zur Ansteuerung der Markisen + 59542 /*InpS2*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_IPSShadowing,29095,3',), /*Markise1 ausfahren*/ + 37689 /*InpS6*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_IPSShadowing,29095,9',), /*Markise1 einfahren*/ + 56752 /*InpS3*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_IPSShadowing,44927,3',), /*Markise2 ausfahren*/ + 52590 /*InpS7*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_IPSShadowing,44927,9',), /*Markise2 einfahren*/ + + // Taster zur Ansteuerung von Audio Terrasse + 56247 /*InpL2*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_Entertainment,AudioMax,ToggleMute,0'), /*Muting*/ + 31397 /*InpL6*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_Netplayer,NetPlayer_Switch'), /*Source*/ + 33116 /*InpL3*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_Netplayer,NetPlayer_Prev'), /*Prev Titel*/ + 48165 /*InpL7*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_Netplayer,NetPlayer_Next'), /*Next Titel*/ + 51018 /*InpS4*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_Entertainment,AudioMax,SetVolumeMinus,0'), /*Volume -*/ + 44967 /*InpS8*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_Entertainment,AudioMax,SetVolumePlus,0'), /*Volume +*/ + 35556 /*InpL4*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_Entertainment,Entertainment_SetRoomPowerByRoomId,25854,false'), /*PowerOff*/ + 43222 /*InpL8*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_Entertainment,Entertainment_SetRoomPowerByRoomId,25854,true'), /*PowerOn*/ + + // Taster zur Ansteuerung von Audio Werkstatt + 45699 /*InpL1*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_Entertainment,IPSLight_ToggleSwitchByName,Werkstatt'), /*AllOff*/ + + 57990 /*InpS3*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_Entertainment,Entertainment_SetRoomPowerByRoomId,22483,false'), /*PowerOff*/ + 29675 /*InpS7*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_Entertainment,Entertainment_SetRoomPowerByRoomId,22483,true'), /*PowerOn*/ + 57327 /*InpS4*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_Entertainment,AudioMax,SetVolumeMinus,2'), /*Volume -*/ + 17306 /*InpS8*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_Entertainment,AudioMax,SetVolumePlus,2'), /*Volume +*/ + 33883 /*InpS5*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_Netplayer,NetPlayer_Prev'), /*Prev Titel*/ + 43223 /*InpS9*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_Netplayer,NetPlayer_Next'), /*Next Titel*/ + 33457 /*InpS6*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_Entertainment,AudioMax,ToggleMute,2'), /*Muting*/ + 55566 /*InpS10*/=> array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_Netplayer,NetPlayer_Switch'), /*Source*/ + + 29769 /*InpS1*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_IPSLight,IPSLight_ToggleSwitchByName,Werkstatt2'), + 23427 /*InpS2*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_IPSLight,IPSLight_ToggleSwitchByName,Werkstatt3'), + 17048 /*InpS3*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_Entertainment,Entertainment_SetRoomPowerByRoomId,22483,false'), /*PowerOff*/ + 25690 /*InpS4*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_Entertainment,Entertainment_SetRoomPowerByRoomId,22483,true'), /*PowerOn*/ + 57607 /*InpS5*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_Entertainment,AudioMax,SetVolumeMinus,2'), /*Volume -*/ + 20451 /*InpS6*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_Entertainment,AudioMax,SetVolumePlus,2'), /*Volume +*/ + + // Taster zur Ansteuerung der Terrassenbeleuchtung + 12456 /*InpS1*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_IPSLight,IPSLight_ToggleGroupByName,Aussen'), + 37693 /*InpS5*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_IPSLight,IPSLight_SetProgramNextByName,TerrasseProgram'), + 57359 /*InpL1*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_IPSLight,IPSLight_ToggleSwitchByName,TerrassePergola'), + 55574 /*InpL5*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_IPSLight,IPSLight_ToggleSwitchByName,TerrasseGarten'), + + // Taster zur Ansteuerung der Wellnessbeleuchtung + 10261 /*InpS1*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_IPSLight,IPSLight_ToggleSwitchByName,WellnessSauna'), + 16855 /*InpS3*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_IPSLight,IPSLight_ToggleSwitchByName,WellnessAmbiente'), + 40346 /*InpS4*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_IPSLight,IPSLight_ToggleSwitchByName,WellnessDusche'), + 15719 /*InpS5*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_IPSLight,IPSLight_DimRelativByName,WellnessDecke,-20'), + 37995 /*InpS6*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_IPSLight,IPSLight_DimRelativByName,WellnessDecke,+20'), + 17936 /*InpL5*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_IPSLight,IPSLight_ToggleSwitchByName,WellnessDecke'), + 59657 /*InpL6*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_IPSLight,IPSLight_ToggleSwitchByName,WellnessDecke'), + 47480 /*InpS7*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_IPSLight,IPSLight_DimRelativByName,WellnessWand,-20'), + 45476 /*InpS8*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_IPSLight,IPSLight_DimRelativByName,WellnessWand,+20'), + 34866 /*InpL7*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_IPSLight,IPSLight_ToggleSwitchByName,WellnessWand'), + 45476 /*InpL8*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_IPSLight,IPSLight_ToggleSwitchByName,WellnessWand'), + 26967 /*InpS9*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_IPSLight,IPSLight_ToggleGroupByName,Wellness'), + 21469 /*InpS13*/=> array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_IPSLight,IPSLight_ToggleGroupByName,Wellness'), + 22671 /*InpS14*/=> array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_IPSLight,IPSLight_SetProgramNextByName,WellnessProgram'), + 49275 /*InpL13*/=> array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_Entertainment,Entertainment_SetRoomPowerByRoomId,20231,true'), /*PowerOn*/ + 29320 /*InpL14*/=> array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_Entertainment,Entertainment_SetRoomPowerByRoomId,20231,false'), /*PowerOff*/ + + //59426 /*InpS2*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_IPSLight,IPSLight_ToggleSwitchByName,WellnessSauna'), + //21493 /*InpS10*/ => array('OnUpdate','IPSComponentSensor_Button','IPSModuleSensor_IPSLight,ToggleSwitchByName,???'), + ); + + return $config; + } + + /** + * + * Liefert Liste mit IR Befehlen, die vom MessageHandler bearbeitet werden. + * + * @return string[] Key-Value Array mit Event Variablen und der dazugehörigen Parametern + */ + function IPSMessageHandler_GetEventConfigurationIR() { + $config = array( + 'yamahareceiver.power' => array('IPSComponentSensor_Button','IPSModuleSensor_Entertainment,Entertainment_SetSourceByRoomId,46541,2'), + 'yamahareceiver.volumeplus' => array('IPSComponentSensor_Button','IPSModuleSensor_Entertainment,Entertainment_SetVolumeDiff,16243,5'), + 'yamahareceiver.volumeminus' => array('IPSComponentSensor_Button','IPSModuleSensor_Entertainment,Entertainment_SetVolumeDiff,16243,-5'), + 'yamahareceiver.presetprev' => array('IPSComponentSensor_Button','IPSModuleSensor_Entertainment,','IPSModuleSensor_Netplayer,NetPlayer_Prev'), + 'yamahareceiver.presetnext' => array('IPSComponentSensor_Button','IPSModuleSensor_Entertainment,','IPSModuleSensor_Netplayer,NetPlayer_Next'), + 'sauna.power' => array('IPSComponentSensor_Button','IPSModuleSensor_Entertainment,Entertainment_SetSourceByRoomId,40058,1'), + //'sauna.mute' => array('IPSComponentSensor_Button','IPSModuleSensor_Entertainment,Entertainment_ToggleMuting,23064'), + 'sauna.volumeplus' => array('IPSComponentSensor_Button','IPSModuleSensor_Entertainment,Entertainment_SetVolumeDiff,28925,5'), + 'sauna.volumeminus' => array('IPSComponentSensor_Button','IPSModuleSensor_Entertainment,Entertainment_SetVolumeDiff,28925,-5'), + ); + return $config; + } + + +/** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/config/core/IPSMessageHandler/Examples/IPSMessageHandler_Custom.inc.php b/IPSLibrary/config/core/IPSMessageHandler/Examples/IPSMessageHandler_Custom.inc.php new file mode 100644 index 0000000..81d4016 --- /dev/null +++ b/IPSLibrary/config/core/IPSMessageHandler/Examples/IPSMessageHandler_Custom.inc.php @@ -0,0 +1,115 @@ + + * + */ + + /** + * + * Callback Funktion, die vor dem behandeln eines Events aufgerufen wird + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param string $component, Source Componente + * @param string $module Destination Module + * @return boolean Funktions Ergebnis, bei false wird das Event NICHT weitergereicht + */ + function IPSMessageHandler_BeforeHandleEvent($variable, $value, IPSComponent $component, IPSModule $module) { + switch($variable) { + // Taster zur Ansteuerung der Markisen + case 59542: /*InpS2*/ + case 37689: /*InpS6*/ + case 56752: /*InpS3*/ + case 52590: /*InpS7*/ + + // Taster zur Steuerung der Terrassenbeleuchtung + case 12456: /*InpS1*/ + case 37693: /*InpS5*/ + case 57359: /*InpL1*/ + case 55574: /*InpL5*/ + + // Taster zur Ansteuerung von Audio Terrasse + case 51018: /*InpS4*/ /*Volume-*/ + case 44967: /*InpS8*/ /*Volume+*/ + case 31397: /*InpL6*/ /*Source*/ + case 33116: /*InpL3*/ /*Previous Titel*/ + case 48165: /*InpL7*/ /*Next Titel*/ + case 35556: /*InpL4*/ /*PowerOff*/ + case 43222: /*InpL8*/ /*PowerOn*/ + if (GetValue(42673)==0) { + return true; // Nur bei Anwesenheit + } else { + IPSLogger_Not(__file__, 'Terrassentaster bei Abwesenheit aktiviert ...!!!', 2); + return false; + } + break; + case 57607: + HM_WriteValueBoolean(40393, 'STATE', true); + HM_WriteValueBoolean(40393, 'STATE', false); + break; + case 20451: + HM_WriteValueBoolean(33866, 'STATE', true); + HM_WriteValueBoolean(33866, 'STATE', false); + break; + case 45699: + IPSUtils_Include ("IPSLight.inc.php", "IPSLibrary::app::modules::IPSLight"); + IPSUtils_Include ("Entertainment.inc.php", "IPSLibrary::app::modules::Entertainment"); + if (GetValue(17535)) { + IPSLight_SetSwitch(17535,false); + IPSLight_SetSwitch(23068,false); + IPSLight_SetSwitch(18489,false); + Entertainment_SetRoomPowerByRoomId(22483,false); + } else { + IPSLight_SetSwitch(17535,true); + Entertainment_SetRoomPowerByRoomId(22483,true); + } + return false; + default: + return true; + } + return true; + } + + /** + * + * Callback Funktion, die nach dem behandeln eines Events aufgerufen wird + * + * @param integer $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param string $component, Source Componente + * @param string $module Destination Module + * + */ + function IPSMessageHandler_AfterHandleEvent($variable, $value, IPSComponent $component, IPSModule $module) { + } + + /** + * + * Callback Funktion, die für das Behandeln von IPSLibary Events aufgerufen wird + * + * @param string $variable ID der auslösenden Variable + * @param string $value Wert der Variable + * @param string $module Name des auslösenden Modules + * @param string $event Name des auslösenden Events + * + */ + function IPSMessageHandler_AfterHandleLibraryEvent($variable, $value, $component, $module) { + switch($variable) { + // Taster zur Ansteuerung der Markisen + case 33471: /*InpS2*/ + HM_WriteValueBoolean(15191, 'STATE', $value); + break; + default: + } + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/config/hardware/AudioMax/Default/AudioMax_Configuration.inc.php b/IPSLibrary/config/hardware/AudioMax/Default/AudioMax_Configuration.inc.php new file mode 100644 index 0000000..7cfd42a --- /dev/null +++ b/IPSLibrary/config/hardware/AudioMax/Default/AudioMax_Configuration.inc.php @@ -0,0 +1,73 @@ + + * + * Änderung an den Parametern erfordert ein erneutes Ausführen des Installations Scripts. + * + */ + + /** + * Definition des COM Ports, der für den AudioMax Server verwendet wird. Ist der Port gesetzt, + * wird die Register Variable, die Splitter Instanz und die IO Instanz automatisch angelegt. + * + * Alternativ kann die zu verwendende Register Variable auch nachträglich in der erzeugten + * AudioMax Instanz gesetzt werden. + * + */ + define ('AM_CONFIG_COM_PORT', 'COM15'); + + /** + * Definition der Anzahl der Räume + */ + define ('AM_CONFIG_ROOM_COUNT', 4); + + /** + * Definition des Namens für den Eingang 1 des AudioMax Servers + */ + define ('AM_CONFIG_INPUTNAME1', 'NetPlayer'); + + /** + * Definition des Namens für den Eingang 2 des AudioMax Servers + */ + define ('AM_CONFIG_INPUTNAME2', 'Tuner'); + + /** + * Definition des Namens für den Eingang 3 des AudioMax Servers + */ + define ('AM_CONFIG_INPUTNAME3', 'CD Player'); + + /** + * Definition des Namens für den Eingang 4 des AudioMax Servers + */ + define ('AM_CONFIG_INPUTNAME4', ''); + + /** + * Definition des Namens für den Raum 1 des AudioMax Servers + */ + define ('AM_CONFIG_ROOMNAME1', 'Wohnzimmer'); + + /** + * Definition des Namens für den Raum 2 des AudioMax Servers + */ + define ('AM_CONFIG_ROOMNAME2', 'Zimmer2'); + + /** + * Definition des Namens für den Raum 3 des AudioMax Servers + */ + define ('AM_CONFIG_ROOMNAME3', 'Zimmer3'); + + /** + * Definition des Namens für den Raum 4 des AudioMax Servers + */ + define ('AM_CONFIG_ROOMNAME4', 'Zimmer4'); + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/config/hardware/AudioMax/Examples/AudioMax_DemoConfiguration.inc.php b/IPSLibrary/config/hardware/AudioMax/Examples/AudioMax_DemoConfiguration.inc.php new file mode 100644 index 0000000..c215585 --- /dev/null +++ b/IPSLibrary/config/hardware/AudioMax/Examples/AudioMax_DemoConfiguration.inc.php @@ -0,0 +1,72 @@ + + * + * Änderung an den Parametern erfordert ein erneutes Ausführen des Installations Scripts. + * + */ + + /** + * Definition des COM Ports, der für den AudioMax Server verwendet wird. Ist der Port gesetzt, + * wird die Register Variable, die Splitter Instanz und die IO Instanz automatisch angelegt. + * + * Alternativ kann die zu verwendende Register Variable auch nachträglich in der erzeugten + * AudioMax Instanz gesetzt werden. + * + */ + define ('AM_CONFIG_COM_PORT', ''); + + /** + * Definition der Anzahl der Räume + */ + define ('AM_CONFIG_ROOM_COUNT', 3); + + /** + * Definition des Namens für den Eingang 1 des AudioMax Servers + */ + define ('AM_CONFIG_INPUTNAME1', 'NetPlayer'); + + /** + * Definition des Namens für den Eingang 2 des AudioMax Servers + */ + define ('AM_CONFIG_INPUTNAME2', 'Tuner'); + + /** + * Definition des Namens für den Eingang 3 des AudioMax Servers + */ + define ('AM_CONFIG_INPUTNAME3', ''); + + /** + * Definition des Namens für den Eingang 4 des AudioMax Servers + */ + define ('AM_CONFIG_INPUTNAME4', ''); + + /** + * Definition des Namens für den Raum 1 des AudioMax Servers + */ + define ('AM_CONFIG_ROOMNAME1', 'Terrasse'); + + /** + * Definition des Namens für den Raum 2 des AudioMax Servers + */ + define ('AM_CONFIG_ROOMNAME2', 'Wohnzimmer'); + + /** + * Definition des Namens für den Raum 3 des AudioMax Servers + */ + define ('AM_CONFIG_ROOMNAME3', 'Arbeitszimmer'); + + /** + * Definition des Namens für den Raum 4 des AudioMax Servers + */ + define ('AM_CONFIG_ROOMNAME4', ''); + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/config/hardware/IPSEDIP/Default/IPSEDIP_Configuration.inc.php b/IPSLibrary/config/hardware/IPSEDIP/Default/IPSEDIP_Configuration.inc.php index 1b9a6ca..f4fc60e 100644 --- a/IPSLibrary/config/hardware/IPSEDIP/Default/IPSEDIP_Configuration.inc.php +++ b/IPSLibrary/config/hardware/IPSEDIP/Default/IPSEDIP_Configuration.inc.php @@ -5,7 +5,7 @@ * * EDIP Konfiguration * - * @file Default/IPSEDIP_Configuration.inc.php + * @file IPSEDIP\IPSEDIP_Configuration.inc.php * @author Andreas Brauneis * @version * Version 2.50.1, 31.01.2012
@@ -36,9 +36,6 @@ * - EDIP_CONFIG_REGISTER: ID der Register Variable, die für das EDIP Display verwendet werden soll. Alternativ kann auch das ComPort angegeben * werden (in diesem Fall wird die Register Variable durch die Installations Prozedur automatisch angelegt). * - * - EDIP_CONFIG_COMPORT: Com Port, das zur Kommunikation mit dem EDIP Display genützt werden soll. Wird nichts angegeben, muß die IO-Instance - * manuell angelegt werden. - * * - EDIP_CONFIG_ROOT: Root ID, die für das 1. EDIP Display verwendet werden soll. * * - EDIP_CONFIG_CLASSNAME: Name der Klasse, die zur Ansteuerung des Displays verwendet werden soll, folgende Klassen stehen derzeit zur Auswahl: @@ -61,7 +58,6 @@ * EDIP_CONFIG_NR1 => array( * EDIP_CONFIG_NAME => 'Vorzimmer', * EDIP_CONFIG_REGISTER => 12345, - * EDIP_CONFIG_COMPORT => '', * EDIP_CONFIG_ROOT => 12345, * EDIP_CONFIG_REFRESHMETHOD => EDIP_REFRESHMETHOD _NONE, * EDIP_CONFIG_CLASSNAME => EDIP_CLASSNAME_EDIP43)); diff --git a/IPSLibrary/config/hardware/IPSEDIP/Examples/IPSEDIP_Configuration.inc.php b/IPSLibrary/config/hardware/IPSEDIP/Examples/IPSEDIP_Configuration.inc.php index 8d4036c..3c3a036 100644 --- a/IPSLibrary/config/hardware/IPSEDIP/Examples/IPSEDIP_Configuration.inc.php +++ b/IPSLibrary/config/hardware/IPSEDIP/Examples/IPSEDIP_Configuration.inc.php @@ -5,7 +5,7 @@ * * EDIP Konfiguration * - * @file Examples\IPSEDIP_Configuration.inc.php + * @file IPSEDIP\IPSEDIP_Configuration.inc.php * @author Andreas Brauneis * @version * Version 2.50.1, 31.01.2012
@@ -36,9 +36,6 @@ * - EDIP_CONFIG_REGISTER: ID der Register Variable, die für das EDIP Display verwendet werden soll. Alternativ kann auch das ComPort angegeben * werden (in diesem Fall wird die Register Variable durch die Installations Prozedur automatisch angelegt). * - * - EDIP_CONFIG_COMPORT: Com Port, das zur Kommunikation mit dem EDIP Display genützt werden soll. Wird nichts angegeben, muß die IO-Instance - * manuell angelegt werden. - * * - EDIP_CONFIG_ROOT: Root ID, die für das 1. EDIP Display verwendet werden soll. * * - EDIP_CONFIG_CLASSNAME: Name der Klasse, die zur Ansteuerung des Displays verwendet werden soll, folgende Klassen stehen derzeit zur Auswahl: @@ -61,7 +58,6 @@ * EDIP_CONFIG_NR1 => array( * EDIP_CONFIG_NAME => 'Vorzimmer', * EDIP_CONFIG_REGISTER => 12345, - * EDIP_CONFIG_COMPORT => '', * EDIP_CONFIG_ROOT => 12345, * EDIP_CONFIG_REFRESHMETHOD => EDIP_REFRESHMETHOD _NONE, * EDIP_CONFIG_CLASSNAME => EDIP_CLASSNAME_EDIP43)); @@ -91,14 +87,12 @@ function IPSEDIP_GetConfiguration() { return array( EDIP_CONFIG_NR1 => array(EDIP_CONFIG_NAME => 'Vorzimmer', EDIP_CONFIG_REGISTER => '', - EDIP_CONFIG_COMPORT => 'COM1', EDIP_CONFIG_ROOT => 19585, EDIP_CONFIG_REFRESHMETHOD => EDIP_REFRESHMETHOD_BOTH, EDIP_CONFIG_CLASSNAME => EDIP_CLASSNAME_EDIP43), EDIP_CONFIG_NR2 => array(EDIP_CONFIG_NAME => 'Obergeschoss', EDIP_CONFIG_REGISTER => '', - EDIP_CONFIG_COMPORT => 'COM2', EDIP_CONFIG_ROOT => 'Visualization.EDIP.Obergeschoss', EDIP_CONFIG_REFRESHMETHOD => EDIP_REFRESHMETHOD_NONE, EDIP_CONFIG_CLASSNAME => EDIP_CLASSNAME_EDIP43), diff --git a/IPSLibrary/config/hardware/IPSHomematic/Default/IPSHomematic_Configuration.inc.php b/IPSLibrary/config/hardware/IPSHomematic/Default/IPSHomematic_Configuration.inc.php new file mode 100644 index 0000000..02c3c53 --- /dev/null +++ b/IPSLibrary/config/hardware/IPSHomematic/Default/IPSHomematic_Configuration.inc.php @@ -0,0 +1,81 @@ + + * + */ + + /** + * + * Defintion der Homematic Instanzen + * + * Die Konfiguration erfolgt in Form eines Arrays, für jede Homematic Instanz wird ein Eintrag im Array erzeugt. + * Name - Name des jeweiligen Homematic Devices + * + * HM_PROPERTY_SERIAL - Seriennummer des Homematic Devices + * + * HM_PROPERTY_CHANNEL - Kanal des Homematic Devices + * + * HM_PROPERTY_PROTOCOL - Protokoll des Homematic Devices (Wired oder Funk), mögliche Werte: + * HM_PROTOCOL_BIDCOSRF - Funk + * HM_PROTOCOL_BIDCOSWI - Wired + * + * HM_PROPERTY_TYPE - Type des Homematic Devices, mögliche Werte: + * HM_TYPE_LIGHT + * HM_TYPE_SHUTTER + * HM_TYPE_DIMMER + * HM_TYPE_BUTTON + * HM_TYPE_SMOKEDETECTOR + * HM_TYPE_SWITCH + * + * Eine ausführliche Beispielliste findet sich auch im Example Ordner + * + * Beispiel: + * @code + function IPSPowerControl_GetSensorConfiguration() { + return array( + 'Name1' => array(HM_PROPERTY_SERIAL => 'IEQ0004711', + HM_PROPERTY_CHANNEL => 1, + HM_PROPERTY_PROTOCOL => HM_PROTOCOL_BIDCOSRF, + HM_PROPERTY_TYPE => HM_TYPE_LIGHT, + ), + 'Name2' => array(HM_PROPERTY_SERIAL => 'IEQ0004712', + HM_PROPERTY_CHANNEL => 1, + HM_PROPERTY_PROTOCOL => HM_PROTOCOL_BIDCOSRF, + HM_PROPERTY_TYPE => HM_TYPE_DIMMER, + ), + ); + } + * @endcocde + * + * @return string Liefert Array mit den Daten der Mess Sensoren + */ + + function get_HomematicConfiguration() { + return array( + ); + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/config/hardware/IPSHomematic/Default/IPSHomematic_Custom.inc.php b/IPSLibrary/config/hardware/IPSHomematic/Default/IPSHomematic_Custom.inc.php new file mode 100644 index 0000000..782fba4 --- /dev/null +++ b/IPSLibrary/config/hardware/IPSHomematic/Default/IPSHomematic_Custom.inc.php @@ -0,0 +1,37 @@ + + * + * File mit Customer spezifischen Funktionen für IPSHomematic + * + */ + + function IPSHomematic_OnActivateSmokeDetector($variableId) { + $detectorName = IPS_GetName(IPS_GetParent($variableId)); + IPSLogger_Wrn(__file__, 'Alarm by SmokeDetector '.$detectorName); + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/config/hardware/IPSHomematic/Examples/IPSHomematic_Configuration.inc.php b/IPSLibrary/config/hardware/IPSHomematic/Examples/IPSHomematic_Configuration.inc.php new file mode 100644 index 0000000..9dc36f1 --- /dev/null +++ b/IPSLibrary/config/hardware/IPSHomematic/Examples/IPSHomematic_Configuration.inc.php @@ -0,0 +1,187 @@ + + * + */ + + /** + * + * Defintion der Homematic Instanzen + * + * Die Konfiguration erfolgt in Form eines Arrays, für jede Homematic Instanz wird ein Eintrag im Array erzeugt. + * Name - Name des jeweiligen Homematic Devices + * + * HM_PROPERTY_SERIAL - Seriennummer des Homematic Devices + * + * HM_PROPERTY_CHANNEL - Kanal des Homematic Devices + * + * HM_PROPERTY_PROTOCOL - Protokoll des Homematic Devices (Wired oder Funk), mögliche Werte: + * HM_PROTOCOL_BIDCOSRF - Funk + * HM_PROTOCOL_BIDCOSWI - Wired + * + * HM_PROPERTY_TYPE - Type des Homematic Devices, mögliche Werte: + * HM_TYPE_LIGHT + * HM_TYPE_SHUTTER + * HM_TYPE_DIMMER + * HM_TYPE_BUTTON + * HM_TYPE_SMOKEDETECTOR + * HM_TYPE_SWITCH + * + * Eine ausführliche Beispielliste findet sich auch im Example Ordner + * + * Beispiel: + * @code + function IPSPowerControl_GetSensorConfiguration() { + return array( + 'Name1' => array(HM_PROPERTY_SERIAL => 'IEQ0004711', + HM_PROPERTY_CHANNEL => 1, + HM_PROPERTY_PROTOCOL => HM_PROTOCOL_BIDCOSRF, + HM_PROPERTY_TYPE => HM_TYPE_LIGHT, + ), + 'Name2' => array(HM_PROPERTY_SERIAL => 'IEQ0004712', + HM_PROPERTY_CHANNEL => 1, + HM_PROPERTY_PROTOCOL => HM_PROTOCOL_BIDCOSRF, + HM_PROPERTY_TYPE => HM_TYPE_DIMMER, + ), + ); + } + * @endcocde + * + * @return string Liefert Array mit den Daten der Mess Sensoren + */ + function get_HomematicConfiguration() { + return array( + // ===== Werkstatt ======================================================================== + 'HW127Wer_Inp1' => array('HEQ0150317', 1, HM_PROTOCOL_BIDCOSWI, HM_TYPE_BUTTON), + 'HW127Wer_Inp2' => array('HEQ0150317', 2, HM_PROTOCOL_BIDCOSWI, HM_TYPE_BUTTON), + 'HW127Wer_Inp3' => array('HEQ0150317', 3, HM_PROTOCOL_BIDCOSWI, HM_TYPE_BUTTON), + 'HW127Wer_Inp4' => array('HEQ0150317', 4, HM_PROTOCOL_BIDCOSWI, HM_TYPE_BUTTON), + 'HW127Wer_Inp5' => array('HEQ0150317', 5, HM_PROTOCOL_BIDCOSWI, HM_TYPE_BUTTON), + 'HW127Wer_Inp6' => array('HEQ0150317', 6, HM_PROTOCOL_BIDCOSWI, HM_TYPE_BUTTON), + 'HW127Wer_Inp7' => array('HEQ0150317', 7, HM_PROTOCOL_BIDCOSWI, HM_TYPE_BUTTON), + 'HW127Wer_Inp8' => array('HEQ0150317', 8, HM_PROTOCOL_BIDCOSWI, HM_TYPE_BUTTON), + 'HW127Wer_Inp9' => array('HEQ0150317', 9, HM_PROTOCOL_BIDCOSWI, HM_TYPE_BUTTON), + 'HW127Wer_Inp10' => array('HEQ0150317',10, HM_PROTOCOL_BIDCOSWI, HM_TYPE_BUTTON), + + 'HW127Wer_Inp1' => array('HEQ0150317', 1, HM_PROTOCOL_BIDCOSWI, HM_TYPE_BUTTON), + 'HW127Ter_Inp1' => array('IEQ0241773', 1, HM_PROTOCOL_BIDCOSWI, HM_TYPE_BUTTON), + 'HW127Ter_Inp2' => array('IEQ0241773', 2, HM_PROTOCOL_BIDCOSWI, HM_TYPE_BUTTON), + 'HW127Ter_Inp3' => array('IEQ0241773', 3, HM_PROTOCOL_BIDCOSWI, HM_TYPE_BUTTON), + 'HW127Ter_Inp4' => array('IEQ0241773', 4, HM_PROTOCOL_BIDCOSWI, HM_TYPE_BUTTON), + 'HW127Ter_Inp5' => array('IEQ0241773', 5, HM_PROTOCOL_BIDCOSWI, HM_TYPE_BUTTON), + 'HW127Ter_Inp6' => array('IEQ0241773', 6, HM_PROTOCOL_BIDCOSWI, HM_TYPE_BUTTON), + 'HW127Ter_Inp7' => array('IEQ0241773', 7, HM_PROTOCOL_BIDCOSWI, HM_TYPE_BUTTON), + 'HW127Ter_Inp8' => array('IEQ0241773', 8, HM_PROTOCOL_BIDCOSWI, HM_TYPE_BUTTON), + 'HW127Ter_Out1' => array('IEQ0241773', 13, HM_PROTOCOL_BIDCOSWI, HM_TYPE_SWITCH), + 'HW127Ter_Out2' => array('IEQ0241773', 14, HM_PROTOCOL_BIDCOSWI, HM_TYPE_SWITCH), + 'HW127Ter_Out3' => array('IEQ0241773', 15, HM_PROTOCOL_BIDCOSWI, HM_TYPE_SWITCH), + 'HW127Ter_Out4' => array('IEQ0241773', 16, HM_PROTOCOL_BIDCOSWI, HM_TYPE_SWITCH), + 'HWShuMar1_Inp1' => array('FEQ0059849', 1, HM_PROTOCOL_BIDCOSWI, HM_TYPE_BUTTON), + 'HWShuMar1_Inp2' => array('FEQ0059849', 2, HM_PROTOCOL_BIDCOSWI, HM_TYPE_BUTTON), + 'HWShuMar1_Out' => array('FEQ0059849', 3, HM_PROTOCOL_BIDCOSWI, HM_TYPE_SHUTTER), + 'HWShuMar2_Inp1' => array('HEQ0236625', 1, HM_PROTOCOL_BIDCOSWI, HM_TYPE_BUTTON), + 'HWShuMar2_Inp2' => array('HEQ0236625', 2, HM_PROTOCOL_BIDCOSWI, HM_TYPE_BUTTON), + 'HWShuMar2_Out' => array('HEQ0236625', 3, HM_PROTOCOL_BIDCOSWI, HM_TYPE_SHUTTER), + + // ===== HomeControl ==================================================================== + 'Verteiler_Sprechanlage' => array('HEQ0150195', 1, HM_PROTOCOL_BIDCOSWI, HM_TYPE_BUTTON), + 'KG_127HC_13_WLAN' => array('HEQ0150195', 13, HM_PROTOCOL_BIDCOSWI, HM_TYPE_LIGHT), + 'KG_127HC_14_IRTrans' => array('HEQ0150195', 14, HM_PROTOCOL_BIDCOSWI, HM_TYPE_LIGHT), + 'KG_127HC_15_Wohnzimmer' => array('HEQ0150195', 15, HM_PROTOCOL_BIDCOSWI, HM_TYPE_LIGHT), + 'KG_127HC_16_Wellness' => array('HEQ0150195', 16, HM_PROTOCOL_BIDCOSWI, HM_TYPE_LIGHT), + 'KG_127HC_17_Firewall' => array('HEQ0150195', 17, HM_PROTOCOL_BIDCOSWI, HM_TYPE_LIGHT), + 'KG_127HC_18_Camera' => array('HEQ0150195', 18, HM_PROTOCOL_BIDCOSWI, HM_TYPE_LIGHT), + + // ===== Werkstatt ====================================================================== + 'Werkstatt_Licht' => array('HEQ0150317', 13, HM_PROTOCOL_BIDCOSWI, HM_TYPE_LIGHT), + 'Werkstatt_Garten1' => array('HEQ0150317', 14, HM_PROTOCOL_BIDCOSWI, HM_TYPE_LIGHT), + 'Werkstatt_Garten2' => array('HEQ0150317', 15, HM_PROTOCOL_BIDCOSWI, HM_TYPE_LIGHT), + + // ===== Wellness==== ================================================================== + 'Wellness_Sauna' => array('HEQ0150259', 13, HM_PROTOCOL_BIDCOSWI, HM_TYPE_LIGHT), + 'Wellness_Sockel' => array('HEQ0150259', 14, HM_PROTOCOL_BIDCOSWI, HM_TYPE_LIGHT), + 'Wellness_Dusche' => array('HEQ0150259', 15, HM_PROTOCOL_BIDCOSWI, HM_TYPE_LIGHT), + 'Wellness_Wand' => array('IEQ0000135', 1, HM_PROTOCOL_BIDCOSRF, HM_TYPE_DIMMER), + 'Wellness_Decke' => array('IEQ0000135', 2, HM_PROTOCOL_BIDCOSRF, HM_TYPE_DIMMER), + 'Wellness_Schalter1' => array('HEQ0150259', 1, HM_PROTOCOL_BIDCOSWI, HM_TYPE_BUTTON), + 'Wellness_Schalter2' => array('HEQ0150259', 2, HM_PROTOCOL_BIDCOSWI, HM_TYPE_BUTTON), + 'Wellness_Schalter3' => array('HEQ0150259', 3, HM_PROTOCOL_BIDCOSWI, HM_TYPE_BUTTON), + 'Wellness_Schalter4' => array('HEQ0150259', 4, HM_PROTOCOL_BIDCOSWI, HM_TYPE_BUTTON), + 'Wellness_Schalter5' => array('HEQ0150259', 5, HM_PROTOCOL_BIDCOSWI, HM_TYPE_BUTTON), + 'Wellness_Schalter6' => array('HEQ0150259', 6, HM_PROTOCOL_BIDCOSWI, HM_TYPE_BUTTON), + 'Wellness_Schalter7' => array('HEQ0150259', 7, HM_PROTOCOL_BIDCOSWI, HM_TYPE_BUTTON), + 'Wellness_Schalter8' => array('HEQ0150259', 8, HM_PROTOCOL_BIDCOSWI, HM_TYPE_BUTTON), + 'Wellness_Schalter9' => array('HEQ0150259', 9, HM_PROTOCOL_BIDCOSWI, HM_TYPE_BUTTON), + 'Wellness_Schalter10' => array('HEQ0150259', 10, HM_PROTOCOL_BIDCOSWI, HM_TYPE_BUTTON), + 'Wellness_Schalter13' => array('HEQ0360531', 1, HM_PROTOCOL_BIDCOSRF, HM_TYPE_BUTTON), + 'Wellness_Schalter14' => array('HEQ0360531', 2, HM_PROTOCOL_BIDCOSRF, HM_TYPE_BUTTON), + + // ===== Erdgeschoss ================================================================== + 'Licht_Esstisch' => array('IEQ0021066', 1, HM_PROTOCOL_BIDCOSRF, HM_TYPE_LIGHT), + 'Licht_Wohnzimmer' => array('IEQ0021445', 1, HM_PROTOCOL_BIDCOSRF, HM_TYPE_LIGHT), + 'Licht_Küche' => array('IEQ0021077', 1, HM_PROTOCOL_BIDCOSRF, HM_TYPE_LIGHT), + 'Licht_Wohnbereich' => array('IEQ0021074', 1, HM_PROTOCOL_BIDCOSRF, HM_TYPE_LIGHT), + 'Licht_Abstellraum' => array('IEQ0021049', 1, HM_PROTOCOL_BIDCOSRF, HM_TYPE_LIGHT), + 'Licht_Arbeitszimmer' => array('IEQ0021062', 1, HM_PROTOCOL_BIDCOSRF, HM_TYPE_LIGHT), + 'Licht_WC' => array('IEQ0021479', 1, HM_PROTOCOL_BIDCOSRF, HM_TYPE_LIGHT), + 'Licht_Vorzimmer' => array('IEQ0021114', 1, HM_PROTOCOL_BIDCOSRF, HM_TYPE_LIGHT), + 'Licht_Terrasse' => array('IEQ0021395', 1, HM_PROTOCOL_BIDCOSRF, HM_TYPE_LIGHT), + + // ===== Obergeschoss ================================================================== + 'Licht_Bad' => array('IEQ0021160', 1, HM_PROTOCOL_BIDCOSRF, HM_TYPE_LIGHT), + 'Licht_Kinderzimmer' => array('IEQ0021333', 1, HM_PROTOCOL_BIDCOSRF, HM_TYPE_LIGHT), + 'Licht_Schlafzimmer' => array('IEQ0021334', 1, HM_PROTOCOL_BIDCOSRF, HM_TYPE_LIGHT), + 'Licht_Schrankraum' => array('IEQ0021350', 1, HM_PROTOCOL_BIDCOSRF, HM_TYPE_LIGHT), + 'Licht_Gästezimmer' => array('IEQ0021056', 1, HM_PROTOCOL_BIDCOSRF, HM_TYPE_LIGHT), + 'Licht_VorraumOG' => array('IEQ0021182', 1, HM_PROTOCOL_BIDCOSRF, HM_TYPE_LIGHT), + 'Licht_StiegeOG' => array('IEQ0021112', 1, HM_PROTOCOL_BIDCOSRF, HM_TYPE_LIGHT), + + // ===== Kellergeschoss ================================================================== + 'Licht_StiegeKG' => array('IEQ0021054', 1, HM_PROTOCOL_BIDCOSRF, HM_TYPE_LIGHT), + 'Licht_Technikraum' => array('IEQ0021186', 1, HM_PROTOCOL_BIDCOSRF, HM_TYPE_LIGHT), + + // ===== Jalousien ================================================================== + 'Jalousie_Kinderzimmer' => array('HEQ0353925', 1, HM_PROTOCOL_BIDCOSRF, HM_TYPE_SHUTTER), + 'Jalousie_Gästezimmer' => array('HEQ0354020', 1, HM_PROTOCOL_BIDCOSRF, HM_TYPE_SHUTTER), + 'Jalousie_Küche' => array('HEQ0353832', 1, HM_PROTOCOL_BIDCOSRF, HM_TYPE_SHUTTER), + 'Jalousie_Wohnzimmer' => array('HEQ0354005', 1, HM_PROTOCOL_BIDCOSRF, HM_TYPE_SHUTTER), + 'Jalousie_Terrasse' => array('HEQ0353776', 1, HM_PROTOCOL_BIDCOSRF, HM_TYPE_SHUTTER), + + // ===== Rauchmelder ================================================================== + 'Rauchmelder_OG' => array('HEQ0403640', 1, HM_PROTOCOL_BIDCOSRF, HM_TYPE_SMOKEDETECTOR), + 'Rauchmelder_KG' => array('IEQ0509539', 1, HM_PROTOCOL_BIDCOSRF, HM_TYPE_SMOKEDETECTOR), + + // ===== Beregnungssteuerung ================================================================== + 'Gardena_1' => array('IEQ0040620', 1, HM_PROTOCOL_BIDCOSRF, HM_TYPE_SWITCH), + 'Gardena_2' => array('IEQ0040620', 2, HM_PROTOCOL_BIDCOSRF, HM_TYPE_SWITCH), + 'Gardena_3' => array('IEQ0040620', 3, HM_PROTOCOL_BIDCOSRF, HM_TYPE_SWITCH), + 'Gardena_4' => array('IEQ0040620', 4, HM_PROTOCOL_BIDCOSRF, HM_TYPE_SWITCH), + ); + } + + /** @}*/ + +?> \ No newline at end of file diff --git a/IPSLibrary/config/hardware/IPSHomematic/Examples/IPSHomematic_Custom.inc.php b/IPSLibrary/config/hardware/IPSHomematic/Examples/IPSHomematic_Custom.inc.php new file mode 100644 index 0000000..0b23350 --- /dev/null +++ b/IPSLibrary/config/hardware/IPSHomematic/Examples/IPSHomematic_Custom.inc.php @@ -0,0 +1,38 @@ + + * + * File mit Customer spezifischen Funktionen für IPSHomematic + * + */ + + function IPSHomematic_OnActivateSmokeDetector($variableId) { + $detectorName = IPS_GetName(IPS_GetParent($variableId)); + IPSLogger_Wrn(__file__, 'Alarm by SmokeDetector '.$detectorName); + IPSLogger_SendProwlMessage('Alarm', 'Rauchmelder "'.$detectorName.'" hat ausgelöst !!!', 0); + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/config/modules/Charts/IPSHighcharts/Default/IPSHighcharts_Custom.inc.php b/IPSLibrary/config/modules/Charts/IPSHighcharts/Default/IPSHighcharts_Custom.inc.php new file mode 100644 index 0000000..ca0359d --- /dev/null +++ b/IPSLibrary/config/modules/Charts/IPSHighcharts/Default/IPSHighcharts_Custom.inc.php @@ -0,0 +1,65 @@ + + * + * Callback Methoden für IPSHighcharts + * + */ + + /** + * Diese Funktion wird vor der Anzeige eines Charts aufgerufen + * + * Hier ist es zum Beispiel diverse Highchartsparameter wie die Stack Konfiguration zu ändern + * + * Parameters: + * @param integer $varID Variable, die zur Highcharts Anzeige verwendet wird + * @param integer $chartID Chart Variable, die zur Highcharts Anzeige verwendet wird + * @param array $CfgDaten Highcharts Konfigurations Daten + * + */ + function IPSHighcharts_BeforeBuildChart($varID, $chartID, &$CfgDaten) { + } + + /** + * Diese Funktion wird nach der Anzeige eines Charts aufgerufen + * + * Parameters: + * @param integer $varID Variable, die zur Highcharts Anzeige verwendet wird + * @param integer $chartID Chart Variable, die zur Highcharts Anzeige verwendet wird + * @param array $CfgDaten Highcharts Konfigurations Daten + * + */ + function IPSHighcharts_AfterBuildChart($varID, $chartID, $CfgDaten) { + } + + /** @}*/ + +?> \ No newline at end of file diff --git a/IPSLibrary/config/modules/Entertainment/Default/Entertainment_Configuration.inc.php b/IPSLibrary/config/modules/Entertainment/Default/Entertainment_Configuration.inc.php index 09a3cf0..682a7f7 100644 --- a/IPSLibrary/config/modules/Entertainment/Default/Entertainment_Configuration.inc.php +++ b/IPSLibrary/config/modules/Entertainment/Default/Entertainment_Configuration.inc.php @@ -65,7 +65,7 @@ function get_CommunicationConfiguration () { // Defintion of Room Configuration // ======================================================================================================================== function get_RoomConfiguration () { - return array ( + return array ( ); } @@ -81,7 +81,7 @@ function get_DeviceConfiguration () { // Defintion of Source Configuration // ======================================================================================================================== function get_SourceConfiguration() { - return array ( + return array ( ); } diff --git a/IPSLibrary/config/modules/Entertainment/Examples/Entertainment_AudioMaxConfiguration.inc.php b/IPSLibrary/config/modules/Entertainment/Examples/Entertainment_AudioMaxConfiguration.inc.php index df0bc72..15045dd 100644 --- a/IPSLibrary/config/modules/Entertainment/Examples/Entertainment_AudioMaxConfiguration.inc.php +++ b/IPSLibrary/config/modules/Entertainment/Examples/Entertainment_AudioMaxConfiguration.inc.php @@ -14,9 +14,9 @@ * @file Entertainment_AudioMaxConfiguration.inc.php * @author Andreas Brauneis * @version - * Version 2.50.1, 31.01.2012
+ * Version 2.50.1, 31.01.2012
* - */ + */ IPSUtils_Include ("AudioMax.inc.php", "IPSLibrary::app::hardware::AudioMax"); IPSUtils_Include ("Entertainment_Constants.inc.php", "IPSLibrary::app::modules::Entertainment"); @@ -25,7 +25,7 @@ define ("c_Comm_WinLIRC", "WinLIRC"); define ("c_Comm_Onkyo", "Onkyo"); - define ("c_Comm_NetPlayer", "NetPlayer"); + define ("c_Comm_NetPlayer", "NetPlayer"); define ("c_Comm_AudioMax", "AudioMax"); define ("c_Room_1", "Raum 1"); @@ -71,9 +71,8 @@ function get_CommunicationConfiguration () { ), c_Comm_AudioMax => array ( c_Property_ScriptSnd => 'Entertainment_InterfaceIPSComponentAVControl.inc.php', - //c_Property_ScriptRcv => 'Entertainment_InterfaceIPSComponentAVControl.inc.php', c_Property_FunctionSnd => 'Entertainment_IPSComponent_SendData', - c_Property_ComponentParams => '', + c_Property_ComponentParams => 'IPSComponentAVControl_AudioMax,null', ), ); } @@ -157,13 +156,13 @@ function get_DeviceConfiguration () { c_Property_Name => 'AudioMax 1', c_Control_DevicePower => array( c_Property_Name => 'Power', - c_Property_CommPowerOn => array(c_Comm_AudioMax, 'SetPower', '0', true), - c_Property_CommPowerOff => array(c_Comm_AudioMax, 'SetPower', '0', false), + c_Property_CommPowerOn => array(c_Comm_AudioMax, 'SetPower', '0', '1'), + c_Property_CommPowerOff => array(c_Comm_AudioMax, 'SetPower', '0', '0'), ), c_Control_Muting => array( c_Property_Name => 'Mute', - c_Property_CommMuteOn => array(c_Comm_AudioMax, 'SetMute', '0', true), - c_Property_CommMuteOff => array(c_Comm_AudioMax, 'SetMute', '0', false), + c_Property_CommMuteOn => array(c_Comm_AudioMax, 'SetMute', '0', '1'), + c_Property_CommMuteOff => array(c_Comm_AudioMax, 'SetMute', '0', '0'), ), c_Control_Volume => array( c_Property_Name => 'Volume', c_Property_MinValue => 0, c_Property_MaxValue => 100, c_Property_Limit => 80, @@ -191,13 +190,13 @@ function get_DeviceConfiguration () { c_Property_Name => 'AudioMax 2', c_Control_DevicePower => array( c_Property_Name => 'Power', - c_Property_CommPowerOn => array(c_Comm_AudioMax, 'SetPower', '1', true), - c_Property_CommPowerOff => array(c_Comm_AudioMax, 'SetPower', '1', false), + c_Property_CommPowerOn => array(c_Comm_AudioMax, 'SetPower', '1', '1'), + c_Property_CommPowerOff => array(c_Comm_AudioMax, 'SetPower', '1', '0'), ), c_Control_Muting => array( c_Property_Name => 'Mute', - c_Property_CommMuteOn => array(c_Comm_AudioMax, 'SetMute', '1', true), - c_Property_CommMuteOff => array(c_Comm_AudioMax, 'SetMute', '1', false), + c_Property_CommMuteOn => array(c_Comm_AudioMax, 'SetMute', '1', '1'), + c_Property_CommMuteOff => array(c_Comm_AudioMax, 'SetMute', '1', '0'), ), c_Control_Volume => array( c_Property_Name => 'Volume', c_Property_MinValue => 0, c_Property_MaxValue => 100, c_Property_Limit => 80, @@ -225,13 +224,13 @@ function get_DeviceConfiguration () { c_Property_Name => 'AudioMax 3', c_Control_DevicePower => array( c_Property_Name => 'Power', - c_Property_CommPowerOn => array(c_Comm_AudioMax, 'SetPower', '2', true), - c_Property_CommPowerOff => array(c_Comm_AudioMax, 'SetPower', '2', false), + c_Property_CommPowerOn => array(c_Comm_AudioMax, 'SetPower', '2', '1'), + c_Property_CommPowerOff => array(c_Comm_AudioMax, 'SetPower', '2', '0'), ), c_Control_Muting => array( c_Property_Name => 'Mute', - c_Property_CommMuteOn => array(c_Comm_AudioMax, 'SetMute', '2', true), - c_Property_CommMuteOff => array(c_Comm_AudioMax, 'SetMute', '2', false), + c_Property_CommMuteOn => array(c_Comm_AudioMax, 'SetMute', '2', '1'), + c_Property_CommMuteOff => array(c_Comm_AudioMax, 'SetMute', '2', '0'), ), c_Control_Volume => array( c_Property_Name => 'Volume', c_Property_MinValue => 0, c_Property_MaxValue => 100, c_Property_Limit => 80, @@ -259,13 +258,13 @@ function get_DeviceConfiguration () { c_Property_Name => 'AudioMax 4', c_Control_DevicePower => array( c_Property_Name => 'Power', - c_Property_CommPowerOn => array(c_Comm_AudioMax, 'SetPower', '3', true), - c_Property_CommPowerOff => array(c_Comm_AudioMax, 'SetPower', '3', false), + c_Property_CommPowerOn => array(c_Comm_AudioMax, 'SetPower', '3', '1'), + c_Property_CommPowerOff => array(c_Comm_AudioMax, 'SetPower', '3', '0'), ), c_Control_Muting => array( c_Property_Name => 'Mute', - c_Property_CommMuteOn => array(c_Comm_AudioMax, 'SetMute', '3', true), - c_Property_CommMuteOff => array(c_Comm_AudioMax, 'SetMute', '3', false), + c_Property_CommMuteOn => array(c_Comm_AudioMax, 'SetMute', '3', '1'), + c_Property_CommMuteOff => array(c_Comm_AudioMax, 'SetMute', '3', '0'), ), c_Control_Volume => array( c_Property_Name => 'Volume', c_Property_MinValue => 0, c_Property_MaxValue => 100, c_Property_Limit => 80, diff --git a/IPSLibrary/config/modules/Entertainment/Examples/Entertainment_DemoConfiguration.inc.php b/IPSLibrary/config/modules/Entertainment/Examples/Entertainment_DemoConfiguration.inc.php index e6429cb..8cc7d5e 100644 --- a/IPSLibrary/config/modules/Entertainment/Examples/Entertainment_DemoConfiguration.inc.php +++ b/IPSLibrary/config/modules/Entertainment/Examples/Entertainment_DemoConfiguration.inc.php @@ -1,8 +1,9 @@ * */ + IPSUtils_Include ("AudioMax.inc.php", "IPSLibrary::app::hardware::AudioMax"); IPSUtils_Include ("Entertainment_Constants.inc.php", "IPSLibrary::app::modules::Entertainment"); IPSUtils_Include ("NetPlayer_Constants.inc.php", "IPSLibrary::app::modules::NetPlayer"); IPSUtils_Include ("NetPlayer_Configuration.inc.php", "IPSLibrary::config::modules::NetPlayer"); - define ("c_Comm_WinLIRC", "WinLIRC"); - define ("c_Comm_Onkyo", "Onkyo"); + define ("c_Comm_WinLIRC", "WinLIRC"); + define ("c_Comm_Onkyo", "Onkyo"); define ("c_Comm_NetPlayer", "NetPlayer"); - define ("c_Comm_AudioMax", "AudioMax"); + define ("c_Comm_AudioMax", "AudioMax"); - define ("c_Room_Wellness", "Wellness"); - define ("c_Room_Sauna", "Sauna"); - define ("c_Room_LivingRoom", "Wohnzimmer"); + define ("c_Room_Wellness", "Wellness"); + define ("c_Room_Sauna", "Sauna"); + define ("c_Room_LivingRoom", "Wohnzimmer"); + define ("c_Room_Terrasse", "Terrasse"); + define ("c_Room_Werkstatt", "Werkstatt"); - define ("c_Device_NetPlayer", "NetPlayer"); - define ("c_Device_YamahaMain", "YamahaMain"); - define ("c_Device_YamahaTuner", "YamahaTuner"); - define ("c_Device_OnkyoMain", "OnkyoMain"); + define ("c_Device_NetPlayer", "NetPlayer"); + define ("c_Device_AudioMax1", "AudioMax1"); + define ("c_Device_AudioMax2", "AudioMax2"); + define ("c_Device_AudioMax3", "AudioMax3"); + define ("c_Device_OnkyoMain", "OnkyoMain"); define ("c_Device_OnkyoZone2", "OnkyoZone2"); define ("c_Device_OnkyoTuner", "OnkyoTuner"); - define ("c_Device_PanasonicVCR", "PanasonicVCR"); + define ("c_Device_PanasonicVCR", "PanasonicVCR"); define ("c_Device_PanasonicBD", "PanasonicBD"); define ("c_Device_TopfieldSat", "TopfieldSat"); - define ("c_Device_PhilipsTV", "PhilipsTV"); + define ("c_Device_PhilipsTV", "PhilipsTV"); define ("c_Device_SanyoBeamer", "SanyoBeamer"); // ======================================================================================================================== @@ -48,37 +53,65 @@ function get_CommunicationConfiguration () { return array ( c_Comm_WinLIRC => array ( - c_Property_ScriptSnd => 'Entertainment_InterfaceWinLIRCSnd.inc.php', - c_Property_ScriptRcv => 'Entertainment_InterfaceWinLIRCRcv.ips.php', - c_Property_FunctionSnd => 'WinLIRC_SendData', - c_Property_Instance => null, - c_Property_MessageTypes => array(), - c_Property_InpTranslationList => array(), - c_Property_OutTranslationList => array(), - c_Property_PowerDelay => array(), + c_Property_ScriptSnd => 'Entertainment_InterfaceWinLIRCSnd.inc.php', + c_Property_ScriptRcv => 'Entertainment_InterfaceWinLIRCRcv.ips.php', + c_Property_FunctionSnd => 'WinLIRC_SendData', + c_Property_Instance => '', + c_Property_MessageTypes => array('philipstv' => c_MessageType_Info, /*Default is MessageType Action*/), + c_Property_InpTranslationList => array('sauna' => 'onkyotuner', + 'sauna.volumeplus' => 'onkyoreceiver.volumeplusz2', + 'sauna.volumeminus' => 'onkyoreceiver.volumeminusz2', + 'sauna.mute' => 'onkyoreceiver.mutez2', + 'sauna.power' => 'onkyoreceiver.zone2power',), + c_Property_OutTranslationList => array( + 'onkyoreceiver.volumeplusz2' => array('*.*','*.*','*.*'), + 'onkyoreceiver.volumeminusz2' => array('*.*','*.*','*.*'), + 'philipstv2' => array('philipstv.*'), + 'philipstv.p1' => array('*.1', '*.ok'), + 'philipstv.p2' => array('*.2', '*.ok'), + 'philipstv.p3' => array('*.3', '*.ok'), + 'philipstv.p4' => array('*.4', '*.ok'), + 'philipstv.p5' => array('*.5', '*.ok'), + 'philipstv.p6' => array('*.6', '*.ok'), + 'philipstv.p7' => array('*.7', '*.ok'), + 'philipstv.p8' => array('*.8', '*.ok'), + 'philipstv.p9' => array('*.9', '*.ok'), + 'philipstv.p10' => array('*.1','*.0','*.ok'), + 'philipstv.p11' => array('*.1','*.1','*.ok'), + 'philipstv.p12' => array('*.1','*.2','*.ok'), + 'topfieldsat.p1' => array('*.1', '*.ok'), + 'topfieldsat.p2' => array('*.2', '*.ok'), + 'topfieldsat.p3' => array('*.3', '*.ok'), + 'topfieldsat.p4' => array('*.4', '*.ok'), + 'topfieldsat.p5' => array('*.5', '*.ok'), + 'topfieldsat.p6' => array('*.6', '*.ok'), + 'topfieldsat.p7' => array('*.7', '*.ok'), + 'topfieldsat.p8' => array('*.8', '*.ok'), + 'topfieldsat.p9' => array('*.9', '*.ok'), + 'topfieldsat.p10' => array('*.1','*.0','*.ok'), + 'topfieldsat.p11' => array('*.1','*.1','*.ok'), + 'topfieldsat.p12' => array('*.1','*.2','*.ok'),), ), c_Comm_Onkyo => array ( c_Property_ScriptSnd => 'Entertainment_InterfaceOnkyoSnd.inc.php', c_Property_ScriptRcv => 'Entertainment_InterfaceOnkyoRcv.ips.php', c_Property_FunctionSnd => 'Onkyo_SendData', - c_Property_Register => null, - c_Property_Instance => null, - c_Property_IPAddress => '', + c_Property_Register => '', + c_Property_Instance => '', + c_Property_IPAddress => '', c_Property_Timeout => 30, ), c_Comm_NetPlayer => array ( c_Property_ScriptSnd => 'Entertainment_InterfaceNetPlayerSnd.inc.php', c_Property_ScriptRcv => 'Entertainment_InterfaceNetPlayerRcv.ips.php', c_Property_FunctionSnd => 'Entertainment_NetPlayer_SendData', - c_Property_Instance => 'Program.IPSLibrary.data.modules.NetPlayer', - c_Property_Variables => 'MobileControl,RemoteControl,ControlType,Power', + c_Property_Instance => 'Program.IPSLibrary.data.modules.NetPlayer', + c_Property_Variables => 'MobileControl,RemoteControl,ControlType,Power', ), c_Comm_AudioMax => array ( - c_Property_ScriptSnd => 'Entertainment_InterfaceAudioMaxSnd.inc.php', - c_Property_ScriptRcv => 'Entertainment_InterfaceAudioMaxRcv.ips.php', - c_Property_FunctionSnd => 'Entertainment_AudioMax_SendData', - //c_Property_Instance => 'Program.AudioMax.AudioMax_Server', - //c_Property_Variables => 'LAST_COMMAND', + c_Property_ScriptSnd => 'Entertainment_InterfaceIPSComponentAVControl.inc.php', + c_Property_FunctionSnd => 'Entertainment_IPSComponent_SendData', + c_Property_ComponentParams => 'IPSComponentAVControl_AudioMax,null', ), ); } @@ -87,40 +120,76 @@ function get_CommunicationConfiguration () { // Defintion of Room Configuration // ======================================================================================================================== function get_RoomConfiguration () { - return array ( - // ------------------------------------------------------------------------------------------------------- + return array ( + // ------------------------------------------------------------------------------------------------------- c_Room_LivingRoom => array( c_Property_Name => 'Wohnzimmer', c_Control_RoomPower => array(c_Property_Name => 'Power'), - c_Control_Muting => array(c_Property_Name => 'Mute'), - c_Control_RemoteVolume => array(c_Property_Name => 'Volume Control'), - c_Control_iRemoteVolume => array(c_Property_Name => 'Volume iPhone'), - c_Control_Source => array(c_Property_Name => 'Source'), - c_Control_RemoteSource => array(c_Property_Name => 'Source Control'), - c_Control_iRemoteSource => array(c_Property_Name => 'Remote iPhone'), + c_Control_Muting => array(c_Property_Name => 'Mute'), + c_Control_Group => array(c_Property_Name => 'Klangeinstellungen', c_Property_Icon => 'Gear'), + c_Control_Balance => array(c_Property_Name => 'Balance', c_Property_Group => 'Klangeinstellungen'), + c_Control_Treble => array(c_Property_Name => 'Höhen', c_Property_Group => 'Klangeinstellungen'), + c_Control_Middle => array(c_Property_Name => 'Mitten', c_Property_Group => 'Klangeinstellungen'), + c_Control_Bass => array(c_Property_Name => 'Bass', c_Property_Group => 'Klangeinstellungen'), + c_Control_Volume => array(c_Property_Name => 'Volume'), + c_Control_RemoteVolume => array(c_Property_Name => 'Volume Control'), + c_Control_iRemoteVolume => array(c_Property_Name => 'Volume iPhone'), + c_Control_Source => array(c_Property_Name => 'Source'), + c_Control_RemoteSource => array(c_Property_Name => 'Source Control'), + c_Control_iRemoteSource => array(c_Property_Name => 'Remote iPhone'), ), - // ------------------------------------------------------------------------------------------------------- + // ------------------------------------------------------------------------------------------------------- c_Room_Wellness => array( c_Property_Name => 'Wellness', c_Control_RoomPower => array(c_Property_Name => 'Power'), - c_Control_Muting => array(c_Property_Name => 'Mute'), - c_Control_Volume => array(c_Property_Name => 'Volume'), - c_Control_Source => array(c_Property_Name => 'Source'), - c_Control_RemoteSource => array(c_Property_Name => 'Source Control'), - c_Control_iRemoteSource => array(c_Property_Name => 'Remote iPhone'), - c_Control_Mode => array(c_Property_Name => 'Listening Mode'), - ), - // ------------------------------------------------------------------------------------------------------- + c_Control_Muting => array(c_Property_Name => 'Mute'), + c_Control_Volume => array(c_Property_Name => 'Volume'), + c_Control_Source => array(c_Property_Name => 'Source'), + c_Control_RemoteSource => array(c_Property_Name => 'Source Control'), + c_Control_iRemoteSource => array(c_Property_Name => 'Remote iPhone'), + c_Control_Mode => array(c_Property_Name => 'Listening Mode'), + ), + // ------------------------------------------------------------------------------------------------------- c_Room_Sauna => array( c_Property_Name => 'Sauna', c_Control_RoomPower => array(c_Property_Name => 'Power'), - c_Control_Muting => array(c_Property_Name => 'Mute'), - c_Control_Volume => array(c_Property_Name => 'Volume'), - c_Control_Source => array(c_Property_Name => 'Source'), - c_Control_RemoteSource => array(c_Property_Name => 'Source Control'), - c_Control_iRemoteSource => array(c_Property_Name => 'Remote iPhone'), + c_Control_Muting => array(c_Property_Name => 'Mute'), + c_Control_Volume => array(c_Property_Name => 'Volume'), + c_Control_Source => array(c_Property_Name => 'Source'), + c_Control_RemoteSource => array(c_Property_Name => 'Source Control'), + c_Control_iRemoteSource => array(c_Property_Name => 'Remote iPhone'), ), - // ------------------------------------------------------------------------------------------------------- + // ------------------------------------------------------------------------------------------------------- + c_Room_Terrasse => array( + c_Property_Name => 'Terrasse', + c_Control_RoomPower => array(c_Property_Name => 'Power'), + c_Control_Muting => array(c_Property_Name => 'Mute'), + c_Control_Volume => array(c_Property_Name => 'Lautstärke'), + c_Control_Group => array(c_Property_Name => 'Klangeinstellungen', c_Property_Icon => 'Gear'), + c_Control_Balance => array(c_Property_Name => 'Balance', c_Property_Group => 'Klangeinstellungen'), + c_Control_Treble => array(c_Property_Name => 'Höhen', c_Property_Group => 'Klangeinstellungen'), + c_Control_Middle => array(c_Property_Name => 'Mitten', c_Property_Group => 'Klangeinstellungen'), + c_Control_Bass => array(c_Property_Name => 'Bass', c_Property_Group => 'Klangeinstellungen'), + c_Control_Source => array(c_Property_Name => 'Eingang'), + c_Control_RemoteSource => array(c_Property_Name => 'Fernbedienung'), + c_Control_iRemoteSource => array(c_Property_Name => 'iFernbedienung'), + ), + // ------------------------------------------------------------------------------------------------------- + c_Room_Werkstatt => array( + c_Property_Name => 'Arbeitszimmer', + c_Control_RoomPower => array(c_Property_Name => 'Power'), + c_Control_Muting => array(c_Property_Name => 'Mute'), + c_Control_Volume => array(c_Property_Name => 'Lautstärke'), + c_Control_Group => array(c_Property_Name => 'Klangeinstellungen', c_Property_Icon => 'Gear'), + c_Control_Balance => array(c_Property_Name => 'Balance', c_Property_Group => 'Klangeinstellungen'), + c_Control_Treble => array(c_Property_Name => 'Höhen', c_Property_Group => 'Klangeinstellungen'), + c_Control_Middle => array(c_Property_Name => 'Mitten', c_Property_Group => 'Klangeinstellungen'), + c_Control_Bass => array(c_Property_Name => 'Bass', c_Property_Group => 'Klangeinstellungen'), + c_Control_Source => array(c_Property_Name => 'Eingang'), + c_Control_RemoteSource => array(c_Property_Name => 'Fernbedienung'), + c_Control_iRemoteSource => array(c_Property_Name => 'iFernbedienung'), + ), + // ------------------------------------------------------------------------------------------------------- ); } @@ -129,71 +198,144 @@ function get_RoomConfiguration () { // ======================================================================================================================== function get_DeviceConfiguration () { return array ( - // ------------------------------------------------------------------------------------------------------- - c_Device_YamahaMain => array( - c_Property_Name => 'YamahaMain', + // ------------------------------------------------------------------------------------------------------- + c_Device_AudioMax1 => array( + c_Property_Name => 'AudioMax 1 (Terrasse)', c_Control_DevicePower => array( - c_Property_Name => 'Power', - c_Property_PowerDelay => 2, - c_Property_CommPower => array(c_Comm_WinLIRC, 'yamahareceiver', 'power'), - c_Property_CommPowerOff => array(c_Comm_WinLIRC, 'yamahareceiver', 'poweroff'), - c_Property_CommPowerOn => array(c_Comm_WinLIRC, 'yamahareceiver', 'poweron'), - ), - c_Control_RemoteVolume => array( - c_Property_Name => 'Volume Control', - c_Property_Names => array('src="../user/Entertainment/Remote_YamahaVolume.php" height=38px'), - ), - c_Control_Muting => array( - c_Property_Name => 'Mute', - c_Property_CommMuteOn => array(c_Comm_WinLIRC, 'yamahareceiver', 'muteon'), - c_Property_CommMuteOff => array(c_Comm_WinLIRC, 'yamahareceiver', 'muteoff'), + c_Property_Name => 'Power', + c_Property_CommPower => array(c_Comm_AudioMax, 'TogglePower', '0'), + c_Property_CommPowerOn => array(c_Comm_AudioMax, 'SetPower', '0', '1'), + c_Property_CommPowerOff => array(c_Comm_AudioMax, 'SetPower', '0', '0'), + ), + c_Control_Muting => array( + c_Property_Name => 'Mute', + c_Property_CommMute => array(c_Comm_AudioMax, 'ToggleMute', '0'), + c_Property_CommMuteOn => array(c_Comm_AudioMax, 'SetMute', '0', '1'), + c_Property_CommMuteOff => array(c_Comm_AudioMax, 'SetMute', '0', '0'), + ), + c_Control_Volume => array( + c_Property_Name => 'Volume', c_Property_MinValue => 0, c_Property_MaxValue => 100, c_Property_Limit => 90, + c_Property_CommVol => array(c_Comm_AudioMax, 'SetVolume', '0', c_Template_Value), + c_Property_CommVolPlus => array(c_Comm_AudioMax, 'SetVolumePlus', '0'), + c_Property_CommVolMinus => array(c_Comm_AudioMax, 'SetVolumeMinus', '0'), + ), + c_Control_Balance => array( + c_Property_Name => 'Balance', c_Property_MinValue => 0, c_Property_MaxValue => 100, + c_Property_CommBal => array(c_Comm_AudioMax, 'SetBalance', '0', c_Template_Value), + ), + c_Control_Treble => array( + c_Property_Name => 'Höhen', c_Property_MinValue => 0, c_Property_MaxValue => 100, + c_Property_CommTre => array(c_Comm_AudioMax, 'SetTreble', '0', c_Template_Value), + ), + c_Control_Middle => array( + c_Property_Name => 'Mitten', c_Property_MinValue => 0, c_Property_MaxValue => 100, + c_Property_CommMid => array(c_Comm_AudioMax, 'SetMiddle', '0', c_Template_Value), + ), + c_Control_Bass => array( + c_Property_Name => 'Bass', c_Property_MinValue => 0, c_Property_MaxValue => 100, + c_Property_CommBas => array(c_Comm_AudioMax, 'SetBass', '0', c_Template_Value), ), ), - // ------------------------------------------------------------------------------------------------------- - c_Device_YamahaTuner => array( - c_Property_Name => 'YamahaTuner', - c_Property_PowerDelay => c_Device_YamahaMain, - c_Control_RemoteSource => array( - c_Property_Name => 'Source Control', - c_Property_Names => array('src="../user/Entertainment/Remote_YamahaTuner.php" height=110px'), - ), - c_Control_iRemoteSource => array( - c_Property_Name => 'iPhone Source Control', - c_Property_Names => array('src="../user/Entertainment/iRemote_YamahaTuner.php"'), + // ------------------------------------------------------------------------------------------------------- + c_Device_AudioMax2 => array( + c_Property_Name => 'AudioMax 2 (Wohnzimmer)', + c_Control_DevicePower => array( + c_Property_Name => 'Power', + c_Property_CommPower => array(c_Comm_AudioMax, 'TogglePower', '1'), + c_Property_CommPowerOn => array(c_Comm_AudioMax, 'SetPower', '1', '1'), + c_Property_CommPowerOff => array(c_Comm_AudioMax, 'SetPower', '1', '0'), + ), + c_Control_Muting => array( + c_Property_Name => 'Mute', + c_Property_CommMute => array(c_Comm_AudioMax, 'ToggleMute', '1'), + c_Property_CommMuteOn => array(c_Comm_AudioMax, 'SetMute', '1', '1'), + c_Property_CommMuteOff => array(c_Comm_AudioMax, 'SetMute', '1', '0'), + ), + c_Control_Volume => array( + c_Property_Name => 'Volume', c_Property_MinValue => 0, c_Property_MaxValue => 100, c_Property_Limit => 80, + c_Property_CommVol => array(c_Comm_AudioMax, 'SetVolume', '1', c_Template_Value), + c_Property_CommVolPlus => array(c_Comm_AudioMax, 'SetVolumePlus', '1'), + c_Property_CommVolMinus => array(c_Comm_AudioMax, 'SetVolumeMinus', '1'), + ), + c_Control_Balance => array( + c_Property_Name => 'Balance', c_Property_MinValue => 0, c_Property_MaxValue => 100, + c_Property_CommBal => array(c_Comm_AudioMax, 'SetBalance', '1', c_Template_Value), + ), + c_Control_Treble => array( + c_Property_Name => 'Höhen', c_Property_MinValue => 0, c_Property_MaxValue => 100, + c_Property_CommTre => array(c_Comm_AudioMax, 'SetTreble', '1', c_Template_Value), + ), + c_Control_Middle => array( + c_Property_Name => 'Mitten', c_Property_MinValue => 0, c_Property_MaxValue => 100, + c_Property_CommMid => array(c_Comm_AudioMax, 'SetMiddle', '1', c_Template_Value), + ), + c_Control_Bass => array( + c_Property_Name => 'Bass', c_Property_MinValue => 0, c_Property_MaxValue => 100, + c_Property_CommBas => array(c_Comm_AudioMax, 'SetBass', '1', c_Template_Value), ), - c_Control_Program => array( - c_Property_Name => 'Program', - c_Property_CommPrg => array(c_Comm_WinLIRC, 'yamahareceiver', c_Template_Code), - c_Property_CommPrgPrev => array(c_Comm_WinLIRC, 'yamahareceiver', 'presetlast'), - c_Property_CommPrgNext => array(c_Comm_WinLIRC, 'yamahareceiver', 'presetnext'), - c_Property_Codes => array('0', '1', '2', '3', '4', '5', '6', '7'), - c_Property_Names => array('Arabella','Antenne','Kronehit Radio','Radio Wien','Radio Noe','OE 3','88.6','Hit FM'), + ), + // ------------------------------------------------------------------------------------------------------- + c_Device_AudioMax3 => array( + c_Property_Name => 'AudioMax 3 (Werkstatt)', + c_Control_DevicePower => array( + c_Property_Name => 'Power', + c_Property_CommPower => array(c_Comm_AudioMax, 'TogglePower', '2'), + c_Property_CommPowerOn => array(c_Comm_AudioMax, 'SetPower', '2', '1'), + c_Property_CommPowerOff => array(c_Comm_AudioMax, 'SetPower', '2', '0'), + ), + c_Control_Muting => array( + c_Property_Name => 'Mute', + c_Property_CommMute => array(c_Comm_AudioMax, 'ToggleMute', '2'), + c_Property_CommMuteOn => array(c_Comm_AudioMax, 'SetMute', '2', '1'), + c_Property_CommMuteOff => array(c_Comm_AudioMax, 'SetMute', '2', '0'), + ), + c_Control_Volume => array( + c_Property_Name => 'Volume', c_Property_MinValue => 0, c_Property_MaxValue => 100, c_Property_Limit => 80, + c_Property_CommVol => array(c_Comm_AudioMax, 'SetVolume', '2', c_Template_Value), + c_Property_CommVolPlus => array(c_Comm_AudioMax, 'SetVolumePlus', '2'), + c_Property_CommVolMinus => array(c_Comm_AudioMax, 'SetVolumeMinus', '2'), + ), + c_Control_Balance => array( + c_Property_Name => 'Balance', c_Property_MinValue => 0, c_Property_MaxValue => 100, + c_Property_CommBal => array(c_Comm_AudioMax, 'SetBalance', '2', c_Template_Value), + ), + c_Control_Treble => array( + c_Property_Name => 'Höhen', c_Property_MinValue => 0, c_Property_MaxValue => 100, + c_Property_CommTre => array(c_Comm_AudioMax, 'SetTreble', '2', c_Template_Value), + ), + c_Control_Middle => array( + c_Property_Name => 'Mitten', c_Property_MinValue => 0, c_Property_MaxValue => 100, + c_Property_CommMid => array(c_Comm_AudioMax, 'SetMiddle', '2', c_Template_Value), + ), + c_Control_Bass => array( + c_Property_Name => 'Bass', c_Property_MinValue => 0, c_Property_MaxValue => 100, + c_Property_CommBas => array(c_Comm_AudioMax, 'SetBass', '2', c_Template_Value), ), ), // ------------------------------------------------------------------------------------------------------- c_Device_PhilipsTV => array( c_Property_Name => 'PhilipsTV', - c_Control_DevicePower => array( + c_Control_DevicePower => array( c_Property_Name => 'Power', c_Property_CommPower => array(c_Comm_WinLIRC, 'philipstv', 'power'), - c_Property_CommPower2 => array(c_Comm_WinLIRC, 'philipstv2', 'power'), - c_Property_CommPowerOn => array(c_Comm_WinLIRC, 'philipstv', 'poweron'), - c_Property_CommPowerOff => array(c_Comm_WinLIRC, 'philipstv', 'poweroff'), + c_Property_CommPower2 => array(c_Comm_WinLIRC, 'philipstv2', 'power'), + c_Property_CommPowerOn => array(c_Comm_WinLIRC, 'philipstv', 'poweron'), + c_Property_CommPowerOff => array(c_Comm_WinLIRC, 'philipstv', 'poweroff'), ), c_Control_Muting => array( c_Property_Name => 'Mute', c_Property_CommMute => array(c_Comm_WinLIRC, 'philipstv', 'mute'), - c_Property_CommMute2 => array(c_Comm_WinLIRC, 'philipstv2', 'mute'), + c_Property_CommMute2 => array(c_Comm_WinLIRC, 'philipstv2', 'mute'), ), - c_Control_RemoteVolume => array( + c_Control_RemoteVolume => array( c_Property_Name => 'Volume Control', - c_Property_Names => array('src="../user/Entertainment/Remote_PhilipsTVVolume.php" height=38px'), + c_Property_Names => array('src="../user/Entertainment/Remote_PhilipsTVVolume.php" height=38px'), ), - c_Control_RemoteSource => array( + c_Control_RemoteSource => array( c_Property_Name => 'Source Control', - c_Property_CommRemSrc => array(c_Comm_WinLIRC, 'philipstvtype', c_Template_Value), - c_Property_Names => array('src="../user/Entertainment/Remote_PhilipsTVProgram_Simple.php" height=182px', - 'src="../user/Entertainment/Remote_PhilipsTVProgram_Advanced.php" height=208px'), + c_Property_CommRemSrc => array(c_Comm_WinLIRC, 'philipstvtype', c_Template_Value), + c_Property_Names => array('src="../user/Entertainment/Remote_PhilipsTVProgram_Simple.php" height=182px', + 'src="../user/Entertainment/Remote_PhilipsTVProgram_Advanced.php" height=208px'), ), c_Control_RemoteSourceType => array( c_Property_Name => 'Source ControlType', @@ -206,7 +348,7 @@ function get_DeviceConfiguration () { // ------------------------------------------------------------------------------------------------------- c_Device_SanyoBeamer => array( c_Property_Name => 'SanyoBeamer', - c_Control_DevicePower => array( + c_Control_DevicePower => array( c_Property_Name => 'Power', c_Property_CommPower => array(c_Comm_WinLIRC, 'sanyobeamer', 'power'), ), @@ -214,67 +356,67 @@ function get_DeviceConfiguration () { // ------------------------------------------------------------------------------------------------------- c_Device_PanasonicVCR => array( c_Property_Name => 'PanasonicVCR', - c_Control_DevicePower => array( + c_Control_DevicePower => array( c_Property_Name => 'Power', c_Property_CommPower => array(c_Comm_WinLIRC, 'panasonicrc2', 'power'), ), - c_Control_RemoteSource => array( + c_Control_RemoteSource => array( c_Property_Name => 'Source Control', - c_Property_CommRemSrc => array(c_Comm_WinLIRC, 'panasonicrc2type', c_Template_Value), - c_Property_Names => array('src="../user/Entertainment/Remote_PanasonicVCR_Simple.php" height=170px', - 'src="../user/Entertainment/Remote_PanasonicVCR_Watch.php" height=170px', - 'src="../user/Entertainment/Remote_PanasonicVCR_Guide.php" height=170px'), + c_Property_CommRemSrc => array(c_Comm_WinLIRC, 'panasonicrc2type', c_Template_Value), + c_Property_Names => array('src="../user/Entertainment/Remote_PanasonicVCR_Simple.php" height=170px', + 'src="../user/Entertainment/Remote_PanasonicVCR_Watch.php" height=170px', + 'src="../user/Entertainment/Remote_PanasonicVCR_Guide.php" height=170px'), ), - c_Control_RemoteSourceType => array( + c_Control_RemoteSourceType => array( c_Property_Name => 'Source Control Type', ), - c_Control_iRemoteSource => array( - c_Property_Name => 'iPhone Source Control', + c_Control_iRemoteSource => array( + c_Property_Name => 'iPhone Source Control', c_Property_Names => array('src="../user/Entertainment/iRemote_PanasonicVCR.php"'), ), ), // ------------------------------------------------------------------------------------------------------- c_Device_PanasonicBD => array( c_Property_Name => 'PanasonicBD', - c_Control_DevicePower => array( + c_Control_DevicePower => array( c_Property_Name => 'Power', c_Property_CommPower => array(c_Comm_WinLIRC, 'panasonicrc', 'power'), ), - c_Control_RemoteSource => array( + c_Control_RemoteSource => array( c_Property_Name => 'Source Control', - c_Property_Names => array('src="../user/Entertainment/Remote_PanasonicBD.php" height=170px'), + c_Property_Names => array('src="../user/Entertainment/Remote_PanasonicBD.php" height=170px'), ), - c_Control_iRemoteSource => array( - c_Property_Name => 'iPhone Source Control', - c_Property_Names => array('src="../user/Entertainment/iRemote_PanasonicBD.php"'), + c_Control_iRemoteSource => array( + c_Property_Name => 'iPhone Source Control', + c_Property_Names => array('src="../user/Entertainment/iRemote_PanasonicBD.php"'), ), ), // ------------------------------------------------------------------------------------------------------- c_Device_TopfieldSat => array( c_Property_Name => 'TopfieldSat', - c_Control_DevicePower => array( + c_Control_DevicePower => array( c_Property_Name => 'Power', c_Property_CommPower => array(c_Comm_WinLIRC, 'topfieldsat', 'power'), ), - c_Control_RemoteSource => array( + c_Control_RemoteSource => array( c_Property_Name => 'Source Control', - c_Property_CommRemSrc => array(c_Comm_WinLIRC, 'topfieldsattype', c_Template_Value), - c_Property_Names => array('src="../user/Entertainment/Remote_TopfieldSat_Simple.php" height=148px', - 'src="../user/Entertainment/Remote_TopfieldSat_Advanced.php" height=185px'), + c_Property_CommRemSrc => array(c_Comm_WinLIRC, 'topfieldsattype', c_Template_Value), + c_Property_Names => array('src="../user/Entertainment/Remote_TopfieldSat_Simple.php" height=148px', + 'src="../user/Entertainment/Remote_TopfieldSat_Advanced.php" height=185px'), ), - c_Control_RemoteSourceType => array( + c_Control_RemoteSourceType => array( c_Property_Name => 'Source Control Type', ), - c_Control_iRemoteSource => array( - c_Property_Name => 'iPhone Source Control', - c_Property_Names => array('src="../user/Entertainment/iRemote_TopfieldSat.php"'), + c_Control_iRemoteSource => array( + c_Property_Name => 'iPhone Source Control', + c_Property_Names => array('src="../user/Entertainment/iRemote_TopfieldSat.php"'), ), - c_Control_Program => array( + c_Control_Program => array( c_Property_Name => 'Program', - c_Property_CommPrg => array(c_Comm_WinLIRC, 'topfieldsat', c_Template_Code), - c_Property_CommPrg2 => array(c_Comm_WinLIRC, 'topfieldsat', c_Template_Code2), - c_Property_CommPrgPrev => array(c_Comm_WinLIRC, 'topfieldsat', 'programprev'), - c_Property_CommPrgNext => array(c_Comm_WinLIRC, 'topfieldsat', 'programnext'), + c_Property_CommPrg => array(c_Comm_WinLIRC, 'topfieldsat', c_Template_Code), + c_Property_CommPrg2 => array(c_Comm_WinLIRC, 'topfieldsat', c_Template_Code2), + c_Property_CommPrgPrev => array(c_Comm_WinLIRC, 'topfieldsat', 'programprev'), + c_Property_CommPrgNext => array(c_Comm_WinLIRC, 'topfieldsat', 'programnext'), c_Property_Codes => array('p1','p2','p3','p4','p5','p6','p7','p8','p9','p10','p11','p12'), c_Property_Names => array('ORF 1','ORF 2','ARD','ZDF','RTL','Sat 1','Pro 7','RTL 2','Kabel 1','VOX','N24','Sat 1'), ), @@ -282,38 +424,38 @@ function get_DeviceConfiguration () { // ------------------------------------------------------------------------------------------------------- c_Device_OnkyoMain => array( c_Property_Name => 'OnkyoMain', - c_Control_DevicePower => array( - c_Property_Name => 'Power', + c_Control_DevicePower => array( + c_Property_Name => 'Power', c_Property_CommPowerOn => array(c_Comm_WinLIRC, 'onkyoreceiver', 'mainpoweron'), c_Property_CommPowerOff => array(c_Comm_WinLIRC, 'onkyoreceiver', 'mainpoweroff'), c_Property_ConnectSocket => c_Comm_Onkyo, c_Property_CommPowerOn2 => array(c_Comm_Onkyo, 'PWR', '01'), c_Property_CommPowerOff2 => array(c_Comm_Onkyo, 'PWR', '00'), ), - c_Control_Muting => array( - c_Property_Name => 'Mute', - c_Property_CommMute => array(c_Comm_WinLIRC, 'onkyoreceiver', 'mute'), + c_Control_Muting => array( + c_Property_Name => 'Mute', + c_Property_CommMute => array(c_Comm_WinLIRC, 'onkyoreceiver', 'mute'), c_Property_CommMuteOn => array(c_Comm_Onkyo, 'AMT', '01'), c_Property_CommMuteOff => array(c_Comm_Onkyo, 'AMT', '00'), ), - c_Control_Volume => array( - c_Property_Name => 'Volume', - c_Property_MinValue => 0, - c_Property_MaxValue => 100, - c_Property_Limit => 80, + c_Control_Volume => array( + c_Property_Name => 'Volume', + c_Property_MinValue => 0, + c_Property_MaxValue => 100, + c_Property_Limit => 80, c_Property_CommVol => array(c_Comm_Onkyo, 'MVL', c_Template_Value), ), - c_Control_Mode => array( - c_Property_Name => 'Listening Mode', + c_Control_Mode => array( + c_Property_Name => 'Listening Mode', c_Property_CommMode => array(c_Comm_Onkyo, 'LMD', c_Template_Code), - c_Property_Names => array( + c_Property_Names => array( "Stereo","Direct", "Pure Audio","Surround","Film","THX", "Action", "Musical", "Orchestra", "Unplugged", "Studio-Mix", "All Ch Stereo","Theater-Dimensional", "Enhanced 7/Enhance","Mono","Full Mono","DTS Surround Sens", "Audyssey DSX","Straight Decode*1","Dolby EX*2","Dolby EX+DSX","THX Cinema","THX Surround EX","THX Music", "PLIIx Movie","PLIIx Music","PLIIx Game", ), - c_Property_Codes => array( + c_Property_Codes => array( "00", "01", "02", "03", "04", "05", "06", "08", "09", "0A", "0B", "0C", "0D", "0E", "0F", "13", "15", @@ -322,74 +464,74 @@ function get_DeviceConfiguration () { ), ), ), - // ------------------------------------------------------------------------------------------------------- + // ------------------------------------------------------------------------------------------------------- c_Device_OnkyoZone2 => array( - c_Property_Name => 'OnkyoZone2', + c_Property_Name => 'OnkyoZone2', c_Control_DevicePower => array( - c_Property_Name => 'Power', - c_Property_CommPower => array(c_Comm_WinLIRC, 'onkyoreceiver', 'zone2power'), + c_Property_Name => 'Power', + c_Property_CommPower => array(c_Comm_WinLIRC, 'onkyoreceiver', 'zone2power'), c_Property_CommPowerOn => array(c_Comm_WinLIRC, 'onkyoreceiver', 'zone2poweron'), c_Property_CommPowerOff => array(c_Comm_WinLIRC, 'onkyoreceiver', 'zone2poweroff'), c_Property_ConnectSocket => c_Comm_Onkyo, c_Property_CommPowerOn2 => array(c_Comm_Onkyo, 'ZPW', '01'), c_Property_CommPowerOff2 => array(c_Comm_Onkyo, 'ZPW', '00'), ), - c_Control_Muting => array( - c_Property_Name => 'Mute', + c_Control_Muting => array( + c_Property_Name => 'Mute', c_Property_CommMuteOn => array(c_Comm_Onkyo, 'ZMT', '01'), c_Property_CommMuteOff => array(c_Comm_Onkyo, 'ZMT', '00'), - c_Property_CommMute => array(c_Comm_WinLIRC, 'onkyoreceiver', 'mutez2'), + c_Property_CommMute => array(c_Comm_WinLIRC, 'onkyoreceiver', 'mutez2'), ), - c_Control_Volume => array( - c_Property_Name => 'Volume', - c_Property_MinValue => 0, - c_Property_MaxValue => 100, - c_Property_Limit => 75, + c_Control_Volume => array( + c_Property_Name => 'Volume', + c_Property_MinValue => 0, + c_Property_MaxValue => 100, + c_Property_Limit => 75, c_Property_CommVol => array(c_Comm_Onkyo, 'ZVL', c_Template_Value), ), ), // ------------------------------------------------------------------------------------------------------- - c_Device_OnkyoTuner => array( - c_Property_Name => 'OnkyoTuner', + c_Device_OnkyoTuner => array( + c_Property_Name => 'OnkyoTuner', c_Control_RemoteSource => array( - c_Property_Name => 'Source Control', - c_Property_Names => array('src="../user/Entertainment/Remote_OnkyoTuner.php" height=110px'), + c_Property_Name => 'Source Control', + c_Property_Names => array('src="../user/Entertainment/Remote_OnkyoTuner.php" height=110px'), ), - c_Control_iRemoteSource => array( - c_Property_Name => 'iPhone Source Control', - c_Property_Names => array('src="../user/Entertainment/iRemote_OnkyoTuner.php"'), + c_Control_iRemoteSource => array( + c_Property_Name => 'iPhone Source Control', + c_Property_Names => array('src="../user/Entertainment/iRemote_OnkyoTuner.php"'), ), - c_Control_Program => array( + c_Control_Program => array( c_Property_Name => 'Program', - c_Property_CommPrg => array(c_Comm_Onkyo, 'PRS', c_Template_Code), - c_Property_CommPrg2 => array(c_Comm_WinLIRC, 'onkyotuner', c_Template_Code2), - c_Property_CommPrgPrev => array(c_Comm_Onkyo, 'PRS', 'DOWN'), - c_Property_CommPrgPrev2 => array(c_Comm_WinLIRC, 'onkyotuner', 'up'), - c_Property_CommPrgNext => array(c_Comm_Onkyo, 'PRS', 'UP'), - c_Property_CommPrgNext2 => array(c_Comm_WinLIRC, 'onkyotuner', 'down'), + c_Property_CommPrg => array(c_Comm_Onkyo, 'PRS', c_Template_Code), + c_Property_CommPrg2 => array(c_Comm_WinLIRC, 'onkyotuner', c_Template_Code2), + c_Property_CommPrgPrev => array(c_Comm_Onkyo, 'PRS', 'DOWN'), + c_Property_CommPrgPrev2 => array(c_Comm_WinLIRC, 'onkyotuner', 'up'), + c_Property_CommPrgNext => array(c_Comm_Onkyo, 'PRS', 'UP'), + c_Property_CommPrgNext2 => array(c_Comm_WinLIRC, 'onkyotuner', 'down'), c_Property_Codes => array('01', '02', '03', '04', '05', '06', '07', '08'), c_Property_Codes2 => array('p1','p2','p3','p4','p5','p6','p7','p8'), c_Property_Names => array('Arabella','Antenne','Kronehit Radio','Radio Wien','Radio Noe','OE 3','88.6','Hit FM'), ), ), - // ------------------------------------------------------------------------------------------------------- + // ------------------------------------------------------------------------------------------------------- c_Device_NetPlayer => array( c_Property_Name => 'NetPlayer', - c_Control_DevicePower => array( + c_Control_DevicePower => array( c_Property_Name => 'Power', c_Property_CommPowerOn => array(c_Comm_NetPlayer, 'netplayer', 'poweron'), c_Property_CommPowerOff => array(c_Comm_NetPlayer, 'netplayer', 'poweroff'), ), - c_Control_RemoteSource => array( + c_Control_RemoteSource => array( c_Property_Name => 'Source Control', - c_Property_CommRemSrc => array(c_Comm_NetPlayer, 'netplayertype', c_Template_Value), - c_Property_Names => array(NP_RC_MP3CONTROL, - NP_RC_MP3SELECTION, - NP_RC_RADIOCONTROL), + c_Property_CommRemSrc => array(c_Comm_NetPlayer, 'netplayertype', c_Template_Value), + c_Property_Names => array(NP_RC_MP3CONTROL, + NP_RC_MP3SELECTION, + NP_RC_RADIOCONTROL), ), c_Control_iRemoteSource => array( c_Property_Name => 'Mobile Control', - c_Property_Names => array(NP_RC_MOBILE), + c_Property_Names => array(NP_RC_MOBILE), ), c_Control_RemoteSourceType => array( c_Property_Name => 'Source Control Type', @@ -407,83 +549,109 @@ function get_SourceConfiguration() { // ------------------------------------------------------------------------------------------------------- c_Room_LivingRoom => array( 0 => array( - c_Property_Name => 'TV', - c_Property_Output => array(c_Property_Device => c_Device_PhilipsTV, - c_Property_CommSrc => array(c_Comm_WinLIRC, 'philipstv', 'tv'), - c_Property_CommSrc2 => array(c_Comm_WinLIRC, 'philipstv2', 'tv')), + c_Property_Name => 'TV', + c_Property_Output => array(c_Property_Device => c_Device_PhilipsTV, + c_Property_CommSrc => array(c_Comm_WinLIRC, 'philipstv', 'tv'), + c_Property_CommSrc2 => array(c_Comm_WinLIRC, 'philipstv2', 'tv')), ), 1 => array( - c_Property_Name => 'VCR', - c_Property_Input => array(c_Property_Device => c_Device_PanasonicVCR), - c_Property_Output => array(c_Property_Device => c_Device_PhilipsTV, - c_Property_CommSrc => array(c_Comm_WinLIRC, 'philipstv', 'hdmiside'), - c_Property_CommSrc2 => array(c_Comm_WinLIRC, 'philipstv2', 'hdmiside')), + c_Property_Name => 'VCR', + c_Property_Input => array(c_Property_Device => c_Device_PanasonicVCR), + c_Property_Output => array(c_Property_Device => c_Device_PhilipsTV, + c_Property_CommSrc => array(c_Comm_WinLIRC, 'philipstv', 'hdmiside'), + c_Property_CommSrc2 => array(c_Comm_WinLIRC, 'philipstv2', 'hdmiside')), ), 2 => array( - c_Property_Name => 'Tuner', - c_Property_Input => array(c_Property_Device => c_Device_YamahaTuner), - c_Property_Output => array(c_Property_Device => c_Device_YamahaMain, - c_Property_CommSrc => array(c_Comm_WinLIRC, 'yamahareceiver', 'tuner')), - ), - 3 => array( - c_Property_Name => 'Net Player', - c_Property_Input => array(c_Property_Device => c_Device_NetPlayer), - c_Property_Output => array(c_Property_Device => c_Device_YamahaMain, - c_Property_CommSrc => array(c_Comm_WinLIRC, 'yamahareceiver', 'cd')), + c_Property_Name => 'NetPlayer', + c_Property_Input => array(c_Property_Device => c_Device_NetPlayer), + c_Property_Output => array(c_Property_Device => c_Device_AudioMax2, + c_Property_CommSrc => array(c_Comm_AudioMax, 'SetSource', '1', '0'), + c_Property_CommSrcNext => array(c_Comm_AudioMax, 'SetSourceNext', '1')), ), ), // ------------------------------------------------------------------------------------------------------- c_Room_Wellness => array( 0 => array( c_Property_Name => 'Kabel', - c_Property_Input => array(c_Property_Device => c_Device_TopfieldSat), + c_Property_Input => array(c_Property_Device => c_Device_TopfieldSat), c_Property_Switch => array(c_Property_Device => c_Device_OnkyoMain, - c_Property_CommSrc => array(c_Comm_Onkyo, 'SLI', '01')), + c_Property_CommSrc => array(c_Comm_Onkyo, 'SLI', '01')), c_Property_Output => array(c_Property_Device => c_Device_SanyoBeamer) ), 1 => array( c_Property_Name => 'Bluray', - c_Property_Input => array(c_Property_Device => c_Device_PanasonicBD), + c_Property_Input => array(c_Property_Device => c_Device_PanasonicBD), c_Property_Switch => array(c_Property_Device => c_Device_OnkyoMain, - c_Property_CommSrc => array(c_Comm_Onkyo, 'SLI', '10')), + c_Property_CommSrc => array(c_Comm_Onkyo, 'SLI', '10')), c_Property_Output => array(c_Property_Device => c_Device_SanyoBeamer) ), 2 => array( c_Property_Name => 'VCR', - c_Property_Input => array(c_Property_Device => c_Device_PanasonicVCR), + c_Property_Input => array(c_Property_Device => c_Device_PanasonicVCR), c_Property_Switch => array(c_Property_Device => c_Device_OnkyoMain, - c_Property_CommSrc => array(c_Comm_Onkyo, 'SLI', '00')), + c_Property_CommSrc => array(c_Comm_Onkyo, 'SLI', '00')), c_Property_Output => array(c_Property_Device => c_Device_SanyoBeamer) ), 3 => array( c_Property_Name => 'OnkyoTuner', - c_Property_Input => array(c_Property_Device => c_Device_OnkyoTuner), + c_Property_Input => array(c_Property_Device => c_Device_OnkyoTuner), c_Property_Output => array(c_Property_Device => c_Device_OnkyoMain, - c_Property_CommSrc => array(c_Comm_Onkyo, 'SLI', '24')), + c_Property_CommSrc => array(c_Comm_Onkyo, 'SLI', '24')), ), 4 => array( c_Property_Name => 'Net Player', - c_Property_Input => array(c_Property_Device => c_Device_NetPlayer), + c_Property_Input => array(c_Property_Device => c_Device_NetPlayer), c_Property_Output => array(c_Property_Device => c_Device_OnkyoMain, - c_Property_CommSrc => array(c_Comm_Onkyo, 'SLI', '23')), + c_Property_CommSrc => array(c_Comm_Onkyo, 'SLI', '23')), ), ), - // ------------------------------------------------------------------------------------------------------- + // ------------------------------------------------------------------------------------------------------- c_Room_Sauna => array( 0 => array( c_Property_Name => 'OnkyoTuner', - c_Property_Input => array(c_Property_Device => c_Device_OnkyoTuner), + c_Property_Input => array(c_Property_Device => c_Device_OnkyoTuner), c_Property_Output => array(c_Property_Device => c_Device_OnkyoZone2, - c_Property_CommSrc => array(c_Comm_Onkyo, 'SLZ', '24')), + c_Property_CommSrc => array(c_Comm_Onkyo, 'SLZ', '24')), ), 1 => array( c_Property_Name => 'Net Player', - c_Property_Input => array(c_Property_Device => c_Device_NetPlayer), + c_Property_Input => array(c_Property_Device => c_Device_NetPlayer), c_Property_Output => array(c_Property_Device => c_Device_OnkyoZone2, - c_Property_CommSrc => array(c_Comm_Onkyo, 'SLZ', '23')), + c_Property_CommSrc => array(c_Comm_Onkyo, 'SLZ', '23')), + ), + ), + // ------------------------------------------------------------------------------------------------------- + c_Room_Terrasse => array( + 0 => array( + c_Property_Name => 'NetPlayer', + c_Property_Input => array(c_Property_Device => c_Device_NetPlayer), + c_Property_Output => array(c_Property_Device => c_Device_AudioMax1, + c_Property_CommSrc => array(c_Comm_AudioMax, 'SetSource', '0', '0'), + c_Property_CommSrcNext=> array(c_Comm_AudioMax, 'SetSourceNext', '0')), + ), + 1 => array( + c_Property_Name => 'Radio', + c_Property_Input => array(c_Property_Device => c_Device_NetPlayer), + c_Property_Output => array(c_Property_Device => c_Device_AudioMax1, + c_Property_CommSrc => array(c_Comm_AudioMax, 'SetSource', '0', '1')), + ), + ), + // ------------------------------------------------------------------------------------------------------- + c_Room_Werkstatt => array( + 0 => array( + c_Property_Name => 'NetPlayer', + c_Property_Input => array(c_Property_Device => c_Device_NetPlayer), + c_Property_Output => array(c_Property_Device => c_Device_AudioMax3, + c_Property_CommSrc => array(c_Comm_AudioMax, 'SetSource', '2', '0'), + c_Property_CommSrcNext=> array(c_Comm_AudioMax, 'SetSourceNext', '2')), + ), + 1 => array( + c_Property_Name => 'Radio', + c_Property_Input => array(c_Property_Device => c_Device_NetPlayer), + c_Property_Output => array(c_Property_Device => c_Device_AudioMax3, + c_Property_CommSrc => array(c_Comm_AudioMax, 'SetSource', '2', '1')), ), ), - // ------------------------------------------------------------------------------------------------------- ); } diff --git a/IPSLibrary/config/modules/IPSCam/Default/IPSCam_Configuration.inc.php b/IPSLibrary/config/modules/IPSCam/Default/IPSCam_Configuration.inc.php new file mode 100644 index 0000000..7689c7b --- /dev/null +++ b/IPSLibrary/config/modules/IPSCam/Default/IPSCam_Configuration.inc.php @@ -0,0 +1,117 @@ + + * + * Konfigurations File für IPSCam + * + */ + + /** + * + * Definition der Kameras + * + * Die Konfiguration erfolgt in Form eines Arrays, für jede Kamera wird ein Eintrag im Array erzeugt. + * IPSCAM_PROPERTY_NAME - Name der Kamera + * + * IPSCAM_PROPERTY_TYPE - Type der Kamera (unterstüzte Werte: IPSCAM_TYPE_MOVABLECAM und IPSCAM_TYPE_FIXEDCAM) + * + * IPSCAM_PROPERTY_COMPONENT - Kamera Component Definition + * + * IPSCAM_PROPERTY_SWITCHPOWER - ID der Varible, die für das Schalten der Stromversorgung verwendet wird [optional] + * IPSCAM_PROPERTY_SWITCHWLAN - ID der Varible, die für das Schalten des WLAN verwendet wird [optional] + * + * IPSCAM_PROPERTY_PREDEFPOS1 - Bezeichnung für vordefinierte Kameraposition 1 [optional] + * IPSCAM_PROPERTY_PREDEFPOS2 - Bezeichnung für vordefinierte Kameraposition 2 [optional] + * IPSCAM_PROPERTY_PREDEFPOS3 - Bezeichnung für vordefinierte Kameraposition 3 [optional] + * IPSCAM_PROPERTY_PREDEFPOS4 - Bezeichnung für vordefinierte Kameraposition 4 [optional] + * + * IPSCAM_PROPERTY_COMMAND1 - Name für vordefinierte Kamera Action 1 [optional] + * IPSCAM_PROPERTY_COMMAND2 - Name für vordefinierte Kamera Action 2 [optional] + * IPSCAM_PROPERTY_COMMAND3 - Name für vordefinierte Kamera Action 3 [optional] + * IPSCAM_PROPERTY_COMMAND4 - Name für vordefinierte Kamera Action 4 [optional] + * + * IPSCAM_PROPERTY_ACTION1 - ActionScript für vordefinierte Kamera Action 1 (alternativ auch IPSComponentSensor Definition möglich) [optional] + * IPSCAM_PROPERTY_ACTION2 - ActionScript für vordefinierte Kamera Action 2 (alternativ auch IPSComponentSensor Definition möglich) [optional] + * IPSCAM_PROPERTY_ACTION3 - ActionScript für vordefinierte Kamera Action 3 (alternativ auch IPSComponentSensor Definition möglich) [optional] + * IPSCAM_PROPERTY_ACTION4 - ActionScript für vordefinierte Kamera Action 4 (alternativ auch IPSComponentSensor Definition möglich) [optional] + * + * Eine ausführliche Beispielliste findet sich auch im Example Ordner + * + * Beispiel: + * @code + function IPSCam_GetCamConfiguration() { + return array( + 0 => array(IPSCAM_PROPERTY_NAME => 'Wohnzimmer', + IPSCAM_PROPERTY_TYPE => IPSCAM_TYPE_MOVABLECAM, + IPSCAM_PROPERTY_COMPONENT => 'IPSComponentCam_Edimax,192.168.0.14,username,password', + IPSCAM_PROPERTY_SWITCHPOWER => '11625', + IPSCAM_PROPERTY_SWITCHWLAN => '52861', + IPSCAM_PROPERTY_PREDEFPOS1 => 'Decke', + IPSCAM_PROPERTY_PREDEFPOS2 => 'Wohnzimmer', + IPSCAM_PROPERTY_PREDEFPOS3 => 'Stiege', + IPSCAM_PROPERTY_COMMAND1 => 'Licht Esstisch', + IPSCAM_PROPERTY_ACTION1 => 12345, + IPSCAM_PROPERTY_COMMAND2 => 'Licht Wohnzimmer', + IPSCAM_PROPERTY_ACTION2 => 'IPSModuleSensor_IPSLight,IPSLight_ToggleSwitchByName,Wohnzimmer', + IPSCAM_PROPERTY_COMMAND3 => 'Licht Wohnbereich', + IPSCAM_PROPERTY_ACTION3 => 'IPSModuleSensor_IPSLight,IPSLight_ToggleSwitchByName,Wohnbereich', + ); + } + * @endcocde + * + * @return string Liefert Array mit den Kameras + */ + function IPSCam_GetConfiguration() { + return array( + 0 => array(IPSCAM_PROPERTY_NAME => 'MyCam', + IPSCAM_PROPERTY_TYPE => IPSCAM_TYPE_FIXEDCAM, + IPSCAM_PROPERTY_COMPONENT => 'IPSComponentCam_XXXX,192.168.x.x,username,password', + ), + ); + } + + /** + * Höhe des HTML Elements für kleine Streams im WebFront + */ + define ("IPSCAM_HEIGHT_SMALL", 340); + + /** + * Höhe des HTML Elements für normale Streams im WebFront + */ + define ("IPSCAM_HEIGHT_MIDDLE", 520); + + /** + * Höhe des HTML Elements für große Streams im WebFront + */ + define ("IPSCAM_HEIGHT_LARGE", 800); + + /** + * Breite der HTML Elemente in der Mobile GUI (Auflösung des Displays) + */ + define ("IPSCAM_WIDTH_MOBILE", 960); + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/config/modules/IPSCam/Default/IPSCam_Custom.inc.php b/IPSLibrary/config/modules/IPSCam/Default/IPSCam_Custom.inc.php new file mode 100644 index 0000000..d630418 --- /dev/null +++ b/IPSLibrary/config/modules/IPSCam/Default/IPSCam_Custom.inc.php @@ -0,0 +1,83 @@ + + * + * Callback Methoden für IPSCam + * + */ + + /** + * Diese Funktion wird vor dem Speichern eines Bildes aufgerufen + * + * Hier ist es zum Beispiel möglich die Stromversorgung und das WLAN für eine Kamera einzuschalten. + * Oder man kann nach der Dämmerung die Speicherung des Bildes unterbinden. + * + * Parameters: + * @param integer $cameraIdx Idx der Kamera in der Konfiguration + * @result boolean TRUE für OK, bei FALSE erfolgt keine Speicherung des Bildes + * + */ + function IPSCam_BeforeStorePicture($cameraIdx) { + return true; + } + /** + * Diese Funktion wird nach dem Speichern eines Bildes aufgerufen + * + * Parameters: + * @param integer $cameraIdx Idx der Kamera in der Konfiguration + * + */ + function IPSCam_AfterStorePicture($cameraIdx) { + } + + /** + * Diese Funktion wird vor dem Speichern eines Zeitraffer Bildes aufgerufen + * + * Analog zur Speicherung eines normalen Bildes, kann auch hier die Stromversorgung und das WLAN für + * eine Kamera einzuschaltet werden oder während der Nachtstunden die Aufnahme der Zeitraffer Bilder + * unterbunden werden. + * + * Parameters: + * @param integer $cameraIdx Idx der Kamera in der Konfiguration + * @result boolean TRUE für OK, bei FALSE erfolgt keine Speicherung des Bildes + * + */ + function IPSCam_BeforeStoreMotion($cameraIdx) { + return true; + } + /** + * Diese Funktion wird nach dem Speichern eines Zeitraffer Bildes aufgerufen + * + * Parameters: + * @param integer $cameraIdx Idx der Kamera in der Konfiguration + * + */ + function IPSCam_AfterStoreMotion($cameraIdx) { + } + + + /** @}*/ + +?> \ No newline at end of file diff --git a/IPSLibrary/config/modules/IPSCam/Examples/IPSCam_DemoConfiguration.inc.php b/IPSLibrary/config/modules/IPSCam/Examples/IPSCam_DemoConfiguration.inc.php new file mode 100644 index 0000000..406a70b --- /dev/null +++ b/IPSLibrary/config/modules/IPSCam/Examples/IPSCam_DemoConfiguration.inc.php @@ -0,0 +1,152 @@ + + * + * Konfigurations File für IPSCam + * + */ + + /** + * + * Definition der Kameras + * + * Die Konfiguration erfolgt in Form eines Arrays, für jede Kamera wird ein Eintrag im Array erzeugt. + * IPSCAM_PROPERTY_NAME - Name der Kamera + * + * IPSCAM_PROPERTY_TYPE - Type der Kamera (unterstüzte Werte: IPSCAM_TYPE_MOVABLECAM und IPSCAM_TYPE_FIXEDCAM) + * + * IPSCAM_PROPERTY_COMPONENT - Kamera Component Definition + * + * IPSCAM_PROPERTY_SWITCHPOWER - ID der Varible, die für das Schalten der Stromversorgung verwendet wird [optional] + * IPSCAM_PROPERTY_SWITCHWLAN - ID der Varible, die für das Schalten des WLAN verwendet wird [optional] + * + * IPSCAM_PROPERTY_PREDEFPOS1 - Bezeichnung für vordefinierte Kameraposition 1 [optional] + * IPSCAM_PROPERTY_PREDEFPOS2 - Bezeichnung für vordefinierte Kameraposition 2 [optional] + * IPSCAM_PROPERTY_PREDEFPOS3 - Bezeichnung für vordefinierte Kameraposition 3 [optional] + * IPSCAM_PROPERTY_PREDEFPOS4 - Bezeichnung für vordefinierte Kameraposition 4 [optional] + * + * IPSCAM_PROPERTY_COMMAND1 - Name für vordefinierte Kamera Action 1 [optional] + * IPSCAM_PROPERTY_COMMAND2 - Name für vordefinierte Kamera Action 2 [optional] + * IPSCAM_PROPERTY_COMMAND3 - Name für vordefinierte Kamera Action 3 [optional] + * IPSCAM_PROPERTY_COMMAND4 - Name für vordefinierte Kamera Action 4 [optional] + * + * IPSCAM_PROPERTY_ACTION1 - ActionScript für vordefinierte Kamera Action 1 (alternativ auch IPSComponentSensor Definition möglich) [optional] + * IPSCAM_PROPERTY_ACTION2 - ActionScript für vordefinierte Kamera Action 2 (alternativ auch IPSComponentSensor Definition möglich) [optional] + * IPSCAM_PROPERTY_ACTION3 - ActionScript für vordefinierte Kamera Action 3 (alternativ auch IPSComponentSensor Definition möglich) [optional] + * IPSCAM_PROPERTY_ACTION4 - ActionScript für vordefinierte Kamera Action 4 (alternativ auch IPSComponentSensor Definition möglich) [optional] + * + * Eine ausführliche Beispielliste findet sich auch im Example Ordner + * + * Beispiel: + * @code + function IPSCam_GetCamConfiguration() { + return array( + 0 => array(IPSCAM_PROPERTY_NAME => 'Wohnzimmer', + IPSCAM_PROPERTY_TYPE => IPSCAM_TYPE_MOVABLECAM, + IPSCAM_PROPERTY_COMPONENT => 'IPSComponentCam_Edimax,192.168.0.14,username,password', + IPSCAM_PROPERTY_SWITCHPOWER => '11625', + IPSCAM_PROPERTY_SWITCHWLAN => '52861', + IPSCAM_PROPERTY_PREDEFPOS1 => 'Decke', + IPSCAM_PROPERTY_PREDEFPOS2 => 'Wohnzimmer', + IPSCAM_PROPERTY_PREDEFPOS3 => 'Stiege', + IPSCAM_PROPERTY_COMMAND1 => 'Licht Esstisch', + IPSCAM_PROPERTY_ACTION1 => 'IPSModuleSensor_IPSLight,IPSLight_ToggleSwitchByName,Esstisch', + IPSCAM_PROPERTY_COMMAND2 => 'Licht Wohnzimmer', + IPSCAM_PROPERTY_ACTION2 => 'IPSModuleSensor_IPSLight,IPSLight_ToggleSwitchByName,Wohnzimmer', + IPSCAM_PROPERTY_COMMAND3 => 'Licht Wohnbereich', + IPSCAM_PROPERTY_ACTION3 => 'IPSModuleSensor_IPSLight,IPSLight_ToggleSwitchByName,Wohnbereich', + IPSCAM_PROPERTY_COMMAND4 => 'Terrasse', + IPSCAM_PROPERTY_ACTION4 => 'IPSModuleSensor_IPSLight,IPSLight_ToggleSwitchByName,TerrasseHauswand', + ); + } + * @endcocde + * + * @return string Liefert Array mit den Kameras + */ + function IPSCam_GetConfiguration() { + return array( + 0 => array(IPSCAM_PROPERTY_NAME => 'Eingangstor', + IPSCAM_PROPERTY_TYPE => IPSCAM_TYPE_FIXEDCAM, + IPSCAM_PROPERTY_COMPONENT => 'IPSComponentCam_Axis,192.168.0.22,xxx,xxx', + IPSCAM_PROPERTY_SWITCHPOWER => '', + IPSCAM_PROPERTY_SWITCHWLAN => '52861', + ), + 1 => array(IPSCAM_PROPERTY_NAME => 'Garten', + IPSCAM_PROPERTY_TYPE => IPSCAM_TYPE_FIXEDCAM, + IPSCAM_PROPERTY_COMPONENT => 'IPSComponentCam_Vivotek,192.168.0.4,xxx,xxx', + IPSCAM_PROPERTY_SWITCHPOWER => '', + IPSCAM_PROPERTY_SWITCHWLAN => '', + IPSCAM_PROPERTY_COMMAND1 => 'Licht Aussenbereich', + IPSCAM_PROPERTY_ACTION1 => 'IPSModuleSensor_IPSLight,IPSLight_ToggleGroupByName,Aussen', + IPSCAM_PROPERTY_COMMAND2 => 'Licht Garten', + IPSCAM_PROPERTY_ACTION2 => 'IPSModuleSensor_IPSLight,IPSLight_ToggleSwitchByName,TerrasseGarten', + IPSCAM_PROPERTY_COMMAND3 => 'Licht Terrasse', + IPSCAM_PROPERTY_ACTION3 => 'IPSModuleSensor_IPSLight,IPSLight_ToggleSwitchByName,TerrasseHauswand', + IPSCAM_PROPERTY_COMMAND4 => 'Licht Pergola', + IPSCAM_PROPERTY_ACTION4 => 'IPSModuleSensor_IPSLight,IPSLight_ToggleSwitchByName,TerrassePergola', + ), + 2 => array(IPSCAM_PROPERTY_NAME => 'Wohnzimmer', + IPSCAM_PROPERTY_TYPE => IPSCAM_TYPE_MOVABLECAM, + IPSCAM_PROPERTY_COMPONENT => 'IPSComponentCam_Edimax,192.168.0.14,xxx,xxx', + IPSCAM_PROPERTY_SWITCHPOWER => '11625', + IPSCAM_PROPERTY_SWITCHWLAN => '52861', + IPSCAM_PROPERTY_PREDEFPOS1 => 'Decke', + IPSCAM_PROPERTY_PREDEFPOS2 => 'Wohnzimmer', + IPSCAM_PROPERTY_PREDEFPOS3 => 'Stiege', + IPSCAM_PROPERTY_COMMAND1 => 'Licht Esstisch', + IPSCAM_PROPERTY_ACTION1 => 'IPSModuleSensor_IPSLight,IPSLight_ToggleSwitchByName,Esstisch', + IPSCAM_PROPERTY_COMMAND2 => 'Licht Wohnzimmer', + IPSCAM_PROPERTY_ACTION2 => 'IPSModuleSensor_IPSLight,IPSLight_ToggleSwitchByName,Wohnzimmer', + IPSCAM_PROPERTY_COMMAND3 => 'Licht Wohnbereich', + IPSCAM_PROPERTY_ACTION3 => 'IPSModuleSensor_IPSLight,IPSLight_ToggleSwitchByName,Wohnbereich', + IPSCAM_PROPERTY_COMMAND4 => 'Terrasse', + IPSCAM_PROPERTY_ACTION4 => 'IPSModuleSensor_IPSLight,IPSLight_ToggleSwitchByName,TerrasseHauswand', + ), + ); + } + + /** + * Höhe des HTML Elements für kleine Streams im WebFront + */ + define ("IPSCAM_HEIGHT_SMALL", 340); + + /** + * Höhe des HTML Elements für normale Streams im WebFront + */ + define ("IPSCAM_HEIGHT_MIDDLE", 520); + + /** + * Höhe des HTML Elements für große Streams im WebFront + */ + define ("IPSCAM_HEIGHT_LARGE", 800); + + /** + * Breite der HTML Elemente in der Mobile GUI (Auflösung des Displays) + */ + define ("IPSCAM_WIDTH_MOBILE", 960); + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/config/modules/IPSCam/Examples/IPSCam_DemoCustom.inc.php b/IPSLibrary/config/modules/IPSCam/Examples/IPSCam_DemoCustom.inc.php new file mode 100644 index 0000000..fd03771 --- /dev/null +++ b/IPSLibrary/config/modules/IPSCam/Examples/IPSCam_DemoCustom.inc.php @@ -0,0 +1,92 @@ + + * + * Callback Methoden für IPSCam + * + */ + + /** + * Diese Funktion wird vor dem Speichern eines Bildes aufgerufen + * + * Hier ist es zum Beispiel möglich die Stromversorgung und das WLAN für eine Kamera einzuschalten. + * Oder man kann nach der Dämmerung die Speicherung des Bildes unterbinden. + * + * Parameters: + * @param integer $cameraIdx Idx der Kamera in der Konfiguration + * @result boolean TRUE für OK, bei FALSE erfolgt keine Speicherung des Bildes + * + */ + function IPSCam_BeforeStorePicture($cameraIdx) { + return true; + } + /** + * Diese Funktion wird nach dem Speichern eines Bildes aufgerufen + * + * Parameters: + * @param integer $cameraIdx Idx der Kamera in der Konfiguration + * @result boolean TRUE für OK, bei FALSE erfolgt keine Speicherung des Bildes + * + */ + function IPSCam_AfterStorePicture($cameraIdx) { + return true; + } + + /** + * Diese Funktion wird vor dem Speichern eines Zeitraffer Bildes aufgerufen + * + * Analog zur Speicherung eines normalen Bildes, kann auch hier die Stromversorgung und das WLAN für + * eine Kamera einzuschaltet werden oder während der Nachtstunden die Aufnahme der Zeitraffer Bilder + * unterbunden werden. + * + * Parameters: + * @param integer $cameraIdx Idx der Kamera in der Konfiguration + * @result boolean TRUE für OK, bei FALSE erfolgt keine Speicherung des Bildes + * + */ + function IPSCam_BeforeStoreMotion($cameraIdx) { + return true; + } + /** + * Diese Funktion wird nach dem Speichern eines Zeitraffer Bildes aufgerufen + * + * Parameters: + * @param integer $cameraIdx Idx der Kamera in der Konfiguration + * @result boolean TRUE für OK, bei FALSE erfolgt keine Speicherung des Bildes + * + */ + function IPSCam_AfterStoreMotion($cameraIdx) { + return true; + } + + + /** @}*/ + +?> \ No newline at end of file diff --git a/IPSLibrary/config/modules/IPSLight/Default/IPSLight_Configuration.inc.php b/IPSLibrary/config/modules/IPSLight/Default/IPSLight_Configuration.inc.php new file mode 100644 index 0000000..ae93c24 --- /dev/null +++ b/IPSLibrary/config/modules/IPSLight/Default/IPSLight_Configuration.inc.php @@ -0,0 +1,210 @@ + + * + * Konfigurations File für IPSLight + * + */ + + /** + * + * Definition der Beleuchtungs Elemente + * + * Die Konfiguration erfolgt in Form eines Arrays, für jedes Beleuchtungselement wird ein Eintrag im Array erzeugt. + * + * Für jedes Beleuchtungselement werden dann die Eigenschaften in einem gesonderten Array hinterlegt: + * + * IPSLIGHT_NAME - spezifiziert den Namen der Beleuchtung in der GUI, Änderungen an dieser Eigenschaft werden erst nach einem + * erneuten Ausführen der Installationsprozedur sichtbar. + * + * IPSLIGHT_GROUP - beinhaltet eine Liste aller Gruppen, der das Beleuchtungselement zugeordnet ist. Diese Eigenschaft kann + * jederzeit geändert werden (vorausgesetzt die Gruppe ist bereits definiert, siehe weiter unten). + * + * IPSLIGHT_TYPE - spezifiziert den Type der Beleuchtung, zur Zeit werden 3 Beleuchtungstypen unterstützt: + * - IPSLIGHT_TYPE_SWITCH: Normale Beleuchtung mit Ein/Aus Funktionalität + * - IPSLIGHT_TYPE_RGB: RGB Beleuchtung + * - IPSLIGHT_TYPE_DIMMER: Dimmbare Beleuchtung + * Änderungen an diesem Parameter erfordern ein Ausführen der Installations Prozedure. + * + * IPSLIGHT_COMPONENT - dieser Eintrag spezifiziert die Hardware, die Angabe des Component Strings muss mit dem spezifizierten + * Beleuchtungstypen (siehe oben) zusammenpassen (Type Dimmer benötigt zB eine Klasse IPSComponentDimmer). + * + * IPSLIGHT_POWERCIRCLE - Hier kann spezifiziert werden an welchem Stromkreis die Lampe angeschlossen ist. Dieser Parameter ist + * optional. + * + * IPSLIGHT_POWERWATT - Spezifiert die maximale Leistung der Beleuchtung. Zusammen mit dem Parameter IPSLIGHT_POWERCIRCLE ist es + * nun möglich die aktuelle Leistung eines Stromkreises abzufragen. Details siehe auch im WIKI. + * + * Eine ausführliche Beispielliste findet sich auch im Example Ordner + * + * + * Beispiel: + * @code + function IPSLight_GetLightConfiguration() { + return array( + 'Kueche' => array( + IPSLIGHT_NAME => 'Küche', + IPSLIGHT_GROUPS => 'Erdgeschoss,All', + IPSLIGHT_TYPE => IPSLIGHT_TYPE_SWITCH', + IPSLIGHT_COMPONENT => 'IPSComponentSwitch_Homematic,12345', + IPSLIGHT_POWERCIRCLE => 1, + IPSLIGHT_POWERWATT => 60), + 'Ambiente' => array( + IPSLIGHT_NAME => 'Ambiente', + IPSLIGHT_GROUPS => 'Erdgeschoss,All', + IPSLIGHT_TYPE => IPSLIGHT_TYPE_RGB, + IPSLIGHT_COMPONENT => 'IPSComponentRGB_IPS868,12345'), + ); + } + * @endcocde + * + * @return string Liefert Array mit Beleuchtungs Elementen + */ + function IPSLight_GetLightConfiguration() { + return array( + 'Wohnzimmer' => array('Wohnzimmer', 'Erdgeschoss,All', 'Switch', 'IPSComponentSwitch_Dummy,12345'), + 'Kueche' => array('Küche', 'Erdgeschoss,All', 'Switch', 'IPSComponentSwitch_Homematic,12345'), + ); + } + + + /** + * + * Definition der Beleuchtungs Gruppen + * + * Die Konfiguration erfolgt in Form eines Arrays, für jede Beleuchtungsgruppe wird ein Eintrag im Array erzeugt. + * + * Für jede Beleuchtungsgruppe werden dann die Eigenschaften in einem gesonderten Array hinterlegt: + * + * IPSLIGHT_NAME - spezifiziert den Namen der Gruppe in der GUI, Änderungen an dieser Eigenschaft werden erst nach einem + * erneuten Ausführen der Installationsprozedur sichtbar. + * + * IPSLIGHT_ACTIVATABLE - gibt an, ob die Gruppe über die GUI eingeschaltet werden kann + * + * Eine Liste mit diversen Beispiel Konfigurationen findet sich auch im Example Ordner + * + * + * Beispiel: + * @code + function IPSLight_GetGroupConfiguration() { + return array( + 'All' => array( + IPSLIGHT_NAME => 'All', + IPSLIGHT_ACTIVATABLE => false), + 'Erdgeschoss' => array( + IPSLIGHT_NAME => 'Erdgeschoss', + IPSLIGHT_ACTIVATABLE => false), + ); + } + * @endcocde + * + * @return string Liefert Array mit Beleuchtungs Gruppen + */ + function IPSLight_GetGroupConfiguration() { + return array('All' => array('All', IPSLIGHT_ACTIVATABLE => false,), + 'Erdgeschoss' => array('Erdgeschoss', IPSLIGHT_ACTIVATABLE => false,), + ); + } + + /** + * + * Definition der Beleuchtungs Programme + * + * Die Konfiguration erfolgt in Form eines Arrays, für jedes Beleuchtungsprogramm wird ein Eintrag im Array erzeugt. + * + * Für jedes Beleuchtungsprogramm werden dann die einzelnen Programme ebenfalls als Array hinterlegt, diese wiederum haben ihre + * Eigenschaften nochmals in einem Array gespeichert: + * + * IPSLIGHT_PROGRAMON - Liste mit Beleuchungselementen, die bei diesem Programm eingeschaltet sein sollen. + * + * IPSLIGHT_PROGRAMOFF - Liste mit Beleuchungselementen, die bei diesem Programm ausgeschaltet sein sollen. + * + * IPSLIGHT_PROGRAMLEVEL - Liste mit Beleuchungselementen, die auf einen bestimmten Dimm Level gestellt werden sollen + * + * Eine Liste mit diversen Beispiel Konfigurationen findet sich auch im Example Ordner + * + * + * Beispiel: + * @code + function IPSLight_GetProgramConfiguration() { + return array( + 'Aus' => array( + IPSLIGHT_PROGRAMOFF => 'WellnessWand,WellnessDecke,WellnessSauna,WellnessDusche,WellnessAmbiente', + ), + 'TV' => array( + IPSLIGHT_PROGRAMLEVEL => 'WellnessWand,30', + IPSLIGHT_PROGRAMOFF => 'WellnessDecke,WellnessSauna,WellnessDusche,WellnessAmbiente', + + ), + 'Relax' => array( + IPSLIGHT_PROGRAMON => 'WellnessSauna,WellnessDusche,WellnessAmbiente', + IPSLIGHT_PROGRAMLEVEL => 'WellnessDecke,30,WellnessWand,30', + + ), + ); + } + * @endcocde + * + * @return string Liefert Array mit Beleuchtungs Gruppen + */ + function IPSLight_GetProgramConfiguration() { + return array( + ); + } + + /** + * + * Definition der WebFront GUI + * + * Die Konfiguration der WebFront Oberfläche ist NICHT dokumentiert, ist aber analog zur normalen WebFront Konfigurator GUI + * aufgebaut. + * + * Beispiele finden sich im Example Ordner + * + * @return string Liefert Array zum Aufbau des WebFronts + */ + function IPSLight_GetWebFrontConfiguration() { + return array( + ); + } + + /** + * + * Definition der Mobile GUI + * + * Die Konfiguration der Mobile GUI ist NICHT dokumentiert + * + * Beispiele finden sich im Example Ordner + * + * @return string Liefert Array zum Aufbau der Mobile GUI + */ + function IPSLight_GetMobileConfiguration() { + return array( + ); + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/config/modules/IPSLight/Default/IPSLight_Custom.inc.php b/IPSLibrary/config/modules/IPSLight/Default/IPSLight_Custom.inc.php new file mode 100644 index 0000000..2af65eb --- /dev/null +++ b/IPSLibrary/config/modules/IPSLight/Default/IPSLight_Custom.inc.php @@ -0,0 +1,91 @@ + + * + * Callback Methoden für IPSLight + * + */ + + /** + * Diese Funktion wird vor dem Schalten eines Lichtes ausgeführt. + * + * Parameters: + * @param integer $lightId ID des Beleuchtungs Switches in IPSLight + * @param boolean $value Wert für Ein/Aus + * @result boolean TRUE für OK, bei FALSE wurde die Ansteuerung der Beleuchtung bereits in der Callback Funktion erledigt + * + */ + function IPSLight_BeforeSwitch($lightId, $value) { + return true; + } + + /** + * Diese Funktion wird nach dem Schalten eines Lichtes ausgeführt. + * + * Parameters: + * @param integer $lightId ID des Beleuchtungs Switches in IPSLight + * @param boolean $value Wert für Ein/Aus + * + */ + function IPSLight_AfterSwitch($lightId, $value) { + + } + + /** + * Diese Funktion wird vor dem Synchronisieren eines Licht Schaltvorganges durch ein externes System ausgeführt. + * + * Parameters: + * @param integer $lightId ID des Beleuchtungs Switches in IPSLight + * @param boolean $value Wert für Ein/Aus + * @result boolean TRUE für OK, bei FALSE erfolgt keine Synchronisierung + * + */ + function IPSLight_BeforeSynchronizeSwitch ($lightId, $value) { + + return true; + } + + /** + * Diese Funktion wird nach dem Synchronisieren eines Licht Schaltvorganges durch ein externes System ausgeführt. + * + * Parameters: + * @param integer $lightId ID des Beleuchtungs Switches in IPSLight + * @param boolean $value Wert für Ein/Aus + * + */ + function IPSLight_AfterSynchronizeSwitch ($lightId, $value) { + } + + /** @}*/ + +?> \ No newline at end of file diff --git a/IPSLibrary/config/modules/IPSLight/Examples/IPSLight_DemoConfiguration.inc.php b/IPSLibrary/config/modules/IPSLight/Examples/IPSLight_DemoConfiguration.inc.php new file mode 100644 index 0000000..ece25fb --- /dev/null +++ b/IPSLibrary/config/modules/IPSLight/Examples/IPSLight_DemoConfiguration.inc.php @@ -0,0 +1,381 @@ + + * + * Konfigurations File für IPSLight + * + */ + + /** + * + * Definition der Beleuchtungs Elemente + * + * Die Konfiguration erfolgt in Form eines Arrays, für jedes Beleuchtungselement wird ein Eintrag im Array erzeugt. + * + * Für jedes Beleuchtungselement werden dann die Eigenschaften in einem gesonderten Array hinterlegt: + * + * IPSLIGHT_NAME - spezifiziert den Namen der Beleuchtung in der GUI, Änderungen an dieser Eigenschaft werden erst nach einem + * erneuten Ausführen der Installationsprozedur sichtbar. + * + * IPSLIGHT_GROUP - beinhaltet eine Liste aller Gruppen, der das Beleuchtungselement zugeordnet ist. Diese Eigenschaft kann + * jederzeit geändert werden (vorausgesetzt die Gruppe ist bereits definiert, siehe weiter unten). + * + * IPSLIGHT_TYPE - spezifiziert den Type der Beleuchtung, zur Zeit werden 3 Beleuchtungstypen unterstützt: + * - IPSLIGHT_TYPE_SWITCH: Normale Beleuchtung mit Ein/Aus Funktionalität + * - IPSLIGHT_TYPE_RGB: RGB Beleuchtung + * - IPSLIGHT_TYPE_DIMMER: Dimmbare Beleuchtung + * Änderungen an diesem Parameter erfordern ein Ausführen der Installations Prozedure. + * + * IPSLIGHT_COMPONENT - dieser Eintrag spezifiziert die Hardware, die Angabe des Component Strings muss mit dem spezifizierten + * Beleuchtungstypen (siehe oben) zusammenpassen (Type Dimmer benötigt zB eine Klasse IPSComponentDimmer). + * + * IPSLIGHT_POWERCIRCLE - Hier kann spezifiziert werden an welchem Stromkreis die Lampe angeschlossen ist. Dieser Parameter ist + * optional. + * + * IPSLIGHT_POWERWATT - Spezifiert die maximale Leistung der Beleuchtung. Zusammen mit dem Parameter IPSLIGHT_POWERCIRCLE ist es + * nun möglich die aktuelle Leistung eines Stromkreises abzufragen. Details siehe auch im WIKI. + * + * Eine ausführliche Beispielliste findet sich auch im Example Ordner + * + * + * Beispiel: + * @code + function IPSLight_GetLightConfiguration() { + return array( + 'Kueche' => array( + IPSLIGHT_NAME => 'Küche', + IPSLIGHT_GROUPS => 'Erdgeschoss,All', + IPSLIGHT_TYPE => IPSLIGHT_TYPE_SWITCH', + IPSLIGHT_COMPONENT => 'IPSComponentSwitch_Dummy,12345', + IPSLIGHT_POWERCIRCLE => 1, + IPSLIGHT_POWERWATT => 60), + 'Ambiente' => array( + IPSLIGHT_NAME => 'Ambiente', + IPSLIGHT_GROUPS => 'Erdgeschoss,All', + IPSLIGHT_TYPE => IPSLIGHT_TYPE_RGB, + IPSLIGHT_COMPONENT => 'IPSComponentRGB_IPS868,12345'), + ); + } + * @endcocde + * + * @return string Liefert Array mit Beleuchtungs Elementen + */ + function IPSLight_GetLightConfiguration() { + return array( + // ===== Erdgeschoss ================================================================== + 'Esstisch' => array('Esstisch', 'Erdgeschoss,All', 'Switch', 'IPSComponentSwitch_Dummy,32626','L1',100), + 'Wohnzimmer' => array('Wohnzimmer', 'Erdgeschoss,All', 'Switch', 'IPSComponentSwitch_Dummy,48611','L1',100), + 'Ambiente' => array('Ambiente', 'Erdgeschoss,All', 'RGB', 'IPSComponentRGB_Dummy,36525','L1',10), + 'Wohnbereich' => array('Wohnbereich', 'Erdgeschoss,All', 'Switch', 'IPSComponentSwitch_Dummy,17605','L1',100), + 'Kueche' => array('Küche', 'Erdgeschoss,All', 'Switch', 'IPSComponentSwitch_Dummy,27179','L2',10), + 'Arbeitszimmer' => array('Arbeitszimmer', 'Erdgeschoss,All', 'Switch', 'IPSComponentSwitch_Dummy,24592','L1',10), + 'Vorzimmer' => array('Vorzimmer', 'Erdgeschoss,All', 'Switch', 'IPSComponentSwitch_Dummy,11022','L3',60), + 'WC' => array('WC', 'Erdgeschoss,All', 'Switch', 'IPSComponentSwitch_Dummy,21180','L3',40), + 'Abstellraum' => array('Abstellraum', 'Erdgeschoss,All', 'Switch', 'IPSComponentSwitch_Dummy,13545','L3',60), + + // ===== Obergeschoss ================================================================== + 'Bad' => array('Bad', 'Obergeschoss,All', 'Switch', 'IPSComponentSwitch_Dummy,51577','L1',0), + 'Gaestezimmer' => array('Spielezimmer', 'Obergeschoss,All', 'Switch', 'IPSComponentSwitch_Dummy,32432','L1',0), + 'Kinderzimmer' => array('Zimmer Jonas', 'Obergeschoss,All', 'Switch', 'IPSComponentSwitch_Dummy,52619','L1',0), + 'Schlafzimmer' => array('Schlafzimmer', 'Obergeschoss,All', 'Switch', 'IPSComponentSwitch_Dummy,45579','L1',0), + 'Schrankraum' => array('Schrankraum', 'Obergeschoss,All', 'Switch', 'IPSComponentSwitch_Dummy,18743','L1',0), + 'Vorraum' => array('Vorraum', 'Obergeschoss,All', 'Switch', 'IPSComponentSwitch_Dummy,59085','L1',0), + 'Stiege OG' => array('Stiege OG', 'Obergeschoss,All', 'Switch', 'IPSComponentSwitch_Dummy,19661','L1',0), + + // ===== Kellergeschoss ================================================================== + 'Stiege KG' => array('Bad', 'Kellergeschoss,All', 'Switch', 'IPSComponentSwitch_Dummy,21631','L1',0), + 'Technikraum' => array('Technikraum', 'Kellergeschoss,All', 'Switch', 'IPSComponentSwitch_Dummy,40611','L1',0), + 'Werkstatt' => array('Werkstatt', 'Kellergeschoss,All', 'Switch', 'IPSComponentSwitch_Dummy,39307','L1',0), + 'WellnessWand' => array('Wandleuchte', 'Kellergeschoss,All,Wellness', 'Dimmer', 'IPSComponentDimmer_Dummy,10608','L2',380), + 'WellnessDecke' => array('Decke', 'Kellergeschoss,All,Wellness', 'Dimmer', 'IPSComponentDimmer_Dummy,22847','L2',60), + 'WellnessSauna' => array('Sauna', 'Kellergeschoss,All,Wellness', 'Switch', 'IPSComponentSwitch_Dummy,43774','L2',60), + 'WellnessDusche' => array('Dusche', 'Kellergeschoss,All,Wellness', 'Switch', 'IPSComponentSwitch_Dummy,21540','L2',10), + 'WellnessAmbiente' => array('Ambiente', 'Kellergeschoss,All,Wellness', 'Switch', 'IPSComponentSwitch_Dummy,28131','L2',10), + + // ===== Aussen ================================================================== + 'TerrasseHauswand' => array('Hauswand', 'Aussen,All', 'Switch', 'IPSComponentSwitch_Dummy,34233','L1',120), + 'TerrasseGarten' => array('Garten', 'Aussen,All', 'Switch', 'IPSComponentSwitch_Dummy,50936','L1',60), + 'TerrassePergola' => array('Pergola', 'Aussen,All', 'Switch', 'IPSComponentSwitch_Dummy,34391','L1',12), + 'TerrasseTisch' => array('Tisch', 'Aussen,All', 'Switch', 'IPSComponentSwitch_Dummy,58524','L1',6), + ); + } + + + /** + * + * Definition der Beleuchtungs Gruppen + * + * Die Konfiguration erfolgt in Form eines Arrays, für jede Beleuchtungsgruppe wird ein Eintrag im Array erzeugt. + * + * Für jede Beleuchtungsgruppe werden dann die Eigenschaften in einem gesonderten Array hinterlegt: + * + * IPSLIGHT_NAME - spezifiziert den Namen der Gruppe in der GUI, Änderungen an dieser Eigenschaft werden erst nach einem + * erneuten Ausführen der Installationsprozedur sichtbar. + * + * IPSLIGHT_ACTIVATABLE - gibt an, ob die Gruppe über die GUI eingeschaltet werden kann + * + * Eine Liste mit diversen Beispiel Konfigurationen findet sich auch im Example Ordner + * + * + * Beispiel: + * @code + function IPSLight_GetGroupConfiguration() { + return array( + 'All' => array( + IPSLIGHT_NAME => 'All', + IPSLIGHT_ACTIVATABLE => false), + 'Erdgeschoss' => array( + IPSLIGHT_NAME => 'Erdgeschoss', + IPSLIGHT_ACTIVATABLE => false), + ); + } + * @endcocde + * + * @return string Liefert Array mit Beleuchtungs Gruppen + */ + function IPSLight_GetGroupConfiguration() { + return array('All' => array('All', IPSLIGHT_ACTIVATABLE => false,), + 'Erdgeschoss' => array('Erdgeschoss', IPSLIGHT_ACTIVATABLE => false,), + 'Obergeschoss' => array('Obergeschoss', IPSLIGHT_ACTIVATABLE => false,), + 'Kellergeschoss' => array('Kellergeschoss', IPSLIGHT_ACTIVATABLE => false,), + 'Wellness' => array('Wellness', IPSLIGHT_ACTIVATABLE => true,), + 'Aussen' => array('Aussen', IPSLIGHT_ACTIVATABLE => true,), + ); + } + + /** + * + * Definition der Beleuchtungs Programme + * + * Die Konfiguration erfolgt in Form eines Arrays, für jedes Beleuchtungsprogramm wird ein Eintrag im Array erzeugt. + * + * Für jedes Beleuchtungsprogramm werden dann die einzelnen Programme ebenfalls als Array hinterlegt, diese wiederum haben ihre + * Eigenschaften nochmals in einem Array gespeichert: + * + * IPSLIGHT_PROGRAMON - Liste mit Beleuchungselementen, die bei diesem Programm eingeschaltet sein sollen. + * + * IPSLIGHT_PROGRAMOFF - Liste mit Beleuchungselementen, die bei diesem Programm ausgeschaltet sein sollen. + * + * IPSLIGHT_PROGRAMLEVEL - Liste mit Beleuchungselementen, die auf einen bestimmten Dimm Level gestellt werden sollen + * + * Eine Liste mit diversen Beispiel Konfigurationen findet sich auch im Example Ordner + * + * + * Beispiel: + * @code + function IPSLight_GetProgramConfiguration() { + return array( + 'Aus' => array( + IPSLIGHT_PROGRAMOFF => 'WellnessWand,WellnessDecke,WellnessSauna,WellnessDusche,WellnessAmbiente', + ), + 'TV' => array( + IPSLIGHT_PROGRAMLEVEL => 'WellnessWand,30', + IPSLIGHT_PROGRAMOFF => 'WellnessDecke,WellnessSauna,WellnessDusche,WellnessAmbiente', + + ), + 'Relax' => array( + IPSLIGHT_PROGRAMON => 'WellnessSauna,WellnessDusche,WellnessAmbiente', + IPSLIGHT_PROGRAMLEVEL => 'WellnessDecke,30,WellnessWand,30', + + ), + ); + } + * @endcocde + * + * @return string Liefert Array mit Beleuchtungs Gruppen + */ + function IPSLight_GetProgramConfiguration() { + return array( + // ===== Wellness ================================================================== + 'WellnessProgram' => array( + 'Aus' => array( + IPSLIGHT_PROGRAMOFF => 'WellnessWand,WellnessDecke,WellnessSauna,WellnessDusche,WellnessAmbiente', + ), + 'Normal' => array( + IPSLIGHT_PROGRAMON => 'WellnessSauna,WellnessDusche,WellnessAmbiente', + IPSLIGHT_PROGRAMLEVEL => 'WellnessDecke,100,WellnessWand,100', + ), + 'Sauna' => array( + IPSLIGHT_PROGRAMON => 'WellnessSauna,WellnessDusche,WellnessAmbiente', + IPSLIGHT_PROGRAMLEVEL => 'WellnessDecke,50', + IPSLIGHT_PROGRAMOFF => 'WellnessWand', + ), + 'TV' => array( + IPSLIGHT_PROGRAMLEVEL => 'WellnessWand,30', + IPSLIGHT_PROGRAMOFF => 'WellnessDecke,WellnessSauna,WellnessDusche,WellnessAmbiente', + + ), + 'Relax' => array( + IPSLIGHT_PROGRAMON => 'WellnessSauna,WellnessDusche,WellnessAmbiente', + IPSLIGHT_PROGRAMLEVEL => 'WellnessDecke,30,WellnessWand,30', + + ), + ), + // ===== Terrasse ================================================================== + 'TerrasseProgram' => array( + 'Aus' => array( + IPSLIGHT_PROGRAMOFF => 'TerrasseHauswand,TerrasseGarten,TerrassePergola,TerrasseTisch', + IPSLIGHT_PROGRAMLEVEL => '', + ), + 'Garten' => array( + IPSLIGHT_PROGRAMON => 'TerrasseGarten,TerrassePergola', + IPSLIGHT_PROGRAMOFF => 'TerrasseHauswand,TerrasseTisch', + IPSLIGHT_PROGRAMLEVEL => '', + ), + 'Abend' => array( + IPSLIGHT_PROGRAMON => 'TerrasseGarten,TerrassePergola,TerrasseTisch', + IPSLIGHT_PROGRAMOFF => 'TerrasseHauswand', + IPSLIGHT_PROGRAMLEVEL => '', + ), + 'Terrasse' => array( + IPSLIGHT_PROGRAMON => 'TerrasseHauswand,TerrasseGarten,TerrassePergola,TerrasseTisch', + IPSLIGHT_PROGRAMLEVEL => '', + ), + ), + // ===== Wohnzimmer ================================================================== + 'WohnenProgram' => array( + 'Aus' => array( + IPSLIGHT_PROGRAMOFF => 'Esstisch,Wohnzimmer,Ambiente,Wohnbereich,Kueche,Arbeitszimmer', + IPSLIGHT_PROGRAMLEVEL => '', + ), + 'Essen' => array( + IPSLIGHT_PROGRAMON => 'Esstisch', + IPSLIGHT_PROGRAMOFF => 'Wohnzimmer,Ambiente,Wohnbereich,Arbeitszimmer', + IPSLIGHT_PROGRAMLEVEL => '', + ), + 'TV' => array( + IPSLIGHT_PROGRAMON => 'Wohnzimmer', + IPSLIGHT_PROGRAMOFF => 'Esstisch,Ambiente,Wohnbereich,Kueche,Arbeitszimmer', + IPSLIGHT_PROGRAMRGB => 'Ambiente,70,255,255,0', + ), + 'Relax' => array( + IPSLIGHT_PROGRAMON => '', + IPSLIGHT_PROGRAMOFF => 'Esstisch,Wohnzimmer,Wohnbereich,Kueche,Arbeitszimmer', + IPSLIGHT_PROGRAMRGB => 'Ambiente,100,255,255,0', + ), + ), + ); + } + + /** + * + * Definition der WebFront GUI + * + * Die Konfiguration der WebFront Oberfläche ist NICHT dokumentiert + * + * Beispiele finden sich im Example Ordner + * + * @return string Liefert Array zum Aufbau des WebFronts + */ + function IPSLight_GetWebFrontConfiguration() { + return array( + 'Übersicht' => array( + array(IPSLIGHT_WFCSPLITPANEL, 'Light_1_SPv1x', 'LightTP', 'Übersicht','Bulb',1,33,0,0,'true'), + array(IPSLIGHT_WFCSPLITPANEL, 'Light_1_SPv1h1x', 'Light_1_SPv1x', null,null,0,270,0,1,'true'), + array(IPSLIGHT_WFCCATEGORY, 'Light_1_CAv1h1', 'Light_1_SPv1h1x', null,null), + array(IPSLIGHT_WFCLINKS, '', 'Light_1_CAv1h1', 'Obergeschoss,Erdgeschoss,Kellergeschoss,Wellness,Aussen'), + array(IPSLIGHT_WFCCATEGORY, 'Light_1_CAv1h2', 'Light_1_SPv1h1x', null,null), + array(IPSLIGHT_WFCGROUP, 'Wellness', 'Light_1_CAv1h2', 'WellnessWand,WellnessDecke,WellnessSauna,WellnessDusche,WellnessAmbiente', 'Decke,Wand,Sauna,Dusche,Ambiente'), + array(IPSLIGHT_WFCSPLITPANEL, 'Light_1_SPv23', 'Light_1_SPv1x', null,null,1,50,0,0,'true'), + array(IPSLIGHT_WFCCATEGORY, 'Light_1_CAv2', 'Light_1_SPv23', null,null), + array(IPSLIGHT_WFCGROUP, 'Erdgeschoss', 'Light_1_CAv2', 'Wohnbereich,Wohnzimmer,Ambiente,Esstisch,Kueche,Arbeitszimmer,Vorzimmer,WC,Abstellraum', 'Wohnbereich,Wohnzimmer,Ambiente,Esstisch,Küche,Arbeitszimmer,Vorzimmer,WC,Abstellraum'), + array(IPSLIGHT_WFCGROUP, 'Aussen', 'Light_1_CAv2', 'TerrasseHauswand,TerrasseGarten,TerrassePergola,TerrasseTisch', 'Hauswand,Garten,Pergola,Tisch'), + array(IPSLIGHT_WFCCATEGORY, 'Light_1_CAv3', 'Light_1_SPv23', null,null), + array(IPSLIGHT_WFCGROUP, 'Obergeschoss', 'Light_1_CAv3', 'Stiege OG,Vorraum,Bad,Gaestezimmer,Kinderzimmer,Schlafzimmer,Schrankraum', 'Stiege OG,Vorraum,Bad,Gästezimmer,Kinderzimmer,Schlafzimmer,Schrankraum'), + array(IPSLIGHT_WFCGROUP, 'Kellergeschoss','Light_1_CAv3', 'Stiege KG,Technikraum,Werkstatt'), + ), + 'Obergeschoss' => array( + array(IPSLIGHT_WFCSPLITPANEL, 'Light_2_SPv1', 'LightTP', 'Obergeschoss',null,1,50,0,0,'true'), + array(IPSLIGHT_WFCSPLITPANEL, 'Light_2_SPv1h1x', 'Light_2_SPv1', null,null,0,100,0,1,'true'), + array(IPSLIGHT_WFCCATEGORY, 'Light_2_CAv1h1', 'Light_2_SPv1h1x', null,null), + array(IPSLIGHT_WFCLINKS, '', 'Light_2_CAv1h1', 'Obergeschoss'), + array(IPSLIGHT_WFCCATEGORY, 'Light_2_CAv1h2', 'Light_2_SPv1h1x', null,null), + array(IPSLIGHT_WFCGROUP, 'Obergeschoss', 'Light_2_CAv1h2', 'Stiege OG,Vorraum,Bad,Gaestezimmer,Kinderzimmer,Schlafzimmer,Schrankraum', 'Stiege OG,Vorraum,Bad,Gästezimmer,Kinderzimmer,Schlafzimmer,Schrankraum'), + array(IPSLIGHT_WFCSPLITPANEL, 'Light_2_SPv2h1x', 'Light_2_SPv1', null,null,0,500,0,1,'true'), + array(IPSLIGHT_WFCCATEGORY, 'Light_2_CAv2h1', 'Light_2_SPv2h1x', null,null), + array(IPSLIGHT_WFCCATEGORY, 'Light_2_CAv2h2', 'Light_2_SPv2h1x', null,null), + ), + 'Erdgeschoss' => array( + array(IPSLIGHT_WFCSPLITPANEL, 'Light_3_SPv1', 'LightTP', 'Erdgeschoss',null,1,50,0,0,'true'), + array(IPSLIGHT_WFCSPLITPANEL, 'Light_3_SPv1h1x', 'Light_3_SPv1', null,null,0,100,0,1,'true'), + array(IPSLIGHT_WFCCATEGORY, 'Light_3_CAv1h1', 'Light_3_SPv1h1x', null,null), + array(IPSLIGHT_WFCLINKS, '', 'Light_3_CAv1h1', 'Erdgeschoss'), + array(IPSLIGHT_WFCCATEGORY, 'Light_3_CAv1h2', 'Light_3_SPv1h1x', null,null), + array(IPSLIGHT_WFCGROUP, 'Erdgeschoss', 'Light_3_CAv1h2', 'Vorzimmer,WC,Abstellraum,Wohnbereich,Wohnzimmer,Esstisch,Kueche,Arbeitszimmer', 'Vorzimmer,WC,Abstellraum,Wohnbereich,Wohnzimmer,Esstisch,Küche,Arbeitszimmer'), + array(IPSLIGHT_WFCSPLITPANEL, 'Light_3_SPv2h1x', 'Light_3_SPv1', null,null,0,500,0,1,'true'), + array(IPSLIGHT_WFCCATEGORY, 'Light_3_CAv2h1', 'Light_3_SPv2h1x', null,null), + array(IPSLIGHT_WFCGROUP, 'Ambiente', 'Light_3_CAv2h1', 'Ambiente,Ambiente#Color,Ambiente#Level', 'Power,Farbe,Helligkeit'), + array(IPSLIGHT_WFCCATEGORY, 'Light_3_CAv2h2', 'Light_3_SPv2h1x', null,null), + ), + 'Keller/Aussen' => array( + array(IPSLIGHT_WFCSPLITPANEL, 'Light_4_SPv1', 'LightTP', 'Keller/Aussen',null,1,50,0,0,'true'), + array(IPSLIGHT_WFCSPLITPANEL, 'Light_4_SPv1h1x', 'Light_4_SPv1', null,null,0,200,0,1,'true'), + array(IPSLIGHT_WFCCATEGORY, 'Light_4_CAv1h1', 'Light_4_SPv1h1x', null,null), + array(IPSLIGHT_WFCLINKS, '', 'Light_4_CAv1h1', 'Kellergeschoss,Wellness,Aussen'), + array(IPSLIGHT_WFCCATEGORY, 'Light_4_CAv1h2', 'Light_4_SPv1h1x', null,null), + array(IPSLIGHT_WFCGROUP, 'Keller', 'Light_4_CAv1h2', 'Stiege KG,Technikraum,Werkstatt'), + array(IPSLIGHT_WFCGROUP, 'Aussen', 'Light_4_CAv1h2', 'TerrasseProgram,TerrasseHauswand,TerrasseGarten,TerrassePergola,TerrasseTisch', 'Programm,Hauswand,Garten,Pergola,Tisch'), + array(IPSLIGHT_WFCSPLITPANEL, 'Light_4_SPv2h1x', 'Light_4_SPv1', null,null,0,400,0,1,'true'), + array(IPSLIGHT_WFCCATEGORY, 'Light_4_CAv2h1', 'Light_4_SPv2h1x', null,null), + array(IPSLIGHT_WFCGROUP, 'Wellness', 'Light_4_CAv2h1', 'WellnessProgram,WellnessDecke,WellnessDecke#Level,WellnessWand,WellnessWand#Level,WellnessSauna,WellnessDusche,WellnessAmbiente', 'Program,Decke,Helligkeit Decke,Wand,Helligkeit Wand,Sauna,Dusche,Ambiente'), + array(IPSLIGHT_WFCCATEGORY, 'Light_4_CAv2h2', 'Light_4_SPv2h1x', null,null,''), + ), + ); + } + + /** + * + * Definition der Mobile GUI + * + * Die Konfiguration der Mobile GUI ist NICHT dokumentiert + * + * Beispiele finden sich im Example Ordner + * + * @return string Liefert Array zum Aufbau der Mobile GUI + */ + function IPSLight_GetMobileConfiguration() { + return array( + 'Obergeschoss,Erdgeschoss,Kellergeschoss,Wellness,Aussen', + 'Obergeschoss' => array( + array(IPSLIGHT_WFCLINKS, '', 'Obergeschoss'), + array(IPSLIGHT_WFCGROUP, 'Obergeschoss', 'Stiege OG,Vorraum,Bad,Gaestezimmer,Kinderzimmer,Schlafzimmer,Schrankraum', 'Stiege OG,Vorraum,Bad,Gästezimmer,Kinderzimmer,Schlafzimmer,Schrankraum'), + ), + 'Erdgeschoss' => array( + array(IPSLIGHT_WFCLINKS, '', 'Erdgeschoss'), + array(IPSLIGHT_WFCGROUP, 'Erdgeschoss', 'Vorzimmer,WC,Abstellraum,Wohnbereich,Wohnzimmer,Esstisch,Kueche,Arbeitszimmer', 'Vorzimmer,WC,Abstellraum,Wohnbereich,Wohnzimmer,Esstisch,Küche,Arbeitszimmer'), + array(IPSLIGHT_WFCGROUP, 'Ambiente', 'Ambiente,Ambiente#Color,Ambiente#Level', 'Power,Farbe,Helligkeit'), + ), + 'Keller/Aussen' => array( + array(IPSLIGHT_WFCLINKS, '', 'Kellergeschoss,Wellness,Aussen'), + array(IPSLIGHT_WFCGROUP, 'Keller', 'Stiege KG,Technikraum,Werkstatt'), + array(IPSLIGHT_WFCGROUP, 'Aussen', 'TerrasseProgram,TerrasseHauswand,TerrasseGarten,TerrassePergola,TerrasseTisch', 'Programm,Hauswand,Garten,Pergola,Tisch'), + array(IPSLIGHT_WFCGROUP, 'Wellness', 'WellnessProgram,WellnessDecke,WellnessDecke#Level,WellnessWand,WellnessWand#Level,WellnessSauna,WellnessDusche,WellnessAmbiente', 'Program,Decke,Helligkeit,Wand,Helligkeit,Sauna,Dusche,Ambiente'), + ), + ); + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/config/modules/IPSLight/Examples/IPSLight_DemoCustom.inc.php b/IPSLibrary/config/modules/IPSLight/Examples/IPSLight_DemoCustom.inc.php new file mode 100644 index 0000000..2af65eb --- /dev/null +++ b/IPSLibrary/config/modules/IPSLight/Examples/IPSLight_DemoCustom.inc.php @@ -0,0 +1,91 @@ + + * + * Callback Methoden für IPSLight + * + */ + + /** + * Diese Funktion wird vor dem Schalten eines Lichtes ausgeführt. + * + * Parameters: + * @param integer $lightId ID des Beleuchtungs Switches in IPSLight + * @param boolean $value Wert für Ein/Aus + * @result boolean TRUE für OK, bei FALSE wurde die Ansteuerung der Beleuchtung bereits in der Callback Funktion erledigt + * + */ + function IPSLight_BeforeSwitch($lightId, $value) { + return true; + } + + /** + * Diese Funktion wird nach dem Schalten eines Lichtes ausgeführt. + * + * Parameters: + * @param integer $lightId ID des Beleuchtungs Switches in IPSLight + * @param boolean $value Wert für Ein/Aus + * + */ + function IPSLight_AfterSwitch($lightId, $value) { + + } + + /** + * Diese Funktion wird vor dem Synchronisieren eines Licht Schaltvorganges durch ein externes System ausgeführt. + * + * Parameters: + * @param integer $lightId ID des Beleuchtungs Switches in IPSLight + * @param boolean $value Wert für Ein/Aus + * @result boolean TRUE für OK, bei FALSE erfolgt keine Synchronisierung + * + */ + function IPSLight_BeforeSynchronizeSwitch ($lightId, $value) { + + return true; + } + + /** + * Diese Funktion wird nach dem Synchronisieren eines Licht Schaltvorganges durch ein externes System ausgeführt. + * + * Parameters: + * @param integer $lightId ID des Beleuchtungs Switches in IPSLight + * @param boolean $value Wert für Ein/Aus + * + */ + function IPSLight_AfterSynchronizeSwitch ($lightId, $value) { + } + + /** @}*/ + +?> \ No newline at end of file diff --git a/IPSLibrary/config/modules/IPSPowerControl/Default/IPSPowerControl_Configuration.inc.php b/IPSLibrary/config/modules/IPSPowerControl/Default/IPSPowerControl_Configuration.inc.php new file mode 100644 index 0000000..e5eb246 --- /dev/null +++ b/IPSLibrary/config/modules/IPSPowerControl/Default/IPSPowerControl_Configuration.inc.php @@ -0,0 +1,200 @@ + + * + * Konfigurations File für IPSPowerControl + * + */ + + /** + * + * Defintion der Mess Sensoren + * + * Die Konfiguration erfolgt in Form eines Arrays, für jeden Sensor wird ein Eintrag im Array erzeugt. + * + * IPSPC_PROPERTY_NAME - Name des Sensors + * + * IPSPC_PROPERTY_VARWATT - Variable ID die zum Lesen der aktuellen "Watt" Werte verwendet werden soll + * + * IPSPC_PROPERTY_VARKWH - Variable ID die zum Lesen der aktuellen "kWh" Werte verwendet werden soll + * + * IPSPC_PROPERTY_VARM3 - Variable ID die zum Lesen der aktuellen Gas bzw. Wasser Werte verwendet werden soll + * + * Eine ausführliche Beispielliste findet sich auch im Example Ordner + * + * Beispiel: + * @code + function IPSPowerControl_GetSensorConfiguration() { + return array( + 0 => array(IPSPC_PROPERTY_NAME => 'L1', + IPSPC_PROPERTY_VARWATT => 32902, + IPSPC_PROPERTY_VARKWH => 40061, + ), + 1 => array(IPSPC_PROPERTY_NAME => 'L2', + IPSPC_PROPERTY_VARWATT => 44599, + IPSPC_PROPERTY_VARKWH => 41795, + ), + 2 => array(IPSPC_PROPERTY_NAME => 'L3', + IPSPC_PROPERTY_VARWATT => 26373, + IPSPC_PROPERTY_VARKWH => 21487, + ), + 3 => array(IPSPC_PROPERTY_NAME => 'Gas', + IPSPC_PROPERTY_VARM3 => 12345, + ), + 4 => array(IPSPC_PROPERTY_NAME => 'Wasser', + IPSPC_PROPERTY_VARM3 => 23456, + ), + ); + } + * @endcocde + * + * @return string Liefert Array mit den Daten der Mess Sensoren + */ + function IPSPowerControl_GetSensorConfiguration() { + return array( + 0 => array(IPSPC_PROPERTY_NAME => 'L1', + IPSPC_PROPERTY_VARWATT => 11111, + IPSPC_PROPERTY_VARKWH => 22222, + ), + ); + } + + + /** + * + * Defintion der Visualisierungs Werte + * + * Die Konfiguration erfolgt in Form eines Arrays, für jede Visualisierungs Variable wird ein Eintrag im Array erzeugt. + * + * IPSPC_PROPERTY_NAME - Name der Visualisierungs Variable + * + * IPSPC_PROPERTY_DISPLAY - Spezifiziert ob der Wert in der GUI visualisiert werden soll + * + * IPSPC_PROPERTY_VALUETYPE - Werte Type der Variable, mögliche Werte: + * IPSPC_VALUETYPE_TOTAL ... definiert die Variable als Summenwert über alle Stromkreise + * IPSPC_VALUETYPE_DETAIL ... definiert die Variable als Detailwert eines Stromkreises + * IPSPC_VALUETYPE_OTHER ... übrige Werte (weder Total noch Detail) + * IPSPC_VALUETYPE_WATER ... Werte eines Wasserverbrauchs Sensors + * IPSPC_VALUETYPE_GAS ... Werte eines Gas Sensors + * + * Eine ausführliche Beispielliste findet sich auch im Example Ordner + * + * + * Beispiel: + * @code + function IPSPowerControl_GetValueConfiguration() { + return array( + 0 => array(IPSPC_PROPERTY_NAME => 'L1', + IPSPC_PROPERTY_DISPLAY => true, + IPSPC_PROPERTY_VALUETYPE => IPSPC_VALUETYPE_DETAIL, + ), + 1 => array(IPSPC_PROPERTY_NAME => 'L2', + IPSPC_PROPERTY_DISPLAY => true, + IPSPC_PROPERTY_VALUETYPE => IPSPC_VALUETYPE_DETAIL, + ), + 2 => array(IPSPC_PROPERTY_NAME => 'L3', + IPSPC_PROPERTY_DISPLAY => true, + IPSPC_PROPERTY_VALUETYPE => IPSPC_VALUETYPE_DETAIL, + ), + 3 => array(IPSPC_PROPERTY_NAME => 'Total', + IPSPC_PROPERTY_DISPLAY => true, + IPSPC_PROPERTY_VALUETYPE => IPSPC_VALUETYPE_TOTAL, + ), + 4 => array(IPSPC_PROPERTY_NAME => 'Wasser', + IPSPC_PROPERTY_DISPLAY => true, + IPSPC_PROPERTY_VALUETYPE => IPSPC_VALUETYPE_WATER, + ), + 5 => array(IPSPC_PROPERTY_NAME => 'Gas', + IPSPC_PROPERTY_DISPLAY => true, + IPSPC_PROPERTY_VALUETYPE => IPSPC_VALUETYPE_GAS, + ), + ); + } + * @endcocde + * + * @return string Liefert Array mit den Daten der Visualisierungs Werte + */ + function IPSPowerControl_GetValueConfiguration() { + return array( + 1 => array(IPSPC_PROPERTY_NAME => 'L1', + IPSPC_PROPERTY_DISPLAY => true, + IPSPC_PROPERTY_VALUETYPE => IPSPC_VALUETYPE_OTHER, + ), + ); + } + + /** IPSPowerControl Stromkosten + * + * Definiert die Stromkosten in Cents per kWh, die für die Berechnung der Werte verwendet + * werden soll. + * + */ + define ("IPSPC_ELECTRICITYRATE", 18 /*Cents per KWh*/); + + /** IPSPowerControl Wasserkosten + * + * Definiert die Kosten für Wasser in Euro pro m³, dieser Wert wird für die Umrechung in die + * Kosten bei der Generierung der Charts verwendet. + * + */ + define ("IPSPC_WATERRATE", 130 /*Cents per m³*/); + + /** IPSPowerControl Umrechnung von Gas m³ in kWh + * + * Definiert den Faktor, der für die Umrechung von m³ in kWh verwendet werden soll (dieser Faktor + * ist von mehreren Dingen abhängig, eine genaue Angabe ist vom jeweiligen Gasversorger zu + * erfragen. Für eine grobe Annäherungsrechung kann ein Faktor von 10 verwendet werden). + * + */ + define ("IPSPC_GASRATE_KWH", 10.6 /*1m³ = kWh*/); + + /** IPSPowerControl Gaskosten + * + * Definiert die Kosten für Gas in Cent pro m³, dieser Wert wird für die Umrechung in die + * Kosten bei der Generierung der Charts verwendet. + * + */ + define ("IPSPC_GASRATE_EURO", 7.6 /*Cents per KWh*/); + + + /** IPSPowerControl Aktualisierungs Interval Watt + * + * Definiert das Interval für die Aktualisierung der berechneten Watt Verbrauchswerte. + * Die Angabe erfolgt in Sekunden + * + */ + define ("IPSPC_REFRESHINTERVAL_WATT", 60); + + /** IPSPowerControl Aktualisierungs Interval kWh + * + * Definiert das Interval für die Aktualisierung der berechneten kWh Verbrauchswerte. + * Die Angabe erfolgt in Minuten + * + */ + define ("IPSPC_REFRESHINTERVAL_KWH", 60); + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/config/modules/IPSPowerControl/Default/IPSPowerControl_Custom.inc.php b/IPSLibrary/config/modules/IPSPowerControl/Default/IPSPowerControl_Custom.inc.php new file mode 100644 index 0000000..1d06226 --- /dev/null +++ b/IPSLibrary/config/modules/IPSPowerControl/Default/IPSPowerControl_Custom.inc.php @@ -0,0 +1,83 @@ + + * + * Callback Methoden für IPSPowerControl + * + */ + + /** + * Diese Funktion wird zur Berechnung der "Watt" Verbrauchswerte aufgerufen + * + * Man kann hier ausgehend von den Sensor Werten noch zusätzliche Werte Berechnen und für die Visualisierung + * bereitstellen. + * + * Parameters: + * @param array $sensorList Liste mit Sensor Werten + * @param array $valueList Liste der zu berechnenden Werte + * @result array Liste der berechneten Visualisierungs Werte + * + */ + + function IPSPowerControl_CalculateValuesWatt($sensorList, $valueList) { + $returnList = $valueList; + foreach ($sensorList as $idx=>$value) { + $returnList[$idx] = $value; + } + return $returnList; + } + + /** + * Diese Funktion wird zur Berechnung der Verbrauchswerte in KWH aufgerufen + * + * Man kann hier ausgehend von den Sensor Werten noch zusätzliche Werte Berechnen und für die Visualisierung + * bereitstellen. + * + * Parameters: + * @param array $sensorList Liste mit Sensor Werten + * @param array $valueList Liste der zu berechnenden Werte + * @result array Liste der berechneten Visualisierungs Werte + * + */ + function IPSPowerControl_CalculateValuesKWH($sensorList, $valueList) { + $returnList = $valueList; + foreach ($sensorList as $idx=>$value) { + $returnList[$idx] = $value; + } + return $returnList; + } + + /** @}*/ + +?> \ No newline at end of file diff --git a/IPSLibrary/config/modules/IPSPowerControl/Examples/IPSPowerControl_DemoConfiguration.inc.php b/IPSLibrary/config/modules/IPSPowerControl/Examples/IPSPowerControl_DemoConfiguration.inc.php new file mode 100644 index 0000000..d27f420 --- /dev/null +++ b/IPSLibrary/config/modules/IPSPowerControl/Examples/IPSPowerControl_DemoConfiguration.inc.php @@ -0,0 +1,252 @@ + + * + * Konfigurations File für IPSPowerControl + * + */ + + /** + * + * Defintion der Mess Sensoren + * + * Die Konfiguration erfolgt in Form eines Arrays, für jeden Sensor wird ein Eintrag im Array erzeugt. + * + * IPSPC_PROPERTY_NAME - Name des Sensors + * + * IPSPC_PROPERTY_VARWATT - Variable ID die zum Lesen der aktuellen "Watt" Werte verwendet werden soll + * + * IPSPC_PROPERTY_VARKWH - Variable ID die zum Lesen der aktuellen "kWh" Werte verwendet werden soll + * + * Eine ausführliche Beispielliste findet sich auch im Example Ordner + * + * Beispiel: + * @code + function IPSPowerControl_GetSensorConfiguration() { + return array( + 0 => array(IPSPC_PROPERTY_NAME => 'L1', + IPSPC_PROPERTY_VARWATT => 32902, + IPSPC_PROPERTY_VARKWH => 40061, + ), + 1 => array(IPSPC_PROPERTY_NAME => 'L2', + IPSPC_PROPERTY_VARWATT => 44599, + IPSPC_PROPERTY_VARKWH => 41795, + ), + 2 => array(IPSPC_PROPERTY_NAME => 'L3', + IPSPC_PROPERTY_VARWATT => 26373, + IPSPC_PROPERTY_VARKWH => 21487, + ), + ); + } + * @endcocde + * + * @return string Liefert Array mit den Daten der Mess Sensoren + */ + function IPSPowerControl_GetSensorConfiguration() { + return array( + 0 => array(IPSPC_PROPERTY_NAME => 'L1', + IPSPC_PROPERTY_VARWATT => 32902, + IPSPC_PROPERTY_VARKWH => 40061, + ), + 1 => array(IPSPC_PROPERTY_NAME => 'L2', + IPSPC_PROPERTY_VARWATT => 44599, + IPSPC_PROPERTY_VARKWH => 41795, + ), + 2 => array(IPSPC_PROPERTY_NAME => 'L3', + IPSPC_PROPERTY_VARWATT => 26373, + IPSPC_PROPERTY_VARKWH => 21487, + ), + 3 => array(IPSPC_PROPERTY_NAME => 'HC', + IPSPC_PROPERTY_VARWATT => 20158, + IPSPC_PROPERTY_VARKWH => 20158, + ), + 4 => array(IPSPC_PROPERTY_NAME => 'WM', + IPSPC_PROPERTY_VARWATT => 13305, + IPSPC_PROPERTY_VARKWH => 13305, + ), + 5 => array(IPSPC_PROPERTY_NAME => 'TR', + IPSPC_PROPERTY_VARWATT => 21942, + IPSPC_PROPERTY_VARKWH => 21942, + ), + 6 => array(IPSPC_PROPERTY_NAME => 'HZ', + IPSPC_PROPERTY_VARWATT => 59916, + IPSPC_PROPERTY_VARKWH => 59916, + ), + ); + } + + + /** + * + * Defintion der Visualisierungs Werte + * + * Die Konfiguration erfolgt in Form eines Arrays, für jede Visualisierungs Variable wird ein Eintrag im Array erzeugt. + * + * IPSPC_PROPERTY_NAME - Name der Visualisierungs Variable + * + * IPSPC_PROPERTY_DISPLAY - Spezifiziert ob der Wert in der GUI visualisiert werden soll + * + * IPSPC_PROPERTY_VALUETYPE - Werte Type der Variable, mögliche Werte: + * IPSPC_VALUETYPE_TOTAL ... definiert die Variable als Summenwert über alle Stromkreise + * IPSPC_VALUETYPE_DETAIL ... definiert die Variable als Detailwert eines Stromkreises + * IPSPC_VALUETYPE_OTHER ... übrige Werte (weder Total noch Detail) + * IPSPC_VALUETYPE_WATER ... Werte eines Wasserverbrauchs Sensors + * IPSPC_VALUETYPE_GAS ... Werte eines Gas Sensors + * + * Eine ausführliche Beispielliste findet sich auch im Example Ordner + * + * + * Beispiel: + * @code + function IPSPowerControl_GetValueConfiguration() { + return array( + 0 => array(IPSPC_PROPERTY_NAME => 'Total', + IPSPC_PROPERTY_DISPLAY => true, + IPSPC_PROPERTY_VALUETYPE => IPSPC_VALUETYPE_TOTAL, + ), + 1 => array(IPSPC_PROPERTY_NAME => 'Waschmaschine', + IPSPC_PROPERTY_DISPLAY => true, + IPSPC_PROPERTY_VALUETYPE => IPSPC_VALUETYPE_DETAIL, + ), + ); + } + * @endcocde + * + * @return string Liefert Array mit den Daten der Visualisierungs Werte + */ + function IPSPowerControl_GetValueConfiguration() { + return array( + 0 => array(IPSPC_PROPERTY_NAME => 'Total', + IPSPC_PROPERTY_DISPLAY => true, + IPSPC_PROPERTY_VALUETYPE => IPSPC_VALUETYPE_TOTAL, + ), + 1 => array(IPSPC_PROPERTY_NAME => 'L1', + IPSPC_PROPERTY_DISPLAY => true, + IPSPC_PROPERTY_VALUETYPE => IPSPC_VALUETYPE_OTHER, + ), + 2 => array(IPSPC_PROPERTY_NAME => 'L2', + IPSPC_PROPERTY_DISPLAY => true, + IPSPC_PROPERTY_VALUETYPE => IPSPC_VALUETYPE_OTHER, + ), + 3 => array(IPSPC_PROPERTY_NAME => 'L3', + IPSPC_PROPERTY_DISPLAY => true, + IPSPC_PROPERTY_VALUETYPE => IPSPC_VALUETYPE_OTHER, + ), + 4 => array(IPSPC_PROPERTY_NAME => 'HomeControl', + IPSPC_PROPERTY_DISPLAY => true, + IPSPC_PROPERTY_VALUETYPE => IPSPC_VALUETYPE_DETAIL, + ), + 5 => array(IPSPC_PROPERTY_NAME => 'Waschmaschine', + IPSPC_PROPERTY_DISPLAY => true, + IPSPC_PROPERTY_VALUETYPE => IPSPC_VALUETYPE_DETAIL, + ), + 6 => array(IPSPC_PROPERTY_NAME => 'Trockner', + IPSPC_PROPERTY_DISPLAY => true, + IPSPC_PROPERTY_VALUETYPE => IPSPC_VALUETYPE_DETAIL, + ), + 7 => array(IPSPC_PROPERTY_NAME => 'Heizung', + IPSPC_PROPERTY_DISPLAY => true, + IPSPC_PROPERTY_VALUETYPE => IPSPC_VALUETYPE_DETAIL, + ), + 8 => array(IPSPC_PROPERTY_NAME => 'Sauna', + IPSPC_PROPERTY_DISPLAY => true, + IPSPC_PROPERTY_VALUETYPE => IPSPC_VALUETYPE_DETAIL, + ), + 9 => array(IPSPC_PROPERTY_NAME => 'Licht', + IPSPC_PROPERTY_DISPLAY => true, + IPSPC_PROPERTY_VALUETYPE => IPSPC_VALUETYPE_DETAIL, + ), + 10 => array(IPSPC_PROPERTY_NAME => 'Wohnraumlüftung', + IPSPC_PROPERTY_DISPLAY => true, + IPSPC_PROPERTY_VALUETYPE => IPSPC_VALUETYPE_DETAIL, + ), + 11 => array(IPSPC_PROPERTY_NAME => 'Gs,Wz,Az(L1)', + IPSPC_PROPERTY_DISPLAY => true, + IPSPC_PROPERTY_VALUETYPE => IPSPC_VALUETYPE_DETAIL, + ), + 12 => array(IPSPC_PROPERTY_NAME => 'Küche (L2)', + IPSPC_PROPERTY_DISPLAY => true, + IPSPC_PROPERTY_VALUETYPE => IPSPC_VALUETYPE_DETAIL, + ), + 13 => array(IPSPC_PROPERTY_NAME => 'Sauger,Br(L3)', + IPSPC_PROPERTY_DISPLAY => true, + IPSPC_PROPERTY_VALUETYPE => IPSPC_VALUETYPE_DETAIL, + ), + ); + } + + /** IPSPowerControl Stromkosten + * + * Definiert die Stromkosten in Cents per kWh, die für die Berechnung der Werte verwendet + * werden soll. + * + */ + define ("IPSPC_ELECTRICITYRATE", 18 /*Cents per KWh*/); + + /** IPSPowerControl Wasserkosten + * + * Definiert die Kosten für Wasser in Euro pro m³, dieser Wert wird für die Umrechung in die + * Kosten bei der Generierung der Charts verwendet. + * + */ + define ("IPSPC_WATERRATE", 130 /*Cents per m³*/); + + /** IPSPowerControl Umrechnung von Gas m³ in kWh + * + * Definiert den Faktor, der für die Umrechung von m³ in kWh verwendet werden soll (dieser Faktor + * ist von mehreren Dingen abhängig, eine genaue Angabe ist vom jeweiligen Gasversorger zu + * erfragen. Für eine grobe Annäherungsrechung kann ein Faktor von 10 verwendet werden). + * + */ + define ("IPSPC_GASRATE_KWH", 10.6 /*1m³ = kWh*/); + + /** IPSPowerControl Gaskosten + * + * Definiert die Kosten für Gas in Cent pro m³, dieser Wert wird für die Umrechung in die + * Kosten bei der Generierung der Charts verwendet. + * + */ + define ("IPSPC_GASRATE_EURO", 7.6 /*Cents per KWh*/); + + + /** IPSPowerControl Aktualisierungs Interval Watt + * + * Definiert das Interval für die Aktualisierung der berechneten Watt Verbrauchswerte. + * Die Angabe erfolgt in Sekunden + * + */ + define ("IPSPC_REFRESHINTERVAL_WATT", 60); + + /** IPSPowerControl Aktualisierungs Interval kWh + * + * Definiert das Interval für die Aktualisierung der berechneten kWh Verbrauchswerte. + * Die Angabe erfolgt in Minuten + * + */ + define ("IPSPC_REFRESHINTERVAL_KWH", 60); + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/config/modules/IPSPowerControl/Examples/IPSPowerControl_DemoCustom.inc.php b/IPSLibrary/config/modules/IPSPowerControl/Examples/IPSPowerControl_DemoCustom.inc.php new file mode 100644 index 0000000..0a0300e --- /dev/null +++ b/IPSLibrary/config/modules/IPSPowerControl/Examples/IPSPowerControl_DemoCustom.inc.php @@ -0,0 +1,158 @@ + + * + * Callback Methoden für IPSPowerControl + * + */ + + /** + * Diese Funktion wird zur Berechnung der "Watt" Verbrauchswerte aufgerufen + * + * Man kann hier ausgehend von den Sensor Werten noch zusätzliche Werte Berechnen und für die Visualisierung + * bereitstellen. + * + * Parameters: + * @param array $sensorList Liste mit Sensor Werten + * @param array $valueList Liste der zu berechnenden Werte + * @result array Liste der berechneten Visualisierungs Werte + * + */ + + function IPSPowerControl_CalculateValuesWatt($sensorList, $valueList) { + $returnList = $valueList; + + $L1 = $sensorList[0]; + $L2 = $sensorList[1]; + $L3 = $sensorList[2]; + $homeControl = IPSPowerControl_KWH2Watt(3, 1/20000); + $washing = IPSPowerControl_KWH2Watt(4, 1/20000); + $dryer = IPSPowerControl_KWH2Watt(5, 1/20000); + $heating = IPSPowerControl_KWH2Watt(6, 1/20000); + + $ventilation = 50; + $sauna = 0; + $light = 0; + $L1 = $L1 - $heating; + $L3 = $L3 - $dryer; + $L2 = $L2 - $homeControl; + $L2 = $L2 - $washing; + $L3 = $L3 - $ventilation; + + // Calculate Light + IPSUtils_Include ("IPSLight.inc.php", "IPSLibrary::app::modules::IPSLight"); + $lightManager = new IPSLight_Manager(); + $lightL1 = $lightManager->GetPowerConsumption('L1'); + $lightL2 = $lightManager->GetPowerConsumption('L2'); + $lightL3 = $lightManager->GetPowerConsumption('L3'); + $light = $lightL1 + $lightL2 + $lightL3; + $L1 = $L1 - $lightL1; + $L2 = $L2 - $lightL2; + $L3 = $L3 - $lightL3; + + // Calculate Sauna + if ($L1>=2000 and $L2>=2000 and $L3>=2000) { + $sauna= 6000; + $L1 = $L1 - 2000; + $L2 = $L2 - 2000; + $L3 = $L3 - 2000; + } + + // Correct Values + if ($L1<0) { $L1=0; } + if ($L2<0) { $L2=0; } + if ($L3<0) { $L3=0; } + + // Store calculated KWH Values + IPSPowerControl_AddCalculatedValue('SAUNA_KWH', $sauna/1000/60); + IPSPowerControl_AddCalculatedValue('LIGHT_KWH', $light/1000/60); + IPSPowerControl_AddCalculatedValue('KWL_KWH', $ventilation/1000/60); + IPSPowerControl_AddCalculatedValue('L1_KWH', $L1/1000/60); + IPSPowerControl_AddCalculatedValue('L2_KWH', $L2/1000/60); + IPSPowerControl_AddCalculatedValue('L3_KWH', $L3/1000/60); + + // Build Return List + $returnList[0] = $sensorList[0] + $sensorList[1] + $sensorList[2]; + $returnList[1] = $sensorList[0]; + $returnList[2] = $sensorList[1]; + $returnList[3] = $sensorList[2]; + $returnList[4] = $homeControl; + $returnList[5] = $washing; + $returnList[6] = $dryer; + $returnList[7] = $heating; + $returnList[8] = $sauna; + $returnList[9] = $light; + $returnList[10] = $ventilation; + $returnList[11] = $L1; + $returnList[12] = $L2; + $returnList[13] = $L3; + + return $returnList; + } + + /** + * Diese Funktion wird zur Berechnung der Verbrauchswerte in KWH aufgerufen + * + * Man kann hier ausgehend von den Sensor Werten noch zusätzliche Werte Berechnen und für die Visualisierung + * bereitstellen. + * + * Parameters: + * @param array $sensorList Liste mit Sensor Werten + * @param array $valueList Liste der zu berechnenden Werte + * @result array Liste der berechneten Visualisierungs Werte + * + */ + function IPSPowerControl_CalculateValuesKWH($sensorList, $valueList) { + $returnList[0] = $sensorList[0]+$sensorList[1]+$sensorList[2]; + $returnList[1] = $sensorList[0]; + $returnList[2] = $sensorList[1]; + $returnList[3] = $sensorList[2]; + $returnList[4] = IPSPowerControl_Value2KWH(3, 1/20000); + $returnList[5] = IPSPowerControl_Value2KWH(4, 1/20000); + $returnList[6] = IPSPowerControl_Value2KWH(5, 1/20000); + $returnList[7] = IPSPowerControl_Value2KWH(6, 1/20000); + $returnList[8] = IPSPowerControl_GetCalculatedValue('SAUNA_KWH'); + $returnList[9] = IPSPowerControl_GetCalculatedValue('LIGHT_KWH'); + $returnList[10] = IPSPowerControl_GetCalculatedValue('KWL_KWH'); + $returnList[11] = IPSPowerControl_GetCalculatedValue('L1_KWH'); + $returnList[12] = IPSPowerControl_GetCalculatedValue('L2_KWH'); + $returnList[13] = IPSPowerControl_GetCalculatedValue('L3_KWH'); + $returnList[14] = IPSPowerControl_Value2M3(7, 1/10, true); + + return $returnList; + } + + /** @}*/ + +?> \ No newline at end of file diff --git a/IPSLibrary/config/modules/IPSShadowing/Default/IPSShadowing_Configuration.inc.php b/IPSLibrary/config/modules/IPSShadowing/Default/IPSShadowing_Configuration.inc.php new file mode 100644 index 0000000..0e30983 --- /dev/null +++ b/IPSLibrary/config/modules/IPSShadowing/Default/IPSShadowing_Configuration.inc.php @@ -0,0 +1,287 @@ + + * + * Konfigurations File für IPSShadowing + * + */ + + IPSUtils_Include ("IPSShadowing_Constants.inc.php", "IPSLibrary::app::modules::IPSShadowing"); + IPSUtils_Include ("IPSTwilight_Configuration.inc.php", "IPSLibrary::config::modules::Weather::IPSTwilight"); + + /** Programm Verzögerung (in Minuten) + * + * Definition der Programm Verzögerung, ein Programm kann sich innerhalb dieser vorgegebenen Zeit in Minuten + * nicht ändern. + * Dadurch kann man zB verhindern, dass durch kleinere Temperaturschwankungen sich die Beschattung dauernd ändert. + * + * Dieser Parameter kann jederzeit geändert werden, keine Installation erforderlich. + */ + define ("IPSSHADOWING_PROGRAM_DELAY", 0); + + /** Temperatursensor Innen + * + * Definition des Innentemperatur Sensors, die Konstante muß auf eine Variable verweisen, die die aktuelle Innentemperatur + * als Float Value enthält. + * Die Verlinkung der Variable erfolgt entweder direkt durch Angabe der ID oder durch Angabe des Pfades. + * + * Dieser Parameter kann jederzeit geändert werden, keine Installation erforderlich. + */ + define ("IPSSHADOWING_TEMPSENSORINDOOR", ""); + + /** Temperatursensor Aussen + * + * Definition des Aussentemperatur Sensors, die Konstante muß auf eine Variable verweisen, die die aktuelle Aussentemperatur + * als Float Value enthält. + * Die Verlinkung der Variable erfolgt entweder direkt durch Angabe der ID oder durch Angabe des Pfades. + * + * Dieser Parameter kann jederzeit geändert werden, keine Installation erforderlich. + */ + define ("IPSSHADOWING_TEMPSENSOROUTDOOR", ""); + + /** Helligkeitssensor + * + * Definition des Helligkeits Sensors, die Konstante muß auf eine Variable verweisen, die die aktuelle Helligkeit + * als Integer oder Float Value enthält. + * Die Verlinkung der Variable erfolgt entweder direkt durch Angabe der ID oder durch Angabe des Pfades. + * + * Dieser Parameter kann jederzeit geändert werden, keine Installation erforderlich. + */ + define ("IPSSHADOWING_BRIGHTNESSSENSOR", ''); + + /** Regensensor + * + * Definition des Regen Sensors, die Konstante muß auf eine Variable verweisen, die den Wert des Sensors als + * boolschen Wert enthält. + * Die Verlinkung der Variable erfolgt entweder direkt durch Angabe der ID oder durch Angabe des Pfades. + * + * Dieser Parameter kann jederzeit geändert werden, keine Installation erforderlich. + */ + define ("IPSSHADOWING_RAINSENSOR", ""); + + /** Windsensor + * + * Definition des Wind Sensors, die Konstante muß auf eine Variable verweisen, die den Wert des Sensors als + * Float Wert mit Angabe in "kmh" enthält, + * Die Verlinkung der Variable erfolgt entweder direkt durch Angabe der ID oder durch Angabe des Pfades. + * + * Dieser Parameter kann jederzeit geändert werden, keine Installation erforderlich. + */ + define ("IPSSHADOWING_WINDSENSOR", ""); + + /** Profil Wetterdefinition / Klassifiktation + * + * Definition/Masseinheit des Windlevels. + * Einstellung: false Vergleich der Windgeschwindigkeit mit dem Windlevel in km/h + * true Vergleich der Windgeschwindigkeit mit dem Windlevel in Beaufort + * + * Dieser Parameter kann jederzeit geändert werden. + * Eine erstmalige Installation über den ModuleManager oder ModuleManagerGUI ist notwendig. + */ + define ("IPSSHADOWING_WINDLEVEL_CLASSIFICATION", false); + + /** Anwesenheits Flag + * + * Definition des Anwesenheits Flags, die Konstante muß auf eine Variable verweisen, die den aktuellen Anwesenheits Status als + * boolean Wert enthält (true bedeutet Anwesend). + * Die Verlinkung der Variable erfolgt entweder direkt durch Angabe der ID oder durch Angabe des Pfades. + * + * Dieser Parameter kann jederzeit geändert werden, keine Installation erforderlich. + */ + define ("IPSSHADOWING_PRESENT", ''); + + /** Abwesenheits Flag + * + * Definition des Abwesenheits Flags, die Konstante muß auf eine Variable verweisen, die den aktuellen Abwesenheits Status als + * boolean Wert enthält (true bedeutet Abwesend). + * Diese Variable kann alternativ zu dem Anwesenheits Flag gesetzt werden. + * Die Verlinkung der Variable erfolgt entweder direkt durch Angabe der ID oder durch Angabe des Pfades. + * + * Dieser Parameter kann jederzeit geändert werden, keine Installation erforderlich. + */ + define ("IPSSHADOWING_ABSENCE", ""); + + /** Zeitpunkt Sonnenaufgang + * + * Definition des Tagesbeginn Zeitpunktes, die Konstante muß auf eine Variable verweisen, die die Zeit in der Form + * hh:mm enthält. + * Verlinkung erfolgt direkt durch Angabe der ID oder durch Angabe des Pfades. + * + * Dieser Parameter kann jederzeit geändert werden, keine Installation erforderlich. + */ + define ("IPSSHADOWING_TWILIGHTSUNRISE", "Program.IPSLibrary.data.modules.Weather.IPSTwilight.Values.SunriseBegin"); + + /** Zeitpunkt Sonnenuntergang + * + * Definition des Tagesend Zeitpunktes, die Konstante muß auf eine Variable verweisen, die die Zeit in der Form + * hh:mm enthält. + * Verlinkung erfolgt direkt durch Angabe der ID oder durch Angabe des Pfades. + * + * Dieser Parameter kann jederzeit geändert werden, keine Installation erforderlich. + */ + define ("IPSSHADOWING_TWILIGHTSUNSET", "Program.IPSLibrary.data.modules.Weather.IPSTwilight.Values.SunriseEnd"); + + /** Zeitpunkt limited Sonnenaufgang + * + * Definition des "limited" Tagesbeginn Zeitpunktes, die Konstante muß auf eine Variable verweisen, die die Zeit in der Form + * hh:mm enthält. Durch diese Variable ist es möglich, dass der Tagesbeginn in bestimmten Grenzen liegen muß. + * Verlinkung erfolgt direkt durch Angabe der ID oder durch Angabe des Pfades. + * + * Dieser Parameter kann jederzeit geändert werden, keine Installation erforderlich. + */ + define ("IPSSHADOWING_TWILIGHTSUNRISELIMITED", "Program.IPSLibrary.data.modules.Weather.IPSTwilight.Values.SunriseBeginLimited"); + + /** Zeitpunkt limited Sonnenuntergang + * + * Definition des "limited" Tagesend Zeitpunktes, die Konstante muß auf eine Variable verweisen, die die Zeit in der Form + * hh:mm enthält. Durch diese Variable ist es möglich, dass der Tagesbeginn in bestimmten Grenzen liegen muß. + * Verlinkung erfolgt direkt durch Angabe der ID oder durch Angabe des Pfades. + * + * Dieser Parameter kann jederzeit geändert werden, keine Installation erforderlich. + */ + define ("IPSSHADOWING_TWILIGHTSUNSETLIMITED", "Program.IPSLibrary.data.modules.Weather.IPSTwilight.Values.SunriseEndLimited"); + + /** + * Angabe des Breitengrades zur Berechnung des Sonnenstandes + * + * Dieser Parameter kann jederzeit geändert werden, keine Installation erforderlich. + */ + define ('IPSSHADOWING_LATITUDE', IPSTWILIGHT_LATITUDE); + + /** + * Angabe des Längengrades zur Berechnung des Sonnenstandes + * + * Dieser Parameter kann jederzeit geändert werden, keine Installation erforderlich. + */ + define ('IPSSHADOWING_LONGITUDE', IPSTWILIGHT_LONGITUDE); + + /** + * Ausrichtung des Gebäudes + * + * Dieser Wert spezifiziert die Abweichung von der Ausrichtung des Gebäudes Richtung Süden in Grad. + * + * Dieser Parameter kann jederzeit geändert werden, keine Installation erforderlich. + */ + define ('IPSSHADOWING_BUILDINGORIENTATION', -15); + + /** + * Verhältnis der Gebäudewände + * + * Mit diesem Parameter kann das Verhältnis der Länge der Gebäudewände in der Grafik verändert werden. + * + * 0 bedeutet dass alle Gebäudewände gleich lang sind, bei positiven Werten wird die südliche Seite des Gebäudes + * breiter und umgekehrt. + * + * Dieser Parameter kann jederzeit geändert werden, keine Installation erforderlich. + */ + define ('IPSSHADOWING_BUILDINGRELATION', 10); + + + /** + * Definiert die Anzahl der Meldungen, die im Applikation Logging Window angezeigt werden. + * + * Dieser Parameter kann jederzeit geändert werden, keine Installation erforderlich. + */ + define ("IPSSHADOWING_LOGMESSAGECOUNT", 30); + + /** + * + * Definition der Beschattungs Elemente + * Die Konfiguration erfolgt in Form eines Arrays, für jedes Beschattungs Device wird ein Eintrag im Array erzeugt. + * + * Die Eigenschaft c_Property_ShadowingType spezifiziert den Type der Beschattung, folgende Typen stehen zur Auswahl: + * - c_ShadowingType_Jalousie, Ansteuerung einer Jalousie, es werden noch zusätzliche Properties ausgewertet, um die Lamellen in eine bestimmte Position zu bringen + * - c_ShadowingType_Shutter, Ansteuerung eines normalen Rollos + * - c_ShadowingType_Marquees, Ansteuerung einer Markise + * + * Der Eintrag "c_Property_Name" spezifiziert den Namen des Beschattungs Elements, der im WebFront und in den Log's angezeigt + * wird. + * + * Der Eintrag "c_Property_Component" spezifiziert die Hardware, es kann jeder "Shutter" Component String Konstruktor + * angegeben werden. Detailiertere Informationen kann man auch im core Modul IPSComponent finden. + * + * Mit den Properties c_Property_TimeOpening, c_Property_TimeClosing, c_Property_TimeDimoutUp, c_Property_TimeDimoutDown, c_Property_TimePause + * werden die Fahrzeiten spezifiziert. c_Property_TimeDimoutUp und c_Property_TimeDimoutDown werden nur bei Jalousien ausgewertet, um die Lamellen + * in die Verdunkelungs- bzw. Beschatttungsposition zu bringen. + * + * Mit c_Property_TempSensorIndoor ist die Einbindung eines Innentemperatursensors für das Beschattungselement möglich. Verlinkung erfolgt durch + * Angabe des Pfades oder direkt durch die ID der Temperatur Variable. + * + * Beispiel: + * @code + function get_ShadowingConfiguration() { + return array( + c_ShadowingDevice_1 => array( + c_Property_ShadowingType => c_ShadowingType_Jalousie, + c_Property_Name => 'Küche', + c_Property_Component => 'IPSComponentShutter_Dummy,12345', + c_Property_TimeOpening => 35, + c_Property_TimeClosing => 35, + c_Property_TimeDimoutUp => 2, + c_Property_TimeDimoutDown => 3, + c_Property_TimePause => 1, + c_Property_TempSensorIndoor => '', + )); + } + * @endcocde + * + * @return string Liefert Array mit Beschattungs Elementen + */ + function get_ShadowingConfiguration() { + return array( + c_ShadowingDevice_1 => array( + c_Property_ShadowingType => c_ShadowingType_Jalousie, + c_Property_Name => 'Zimmer 1', + c_Property_Component => 'IPSComponentShutter_Dummy,12345', + c_Property_TimeOpening => 35, + c_Property_TimeClosing => 35, + c_Property_TimeDimoutUp => 2, + c_Property_TimeDimoutDown => 3, + c_Property_TimePause => 1, + c_Property_TempSensorIndoor => '', + ), + c_ShadowingDevice_2 => array( + c_Property_ShadowingType => c_ShadowingType_Shutter, + c_Property_Name => 'Zimmer 2', + c_Property_Component => 'IPSComponentShutter_Dummy,12345', + c_Property_TimeOpening => 60, + c_Property_TimeClosing => 60, + c_Property_TimePause => 1, + c_Property_TempSensorIndoor => '', + ), + c_ShadowingDevice_3 => array( + c_Property_ShadowingType => c_ShadowingType_Marquees, + c_Property_Name => 'Markise', + c_Property_Component => 'IPSComponentShutter_Dummy,12345', + c_Property_TimeOpening => 70, + c_Property_TimeClosing => 70, + c_Property_TimePause => 1, + c_Property_TempSensorIndoor => '', + ), + ); + } + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/config/modules/IPSShadowing/Default/IPSShadowing_Custom.inc.php b/IPSLibrary/config/modules/IPSShadowing/Default/IPSShadowing_Custom.inc.php new file mode 100644 index 0000000..592026e --- /dev/null +++ b/IPSLibrary/config/modules/IPSShadowing/Default/IPSShadowing_Custom.inc.php @@ -0,0 +1,122 @@ + + * + * Callback Methoden für IPSShadowing + * + */ + + /** + * Diese Funktion wird von der Beschattungs Steuerung aufgerufen um zu ermitteln ob der aktuelle Tag ein Werktag ist + * + * @return boolean TRUE für Werktag, FALSE für Wochenende oder Feiertag. Bei NULL erfolgt die Ermittlung durch die Steuerung (Feiertage werden dabei NICHT berücksichtigt) + * + */ + function IPSShadowing_IsWorkingDay() { + return null; + } + + /** + * Diese Funktion wird vor dem aktivieren eines Beschattungs Devices ausgeführt. + * + * Parameters: + * @param integer $deviceId ID of current Shadowing Device (means Program.IPSLibrary.data.modules.IPSShadowing.Devices.MyCurrentDevice) + * @param boolean $command Beschattungs Befehl, der gerade ausgeführt wird (mögliche Werte: define ("c_Movement_Down","c_Movement_Stop" und "c_Movement_Up") + * @result boolean TRUE für OK, bei FALSE wurde die Ansteuerung der Beschattung bereits in der Callback Funktion erledigt + * + */ + + function IPSShadowing_BeforeActivateShutter($deviceId, $command) { + + return true; + } + + + /** + * Diese Funktion wird nach dem aktivieren eines Beschattungs Devices ausgeführt. + * + * Parameters: + * @param integer $deviceId ID of current Shadowing Device (means Program.IPSLibrary.data.modules.IPSShadowing.Devices.MyCurrentDevice) + * @param boolean $command Beschattungs Befehl, der gerade ausgeführt wird (mögliche Werte: define ("c_Movement_Down","c_Movement_Stop" und "c_Movement_Up") + * + */ + + function IPSShadowing_AfterActivateShutter($deviceId, $command) { + + } + + /** + * + * Function will be called by the Program Timer when no manual Invervention has occured, present + * is not activated and Automatic is enabled. + * Shadowing can be activated as described below, to prevent other Programs from being executed, + * the function has to return true; + * + * Executing a Program: + * $device = new IPSShadowing_Device($DeviceId); + * $device->MoveByProgram(c_ProgramId_Opened); // Open + * $device->MoveByProgram(c_ProgramId_Closed); // Close a Shutter + * $device->MoveByProgram(c_ProgramId_Dimout); // Close a Jalousie + * $device->MoveByProgram(c_ProgramId_Shadowing); // Shadowing a Jalousie + * + * Parameters: + * @param integer $DeviceId ID of current Shadowing Device (means Program.IPSLibrary.data.modules.IPSShadowing.Devices.MyCurrentDevice) + * @param boolean $isDay Value, indicating Day or Night + * + */ + + function IPSShadowing_ProgramCustom($DeviceId,$isDay,&$programInfo) { + + return false; + } + + /** + * + * Function will be called by the Shadowing Device when a refresh of data is done + * + * Parameters: + * @param integer $deviceId ID of current Shadowing Device (means Program.IPSLibrary.data.modules.IPSShadowing.Devices.MyCurrentDevice) + * @param integer $stepCount Total Steps for Shadowing + * @param integer $step Current Step for Shadowing + * @param integer $command Current Movement Command + * @param integer $secsToDo Total Amount of Seconds in current Step + * @param integer $stepCount Seconds already done in current Step + * + */ + function IPSShadowing_Refresh($deviceId, $stepCount, $step, $command, $secsToDo, $secsDone) { + } + + /** @}*/ + +?> \ No newline at end of file diff --git a/IPSLibrary/config/modules/IPSShadowing/Examples/IPSShadowing_DemoConfiguration.inc.php b/IPSLibrary/config/modules/IPSShadowing/Examples/IPSShadowing_DemoConfiguration.inc.php new file mode 100644 index 0000000..78e195b --- /dev/null +++ b/IPSLibrary/config/modules/IPSShadowing/Examples/IPSShadowing_DemoConfiguration.inc.php @@ -0,0 +1,325 @@ + + * + * Konfigurations File für IPSShadowing + * + */ + + IPSUtils_Include ("IPSShadowing_Constants.inc.php", "IPSLibrary::app::modules::IPSShadowing"); + IPSUtils_Include ("IPSTwilight_Configuration.inc.php", "IPSLibrary::config::modules::Weather::IPSTwilight"); + + /** Programm Verzögerung (in Minuten) + * + * Definition der Programm Verzögerung, ein Programm kann sich innerhalb dieser vorgegebenen Zeit in Minuten + * nicht ändern. + * Dadurch kann man zB verhindern, dass durch kleinere Temperaturschwankungen sich die Beschattung dauernd ändert. + * + * Dieser Parameter kann jederzeit geändert werden, keine Installation erforderlich. + */ + define ("IPSSHADOWING_PROGRAM_DELAY", 30); + + /** Temperatursensor Innen + * + * Definition des Innentemperatur Sensors, die Konstante muß auf eine Variable verweisen, die die aktuelle Innentemperatur + * als Float Value enthält. + * Die Verlinkung der Variable erfolgt entweder direkt durch Angabe der ID oder durch Angabe des Pfades. + * + * Dieser Parameter kann jederzeit geändert werden, keine Installation erforderlich. + */ + define ("IPSSHADOWING_TEMPSENSORINDOOR", ""); + + /** Temperatursensor Aussen + * + * Definition des Aussentemperatur Sensors, die Konstante muß auf eine Variable verweisen, die die aktuelle Aussentemperatur + * als Float Value enthält. + * Die Verlinkung der Variable erfolgt entweder direkt durch Angabe der ID oder durch Angabe des Pfades. + * + * Dieser Parameter kann jederzeit geändert werden, keine Installation erforderlich. + */ + define ("IPSSHADOWING_TEMPSENSOROUTDOOR", ""); + + /** Helligkeitssensor + * + * Definition des Helligkeits Sensors, die Konstante muß auf eine Variable verweisen, die die aktuelle Helligkeit + * als Integer oder Float Value enthält. + * Die Verlinkung der Variable erfolgt entweder direkt durch Angabe der ID oder durch Angabe des Pfades. + * + * Dieser Parameter kann jederzeit geändert werden, keine Installation erforderlich. + */ + define ("IPSSHADOWING_BRIGHTNESSSENSOR", ''); + + /** Regensensor + * + * Definition des Regen Sensors, die Konstante muß auf eine Variable verweisen, die den Wert des Sensors als + * boolschen Wert enthält. + * Die Verlinkung der Variable erfolgt entweder direkt durch Angabe der ID oder durch Angabe des Pfades. + * + * Dieser Parameter kann jederzeit geändert werden, keine Installation erforderlich. + */ + define ("IPSSHADOWING_RAINSENSOR", ""); + + /** Windsensor + * + * Definition des Wind Sensors, die Konstante muß auf eine Variable verweisen, die den Wert des Sensors als + * Float Wert mit Angabe in "kmh" enthält, + * Die Verlinkung der Variable erfolgt entweder direkt durch Angabe der ID oder durch Angabe des Pfades. + * + * Dieser Parameter kann jederzeit geändert werden, keine Installation erforderlich. + */ + define ("IPSSHADOWING_WINDSENSOR", ""); + + /** Profil Wetterdefinition / Klassifiktation + * + * Definition/Masseinheit des Windlevels. + * Einstellung: false Vergleich der Windgeschwindigkeit mit dem Windlevel in km/h + * true Vergleich der Windgeschwindigkeit mit dem Windlevel in Beaufort + * + * Dieser Parameter kann jederzeit geändert werden. + * Für die Übernahme der Änderung ist eine erneute Installation über den ModuleManager oder ModuleManagerGUI notwendig. + */ + define ("IPSSHADOWING_WINDLEVEL_CLASSIFICATION", false); + + /** Anwesenheits Flag + * + * Definition des Anwesenheits Flags, die Konstante muß auf eine Variable verweisen, die den aktuellen Anwesenheits Status als + * boolean Wert enthält (true bedeutet Anwesend). + * Die Verlinkung der Variable erfolgt entweder direkt durch Angabe der ID oder durch Angabe des Pfades. + * + * Dieser Parameter kann jederzeit geändert werden, keine Installation erforderlich. + */ + define ("IPSSHADOWING_PRESENT", ''); + + /** Abwesenheits Flag + * + * Definition des Abwesenheits Flags, die Konstante muß auf eine Variable verweisen, die den aktuellen Abwesenheits Status als + * boolean Wert enthält (true bedeutet Abwesend). + * Diese Variable kann alternativ zu dem Anwesenheits Flag gesetzt werden. + * Die Verlinkung der Variable erfolgt entweder direkt durch Angabe der ID oder durch Angabe des Pfades. + * + * Dieser Parameter kann jederzeit geändert werden, keine Installation erforderlich. + */ + define ("IPSSHADOWING_ABSENCE", ""); + + /** Zeitpunkt Sonnenaufgang + * + * Definition des Tagesbeginn Zeitpunktes, die Konstante muß auf eine Variable verweisen, die die Zeit in der Form + * hh:mm enthält. + * Verlinkung erfolgt direkt durch Angabe der ID oder durch Angabe des Pfades. + * + * Dieser Parameter kann jederzeit geändert werden, keine Installation erforderlich. + */ + define ("IPSSHADOWING_TWILIGHTSUNRISE", "Program.IPSLibrary.data.modules.Weather.IPSTwilight.Values.SunriseBegin"); + + /** Zeitpunkt Sonnenuntergang + * + * Definition des Tagesend Zeitpunktes, die Konstante muß auf eine Variable verweisen, die die Zeit in der Form + * hh:mm enthält. + * Verlinkung erfolgt direkt durch Angabe der ID oder durch Angabe des Pfades. + * + * Dieser Parameter kann jederzeit geändert werden, keine Installation erforderlich. + */ + define ("IPSSHADOWING_TWILIGHTSUNSET", "Program.IPSLibrary.data.modules.Weather.IPSTwilight.Values.SunriseEnd"); + + /** Zeitpunkt limited Sonnenaufgang + * + * Definition des "limited" Tagesbeginn Zeitpunktes, die Konstante muß auf eine Variable verweisen, die die Zeit in der Form + * hh:mm enthält. Durch diese Variable ist es möglich, dass der Tagesbeginn in bestimmten Grenzen liegen muß. + * Verlinkung erfolgt direkt durch Angabe der ID oder durch Angabe des Pfades. + * + * Dieser Parameter kann jederzeit geändert werden, keine Installation erforderlich. + */ + define ("IPSSHADOWING_TWILIGHTSUNRISELIMITED", "Program.IPSLibrary.data.modules.Weather.IPSTwilight.Values.SunriseBeginLimited"); + + /** Zeitpunkt limited Sonnenuntergang + * + * Definition des "limited" Tagesend Zeitpunktes, die Konstante muß auf eine Variable verweisen, die die Zeit in der Form + * hh:mm enthält. Durch diese Variable ist es möglich, dass der Tagesbeginn in bestimmten Grenzen liegen muß. + * Verlinkung erfolgt direkt durch Angabe der ID oder durch Angabe des Pfades. + * + * Dieser Parameter kann jederzeit geändert werden, keine Installation erforderlich. + */ + define ("IPSSHADOWING_TWILIGHTSUNSETLIMITED", "Program.IPSLibrary.data.modules.Weather.IPSTwilight.Values.SunriseEndLimited"); + + /** + * Angabe des Breitengrades zur Berechnung des Sonnenstandes + * + * Dieser Parameter kann jederzeit geändert werden, keine Installation erforderlich. + */ + define ('IPSSHADOWING_LATITUDE', IPSTWILIGHT_LATITUDE); + + /** + * Angabe des Längengrades zur Berechnung des Sonnenstandes + * + * Dieser Parameter kann jederzeit geändert werden, keine Installation erforderlich. + */ + define ('IPSSHADOWING_LONGITUDE', IPSTWILIGHT_LONGITUDE); + + /** + * Ausrichtung des Gebäudes + * + * Dieser Wert spezifiziert die Abweichung von der Ausrichtung des Gebäudes Richtung Süden in Grad. + * + * Dieser Parameter kann jederzeit geändert werden, keine Installation erforderlich. + */ + define ('IPSSHADOWING_BUILDINGORIENTATION', -15); + + /** + * Verhältnis der Gebäudewände + * + * Mit diesem Parameter kann das Verhältnis der Länge der Gebäudewände in der Grafik verändert werden. + * + * 0 bedeutet dass alle Gebäudewände gleich lang sind, bei positiven Werten wird die südliche Seite des Gebäudes + * breiter und umgekehrt. + * + * Dieser Parameter kann jederzeit geändert werden, keine Installation erforderlich. + */ + define ('IPSSHADOWING_BUILDINGRELATION', 10); + + + /** + * Definiert die Anzahl der Meldungen, die im Applikation Logging Window angezeigt werden. + * + * Dieser Parameter kann jederzeit geändert werden, keine Installation erforderlich. + */ + define ("IPSSHADOWING_LOGMESSAGECOUNT", 30); + + + + /** + * + * Definition der Beschattungs Elemente + * Die Konfiguration erfolgt in Form eines Arrays, für jedes Beschattungs Device wird ein Eintrag im Array erzeugt. + * + * Der Eintrag "c_Property_Name" spezifiziert den Namen des Beschattungs Elements, der im WebFront und in den Log's angezeigt + * wird. + * + * Der Eintrag "c_Property_Component" spezifiziert die Hardware, es kann jeder "Shutter" Component String Konstruktor + * angegeben werden. Detailiertere Informationen kann man auch im core Modul IPSComponent finden. + * + * + * Beispiel: + * @code + function get_ShadowingConfiguration() { + return array( + c_ShadowingDevice_1 => array( + c_Property_ShadowingType => c_ShadowingType_Jalousie, + c_Property_Name => 'Küche', + c_Property_Component => 'IPSComponentShutter_Dummy,12345', + c_Property_TimeOpening => 35, + c_Property_TimeClosing => 35, + c_Property_TimeDimoutUp => 2, + c_Property_TimeDimoutDown => 3, + c_Property_TimePause => 1, + c_Property_TempSensorOutdoor => '', + c_Property_TempSensorIndoor => '', + )); + } + * @endcocde + * + * @return string Liefert Array mit Bewässerungs Kreisen + */ + function get_ShadowingConfiguration() { + return array( + c_ShadowingDevice_1 => array( + c_Property_ShadowingType => c_ShadowingType_Jalousie, + c_Property_Name => 'Küche', + c_Property_Component => 'IPSComponentShutter_Dummy,12345', + c_Property_TimeOpening => 35, + c_Property_TimeClosing => 35, + c_Property_TimeDimoutUp => 2, + c_Property_TimeDimoutDown => 3, + c_Property_TimePause => 1, + c_Property_TempSensorIndoor => '', + ), + c_ShadowingDevice_2 => array( + c_Property_ShadowingType => c_ShadowingType_Jalousie, + c_Property_Name => 'Terrasse', + c_Property_Component => 'IPSComponentShutter_Dummy,12345', + c_Property_TimeOpening => 60, + c_Property_TimeClosing => 60, + c_Property_TimeDimoutUp => 2, + c_Property_TimeDimoutDown => 3, + c_Property_TimePause => 1, + c_Property_TempSensorIndoor => '', + ), + c_ShadowingDevice_3 => array( + c_Property_ShadowingType => c_ShadowingType_Jalousie, + c_Property_Name => 'Wohnzimmer', + c_Property_Component => 'IPSComponentShutter_Dummy,12345', + c_Property_TimeOpening => 60, + c_Property_TimeClosing => 60, + c_Property_TimeDimoutUp => 2, + c_Property_TimeDimoutDown => 4, + c_Property_TimePause => 1, + c_Property_TempSensorIndoor => '', + ), + c_ShadowingDevice_4 => array( + c_Property_ShadowingType => c_ShadowingType_Shutter, + c_Property_Name => 'Kinderzimmer 1', + c_Property_Component => 'IPSComponentShutter_Dummy,12345', + c_Property_TimeOpening => 60, + c_Property_TimeClosing => 60, + c_Property_TimeDimoutUp => 2, + c_Property_TimeDimoutDown => 3, + c_Property_TimePause => 1, + c_Property_TempSensorIndoor => '', + ), + c_ShadowingDevice_5 => array( + c_Property_ShadowingType => c_ShadowingType_Shutter, + c_Property_Name => 'Kinderzimmer 2', + c_Property_Component => 'IPSComponentShutter_Dummy,12345', + c_Property_TimeOpening => 60, + c_Property_TimeClosing => 60, + c_Property_TimeDimoutUp => 2, + c_Property_TimeDimoutDown => 3, + c_Property_TimePause => 1, + c_Property_TempSensorIndoor => '', + ), + + c_ShadowingDevice_6 => array( + c_Property_ShadowingType => c_ShadowingType_Marquees, + c_Property_Name => 'Markise Links', + c_Property_Component => 'IPSComponentShutter_Dummy,12345', + c_Property_TimeOpening => 70, + c_Property_TimeClosing => 70, + c_Property_TimePause => 1, + c_Property_TempSensorIndoor => '', + ), + c_ShadowingDevice_7 => array( + c_Property_ShadowingType => c_ShadowingType_Marquees, + c_Property_Name => 'Markise Rechts', + c_Property_Component => 'IPSComponentShutter_Dummy,12345', + c_Property_TimeOpening => 70, + c_Property_TimeClosing => 70, + c_Property_TimePause => 1, + c_Property_TempSensorIndoor => '', + ), + + ); + } + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/config/modules/IPSShadowing/Examples/IPSShadowing_DemoCustom.inc.php b/IPSLibrary/config/modules/IPSShadowing/Examples/IPSShadowing_DemoCustom.inc.php new file mode 100644 index 0000000..606c90a --- /dev/null +++ b/IPSLibrary/config/modules/IPSShadowing/Examples/IPSShadowing_DemoCustom.inc.php @@ -0,0 +1,104 @@ + + * + * Callback Methoden für IPSShadowing + * + */ + + /** + * Diese Funktion wird von der Beschattungs Steuerung aufgerufen um zu ermitteln ob der aktuelle Tag ein Werktag ist + * + * @return boolean TRUE für Werktag, FALSE für Wochenende oder Feiertag. Bei NULL erfolgt die Ermittlung durch die Steuerung (Feiertage werden dabei NICHT berücksichtigt) + * + */ + function IPSShadowing_IsWorkingDay() { + return null; + } + + /** + * Diese Funktion wird vor dem aktivieren eines Beschattungs Devices ausgeführt. + * + * Parameters: + * @param integer $deviceId ID of current Shadowing Device (means Program.IPSLibrary.data.modules.IPSShadowing.Devices.MyCurrentDevice) + * @param boolean $command Beschattungs Befehl, der gerade ausgeführt wird (mögliche Werte: define ("c_Movement_Down","c_Movement_Stop" und "c_Movement_Up") + * + */ + + function IPSShadowing_BeforeActivateShutter($deviceId, $command) { + return true; + } + + + /** + * Diese Funktion wird nach dem aktivieren eines Beschattungs Devices ausgeführt. + * + * Parameters: + * @param integer $deviceId ID of current Shadowing Device (means Program.IPSLibrary.data.modules.IPSShadowing.Devices.MyCurrentDevice) + * @param boolean $command Beschattungs Befehl, der gerade ausgeführt wird (mögliche Werte: define ("c_Movement_Down","c_Movement_Stop" und "c_Movement_Up") + * + */ + + function IPSShadowing_AfterActivateShutter($deviceId, $command) { + + } + + /** + * + * Function will be called by the Program Timer when no manual Invervention has occured, present + * is not activated and Automatic is enabled. + * Shadowing can be activated as described below, to prevent other Programs from being executed, + * the function has to return true; + * + * Executing a Program: + * $device = new IPSShadowing_Device($DeviceId); + * $device->MoveByProgram(c_ProgramId_Opened); // Open + * $device->MoveByProgram(c_ProgramId_Closed); // Close a Shutter + * $device->MoveByProgram(c_ProgramId_Dimout); // Close a Jalousie + * $device->MoveByProgram(c_ProgramId_Shadowing); // Shadowing a Jalousie + * + * Parameters: + * @param integer $DeviceId ID of current Shadowing Device (means Program.IPSLibrary.data.modules.IPSShadowing.Devices.MyCurrentDevice) + * @param boolean $isDay Value, indicating Day or Night + * + */ + + function IPSShadowing_ProgramCustom($DeviceId,$isDay,&$programInfo) { + + return false; + } + + /** @}*/ + +?> \ No newline at end of file diff --git a/IPSLibrary/config/modules/IPSWatering/Default/IPSWatering_Custom.inc.php b/IPSLibrary/config/modules/IPSWatering/Default/IPSWatering_Custom.inc.php index 2d0e0b0..4b4b5ba 100644 --- a/IPSLibrary/config/modules/IPSWatering/Default/IPSWatering_Custom.inc.php +++ b/IPSLibrary/config/modules/IPSWatering/Default/IPSWatering_Custom.inc.php @@ -77,5 +77,21 @@ function IPSWatering_AfterActivateWatering($CycleId ,$Value, $Mode) { } + // ---------------------------------------------------------------------------------------------------------------------------- + // + // Function will be called when Refresh of Display Data is taking Place + // + // Parameters: + // $CycleId - ID of current Watering Device (means Program.IPSWatering.WaterCircles.MyCurrentCycle) + // $Duration - Total Duration in Minutes + // $TimeDiffMinutes - Minutes aktually to be done + // $TimeDiffSeconds - Seconds altually to be done + // + // ---------------------------------------------------------------------------------------------------------------------------- + + function IPSWatering_AfterRefresh($circleId, $duration, $timeDiffMinutes, $timeDiffSeconds) { + IPSLogger_Dbg(__file__, "Refresh for CircleID=$circleId, Duration=$duration, Mintues=$timeDiffMinutes, Seconds=$timeDiffSeconds"); + } + /** @}*/ ?> \ No newline at end of file diff --git a/IPSLibrary/config/modules/NetPlayer2/Default/NetPlayer_Configuration.inc.php b/IPSLibrary/config/modules/NetPlayer2/Default/NetPlayer_Configuration.inc.php new file mode 100644 index 0000000..2baa004 --- /dev/null +++ b/IPSLibrary/config/modules/NetPlayer2/Default/NetPlayer_Configuration.inc.php @@ -0,0 +1,145 @@ + + * + * Script mit NetPlayer Konfigurations Parametern + * + */ + + /** NetPlayer Player Component Definition + * + * Definiert Verbindung zur Hardware Komponente des Players + * + * Alle Parameter zur Erzeugung des Player Objektes werden durch Comma getrennt. + * - Param1 ist die Klasse des Players (muss von IPSComponentPlayer abgeleitet sein) + * - Param2-n spezifizieren die Parameter, die zum Erzeugen des spezifischen Player Objektes notwendig sind. + * + * Beispiele: + * define ("NETPLAYER_COMPONENT", 'IPSComponentPlayer_Mediaplayer,36728'); + * define ("NETPLAYER_COMPONENT", 'IPSComponentPlayer_Mediaplayer,Hardware.NetPlayer.MediaPlayer'); + * define ("NETPLAYER_COMPONENT", 'IPSComponentPlayer_Sonos,192.168.0.12'); + * + * Im Falle des MediaPlayers wird zum Erzeugen eines Objectes die ID der Mediaplayer Instanz + * benötigt. Alternativ kann auch der IPS Pfad zum Player angegeben werden (Beispiel 2). + * Beispiel 3 definiert einen Sonos Player, der als Parameter die IP des Players benötigt. + * + */ + define ("NETPLAYER_COMPONENT", 'IPSComponentPlayer_Mediaplayer,Hardware.NetPlayer.MediaPlayer'); + + /** Input Directory für NetPlayer + * + * In diesem Verzeichnis sucht der NetPlayer nach MP3 Files, die beinhaltenden Verzeichnisse und + * Files sollten folgende Form haben: + * .../Interpret [Album]/LiedNummer Titel.mp3 + * + * Beispiele: + * C:/Music/Metallica [S&M]/01 - Battery.mp3 + * C:/Music/_Sampler/Bravo Hits 54 []/01 - Yana Yana.mp3 + * + * Zusätzlich werden auch noch Musik Kategorien unterstützt, diese erlauben es die Musik in verschiedene + * Gruppen einzuteilen. + * Kategorien werden durch ein "_" am Beginn des Verzeichnisses definiert, die Verzeichnisse werden bei + * der Musik Auswahl automatisch in der Navigations Leiste aufgelistet. + * + * Beispiele: + * _Sampler + * _Soundtracks + * _Kinderlieder + * + * CD Covers werden immer im aktuell gewählten Song Verzeichnis gesucht. Als erstes wird ein JPG Datei + * gesucht, die ein "front" im Namen hat. Wird keine Datei gefunden wird die erste gefundene JPG Datei + * angezeigt. + * + * Dieser Parameter kann jederzeit geändert werden, erneute Installation des Players ist nicht + * erforderlich. + */ + + define ("NETPLAYER_DIRECTORY", "C:/Music/"); + + /** Liste der Radio Sender + * + * Hier wird die Liste der Radio Sender definiert, die im WebFront zur Auswahl steht. + * + * @return string[] Liste von RadioName/RadioUrl Paaren + */ + function NetPlayer_GetRadioList() { + $radiolist = array( + 'OE 3' => "mms://apasf.apa.at/OE3_Live_Audio", + 'KroneHit Radio' => "http://onair.krone.at:80/kronehit.mp3", + 'Radio Wien' => "http://mp3stream2.apasf.apa.at:8000", + 'Radio 88.6' => "http://www.radiostream.de/stream/36889.asx", + 'Radio Arabella' => "http://stream01.arabella-at.vss.kapper.net:8000/;stream.mp3", + 'FM4' => "mms://apasf.apa.at/fm4_live_worldwide", + 'Radio Harmonie' => "http://92.63.218.120:9630", + 'Hit FM' => "http://hitfm.biosnet.at:8000", + 'Lounge FM' => "http://stream.lounge.fm/loungefm128.m3u", + 'Fan Radio' => "http://onair.krone.at/krone-fanradio.mp3.m3u", + ); + return $radiolist; + } + + /** + * Anzahl der CDs, die im HTML Interface angezeigt werden. + */ + define ("NP_COUNT_CDHTML", 16); + + /** + * Anzahl der CDs, die im Mobile Interface angezeigt werden. + */ + define ("NP_COUNT_CDMOBILE", 10); + + /** + * Anzahl der CDs, die im Webfront Interface (Variablen deren Profil dynamisch angepasst wird) angezeigt werden. + */ + define ("NP_COUNT_CDVARIABLE", 6); + + /** + * Anzahl der Radiosender, die im HTML Interface angezeigt werden. + */ + define ("NP_COUNT_RADIOHTML", 16); + + /** + * Anzahl der Radiosender, die im Mobile Interface angezeigt werden. + */ + define ("NP_COUNT_RADIOMOBILE", 16); + + /** + * Anzahl der Radiosender, die im Webfront Interface (Variablen deren Profil dynamisch angepasst wird) angezeigt werden. + */ + define ("NP_COUNT_RADIOVARIABLE", 6); + + /** + * Anzahl der Tracknamen, die im Webfront Interface (Variablen deren Profil dynamisch angepasst wird) angezeigt werden. + */ + define ("NP_COUNT_TRACKVARIABLE", 6); + + /** + * Definition des HTML Player Interfaces + */ + define ("NP_RC_MP3CONTROL", 'src="../user/NetPlayer2/NetPlayer_MP3Control.php" height=260px'); + + /** + * Definition des HTML CD Auswahl Interfaces + */ + define ("NP_RC_MP3SELECTION", 'src="../user/NetPlayer2/NetPlayer_MP3Selection.php" height=252px'); + + /** + * Definition des HTML Radioplayer Interfaces + */ + define ("NP_RC_RADIOCONTROL", 'src="../user/NetPlayer2/NetPlayer_RadioControl.php" height=182px'); + + /** + * Definition des Mobile Interfaces + */ + define ("NP_RC_MOBILE", 'src="../user/NetPlayer2/NetPlayer_Mobile.php" height=3000px'); + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/config/modules/NetPlayer2/Examples/NetPlayer_DemoConfiguration.inc.php b/IPSLibrary/config/modules/NetPlayer2/Examples/NetPlayer_DemoConfiguration.inc.php new file mode 100644 index 0000000..70c56c1 --- /dev/null +++ b/IPSLibrary/config/modules/NetPlayer2/Examples/NetPlayer_DemoConfiguration.inc.php @@ -0,0 +1,146 @@ + + * + * Script mit NetPlayer Konfigurations Parametern + * + */ + + /** NetPlayer Player Component Definition + * + * Definiert Verbindung zur Hardware Komponente des Players + * + * Alle Parameter zur Erzeugung des Player Objektes werden durch Comma getrennt. + * - Param1 ist die Klasse des Players (muss von IPSComponentPlayer abgeleitet sein) + * - Param2-n spezifizieren die Parameter, die zum Erzeugen des spezifischen Player Objektes notwendig sind. + * + * Beispiele: + * define ("NETPLAYER_COMPONENT", 'IPSComponentPlayer_Mediaplayer,36728'); + * define ("NETPLAYER_COMPONENT", 'IPSComponentPlayer_Mediaplayer,Hardware.NetPlayer.MediaPlayer'); + * define ("NETPLAYER_COMPONENT", 'IPSComponentPlayer_Sonos,192.168.0.12'); + * + * Im Falle des MediaPlayers wird zum Erzeugen eines Objectes die ID der Mediaplayer Instanz + * benötigt. Alternativ kann auch der IPS Pfad zum Player angegeben werden (Beispiel 2). + * Beispiel 3 definiert einen Sonos Player, der als Parameter die IP des Players benötigt. + * + */ + define ("NETPLAYER_COMPONENT", 'IPSComponentPlayer_Mediaplayer,Hardware.NetPlayer.MediaPlayer'); + //define ("NETPLAYER_COMPONENT", 'IPSComponentPlayer_Mediaplayer,36728'); + + /** Input Directory für NetPlayer + * + * In diesem Verzeichnis sucht der NetPlayer nach MP3 Files, die beinhaltenden Verzeichnisse und + * Files sollten folgende Form haben: + * .../Interpret [Album]/LiedNummer Titel.mp3 + * + * Beispiele: + * C:/Music/Metallica [S&M]/01 - Battery.mp3 + * C:/Music/_Sampler/Bravo Hits 54 []/01 - Yana Yana.mp3 + * + * Zusätzlich werden auch noch Musik Kategorien unterstützt, diese erlauben es die Musik in verschiedene + * Gruppen einzuteilen. + * Kategorien werden durch ein "_" am Beginn des Verzeichnisses definiert, die Verzeichnisse werden bei + * der Musik Auswahl automatisch in der Navigations Leiste aufgelistet. + * + * Beispiele: + * _Sampler + * _Soundtracks + * _Kinderlieder + * + * CD Covers werden immer im aktuell gewählten Song Verzeichnis gesucht. Als erstes wird ein JPG Datei + * gesucht, die ein "front" im Namen hat. Wird keine Datei gefunden wird die erste gefundene JPG Datei + * angezeigt. + * + * Dieser Parameter kann jederzeit geändert werden, erneute Installation des Players ist nicht + * erforderlich. + */ + + define ("NETPLAYER_DIRECTORY", "C:/Music/"); + + /** Liste der Radio Sender + * + * Hier wird die Liste der Radio Sender definiert, die im WebFront zur Auswahl steht. + * + * @return string[] Liste von RadioName/RadioUrl Paaren + */ + function NetPlayer_GetRadioList() { + $radiolist = array( + 'OE 3' => "mms://apasf.apa.at/OE3_Live_Audio", + 'KroneHit Radio' => "http://onair.krone.at:80/kronehit.mp3", + 'Radio Wien' => "http://mp3stream2.apasf.apa.at:8000", + 'Radio 88.6' => "http://www.radiostream.de/stream/36889.asx", + 'Radio Arabella' => "http://stream01.arabella-at.vss.kapper.net:8000/;stream.mp3", + 'FM4' => "mms://apasf.apa.at/fm4_live_worldwide", + 'Radio Harmonie' => "http://92.63.218.120:9630", + 'Hit FM' => "http://hitfm.biosnet.at:8000", + 'Lounge FM' => "http://stream.lounge.fm/loungefm128.m3u", + 'Fan Radio' => "http://onair.krone.at/krone-fanradio.mp3.m3u", + ); + return $radiolist; + } + + /** + * Anzahl der CDs, die im HTML Interface angezeigt werden. + */ + define ("NP_COUNT_CDHTML", 16); + + /** + * Anzahl der CDs, die im Mobile Interface angezeigt werden. + */ + define ("NP_COUNT_CDMOBILE", 10); + + /** + * Anzahl der CDs, die im Webfront Interface (Variablen deren Profil dynamisch angepasst wird) angezeigt werden. + */ + define ("NP_COUNT_CDVARIABLE", 6); + + /** + * Anzahl der Radiosender, die im HTML Interface angezeigt werden. + */ + define ("NP_COUNT_RADIOHTML", 16); + + /** + * Anzahl der Radiosender, die im Mobile Interface angezeigt werden. + */ + define ("NP_COUNT_RADIOMOBILE", 16); + + /** + * Anzahl der Radiosender, die im Webfront Interface (Variablen deren Profil dynamisch angepasst wird) angezeigt werden. + */ + define ("NP_COUNT_RADIOVARIABLE", 6); + + /** + * Anzahl der Tracknamen, die im Webfront Interface (Variablen deren Profil dynamisch angepasst wird) angezeigt werden. + */ + define ("NP_COUNT_TRACKVARIABLE", 6); + + /** + * Definition des HTML Player Interfaces + */ + define ("NP_RC_MP3CONTROL", 'src="../user/NetPlayer2/NetPlayer_MP3Control.php" height=260px'); + + /** + * Definition des HTML CD Auswahl Interfaces + */ + define ("NP_RC_MP3SELECTION", 'src="../user/NetPlayer2/NetPlayer_MP3Selection.php" height=252px'); + + /** + * Definition des HTML Radioplayer Interfaces + */ + define ("NP_RC_RADIOCONTROL", 'src="../user/NetPlayer2/NetPlayer_RadioControl.php" height=182px'); + + /** + * Definition des Mobile Interfaces + */ + define ("NP_RC_MOBILE", 'src="../user/NetPlayer2/NetPlayer_Mobile.php" height=3000px'); + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/config/modules/Weather/IPSWeatherForcastAT/Default/IPSWeatherForcastAT_Configuration.inc.php b/IPSLibrary/config/modules/Weather/IPSWeatherForcastAT/Default/IPSWeatherForcastAT_Configuration.inc.php index fd45c3a..cf14118 100644 --- a/IPSLibrary/config/modules/Weather/IPSWeatherForcastAT/Default/IPSWeatherForcastAT_Configuration.inc.php +++ b/IPSLibrary/config/modules/Weather/IPSWeatherForcastAT/Default/IPSWeatherForcastAT_Configuration.inc.php @@ -54,6 +54,28 @@ */ define ("IPSWEATHERFAT_GOOGLE_LANG", 'de'); + /** + * Zugriffs API Key für die "Wunderground Weather API", dieser kann auf folgender Adresse generiert + * werden: http://www.wunderground.com + */ + define ("IPSWEATHERFAT_WUNDERGROUND_KEY", ''); + + /** + * Ländereinstellung für die "Wunderground Weather API" + */ + define ("IPSWEATHERFAT_WUNDERGROUND_COUNTRY", 'AT'); + + /** + * Stadt für die "Wunderground Weather API" + */ + define ("IPSWEATHERFAT_WUNDERGROUND_TOWN", 'Wien'); + + /** + * Yahoo Wohnort Angabe, WOEID = "Where On Earth Identifiers", dieser kann auf folgender Adresse + * ermittelt werden: "http://weather.yahoo.com" + */ + define ("IPSWEATHERFAT_YAHOO_WOEID", ''); + /** * URL für ORF Wetter */ diff --git a/IPSLibrary/docu/Screenshots/IPSShadowing_MobileDevice.PNG b/IPSLibrary/docu/Screenshots/IPSShadowing_MobileDevice.PNG new file mode 100644 index 0000000..223e78d Binary files /dev/null and b/IPSLibrary/docu/Screenshots/IPSShadowing_MobileDevice.PNG differ diff --git a/IPSLibrary/docu/Screenshots/IPSShadowing_MobileOverview.PNG b/IPSLibrary/docu/Screenshots/IPSShadowing_MobileOverview.PNG new file mode 100644 index 0000000..e781e6e Binary files /dev/null and b/IPSLibrary/docu/Screenshots/IPSShadowing_MobileOverview.PNG differ diff --git a/IPSLibrary/docu/Screenshots/IPSShadowing_WFDevice.png b/IPSLibrary/docu/Screenshots/IPSShadowing_WFDevice.png new file mode 100644 index 0000000..5a614ae Binary files /dev/null and b/IPSLibrary/docu/Screenshots/IPSShadowing_WFDevice.png differ diff --git a/IPSLibrary/docu/Screenshots/IPSShadowing_WFMessages.png b/IPSLibrary/docu/Screenshots/IPSShadowing_WFMessages.png new file mode 100644 index 0000000..a5179e8 Binary files /dev/null and b/IPSLibrary/docu/Screenshots/IPSShadowing_WFMessages.png differ diff --git a/IPSLibrary/docu/Screenshots/IPSShadowing_WFOverview.png b/IPSLibrary/docu/Screenshots/IPSShadowing_WFOverview.png new file mode 100644 index 0000000..d8193c8 Binary files /dev/null and b/IPSLibrary/docu/Screenshots/IPSShadowing_WFOverview.png differ diff --git a/IPSLibrary/docu/Screenshots/IPSShadowing_WFProfileBgnOfDay.png b/IPSLibrary/docu/Screenshots/IPSShadowing_WFProfileBgnOfDay.png new file mode 100644 index 0000000..8432a3a Binary files /dev/null and b/IPSLibrary/docu/Screenshots/IPSShadowing_WFProfileBgnOfDay.png differ diff --git a/IPSLibrary/docu/Screenshots/IPSShadowing_WFProfileEndOfDay.png b/IPSLibrary/docu/Screenshots/IPSShadowing_WFProfileEndOfDay.png new file mode 100644 index 0000000..69ca418 Binary files /dev/null and b/IPSLibrary/docu/Screenshots/IPSShadowing_WFProfileEndOfDay.png differ diff --git a/IPSLibrary/docu/Screenshots/IPSShadowing_WFProfileSun.png b/IPSLibrary/docu/Screenshots/IPSShadowing_WFProfileSun.png new file mode 100644 index 0000000..0070547 Binary files /dev/null and b/IPSLibrary/docu/Screenshots/IPSShadowing_WFProfileSun.png differ diff --git a/IPSLibrary/docu/Screenshots/IPSShadowing_WFProfileTemp.png b/IPSLibrary/docu/Screenshots/IPSShadowing_WFProfileTemp.png new file mode 100644 index 0000000..02e85b4 Binary files /dev/null and b/IPSLibrary/docu/Screenshots/IPSShadowing_WFProfileTemp.png differ diff --git a/IPSLibrary/docu/Screenshots/IPSShadowing_WFProfileWeather.png b/IPSLibrary/docu/Screenshots/IPSShadowing_WFProfileWeather.png new file mode 100644 index 0000000..b65cf13 Binary files /dev/null and b/IPSLibrary/docu/Screenshots/IPSShadowing_WFProfileWeather.png differ diff --git a/IPSLibrary/docu/Screenshots/IPSShadowing_WFScenario.png b/IPSLibrary/docu/Screenshots/IPSShadowing_WFScenario.png new file mode 100644 index 0000000..4fad367 Binary files /dev/null and b/IPSLibrary/docu/Screenshots/IPSShadowing_WFScenario.png differ diff --git a/IPSLibrary/docu/Screenshots/IPSShadowing_WFScenarioEdit.png b/IPSLibrary/docu/Screenshots/IPSShadowing_WFScenarioEdit.png new file mode 100644 index 0000000..92aaace Binary files /dev/null and b/IPSLibrary/docu/Screenshots/IPSShadowing_WFScenarioEdit.png differ diff --git a/IPSLibrary/docu/Screenshots/IPSShadowing_WFSettings.png b/IPSLibrary/docu/Screenshots/IPSShadowing_WFSettings.png new file mode 100644 index 0000000..9b0e20a Binary files /dev/null and b/IPSLibrary/docu/Screenshots/IPSShadowing_WFSettings.png differ diff --git a/IPSLibrary/install/BaseLoader/IPSLibrary_BaseLoader.ips.php b/IPSLibrary/install/BaseLoader/IPSLibrary_BaseLoader.ips.php index fa447f0..884f19f 100644 --- a/IPSLibrary/install/BaseLoader/IPSLibrary_BaseLoader.ips.php +++ b/IPSLibrary/install/BaseLoader/IPSLibrary_BaseLoader.ips.php @@ -1,12 +1,14 @@ LoadModule($remoteRepository, true); - $moduleManager->InstallModule(); + $moduleManager->LoadModule($remoteRepository, true); + $moduleManager->InstallModule(); // ------------------------------------------------------------------------------- function LoadFile($sourceFile, $destinationFile) { @@ -46,6 +50,7 @@ function LoadFile($sourceFile, $destinationFile) { curl_setopt($curl_handle, CURLOPT_CONNECTTIMEOUT,10); curl_setopt($curl_handle, CURLOPT_RETURNTRANSFER,true); curl_setopt($curl_handle, CURLOPT_SSL_VERIFYPEER, false); + curl_setopt($curl_handle, CURLOPT_FOLLOWLOCATION, true); curl_setopt($curl_handle, CURLOPT_FAILONERROR, true); $fileContent = curl_exec($curl_handle); @@ -55,26 +60,26 @@ function LoadFile($sourceFile, $destinationFile) { //echo 'Loaded '.str_replace(chr(13),'',str_replace(chr(10),'',substr($fileContent,1,200))).'...'.PHP_EOL; curl_close($curl_handle); - // $fileContent = html_entity_decode($fileContent, ENT_COMPAT, 'UTF-8'); + //$fileContent = html_entity_decode($fileContent, ENT_COMPAT, 'UTF-8'); } else { $fileContent = file_get_contents($sourceFile); } - $destinationFile = str_replace('/','\\',$destinationFile); + $destinationFile = str_replace('/','\\',$destinationFile); $destinationFilePath = pathinfo($destinationFile, PATHINFO_DIRNAME); if (!file_exists($destinationFilePath)) { if (!mkdir($destinationFilePath, 0, true)) { throw new Exception('Create Directory '.$destinationFilePath.' failed!'); } } - $destinationFile = str_replace('\\InitializationFiles\\Default\\','\\InitializationFiles\\',$destinationFile); - if (!file_put_contents($destinationFile, $fileContent)) { + $destinationFile = str_replace('\\InitializationFiles\\Default\\','\\InitializationFiles\\',$destinationFile); + if (!file_put_contents($destinationFile, $fileContent)) { sleep(1); echo 'Create File '.$destinationFile.' failed --> Retry ...'; if (!file_put_contents($destinationFile, $fileContent)) { throw new Exception('Create File '.$destinationFile.' failed!'); - } - } + } + } } // ------------------------------------------------------------------------------------------------ @@ -96,4 +101,4 @@ function Register_IPSUtils() { file_put_contents($file, $FileContent); } } -?> \ No newline at end of file +?> diff --git a/IPSLibrary/install/DownloadListFiles/AudioMax_FileList.ini b/IPSLibrary/install/DownloadListFiles/AudioMax_FileList.ini new file mode 100644 index 0000000..8f54fcb --- /dev/null +++ b/IPSLibrary/install/DownloadListFiles/AudioMax_FileList.ini @@ -0,0 +1,30 @@ +Version="2.50.5" +InstallVersion="2.50.3" +ModuleNamespace="IPSLibrary::app::hardware::AudioMax" +[App] +DefaultFiles[]="" +ScriptFiles[]="AudioMax.inc.php" +ScriptFiles[]="AudioMax_Server.class.php" +ScriptFiles[]="AudioMax_Room.class.php" +ScriptFiles[]="AudioMax_Constants.inc.php" +ScriptFiles[]="AudioMax_ChangeSettings.ips.php" +ScriptFiles[]="AudioMax_Receive.ips.php" +ScriptFiles[]="AudioMax_KeepAlive.ips.php" +[Config] +DefaultFiles[]="AudioMax_Configuration.inc.php" +ExampleFiles[]="" +[Install] +InstallFiles[]="AudioMax_Installation.ips.php" +DownloadFiles[]="AudioMax_FileList.ini" +DefaultFiles[]="AudioMax.ini" +ExampleFiles[]="" +[WebFront] +ScriptFiles[]="" +[RequiredModules] +IPSModuleManager="2.50.2" +[ChangeList] +2.50.1="Initiale Version" +2.50.2="Zugriff auf IPS System-Variablen angepasst" +2.50.3="WebFront GUI hinzugefügt" +2.50.4="Timeout beim Warten auf Antwort erhöht" +2.50.5="KeepAlive Handling verbessert" diff --git a/IPSLibrary/install/DownloadListFiles/Entertainment_FileList.ini b/IPSLibrary/install/DownloadListFiles/Entertainment_FileList.ini index ff6cfb1..580f845 100644 --- a/IPSLibrary/install/DownloadListFiles/Entertainment_FileList.ini +++ b/IPSLibrary/install/DownloadListFiles/Entertainment_FileList.ini @@ -1,64 +1,70 @@ -Version=2.50.1 -ModuleNamespace=IPSLibrary::app::modules::Entertainment - +Version="2.50.4" +InstallVersion="2.50.2" +ModuleNamespace="IPSLibrary::app::modules::Entertainment" [App] -DefaultFiles[]=Entertainment_IDs.inc.php -ScriptFiles[]=Entertainment.inc.php -ScriptFiles[]=Entertainment_Constants.inc.php -ScriptFiles[]=Entertainment_Control.inc.php -ScriptFiles[]=Entertainment_Communication.inc.php -ScriptFiles[]=Entertainment_Connect.inc.php -ScriptFiles[]=Entertainment_ConnectAsynchron.ips.php -ScriptFiles[]=Entertainment_Device.inc.php -ScriptFiles[]=Entertainment_Power.inc.php -ScriptFiles[]=Entertainment_RemoteControl.inc.php -ScriptFiles[]=Entertainment_Room.inc.php -ScriptFiles[]=Entertainment_Source.inc.php -ScriptFiles[]=Entertainment_AllRoomesOff.ips.php -ScriptFiles[]=Entertainment_PostInstallation.ips.php -ScriptFiles[]=Entertainment_Interface.ips.php -ScriptFiles[]=Entertainment_InterfaceOnkyoRcv.ips.php -ScriptFiles[]=Entertainment_InterfaceOnkyoSnd.inc.php -ScriptFiles[]=Entertainment_InterfaceWinLIRCRcv.ips.php -ScriptFiles[]=Entertainment_InterfaceWinLIRCSnd.inc.php -ScriptFiles[]=Entertainment_InterfaceNetPlayerRcv.ips.php -ScriptFiles[]=Entertainment_InterfaceNetPlayerSnd.inc.php -ScriptFiles[]=Entertainment_InterfaceIPSComponentAVControl.inc.php - +DefaultFiles[]="Entertainment_IDs.inc.php" +ScriptFiles[]="Entertainment.inc.php" +ScriptFiles[]="Entertainment_Constants.inc.php" +ScriptFiles[]="Entertainment_Control.inc.php" +ScriptFiles[]="Entertainment_Communication.inc.php" +ScriptFiles[]="Entertainment_Connect.inc.php" +ScriptFiles[]="Entertainment_ConnectAsynchron.ips.php" +ScriptFiles[]="Entertainment_Device.inc.php" +ScriptFiles[]="Entertainment_Power.inc.php" +ScriptFiles[]="Entertainment_RemoteControl.inc.php" +ScriptFiles[]="Entertainment_Room.inc.php" +ScriptFiles[]="Entertainment_Source.inc.php" +ScriptFiles[]="Entertainment_AllRoomesOff.ips.php" +ScriptFiles[]="Entertainment_PostInstallation.ips.php" +ScriptFiles[]="Entertainment_Interface.ips.php" +ScriptFiles[]="Entertainment_InterfaceOnkyoRcv.ips.php" +ScriptFiles[]="Entertainment_InterfaceOnkyoSnd.inc.php" +ScriptFiles[]="Entertainment_InterfaceWinLIRCRcv.ips.php" +ScriptFiles[]="Entertainment_InterfaceWinLIRCSnd.inc.php" +ScriptFiles[]="Entertainment_InterfaceNetPlayerRcv.ips.php" +ScriptFiles[]="Entertainment_InterfaceNetPlayerSnd.inc.php" +ScriptFiles[]="Entertainment_InterfaceIPSComponentAVControl.inc.php" [Config] -DefaultFiles[]=Entertainment_Configuration.inc.php -DefaultFiles[]=Entertainment_Custom.inc.php -ExampleFiles[]=Entertainment_DemoConfiguration.inc.php -ExampleFiles[]=Entertainment_AudioMaxConfiguration.inc.php -ExampleFiles[]=Entertainment_YamahaCustom.inc.php - +DefaultFiles[]="Entertainment_Configuration.inc.php" +DefaultFiles[]="Entertainment_Custom.inc.php" +ExampleFiles[]="Entertainment_DemoConfiguration.inc.php" +ExampleFiles[]="Entertainment_AudioMaxConfiguration.inc.php" +ExampleFiles[]="Entertainment_YamahaCustom.inc.php" [Install] -InstallFiles[]=Entertainment_Installation.ips.php -DownloadFiles[]=Entertainment_FileList.ini -DefaultFiles[]=Entertainment.ini -ExampleFiles[]= - +InstallFiles[]="Entertainment_Installation.ips.php" +DownloadFiles[]="Entertainment_FileList.ini" +DefaultFiles[]="Entertainment.ini" +ExampleFiles[]="" [WebFront] -ScriptFiles[]=jquery.min.js -ScriptFiles[]=iRemote.css -ScriptFiles[]=iRemote_OnkyoTuner.php -ScriptFiles[]=iRemote_PanasonicBD.php -ScriptFiles[]=iRemote_PanasonicVCR.php -ScriptFiles[]=iRemote_PhilipsTV.php -ScriptFiles[]=iRemote_TopfieldSat.php -ScriptFiles[]=iRemote_YamahaTuner.php -ScriptFiles[]=Remote.css -ScriptFiles[]=Remote_PanasonicBD.php -ScriptFiles[]=Remote_PanasonicVCR_Guide.php -ScriptFiles[]=Remote_PanasonicVCR_Simple.php -ScriptFiles[]=Remote_PanasonicVCR_Watch.php -ScriptFiles[]=Remote_PhilipsTVProgram_Advanced.php -ScriptFiles[]=Remote_PhilipsTVProgram_Simple.php -ScriptFiles[]=Remote_PhilipsTVVolume.php -ScriptFiles[]=Remote_Receiver.php -ScriptFiles[]=Remote_Sender.php -ScriptFiles[]=Remote_TopfieldSat_Advanced.php -ScriptFiles[]=Remote_TopfieldSat_Simple.php -ScriptFiles[]=Remote_OnkyoTuner.php -ScriptFiles[]=Remote_YamahaTuner.php -ScriptFiles[]=Remote_YamahaVolume.php +ScriptFiles[]="jquery.min.js" +ScriptFiles[]="iRemote.css" +ScriptFiles[]="iRemote_OnkyoTuner.php" +ScriptFiles[]="iRemote_PanasonicBD.php" +ScriptFiles[]="iRemote_PanasonicVCR.php" +ScriptFiles[]="iRemote_PhilipsTV.php" +ScriptFiles[]="iRemote_TopfieldSat.php" +ScriptFiles[]="iRemote_YamahaTuner.php" +ScriptFiles[]="Remote.css" +ScriptFiles[]="Remote_PanasonicBD.php" +ScriptFiles[]="Remote_PanasonicVCR_Guide.php" +ScriptFiles[]="Remote_PanasonicVCR_Simple.php" +ScriptFiles[]="Remote_PanasonicVCR_Watch.php" +ScriptFiles[]="Remote_PhilipsTVProgram_Advanced.php" +ScriptFiles[]="Remote_PhilipsTVProgram_Simple.php" +ScriptFiles[]="Remote_PhilipsTVVolume.php" +ScriptFiles[]="Remote_Receiver.php" +ScriptFiles[]="Remote_Sender.php" +ScriptFiles[]="Remote_TopfieldSat_Advanced.php" +ScriptFiles[]="Remote_TopfieldSat_Simple.php" +ScriptFiles[]="Remote_OnkyoTuner.php" +ScriptFiles[]="Remote_YamahaTuner.php" +ScriptFiles[]="Remote_YamahaVolume.php" +[RequiredModules] +IPSModuleManager="2.50.2" +IPSLogger="2.50.2" +IPSComponent="2.50.1" +IPSMessageHandler="2.50.1" +[ChangeList] +2.50.2="Umstellung auf neuen IPS System Variablen Zugriff" +2.50.3="Kleinere Bugfixes, Support of PowerDelay" +2.50.4="Added Library Event" diff --git a/IPSLibrary/install/DownloadListFiles/IPSCam_FileList.ini b/IPSLibrary/install/DownloadListFiles/IPSCam_FileList.ini new file mode 100644 index 0000000..e385720 --- /dev/null +++ b/IPSLibrary/install/DownloadListFiles/IPSCam_FileList.ini @@ -0,0 +1,90 @@ +Version="2.50.17" +InstallVersion="2.50.16" +ModuleNamespace="IPSLibrary::app::modules::IPSCam" +[App] +DefaultFiles[]="" +ScriptFiles[]="IPSCam.inc.php" +ScriptFiles[]="IPSCam_ActionScript.ips.php" +ScriptFiles[]="IPSCam_Constants.inc.php" +ScriptFiles[]="IPSCam_Manager.class.php" +ScriptFiles[]="IPSCam_RefreshPicture.ips.php" +ScriptFiles[]="IPSCam_RefreshPicture1.ips.php" +ScriptFiles[]="IPSCam_RefreshPicture2.ips.php" +ScriptFiles[]="IPSCam_RefreshPicture3.ips.php" +ScriptFiles[]="IPSCam_RefreshPicture4.ips.php" +ScriptFiles[]="IPSCam_RefreshPicture5.ips.php" +ScriptFiles[]="IPSCam_RefreshPicture6.ips.php" +ScriptFiles[]="IPSCam_StorePicture.ips.php" +ScriptFiles[]="IPSCam_StorePicture1.ips.php" +ScriptFiles[]="IPSCam_StorePicture2.ips.php" +ScriptFiles[]="IPSCam_StorePicture3.ips.php" +ScriptFiles[]="IPSCam_StorePicture4.ips.php" +ScriptFiles[]="IPSCam_StorePicture5.ips.php" +ScriptFiles[]="IPSCam_StorePicture6.ips.php" +ScriptFiles[]="IPSCam_NavigatePrev1.ips.php" +ScriptFiles[]="IPSCam_NavigatePrev2.ips.php" +ScriptFiles[]="IPSCam_NavigatePrev3.ips.php" +ScriptFiles[]="IPSCam_NavigatePrev4.ips.php" +ScriptFiles[]="IPSCam_NavigatePrev5.ips.php" +ScriptFiles[]="IPSCam_NavigatePrev6.ips.php" +ScriptFiles[]="IPSCam_NavigateNext1.ips.php" +ScriptFiles[]="IPSCam_NavigateNext2.ips.php" +ScriptFiles[]="IPSCam_NavigateNext3.ips.php" +ScriptFiles[]="IPSCam_NavigateNext4.ips.php" +ScriptFiles[]="IPSCam_NavigateNext5.ips.php" +ScriptFiles[]="IPSCam_NavigateNext6.ips.php" +ScriptFiles[]="IPSCam_PurgeFiles.ips.php" +ScriptFiles[]="IPSCam_GenerateMovies.ips.php" +ScriptFiles[]="IPSCam_NavPicPrev.ips.php" +ScriptFiles[]="IPSCam_NavPicNext.ips.php" +ScriptFiles[]="IPSCam_NavDayPrev.ips.php" +ScriptFiles[]="IPSCam_NavDayNext.ips.php" +[Config] +DefaultFiles[]="IPSCam_Configuration.inc.php" +DefaultFiles[]="IPSCam_Custom.inc.php" +ExampleFiles[]="IPSCam_DemoCustom.inc.php" +ExampleFiles[]="IPSCam_DemoConfiguration.inc.php" +[Install] +InstallFiles[]="IPSCam_Installation.ips.php" +DownloadFiles[]="IPSCam_FileList.ini" +DefaultFiles[]="IPSCam.ini" +ExampleFiles[]="" +[WebFront] +ScriptFiles[]="IPSCam_CameraMobile.css" +ScriptFiles[]="IPSCam_CameraWebFront.css" +ScriptFiles[]="IPSCam_CameraUtils.php" +ScriptFiles[]="IPSCam_CameraReceiver.php" +ScriptFiles[]="IPSCam_Camera.php" +ScriptFiles[]="IPSCam_Camera0.php" +ScriptFiles[]="IPSCam_Camera1.php" +ScriptFiles[]="IPSCam_Camera2.php" +ScriptFiles[]="IPSCam_Camera3.php" +ScriptFiles[]="IPSCam_Camera4.php" +ScriptFiles[]="jquery.min.js" +ScriptFiles[]="icons/arrow_up.png" +ScriptFiles[]="icons/arrow_down.png" +ScriptFiles[]="icons/arrow_left.png" +ScriptFiles[]="icons/arrow_right.png" +[RequiredModules] +IPSModuleManager="2.50.2" +IPSLogger="2.50.2" +IPSComponent="2.50.1" +IPSMessageHandler="2.50.1" +[ChangeList] +2.50.1="Initiale Version" +2.50.2="Fixed optional Properties IPSCAM_PROPERTY_SWITCHWLAN,IPSCAM_PROPERTY_SWITCHPOWER" +2.50.3="Bugfix bei Höhe von Kamerabild und WebFront von iPad" +2.50.4="Fixed Timers" +2.50.5="Filterung auf jpg Files bei History Navigation" +2.50.6="Fixed call of RefreshPicture" +2.50.7="Support additional HTML Variable for Stream/Image and History" +2.50.8="Adapted WebFront Installation to IPS v3.0" +2.50.9="Fixed Deletion of Hist Files used by Media Content" +2.50.10="Timeout bei Purge Files erhöht" +2.50.11="Funktion IPSCam_StorePicture gibt jetzt den Namen des gespeicherten Bildes zurück" +2.50.12="Kompatibilität Ubuntu, RaspberryPi, Mac OSX" +2.50.13="Zusätzliches Timeout und Semaphore für Download von Images" +2.50.14="Support von MediaStreams" +2.50.15="Semaphore für Image Refresh" +2.50.16="Fixed Refresh Skriptes" +2.50.17="History und Refresh für jede Kamera" diff --git a/IPSLibrary/install/DownloadListFiles/IPSComponent_FileList.ini b/IPSLibrary/install/DownloadListFiles/IPSComponent_FileList.ini index aa00b60..136a9f7 100644 --- a/IPSLibrary/install/DownloadListFiles/IPSComponent_FileList.ini +++ b/IPSLibrary/install/DownloadListFiles/IPSComponent_FileList.ini @@ -1,55 +1,147 @@ -Version=2.50.1 -ModuleNamespace=IPSLibrary::app::core::IPSComponent - +Version="2.50.44" +InstallVersion="2.50.1" +ModuleNamespace="IPSLibrary::app::core::IPSComponent" [App] -DefaultFiles[]= -ScriptFiles[]=IPSComponent.class.php -ScriptFiles[]=IPSModule.class.php - -ScriptFiles[]=IPSComponentPlayer\IPSComponentPlayer.class.php -ScriptFiles[]=IPSComponentPlayer\IPSComponentPlayer_Sonos.class.php -ScriptFiles[]=IPSComponentPlayer\IPSComponentPlayer_Mediaplayer.class.php -ScriptFiles[]=IPSComponentPlayer\IPSComponentPlayer_Squeezebox.class.php -ScriptFiles[]=IPSComponentPlayer\IPSModulePlayer.class.php -ScriptFiles[]=IPSComponentPlayer\IPSModulePlayer_NetPlayer.class.php - -ScriptFiles[]=IPSComponentShutter\IPSComponentShutter.class.php -ScriptFiles[]=IPSComponentShutter\IPSComponentShutter_Homematic.class.php -ScriptFiles[]=IPSComponentShutter\IPSComponentShutter_1Wire.class.php -ScriptFiles[]=IPSComponentShutter\IPSComponentShutter_Enocean.class.php -ScriptFiles[]=IPSComponentShutter\IPSComponentShutter_FS20.class.php -ScriptFiles[]=IPSComponentShutter\IPSComponentShutter_IPSShutterControl.class.php -ScriptFiles[]=IPSComponentShutter\IPSComponentShutter_LCN.class.php -ScriptFiles[]=IPSComponentShutter\IPSComponentShutter_MoellerEaton.class.php -ScriptFiles[]=IPSComponentShutter\IPSModuleShutter.class.php - -ScriptFiles[]=IPSComponentSwitch\IPSComponentSwitch.class.php -ScriptFiles[]=IPSComponentSwitch\IPSComponentSwitch_Homematic.class.php -ScriptFiles[]=IPSComponentSwitch\IPSModuleSwitch.class.php - -ScriptFiles[]=IPSComponentDimmer\IPSComponentDimmer.class.php -ScriptFiles[]=IPSComponentDimmer\IPSComponentDimmer_Homematic.class.php -ScriptFiles[]=IPSComponentDimmer\IPSModuleDimmer.class.php - -ScriptFiles[]=IPSComponentRGB\IPSComponentRGB.class.php -ScriptFiles[]=IPSComponentRGB\IPSComponentRGB_IPS868.class.php -ScriptFiles[]=IPSComponentRGB\IPSModuleRGB.class.php - -ScriptFiles[]=IPSComponentAVControl\IPSComponentAVControl.class.php -ScriptFiles[]=IPSComponentAVControl\IPSComponentAVControl_AudioMax.class.php -ScriptFiles[]=IPSComponentAVControl\IPSModuleAVControl.class.php -ScriptFiles[]=IPSComponentAVControl\IPSModuleAVControl_Entertainment.class.php - +DefaultFiles[]="" +ScriptFiles[]="IPSComponent.class.php" +ScriptFiles[]="IPSModule.class.php" +ScriptFiles[]="IPSComponentCam\IPSComponentCam.class.php" +ScriptFiles[]="IPSComponentCam\IPSComponentCam_Abus.class.php" +ScriptFiles[]="IPSComponentCam\IPSComponentCam_Allnet.class.php" +ScriptFiles[]="IPSComponentCam\IPSComponentCam_Android.class.php" +ScriptFiles[]="IPSComponentCam\IPSComponentCam_Axis.class.php" +ScriptFiles[]="IPSComponentCam\IPSComponentCam_AxisM7001.class.php" +ScriptFiles[]="IPSComponentCam\IPSComponentCam_Cisco.class.php" +ScriptFiles[]="IPSComponentCam\IPSComponentCam_DLink932.class.php" +ScriptFiles[]="IPSComponentCam\IPSComponentCam_DLink.class.php" +ScriptFiles[]="IPSComponentCam\IPSComponentCam_Edimax.class.php" +ScriptFiles[]="IPSComponentCam\IPSComponentCam_Instar.class.php" +ScriptFiles[]="IPSComponentCam\IPSComponentCam_Foscam.class.php" +ScriptFiles[]="IPSComponentCam\IPSComponentCam_Foscam89x.class.php" +ScriptFiles[]="IPSComponentCam\IPSComponentCam_Mobotix.class.php" +ScriptFiles[]="IPSComponentCam\IPSComponentCam_Planet.class.php" +ScriptFiles[]="IPSComponentCam\IPSComponentCam_Vivotek.class.php" +ScriptFiles[]="IPSComponentCam\IPSComponentCam_YCam.class.php" +ScriptFiles[]="IPSComponentPlayer\IPSComponentPlayer.class.php" +ScriptFiles[]="IPSComponentPlayer\IPSComponentPlayer_Sonos.class.php" +ScriptFiles[]="IPSComponentPlayer\IPSComponentPlayer_Mediaplayer.class.php" +ScriptFiles[]="IPSComponentPlayer\IPSComponentPlayer_Squeezebox.class.php" +ScriptFiles[]="IPSComponentPlayer\IPSModulePlayer.class.php" +ScriptFiles[]="IPSComponentPlayer\IPSModulePlayer_NetPlayer.class.php" +ScriptFiles[]="IPSComponentShutter\IPSComponentShutter.class.php" +ScriptFiles[]="IPSComponentShutter\IPSComponentShutter_Homematic.class.php" +ScriptFiles[]="IPSComponentShutter\IPSComponentShutter_Dummy.class.php" +ScriptFiles[]="IPSComponentShutter\IPSComponentShutter_1Wire.class.php" +ScriptFiles[]="IPSComponentShutter\IPSComponentShutter_Enocean.class.php" +ScriptFiles[]="IPSComponentShutter\IPSComponentShutter_FS20.class.php" +ScriptFiles[]="IPSComponentShutter\IPSComponentShutter_IPSShutterControl.class.php" +ScriptFiles[]="IPSComponentShutter\IPSComponentShutter_LCN.class.php" +ScriptFiles[]="IPSComponentShutter\IPSComponentShutter_EIB.class.php" +ScriptFiles[]="IPSComponentShutter\IPSComponentShutter_MoellerEaton.class.php" +ScriptFiles[]="IPSComponentShutter\IPSComponentShutter_zwave.class.php" +ScriptFiles[]="IPSComponentShutter\IPSModuleShutter.class.php" +ScriptFiles[]="IPSComponentShutter\IPSModuleShutter_IPSShadowing.class.php" +ScriptFiles[]="IPSComponentSwitch\IPSComponentSwitch.class.php" +ScriptFiles[]="IPSComponentSwitch\IPSComponentSwitch_1WireD2408.class.php" +ScriptFiles[]="IPSComponentSwitch\IPSComponentSwitch_1WireD2413.class.php" +ScriptFiles[]="IPSComponentSwitch\IPSComponentSwitch_Dummy.class.php" +ScriptFiles[]="IPSComponentSwitch\IPSComponentSwitch_DMX.class.php" +ScriptFiles[]="IPSComponentSwitch\IPSComponentSwitch_EatonMoeller.class.php" +ScriptFiles[]="IPSComponentSwitch\IPSComponentSwitch_EIB.class.php" +ScriptFiles[]="IPSComponentSwitch\IPSComponentSwitch_Enocean.class.php" +ScriptFiles[]="IPSComponentSwitch\IPSComponentSwitch_FS20.class.php" +ScriptFiles[]="IPSComponentSwitch\IPSComponentSwitch_Homematic.class.php" +ScriptFiles[]="IPSComponentSwitch\IPSComponentSwitch_ModBus.class.php" +ScriptFiles[]="IPSComponentSwitch\IPSComponentSwitch_LCN.class.php" +ScriptFiles[]="IPSComponentSwitch\IPSComponentSwitch_LCNa.class.php" +ScriptFiles[]="IPSComponentSwitch\IPSComponentSwitch_Plugwise.class.php" +ScriptFiles[]="IPSComponentSwitch\IPSComponentSwitch_ZW.class.php" +ScriptFiles[]="IPSComponentSwitch\IPSModuleSwitch.class.php" +ScriptFiles[]="IPSComponentSwitch\IPSModuleSwitch_IPSLight.class.php" +ScriptFiles[]="IPSComponentDimmer\IPSComponentDimmer.class.php" +ScriptFiles[]="IPSComponentDimmer\IPSComponentDimmer_Dummy.class.php" +ScriptFiles[]="IPSComponentDimmer\IPSComponentDimmer_DMX.class.php" +ScriptFiles[]="IPSComponentDimmer\IPSComponentDimmer_EatonMoeller.class.php" +ScriptFiles[]="IPSComponentDimmer\IPSComponentDimmer_EIB.class.php" +ScriptFiles[]="IPSComponentDimmer\IPSComponentDimmer_Enocean.class.php" +ScriptFiles[]="IPSComponentDimmer\IPSComponentDimmer_FS20.class.php" +ScriptFiles[]="IPSComponentDimmer\IPSComponentDimmer_Homematic.class.php" +ScriptFiles[]="IPSComponentDimmer\IPSComponentDimmer_ZW.class.php" +ScriptFiles[]="IPSComponentDimmer\IPSModuleDimmer.class.php" +ScriptFiles[]="IPSComponentRGB\IPSComponentRGB.class.php" +ScriptFiles[]="IPSComponentRGB\IPSComponentRGB_DMX.class.php" +ScriptFiles[]="IPSComponentRGB\IPSComponentRGB_Dummy.class.php" +ScriptFiles[]="IPSComponentRGB\IPSComponentRGB_IPS868.class.php" +ScriptFiles[]="IPSComponentRGB\IPSComponentRGB_PhilipsHUE.class.php" +ScriptFiles[]="IPSComponentRGB\IPSModuleRGB.class.php" +ScriptFiles[]="IPSComponentAVControl\IPSComponentAVControl.class.php" +ScriptFiles[]="IPSComponentAVControl\IPSComponentAVControl_AudioMax.class.php" +ScriptFiles[]="IPSComponentAVControl\IPSModuleAVControl.class.php" +ScriptFiles[]="IPSComponentAVControl\IPSModuleAVControl_Entertainment.class.php" +ScriptFiles[]="IPSComponentSensor\IPSComponentSensor.class.php" +ScriptFiles[]="IPSComponentSensor\IPSComponentSensor_Button.class.php" +ScriptFiles[]="IPSComponentSensor\IPSComponentSensor_IRTrans.class.php" +ScriptFiles[]="IPSComponentSensor\IPSModuleSensor.class.php" +ScriptFiles[]="IPSComponentSensor\IPSModuleSensor_IPSShadowing.class.php" +ScriptFiles[]="IPSComponentSensor\IPSModuleSensor_IRTrans.class.php" +ScriptFiles[]="IPSComponentSensor\IPSModuleSensor_NetPlayer.class.php" +ScriptFiles[]="IPSComponentSensor\IPSModuleSensor_Entertainment.class.php" +ScriptFiles[]="IPSComponentSensor\IPSModuleSensor_IPSLight.class.php" [Config] -DefaultFiles[]= -ExampleFiles[]= - +DefaultFiles[]="" +ExampleFiles[]="" [Install] -InstallFiles[]=IPSComponent_Installation.ips.php -DownloadFiles[]=IPSComponent_FileList.ini -DefaultFiles[]=IPSComponent.ini -ExampleFiles[]= - - +InstallFiles[]="IPSComponent_Installation.ips.php" +DownloadFiles[]="IPSComponent_FileList.ini" +DefaultFiles[]="IPSComponent.ini" +ExampleFiles[]="" [WebFront] -ScriptFiles[]= +ScriptFiles[]="" +[RequiredModules] +IPSModuleManager="2.50.2" +IPSLogger="2.50.2" +[ChangeList] +2.50.1="Initiale Version" +2.50.2="Sensor Komponenten hinzugefuegt" +2.50.3="Kamera Komponenten hinzugefuegt" +2.50.4="Zusaetzliche Switch Komponenten hinzugefuegt" +2.50.5="Dummy Objekte fuer Dimmer und RGB hinzugefuegt" +2.50.6="BugFix Enocean Shutter" +2.50.7="Bugfix Enocean Shutter (Stop Funktion)" +2.50.8="IPSModuleSwitch_IPSLight.class.php fuer die Rueckmeldung zur Lichtsteuerung hinzugefuegt" +2.50.9="IPSComponentCam_Abus and IPSComponentCam_Allnet hinzugefügt" +2.50.10="Added IPSComponentCam_Instar" +2.50.11="Used Ident for Homematic State Variable" +2.50.12="Corrected ZWave Switch" +2.50.13="Added Instart Cam" +2.50.14="Added IPSComponentSwitch_1WireD2413" +2.50.15="Added IPSComponentSwitch_ModBus" +2.50.16="Added IPSComponentDimmer_EIB" +2.50.17="Added IPSComponentCam_Mobotix and IPSComponentCam_Planet" +2.50.18="Added DLink Kamera" +2.50.19="Fixed IPSComponentSwitch_EIB" +2.50.20="IPSCam - Added Foscam Camera Support" +2.50.21="IPSComponent - Added Include of IPSComponent" +2.50.22="Support OnTime for IPSComponentSwitch" +2.50.23="Added IPSComponentCam_Android" +2.50.24="Added IPSComponentCam_DLink932" +2.50.25="IPSComponentCam - Added IPSComponentCam_YCam" +2.50.26="IPSComponentCam - Added IPSComponentCam_AxisM7001" +2.50.27="Fixed SetPlayListPosition in IPSComponentPlayer_Mediaplayer" +2.50.28="Added Cams for Cisco and Foscam" +2.50.29="Fixed IPSComponentShutter_Enocean" +2.50.30="Fixed IPSComponentCam_Vivotek" +2.50.31="Added new Shutter Component for ZWave" +2.50.32="Added new Dimmer Component for ZWave and FS20" +2.50.33="IPSComponent - Added IPSComponentDimmer_EatonMoeller" +2.50.34="IPSComponent - Added IPSComponentSwitch_LCNa" +2.50.35="Fixed IPSModuleSensor_IPSLight" +2.50.36="Added IPSComponentRGB_DMX" +2.50.37="Added IPSComponentSwitch_DMX,IPSComponentDimmer_DMX" +2.50.38="Added IPSComponentSwitch_Eoncean,IPSComponentDimmer_Enocean" +2.50.39="Added IPSComponentSwitch_Plugwise" +2.50.40="IPSComponent - Added IPSComponentRGB_PhilipsHUE" +2.50.41="Fixed IPSComponentDimmer_FS20" +2.50.42="New Parameter SupportsOnTime for IPSComponentSwitch_Homematic" +2.50.43="IPSComponent - Fixed IPSComponentShutter_LCN (Richtungsschalter)" +2.50.44="IPSComponentRGB_PhilipsHUE - allgemeine Verbesserungen bei der Ansteuerung der HUE" diff --git a/IPSLibrary/install/DownloadListFiles/IPSEDIP_FileList.ini b/IPSLibrary/install/DownloadListFiles/IPSEDIP_FileList.ini index 8aa2f53..ec8b4dd 100644 --- a/IPSLibrary/install/DownloadListFiles/IPSEDIP_FileList.ini +++ b/IPSLibrary/install/DownloadListFiles/IPSEDIP_FileList.ini @@ -1,25 +1,27 @@ -Version=2.50.1 -ModuleNamespace=IPSLibrary::app::hardware::IPSEDIP - +Version="2.50.3" +ModuleNamespace="IPSLibrary::app::hardware::IPSEDIP" [App] -DefaultFiles[]=IPSEDIP_IDs.inc.php -ScriptFiles[]=IPSEDIP.class.php -ScriptFiles[]=IPSEDIP_240.class.php -ScriptFiles[]=IPSEDIP_TFT43A.class.php -ScriptFiles[]=IPSEDIP_Constants.inc.php -ScriptFiles[]=IPSEDIP_Event.ips.php -ScriptFiles[]=IPSEDIP_Receive.ips.php -ScriptFiles[]=IPSEDIP_Timer.ips.php - +DefaultFiles[]="IPSEDIP_IDs.inc.php" +ScriptFiles[]="IPSEDIP.class.php" +ScriptFiles[]="IPSEDIP_240.class.php" +ScriptFiles[]="IPSEDIP_TFT43A.class.php" +ScriptFiles[]="IPSEDIP_Constants.inc.php" +ScriptFiles[]="IPSEDIP_Event.ips.php" +ScriptFiles[]="IPSEDIP_Receive.ips.php" +ScriptFiles[]="IPSEDIP_Timer.ips.php" [Config] -DefaultFiles[]=IPSEDIP_Configuration.inc.php -ExampleFiles[]=IPSEDIP_Configuration.inc.php - +DefaultFiles[]="IPSEDIP_Configuration.inc.php" +ExampleFiles[]="IPSEDIP_Configuration.inc.php" [Install] -InstallFiles[]=IPSEDIP_Installation.ips.php -DownloadFiles[]=IPSEDIP_FileList.ini -DefaultFiles[]=IPSEDIP.ini -ExampleFiles[]= - +InstallFiles[]="IPSEDIP_Installation.ips.php" +DownloadFiles[]="IPSEDIP_FileList.ini" +DefaultFiles[]="IPSEDIP.ini" +ExampleFiles[]="" [WebFront] -ScriptFiles[]= +ScriptFiles[]="" +[RequiredModules] +IPSLogger="2.50.2" +IPSModuleManager="2.50.2" +[ChangeList] +2.50.3="Verbessertes Error Handling im Fehler eines Sende Fehlers" +2.50.2="Umstellung auf neuen IPS Variablen-Zugriff" diff --git a/IPSLibrary/install/DownloadListFiles/IPSHighcharts_FileList.ini b/IPSLibrary/install/DownloadListFiles/IPSHighcharts_FileList.ini new file mode 100644 index 0000000..59cdb46 --- /dev/null +++ b/IPSLibrary/install/DownloadListFiles/IPSHighcharts_FileList.ini @@ -0,0 +1,56 @@ +Version="2.50.8" +InstallVersion="2.50.1" +ModuleNamespace="IPSLibrary::app::modules::Charts::IPSHighcharts" +[App] +DefaultFiles[]="" +ScriptFiles[]="IPSHighcharts.inc.php" +[Config] +DefaultFiles[]="IPSHighcharts_Custom.inc.php" +ExampleFiles[]="" +[Install] +InstallFiles[]="IPSHighcharts_Installation.ips.php" +DownloadFiles[]="IPSHighcharts_FileList.ini" +DefaultFiles[]="IPSHighcharts.ini" +ExampleFiles[]="" +[WebFront] +ScriptFiles[]="IPSTemplates/Highcharts.php" +ScriptFiles[]="IPSTemplates/Highstock.php" +ScriptFiles[]="Highcharts/js/jquery.min.js" +ScriptFiles[]="Highcharts/js/highcharts.src.js" +ScriptFiles[]="Highcharts/js/highcharts-more.js" +ScriptFiles[]="Highcharts/js/highcharts.js" +ScriptFiles[]="Highcharts/js/highstock.src.js" +ScriptFiles[]="Highcharts/js/highstock.js" +ScriptFiles[]="Highcharts/js/themes/ips.js" +ScriptFiles[]="Highcharts/js/themes/dark-blue.js" +ScriptFiles[]="Highcharts/js/themes/dark-green.js" +ScriptFiles[]="Highcharts/js/themes/gray.js" +ScriptFiles[]="Highcharts/js/themes/grid.js" +ScriptFiles[]="Highcharts/js/modules/data.src.js" +ScriptFiles[]="Highcharts/js/modules/data.js" +ScriptFiles[]="Highcharts/js/modules/canvas-tools.js" +ScriptFiles[]="Highcharts/js/modules/canvas-tools.src.js" +ScriptFiles[]="Highcharts/js/modules/exporting.js" +ScriptFiles[]="Highcharts/js/modules/exporting.src.js" +ScriptFiles[]="HighchartsCommand.php" +ScriptFiles[]="IPSChart.php" +ScriptFiles[]="icons/Backward.png" +ScriptFiles[]="icons/Forward.png" +ScriptFiles[]="icons/Home.png" +ScriptFiles[]="icons/Day.png" +ScriptFiles[]="icons/Hour.png" +ScriptFiles[]="icons/Week.png" +ScriptFiles[]="icons/Month.png" +ScriptFiles[]="icons/Year.png" +[RequiredModules] +IPSModuleManager="2.50.2" +IPSLogger="2.50.2" +[ChangeList] +2.50.1="Initiale Version" +2.50.2="Local Version of JQuery is now used" +2.50.3="Added Highstock Files" +2.50.4="Fixed Version of JQuery" +2.50.5="Unterstützung von IPS Chart Media Objekten" +2.50.6="Verwendung von AC_GetLoggedValuesCompatibility" +2.50.7="Fix beim Lesen von Zähler Variablen" +2.50.8="Auswerten der Titel Variable" diff --git a/IPSLibrary/install/DownloadListFiles/IPSHomematic_FileList.ini b/IPSLibrary/install/DownloadListFiles/IPSHomematic_FileList.ini new file mode 100644 index 0000000..a5139e3 --- /dev/null +++ b/IPSLibrary/install/DownloadListFiles/IPSHomematic_FileList.ini @@ -0,0 +1,39 @@ +Version="2.50.7" +InstallVersion="2.50.1" +ModuleNamespace="IPSLibrary::app::hardware::IPSHomematic" +[App] +ScriptFiles[]="IPSHomematic.inc.php" +ScriptFiles[]="IPSHomematic_Constants.inc.php" +ScriptFiles[]="IPSHomematic_Utils.inc.php" +ScriptFiles[]="IPSHomematic_Manager.class.php" +ScriptFiles[]="IPSHomematic_ChangeSettings.ips.php" +ScriptFiles[]="IPSHomematic_SmokeDetector.ips.php" +ScriptFiles[]="IPSHomematic_TimerRefreshServiceMessages.ips.php" +ScriptFiles[]="IPSHomematic_TimerRefreshRSSI.ips.php" +ScriptFiles[]="IPSHomematic_ResetServiceMessages.ips.php" +ScriptFiles[]="IPSHomematic_RefreshServiceMessages.ips.php" +ScriptFiles[]="IPSHomematic_RefreshRSSI.ips.php" +ScriptFiles[]="IPSHomematic_RefreshStatusVariables.ips.php" +[Config] +DefaultFiles[]="IPSHomematic_Configuration.inc.php" +DefaultFiles[]="IPSHomematic_Custom.inc.php" +ExampleFiles[]="IPSHomematic_Configuration.inc.php" +ExampleFiles[]="IPSHomematic_Custom.inc.php" +[Install] +InstallFiles[]="IPSHomematic_Installation.ips.php" +DownloadFiles[]="IPSHomematic_FileList.ini" +DefaultFiles[]="IPSHomematic.ini" +ExampleFiles[]="" +[WebFront] +ScriptFiles[]="" +[RequiredModules] +IPSModuleManager="2.50.2" +IPSLogger="2.50.2" +[ChangeList] +2.50.2="Umstellung auf neuen IPS Variablen-Zugriff" +2.50.1="Initiale Version" +2.50.3="Zusätzliches Logging eingebaut" +2.50.4="Konfiguration der Devices wird nur mehr bei der Installation verwendet" +2.50.5="Timeout bei Refresh erhöht" +2.50.6="Format der Service Messages bei Notifizierung verbessert" +2.50.7="Volle Pfadangabe des betroffenen Devices bei Service Meldungen)" diff --git a/IPSLibrary/install/DownloadListFiles/IPSLight_FileList.ini b/IPSLibrary/install/DownloadListFiles/IPSLight_FileList.ini new file mode 100644 index 0000000..83ffc2c --- /dev/null +++ b/IPSLibrary/install/DownloadListFiles/IPSLight_FileList.ini @@ -0,0 +1,39 @@ +Version="2.50.10" +InstallVersion="2.50.1" +ModuleNamespace="IPSLibrary::app::modules::IPSLight" +[App] +DefaultFiles[]="" +ScriptFiles[]="IPSLight.inc.php" +ScriptFiles[]="IPSLight_ActionScript.ips.php" +ScriptFiles[]="IPSLight_Constants.inc.php" +ScriptFiles[]="IPSLight_Simulator.class.php" +ScriptFiles[]="IPSLight_Manager.class.php" +[Config] +DefaultFiles[]="IPSLight_Configuration.inc.php" +DefaultFiles[]="IPSLight_Custom.inc.php" +ExampleFiles[]="IPSLight_DemoCustom.inc.php" +ExampleFiles[]="IPSLight_DemoConfiguration.inc.php" +[Install] +InstallFiles[]="IPSLight_Installation.ips.php" +DownloadFiles[]="IPSLight_FileList.ini" +DefaultFiles[]="IPSLight.ini" +ExampleFiles[]="" +[WebFront] +ScriptFiles[]="" +[RequiredModules] +IPSModuleManager="2.50.2" +IPSLogger="2.50.2" +IPSComponent="2.50.4" +IPSMessageHandler="2.50.1" +[ChangeList] +2.50.1="Initiale Version" +2.50.2="Used Ident for Homematic State Variable" +2.50.3="Fixed SetProgram for RGB" +2.50.4="Support of KNX Synchroninsation" +2.50.5="Fixed SetRGB,IPSLight_SetSwitch,IPSLight_ToggleSwitch" +2.50.6="Added Support for RGB in Programs" +2.50.7="DimmerState Off wenn Level=0, Logging korrigiert" +2.50.8="Added Synch for LCN" +2.50.9="Fixed IPSLight_SetSwitchByName,IPSLight_ToggleSwitchByName" +2.50.10="Anpassung des minimalen Dimmer Levels nach dem Einschalten" +2.50.11="Neues Feature "Licht Simulation"" diff --git a/IPSLibrary/install/DownloadListFiles/IPSLogger_FileList.ini b/IPSLibrary/install/DownloadListFiles/IPSLogger_FileList.ini index 74fd079..f7a58e3 100644 --- a/IPSLibrary/install/DownloadListFiles/IPSLogger_FileList.ini +++ b/IPSLibrary/install/DownloadListFiles/IPSLogger_FileList.ini @@ -1,29 +1,35 @@ -Version=2.50.1 -ModuleNamespace=IPSLibrary::app::core::IPSLogger - +Version="2.50.8" +InstallVersion="2.50.3" +ModuleNamespace="IPSLibrary::app::core::IPSLogger" [App] -DefaultFiles[]=IPSLogger_IDs.inc.php -ScriptFiles[]=IPSLogger.inc.php -ScriptFiles[]=IPSLogger_Constants.inc.php -ScriptFiles[]=IPSLogger_Output.inc.php -ScriptFiles[]=IPSLogger_PhpErrorHandler.inc.php -ScriptFiles[]=IPSLogger_ChangeSettings.ips.php -ScriptFiles[]=IPSLogger_ClearHtmlOut.ips.php -ScriptFiles[]=IPSLogger_ClearSingleOut.ips.php -ScriptFiles[]=IPSLogger_PurgeLogFiles.ips.php -ScriptFiles[]=IPSLogger_SendMail.ips.php - +DefaultFiles[]="IPSLogger_IDs.inc.php" +ScriptFiles[]="IPSLogger.inc.php" +ScriptFiles[]="IPSLogger_Constants.inc.php" +ScriptFiles[]="IPSLogger_Output.inc.php" +ScriptFiles[]="IPSLogger_PhpErrorHandler.inc.php" +ScriptFiles[]="IPSLogger_ChangeSettings.ips.php" +ScriptFiles[]="IPSLogger_ClearHtmlOut.ips.php" +ScriptFiles[]="IPSLogger_ClearSingleOut.ips.php" +ScriptFiles[]="IPSLogger_PurgeLogFiles.ips.php" +ScriptFiles[]="IPSLogger_SendMail.ips.php" +ScriptFiles[]="ProwlPHP.php" [Config] -DefaultFiles[]=IPSLogger_Configuration.inc.php -ExampleFiles[]= - +DefaultFiles[]="IPSLogger_Configuration.inc.php" +ExampleFiles[]="" [Install] -InstallFiles[]=IPSLogger_Installation.ips.php -InstallFiles[]=IPSLogger_Deinstallation.ips.php -DownloadFiles[]=IPSLogger_FileList.ini -DefaultFiles[]=IPSLogger.ini -ExampleFiles[]= - - +InstallFiles[]="IPSLogger_Installation.ips.php" +InstallFiles[]="IPSLogger_Deinstallation.ips.php" +DownloadFiles[]="IPSLogger_FileList.ini" +DefaultFiles[]="IPSLogger.ini" +ExampleFiles[]="" [WebFront] -ScriptFiles[]= +ScriptFiles[]="" +[RequiredModules] +IPSModuleManager="2.50.2" +[ChangeList] +2.50.3="Zugriff auf IPS System-Variablen angepasst" +2.50.4="Fixed Purge of XML Log Files" +2.50.5="SysLog Integration" +2.50.6="MySQL Integration" +2.50.7="Style für Support von MouseOver geändert" +2.50.8="Style für Support von MouseOver verbessert ..." diff --git a/IPSLibrary/install/DownloadListFiles/IPSMessageHandler_FileList.ini b/IPSLibrary/install/DownloadListFiles/IPSMessageHandler_FileList.ini index f3cce60..8102a07 100644 --- a/IPSLibrary/install/DownloadListFiles/IPSMessageHandler_FileList.ini +++ b/IPSLibrary/install/DownloadListFiles/IPSMessageHandler_FileList.ini @@ -1,21 +1,29 @@ -Version=2.50.1 -ModuleNamespace=IPSLibrary::app::core::IPSMessageHandler - +Version="2.50.6" +InstallVersion="2.50.1" +ModuleNamespace="IPSLibrary::app::core::IPSMessageHandler" [App] -DefaultFiles[]= -ScriptFiles[]=IPSMessageHandler.class.php -ScriptFiles[]=IPSMessageHandler_Event.ips.php - +DefaultFiles[]="" +ScriptFiles[]="IPSMessageHandler.class.php" +ScriptFiles[]="IPSMessageHandler_Event.ips.php" +ScriptFiles[]="IPSMessageHandler_IREvent.ips.php" [Config] -DefaultFiles[]=IPSMessageHandler_Configuration.inc.php -ExampleFiles[]= - +DefaultFiles[]="IPSMessageHandler_Configuration.inc.php" +DefaultFiles[]="IPSMessageHandler_Custom.inc.php" +ExampleFiles[]="IPSMessageHandler_Configuration.inc.php" +ExampleFiles[]="IPSMessageHandler_Custom.inc.php" [Install] -InstallFiles[]=IPSMessageHandler_Installation.ips.php -DownloadFiles[]=IPSMessageHandler_FileList.ini -DefaultFiles[]=IPSMessageHandler.ini -ExampleFiles[]= - - +InstallFiles[]="IPSMessageHandler_Installation.ips.php" +DownloadFiles[]="IPSMessageHandler_FileList.ini" +DefaultFiles[]="IPSMessageHandler.ini" +ExampleFiles[]="" [WebFront] -ScriptFiles[]= +ScriptFiles[]="" +[RequiredModules] +IPSModuleManager="2.50.2" +IPSLogger="2.50.2" +[ChangeList] +2.50.2="Bugfix bei Event Registrierung" +2.50.3="Fixed default for Customer specific Configuration" +2.50.4="Fixed Access to Custom Event Configuration" +2.50.5="Fixed Custom, Added Library Events" +2.50.6="Fixed IPSMessageHandler_HandleLibraryEvent" diff --git a/IPSLibrary/install/DownloadListFiles/IPSModuleManagerGUI_FileList.ini b/IPSLibrary/install/DownloadListFiles/IPSModuleManagerGUI_FileList.ini new file mode 100644 index 0000000..371a280 --- /dev/null +++ b/IPSLibrary/install/DownloadListFiles/IPSModuleManagerGUI_FileList.ini @@ -0,0 +1,44 @@ +Version="2.50.11" +InstallVersion="2.50.1" +ModuleNamespace="IPSLibrary::app::modules::IPSModuleManagerGUI" +[App] +DefaultFiles[]="" +ScriptFiles[]="IPSModuleManagerGUI.inc.php" +ScriptFiles[]="IPSModuleManagerGUI_Constants.inc.php" +ScriptFiles[]="IPSModuleManagerGUI_Utils.inc.php" +ScriptFiles[]="IPSModuleManagerGUI_SearchUpdates.ips.php" +[Config] +DefaultFiles[]="" +ExampleFiles[]="" +[Install] +InstallFiles[]="IPSModuleManagerGUI_Installation.ips.php" +DownloadFiles[]="IPSModuleManagerGUI_FileList.ini" +DefaultFiles[]="IPSModuleManagerGUI.ini" +ExampleFiles[]="" +[WebFront] +ScriptFiles[]="jquery.min.js" +ScriptFiles[]="IPSModuleManagerGUI.php" +ScriptFiles[]="IPSModuleManagerGUI.css" +ScriptFiles[]="IPSModuleManagerGUI_Overview.php" +ScriptFiles[]="IPSModuleManagerGUI_Updates.php" +ScriptFiles[]="IPSModuleManagerGUI_Logs.php" +ScriptFiles[]="IPSModuleManagerGUI_LogFile.php" +ScriptFiles[]="IPSModuleManagerGUI_NewModule.php" +ScriptFiles[]="IPSModuleManagerGUI_Module.php" +ScriptFiles[]="IPSModuleManagerGUI_Wizard.php" +ScriptFiles[]="IPSModuleManagerGUI_Receiver.php" +[RequiredModules] +IPSLogger="2.50.2" +IPSModuleManager="2.50.4" +[ChangeList] +2.50.1="Initiale Version" +2.50.2="Bugfixes bei New Module Ansicht" +2.50.3="Bugfix von Repository bei Module Update (Modul Ansicht)" +2.50.4="Installations Wizard hinzugefügt" +2.50.5="Fixed Error in Update GUI" +2.50.6="Support von HTTPS Protokoll" +2.50.7="Fixed Buttons disabled during Update" +2.50.8="Fixed Config of WebFront Konfigurator ID" +2.50.9="Improved Sorting of Changelist" +2.50.10="Adapted WebFront Installation to IPS v3.0" +2.50.11="Fixed CSS File" diff --git a/IPSLibrary/install/DownloadListFiles/IPSModuleManager_FileList.ini b/IPSLibrary/install/DownloadListFiles/IPSModuleManager_FileList.ini index 567e151..f7d4f1d 100644 --- a/IPSLibrary/install/DownloadListFiles/IPSModuleManager_FileList.ini +++ b/IPSLibrary/install/DownloadListFiles/IPSModuleManager_FileList.ini @@ -1,37 +1,54 @@ -Version=2.50.2 -ModuleNamespace=IPSLibrary - +Version="2.50.21" +InstallVersion="2.50.4" +ModuleNamespace="IPSLibrary" [App] -DefaultFiles[]= -ScriptFiles[]=install\IPSInstaller\IPSInstaller.inc.php -ScriptFiles[]=install\BaseLoader\IPSLibrary_Migration.ips.php -ScriptFiles[]=install\BaseLoader\IPSLibrary_BaseLoader.ips.php -ScriptFiles[]=install\IPSModuleManager\IPSModuleManager.class.php -ScriptFiles[]=install\IPSModuleManager\IPSVersionHandler\IPSVersionHandler.class.php -ScriptFiles[]=install\IPSModuleManager\IPSVersionHandler\IPSVariableVersionHandler.class.php -ScriptFiles[]=install\IPSModuleManager\IPSVersionHandler\IPSFileVersionHandler.class.php -ScriptFiles[]=install\IPSModuleManager\IPSScriptHandler\IPSScriptHandler.class.php -ScriptFiles[]=install\IPSModuleManager\IPSFileHandler\IPSFileHandler.class.php -ScriptFiles[]=install\IPSModuleManager\IPSBackupHandler\IPSBackupHandler.class.php -ScriptFiles[]=install\IPSModuleManager\IPSLogHandler\IPSLogHandler.class.php -ScriptFiles[]=app\core\IPSConfigHandler\IPSConfigHandler.class.php -ScriptFiles[]=app\core\IPSConfigHandler\IPSIniConfigHandler.class.php -ScriptFiles[]=app\core\IPSUtils\IPSUtils.inc.php -ScriptFiles[]=config\AvailableModules.ini - +DefaultFiles[]="" +ScriptFiles[]="install\IPSInstaller\IPSInstaller.inc.php" +ScriptFiles[]="install\BaseLoader\IPSLibrary_Migration.ips.php" +ScriptFiles[]="install\BaseLoader\IPSLibrary_BaseLoader.ips.php" +ScriptFiles[]="install\IPSModuleManager\IPSModuleManager.class.php" +ScriptFiles[]="install\IPSModuleManager\IPSVersionHandler\IPSVersionHandler.class.php" +ScriptFiles[]="install\IPSModuleManager\IPSVersionHandler\IPSFileVersionHandler.class.php" +ScriptFiles[]="install\IPSModuleManager\IPSScriptHandler\IPSScriptHandler.class.php" +ScriptFiles[]="install\IPSModuleManager\IPSFileHandler\IPSFileHandler.class.php" +ScriptFiles[]="install\IPSModuleManager\IPSBackupHandler\IPSBackupHandler.class.php" +ScriptFiles[]="install\IPSModuleManager\IPSLogHandler\IPSLogHandler.class.php" +ScriptFiles[]="app\core\IPSConfigHandler\IPSConfigHandler.class.php" +ScriptFiles[]="app\core\IPSConfigHandler\IPSIniConfigHandler.class.php" +ScriptFiles[]="app\core\IPSUtils\IPSUtils.inc.php" +ScriptFiles[]="config\AvailableModules.ini" +ScriptFiles[]="config\KnownRepositories.ini" [Config] -ScriptFiles[]= -DefaultFiles[]= -ExampleFiles[]= - +ScriptFiles[]="" +DefaultFiles[]="" +ExampleFiles[]="" [Install] -InstallFiles[]=IPSModuleManager_Installation.ips.php -InstallFiles[]=IPSModuleManager_Deinstallation.ips.php -DownloadFiles[]=IPSModuleManager_FileList.ini -DefaultFiles[]=IPSModuleManager.ini -ExampleFiles[]= - +InstallFiles[]="IPSModuleManager_Installation.ips.php" +InstallFiles[]="IPSModuleManager_Deinstallation.ips.php" +DownloadFiles[]="IPSModuleManager_FileList.ini" +DefaultFiles[]="IPSModuleManager.ini" +ExampleFiles[]="" [WebFront] -ScriptFiles[]= -ExampleFiles[]= - +ScriptFiles[]="" +ExampleFiles[]="" +[RequiredModules] +[ChangeList] +2.50.4="Verbesserung der Versionierung" +2.50.1="Initiale Version" +2.50.5="Uebergabe von ModuleName bei GetModuleInfos ist nun moeglich" +2.50.6="Repository von 1007 hinzugefuegt" +2.50.7="Fixed Search Last Repository" +2.50.8="Fixed VersionHandler, Added Proxy Support" +2.50.9="Fixed Access to Boolean Config Values" +2.50.10="Added Retry for File Download" +2.50.11="Modul Status Deleted hinzugefügt, fixed Modul Deletion" +2.50.12="Added Function IPS_SetLinkTargetID for IPS < 2.6" +2.50.13="Improved Sorting of Changelist" +2.50.14="Fixed Boolean Values in ConfigHandler" +2.50.15="Fixed CreateScript (delete old Script File)" +2.50.16="Fixed CreateProfile_Switch" +2.50.17="Fixed compare of module versions" +2.50.18="Fixed Encoding of Names in CreateWFC Functions (>3.0)" +2.50.19="Anpassung der Repositories" +2.50.20="Anpassung der URL im BaseLoader Script" +2.50.21="Löschen von Skripten im IPSInstaller modifiziert" diff --git a/IPSLibrary/install/DownloadListFiles/IPSPowerControl_FileList.ini b/IPSLibrary/install/DownloadListFiles/IPSPowerControl_FileList.ini new file mode 100644 index 0000000..51bbb4e --- /dev/null +++ b/IPSLibrary/install/DownloadListFiles/IPSPowerControl_FileList.ini @@ -0,0 +1,37 @@ +Version="2.50.6" +InstallVersion="2.50.1" +ModuleNamespace="IPSLibrary::app::modules::IPSPowerControl" +[App] +DefaultFiles[]="" +ScriptFiles[]="IPSPowerControl.inc.php" +ScriptFiles[]="IPSPowerControl_ActionScript.ips.php" +ScriptFiles[]="IPSPowerControl_Constants.inc.php" +ScriptFiles[]="IPSPowerControl_Utils.inc.php" +ScriptFiles[]="IPSPowerControl_Manager.class.php" +ScriptFiles[]="IPSPowerControl_NavigatePrev.ips.php" +ScriptFiles[]="IPSPowerControl_NavigateNext.ips.php" +ScriptFiles[]="IPSPowerControl_NavigatePlus.ips.php" +ScriptFiles[]="IPSPowerControl_NavigateMinus.ips.php" +[Config] +DefaultFiles[]="IPSPowerControl_Configuration.inc.php" +DefaultFiles[]="IPSPowerControl_Custom.inc.php" +ExampleFiles[]="IPSPowerControl_DemoConfiguration.inc.php" +ExampleFiles[]="IPSPowerControl_DemoCustom.inc.php" +[Install] +InstallFiles[]="IPSPowerControl_Installation.ips.php" +DownloadFiles[]="IPSPowerControl_FileList.ini" +DefaultFiles[]="IPSPowerControl.ini" +ExampleFiles[]="" +[WebFront] +ScriptFiles[]="" +[RequiredModules] +IPSModuleManager="2.50.2" +IPSLogger="2.50.2" +IPSHighcharts="2.50.2" +[ChangeList] +2.50.1="Initiale Version" +2.50.2="Funktionen zum Umrechnen von Sensorwerten hinzugefügt" +2.50.3="Support von Gas und Wasser Sensoren" +2.50.4="Fixed Utitlity Functions, added IPSPowerControl_Value2m3" +2.50.5="Korrektur der Wasser Preises im Default Config File" +2.50.6="Adapted WebFront Installation to IPS v3.0" diff --git a/IPSLibrary/install/DownloadListFiles/IPSShadowing_FileList.ini b/IPSLibrary/install/DownloadListFiles/IPSShadowing_FileList.ini new file mode 100644 index 0000000..bf7f22c --- /dev/null +++ b/IPSLibrary/install/DownloadListFiles/IPSShadowing_FileList.ini @@ -0,0 +1,68 @@ +Version="2.50.18" +InstallVersion="2.50.17" +ModuleNamespace="IPSLibrary::app::modules::IPSShadowing" +[App] +DefaultFiles[]="" +ScriptFiles[]="IPSShadowing.inc.php" +ScriptFiles[]="IPSShadowing_AutomaticOn.ips.php" +ScriptFiles[]="IPSShadowing_AutomaticOff.ips.php" +ScriptFiles[]="IPSShadowing_AutomaticReset.ips.php" +ScriptFiles[]="IPSShadowing_Azimuth.inc.php" +ScriptFiles[]="IPSShadowing_ChangeSettings.ips.php" +ScriptFiles[]="IPSShadowing_Constants.inc.php" +ScriptFiles[]="IPSShadowing_Device.class.php" +ScriptFiles[]="IPSShadowing_Logging.inc.php" +ScriptFiles[]="IPSShadowing_ProfileBgnOfDayCreate.ips.php" +ScriptFiles[]="IPSShadowing_ProfileBgnOfDayDelete.ips.php" +ScriptFiles[]="IPSShadowing_ProfileEndOfDayCreate.ips.php" +ScriptFiles[]="IPSShadowing_ProfileEndOfDayDelete.ips.php" +ScriptFiles[]="IPSShadowing_ProfileTempCreate.ips.php" +ScriptFiles[]="IPSShadowing_ProfileTempDelete.ips.php" +ScriptFiles[]="IPSShadowing_ProfileSunCreate.ips.php" +ScriptFiles[]="IPSShadowing_ProfileSunDelete.ips.php" +ScriptFiles[]="IPSShadowing_ProfileWeatherCreate.ips.php" +ScriptFiles[]="IPSShadowing_ProfileWeatherDelete.ips.php" +ScriptFiles[]="IPSShadowing_ProfileManager.class.php" +ScriptFiles[]="IPSShadowing_ProfileTemp.class.php" +ScriptFiles[]="IPSShadowing_ProfileTime.class.php" +ScriptFiles[]="IPSShadowing_ProfileSun.class.php" +ScriptFiles[]="IPSShadowing_ProfileWeather.class.php" +ScriptFiles[]="IPSShadowing_ProgramTimer.ips.php" +ScriptFiles[]="IPSShadowing_RefreshTimer.ips.php" +ScriptFiles[]="IPSShadowing_ResetTimer.ips.php" +ScriptFiles[]="IPSShadowing_Scenario.class.php" +ScriptFiles[]="IPSShadowing_ScenarioManager.class.php" +ScriptFiles[]="IPSShadowing_ScenarioCreate.ips.php" +ScriptFiles[]="IPSShadowing_ScenarioDelete.ips.php" +[Config] +DefaultFiles[]="IPSShadowing_Configuration.inc.php" +DefaultFiles[]="IPSShadowing_Custom.inc.php" +ExampleFiles[]="IPSShadowing_DemoCustom.inc.php" +ExampleFiles[]="IPSShadowing_DemoConfiguration.inc.php" +[Install] +InstallFiles[]="IPSShadowing_Installation.ips.php" +DownloadFiles[]="IPSShadowing_FileList.ini" +DefaultFiles[]="IPSShadowing.ini" +ExampleFiles[]="" +[WebFront] +ScriptFiles[]="" +[RequiredModules] +IPSModuleManager="2.50.2" +IPSLogger="2.50.2" +IPSComponent="2.50.1" +IPSMessageHandler="2.50.1" +[ChangeList] +2.50.4="Loeschen alter Device Daten hinzugefuegt, Korrektur von Scenarien" +2.50.5="Reset Flag manuelle Änderung nach Wechsel von Tag/Nacht" +2.50.6="Fixed Update ProfileInfo of Weather" +2.50.7="Fixed Create Profile Sun" +2.50.8="Adapted WebFront Installation to IPS v3.0" +2.50.9="Fixed % Character in Profiles" +2.50.10="Event Sync verbessert" +2.50.11="Bugfix bei Tag/Nachtwechsel" +2.50.12="Fix bei Reset des Flags Manuelle Betätigung" +2.50.13="Neues Windlevel Profil Beaufort (Merge NickSpawn)" +2.50.14="Manuelles Flag bei SyncStatus wird nun gesetzt" +2.50.15="Keine zwingende Installation mehr durch Windlevel Änderung" +2.50.17="Hysterese Heeligkeitssensor, Programm Delay, Fix Temp Reset" +2.50.18="Fix bei Wetterprofile (Parameter werden nun korrekt "oder" verknüpft)" diff --git a/IPSLibrary/install/DownloadListFiles/IPSTwilight_FileList.ini b/IPSLibrary/install/DownloadListFiles/IPSTwilight_FileList.ini index ac52c74..af20eba 100644 --- a/IPSLibrary/install/DownloadListFiles/IPSTwilight_FileList.ini +++ b/IPSLibrary/install/DownloadListFiles/IPSTwilight_FileList.ini @@ -1,21 +1,24 @@ -Version=2.50.1 -ModuleNamespace=IPSLibrary::app::modules::Weather::IPSTwilight - +Version="2.50.4" +InstallVersion="2.50.2" +ModuleNamespace="IPSLibrary::app::modules::Weather::IPSTwilight" [App] -DefaultFiles[]= -ScriptFiles[]=IPSTwilight.ips.php - +DefaultFiles[]="" +ScriptFiles[]="IPSTwilight.ips.php" [Config] -DefaultFiles[]=IPSTwilight_Configuration.inc.php -DefaultFiles[]=IPSTwilight_Custom.inc.php -ExampleFiles[]= - +DefaultFiles[]="IPSTwilight_Configuration.inc.php" +DefaultFiles[]="IPSTwilight_Custom.inc.php" +ExampleFiles[]="" [Install] -InstallFiles[]=IPSTwilight_Installation.ips.php -DownloadFiles[]=IPSTwilight_FileList.ini -DefaultFiles[]=IPSTwilight.ini -ExampleFiles[]= - - +InstallFiles[]="IPSTwilight_Installation.ips.php" +DownloadFiles[]="IPSTwilight_FileList.ini" +DefaultFiles[]="IPSTwilight.ini" +ExampleFiles[]="" [WebFront] -ScriptFiles[]= +ScriptFiles[]="" +[RequiredModules] +IPSModuleManager="2.50.2" +IPSLogger="2.50.2" +[ChangeList] +2.50.2="Umstellung auf neuen IPS Variablen-Zugriff" +2.50.3="Fixed Handling of IPS-SENDER" +2.50.4="Adapted WebFront Installation to IPS v3.0" diff --git a/IPSLibrary/install/DownloadListFiles/IPSWatering_FileList.ini b/IPSLibrary/install/DownloadListFiles/IPSWatering_FileList.ini index 3605aec..5da1042 100644 --- a/IPSLibrary/install/DownloadListFiles/IPSWatering_FileList.ini +++ b/IPSLibrary/install/DownloadListFiles/IPSWatering_FileList.ini @@ -1,30 +1,34 @@ -Version=2.50.1 -ModuleNamespace=IPSLibrary::app::modules::IPSWatering - +Version="2.50.5" +InstallVersion="2.50.3" +ModuleNamespace="IPSLibrary::app::modules::IPSWatering" [App] -DefaultFiles[]= -ScriptFiles[]=IPSWatering_Constants.inc.php -ScriptFiles[]=IPSWatering.inc.php -ScriptFiles[]=IPSWatering_Logging.inc.php -ScriptFiles[]=IPSWatering_ActivationTimer.ips.php -ScriptFiles[]=IPSWatering_AutomaticOn.ips.php -ScriptFiles[]=IPSWatering_AutomaticOff.ips.php -ScriptFiles[]=IPSWatering_ChangeSettings.ips.php -ScriptFiles[]=IPSWatering_RefreshTimer.ips.php - +DefaultFiles[]="" +ScriptFiles[]="IPSWatering_Constants.inc.php" +ScriptFiles[]="IPSWatering.inc.php" +ScriptFiles[]="IPSWatering_Logging.inc.php" +ScriptFiles[]="IPSWatering_ActivationTimer.ips.php" +ScriptFiles[]="IPSWatering_AutomaticOn.ips.php" +ScriptFiles[]="IPSWatering_AutomaticOff.ips.php" +ScriptFiles[]="IPSWatering_ChangeSettings.ips.php" +ScriptFiles[]="IPSWatering_RefreshTimer.ips.php" [Config] -DefaultFiles[]=IPSWatering_Configuration.inc.php -DefaultFiles[]=IPSWatering_Custom.inc.php -ExampleFiles[]=IPSWatering_DemoConfiguration.inc.php -ExampleFiles[]=IPSWatering_DemoCustom.inc.php - - +DefaultFiles[]="IPSWatering_Configuration.inc.php" +DefaultFiles[]="IPSWatering_Custom.inc.php" +ExampleFiles[]="IPSWatering_DemoConfiguration.inc.php" +ExampleFiles[]="IPSWatering_DemoCustom.inc.php" [Install] -InstallFiles[]=IPSWatering_Installation.ips.php -DownloadFiles[]=IPSWatering_FileList.ini -DefaultFiles[]=IPSWatering.ini -ExampleFiles[]= - - +InstallFiles[]="IPSWatering_Installation.ips.php" +DownloadFiles[]="IPSWatering_FileList.ini" +DefaultFiles[]="IPSWatering.ini" +ExampleFiles[]="" [WebFront] -ScriptFiles[]= +ScriptFiles[]="" +[RequiredModules] +IPSModuleManager="2.50.2" +IPSLogger="2.50.2" +IPSComponent="2.50.1" +IPSMessageHandler="2.50.1" +[ChangeList] +2.50.3="WebFront Anpassung an IP-Symcon 2.5" +2.50.4="Direkter Support von OnTime (Zeit die der Aktor eingeschaltet bleiben soll wird bereits beim Einschalten mitgesendet" +2.50.5="Callback for Refresh" diff --git a/IPSLibrary/install/DownloadListFiles/IPSWeatherForcastAT_FileList.ini b/IPSLibrary/install/DownloadListFiles/IPSWeatherForcastAT_FileList.ini index 7ff9812..906cb18 100644 --- a/IPSLibrary/install/DownloadListFiles/IPSWeatherForcastAT_FileList.ini +++ b/IPSLibrary/install/DownloadListFiles/IPSWeatherForcastAT_FileList.ini @@ -1,65 +1,75 @@ -Version=2.50.1 -ModuleNamespace=IPSLibrary::app::modules::Weather::IPSWeatherForcastAT - +Version="2.50.5" +InstallVersion="2.50.2" +ModuleNamespace="IPSLibrary::app::modules::Weather::IPSWeatherForcastAT" [App] -DefaultFiles[]= -ScriptFiles[]=IPSWeatherForcastAT_Refresh.ips.php -ScriptFiles[]=IPSWeatherForcastAT_Constants.inc.php -ScriptFiles[]=IPSWeatherForcastAT_Utils.inc.php - +DefaultFiles[]="" +ScriptFiles[]="IPSWeatherForcastAT_Constants.inc.php" +ScriptFiles[]="IPSWeatherForcastAT_Utils.inc.php" +ScriptFiles[]="IPSWeatherForcastAT_Refresh.ips.php" +ScriptFiles[]="IPSWeatherForcastAT_RefreshGoogle.inc.php" +ScriptFiles[]="IPSWeatherForcastAT_RefreshYahoo.inc.php" +ScriptFiles[]="IPSWeatherForcastAT_RefreshWunderground.inc.php" +ScriptFiles[]="IPSWeatherForcastAT_RefreshORF.inc.php" [Config] -DefaultFiles[]=IPSWeatherForcastAT_Configuration.inc.php -ExampleFiles[]= - +DefaultFiles[]="IPSWeatherForcastAT_Configuration.inc.php" +ExampleFiles[]="" [Install] -InstallFiles[]=IPSWeatherForcastAT_Installation.ips.php -DownloadFiles[]=IPSWeatherForcastAT_FileList.ini -DefaultFiles[]=IPSWeatherForcastAT.ini -ExampleFiles[]= - +InstallFiles[]="IPSWeatherForcastAT_Installation.ips.php" +DownloadFiles[]="IPSWeatherForcastAT_FileList.ini" +DefaultFiles[]="IPSWeatherForcastAT.ini" +ExampleFiles[]="" [WebFront] -ScriptFiles[]=Weather.php -ScriptFiles[]=Weather.css -ScriptFiles[]=iWeather.css -ScriptFiles[]=icons/chance_of_rain.png -ScriptFiles[]=icons/chance_of_snow.png -ScriptFiles[]=icons/chance_of_storm.png -ScriptFiles[]=icons/chance_of_tstorm.png -ScriptFiles[]=icons/cloudy.png -ScriptFiles[]=icons/dust.png -ScriptFiles[]=icons/flurries.png -ScriptFiles[]=icons/fog.png -ScriptFiles[]=icons/haze.png -ScriptFiles[]=icons/icy.png -ScriptFiles[]=icons/mostly_cloudy.png -ScriptFiles[]=icons/mostly_sunny.png -ScriptFiles[]=icons/partly_cloudy.png -ScriptFiles[]=icons/rain.png -ScriptFiles[]=icons/showers.png -ScriptFiles[]=icons/sleet.png -ScriptFiles[]=icons/smoke.png -ScriptFiles[]=icons/snow.png -ScriptFiles[]=icons/storm.png -ScriptFiles[]=icons/sunny.png -ScriptFiles[]=icons/thunderstorm.png -ScriptFiles[]=icons/gross/chance_of_rain.png -ScriptFiles[]=icons/gross/chance_of_snow.png -ScriptFiles[]=icons/gross/chance_of_storm.png -ScriptFiles[]=icons/gross/chance_of_tstorm.png -ScriptFiles[]=icons/gross/cloudy.png -ScriptFiles[]=icons/gross/dust.png -ScriptFiles[]=icons/gross/flurries.png -ScriptFiles[]=icons/gross/fog.png -ScriptFiles[]=icons/gross/haze.png -ScriptFiles[]=icons/gross/icy.png -ScriptFiles[]=icons/gross/mostly_cloudy.png -ScriptFiles[]=icons/gross/mostly_sunny.png -ScriptFiles[]=icons/gross/partly_cloudy.png -ScriptFiles[]=icons/gross/rain.png -ScriptFiles[]=icons/gross/showers.png -ScriptFiles[]=icons/gross/sleet.png -ScriptFiles[]=icons/gross/smoke.png -ScriptFiles[]=icons/gross/snow.png -ScriptFiles[]=icons/gross/storm.png -ScriptFiles[]=icons/gross/sunny.png -ScriptFiles[]=icons/gross/thunderstorm.png +ScriptFiles[]="Weather.php" +ScriptFiles[]="Weather.css" +ScriptFiles[]="iWeather.css" +ScriptFiles[]="icons/chance_of_rain.png" +ScriptFiles[]="icons/chance_of_snow.png" +ScriptFiles[]="icons/chance_of_storm.png" +ScriptFiles[]="icons/chance_of_tstorm.png" +ScriptFiles[]="icons/cloudy.png" +ScriptFiles[]="icons/dust.png" +ScriptFiles[]="icons/flurries.png" +ScriptFiles[]="icons/fog.png" +ScriptFiles[]="icons/haze.png" +ScriptFiles[]="icons/icy.png" +ScriptFiles[]="icons/mostly_cloudy.png" +ScriptFiles[]="icons/mostly_sunny.png" +ScriptFiles[]="icons/partly_cloudy.png" +ScriptFiles[]="icons/rain.png" +ScriptFiles[]="icons/showers.png" +ScriptFiles[]="icons/sleet.png" +ScriptFiles[]="icons/smoke.png" +ScriptFiles[]="icons/snow.png" +ScriptFiles[]="icons/storm.png" +ScriptFiles[]="icons/sunny.png" +ScriptFiles[]="icons/thunderstorm.png" +ScriptFiles[]="icons/gross/chance_of_rain.png" +ScriptFiles[]="icons/gross/chance_of_snow.png" +ScriptFiles[]="icons/gross/chance_of_storm.png" +ScriptFiles[]="icons/gross/chance_of_tstorm.png" +ScriptFiles[]="icons/gross/cloudy.png" +ScriptFiles[]="icons/gross/dust.png" +ScriptFiles[]="icons/gross/flurries.png" +ScriptFiles[]="icons/gross/fog.png" +ScriptFiles[]="icons/gross/haze.png" +ScriptFiles[]="icons/gross/icy.png" +ScriptFiles[]="icons/gross/mostly_cloudy.png" +ScriptFiles[]="icons/gross/mostly_sunny.png" +ScriptFiles[]="icons/gross/partly_cloudy.png" +ScriptFiles[]="icons/gross/rain.png" +ScriptFiles[]="icons/gross/showers.png" +ScriptFiles[]="icons/gross/sleet.png" +ScriptFiles[]="icons/gross/smoke.png" +ScriptFiles[]="icons/gross/snow.png" +ScriptFiles[]="icons/gross/storm.png" +ScriptFiles[]="icons/gross/sunny.png" +ScriptFiles[]="icons/gross/thunderstorm.png" +[RequiredModules] +IPSLogger="2.50.2" +IPSModuleManager="2.50.2" +[ChangeList] +2.50.2="Anpassung der Temperatur Profile" +2.50.1="Initiale Version" +2.50.3="Errorhandling beim Zugriff auf ORF Wettter verbessert" +2.50.4="Support Parameter for Background Color" +2.50.5="Fixed Yahoo Weather Access" diff --git a/IPSLibrary/install/DownloadListFiles/NetPlayer2_FileList.ini b/IPSLibrary/install/DownloadListFiles/NetPlayer2_FileList.ini new file mode 100644 index 0000000..a8e9d33 --- /dev/null +++ b/IPSLibrary/install/DownloadListFiles/NetPlayer2_FileList.ini @@ -0,0 +1,45 @@ +Version="2.50.5" +InstallVersion="2.50.2" +ModuleNamespace="IPSLibrary::app::modules::NetPlayer2" +[App] +DefaultFiles[]="NetPlayer_IDs.inc.php" +ScriptFiles[]="NetPlayer.inc.php" +ScriptFiles[]="NetPlayer_Utils.inc.php" +ScriptFiles[]="NetPlayer_Constants.inc.php" +ScriptFiles[]="NetPlayer_LoadFiles.inc.php" +ScriptFiles[]="NetPlayer_ListFiles.inc.php" +ScriptFiles[]="NetPlayer_EventScript.ips.php" +ScriptFiles[]="NetPlayer_ActionScript.ips.php" +[Config] +DefaultFiles[]="NetPlayer_Configuration.inc.php" +ExampleFiles[]="NetPlayer_DemoConfiguration.inc.php" +[Install] +InstallFiles[]="NetPlayer2_Installation.ips.php" +DownloadFiles[]="NetPlayer2_FileList.ini" +DefaultFiles[]="NetPlayer2.ini" +ExampleFiles[]="" +[WebFront] +ScriptFiles[]="jquery.min.js" +ScriptFiles[]="mNetPlayer.css" +ScriptFiles[]="NetPlayer.css" +ScriptFiles[]="NetPlayer_CoverNotFound.jpg" +ScriptFiles[]="NetPlayer_Mobile.php" +ScriptFiles[]="NetPlayer_MobilePlayer.php" +ScriptFiles[]="NetPlayer_MobileRadio.php" +ScriptFiles[]="NetPlayer_MobileSelection.php" +ScriptFiles[]="NetPlayer_MP3Control.php" +ScriptFiles[]="NetPlayer_MP3Selection.php" +ScriptFiles[]="NetPlayer_RadioControl.php" +ScriptFiles[]="NetPlayer_Receiver.php" +ScriptFiles[]="NetPlayer_Sender.php" +ScriptFiles[]="NetPlayer_Utils.php" +[RequiredModules] +IPSModuleManager="2.50.2" +IPSLogger="2.50.2" +IPSComponent="2.50.1" +IPSMessageHandler="2.50.1" +[ChangeList] +2.50.2="Umstellung auf neuen IPS Variablen-Zugriff" +2.50.3="Added Function NetPlayer_RadioByIndex" +2.50.4="Added Support for Background and Foreground Colors" +2.50.5="Fixed URLs for HTTPS Access " diff --git a/IPSLibrary/install/DownloadListFiles/NetPlayer_FileList.ini b/IPSLibrary/install/DownloadListFiles/NetPlayer_FileList.ini index d3a0f34..32f2046 100644 --- a/IPSLibrary/install/DownloadListFiles/NetPlayer_FileList.ini +++ b/IPSLibrary/install/DownloadListFiles/NetPlayer_FileList.ini @@ -1,39 +1,45 @@ -Version=2.50.1 -ModuleNamespace=IPSLibrary::app::modules::NetPlayer - +Version="2.50.5" +InstallVersion="2.50.2" +ModuleNamespace="IPSLibrary::app::modules::NetPlayer" [App] -DefaultFiles[]=NetPlayer_IDs.inc.php -ScriptFiles[]=NetPlayer.inc.php -ScriptFiles[]=NetPlayer_Utils.inc.php -ScriptFiles[]=NetPlayer_Constants.inc.php -ScriptFiles[]=NetPlayer_LoadFiles.inc.php -ScriptFiles[]=NetPlayer_ListFiles.inc.php -ScriptFiles[]=NetPlayer_EventScript.ips.php -ScriptFiles[]=NetPlayer_ActionScript.ips.php - +DefaultFiles[]="NetPlayer_IDs.inc.php" +ScriptFiles[]="NetPlayer.inc.php" +ScriptFiles[]="NetPlayer_Utils.inc.php" +ScriptFiles[]="NetPlayer_Constants.inc.php" +ScriptFiles[]="NetPlayer_LoadFiles.inc.php" +ScriptFiles[]="NetPlayer_ListFiles.inc.php" +ScriptFiles[]="NetPlayer_EventScript.ips.php" +ScriptFiles[]="NetPlayer_ActionScript.ips.php" [Config] -DefaultFiles[]=NetPlayer_Configuration.inc.php -ExampleFiles[]=NetPlayer_DemoConfiguration.inc.php - +DefaultFiles[]="NetPlayer_Configuration.inc.php" +ExampleFiles[]="NetPlayer_DemoConfiguration.inc.php" [Install] -InstallFiles[]=NetPlayer_Installation.ips.php -DownloadFiles[]=NetPlayer_FileList.ini -DefaultFiles[]=NetPlayer.ini -ExampleFiles[]= - +InstallFiles[]="NetPlayer_Installation.ips.php" +DownloadFiles[]="NetPlayer_FileList.ini" +DefaultFiles[]="NetPlayer.ini" +ExampleFiles[]="" [WebFront] -ScriptFiles[]=jquery.min.js -ScriptFiles[]=mNetPlayer.css -ScriptFiles[]=NetPlayer.css -ScriptFiles[]=NetPlayer_CoverNotFound.jpg -ScriptFiles[]=NetPlayer_Mobile.php -ScriptFiles[]=NetPlayer_MobilePlayer.php -ScriptFiles[]=NetPlayer_MobileRadio.php -ScriptFiles[]=NetPlayer_MobileSelection.php -ScriptFiles[]=NetPlayer_MP3Control.php -ScriptFiles[]=NetPlayer_MP3Selection.php -ScriptFiles[]=NetPlayer_RadioControl.php -ScriptFiles[]=NetPlayer_Receiver.php -ScriptFiles[]=NetPlayer_Sender.php -ScriptFiles[]=NetPlayer_Utils.php - +ScriptFiles[]="jquery.min.js" +ScriptFiles[]="mNetPlayer.css" +ScriptFiles[]="NetPlayer.css" +ScriptFiles[]="NetPlayer_CoverNotFound.jpg" +ScriptFiles[]="NetPlayer_Mobile.php" +ScriptFiles[]="NetPlayer_MobilePlayer.php" +ScriptFiles[]="NetPlayer_MobileRadio.php" +ScriptFiles[]="NetPlayer_MobileSelection.php" +ScriptFiles[]="NetPlayer_MP3Control.php" +ScriptFiles[]="NetPlayer_MP3Selection.php" +ScriptFiles[]="NetPlayer_RadioControl.php" +ScriptFiles[]="NetPlayer_Receiver.php" +ScriptFiles[]="NetPlayer_Sender.php" +ScriptFiles[]="NetPlayer_Utils.php" +[RequiredModules] +IPSModuleManager="2.50.2" +IPSLogger="2.50.2" +IPSComponent="2.50.1" +IPSMessageHandler="2.50.1" +[ChangeList] +2.50.2="Umstellung auf neuen IPS Variablen-Zugriff" +2.50.3="Added Function NetPlayer_RadioByIndex" +2.50.4="Added Support for Background and Foreground Colors" +2.50.5="Fixed URLs for HTTPS Access " diff --git a/IPSLibrary/install/IPSInstaller/IPSInstaller.inc.php b/IPSLibrary/install/IPSInstaller/IPSInstaller.inc.php index 0af154c..ce76aab 100644 --- a/IPSLibrary/install/IPSInstaller/IPSInstaller.inc.php +++ b/IPSLibrary/install/IPSInstaller/IPSInstaller.inc.php @@ -18,7 +18,6 @@ * */ - /** Anlegen einer Kategorie. * * Die Funktion legt eine Kategory, als übergeordnete ID dient dabei $ParentId. Sollte @@ -66,6 +65,46 @@ function DeleteCategory($CategoryId) { IPS_DeleteCategory($CategoryId); } + /** Löschen eines beliebigen Objektes + * + * Die Funktion löscht ein IP-Symcon Object mit der übergebenen ID. + * + * @param integer $objectId ID des Objektes + * + */ + function DeleteObject($ObjectId) { + $Object = IPS_GetObject($ObjectId); + $ObjectType = $Object['ObjectType']; + switch ($ObjectType) { + case 0: // Category + DeleteCategory($ObjectId); + break; + case 1: // Instance + EmptyCategory($ObjectId); + IPS_DeleteInstance($ObjectId); + break; + case 2: // Variable + IPS_DeleteVariable($ObjectId); + break; + case 3: // Script + EmptyCategory($ObjectId); + IPS_DeleteScript($ObjectId, false); + break; + case 4: // Event + IPS_DeleteEvent($ObjectId); + break; + case 5: // Media + IPS_DeleteMedia($ObjectId, true); + break; + case 6: // Link + IPS_DeleteLink($ObjectId); + break; + default: + Error ("Found unknown ObjectType $ObjectType"); + } + } + + /** Löschen des Inhalts einer Kategorie inklusve Inhalt * * Die Funktion löscht den gesamtem Inhalt einer Kategorie @@ -80,34 +119,7 @@ function EmptyCategory($CategoryId) { $ChildrenIds = IPS_GetChildrenIDs($CategoryId); foreach ($ChildrenIds as $ObjectId) { - $Object = IPS_GetObject($ObjectId); - $ObjectType = $Object['ObjectType']; - switch ($ObjectType) { - case 0: // Category - DeleteCategory($ObjectId); - break; - case 1: // Instance - EmptyCategory($ObjectId); - IPS_DeleteInstance($ObjectId); - break; - case 2: // Variable - IPS_DeleteVariable($ObjectId); - break; - case 3: // Script - IPS_DeleteScript($ObjectId, false); - break; - case 4: // Event - IPS_DeleteEvent($ObjectId); - break; - case 5: // Media - IPS_DeleteMedia($ObjectId, true); - break; - case 6: // Link - IPS_DeleteLink($ObjectId); - break; - default: - Error ("Found unknown ObjectType $ObjectType"); - } + DeleteObject($ObjectId); } Debug ("Empty Category ID=$CategoryId"); } @@ -180,6 +192,7 @@ function Get_IdentByName($name) { $ident = str_replace(array('"','\'','%','&','(',')','=','#','<','>','|','\\'), '', $ident); $ident = str_replace(array(',','.',':',';','!','?'), '', $ident); $ident = str_replace(array('+','-','/','*'), '', $ident); + $ident = str_replace(array('ß'), 'ss', $ident); return $ident; } @@ -281,7 +294,7 @@ function CreateMedia ($Name, $ParentId, $FileName, $FileExists=false, $MediaType * */ function CreateDummyInstance ($Name, $ParentId, $Position=0) { - return CreateInstance ($Name, $ParentId, "{485D0419-BE97-4548-AA9C-C083EB82E61E}", $Position); + return CreateInstance ($Name, $ParentId, "{485D0419-BE97-4548-AA9C-C083EB82E61E}", $Position); } /** Anlegen einer IO Instanze mit seriellem Port @@ -452,6 +465,10 @@ function CreateScript ($Name, $File, $ParentId, $Position=0) { IPS_SetName($ScriptId, $Name); IPS_SetPosition($ScriptId, $Position); IPS_SetScriptFile($ScriptId, $File); + $oldScriptFile=IPS_GetKernelDir().'scripts\\'.$ScriptId.'.ips.php'; + if (file_exists($oldScriptFile)) { + unlink($oldScriptFile); + } IPS_SetIdent($ScriptId, Get_IdentByName($Name)); Debug ('Created Script '.$Name.'='.$ScriptId.""); } @@ -541,15 +558,24 @@ function CreateLink ($Name, $Link, $ParentId, $Position, $ident="") { if ($ident<>"") { IPS_SetIdent($LinkId, Get_IdentByName($Name)); } - IPS_SetLinkChildID($LinkId, $Link); + IPS_SetLinkTargetID($LinkId, $Link); IPS_SetPosition($LinkId, $Position); Debug ('Created Link '.$Name.'='.$LinkId.""); } UpdateObjectData($LinkId, $Position); - IPS_SetLinkChildID($LinkId, $Link); + IPS_SetLinkTargetID($LinkId, $Link); return $LinkId; } + /* + * Simulate IPS_SetLinkTargetID for IP-Symcon < 2.6 + */ + if (!function_exists('IPS_SetLinkTargetID')) { + function IPS_SetLinkTargetID($LinkID, $TargetID) { + return IPS_SetLinkChildID($LinkID, $TargetID); + } + } + /** Anlegen eines Links * * Die Funktion sucht in der spezifizierten Parent Kategorie alle vorhandenen Links und überprüft ob einer der @@ -574,16 +600,16 @@ function CreateLinkByDestination ($Name, $LinkChildId, $ParentId, $Position, $id if ($Link['LinkChildID']==$LinkChildId) { $LinkId = $ObjectId; break; - } + } } } - if ($LinkId === false) { - $LinkId = IPS_CreateLink(); + if ($LinkId === false) { + $LinkId = IPS_CreateLink(); IPS_SetParent($LinkId, $ParentId); IPS_SetPosition($LinkId, $Position); } - IPS_SetLinkChildID($LinkId, $LinkChildId); + IPS_SetLinkTargetID($LinkId, $LinkChildId); if ($ident<>"") { IPS_SetIdent($LinkId, $ident); } @@ -798,16 +824,20 @@ function CreateProfile_Associations ($Name, $Associations, $Icon="", $Color=-1, * @param integer $ColorOn Farbwert der für TRUE verwendet werden soll im HTML Farbcode (z.b. 0x0000FF für Blau). Sonderfall: -1 für Transparent * @param string $IconOff Dateiname des Icons das für FALSE verwendet werden soll * @param string $IconOn Dateiname des Icons das für TRUE verwendet werden soll + * @param boolean $DeleteProfile Spezifiziert ob ein bestehendes Profil geöscht werden soll * */ - function CreateProfile_Switch ($Name, $DisplayFalse, $DisplayTrue, $Icon="", $ColorOff=-1, $ColorOn=0x00ff00, $IconOff="", $IconOn="") { - @IPS_CreateVariableProfile($Name, 1); + function CreateProfile_Switch ($Name, $DisplayFalse, $DisplayTrue, $Icon="", $ColorOff=-1, $ColorOn=0x00ff00, $IconOff="", $IconOn="", $DeleteProfile=true) { + if ($DeleteProfile) { + @IPS_DeleteVariableProfile($Name); + } + @IPS_CreateVariableProfile($Name, 0); IPS_SetVariableProfileText($Name, "", ""); - IPS_SetVariableProfileValues($Name, 0, 1, 1); + IPS_SetVariableProfileValues($Name, 0, 1, 0); IPS_SetVariableProfileDigits($Name, 0); IPS_SetVariableProfileIcon($Name, $Icon); IPS_SetVariableProfileAssociation($Name, 0, $DisplayFalse, $IconOff, $ColorOff); - IPS_SetVariableProfileAssociation($Name, 1, $DisplayTrue, $IconOn, $ColorOn); + IPS_SetVariableProfileAssociation($Name, 1, $DisplayTrue, $IconOn, $ColorOn); } /** Anlegen eines Integer Profils @@ -822,9 +852,13 @@ function CreateProfile_Switch ($Name, $DisplayFalse, $DisplayTrue, $Icon="", $Co * @param string $Prefix Prefix für den Wert * @param string $Suffix Suffix für den Wert * @param string $Icon Dateiname des Icons + * @param boolean $DeleteProfile Spezifiziert ob ein bestehendes Profil geöscht werden soll * */ - function CreateProfile_Count ($Name, $Start=0, $Step=0, $Stop=0, $Prefix="", $Suffix="", $Icon="") { + function CreateProfile_Count ($Name, $Start=0, $Step=0, $Stop=0, $Prefix="", $Suffix="", $Icon="", $DeleteProfile=true) { + if ($DeleteProfile) { + @IPS_DeleteVariableProfile($Name); + } @IPS_CreateVariableProfile($Name, 1); IPS_SetVariableProfileText($Name, $Prefix, $Suffix); IPS_SetVariableProfileValues($Name, $Start, $Stop, $Step); @@ -900,9 +934,13 @@ function PrepareWFCItemData (&$ItemId, &$ParentId, &$Title) { $ParentId = str_replace(' ','_',$ParentId); //$ItemId = str_replace('_','',$ItemId); //$ParentId = str_replace('_','',$ParentId); - $Title = utf8_encode($Title); - $ItemId = utf8_encode($ItemId); - $ParentId = utf8_encode($ParentId); + $version = IPS_GetKernelVersion(); + $versionArray = explode('.', $version); + if ($versionArray[0] < 3) { + $Title = utf8_encode($Title); + $ItemId = utf8_encode($ItemId); + $ParentId = utf8_encode($ParentId); + } } function CreateWFCItem ($WFCId, $ItemId, $ParentId, $Position, $Title, $Icon, $ClassName, $Configuration) { @@ -1050,19 +1088,20 @@ function DeleteWFCItem($WFCId, $ItemId) { function Debug($msg) { if (isset($_IPS['MODULEMANAGER'])) { - $moduleManager = $_IPS['MODULEMANAGER']; - $moduleManager->LogHandler()->Debug($msg); + $moduleManager = $_IPS['MODULEMANAGER']; + $moduleManager->LogHandler()->Debug($msg); + } elseif (isset($_IPS['SENDER']) and $_IPS['SENDER']=='WebFront') { } else { - echo $msg.PHP_EOL; + echo $msg.PHP_EOL; } } function Error($msg) { if (isset($_IPS['MODULEMANAGER'])) { - $moduleManager = $_IPS['MODULEMANAGER']; - $moduleManager->LogHandler()->Error($msg); + $moduleManager = $_IPS['MODULEMANAGER']; + $moduleManager->LogHandler()->Error($msg); } else { - echo $msg.PHP_EOL; + echo $msg.PHP_EOL; } throw new Exception($msg); } diff --git a/IPSLibrary/install/IPSModuleManager/IPSFileHandler/IPSFileHandler.class.php b/IPSLibrary/install/IPSModuleManager/IPSFileHandler/IPSFileHandler.class.php index a3ddc9a..0adad14 100644 --- a/IPSLibrary/install/IPSModuleManager/IPSFileHandler/IPSFileHandler.class.php +++ b/IPSLibrary/install/IPSModuleManager/IPSFileHandler/IPSFileHandler.class.php @@ -83,8 +83,8 @@ public static function GetUserFilenameByDefaultFilename($defaultFile) { * @param string $destinationList Liste der Files, die erzeugt werden soll */ public function FilterEqualFiles(&$sourceList, &$destinationList) { - $sourceOut = array(); - $destinationOut = array(); + $sourceOut = array(); + $destinationOut = array(); foreach ($sourceList as $idx=>$sourceScript) { $sourceFile = $sourceList[$idx]; $destinationFile = $destinationList[$idx]; @@ -93,18 +93,17 @@ public function FilterEqualFiles(&$sourceList, &$destinationList) { if (!file_exists($destinationFile)) { $addFileToList = true; } else { - $sourceContent = file_get_contents($sourceFile); - $destinationContent = file_get_contents($destinationFile); - $sourceContent = str_replace(chr(13), '',$sourceContent); - $destinationContent = str_replace(chr(13), '',$destinationContent); - if ($sourceContent == $destinationContent) { + $sourceContent = file_get_contents($sourceFile); + $destinationContent = file_get_contents($destinationFile); + $sourceContent = str_replace(chr(13), '',$sourceContent); + $destinationContent = str_replace(chr(13), '',$destinationContent); + if ($sourceContent == $destinationContent) { $addFileToList = false; - } + } } if ($addFileToList) { - $sourceOut[] = $sourceFile; - $destinationOut[] = $destinationFile; - + $sourceOut[] = $sourceFile; + $destinationOut[] = $destinationFile; }; } $sourceList = $sourceOut; @@ -119,10 +118,11 @@ public function FilterEqualFiles(&$sourceList, &$destinationList) { * * @param string $sourceFile Datei die kopiert werden soll * @param string $destinationFile Datei die erzeugt werden soll + * @param boolean $raiseError gibt an ob ein Error geraised werden soll oder ob die Function im Falle eines Fehlers false retounieren soll + * @return boolean true für OK, false bei Fehler beim Kopiervorgang * @throws IPSFileHandlerException wenn Fehler beim Erzeugen der Zieldatei auftritt */ - public function CopyFile($sourceFile, $destinationFile) { - + public function CopyFile($sourceFile, $destinationFile, $raiseError=true) { $destinationFilePath = pathinfo($destinationFile, PATHINFO_DIRNAME); if (!file_exists($destinationFilePath)) { $this->logHandler->Log("Create Directory $destinationFilePath"); @@ -132,44 +132,66 @@ public function CopyFile($sourceFile, $destinationFile) { } } - if (strpos($sourceFile, 'https')===0) { - $sourceFile = str_replace('\\','/', $sourceFile); - $sourceFile = str_replace('//','/', $sourceFile); - $sourceFile = str_replace('https:/','https://', $sourceFile); - $this->logHandler->Log("Copy $sourceFile --> $destinationFile"); + $sourceFile = str_replace('\\','/', $sourceFile); + $sourceFile = str_replace('//','/', $sourceFile); + $sourceFile = str_replace('https:/','https://', $sourceFile); + $this->logHandler->Log("Copy $sourceFile ---> $destinationFile"); $curl_handle=curl_init(); + global $_IPS; + if (array_key_exists('PROXY', $_IPS)) { + $proxy = $_IPS['PROXY']; + if ( $proxy != '' ) { + curl_setopt($curl_handle, CURLOPT_HTTPPROXYTUNNEL, 1); + curl_setopt($curl_handle, CURLOPT_PROXY, $proxy); + } + } curl_setopt($curl_handle, CURLOPT_URL,$sourceFile); - curl_setopt($curl_handle, CURLOPT_CONNECTTIMEOUT,10); + curl_setopt($curl_handle, CURLOPT_CONNECTTIMEOUT, 10); curl_setopt($curl_handle, CURLOPT_RETURNTRANSFER,true); curl_setopt($curl_handle, CURLOPT_SSL_VERIFYPEER, false); + curl_setopt($curl_handle, CURLOPT_FOLLOWLOCATION, true); curl_setopt($curl_handle, CURLOPT_FAILONERROR, true); $fileContent = curl_exec($curl_handle); //$fileContent = html_entity_decode($fileContent, ENT_COMPAT, 'ISO-8859-1'); if ($fileContent===false) { - throw new IPSFileHandlerException('File '.$destinationFile.' could NOT be found on the Server !!!', - E_USER_ERROR); + $this->logHandler->Log("Download Destination File $sourceFile failed --> Retry ..."); + $fileContent = curl_exec($curl_handle); + } + if ($fileContent===false) { + $this->logHandler->Log("Download Destination File $sourceFile failed --> Retry ..."); + $fileContent = curl_exec($curl_handle); + } + if ($fileContent===false) { + if ($raiseError) { + throw new IPSFileHandlerException('File '.$destinationFile.' could NOT be found on the Server !!!', + E_USER_ERROR); + } else { + return false; + } } curl_close($curl_handle); - $result = file_put_contents($destinationFile, $fileContent); - if ($result===false) { + $result = file_put_contents($destinationFile, $fileContent); + if ($result===false) { $this->logHandler->Log("Write Destination File $destinationFile failed --> Retry ..."); - sleep(1); - $result = file_put_contents($destinationFile, $fileContent); - if ($result===false) { + sleep(1); + $result = file_put_contents($destinationFile, $fileContent); + if ($result===false and $raiseError) { throw new IPSFileHandlerException('Error writing File Content to '.$destinationFile, E_USER_ERROR); - } - } + } + } } else { $this->logHandler->Log("Copy $sourceFile --> $destinationFile"); - if (!copy ($sourceFile, $destinationFile)) { + $result = @copy ($sourceFile, $destinationFile); + if ($result===false and $raiseError) { throw new IPSFileHandlerException('Error while copy File '.$sourceFile.' to '.$destinationFile, - E_USER_ERROR); + E_USER_ERROR); } } + return $result; } /** @@ -198,13 +220,19 @@ public function CreateScriptsFromDefault($scriptList, $overwriteUserFiles=false) * * @param string $sourceList Liste der Files, die kopiert werden soll * @param string $destinationList Liste der Files, die erzeugt werden soll + * @param boolean $raiseError gibt an ob ein Error geraised werden soll oder ob die Function im Falle eines Fehlers false retounieren soll + * @return boolean true für OK, false bei Fehler beim Kopiervorgang * @throws IPSFileHandlerException wenn Fehler beim Erzeugen der Zieldatei auftritt */ - public function CopyFiles ($sourceList, $destinationList) { + public function CopyFiles ($sourceList, $destinationList, $raiseError=true) { foreach ($sourceList as $idx=>$sourceScript) { $destinationScript = $destinationList[$idx]; - $this->CopyFile($sourceScript, $destinationScript); + $result = $this->CopyFile($sourceScript, $destinationScript, $raiseError); + if ($result===false) { + return false; + } } + return true; } /** diff --git a/IPSLibrary/install/IPSModuleManager/IPSLogHandler/IPSLogHandler.class.php b/IPSLibrary/install/IPSModuleManager/IPSLogHandler/IPSLogHandler.class.php index c87d6cd..b93ed10 100644 --- a/IPSLibrary/install/IPSModuleManager/IPSLogHandler/IPSLogHandler.class.php +++ b/IPSLibrary/install/IPSModuleManager/IPSLogHandler/IPSLogHandler.class.php @@ -23,6 +23,7 @@ class IPSLogHandler{ private static $logDirectory=""; private static $logFile=""; private static $debugMode=false; + private static $silentMode=false; private $logContext=""; /** @@ -34,17 +35,54 @@ class IPSLogHandler{ * @param string $logDirectory Verzeichnis für Log File * @param string $logFile Name des Log Files * @param string $debugMode Debug Mode, Switch für Ausgae von Debug Meldungen + * @param string $silentMode bei TRUE werden Meldungen nicht mit ECHO gelogged */ - public function __construct($logContext, $logDirectory ,$logFile='' , $debugMode=true) { + public function __construct($logContext, $logDirectory, $moduleName='', $debugMode=true, $silentMode=false, $logFile='') { if ($logFile=='') { - $logFile = 'IPSModuleManager_'.date("Y-m-d_Hi").'.log'; + $logFile = 'IPSModuleManager_'.date("Y-m-d_Hi").'_'.$moduleName.'.log'; } self::$logDirectory = $logDirectory; self::$logFile = $logFile; self::$debugMode = $debugMode; + self::$silentMode = $silentMode; $this->logContext = $logContext; } + /** + * @public + * + * Liefert eine Liste aller LogFiles in absteigender Reihenfolge (Neueste Files zuerst) + * + * @param integer $limit Maximale Anzahl von Einträgen + * @return string[] Liste der LogFiles + */ + public function GetLogFileList($limit=10) { + $result = array(); + $files = scandir(self::$logDirectory, 1); + foreach ($files as $idx=>$file) { + // Found LogFile + if (strpos($file,'IPSModuleManager_')!==false and $idx<=$limit) { + $result[] = self::$logDirectory.$file; + } + } + return $result; + } + + + /** + * @public + * + * Liefert den Inhalt eines LogFiles + * + * @param string $fileName Name des LogFiles + * @return string[] Zeilen des LogFiles + */ + public function GetLogFileContent($fileName) { + $fileContent = file_get_contents(self::$logDirectory.$fileName); + $logLines = explode(PHP_EOL, $fileContent); + + return $logLines; + } /** * @public @@ -67,9 +105,9 @@ public function GetLogFileName() { */ public static function GetLogger($logContext) { if (self::$logDirectory=='' or self::$logFile=='') { - die('LogFile NOT assigned !!!'); + die('LogFile NOT assigned !!!'); } - return new IPSLogHandler($logContext, IPSLogHandler::$logDirectory, IPSLogHandler::$logFile, IPSLogHandler::$debugMode); + return new IPSLogHandler($logContext, IPSLogHandler::$logDirectory, null, IPSLogHandler::$debugMode, IPSLogHandler::$silentMode, IPSLogHandler::$logFile); } private function WriteFile($msg) { @@ -86,10 +124,12 @@ private function WriteFile($msg) { } private function WritePHPConsole($msg) { - $out = 'IPSModuleManager-Log-'; - $out .= substr(str_pad($this->logContext,20,' '),0,20); - $out .= date('Y-m-d H:i:s').substr(microtime(),1,3).' '.$msg; - echo $out."\n"; + if (!self::$silentMode) { + $out = 'IPSModuleManager-Log-'; + $out .= substr(str_pad($this->logContext,20,' '),0,20); + $out .= date('Y-m-d H:i:s').substr(microtime(),1,3).' '.$msg; + echo $out."\n"; + } } private function WriteIPSConsole($msg) { diff --git a/IPSLibrary/install/IPSModuleManager/IPSModuleManager.class.php b/IPSLibrary/install/IPSModuleManager/IPSModuleManager.class.php index 5c0559f..57972d0 100644 --- a/IPSLibrary/install/IPSModuleManager/IPSModuleManager.class.php +++ b/IPSLibrary/install/IPSModuleManager/IPSModuleManager.class.php @@ -26,7 +26,8 @@ * * @author Andreas Brauneis * @version - * Version 2.5.1, 05.01.2012
+ * Version 2.5.1, 05.01.2012
+ * Version 2.5.3, 29.10.2012 Adapted Version Handling
*/ class IPSModuleManager{ @@ -57,12 +58,10 @@ class IPSModuleManager{ * * @param string $moduleName Name des Modules * @param string $sourceRepository Pfad/Url zum SourceRepository, das zum Download der Module verwendet werden soll - * @param IPSVersionHandler $versionHandler Version Handler - * @param IPSConfigHandler $fileConfigHandler Konfigurations Handler für Download Liste - * @param IPSConfigHandler $moduleConfigHandler Konfigurations Handler für übergebenes Module - * @param IPSConfigHandler $managerConfigHandler Konfigurations Handler für ModuleManager + * @param string $logDirectory Vrezeichnis das zum Loggen verwendet werden soll + * @param string $silentMode bei TRUE werden Meldungen nicht mit ECHO gelogged */ - public function __construct($moduleName, $sourceRepository='', $versionHandler=null, $fileConfigHandler=null, $moduleConfigHandler=null, $managerConfigHandler=null) { + public function __construct($moduleName='', $sourceRepository='', $logDirectory='', $silentMode=false) { $_IPS['ABORT_ON_ERROR'] = true; $_IPS['MODULEMANAGER'] = $this; @@ -72,26 +71,22 @@ public function __construct($moduleName, $sourceRepository='', $versionHandler=n $this->moduleName = $moduleName; // Create ConfigHandler for ModuleManager INI File - $this->managerConfigHandler = $managerConfigHandler; - if ($managerConfigHandler==null) { - $this->managerConfigHandler = new IPSIniConfigHandler($this->GetModuleInitializationFile('IPSModuleManager')); - } + $this->managerConfigHandler = new IPSIniConfigHandler($this->GetModuleInitializationFile('IPSModuleManager')); - $this->sourceRepository = $sourceRepository; + $this->sourceRepository = $sourceRepository; if ($this->sourceRepository=='') { $this->sourceRepository = $this->managerConfigHandler->GetValue(IPSConfigHandler::SOURCEREPOSITORY, ''); } $this->sourceRepository = IPSFileHandler::AddTrailingPathDelimiter($this->sourceRepository); // Create Log Handler - $logDirectory = $this->managerConfigHandler->GetValueDef(IPSConfigHandler::LOGDIRECTORY, '', IPS_GetKernelDir().'logs\\'); - $this->logHandler = new IPSLogHandler(get_class($this), $logDirectory, ''); + if ($logDirectory=='') { + $logDirectory = $this->managerConfigHandler->GetValueDef(IPSConfigHandler::LOGDIRECTORY, '', IPS_GetKernelDir().'logs\\'); + } + $this->logHandler = new IPSLogHandler(get_class($this), $logDirectory, $moduleName, true, $silentMode); // Create Version Handler - $this->versionHandler = $versionHandler; - if ($versionHandler==null) { - $this->versionHandler = new IPSFileVersionHandler($moduleName); - } + $this->versionHandler = new IPSFileVersionHandler($moduleName); // Create Script Handler $libraryBasePath = 'Program'; @@ -111,10 +106,7 @@ public function __construct($moduleName, $sourceRepository='', $versionHandler=n $this->logHandler->Log('Module Download Ini File doesnt exists -> Load Ini File "'.$repositoryDownloadIniFile.'"'); $this->fileHandler->LoadFiles(array($repositoryDownloadIniFile), array($localDownloadIniFile)); } - $this->fileConfigHandler = $fileConfigHandler; - if ($fileConfigHandler==null) { - $this->fileConfigHandler = new IPSIniConfigHandler($this->GetModuleDownloadListFile(IPS_GetKernelDir().'scripts\\')); - } + $this->fileConfigHandler = new IPSIniConfigHandler($this->GetModuleDownloadListFile(IPS_GetKernelDir().'scripts\\')); // ConfigHandler for Module INI File $moduleIniFile = $this->GetModuleInitializationFile($moduleName); @@ -125,13 +117,13 @@ public function __construct($moduleName, $sourceRepository='', $versionHandler=n $this->fileHandler->LoadFiles(array($moduleRepositoryDefaultIniFile), array($moduleLocalDefaultIniFile)); $this->fileHandler->CreateScriptsFromDefault(array($moduleLocalDefaultIniFile)); } - $this->moduleConfigHandler = $moduleConfigHandler; - if ($moduleConfigHandler==null) { - $this->moduleConfigHandler = new IPSIniConfigHandler($moduleIniFile); - } + $this->moduleConfigHandler = new IPSIniConfigHandler($moduleIniFile); + // Increase PHP Timeout for current Session - $timeLimit = $this->managerConfigHandler->GetValueIntDef('TimeLimit', '', '120'); /*2 Minuten*/ + $timeLimit = $this->managerConfigHandler->GetValueIntDef('TimeLimit', '', '300'); /*5 Minuten*/ set_time_limit($timeLimit); + global $_IPS; + $_IPS['PROXY'] = $this->managerConfigHandler->GetValueDef('Proxy', '', ''); /*Proxy Settings*/ } /** @@ -190,11 +182,18 @@ public function LogHandler() { * @throws ConfigurationException wenn der betroffene Parameter nicht gefunden wurde */ public function GetConfigValue($key, $section=null) { - if ($this->moduleConfigHandler->ExistsValue($key, $section)) { - return $this->moduleConfigHandler->GetValue($key, $section); - } else { - return $this->managerConfigHandler->GetValue($key, $section); - } + if ($this->moduleConfigHandler->ExistsValue($key, $section)) { + $result = $this->moduleConfigHandler->GetValue($key, $section); + } else { + $result = $this->managerConfigHandler->GetValue($key, $section); + } + if ($result == 'true') { + return true; + } elseif ($result == 'false') { + return false; + } else { + return $result; + } } /** @@ -224,7 +223,7 @@ public function GetConfigValueInt ($key, $section=null) { * @throws ConfigurationException wenn der betroffene Parameter nicht gefunden wurde */ public function GetConfigValueBool ($key, $section=null) { - return (boolean)$this->GetConfigValue($key, $section); + return (boolean)$this->GetConfigValue($key, $section); } /** @@ -368,60 +367,17 @@ public function GetLogFileName() { * Liefert ein Array aller installierten Module * * Aufbau: - * array('Module1' => array('Version', 'Status', 'Description'), - * 'Module2' => array('Version', 'Status', 'Description'), + * array('Module1' => Version, + * 'Module2' => Version, * ... - * 'ModuleX' => array('Version', 'Status', 'Description')) + * 'ModuleX' => Version) * * @return string Array der Installierten Module */ public function GetInstalledModules() { - $resultList = array(); - $installedModules = $this->versionHandler->GetInstalledModules(); - $availableModules = $this->versionHandler->GetAvailableModules(); - foreach ($installedModules as $module=>$version) { - $versionArray = explode('.', $version); - $state = ''; - if (array_key_exists(4,$versionArray)) { - $state = $versionArray[4]; - unset($versionArray[4]); - } - if (array_key_exists(3,$versionArray) and $versionArray[3]=='') { - unset($versionArray[3]); - } - $version = implode('.', $versionArray); - $description = ''; - - if (array_key_exists($module, $availableModules)) { - $description = $availableModules[$module][1]; - } - $resultList[$module] = array($version, $state, $description); - } - return $resultList; - } + $resultList = $this->versionHandler->GetInstalledModules(); - /** - * @public - * - * Liefert ein Array aller verfügbaren Module - * - * Aufbau: - * array('Module1' => array('ModulePfad', 'Description'), - * 'Module2' => array('ModulePfad', 'Description'), - * ... - * 'ModuleX' => array('ModulePfad', 'Description')) - * - * @return string Array der verfügbaren Module - */ - public function GetAvailableModules($reloadModuleFile=true) { - if ($reloadModuleFile) { - $localFile = IPS_GetKernelDir().'scripts\\'.IPSVersionHandler::FILE_AVAILABLE_MODULES; - $repositoryFile = $this->sourceRepository.IPSVersionHandler::FILE_AVAILABLE_MODULES; - $this->fileHandler->LoadFiles(array($repositoryFile), array($localFile)); - } - - $installedModules = $this->versionHandler->GetAvailableModules(); - return $installedModules; + return $resultList; } /** @@ -446,6 +402,35 @@ public function GetConfigurationObjectID() { } /** + * @public + * + * Liefert ein Array mit Informationen zu dem Module zurück + * + * @return string[] Infos zu Modul + */ + public function GetModuleInfos($moduleName='') { + if ($moduleName=='') { + $moduleName = $this->moduleName; + } + $infos = $this->versionHandler->GetModuleInfos($moduleName); + if ($this->versionHandler->IsModuleInstalled($moduleName)) { + $versionHandler = new IPSFileVersionHandler($moduleName); + $infos['Installed'] = 'Yes'; + $infos['CurrentVersion'] = $versionHandler->GetScriptVersion(); + $infos['State'] = $versionHandler->GetModuleState(); + $infos['LastRepository'] = $versionHandler->GetModuleRepository(); + } else { + $infos['Installed'] = 'No'; + $infos['CurrentVersion'] = ''; + $infos['State'] = ''; + $infos['LastRepository'] = ''; + } + + return $infos; + } + + + /** * @private * * @return string liefert Installation Filename des Modules @@ -516,52 +501,53 @@ private function GetModuleDefaultInitializationFile($moduleName, $baseDirectory) */ private function GetScriptList($fileKey, $fileTypeSection, $baseDirectory) { if ($fileKey=='DownloadFiles') { - return array($this->GetModuleDownloadListFile($baseDirectory)); + return array($this->GetModuleDownloadListFile($baseDirectory)); } - $resultList = array(); - $scriptList = $this->fileConfigHandler->GetValueDef($fileKey, $fileTypeSection, array()); + $resultList = array(); + $scriptList = $this->fileConfigHandler->GetValueDef($fileKey, $fileTypeSection, array()); foreach ($scriptList as $idx=>$script) { - if ($script<>'') { + if ($script<>'') { if ($fileKey=='DefaultFiles') { - $script = 'Default\\'.$script; + $script = 'Default\\'.$script; } elseif ($fileKey=='ExampleFiles') { - $script = 'Examples\\'.$script; + $script = 'Examples\\'.$script; } else { } switch ($fileTypeSection) { case 'App': $namespace = $this->fileConfigHandler->GetValue(IPSConfigHandler::MODULENAMESPACE); - $fullScriptName = $baseDirectory.'::'.$namespace.'::'.$script; - break; + $fullScriptName = $baseDirectory.'::'.$namespace.'::'.$script; + break; case 'Config': $namespace = $this->fileConfigHandler->GetValue(IPSConfigHandler::MODULENAMESPACE); - $namespace = str_replace('IPSLibrary::app', 'IPSLibrary::config', $namespace); - $fullScriptName = $baseDirectory.'::'.$namespace.'::'.$script; + $namespace = str_replace('IPSLibrary::app', 'IPSLibrary::config', $namespace); + $fullScriptName = $baseDirectory.'::'.$namespace.'::'.$script; break; case 'WebFront': - if ($baseDirectory==IPS_GetKernelDir().'scripts\\') { - $fullScriptName = IPS_GetKernelDir().'webfront\\user\\'.$this->moduleName.'\\'.$script; - } else { - $fullScriptName = $baseDirectory.'\\IPSLibrary\\webfront\\'.$this->moduleName.'\\'.$script; - } - break; + if ($baseDirectory==IPS_GetKernelDir().'scripts\\') { + $fullScriptName = IPS_GetKernelDir().'webfront\\user\\'.$this->moduleName.'\\'.$script; + } else { + $fullScriptName = $baseDirectory.'\\IPSLibrary\\webfront\\'.$this->moduleName.'\\'.$script; + } + break; case 'Install': if ($fileKey=='DefaultFiles' or $fileKey=='ExampleFiles') { - $fullScriptName = $baseDirectory.'\\IPSLibrary\\install\\InitializationFiles\\'.$script; + $fullScriptName = $baseDirectory.'\\IPSLibrary\\install\\InitializationFiles\\'.$script; } else { - $fullScriptName = $baseDirectory.'\\IPSLibrary\\install\\InstallationScripts\\'.$script; + $fullScriptName = $baseDirectory.'\\IPSLibrary\\install\\InstallationScripts\\'.$script; } - break; + break; default: - die('Unknown fileTypeSection '.$fileTypeSection); + die('Unknown fileTypeSection '.$fileTypeSection); } - $fullScriptName = str_replace('::', '\\', $fullScriptName); - $fullScriptName = str_replace('\\\\', '\\', $fullScriptName); + $fullScriptName = str_replace('::', '\\', $fullScriptName); + $fullScriptName = str_replace('\\\\', '\\', $fullScriptName); + $fullScriptName = str_replace('\\192.168', '\\\\192.168', $fullScriptName); - $resultList[] = $fullScriptName; + $resultList[] = $fullScriptName; } } return $resultList; @@ -627,20 +613,23 @@ private function LoadModuleFiles($fileKey, $fileTypeSection, $sourceRepository, * * Lädt alle zugehörigen Files des Modules von einem Source Repository * - * @param string $sourceRepository Pfad/Url zum Source Repository, das zum Speichern verwendet werden soll + * @param string $sourceRepository Pfad/Url zum Source Repository, das zum Laden verwendet werden soll * @param boolean $overwriteUserFiles bestehende User Files mit Default überschreiben */ public function LoadModule($sourceRepository='', $overwriteUserFiles=false) { - if ($sourceRepository=='') { - $sourceRepository = $this->sourceRepository; - } - $sourceRepository = IPSFileHandler::AddTrailingPathDelimiter($sourceRepository); - - $this->versionHandler->SetModuleVersionLoading(); + if ($sourceRepository=='') { + $sourceRepository = $this->sourceRepository; + } + $sourceRepository = IPSFileHandler::AddTrailingPathDelimiter($sourceRepository); $this->LoadModuleFiles('DownloadFiles','Install', $sourceRepository, $overwriteUserFiles); $this->fileConfigHandler = new IPSIniConfigHandler($this->GetModuleDownloadListFile(IPS_GetKernelDir().'scripts\\')); + $newVersion = $this->fileConfigHandler->GetValueDef(IPSConfigHandler::SCRIPTVERSION, null, + $this->fileConfigHandler->GetValue(IPSConfigHandler::SCRIPTVERSION)); + $this->versionHandler->SetVersionLoading($newVersion); + $this->versionHandler->SetModuleRepository($sourceRepository); + $this->LoadModuleFiles('InstallFiles', 'Install', $sourceRepository, $overwriteUserFiles); $this->LoadModuleFiles('DefaultFiles', 'Install', $sourceRepository, $overwriteUserFiles); $this->LoadModuleFiles('ExampleFiles', 'Install', $sourceRepository, $overwriteUserFiles); @@ -655,7 +644,7 @@ public function LoadModule($sourceRepository='', $overwriteUserFiles=false) { $this->LoadModuleFiles('ScriptFiles', 'WebFront', $sourceRepository, $overwriteUserFiles); $this->LoadModuleFiles('ExampleFiles', 'WebFront', $sourceRepository, $overwriteUserFiles); - $this->versionHandler->SetModuleVersionLoaded(); + $this->versionHandler->SetVersionLoaded($newVersion); } /** @@ -666,16 +655,17 @@ public function LoadModule($sourceRepository='', $overwriteUserFiles=false) { * @param string $forceInstallation wenn true, wird auch eine Installation ausgeführt, wenn sich die Version des Modules nicht geändert hat */ public function InstallModule($forceInstallation = true) { - $newVersion = $this->fileConfigHandler->GetValue(IPSConfigHandler::VERSION); + $newVersion = $this->fileConfigHandler->GetValueDef(IPSConfigHandler::INSTALLVERSION, null, + $this->fileConfigHandler->GetValue(IPSConfigHandler::SCRIPTVERSION)); if (!$this->versionHandler->IsVersionInstalled($newVersion) or $forceInstallation) { - $file = $this->GetModuleInstallationScript(); - $this->versionHandler->SetModuleVersionInstalling(); + $this->versionHandler->SetVersionInstalling($newVersion); $moduleManager = $this; + $file = $this->GetModuleInstallationScript(); include $file; - $this->versionHandler->SetModuleVersion($newVersion); } else { - $this->logHandler->Debug('Module '.$this->moduleName.' is already at Version '.$newVersion); + $this->logHandler->Debug('Module '.$this->moduleName.' is already at installed Version '.$newVersion); } + $this->versionHandler->SetVersionInstalled($newVersion); } /** @@ -688,12 +678,12 @@ public function InstallModule($forceInstallation = true) { * @param string $sourceRepository Pfad/Url zum Source Repository, das zum Speichern verwendet werden soll */ public function UpdateModule($sourceRepository='') { - if ($sourceRepository=='') { - $sourceRepository = $this->sourceRepository; - } - $sourceRepository = IPSFileHandler::AddTrailingPathDelimiter($sourceRepository); - $this->LoadModule($sourceRepository); - $this->InstallModule(false /*dont force Installation*/); + if ($sourceRepository=='') { + $sourceRepository = $this->sourceRepository; + } + $sourceRepository = IPSFileHandler::AddTrailingPathDelimiter($sourceRepository); + $this->LoadModule($sourceRepository); + $this->InstallModule(false /*dont force Installation*/); } /** @@ -701,16 +691,14 @@ public function UpdateModule($sourceRepository='') { * * Update aller installierter Module * - * @param string $sourceRepository Pfad/Url zum Source Repository, das zum Speichern verwendet werden soll */ - public function UpdateAllModules($sourceRepository='') { - if ($sourceRepository=='') { - $sourceRepository = $this->sourceRepository; - } - $sourceRepository = IPSFileHandler::AddTrailingPathDelimiter($sourceRepository); - $moduleList = $this->versionHandler->GetInstalledModules(); - foreach ($moduleList as $module=>$version) { - $moduleManager = new IPSModuleManager($module, $sourceRepository); + public function UpdateAllModules() { + $moduleList = $this->versionHandler->GetKnownUpdates(); + foreach ($moduleList as $idx=>$module) { + $moduleInfos = $this->versionHandler->GetModuleInfos($module); + $repository = $moduleInfos['Repository']; + + $moduleManager = new IPSModuleManager($module, $repository); $moduleManager->UpdateModule(); } } @@ -722,7 +710,7 @@ public function UpdateAllModules($sourceRepository='') { * */ public function RepairModule() { - $this->InstallModule(true /*ForceInstallation*/); + $this->InstallModule(true /*ForceInstallation*/); } /** @@ -735,7 +723,7 @@ public function RepairModule() { * @param string $sourceRepository Pfad/Url zum Source Repository, das zum Speichern verwendet werden soll */ private function DeleteModuleFiles($fileKey, $fileTypeSection) { - $backupDirectory = $this->managerConfigHandler->GetValueDef('DeployBackupDirectory', '', IPS_GetKernelDir().'backup\\IPSLibrary_Delete\\'); + $backupDirectory = $this->managerConfigHandler->GetValueDef('DeployBackupDirectory', '', IPS_GetKernelDir().'backup\\IPSLibrary_Delete\\'); $backupHandler = new IPSBackupHandler($backupDirectory); $localList = $this->GetScriptList($fileKey, $fileTypeSection, IPS_GetKernelDir().'scripts\\'); @@ -744,8 +732,8 @@ private function DeleteModuleFiles($fileKey, $fileTypeSection) { $this->logHandler->Log('Delete Files with Key='.$fileKey.' and Section='.$fileTypeSection); foreach ($localList as $idx=>$file) { if ($fileKey=='DefaultFiles') { - $userFile = IPSFileHandler::GetUserFilenameByDefaultFilename($file); - $backupFile = IPSFileHandler::GetUserFilenameByDefaultFilename($backupList[$idx]); + $userFile = IPSFileHandler::GetUserFilenameByDefaultFilename($file); + $backupFile = IPSFileHandler::GetUserFilenameByDefaultFilename($backupList[$idx]); $this->backupHandler->CreateBackupFromFile($userFile, $backupFile); $this->scriptHandler->UnregisterScriptByFilename($userFile); $this->fileHandler->DeleteFile($userFile); @@ -762,17 +750,17 @@ private function DeleteModuleObjects($path, $exclusiveSwitch=true) { $categoryID = IPSUtil_ObjectIDByPath($path, true); if ($categoryID===false) { $this->logHandler->Debug('Path '.$path.' not found...'); - return; + return; } $this->logHandler->Log('Delete Objects in Category='.$path.', ID='.$categoryID); - DeleteCategory($categoryID); + DeleteObject($categoryID); } } private function DeleteWFCItems($wfcItemPrefix, $exclusiveSwitch=true) { - if ($wfcItemPrefix <> '' and $exclusiveSwitch) { - $wfcConfigID = $this->GetConfigValueIntDef('ID', 'WFC10', GetWFCIdDefault()); + if ($wfcItemPrefix <> '' and $exclusiveSwitch) { + $wfcConfigID = $this->GetConfigValueIntDef('ID', 'WFC10', GetWFCIdDefault()); $this->logHandler->Log('Delete WFC Items with Prefix='.$wfcItemPrefix); DeleteWFCItems($wfcConfigID, $wfcItemPrefix); ReloadAllWebFronts(); @@ -792,42 +780,44 @@ private function DeleteWFCItems($wfcItemPrefix, $exclusiveSwitch=true) { * */ public function DeleteModule() { - if ($this->moduleName=='IPSModuleManager') { + $this->versionHandler->SetVersionDeleting(); + + if ($this->moduleName=='IPSModuleManager') { throw new Exception('Deinstallation of IPSModuleManager currenty NOT supported !!!'); - $this->DeleteModuleObjects('Program.IPSLibrary.install'); - $this->DeleteModuleObjects('Program.IPSLibrary.app.core.IPSUtils'); - $this->DeleteModuleObjects('Program.IPSLibrary.app.core.IPSConfigHandler'); - } else { - if ($this->moduleConfigHandler->GetValueDef('TabItem', 'WFC10', '') <> '') { - $this->DeleteWFCItems($this->moduleConfigHandler->GetValueDef('TabPaneItem', 'WFC10', '').$this->moduleConfigHandler->GetValueDef('TabItem', 'WFC10', '')); - } + $this->DeleteModuleObjects('Program.IPSLibrary.install'); + $this->DeleteModuleObjects('Program.IPSLibrary.app.core.IPSUtils'); + $this->DeleteModuleObjects('Program.IPSLibrary.app.core.IPSConfigHandler'); + } else { + if ($this->moduleConfigHandler->GetValueDef('TabItem', 'WFC10', '') <> '') { + $this->DeleteWFCItems($this->moduleConfigHandler->GetValueDef('TabPaneItem', 'WFC10', '').$this->moduleConfigHandler->GetValueDef('TabItem', 'WFC10', '')); + } for ($idx=1;$idx<=10;$idx++) { - if ($this->moduleConfigHandler->GetValueDef('TabItem'.$idx, 'WFC10', '') <> '') { - $this->DeleteWFCItems($this->moduleConfigHandler->GetValueDef('TabPaneItem', 'WFC10', '').$this->moduleConfigHandler->GetValueDef('TabItem'.$idx, 'WFC10', '')); + if ($this->moduleConfigHandler->GetValueDef('TabItem'.$idx, 'WFC10', '') <> '') { + $this->DeleteWFCItems($this->moduleConfigHandler->GetValueDef('TabPaneItem', 'WFC10', '').$this->moduleConfigHandler->GetValueDef('TabItem'.$idx, 'WFC10', '')); } } - $this->DeleteWFCItems($this->moduleConfigHandler->GetValueDef('TabPaneItem', 'WFC10', ''), + $this->DeleteWFCItems($this->moduleConfigHandler->GetValueDef('TabPaneItem', 'WFC10', ''), $this->moduleConfigHandler->GetValueBoolDef('TabPaneExclusive', 'WFC10', false)); $namespace = $this->fileConfigHandler->GetValue(IPSConfigHandler::MODULENAMESPACE); - $this->DeleteModuleObjects($this->GetModuleCategoryPath('app')); - $this->DeleteModuleObjects($this->GetModuleCategoryPath('data')); - $this->DeleteModuleObjects($this->GetModuleCategoryPath('config')); - $this->DeleteModuleObjects($this->moduleConfigHandler->GetValueDef('Path', 'WFC10', '')); - $this->DeleteModuleObjects($this->moduleConfigHandler->GetValueDef('Path', 'Mobile', ''), + $this->DeleteModuleObjects($this->GetModuleCategoryPath('app')); + $this->DeleteModuleObjects($this->GetModuleCategoryPath('data')); + $this->DeleteModuleObjects($this->GetModuleCategoryPath('config')); + $this->DeleteModuleObjects($this->moduleConfigHandler->GetValueDef('Path', 'WFC10', '')); + $this->DeleteModuleObjects($this->moduleConfigHandler->GetValueDef('Path', 'Mobile', ''), $this->moduleConfigHandler->GetValueBoolDef('PathExclusive', 'Mobile', false)); - $this->DeleteModuleObjects($this->moduleConfigHandler->GetValueDef('Path', 'Mobile', '').'.'.$this->moduleConfigHandler->GetValueDef('Name', 'Mobile', '')); + $this->DeleteModuleObjects($this->moduleConfigHandler->GetValueDef('Path', 'Mobile', '').'.'.$this->moduleConfigHandler->GetValueDef('Name', 'Mobile', '')); for ($idx=1;$idx<=10;$idx++) { - $this->DeleteModuleObjects($this->moduleConfigHandler->GetValueDef('Path', 'Mobile', '').'.'.$this->moduleConfigHandler->GetValueDef('Name'.$idx, 'Mobile', '')); + $this->DeleteModuleObjects($this->moduleConfigHandler->GetValueDef('Path', 'Mobile', '').'.'.$this->moduleConfigHandler->GetValueDef('Name'.$idx, 'Mobile', '')); } } $deinstallationScriptName = $this->GetModuleDeinstallationScript(); if (file_exists($deinstallationScriptName)) { - $this->logHandler->Log('Execute Deinstallation Script '.$deinstallationScriptName); - include_once $deinstallationScriptName; - } + $this->logHandler->Log('Execute Deinstallation Script '.$deinstallationScriptName); + include_once $deinstallationScriptName; + } $this->DeleteModuleFiles('DefaultFiles', 'App'); $this->DeleteModuleFiles('ScriptFiles', 'App'); @@ -856,7 +846,7 @@ public function DeleteModule() { * @param string $sourceRepository Pfad/Url zum Source Repository, das zum Speichern verwendet werden soll */ private function DeployModuleFiles($fileKey, $fileTypeSection, $sourceRepository) { - $backupDirectory = $this->managerConfigHandler->GetValueDef('DeployBackupDirectory', '', IPS_GetKernelDir().'backup\\IPSLibrary_Deploy\\'); + $backupDirectory = $this->managerConfigHandler->GetValueDef('DeployBackupDirectory', '', IPS_GetKernelDir().'backup\\IPSLibrary_Deploy\\'); $backupHandler = new IPSBackupHandler($backupDirectory); $localList = $this->GetScriptList($fileKey, $fileTypeSection, IPS_GetKernelDir().'scripts\\'); @@ -875,13 +865,20 @@ private function DeployModuleFiles($fileKey, $fileTypeSection, $sourceRepository * Exportiert einkomplettes Module zu einem Ziel Verzeichnis * * @param string $sourceRepository Pfad/Url zum Source Repository, das zum Speichern verwendet werden soll + * @param string $changeText Text der für die ChangeList verwendet werden soll + * @param boolean $installationRequired Installation durch Änderung notwendig */ - public function DeployModule($sourceRepository='') { - if ($sourceRepository=='') { + public function DeployModule($sourceRepository='', $changeText='', $installationRequired=false) { + if ($sourceRepository=='') { $sourceRepository = $this->sourceRepository; } - $sourceRepository = IPSFileHandler::AddTrailingPathDelimiter($sourceRepository); + $sourceRepository = IPSFileHandler::AddTrailingPathDelimiter($sourceRepository); + $this->logHandler->Log('Start Deploy of Module "'.$this->moduleName.'"'); + if ($changeText<>'') { + $this->versionHandler->IncreaseModuleVersion($changeText, $installationRequired); + } + $this->DeployModuleFiles('DownloadFiles','Install', $sourceRepository); $this->DeployModuleFiles('DefaultFiles', 'App', $sourceRepository); @@ -898,6 +895,8 @@ public function DeployModule($sourceRepository='') { $this->DeployModuleFiles('ScriptFiles', 'WebFront', $sourceRepository); $this->DeployModuleFiles('ExampleFiles', 'WebFront', $sourceRepository); + + $this->logHandler->Log('Finished Deploy of Module "'.$this->moduleName.'"'); } /** @@ -908,10 +907,10 @@ public function DeployModule($sourceRepository='') { * @param string $sourceRepository Pfad/Url zum Source Repository, das zum Speichern verwendet werden soll */ public function DeployAllModules($sourceRepository='') { - if ($sourceRepository=='') { + if ($sourceRepository=='') { $sourceRepository = $this->sourceRepository; } - $moduleList = $this->versionHandler->GetInstalledModules(); + $moduleList = $this->versionHandler->GetInstalledModules(); foreach ($moduleList as $module=>$version) { $moduleManager = new IPSModuleManager($module, $sourceRepository); $moduleManager->DeployModule(); diff --git a/IPSLibrary/install/IPSModuleManager/IPSVersionHandler/IPSFileVersionHandler.class.php b/IPSLibrary/install/IPSModuleManager/IPSVersionHandler/IPSFileVersionHandler.class.php index 52c7c6c..37ca95c 100644 --- a/IPSLibrary/install/IPSModuleManager/IPSVersionHandler/IPSFileVersionHandler.class.php +++ b/IPSLibrary/install/IPSModuleManager/IPSVersionHandler/IPSFileVersionHandler.class.php @@ -20,13 +20,28 @@ */ class IPSFileVersionHandler extends IPSVersionHandler { - const FILE_INSTALLED_MODULES = 'IPSLibrary\\config\\InstalledModules.ini'; + const FILE_INSTALLED_MODULES = 'IPSLibrary\\config\\InstalledModules.ini'; + const FILE_AVAILABLE_MODULES = 'IPSLibrary\\config\\AvailableModules.ini'; + const FILE_KNOWN_MODULES = 'IPSLibrary\\config\\KnownModules.ini'; + const FILE_KNOWN_REPOSITORIES = 'IPSLibrary\\config\\KnownRepositories.ini'; + const FILE_KNOWN_USERREPOSITORIES = 'IPSLibrary\\config\\KnownUserRepositories.ini'; + const FILE_REPOSITORY_VERSIONS = 'IPSLibrary\\config\\RepositoryVersions.ini'; + const FILE_CHANGELIST = 'IPSLibrary\\config\\ChangeList.ini'; + const FILE_REQUIRED_MODULES = 'IPSLibrary\\config\\RequiredModules.ini'; + const FILE_DOWNLOADLIST_PATH = "IPSLibrary\\install\\DownloadListFiles\\"; + const FILE_DOWNLOADLIST_SUFFIX = '_FileList.ini'; - private $fileName; - private $moduleList; + private $fileNameAvailableModules; + private $fileNameInstalledModules; + private $fileNameKnownModules; + private $fileNameKnownRepositories; + private $fileNameRepositoryVersions; + private $fileNameChangeList; + private $fileNameRequiredModules; + private $fileNameDownloadList; /** - * @public + * @public * * Initialisierung des IPSFileVersionHandler * @@ -37,209 +52,265 @@ public function __construct($moduleName) { die("ModuleName must have a Value!"); } parent::__construct($moduleName); - $this->fileName = IPS_GetKernelDir().'scripts\\'.$this::FILE_INSTALLED_MODULES; + $this->fileNameInstalledModules = IPS_GetKernelDir().'scripts\\'.$this::FILE_INSTALLED_MODULES; + $this->fileNameAvailableModules = IPS_GetKernelDir().'scripts\\'.$this::FILE_AVAILABLE_MODULES; + $this->fileNameKnownModules = IPS_GetKernelDir().'scripts\\'.$this::FILE_KNOWN_MODULES; + $this->fileNameKnownRepositories = IPS_GetKernelDir().'scripts\\'.$this::FILE_KNOWN_REPOSITORIES; + $this->fileNameKnownUserRepositories = IPS_GetKernelDir().'scripts\\'.$this::FILE_KNOWN_USERREPOSITORIES; + $this->fileNameRepositoryVersions = IPS_GetKernelDir().'scripts\\'.$this::FILE_REPOSITORY_VERSIONS; + $this->fileNameChangeList = IPS_GetKernelDir().'scripts\\'.$this::FILE_CHANGELIST; + $this->fileNameRequiredModules = IPS_GetKernelDir().'scripts\\'.$this::FILE_REQUIRED_MODULES; + $this->fileNameDownloadList = IPS_GetKernelDir().'scripts\\'.$this::FILE_DOWNLOADLIST_PATH.$moduleName.$this::FILE_DOWNLOADLIST_SUFFIX; + + $this->ReloadVersionData(); + } - $this->LoadVersionFile(); - if (!array_key_exists($moduleName, $this->moduleList)) { - $this->moduleList[$moduleName] = ''; + public function ReloadVersionData() { + $this->LoadFileInstalledModules(); + $this->LoadFileKnownRepositories(); + $this->LoadFileKnownModules(); + $this->LoadFileRepositoryVersions(); + $this->LoadFileChangeList(); + $this->LoadFileRequiredModules(); + + if (!array_key_exists($this->moduleName, $this->installedModules)) { + $this->installedModules[$this->moduleName] = ''; } - } - private function LoadVersionFile() { - if (file_exists($this->fileName)) { - $fileContent = file_get_contents($this->fileName); - $lines = explode(PHP_EOL, $fileContent); - foreach ($lines as $line) { - $content = explode('=', $line); - if (count($content)>0) { - $this->moduleList[$content[0]] = $content[1]; - } - } - - } else { - $this->moduleList = array(); + private function LoadFileRequiredModules() { + if (file_exists($this->fileNameRequiredModules)) { + $this->requiredModules = parse_ini_file($this->fileNameRequiredModules, true); } } - private function WriteVersionFile() { - $fileContent = ''; - foreach ($this->moduleList as $moduleName=>$moduleVersion) { - if ($fileContent <> '') { - $fileContent .= PHP_EOL; - } - $fileContent .= $moduleName.'='.$moduleVersion; + private function LoadFileChangeList() { + if (file_exists($this->fileNameChangeList)) { + $this->changeList = parse_ini_file($this->fileNameChangeList, true); } - file_put_contents($this->fileName, $fileContent); } - private function VersionToArray($moduleVersion) { - if ($moduleVersion=='') { - $moduleVersion = IPS_GetKernelVersion(); + private function LoadFileKnownModules() { + if (file_exists($this->fileNameKnownModules)) { + $this->knownModules = parse_ini_file($this->fileNameKnownModules, true); } - $moduleVersionArray = explode('.', $moduleVersion); - $moduleVersionArray = array_pad($moduleVersionArray, 3, 0); - $moduleVersionArray = array_pad($moduleVersionArray, 5, ''); - return $moduleVersionArray; } - /** - * @public - * - * Lesen der aktuellen Module Version - * - * @return string Liefert die aktuelle Module Version - */ - public function GetModuleVersion() { - if ($this->moduleName == $this::MODULE_IPS) { - $moduleVersion=IPS_GetKernelVersion(); - } else { - $moduleVersion=$this->moduleList[$this->moduleName]; - } - return $moduleVersion; + private function LoadFileKnownRepositories() { + if (!file_exists($this->fileNameKnownRepositories)) { + die('KnownModules.ini does NOT exists!'); + } elseif (file_exists($this->fileNameKnownUserRepositories)) { + $this->knownRepositories = parse_ini_file($this->fileNameKnownUserRepositories, true); + } else { + $this->knownRepositories = parse_ini_file($this->fileNameKnownRepositories, true); + } } - /** - * @public - * - * Lesen der aktuellen Module Version - * - * @return string Liefert die aktuelle Module Version as Array - */ - public function GetModuleVersionArray() { - return $this->VersionToArray($this->GetModuleVersion()); + private function LoadFileRepositoryVersions() { + if (file_exists($this->fileNameRepositoryVersions)) { + $this->repositoryVersions = parse_ini_file($this->fileNameRepositoryVersions, true); + } } - /** - * @public - * - * Überprüft die Version eines Modules mit dem Namen $moduleName and erzeugt einen Fehler, wenn - * die installierte Version < der übergebenen Version ist. - * - * Examples: - * installed=2.5.3, required=2.5.3 --> OK - * installed=2.5.3, required=2.5.2 --> OK - * installed=2.5.3, required=2.4.4 --> OK - * installed=2.4.3, required=2.5.2 --> Error - * installed=2.5.1, required=2.5.2 --> Error - * - * @param string $moduleName Name des Modules, das überprüft werden soll - * @param string $moduleVersion Version des Modules - * @throws IPSVersionHandlerException wenn Version nicht korrekt ist - */ - public function CheckModuleVersion($moduleName, $moduleVersion) { - $versionHandler = new IPSFileVersionHandler($moduleName); - $versionInstalled = $versionHandler->GetModuleVersionArray(); - $versionRequired = $this->VersionToArray($moduleVersion); - - if ($versionRequired[0] > $versionInstalled[0] or - $versionRequired[1] > $versionInstalled[1] or - $versionRequired[2] > $versionInstalled[2]) { - throw new IPSVersionHandlerException('Versions Fehler:'.PHP_EOL - .'========================================================================'.PHP_EOL - .'=== Modul '.$moduleName.' ist veraltet und benötigt ein Update'.PHP_EOL - .'=== Aktuelle Version: '.$versionHandler->GetModuleVersion().PHP_EOL - .'=== Benötigte Version: '.$moduleVersion.PHP_EOL - .'========================================================================'.PHP_EOL - ); + private function LoadFileInstalledModules() { + if (file_exists($this->fileNameInstalledModules)) { + $fileContent = file_get_contents($this->fileNameInstalledModules); + $lines = explode(PHP_EOL, $fileContent); + foreach ($lines as $line) { + $content = explode('=', $line); + if (count($content)>0) { + $this->installedModules[$content[0]] = $content[1]; + } + } + } else { + $this->installedModules = array(); } } - /** - * @public - * - * Überprüft ob ein Module in der spezifizierten Version installiert ist. - * - * @param string $moduleVersion Version des Modules (Format IPSMajorVersion.IPSMinorVersion.ModuleVersion.ModuleStatus.InstallationStatus) - * @return boolean Liefert true wenn Module installiert, andernfalls false - */ - public function IsVersionInstalled($moduleVersion) { - $versionInstalled = $this->GetModuleVersionArray(); - $versionRequired = $this->VersionToArray($moduleVersion); - - $result = ($versionRequired[0] == $versionInstalled[0] and - $versionRequired[1] == $versionInstalled[1] and - $versionRequired[2] == $versionInstalled[2]); - - return $result; - } - - /** - * @public - * - * Löschen eines Modules - */ - public function DeleteModule() { - $this->logHandler->Log('Remove Module '.$this->moduleName.' from Versioning System'); - unset($this->moduleList[$this->moduleName]); - $this->WriteVersionFile(); + private function WriteFileInstalledModules() { + $fileContent = ''; + foreach ($this->installedModules as $moduleName=>$moduleVersion) { + if ($fileContent <> '') { + $fileContent .= PHP_EOL; + } + $fileContent .= $moduleName.'='.$moduleVersion; + } + file_put_contents($this->fileNameInstalledModules, $fileContent); } /** * @public * - * Schreiben der aktuellen Module Version + * Speicherung der Versions Daten * - * @param string $moduleVersion Name des Modules + * @param string $moduleName Name des Modules */ - public function SetModuleVersion($moduleVersion) { - $this->logHandler->Log('Set Version '.$this->moduleName.'='.$moduleVersion); - $this->moduleList[$this->moduleName] = $moduleVersion; - $this->WriteVersionFile(); + protected function StoreModuleVersions() { + $this->WriteFileInstalledModules(); } /** * @public * - * Aktuelle Module Version auf "Loading" setzen + * Erzeugt das File KnownModules */ - public function SetModuleVersionLoading() { - $moduleVersionArray = $this->GetModuleVersionArray(); - $moduleVersionArray[4] = $this::VERSION_LOADING; - $moduleVersion = implode('.',$moduleVersionArray); - $this->SetModuleVersion($moduleVersion); - } + public function BuildKnownModules() { + $knownRepositories = $this->GetKnownRepositories(); + $knownModules = array(); + $repositoryVersions = array(); + $changeList = array(); + $requiredModules = array(); + foreach ($knownRepositories as $repositoryIdx=>$repository) { + echo 'Process Repsoitory '.$repository.PHP_EOL; + $fileHandler = new IPSFileHandler(); + $repository = IPSFileHandler::AddTrailingPathDelimiter($repository); + $localAvailableModuleList = sys_get_temp_dir().'\\AvailableModules.ini'; + $repositoryAvailableModuleList = $repository.'IPSLibrary\\config\\AvailableModules.ini'; + $fileHandler->CopyFiles(array($repositoryAvailableModuleList), array($localAvailableModuleList)); - /** - * @public - * - * Aktuelle Module Version auf "Loaded" setzen - */ - public function SetModuleVersionLoaded() { - $moduleVersionArray = $this->GetModuleVersionArray(); - $moduleVersionArray[4] = $this::VERSION_LOADED; - $moduleVersion = implode('.',$moduleVersionArray); - $this->SetModuleVersion($moduleVersion); - } + $availableModules = parse_ini_file($localAvailableModuleList, true); + foreach ($availableModules as $moduleName=>$moduleData) { + $moduleProperties = explode('|',$moduleData); + $modulePath = $moduleProperties[0]; + $moduleDescription = ''; + if (array_key_exists(1, $moduleProperties)) { + $moduleDescription = $moduleProperties[1]; + } + + $localDownloadIniFile = sys_get_temp_dir().'\\DownloadListfile.ini'; + $repositoryDownloadIniFile = $repository.'IPSLibrary\\install\\DownloadListFiles\\'.$moduleName.'_FileList.ini'; + $result = $fileHandler->CopyFiles(array($repositoryDownloadIniFile), array($localDownloadIniFile), false); + if ($result===false) { + echo ' '.$moduleName.'could NOT be found in '.$repository.PHP_EOL; + } else { + echo ' Processing '.$moduleName.' in '.$repository.PHP_EOL; + $configHandler = new IPSIniConfigHandler($localDownloadIniFile); + $availableVersion = $configHandler->GetValue(IPSConfigHandler::SCRIPTVERSION); + $changeListModule = $configHandler->GetValueDef(IPSConfigHandler::CHANGELIST, null, array()); + $requiredModulesOfModule = $configHandler->GetValueDef(IPSConfigHandler::REQUIREDMODULES, null, array()); - /** - * @public - * - * Aktuelle Module Version auf "Installing" setzen - */ - public function SetModuleVersionInstalling() { - $moduleVersionArray = $this->GetModuleVersionArray(); - $moduleVersionArray[4] = $this::VERSION_INSTALLING; - $moduleVersion = implode('.',$moduleVersionArray); - $this->SetModuleVersion($moduleVersion); - } + $replaceModule = false; + if (!array_key_exists($moduleName, $knownModules)) { + $replaceModule = true; + } elseif ($versionHandler->CompareVersionsNewer($knownModules[$moduleName]['Version'], $availableVersion)) { + $replaceModule = true; + } elseif ($versionHandler->CompareVersionsEqual($knownModules[$moduleName]['Version'], $availableVersion) + and $versionHandler->IsModuleInstalled($moduleName)) { + $versionHandler = new IPSFileVersionHandler($moduleName); + if ($versionHandler->GetModuleRepository()==$repository) { + $replaceModule = true; + } + } else { + } + + if ($replaceModule) { + $knownModules[$moduleName]['Version'] = $availableVersion; + $knownModules[$moduleName]['Repository'] = $repository; + $knownModules[$moduleName]['Description'] = $moduleDescription; + $knownModules[$moduleName]['Path'] = $modulePath; + if ($this->IsModuleInstalled($moduleName)) { + $versionHandler = new IPSFileVersionHandler($moduleName); + } + $knownModules[$moduleName]['LastRepository'] = $versionHandler->GetModuleRepository(); + $changeList[$moduleName] = $changeListModule; + $requiredModules[$moduleName] = $requiredModulesOfModule; + } + $repositoryVersions[$moduleName][$repository] = $availableVersion; + } + } + + } + + $fileContent = ''; + foreach ($knownModules as $moduleName=>$moduleData) { + $fileContent .= '['.$moduleName.']'.PHP_EOL; + foreach ($moduleData as $property=>$value) { + // "//192.168..." not handled correct in case of usage "" + if ($property=='Repository') { + $fileContent .= $property.'='.$value.''.PHP_EOL; + } else { + $fileContent .= $property.'="'.$value.'"'.PHP_EOL; + } + } + } + file_put_contents($this->fileNameKnownModules, $fileContent); + $fileContent = ''; + foreach ($repositoryVersions as $moduleName=>$moduleData) { + $fileContent .= '['.$moduleName.']'.PHP_EOL; + foreach ($moduleData as $property=>$value) { + $fileContent .= $property.'="'.$value.'"'.PHP_EOL; + } + } + file_put_contents($this->fileNameRepositoryVersions, $fileContent); + + $fileContent = ''; + foreach ($changeList as $moduleName=>$moduleData) { + $fileContent .= '['.$moduleName.']'.PHP_EOL; + foreach ($moduleData as $property=>$value) { + $fileContent .= $property.'="'.$value.'"'.PHP_EOL; + } + } + file_put_contents($this->fileNameChangeList, $fileContent); + + $fileContent = ''; + foreach ($requiredModules as $moduleName=>$moduleData) { + $fileContent .= '['.$moduleName.']'.PHP_EOL; + foreach ($moduleData as $property=>$value) { + $fileContent .= $property.'="'.$value.'"'.PHP_EOL; + } + } + file_put_contents($this->fileNameRequiredModules, $fileContent); + + $this->LoadFileKnownModules(); + $this->LoadFileRepositoryVersions(); + $this->LoadFileChangeList(); + $this->LoadFileRequiredModules(); + } + /** * @public * - * Liefert eine Liste aller installierten Module - * - * @return string[] Liste der installierten Module + * Erhöht die Versionsnummer im entsprechenden Download File und legt den übergebenen Text + * unter der ChangeList des Modules ab. + * */ - public function GetInstalledModules() { - $result = array(); - foreach ($this->moduleList as $moduleName=>$moduleVersion) { - $result[$moduleName] = $moduleVersion; + public function IncreaseModuleVersion($changeText, $installationRequired=false) { + $file = parse_ini_file($this->fileNameDownloadList, true); + $version = $file['Version']; + $version = $this->VersionToArray($version); + $version[2] = (int)$version[2] + 1; + unset($version[4]); + if ($version[3]=='') { + unset($version[3]); } - return $result; - } - + $version = implode('.',$version); + $file['Version'] = $version; + if ($installationRequired) { + $file['InstallVersion'] = $version; + } + $file['ChangeList'][$version] = $changeText; + + $fileContent = ''; + foreach ($file as $section=>$sectionValue) { + if ($section=='Version' or $section=='InstallVersion' or $section=='ModuleNamespace') { + $fileContent .= $section.'="'.$sectionValue.'"'.PHP_EOL; + } else { + $fileContent .= '['.$section.']'.PHP_EOL; + foreach ($sectionValue as $property=>$value) { + if ($section=='ChangeList' or $section=='RequiredModules') { + $fileContent .= $property.'="'.$value.'"'.PHP_EOL; + } else { + foreach ($value as $key=>$data) { + $fileContent .= $property.'[]="'.$data.'"'.PHP_EOL; + } + } + } + } + } + file_put_contents($this->fileNameDownloadList, $fileContent); + } } /** @}*/ diff --git a/IPSLibrary/install/IPSModuleManager/IPSVersionHandler/IPSVersionHandler.class.php b/IPSLibrary/install/IPSModuleManager/IPSVersionHandler/IPSVersionHandler.class.php index c8cc2d2..8cdcd56 100644 --- a/IPSLibrary/install/IPSModuleManager/IPSVersionHandler/IPSVersionHandler.class.php +++ b/IPSLibrary/install/IPSModuleManager/IPSVersionHandler/IPSVersionHandler.class.php @@ -31,13 +31,26 @@ class IPSVersionHandlerException extends Exception { abstract class IPSVersionHandler{ protected $moduleName = ""; protected $logHandler = null; - - const FILE_AVAILABLE_MODULES = 'IPSLibrary\\config\\AvailableModules.ini'; + protected $installedModules; + protected $knownRepositories; + protected $knownModules; + protected $repositoryVersions; + protected $changeList; + protected $requiredModules; + + const MODULE_IPS = 'IPS'; - const MODULE_IPS = 'IPS'; - const VERSION_LOADING = 'Loading'; - const VERSION_LOADED = 'Loaded'; - const VERSION_INSTALLING = 'Installing'; + const STATE_LOADING = 'Loading'; + const STATE_LOADED = 'Loaded'; + const STATE_INSTALLING = 'Installing'; + const STATE_DELETING = 'Deleting'; + const STATE_INSTALLED = 'OK'; + + const PROPERTY_VERSION = 0; + const PROPERTY_SCRIPTVERSION = 1; + const PROPERTY_INSTALLVERSION = 2; + const PROPERTY_STATE = 3; + const PROPERTY_REPOSITORY = 4; /** * @public @@ -49,25 +62,162 @@ abstract class IPSVersionHandler{ public function __construct($moduleName) { $this->moduleName = $moduleName; $this->logHandler = IPSLogHandler::GetLogger(get_class($this)); + $this->installedModules = array(); + $this->knownRepositories = array(); + $this->knownModules = array(); + $this->repositoryVersions = array(); + $this->changeList = array(); + $this->requiredModules = array(); } /** * @public * - * Lesen der aktuellen Module Version + * Speicherung der Versions Daten * - * @return string Liefert die aktuelle Module Version + * @param string $moduleName Name des Modules */ - abstract public function GetModuleVersion(); + abstract protected function StoreModuleVersions(); /** * @public * - * Lesen der aktuellen Module Version + * Versions Daten neu laden + */ + abstract public function ReloadVersionData(); + + /** + * @public + * + * Erzeugt das File KnownModules + */ + abstract public function BuildKnownModules(); + + /** + * @public * - * @return string Liefert die aktuelle Module Version as Array zurück + * Erhöht die Versionsnummer im entsprechenden Download File und legt den übergebenen Text + * unter der ChangeList des Modules ab. + * */ - abstract public function GetModuleVersionArray(); + abstract public function IncreaseModuleVersion($changeText); + + protected function VersionToArray($moduleVersion) { + if ($moduleVersion=='') { + $moduleVersion = IPS_GetKernelVersion(); + } + $moduleVersionArray = explode('.', $moduleVersion); + $moduleVersionArray = array_pad($moduleVersionArray, 3, 0); + $moduleVersionArray = array_pad($moduleVersionArray, 5, ''); + + return $moduleVersionArray; + } + + protected function ArrayToVersion($moduleVersion) { + unset($moduleVersion[4]); + if ($moduleVersion[3]=='') { + unset($moduleVersion[3]); + } + $moduleVersion = implode('.',$moduleVersion); + + return $moduleVersion; + } + + private function GetProperty($property, $moduleName='') { + if ($moduleName=='') { + $moduleName = $this->moduleName; + } + $propertyList = explode('|', $this->installedModules[$moduleName]); + $propertyList = array_pad($propertyList, 5, ''); + + return $propertyList[$property]; + } + + private function SetProperty($property, $value) { + $propertyList = explode('|', $this->installedModules[$this->moduleName]); + $propertyList = array_pad($propertyList, 5, ''); + + $propertyList[$property] = $value; + + $this->installedModules[$this->moduleName] = implode('|', $propertyList); + $this->StoreModuleVersions(); + } + + /** + * @public + * + * Lesen der aktuellen Install Version + * + * @return string Install Version + */ + public function GetInstallVersion() { + $moduleVersion = $this->GetProperty($this::PROPERTY_INSTALLVERSION); + if ($moduleVersion=='') { + $moduleVersion = $this->GetProperty($this::PROPERTY_VERSION); + } + $moduleVersion = $this->VersionToArray($moduleVersion); + $moduleVersion = $this->ArrayToVersion($moduleVersion); + + return $moduleVersion; + } + + + /** + * @public + * + * Lesen der aktuellen Version eines Modules + * + * @param string $moduleName Name des Modules, das überprüft werden soll + * @return string Version + */ + public function GetVersion($moduleName) { + $moduleVersion = $this->GetProperty($this::PROPERTY_SCRIPTVERSION, $moduleName); + if ($moduleVersion=='') { + $moduleVersion = $this->GetProperty($this::PROPERTY_VERSION, $moduleName); + } + $moduleVersion = $this->VersionToArray($moduleVersion); + $moduleVersion = $this->ArrayToVersion($moduleVersion); + + return $moduleVersion; + } + + /** + * @public + * + * Lesen der aktuellen Install Version + * + * @return string Install Version + */ + public function GetScriptVersion() { + $moduleVersion = $this->GetProperty($this::PROPERTY_SCRIPTVERSION); + if ($moduleVersion=='') { + $moduleVersion = $this->GetProperty($this::PROPERTY_VERSION); + } + $moduleVersion = $this->VersionToArray($moduleVersion); + $moduleVersion = $this->ArrayToVersion($moduleVersion); + + return $moduleVersion; + } + + /** + * @public + * + * Lesen des aktuellen Modul Status + * + * @return string Liefert Modul Status + */ + public function GetModuleState() { + $state = $this->GetProperty($this::PROPERTY_STATE); + if ($state=='') { + $moduleVersion = $this->GetProperty($this::PROPERTY_VERSION); + $moduleVersion = $this->VersionToArray($moduleVersion); + $state = $moduleVersion[4]; + if ($state == '') { + $state = $this::STATE_INSTALLED; + } + } + return $state; + } /** * @public @@ -86,7 +236,100 @@ abstract public function GetModuleVersionArray(); * @param string $moduleVersion Version des Modules * @throws IPSVersionHandlerException wenn Version nicht korrekt ist */ - abstract public function CheckModuleVersion($moduleName, $moduleVersion); + public function CheckModuleVersion($moduleName, $moduleVersion) { + $versionHandler = new IPSFileVersionHandler($moduleName); + $versionInstalled = $versionHandler->GetInstallVersion(); + $versionInstalled = $this->VersionToArray($versionInstalled); + $versionRequired = $this->VersionToArray($moduleVersion); + + if ( ( $versionRequired[0] > $versionInstalled[0]) + or ( $versionRequired[0] == $versionInstalled[0] + and $versionRequired[1] > $versionInstalled[1]) + or ( $versionRequired[0] == $versionInstalled[0] + and $versionRequired[1] == $versionInstalled[1] + and $versionRequired[2] > $versionInstalled[2]) + ) { + throw new IPSVersionHandlerException('Versions Fehler:'.PHP_EOL + .'========================================================================'.PHP_EOL + .'=== Modul '.$moduleName.' ist veraltet und benötigt ein Update'.PHP_EOL + .'=== Aktuelle Version: '.$versionHandler->GetScriptVersion().PHP_EOL + .'=== Benötigte Version: '.$moduleVersion.PHP_EOL + .'========================================================================'.PHP_EOL + ); + } + } + + /** + * @public + * + * Überprüft ob die installierte Version eines Modules < der übergebenen Version ist. + * + * Examples: + * installed=2.5.3, required=2.5.3 --> OK + * installed=2.5.3, required=2.5.2 --> OK + * installed=2.5.3, required=2.4.4 --> OK + * installed=2.4.3, required=2.5.2 --> Newer + * installed=2.5.1, required=2.5.2 --> Newer + * + * @param string $moduleName Name des Modules, das überprüft werden soll + * @param string $moduleVersion Version des Modules + * @return boolean Übergebene Version ist neuer oder nicht + */ + public function IsVersionNewer($moduleName, $moduleVersion) { + $versionHandler = new IPSFileVersionHandler($moduleName); + $versionInstalled = $versionHandler->GetScriptVersion(); + $versionInstalled = $this->VersionToArray($versionInstalled); + $versionRequired = $this->VersionToArray($moduleVersion); + + return ( ( $versionRequired[0] > $versionInstalled[0]) + or ( $versionRequired[0] == $versionInstalled[0] + and $versionRequired[1] > $versionInstalled[1]) + or ( $versionRequired[0] == $versionInstalled[0] + and $versionRequired[1] == $versionInstalled[1] + and $versionRequired[2] > $versionInstalled[2]) + ); + } + + /** + * @public + * + * Vergleicht 2 Versionsnummern und überprüft ob die 2. übergebene Version neuer ist als die 1. + * + * @param string $moduleVersion1 Version 1 des Modules + * @param string $moduleVersion2 Version 2 des Modules + * @return boolean Übergebene Version ist neuer oder nicht + */ + public function CompareVersionsNewer($moduleVersion1, $moduleVersion2) { + $moduleVersion1 = $this->VersionToArray($moduleVersion1); + $moduleVersion2 = $this->VersionToArray($moduleVersion2); + + return ( ( $moduleVersion2[0] > $moduleVersion1[0]) + or ( $moduleVersion2[0] == $moduleVersion1[0] + and $moduleVersion2[1] > $moduleVersion1[1]) + or ( $moduleVersion2[0] == $moduleVersion1[0] + and $moduleVersion2[1] == $moduleVersion1[1] + and $moduleVersion2[2] > $moduleVersion1[2]) + ); + } + + /** + * @public + * + * Vergleicht 2 Versionsnummern und überprüft ob die 2. übergebene Version gleich der 1. + * + * @param string $moduleVersion1 Version 1 des Modules + * @param string $moduleVersion2 Version 2 des Modules + * @return boolean Übergebene Version ist neuer oder nicht + */ + public function CompareVersionsEqual($moduleVersion1, $moduleVersion2) { + $moduleVersion1 = $this->VersionToArray($moduleVersion1); + $moduleVersion2 = $this->VersionToArray($moduleVersion2); + + return ($moduleVersion1[0] == $moduleVersion2[0] or + $moduleVersion1[1] == $moduleVersion2[1] or + $moduleVersion1[2] == $moduleVersion2[2]); + } + /** * @public @@ -96,37 +339,131 @@ abstract public function CheckModuleVersion($moduleName, $moduleVersion); * @param string $moduleVersion Version des Modules (Format IPSMajorVersion.IPSMinorVersion.ModuleVersion.ModuleStatus.InstallationStatus) * @return boolean Liefert true wenn Module installiert, andernfalls false */ - abstract public function IsVersionInstalled($moduleVersion); + public function IsVersionInstalled($moduleVersion) { + $versionInstalled = $this->GetInstallVersion(); + $versionInstalled = $this->VersionToArray($versionInstalled); + $versionRequired = $this->VersionToArray($moduleVersion); + $result = ($versionRequired[0] == $versionInstalled[0] and + $versionRequired[1] == $versionInstalled[1] and + $versionRequired[2] == $versionInstalled[2]); + + return $result; + } + /** * @public * - * Schreiben der aktuellen Module Version + * Überprüft ob ein Module in der spezifizierten Version installiert ist. * - * @param string $moduleVersion Version des Modules + * @param string $moduleVersion Version des Modules (Format IPSMajorVersion.IPSMinorVersion.ModuleVersion.ModuleStatus.InstallationStatus) + * @return boolean Liefert true wenn Module installiert, andernfalls false + */ + public function IsModuleInstalled($module) { + $result = array_key_exists($module, $this->installedModules); + return $result; + } + + /** + * @public + * + * Löschen eines Modules */ - abstract public function SetModuleVersion($moduleVersion); + public function DeleteModule() { + $this->logHandler->Log('Remove Module '.$this->moduleName.' from Versioning System'); + unset($this->installedModules[$this->moduleName]); + $this->StoreModuleVersions(); + } + + /** + * @public + * + * Aktuelle Module Version auf "Deleting" setzen + */ + public function SetVersionDeleting() { + $this->logHandler->Log('Set State '.$this->moduleName.'=Deleting'); + $this->SetProperty($this::PROPERTY_STATE, $this::STATE_DELETING); + } /** * @public * * Aktuelle Module Version auf "Loading" setzen + * + * @param string $version aktuelle Version des Modules */ - abstract public function SetModuleVersionLoading(); + public function SetVersionLoading($version) { + $this->logHandler->Log('Set Version '.$this->moduleName.'='.$version.' (Loading)'); + $this->SetProperty($this::PROPERTY_SCRIPTVERSION, $version); + $this->SetProperty($this::PROPERTY_STATE, $this::STATE_LOADING); + } /** * @public * * Aktuelle Module Version auf "Loaded" setzen + * + * @param string $version aktuelle Version des Modules */ - abstract public function SetModuleVersionLoaded(); + public function SetVersionLoaded($version) { + $this->logHandler->Log('Set Version '.$this->moduleName.'='.$version.' (Loaded)'); + $this->SetProperty($this::PROPERTY_SCRIPTVERSION, $version); + $this->SetProperty($this::PROPERTY_STATE, $this::STATE_LOADED); + } /** * @public * * Aktuelle Module Version auf "Installing" setzen + * + * @param string $version aktuelle Version des Modules + */ + public function SetVersionInstalling($version) { + $this->logHandler->Log('Set Version '.$this->moduleName.'='.$version.' (Installing)'); + $this->SetProperty($this::PROPERTY_INSTALLVERSION, $version); + $this->SetProperty($this::PROPERTY_STATE, $this::STATE_INSTALLING); + } + + /** + * @public + * + * Aktuelle Module Version auf "Installed" setzen + * + * @param string $version aktuelle Version des Modules */ - abstract public function SetModuleVersionInstalling(); + public function SetVersionInstalled($version) { + $this->logHandler->Log('Set Version '.$this->moduleName.'='.$version.' (Installed)'); + $this->SetProperty($this::PROPERTY_INSTALLVERSION, $version); + $this->SetProperty($this::PROPERTY_VERSION, $version); + $this->SetProperty($this::PROPERTY_STATE, $this::STATE_INSTALLED); + } + + /** + * @public + * + * Liefert verwendetes Repository des Modules + * + * @return string Modul Repository + */ + public function GetModuleRepository($defaultRepository='') { + $repository = $this->GetProperty($this::PROPERTY_REPOSITORY); + if ($repository=='') { + $repository = $defaultRepository; + } + return $repository; + } + + /** + * @public + * + * Setzen des verwendeten Modul Repositories + * + * @param string $repository Modul Repository + */ + public function SetModuleRepository($repository='') { + $this->logHandler->Log('Set Repository '.$this->moduleName.'='.$repository); + $this->SetProperty($this::PROPERTY_REPOSITORY, $repository); + } /** * @public @@ -135,33 +472,221 @@ abstract public function SetModuleVersionInstalling(); * * @return string[] Liste der installierten Module */ - abstract public function GetInstalledModules(); + public function GetInstalledModules() { + $result = array(); + foreach ($this->installedModules as $moduleName=>$moduleVersion) { + $result[$moduleName] = $this->GetProperty($this::PROPERTY_VERSION, $moduleName); + } + return $result; + } /** * @public * - * Liefert eine Liste aller installierten Module + * Liefert kurze Beschreibung des Modules + * + * @param string $moduleName Name des Modules + * @return string Modul Description + */ + public function GetModuleInfos($moduleName) { + $result = array(); + if (array_key_exists($moduleName, $this->knownModules)) { + $result = $this->knownModules[$moduleName]; + } else { + $result['Version'] = ''; + $result['Repository'] = ''; + $result['Description'] = ''; + $result['Path'] = ''; + $result['LastRepository'] = ''; + } + return $result; + } + + /** + * @public + * + * Liefert eine Liste aller bekannten Module + * + * @return string[] Liste der bekannten Module + */ + public function GetKnownModules() { + $result = $this->knownModules; + + return $result; + } + + /** + * @public + * + * Liefert eine Liste aller bekannten Repositories * * @return string[] Liste der installierten Module */ - public function GetAvailableModules() { - $fileName = IPS_GetKernelDir().'scripts\\'.$this::FILE_AVAILABLE_MODULES; - $fileContent = file_get_contents($fileName); - $lines = explode(PHP_EOL, $fileContent); - - $resultList = array(); - foreach ($lines as $line) { - $content = explode('=', $line); - $moduleName = $content[0]; - $moduleProperties = explode('|',$content[1]); - $modulePath = $moduleProperties[0]; - $moduleDescription = $moduleProperties[1]; - - $result[$moduleName] = array($modulePath,$moduleDescription); - } + public function GetKnownRepositories() { + return $this->knownRepositories['Repository']; + } + + /** + * @public + * + * Liefert eine Liste der Repositories und Versionen eines Modules + * + * @param string $moduleName Name des Modules + * @return string[] Liste der Repository Versionen + */ + public function GetRepositoryVersions($moduleName) { + if (array_key_exists($moduleName, $this->repositoryVersions)) { + return $this->repositoryVersions[$moduleName]; + } else { + return array(); + } + } + + /** + * @public + * + * Liefert eine Liste Changes zu einer übergebenen Version + * + * @param string $moduleName Name des Modules + * @return string[] Liste der Repository Versionen + */ + public function GetChangeList($moduleName, $filterInstalledChanges=true) { + $changeList = array(); + $version = ''; + if ($this->IsModuleInstalled($moduleName)) { + $version = $this->GetVersion($moduleName); + } + if (array_key_exists($moduleName, $this->changeList)) { + foreach ($this->changeList[$moduleName] as $changeVersion=>$changeText) { + if ($this->CompareVersionsNewer($version, $changeVersion) or !$filterInstalledChanges) { + $changeList[$changeVersion] = $changeText; + } + } + } + uksort($changeList, 'version_compare_custom'); + + return $changeList; + } + + + + /** + * @public + * + * Liefert eine Liste der benötigten Module und Versionen zu einem Module + * + * @param string $moduleName Name des Modules + * @return string[] Liste der benötigten Module + */ + public function GetRequiredModules($moduleName='') { + if ($moduleName=='') { + $moduleName = $this->moduleName; + } + $requiredModules = array(); + if (array_key_exists($moduleName, $this->requiredModules)) { + $requiredModules = $this->requiredModules[$moduleName]; + } + return $requiredModules; + } + + /** + * @public + * + * Liefert eine Liste der benötigten Updates zu einem Module (benötigte SubModule + * die nicht vorhanden sind oder die ein Update benötigen). + * + * @param string $moduleName Name des Modules + * @return string[] Liste der benötigten Module + */ + public function GetRequiredUpdates($moduleName='') { + if ($moduleName=='') { + $moduleName = $this->moduleName; + } + $requiredUpdates = array(); + if (array_key_exists($moduleName, $this->requiredModules)) { + foreach ($this->requiredModules[$moduleName] as $requiredModule=>$requiredVersion) { + if ($this->IsVersionNewer($requiredModule, $requiredVersion)) { + $requiredUpdates[$requiredModule] = $requiredVersion; + } + } + } + return $requiredUpdates; + } + + private function GetKnownModuleUpdates($moduleName) { + $result = array(); + $moduleInfos = $this->GetModuleInfos($moduleName); + $requiredVersion = null; + $installedVersion = null; + if (array_key_exists('Version', $moduleInfos)) { + $requiredVersion = $moduleInfos['Version']; + } + if ($this->IsModuleInstalled($moduleName)) { + $installedVersion = $this->GetVersion($moduleName); + } + if ( !$this->IsModuleInstalled($moduleName) + or $this->CompareVersionsNewer($installedVersion, $requiredVersion)) { + //echo $moduleName.'--> Installed='.$installedVersion.', Required='.$requiredVersion.PHP_EOL; + $requiredModules = $this->GetRequiredModules($moduleName); + foreach($requiredModules as $requiredModule=>$version) { + $requiredUpdates = $this->GetKnownModuleUpdates($requiredModule); + foreach($requiredUpdates as $idx=>$requiredUpdate) { + $result[] = $requiredUpdate; + } + } + $result[] = $moduleName; + } + return $result; + } + + /** + * @public + * + * Liefert eine Liste der mit Modulen, für die ein Update verfügbar ist + * + * @return string[] Liste der Module + */ + public function GetKnownUpdates() { + $result = array(); + $knownUpdates = array(); + $installedModules = $this->GetInstalledModules(); + + foreach ($installedModules as $moduleName=>$version) { + if (array_key_exists($moduleName, $this->knownModules)) { + $updates = $this->GetKnownModuleUpdates($moduleName); + + foreach ($updates as $idx=>$module) { + if (!array_key_exists($module, $knownUpdates)) { + $knownUpdates[$module] = $module; + $result[] = $module; + } + } + } + } return $result; } + } + + function version_compare_custom($a, $b) { + $result = 0; + $partsA = explode(".", $a); + $partsB = explode(".", $b); + $maxParts = min(count($partsA), count($partsB)); + for($i = 0; $i < $maxParts; $i++) { + if(is_numeric($partsA[$i]) && is_numeric($partsB[$i])) { + $va = (int) $partsA[$i]; + $vb = (int) $partsB[$i]; + $result = $va == $vb ? 0 : ($va > $vb ? -1 : 1); + } else { + $result = $a == $b ? 0 : ($a > $b ? -1 : 1); + } + if($result != 0) { + break; + } + } + return $result; + } /** @}*/ ?> \ No newline at end of file diff --git a/IPSLibrary/install/InitializationFiles/Default/AudioMax.ini b/IPSLibrary/install/InitializationFiles/Default/AudioMax.ini new file mode 100644 index 0000000..269edb3 --- /dev/null +++ b/IPSLibrary/install/InitializationFiles/Default/AudioMax.ini @@ -0,0 +1,30 @@ +// Mit diesem Switch ist es möglich Fehler bei der Gererierung der ComPort Instanz zu ignorieren +IgnoreIOPortInstanceError=true + +//Installation Switch für die Installation der AudioMax Räume. Die Installation der Räume ist nicht +AudioMaxRoomInstallation=true + + + +[WFC10] +Enabled=true +Path=Visualization.WebFront.System.AudioMax +TabPaneItem=SystemTP +TabPaneParent=roottp +TabPaneName= +TabPaneOrder=90 +TabPaneIcon=Gear +TabPaneExclusive=false +TabItem=Audio +TabName=Audio +TabIcon=Speaker +TabOrder=50 + +[Mobile] +Enabled=true +Path=Visualization.Mobile.System +PathIcon=Gear +PathOrder=90 +Name=Audio +Order=50 +Icon=Speaker diff --git a/IPSLibrary/install/InitializationFiles/Default/IPSCam.ini b/IPSLibrary/install/InitializationFiles/Default/IPSCam.ini new file mode 100644 index 0000000..bd10067 --- /dev/null +++ b/IPSLibrary/install/InitializationFiles/Default/IPSCam.ini @@ -0,0 +1,25 @@ + + +[WFC10] +Enabled=true +Path=Visualization.WebFront.IPSWeather.IPSCam +TabPaneItem=TPWeather +TabPaneParent=roottp +TabPaneName= +TabPaneOrder=10 +TabPaneExclusive=false +TabPaneIcon=Cloud +TabItem=Cam +TabName=Kameras +TabIcon=Window +TabOrder=40 + +[Mobile] +Enabled=true +Path=Visualization.Mobile +PathOrder=15 +PathIcon=Image +Name=Kameras +Icon=Image +Order=15 + diff --git a/IPSLibrary/install/InitializationFiles/Default/IPSEDIP.ini b/IPSLibrary/install/InitializationFiles/Default/IPSEDIP.ini index 8b13789..e69de29 100644 --- a/IPSLibrary/install/InitializationFiles/Default/IPSEDIP.ini +++ b/IPSLibrary/install/InitializationFiles/Default/IPSEDIP.ini @@ -1 +0,0 @@ - diff --git a/IPSLibrary/install/InitializationFiles/Default/IPSHighcharts.ini b/IPSLibrary/install/InitializationFiles/Default/IPSHighcharts.ini new file mode 100644 index 0000000..e69de29 diff --git a/IPSLibrary/install/InitializationFiles/Default/IPSHomematic.ini b/IPSLibrary/install/InitializationFiles/Default/IPSHomematic.ini new file mode 100644 index 0000000..2c40073 --- /dev/null +++ b/IPSLibrary/install/InitializationFiles/Default/IPSHomematic.ini @@ -0,0 +1,23 @@ +[WFC10] +Enabled=true +Path=Visualization.WebFront.System.IPSHomematic +TabPaneItem=SystemTP +TabPaneParent=roottp +TabPaneName= +TabPaneOrder=60 +TabPaneIcon=Window +TabPaneExclusive=false +TabItem1=Homematic +TabName1=Homematic +TabIcon1=Window +TabOrder1=10 + +[Mobile] +Enabled=true +Path=Visualization.Mobile.System +PathIcon=Window +PathOrder=60 +Name1=Homematic +Order1=10 +Icon1=Window + diff --git a/IPSLibrary/install/InitializationFiles/Default/IPSLight.ini b/IPSLibrary/install/InitializationFiles/Default/IPSLight.ini new file mode 100644 index 0000000..6228ae6 --- /dev/null +++ b/IPSLibrary/install/InitializationFiles/Default/IPSLight.ini @@ -0,0 +1,17 @@ +[WFC10] +Enabled=true +Path=Visualization.WebFront.IPSLight +TabPaneItem=LightTP +TabPaneParent=roottp +TabPaneName= +TabPaneOrder=40 +TabPaneIcon=Bulb +TabPaneExclusive=true + + +[Mobile] +Enabled=true +Path=Visualization.Mobile.Licht +PathExclusive=true +PathOrder=40 +PathIcon=Bulb diff --git a/IPSLibrary/install/InitializationFiles/Default/IPSLogger.ini b/IPSLibrary/install/InitializationFiles/Default/IPSLogger.ini index 7c63047..84d55e3 100644 --- a/IPSLibrary/install/InitializationFiles/Default/IPSLogger.ini +++ b/IPSLibrary/install/InitializationFiles/Default/IPSLogger.ini @@ -6,8 +6,8 @@ Path=Visualization.WebFront.System.IPSLogger TabPaneItem=SystemTP TabPaneParent=roottp TabPaneName= -TabPaneOrder=60 -TabPaneIcon=Window +TabPaneOrder=90 +TabPaneIcon=Gear TabPaneExclusive=false TabItem1=LogWindow TabName1=Logging @@ -21,8 +21,8 @@ TabOrder2=20 [Mobile] Enabled=true Path=Visualization.Mobile.System -PathIcon=Window -PathOrder=69 +PathIcon=Gear +PathOrder=90 Name1=Logging Order1=10 Icon1=Window diff --git a/IPSLibrary/install/InitializationFiles/Default/IPSModuleManagerGUI.ini b/IPSLibrary/install/InitializationFiles/Default/IPSModuleManagerGUI.ini new file mode 100644 index 0000000..ab0eef1 --- /dev/null +++ b/IPSLibrary/install/InitializationFiles/Default/IPSModuleManagerGUI.ini @@ -0,0 +1,18 @@ + +[WFC10] +Enabled=true +Path=Visualization.WebFront.System.IPSModuleManagerGUI +TabPaneItem=SystemTP +TabPaneParent=roottp +TabPaneName= +TabPaneOrder=90 +TabPaneIcon=Gear +TabPaneExclusive=false + +TabItem=Library +TabName=IPSLibrary +TabIcon=ErlenmeyerFlask +TabOrder=70 + +[Mobile] +Enabled=false diff --git a/IPSLibrary/install/InitializationFiles/Default/IPSPowerControl.ini b/IPSLibrary/install/InitializationFiles/Default/IPSPowerControl.ini new file mode 100644 index 0000000..1105400 --- /dev/null +++ b/IPSLibrary/install/InitializationFiles/Default/IPSPowerControl.ini @@ -0,0 +1,23 @@ +[WFC10] +Enabled=true +Path=Visualization.WebFront.IPSPowerControl +TabPaneItem=HeatingTP +TabPaneParent=roottp +TabPaneName= +TabPaneOrder=50 +TabPaneIcon=Lightning +TabPaneExclusive=false +TabItem=Details +TabName="Chart Visualisierung" +TabIcon=Graph +TabOrder=20 + +[Mobile] +Enabled=true +Path=Visualization.Mobile.Energie +PathOrder=50 +PathIcon=Lightning +Name="Chart Visualisierung" +Icon=Graph +Order=20 + diff --git a/IPSLibrary/install/InitializationFiles/Default/IPSShadowing.ini b/IPSLibrary/install/InitializationFiles/Default/IPSShadowing.ini new file mode 100644 index 0000000..5b7f33f --- /dev/null +++ b/IPSLibrary/install/InitializationFiles/Default/IPSShadowing.ini @@ -0,0 +1,19 @@ +[WFC10] +Enabled=true +Path=Visualization.WebFront.IPSShadowing +TabPaneItem=ShadowingTP +TabPaneParent=roottp +TabPaneName= +TabPaneOrder=30 +TabPaneIcon=Shutter +TabPaneExclusive=true +TabName1=Übersicht +TabIcon1=Shutter + + +[Mobile] +Enabled=true +Path=Visualization.Mobile.Beschattung +PathExclusive=true +PathOrder=30 +PathIcon=Shutter diff --git a/IPSLibrary/install/InitializationFiles/Default/NetPlayer2.ini b/IPSLibrary/install/InitializationFiles/Default/NetPlayer2.ini new file mode 100644 index 0000000..e69de29 diff --git a/IPSLibrary/install/InstallationScripts/AudioMax_Installation.ips.php b/IPSLibrary/install/InstallationScripts/AudioMax_Installation.ips.php new file mode 100644 index 0000000..0cd2d1c --- /dev/null +++ b/IPSLibrary/install/InstallationScripts/AudioMax_Installation.ips.php @@ -0,0 +1,371 @@ + Error 1, Command Array 1, Unknown Command => Fehler im 1. Befehlsteil + * "2" => Error 2, Command Array 2, Unknown Command => Fehler im 2. Befehlsteil + * "3" => Error 3, Command Array 3, Unknown Command => Fehler im 3. Befehlsteil + * "4" => Error 4, Command Array 4, Out Of Range => Fehler im 4. Befehlsteil + * "5" => Error 5, Command Array 5, Out Of Range => Fehler im 5. Befehlsteil + * Acknowledge Code: + * MODE0 = 0 + * "0" => Befehl erkannt + * + * MODE0 = 1 Bei erkanntem Befehl wird der gesendete Befehl als Echo ausgegeben. + * + */ + /** @}*/ + + /**@defgroup audiomax_install AudioMax Installation + * @ingroup audiomax + * @{ + * + * AudioMax Installations File + * + * @file AudioMax_Installation.ips.php + * @author Andreas Brauneis + * @version + * Version 2.50.1, 18.02.2012
+ * + * Script zur kompletten Installation der AudioMax Entertainment Steuerung. + * + * Vor der Installation sollte noch das File AudioMax_Configuration.inc.php an die persönlichen + * Bedürfnisse angepasst werden. + * + * @page rquirements_audiomax Installations Voraussetzungen + * - IPS Kernel >= 2.50 + * - IPSModuleManager >= 2.50.1 + * - IPSLogger >= 2.50.1 + * + * @page install_audiomax Installations Schritte + * Folgende Schritte sind zur Installation der AudioMax Ansteuerung nötig: + * - Laden des Modules (siehe IPSModuleManager) + * - Konfiguration (Details siehe Konfiguration) + * - Installation (siehe IPSModuleManager) + * + */ + + if (!isset($moduleManager)) { + IPSUtils_Include ('IPSModuleManager.class.php', 'IPSLibrary::install::IPSModuleManager'); + + echo 'ModuleManager Variable not set --> Create "default" ModuleManager'."\n"; + $moduleManager = new IPSModuleManager('AudioMax'); + } + + $moduleManager->VersionHandler()->CheckModuleVersion('IPS','2.50'); + $moduleManager->VersionHandler()->CheckModuleVersion('IPSLogger','2.50.1'); + $moduleManager->VersionHandler()->CheckModuleVersion('IPSModuleManager','2.50.1'); + + IPSUtils_Include ("IPSInstaller.inc.php", "IPSLibrary::install::IPSInstaller"); + IPSUtils_Include ("AudioMax_Constants.inc.php", "IPSLibrary::app::hardware::AudioMax"); + IPSUtils_Include ("AudioMax_Configuration.inc.php", "IPSLibrary::config::hardware::AudioMax"); + + $WFC10_Enabled = $moduleManager->GetConfigValue('Enabled', 'WFC10'); + $WFC10_ConfigId = $moduleManager->GetConfigValueIntDef('ID', 'WFC10', GetWFCIdDefault()); + $WFC10_Path = $moduleManager->GetConfigValue('Path', 'WFC10'); + $WFC10_TabPaneItem = $moduleManager->GetConfigValue('TabPaneItem', 'WFC10'); + $WFC10_TabPaneParent = $moduleManager->GetConfigValue('TabPaneParent', 'WFC10'); + $WFC10_TabPaneName = $moduleManager->GetConfigValue('TabPaneName', 'WFC10'); + $WFC10_TabPaneIcon = $moduleManager->GetConfigValue('TabPaneIcon', 'WFC10'); + $WFC10_TabPaneOrder = $moduleManager->GetConfigValueInt('TabPaneOrder', 'WFC10'); + $WFC10_TabItem = $moduleManager->GetConfigValue('TabItem', 'WFC10'); + $WFC10_TabName = $moduleManager->GetConfigValue('TabName', 'WFC10'); + $WFC10_TabIcon = $moduleManager->GetConfigValue('TabIcon', 'WFC10'); + $WFC10_TabOrder = $moduleManager->GetConfigValueInt('TabOrder', 'WFC10'); + + $Mobile_Enabled = $moduleManager->GetConfigValue('Enabled', 'Mobile'); + $Mobile_Path = $moduleManager->GetConfigValue('Path', 'Mobile'); + $Mobile_PathOrder = $moduleManager->GetConfigValueInt('PathOrder', 'Mobile'); + $Mobile_PathIcon = $moduleManager->GetConfigValue('PathIcon', 'Mobile'); + $Mobile_Name = $moduleManager->GetConfigValue('Name', 'Mobile'); + $Mobile_Order = $moduleManager->GetConfigValueInt('Order', 'Mobile'); + $Mobile_Icon = $moduleManager->GetConfigValue('Icon', 'Mobile'); + + $IgnoreIOPortInstanceError = $moduleManager->GetConfigValueBool('IgnoreIOPortInstanceError'); + $AudioMaxRoomInstallation = $moduleManager->GetConfigValueBool('AudioMaxRoomInstallation'); + + /* ---------------------------------------------------------------------- */ + /* AudioMax Installation */ + /* ---------------------------------------------------------------------- */ + + $CategoryIdData = $moduleManager->GetModuleCategoryID('data'); + $CategoryIdApp = $moduleManager->GetModuleCategoryID('app'); + $CategoryIdHardware = CreateCategoryPath('Hardware.AudioMax'); + + $id_ScriptReceive = IPS_GetScriptIDByName('AudioMax_Receive', $CategoryIdApp); + $id_ScriptSettings = IPS_GetScriptIDByName('AudioMax_ChangeSettings', $CategoryIdApp); + $id_ScriptKeepAlive = IPS_GetScriptIDByName('AudioMax_KeepAlive', $CategoryIdApp); + + if (AM_CONFIG_COM_PORT<>'') { + $id_IOComPort = CreateSerialPort('AudioMax_ComPort', AM_CONFIG_COM_PORT, 19200, 1, 8, 'None',0,$IgnoreIOPortInstanceError); + $id_Cutter = CreateVariableCutter('AudioMax_Cutter', $id_IOComPort, '', chr(13)); + $id_Register = CreateRegisterVariable('AudioMax_Register', $CategoryIdHardware, $id_ScriptReceive, $id_Cutter); + } + CreateTimer_CyclicBySeconds ('SendAlive', $id_ScriptKeepAlive, AM_COM_KEEPALIVE, true); + CreateTimer_CyclicBySeconds ('CheckAlive', $id_ScriptKeepAlive, AM_COM_KEEPALIVE+5, true); + + CreateProfile_Count ('AudioMax_Volume', AM_VAL_VOLUME_MIN, 1, AM_VAL_VOLUME_MAX, "", "%"); + CreateProfile_Count ('AudioMax_Treble', AM_VAL_TREBLE_MIN, 1, AM_VAL_TREBLE_MAX, "", "%"); + CreateProfile_Count ('AudioMax_Middle', AM_VAL_MIDDLE_MIN, 1, AM_VAL_MIDDLE_MAX, "", "%"); + CreateProfile_Count ('AudioMax_Bass', AM_VAL_BASS_MIN, 1, AM_VAL_BASS_MAX, "", "%"); + CreateProfile_Count ('AudioMax_Balance', AM_VAL_BALANCE_MIN, 1, AM_VAL_BALANCE_MAX, "", "%"); + CreateProfile_Count ('AudioMax_InputGain', AM_VAL_INPUTGAIN_MIN, 1, AM_VAL_INPUTGAIN_MAX, "", "%"); + CreateProfile_Associations ('AudioMax_InputSelect', array(AM_CONFIG_INPUTNAME1, AM_CONFIG_INPUTNAME2, AM_CONFIG_INPUTNAME3, AM_CONFIG_INPUTNAME4)); + CreateProfile_Switch ('AudioMax_Mute', 'Aus', 'An', "", -1, 0x00ff00); + CreateProfile_Switch ('AudioMax_KeepAliveStatus', 'KeepAlive Error', 'KeepAlive OK', "", 0xaa0000, 0x00ff00); + CreateProfile_Switch ('AudioMax_Busy', 'Bereit', 'Aktiv', "", -1, 0x0000ff); + CreateProfile_Switch ('AudioMax_Connection', 'Deaktiviert', 'Aktiv', "", 0xaa0000, 0x0000ff, 'LockOpen', 'LockClosed'); + + $id_AudioMaxServerId = CreateDummyInstance("AudioMax_Server", $CategoryIdData, 10); + $id_Power = CreateVariable(AM_VAR_MAINPOWER, 0 /*Boolean*/, $id_AudioMaxServerId, 10, '~Switch', $id_ScriptSettings, false, 'Power'); + $id_Busy = CreateVariable(AM_VAR_BUSY, 0 /*Boolean*/, $id_AudioMaxServerId, 20, 'AudioMax_Busy', null, false, 'Distance'); + $id_Connection = CreateVariable(AM_VAR_CONNECTION, 0 /*Boolean*/, $id_AudioMaxServerId, 30, 'AudioMax_Connection', $id_ScriptSettings, true, ''); + $id_LastError = CreateVariable(AM_VAR_LASTERROR, 3 /*String*/, $id_AudioMaxServerId, 40, '~String', null, '', 'Warning'); + $id_LastCommand = CreateVariable(AM_VAR_LASTCOMMAND, 3 /*String*/, $id_AudioMaxServerId, 50, '~String', null, '', 'Information'); + $id_InputBuffer = CreateVariable(AM_VAR_INPUTBUFFER, 3 /*String*/, $id_AudioMaxServerId, 60, '~String', null, '', 'Information'); + $id_KeepAliveCount = CreateVariable(AM_VAR_KEEPALIVECOUNT, 1 /*Integer*/, $id_AudioMaxServerId, 70, '', null, 0, ''); + $id_KeepAliveStatus = CreateVariable(AM_VAR_KEEPALIVESTATUS, 0 /*Boolean*/, $id_AudioMaxServerId, 80, 'AudioMax_KeepAliveStatus', null, true, 'Repeat'); + $id_ModePowerRequest = CreateVariable(AM_VAR_MODEPOWERREQUEST,0 /*Boolean*/, $id_AudioMaxServerId, 90, '~Switch', $id_ScriptSettings,true, 'Gear'); + $id_ModeServerDebug = CreateVariable(AM_VAR_MODESERVERDEBUG, 0 /*Boolean*/, $id_AudioMaxServerId, 100, '~Switch', $id_ScriptSettings,true, 'Gear'); + $id_ModeEmulateState = CreateVariable(AM_VAR_MODEEMULATESTATE,0 /*Boolean*/, $id_AudioMaxServerId, 110, '~Switch', $id_ScriptSettings,true, 'Gear'); + $id_ModeAcknowledge = CreateVariable(AM_VAR_MODEACKNOWLEDGE, 0 /*Boolean*/, $id_AudioMaxServerId, 120, '~Switch', $id_ScriptSettings,true, 'Gear'); + $id_Port = CreateVariable(AM_VAR_PORTID, 1 /*Integer*/, $id_AudioMaxServerId, 300, '', null, 0, ''); + $id_RoomIds = CreateVariable(AM_VAR_ROOMIDS, 3 /*String*/, $id_AudioMaxServerId, 310, '', null, '', ''); + $id_RoomCount = CreateVariable(AM_VAR_ROOMCOUNT, 1 /*Integer*/, $id_AudioMaxServerId, 320, '', null, 0, ''); + + $id_KeepAliveFlag = @IPS_GetObjectIDByIdent('KEEP_ALIVE_FLAG', $id_AudioMaxServerId); + if ($id_KeepAliveFlag!==false) { + IPS_DeleteVariable($id_KeepAliveFlag); + } + + if ($AudioMaxRoomInstallation) { + $RoomIds = array(); + for ($RoomId=1;$RoomId<=AM_CONFIG_ROOM_COUNT;$RoomId++) { + $RoomInstanceId = CreateDummyInstance("AudioMax_Room".$RoomId, $CategoryIdData, 100+$RoomId); + $RoomIds[] = $RoomInstanceId; + + $PowerId = CreateVariable(AM_VAR_ROOMPOWER, 0 /*Boolean*/, $RoomInstanceId, 10, '~Switch', $id_ScriptSettings, AM_VAL_POWER_DEFAULT, 'Power'); + $SelectId = CreateVariable(AM_VAR_INPUTSELECT, 1 /*Integer*/, $RoomInstanceId, 20, 'AudioMax_InputSelect', $id_ScriptSettings, AM_VAL_INPUTSELECT_DEFAULT, 'Gear'); + $GainId = CreateVariable(AM_VAR_INPUTGAIN, 1 /*Integer*/, $RoomInstanceId, 30, 'AudioMax_InputGain', $id_ScriptSettings, AM_VAL_INPUTGAIN_DEFAULT, 'Lightning'); + $VolumeId = CreateVariable(AM_VAR_VOLUME, 1 /*Integer*/, $RoomInstanceId, 40, 'AudioMax_Volume', $id_ScriptSettings, AM_VAL_VOLUME_DEFAULT, 'Intensity'); + $MutingId = CreateVariable(AM_VAR_MUTE, 0 /*Boolean*/, $RoomInstanceId, 50, 'AudioMax_Mute', $id_ScriptSettings, AM_VAL_MUTE_DEFAULT, 'Speaker'); + $BalanceId = CreateVariable(AM_VAR_BALANCE, 1 /*Integer*/, $RoomInstanceId, 60, 'AudioMax_Balance', $id_ScriptSettings, AM_VAL_BALANCE_DEFAULT, 'Speaker'); + $TrebleId = CreateVariable(AM_VAR_TREBLE, 1 /*Integer*/, $RoomInstanceId, 70, 'AudioMax_Treble', $id_ScriptSettings, AM_VAL_TREBLE_DEFAULT, 'Speaker'); + $MiddleId = CreateVariable(AM_VAR_MIDDLE, 1 /*Integer*/, $RoomInstanceId, 80, 'AudioMax_Middle', $id_ScriptSettings, AM_VAL_MIDDLE_DEFAULT, 'Speaker'); + $BassId = CreateVariable(AM_VAR_BASS, 1 /*Integer*/, $RoomInstanceId, 90, 'AudioMax_Bass', $id_ScriptSettings, AM_VAL_BASS_DEFAULT, 'Speaker'); + } + + SetValue($id_RoomIds, implode(',',$RoomIds)); + SetValue($id_RoomCount, AM_CONFIG_ROOM_COUNT); + if (AM_CONFIG_COM_PORT<>'') { + SetValue($id_Port, $id_IOComPort); + } + } + + // ---------------------------------------------------------------------------------------------------------------------------- + // Webfront Installation + // ---------------------------------------------------------------------------------------------------------------------------- + if ($WFC10_Enabled) { + $categoryIdWebFront = CreateCategoryPath($WFC10_Path); + EmptyCategory($categoryIdWebFront); + $categoryIdWebFrontLeft = CreateCategory('Left', $categoryIdWebFront, 100); + $categoryIdWebFrontRight = CreateCategory('Right', $categoryIdWebFront, 200); + + $instanceIdServer = CreateDummyInstance('AudioMax Server', $categoryIdWebFrontLeft, 10); + CreateLink('Power', $id_Power, $instanceIdServer, 10); + CreateLink('Verbindung', $id_Connection, $instanceIdServer, 20); + CreateLink('Gerät Aktiv', $id_Busy, $instanceIdServer, 30); + CreateLink('Eingangs Buffer', $id_InputBuffer, $instanceIdServer, 40); + CreateLink('Letzter Befehl', $id_LastCommand, $instanceIdServer, 50); + CreateLink('Letzter Fehler', $id_LastError, $instanceIdServer, 60); + CreateLink('"KeepAlive" Status', $id_KeepAliveStatus, $instanceIdServer, 80); + CreateLink('Acknowledge Modus', $id_ModeAcknowledge, $instanceIdServer, 90); + CreateLink('EmulateState Modus', $id_ModeEmulateState, $instanceIdServer, 100); + CreateLink('Debug Modus', $id_ModeServerDebug, $instanceIdServer, 110); + CreateLink('PowerRequest Modus', $id_ModePowerRequest, $instanceIdServer, 120); + + if ($AudioMaxRoomInstallation) { + $roomNames = array(1=>AM_CONFIG_ROOMNAME1, 2=>AM_CONFIG_ROOMNAME2, 3=>AM_CONFIG_ROOMNAME3, 4=>AM_CONFIG_ROOMNAME4); + for ($roomId=1;$roomId<=4;$roomId++) { + $roomCategoryId = CreateCategory('AudioMax'.$roomId, $categoryIdWebFrontRight, 10*$roomId); + $roomInstanceId = IPS_GetObjectIdByIdent("AudioMax_Room".$roomId, $CategoryIdData); + + CreateLink('AudioMax'.$roomId. ' ('.$roomNames[$roomId].')', IPS_GetObjectIDByIdent(AM_VAR_ROOMPOWER, $roomInstanceId), $categoryIdWebFrontRight, $roomId); + + CreateLink('Power', IPS_GetObjectIDByIdent(AM_VAR_ROOMPOWER, $roomInstanceId), $roomCategoryId, 10); + CreateLink('Eingang', IPS_GetObjectIDByIdent(AM_VAR_INPUTSELECT, $roomInstanceId), $roomCategoryId, 20); + CreateLink('Verstärkung', IPS_GetObjectIDByIdent(AM_VAR_INPUTGAIN, $roomInstanceId), $roomCategoryId, 30); + CreateLink('Lautstärke', IPS_GetObjectIDByIdent(AM_VAR_VOLUME, $roomInstanceId), $roomCategoryId, 40); + CreateLink('Muting', IPS_GetObjectIDByIdent(AM_VAR_MUTE, $roomInstanceId), $roomCategoryId, 50); + CreateLink('Balance', IPS_GetObjectIDByIdent(AM_VAR_BALANCE, $roomInstanceId), $roomCategoryId, 60); + CreateLink('Höhen', IPS_GetObjectIDByIdent(AM_VAR_TREBLE, $roomInstanceId), $roomCategoryId, 70); + CreateLink('Mitten', IPS_GetObjectIDByIdent(AM_VAR_MIDDLE, $roomInstanceId), $roomCategoryId, 80); + CreateLink('Bass', IPS_GetObjectIDByIdent(AM_VAR_BASS, $roomInstanceId), $roomCategoryId, 90); + } + } + $instanceIdPlayer = IPSUtil_ObjectIDByPath('Hardware.NetPlayer.MediaPlayer', true); + if ($instanceIdPlayer!==false) { + CreateLink('MediaPlayer', IPS_GetObjectIDByName('Status', $instanceIdPlayer), $categoryIdWebFrontRight, 100); + + $categoryIdPlayer = CreateCategory('MediaPlayer', $categoryIdWebFrontRight, 100); + CreateLink('Lautstärke', IPS_GetObjectIDByName('Lautstärke', $instanceIdPlayer), $categoryIdPlayer, 10); + CreateLink('Status', IPS_GetObjectIDByName('Status', $instanceIdPlayer), $categoryIdPlayer, 20); + CreateLink('Titel', IPS_GetObjectIDByName('Titel', $instanceIdPlayer), $categoryIdPlayer, 30); + CreateLink('Titeldatei', IPS_GetObjectIDByName('Titeldatei', $instanceIdPlayer), $categoryIdPlayer, 40); + CreateLink('Titellänge', IPS_GetObjectIDByName('Titellänge', $instanceIdPlayer), $categoryIdPlayer, 50); + CreateLink('Titelposition',IPS_GetObjectIDByName('Titelposition',$instanceIdPlayer), $categoryIdPlayer, 60); + CreateLink('Wiederholen', IPS_GetObjectIDByName('Wiederholen', $instanceIdPlayer), $categoryIdPlayer, 70); + CreateLink('Zufall', IPS_GetObjectIDByName('Zufall', $instanceIdPlayer), $categoryIdPlayer, 80); + CreateLink('Lautstärke', IPS_GetObjectIDByName('Lautstärke', $instanceIdPlayer), $categoryIdPlayer, 90); + CreateLink('Lautstärke', IPS_GetObjectIDByName('Lautstärke', $instanceIdPlayer), $categoryIdPlayer, 100); + } + + $tabItem = $WFC10_TabPaneItem.$WFC10_TabItem; + DeleteWFCItems($WFC10_ConfigId, $tabItem); + CreateWFCItemTabPane ($WFC10_ConfigId, $WFC10_TabPaneItem, $WFC10_TabPaneParent, $WFC10_TabPaneOrder, $WFC10_TabPaneName, $WFC10_TabPaneIcon); + CreateWFCItemSplitPane ($WFC10_ConfigId, $tabItem, $WFC10_TabPaneItem, $WFC10_TabOrder, $WFC10_TabName, $WFC10_TabIcon, 1 /*Vertical*/, 40 /*Width*/, 0 /*Target=Pane1*/, 0/*UsePerc*/, 'true'); + CreateWFCItemCategory ($WFC10_ConfigId, $tabItem.'_Left', $tabItem, 10, '', '', $categoryIdWebFrontLeft /*BaseId*/, 'false' /*BarBottomVisible*/); + CreateWFCItemCategory ($WFC10_ConfigId, $tabItem.'_Right', $tabItem, 20, '', '', $categoryIdWebFrontRight /*BaseId*/, 'true' /*BarBottomVisible*/); + + ReloadAllWebFronts(); + } + + // ---------------------------------------------------------------------------------------------------------------------------- + // Mobile Installation + // ---------------------------------------------------------------------------------------------------------------------------- + if ($Mobile_Enabled ) { + $mobileId = CreateCategoryPath($Mobile_Path, $Mobile_PathOrder, $Mobile_PathIcon); + $mobileId = CreateCategoryPath($Mobile_Path.'.'.$Mobile_Name, $Mobile_Order, $Mobile_Icon); + EmptyCategory($mobileId); + + $instanceIdServer = CreateCategory('AudioMax Server', $mobileId, 0); + CreateLink('Power', $id_Power, $instanceIdServer, 10); + CreateLink('Verbindung', $id_Connection, $instanceIdServer, 20); + CreateLink('Gerät Aktiv', $id_Busy, $instanceIdServer, 30); + CreateLink('Eingangs Buffer', $id_InputBuffer, $instanceIdServer, 40); + CreateLink('Letzter Befehl', $id_LastCommand, $instanceIdServer, 50); + CreateLink('Letzter Fehler', $id_LastError, $instanceIdServer, 60); + CreateLink('"KeepAlive" Status', $id_KeepAliveStatus, $instanceIdServer, 80); + CreateLink('Acknowledge Modus', $id_ModeAcknowledge, $instanceIdServer, 90); + CreateLink('EmulateState Modus', $id_ModeEmulateState, $instanceIdServer, 100); + CreateLink('Debug Modus', $id_ModeServerDebug, $instanceIdServer, 110); + CreateLink('PowerRequest Modus', $id_ModePowerRequest, $instanceIdServer, 120); + + CreateLink('AudioMax Server', $id_Power, $mobileId, 0); + if ($AudioMaxRoomInstallation) { + $roomNames = array(1=>AM_CONFIG_ROOMNAME1, 2=>AM_CONFIG_ROOMNAME2, 3=>AM_CONFIG_ROOMNAME3, 4=>AM_CONFIG_ROOMNAME4); + for ($roomId=1;$roomId<=4;$roomId++) { + $roomCategoryId = CreateCategory('AudioMax'.$roomId. ' ('.$roomNames[$roomId].')', $mobileId, 10*$roomId); + $roomInstanceId = IPS_GetObjectIdByIdent("AudioMax_Room".$roomId, $CategoryIdData); + + CreateLink('AudioMax'.$roomId. ' ('.$roomNames[$roomId].')', IPS_GetObjectIDByIdent(AM_VAR_ROOMPOWER, $roomInstanceId), $mobileId, $roomId); + + CreateLink('Power', IPS_GetObjectIDByIdent(AM_VAR_ROOMPOWER, $roomInstanceId), $roomCategoryId, 10); + CreateLink('Eingang', IPS_GetObjectIDByIdent(AM_VAR_INPUTSELECT, $roomInstanceId), $roomCategoryId, 20); + CreateLink('Verstärkung', IPS_GetObjectIDByIdent(AM_VAR_INPUTGAIN, $roomInstanceId), $roomCategoryId, 30); + CreateLink('Lautstärke', IPS_GetObjectIDByIdent(AM_VAR_VOLUME, $roomInstanceId), $roomCategoryId, 40); + CreateLink('Muting', IPS_GetObjectIDByIdent(AM_VAR_MUTE, $roomInstanceId), $roomCategoryId, 50); + CreateLink('Balance', IPS_GetObjectIDByIdent(AM_VAR_BALANCE, $roomInstanceId), $roomCategoryId, 60); + CreateLink('Höhen', IPS_GetObjectIDByIdent(AM_VAR_TREBLE, $roomInstanceId), $roomCategoryId, 70); + CreateLink('Mitten', IPS_GetObjectIDByIdent(AM_VAR_MIDDLE, $roomInstanceId), $roomCategoryId, 80); + CreateLink('Bass', IPS_GetObjectIDByIdent(AM_VAR_BASS, $roomInstanceId), $roomCategoryId, 90); + } + } + $instanceIdPlayer = IPSUtil_ObjectIDByPath('Hardware.NetPlayer.MediaPlayer', true); + if ($instanceIdPlayer!==false) { + CreateLink('MediaPlayer', IPS_GetObjectIDByName('Status', $instanceIdPlayer), $mobileId, 100); + + $categoryIdPlayer = CreateCategory('MediaPlayer', $mobileId, 100); + CreateLink('Lautstärke', IPS_GetObjectIDByName('Lautstärke', $instanceIdPlayer), $categoryIdPlayer, 10); + CreateLink('Status', IPS_GetObjectIDByName('Status', $instanceIdPlayer), $categoryIdPlayer, 20); + CreateLink('Titel', IPS_GetObjectIDByName('Titel', $instanceIdPlayer), $categoryIdPlayer, 30); + CreateLink('Titeldatei', IPS_GetObjectIDByName('Titeldatei', $instanceIdPlayer), $categoryIdPlayer, 40); + CreateLink('Titellänge', IPS_GetObjectIDByName('Titellänge', $instanceIdPlayer), $categoryIdPlayer, 50); + CreateLink('Titelposition',IPS_GetObjectIDByName('Titelposition',$instanceIdPlayer), $categoryIdPlayer, 60); + CreateLink('Wiederholen', IPS_GetObjectIDByName('Wiederholen', $instanceIdPlayer), $categoryIdPlayer, 70); + CreateLink('Zufall', IPS_GetObjectIDByName('Zufall', $instanceIdPlayer), $categoryIdPlayer, 80); + CreateLink('Lautstärke', IPS_GetObjectIDByName('Lautstärke', $instanceIdPlayer), $categoryIdPlayer, 90); + CreateLink('Lautstärke', IPS_GetObjectIDByName('Lautstärke', $instanceIdPlayer), $categoryIdPlayer, 100); + } + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/install/InstallationScripts/Entertainment_Installation.ips.php b/IPSLibrary/install/InstallationScripts/Entertainment_Installation.ips.php index 24d5e93..e50673e 100644 --- a/IPSLibrary/install/InstallationScripts/Entertainment_Installation.ips.php +++ b/IPSLibrary/install/InstallationScripts/Entertainment_Installation.ips.php @@ -39,6 +39,7 @@ $moduleManager->VersionHandler()->CheckModuleVersion('IPSLogger','2.50.1'); IPSUtils_Include ("IPSInstaller.inc.php", "IPSLibrary::install::IPSInstaller"); + IPSUtils_Include ("IPSMessageHandler.class.php", "IPSLibrary::app::core::IPSMessageHandler"); IPSUtils_Include ("Entertainment_Configuration.inc.php", "IPSLibrary::config::modules::Entertainment"); $WFC10_Enabled = $moduleManager->GetConfigValue('Enabled', 'WFC10'); @@ -128,6 +129,9 @@ // Generate Roomes and Controls echo "--- Create Roomes and Controls ---------------------------------------------------------\n"; $RoomData = get_RoomConfiguration(); + if (count($RoomData)==0) { + throw new Exception('No Roomes defined, see Demo Configuration File for an Example!!!'); + } $RoomOrder = 100; foreach($RoomData as $RoomName => $RoomProperties) { $RoomId = CreateCategory($RoomName, $CategoryIdRoomes, $RoomOrder); @@ -143,6 +147,9 @@ // Generate Devices and Controls echo "--- Create Devices and Controls --------------------------------------------------------\n"; $DeviceData = get_DeviceConfiguration(); + if (count($DeviceData)==0) { + throw new Exception('No Devices defined, see Demo Configuration File for an Example!!!'); + } $DeviceOrder = 100; foreach($DeviceData as $DeviceName => $DeviceProperties) { $DeviceId = CreateCategory($DeviceName, $CategoryIdDevices, $DeviceOrder); @@ -168,6 +175,14 @@ } } + if (class_exists('AudioMax_Server')) { + echo 'Register AudioMax for MessageHandler'; + $instanceIdAudioMax = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.hardware.AudioMax.AudioMax_Server'); + $instanceIdVariable = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.hardware.AudioMax.AudioMax_Server.LAST_COMMAND'); + IPSMessageHandler::RegisterOnChangeEvent($instanceIdVariable/*Var*/, 'IPSComponentAVControl_AudioMax,'.$instanceIdAudioMax, 'IPSModuleAVControl_Entertainment'); + } + + // ---------------------------------------------------------------------------------------------------------------------------- // Webfront Definition // ---------------------------------------------------------------------------------------------------------------------------- @@ -307,42 +322,57 @@ // ------------------------------------------------------------------------------------------------ - function get_DevicePropertybyParent($ParentId, $ControlType, $Property) { - $Data = false; - $DeviceConfig = get_DeviceConfiguration(); - $Name = IPS_GetName($ParentId); - if (IPS_GetName(IPS_GetParent($ParentId)) == 'Devices') { - $Data = $DeviceConfig[$Name][$ControlType][$Property]; - } else { - $SourceConfig = get_SourceConfiguration(); - foreach ($SourceConfig as $RoomName=>$RoomData) { - foreach ($RoomData as $SourceIdx => $SourceIdxData) { - if (is_array($SourceIdxData)) { - foreach ($SourceIdxData as $SourceType => $SourceTypeData) { - if ($SourceType==c_Property_Input or $SourceType==c_Property_Switch or $SourceType==c_Property_Output) { - $DeviceName = $SourceTypeData[c_Property_Device]; - $DeviceControls = $DeviceConfig[$DeviceName]; - if (array_key_exists($ControlType, $DeviceControls)) { - $Data = $DeviceConfig[$DeviceName][$ControlType][$Property]; - } - } - } - } - } - } - } - if ($Data===false) { - if ($ControlType==c_Control_iRemoteVolume) { - return get_DevicePropertybyParent($ParentId, c_Control_RemoteVolume, $Property); - } - if ($ControlType==c_Control_iRemoteSource) { - return get_DevicePropertybyParent($ParentId, c_Control_RemoteSource, $Property); - } - echo $Name.'.'.$ControlType.'.'.$Property." could NOT be found !!!/n"; - exit; - } - return $Data; - } + function get_DevicePropertybyParent($ParentId, $ControlType, $Property) { + $Data = false; + $DeviceConfig = get_DeviceConfiguration(); + $Name = IPS_GetName($ParentId); + if (IPS_GetName(IPS_GetParent($ParentId)) == 'Devices') { + $Data = $DeviceConfig[$Name][$ControlType][$Property]; + } else { + $SourceConfig = get_SourceConfiguration(); + $DeviceRoomName = $Name; + foreach ($SourceConfig as $RoomName=>$RoomData) { + if($RoomName != $DeviceRoomName) { + continue; + } + foreach ($RoomData as $SourceIdx => $SourceIdxData) { + if (is_array($SourceIdxData)) { + foreach ($SourceIdxData as $SourceType => $SourceTypeData) { + if ($SourceType==c_Property_Input or $SourceType==c_Property_Switch or $SourceType==c_Property_Output) { + // ensure compatibilty to older or simpler configurations + if(isset($SourceTypeData[c_Property_Device])) { + $SourceTypeData = array($SourceTypeData); + } + + $DeviceNames = array(); + foreach($SourceTypeData as $SourceTypeDataX) { + $DeviceName = $SourceTypeDataX[c_Property_Device]; + $DeviceNames[] = $DeviceName; + } + foreach($DeviceNames as $DeviceName) { + $DeviceControls = $DeviceConfig[$DeviceName]; + if (array_key_exists($ControlType, $DeviceControls)) { + $Data = $DeviceControls[$ControlType][$Property]; + } + } + } + } + } + } + } + } + if ($Data===false) { + if ($ControlType==c_Control_iRemoteVolume) { + return get_DevicePropertybyParent($ParentId, c_Control_RemoteVolume, $Property); + } + if ($ControlType==c_Control_iRemoteSource) { + return get_DevicePropertybyParent($ParentId, c_Control_RemoteSource, $Property); + } + echo $Name.'.'.$ControlType.'.'.$Property." could NOT be found !!!/n"; + exit; + } + return $Data; + } // ------------------------------------------------------------------------------------------------ function CreateControl ($ControlType, $ControlData, $ParentId, $ActionScriptId, $Order) { diff --git a/IPSLibrary/install/InstallationScripts/IPSCam_Installation.ips.php b/IPSLibrary/install/InstallationScripts/IPSCam_Installation.ips.php new file mode 100644 index 0000000..fc1db25 --- /dev/null +++ b/IPSLibrary/install/InstallationScripts/IPSCam_Installation.ips.php @@ -0,0 +1,369 @@ += 2.50 + * - IPSModuleManager >= 2.50.2 + * - IPSLogger >= 2.50.1 + * - IPSComponent >= 2.50.1 + * + * @page install_IPSCam Installations Schritte + * Folgende Schritte sind zur Installation der IPSCam Ansteuerung nötig: + * - Laden des Modules (siehe IPSModuleManager) + * - Konfiguration (Details siehe Konfiguration) + * - Installation (siehe IPSModuleManager) + * + * @file IPSCam_Installation.ips.php + * @author Andreas Brauneis + * @version + * Version 2.50.1, 09.08.2012
+ * + */ + + if (!isset($moduleManager)) { + IPSUtils_Include ('IPSModuleManager.class.php', 'IPSLibrary::install::IPSModuleManager'); + + echo 'ModuleManager Variable not set --> Create "default" ModuleManager'; + $moduleManager = new IPSModuleManager('IPSCam'); + } + + $moduleManager->VersionHandler()->CheckModuleVersion('IPS','2.50'); + $moduleManager->VersionHandler()->CheckModuleVersion('IPSModuleManager','2.50.2'); + $moduleManager->VersionHandler()->CheckModuleVersion('IPSLogger','2.50.2'); + $moduleManager->VersionHandler()->CheckModuleVersion('IPSComponent','2.50.1'); + + IPSUtils_Include ("IPSInstaller.inc.php", "IPSLibrary::install::IPSInstaller"); + IPSUtils_Include ("IPSCam.inc.php", "IPSLibrary::app::modules::IPSCam"); + IPSUtils_Include ("IPSCam_Constants.inc.php", "IPSLibrary::app::modules::IPSCam"); + IPSUtils_Include ("IPSCam_Configuration.inc.php", "IPSLibrary::config::modules::IPSCam"); + + $WFC10_Enabled = $moduleManager->GetConfigValue('Enabled', 'WFC10'); + $WFC10_ConfigId = $moduleManager->GetConfigValueIntDef('ID', 'WFC10', GetWFCIdDefault()); + $WFC10_Path = $moduleManager->GetConfigValue('Path', 'WFC10'); + $WFC10_TabPaneItem = $moduleManager->GetConfigValue('TabPaneItem', 'WFC10'); + $WFC10_TabPaneParent = $moduleManager->GetConfigValue('TabPaneParent', 'WFC10'); + $WFC10_TabPaneName = $moduleManager->GetConfigValue('TabPaneName', 'WFC10'); + $WFC10_TabPaneIcon = $moduleManager->GetConfigValue('TabPaneIcon', 'WFC10'); + $WFC10_TabPaneOrder = $moduleManager->GetConfigValueInt('TabPaneOrder', 'WFC10'); + $WFC10_TabItem = $moduleManager->GetConfigValue('TabItem', 'WFC10'); + $WFC10_TabName = $moduleManager->GetConfigValue('TabName', 'WFC10'); + $WFC10_TabIcon = $moduleManager->GetConfigValue('TabIcon', 'WFC10'); + $WFC10_TabOrder = $moduleManager->GetConfigValueInt('TabOrder', 'WFC10'); + + $Mobile_Enabled = $moduleManager->GetConfigValue('Enabled', 'Mobile'); + $Mobile_Path = $moduleManager->GetConfigValue('Path', 'Mobile'); + $Mobile_PathOrder = $moduleManager->GetConfigValueInt('PathOrder', 'Mobile'); + $Mobile_PathIcon = $moduleManager->GetConfigValue('PathOrder', 'Mobile'); + $Mobile_Name = $moduleManager->GetConfigValue('Name', 'Mobile'); + $Mobile_Order = $moduleManager->GetConfigValueInt('Order', 'Mobile'); + $Mobile_Icon = $moduleManager->GetConfigValue('Icon', 'Mobile'); + + // ---------------------------------------------------------------------------------------------------------------------------- + // Program Installation + // ---------------------------------------------------------------------------------------------------------------------------- + $CategoryIdData = $moduleManager->GetModuleCategoryID('data'); + $CategoryIdApp = $moduleManager->GetModuleCategoryID('app'); + + $categoryIdCommon = CreateCategory('Common', $CategoryIdData, 10); + $categoryIdCams = CreateCategory('Cams', $CategoryIdData, 20); + $categoryIdDisplay = CreateCategory('Display', $CategoryIdData, 30); + $categoryIdNavPanel = CreateCategory('NavigationPanel', $categoryIdDisplay,10); + $categoryIdCamPanel = CreateCategory('CameraPanel', $categoryIdDisplay,20); + + // Add Scripts + $scriptIdActionScript = IPS_GetScriptIDByName('IPSCam_ActionScript', $CategoryIdApp); + $scriptIdPurgeFiles = IPS_GetScriptIDByName('IPSCam_PurgeFiles', $CategoryIdApp); + $scriptIdGenerateMovies = IPS_GetScriptIDByName('IPSCam_GenerateMovies', $CategoryIdApp); + $scriptIdNavPicPrev = IPS_GetScriptIDByName('IPSCam_NavPicPrev', $CategoryIdApp); + $scriptIdNavPicNext = IPS_GetScriptIDByName('IPSCam_NavPicNext', $CategoryIdApp); + $scriptIdNavDayPrev = IPS_GetScriptIDByName('IPSCam_NavDayPrev', $CategoryIdApp); + $scriptIdNavDayNext = IPS_GetScriptIDByName('IPSCam_NavDayNext', $CategoryIdApp); + $scriptIdPictRef = IPS_GetScriptIDByName('IPSCam_RefreshPicture', $CategoryIdApp); + $scriptIdPictStore = IPS_GetScriptIDByName('IPSCam_StorePicture', $CategoryIdApp); + + IPS_SetIcon($scriptIdNavPicPrev, 'HollowArrowLeft'); + IPS_SetIcon($scriptIdNavPicNext, 'HollowArrowRight'); + IPS_SetIcon($scriptIdNavDayPrev, 'HollowDoubleArrowLeft'); + IPS_SetIcon($scriptIdNavDayNext, 'HollowDoubleArrowRight'); + IPS_SetIcon($scriptIdPictRef, 'Repeat'); + IPS_SetIcon($scriptIdPictStore, 'ArrowRight'); + + $timerId_PurgeFiles = CreateTimer_OnceADay ('Purge', $scriptIdPurgeFiles, 0, 30) ; + $timerId_GenerateMovies = CreateTimer_OnceADay ('Generate', $scriptIdGenerateMovies, 0, 45) ; + + // Profiles + $associationsMode = array(IPSCAM_MODE_LIVE => 'Live', + IPSCAM_MODE_PICTURE => 'Bild', + IPSCAM_MODE_HISTORY => 'History', + IPSCAM_MODE_SETTINGS => 'Einstellungen'); + + $associationsCam = array(); + foreach (IPSCam_GetConfiguration() as $idx=>$data) { + $associationsCam[$idx] = $data[IPSCAM_PROPERTY_NAME]; + } + + $associationsSize = array(IPSCAM_SIZE_SMALL => 'S', + IPSCAM_SIZE_MIDDLE => 'M', + IPSCAM_SIZE_LARGE => 'L'); + + $associationsNavPict = array(IPSCAM_NAV_BACK => '<<', + IPSCAM_NAV_FORWARD => '>>'); + + $associationsNavDays = array(IPSCAM_DAY_BACK => '<<', + IPSCAM_DAY_FORWARD => '>>'); + + $associationsMotMode = array(1*60 => '1 Min', + 5*60 => '5 Min', + 10*60 => '10 Min', + 30*60 => '30 Min', + 60*60 => '1 Stunde', + 60*60*24 => '1 Tag', + IPSCAM_VAL_DISABLED => 'Aus'); + + $associationsPictRef = array(10 => '10 Sek', + 30 => '30 Sek', + 60 => '1 Min', + 5*60 => '5 Min', + 10*60 => '10 Min', + 30*60 => '30 Min', + IPSCAM_VAL_DISABLED => 'Aus'); + + $associationsPictStore = array(30*60 => '30 Min', + 60*60 => '1 Stunde', + 60*60*4 => '4 Stunden', + IPSCAM_VAL_DISABLED => 'Aus'); + + $associationsPictReset = array(1*60 => '1 Min', + 5*60 => '5 Min', + 10*60 => '10 Min', + 30*60 => '30 Min', + 60*60 => '1 Stunde', + IPSCAM_VAL_DISABLED => 'Aus'); + + CreateProfile_Associations ('IPSCam_Size', $associationsSize); + CreateProfile_Associations ('IPSCam_Cam', $associationsCam); + CreateProfile_Associations ('IPSCam_Mode', $associationsMode); + CreateProfile_Associations ('IPSCam_NavPict', $associationsNavPict); + CreateProfile_Associations ('IPSCam_NavDays', $associationsNavDays); + CreateProfile_Associations ('IPSCam_MotMode', $associationsMotMode); + CreateProfile_Count ('IPSCam_MotHist', 1, 1, 365, null, ' Tage', null); + CreateProfile_Associations ('IPSCam_PictRef', $associationsPictRef); + CreateProfile_Associations ('IPSCam_PictStore', $associationsPictStore); + CreateProfile_Associations ('IPSCam_PictReset', $associationsPictReset); + CreateProfile_Count ('IPSCam_PictHist', 1, 1, 365, null, ' Tage', null); + + // =================================================================================================== + // Add Camera Devices + // =================================================================================================== + $variableIdCamSelect = CreateVariable(IPSCAM_VAR_CAMSELECT,1 /*Integer*/, $categoryIdCommon, 10, 'IPSCam_Cam', $scriptIdActionScript, 0, 'Power'); + $variableIdCamHtml = CreateVariable(IPSCAM_VAR_CAMHTML, 3 /*String*/, $categoryIdCommon,100, '~HTMLBox', $scriptIdActionScript, '', 'Window'); + $variableIdCamPictX = CreateMedia (IPSCAM_VAR_CAMPICT, $categoryIdCamX, IPS_GetKernelDir().'Cams/'.$idx.'/Picture/Current.jpg', false, 1 /*Image*/, 'Image', 30); + $variableIdCamHistX = CreateMedia (IPSCAM_VAR_CAMHIST, $categoryIdCamX, IPS_GetKernelDir().'Cams/'.$idx.'/History/20120101.jpg', false, 1 /*Image*/, 'Clock', 110); + $componentParams = $data[IPSCAM_PROPERTY_COMPONENT]; + $component = IPSComponent::CreateObjectByParams($componentParams); + $urlStream = $component->Get_URLLiveStream(); + $variableIdCamStreamX= CreateMediaStream (IPSCAM_VAR_CAMSTREAM, $categoryIdCamX, $urlStream,'Image', 40); + + $variableIdMotMode = CreateVariable(IPSCAM_VAR_MOTMODE, 1 /*Integer*/, $categoryIdCamX, 100, 'IPSCam_MotMode', $scriptIdActionScript, IPSCAM_VAL_DISABLED, 'Motion'); + $variableIdMotTime = CreateVariable(IPSCAM_VAR_MOTTIME, 3 /*String*/, $categoryIdCamX, 110, '~String', $scriptIdActionScript, '13:00', 'Clock'); + $variableIdMotHist = CreateVariable(IPSCAM_VAR_MOTHIST, 1 /*Integer*/, $categoryIdCamX, 120, 'IPSCam_MotHist', $scriptIdActionScript, 7, 'Image'); + $variableIdMotSize = CreateVariable(IPSCAM_VAR_MOTSIZE, 1 /*Integer*/, $categoryIdCamX, 130, 'IPSCam_Size', $scriptIdActionScript, 1, 'Distance'); + $variableIdPictRef = CreateVariable(IPSCAM_VAR_PICTREF, 1 /*Integer*/, $categoryIdCamX, 200, 'IPSCam_PictRef', $scriptIdActionScript, IPSCAM_VAL_DISABLED, 'Repeat'); + $variableIdPictStore = CreateVariable(IPSCAM_VAR_PICTSTORE, 1 /*Integer*/, $categoryIdCamX, 210, 'IPSCam_PictStore', $scriptIdActionScript, IPSCAM_VAL_DISABLED, 'Lightning'); + $variableIdPictReset = CreateVariable(IPSCAM_VAR_PICTRESET, 1 /*Integer*/, $categoryIdCamX, 220, 'IPSCam_PictReset', $scriptIdActionScript, IPSCAM_VAL_DISABLED, 'Cross'); + $variableIdPictHist = CreateVariable(IPSCAM_VAR_PICTHIST, 1 /*Integer*/, $categoryIdCamX, 230, 'IPSCam_PictHist', $scriptIdActionScript, 14, 'Image'); + $variableIdPictSize = CreateVariable(IPSCAM_VAR_PICTSIZE, 1 /*Integer*/, $categoryIdCamX, 240, 'IPSCam_Size', $scriptIdActionScript, 1, 'Distance'); + $variableIdNavTime = CreateVariable(IPSCAM_VAR_NAVTIME, 3 /*String*/, $categoryIdCamX, 300, '~String', null, date(IPSCAM_NAV_DATEFORMATDISP), 'Clock'); + $variableIdNavFile = CreateVariable(IPSCAM_VAR_NAVFILE, 3 /*String*/, $categoryIdCamX, 310, '~String', null, date(IPSCAM_NAV_DATEFORMATFILE), ''); + + IPSCAM_CreateDirectory(IPS_GetKernelDir().'Cams/'.$idx.'/History/'); + IPSCAM_CreateDirectory(IPS_GetKernelDir().'Cams/'.$idx.'/Picture/'); + IPSCAM_CreateDirectory(IPS_GetKernelDir().'Cams/'.$idx.'/MotionCapture/'); + } + + // Remove unused Variables + $variableIdSize = @IPS_GetObjectIDByIdent(Get_IdentByName('Size'), $categoryIdCommon); + if ($variableIdSize !== false) { + IPS_DeleteVariable($variableIdSize); + } + $variableIdNavFile = @IPS_GetObjectIDByIdent(Get_IdentByName(IPSCAM_VAR_NAVFILE), $categoryIdCommon); + if ($variableIdNavFile !== false) { + IPS_DeleteVariable($variableIdNavFile); + } + + + function IPSCAM_CreateDirectory($directory) { + if (!file_exists($directory)) { + mkdir($directory, 0, true); + } + } + + $baseId = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSCam'); + $displayCategoryId = IPS_GetObjectIDByIdent('Display', $baseId); + $categoryIdNavPanel = IPS_GetObjectIDByIdent('NavigationPanel', $displayCategoryId); + $categoryIdCamPanel = IPS_GetObjectIDByIdent('CameraPanel', $displayCategoryId); + $categoryIdCams = IPS_GetObjectIDByIdent('Cams', $baseId); + $categoryIdCommon = IPS_GetObjectIDByIdent('Common', $baseId); + + CreateLink('Auswahl', IPS_GetObjectIDByIdent(IPSCAM_VAR_CAMSELECT, $categoryIdCommon), $categoryIdCamPanel, 10); + CreateLink('Kamera', IPS_GetObjectIDByIdent(IPSCAM_VAR_CAMHTML, $categoryIdCommon), $categoryIdCamPanel, 20); + CreateLink('Bild', IPS_GetObjectIDByIdent(IPSCAM_VAR_CAMPICT, $categoryIdCommon), $categoryIdCamPanel, 30); + CreateLink('History', IPS_GetObjectIDByIdent(IPSCAM_VAR_CAMHIST, $categoryIdCommon), $categoryIdCamPanel, 40); + $instanceId = CreateDummyInstance("Einstellungen", $categoryIdCamPanel, 30); + + $instanceId = CreateDummyInstance("Modus", $categoryIdNavPanel, 10); + CreateLink('Live', IPS_GetObjectIDByIdent(IPSCAM_VAR_MODELIVE, $categoryIdCommon), $instanceId, 10); + CreateLink('Bild', IPS_GetObjectIDByIdent(IPSCAM_VAR_MODEPICT, $categoryIdCommon), $instanceId, 20); + CreateLink('History', IPS_GetObjectIDByIdent(IPSCAM_VAR_MODEHIST, $categoryIdCommon), $instanceId, 30); + CreateLink('Einstellungen', IPS_GetObjectIDByIdent(IPSCAM_VAR_MODESETT, $categoryIdCommon), $instanceId, 40); + $instanceId = CreateDummyInstance("Navigation", $categoryIdNavPanel, 20); + CreateLink('Bilder', IPS_GetObjectIDByIdent(IPSCAM_VAR_NAVPICT, $categoryIdCommon), $instanceId, 10); + CreateLink('Tage', IPS_GetObjectIDByIdent(IPSCAM_VAR_NAVDAYS, $categoryIdCommon), $instanceId, 20); + //CreateLink('Uhrzeit', IPS_GetObjectIDByIdent(IPSCAM_VAR_NAVTIME, $categoryIdCommon), $instanceId, 30); + $instanceId = CreateDummyInstance("Bild", $categoryIdNavPanel, 30); + CreateLink('Aktualisieren', IPSUtil_ObjectIDByPath('Program.IPSLibrary.app.modules.IPSCam.IPSCam_RefreshPicture'), $instanceId, 10); + CreateLink('Speichern', IPSUtil_ObjectIDByPath('Program.IPSLibrary.app.modules.IPSCam.IPSCam_StorePicture'), $instanceId, 20); + $instanceId = CreateDummyInstance("Kamera Einstellungen", $categoryIdNavPanel, 35); + $instanceId = CreateDummyInstance("Power", $categoryIdNavPanel, 40); + $id = CreateLink('Power', IPS_GetObjectIDByIdent(IPSCAM_VAR_MODESETT, $categoryIdCommon), $instanceId, 10); + IPS_SetIcon($id, 'Power'); + $id = CreateLink('WLAN', IPS_GetObjectIDByIdent(IPSCAM_VAR_MODESETT, $categoryIdCommon), $instanceId, 10); + IPS_SetIcon($id, 'Intensity'); + + // ---------------------------------------------------------------------------------------------------------------------------- + // Webfront Installation + // ---------------------------------------------------------------------------------------------------------------------------- + if ($WFC10_Enabled) { + //$categoryId_WebFront = CreateCategoryPath($WFC10_Path); + //EmptyCategory($categoryId_WebFront); + + $tabItem = $WFC10_TabPaneItem.$WFC10_TabItem; + DeleteWFCItems($WFC10_ConfigId, $tabItem); + CreateWFCItemTabPane ($WFC10_ConfigId, $WFC10_TabPaneItem, $WFC10_TabPaneParent, $WFC10_TabPaneOrder, $WFC10_TabPaneName, $WFC10_TabPaneIcon); + CreateWFCItemSplitPane ($WFC10_ConfigId, $tabItem, $WFC10_TabPaneItem, $WFC10_TabOrder, $WFC10_TabName, $WFC10_TabIcon, 1 /*Vertical*/, 330 /*Width*/, 0 /*Target=Pane1*/, 1/*UsePixel*/, 'true'); + CreateWFCItemCategory ($WFC10_ConfigId, $tabItem.'_Left', $tabItem, 10, '', '', $categoryIdNavPanel /*BaseId*/, 'false' /*BarBottomVisible*/); + CreateWFCItemCategory ($WFC10_ConfigId, $tabItem.'_Right', $tabItem, 20, '', '', $categoryIdCamPanel /*BaseId*/, 'false' /*BarBottomVisible*/); + + ReloadAllWebFronts(); + } + + // ---------------------------------------------------------------------------------------------------------------------------- + // Mobile Installation + // ---------------------------------------------------------------------------------------------------------------------------- + if ($Mobile_Enabled ) { + $mobileId = CreateCategoryPath($Mobile_Path, $Mobile_PathOrder, $Mobile_PathIcon); + $mobileId = CreateCategoryPath($Mobile_Path.'.'.$Mobile_Name, $Mobile_Order, $Mobile_Icon); + EmptyCategory($mobileId); + + $camConfig = IPSCam_GetConfiguration(); + foreach ($camConfig as $cameraIdx=>$data) { + $mobileIdCam = CreateCategory($data[IPSCAM_PROPERTY_NAME], $mobileId, $cameraIdx, 'Image'); + $categoryIdCam = IPS_GetCategoryIDByName($cameraIdx, $categoryIdCams); + + CreateLink('Live', IPS_GetObjectIDByIdent(IPSCAM_VAR_CAMHTML, $categoryIdCam), $mobileIdCam, 10); + CreateLink('Bild', IPS_GetObjectIDByIdent(IPSCAM_VAR_CAMPICT, $categoryIdCam), $mobileIdCam, 20); + CreateLink('Bild Aktualisieren', IPSUtil_ObjectIDByPath('Program.IPSLibrary.app.modules.IPSCam.IPSCam_RefreshPicture'.($cameraIdx+1)), $mobileIdCam, 30); + CreateLink('Bild Speichern', IPSUtil_ObjectIDByPath('Program.IPSLibrary.app.modules.IPSCam.IPSCam_StorePicture'.($cameraIdx+1)), $mobileIdCam, 40); + + if (array_key_exists(IPSCAM_PROPERTY_SWITCHPOWER, $camConfig[$cameraIdx])) { + $variableIdPower = $camConfig[$cameraIdx][IPSCAM_PROPERTY_SWITCHPOWER]; + if ($variableIdPower<>'') { + $id = CreateLink('Power', IPSUtil_ObjectIDByPath($variableIdPower), $mobileIdCam, 50); + IPS_SetIcon($id, 'Power'); + } + } + + if (array_key_exists(IPSCAM_PROPERTY_SWITCHWLAN, $camConfig[$cameraIdx])) { + $variableIdWLAN = $camConfig[$cameraIdx][IPSCAM_PROPERTY_SWITCHWLAN]; + if ($variableIdWLAN<>'') { + $id = CreateLink('WLAN', IPSUtil_ObjectIDByPath($variableIdWLAN), $mobileIdCam, 60); + $id = IPS_SetIcon($id, 'Intensity'); + } + } + + $categoryIdSettings = CreateCategory('Einstellungen', $categoryIdCam, 100); + $instanceIdDetail = CreateDummyInstance("Allgemein", $categoryIdSettings, 10); + CreateLink('Bild Aktualisierung', IPS_GetObjectIDByIdent(IPSCAM_VAR_PICTREF, $categoryIdCam), $instanceIdDetail, 10); + CreateLink('Aktivierung Bild Modus', IPS_GetObjectIDByIdent(IPSCAM_VAR_PICTRESET, $categoryIdCam), $instanceIdDetail, 30); + $instanceIdDetail = CreateDummyInstance("Automatische Bilder", $categoryIdSettings, 10); + CreateLink('Autom. Bild Speicherung',IPS_GetObjectIDByIdent(IPSCAM_VAR_PICTSTORE, $categoryIdCam), $instanceIdDetail, 20); + CreateLink('Bild Historisierung', IPS_GetObjectIDByIdent(IPSCAM_VAR_PICTHIST, $categoryIdCam), $instanceIdDetail, 40); + CreateLink('Bildgröße', IPS_GetObjectIDByIdent(IPSCAM_VAR_PICTSIZE, $categoryIdCam), $instanceIdDetail, 50); + $instanceIdDetail = CreateDummyInstance("Zeitraffer", $categoryIdSettings, 10); + CreateLink('Modus', IPS_GetObjectIDByIdent(IPSCAM_VAR_MOTMODE, $categoryIdCam), $instanceIdDetail, 60); + CreateLink('Abstand', IPS_GetObjectIDByIdent(IPSCAM_VAR_MOTTIME, $categoryIdCam), $instanceIdDetail, 70); + CreateLink('Zeitraum', IPS_GetObjectIDByIdent(IPSCAM_VAR_MOTHIST, $categoryIdCam), $instanceIdDetail, 80); + CreateLink('Bildgröße', IPS_GetObjectIDByIdent(IPSCAM_VAR_MOTSIZE, $categoryIdCam), $instanceIdDetail, 90); + } + + $instanceIdStreams = CreateDummyInstance("Live Streams", $mobileId, 100); + $camConfig = IPSCam_GetConfiguration(); + foreach ($camConfig as $cameraIdx=>$data) { + $categoryIdCam = IPS_GetCategoryIDByName($cameraIdx, $categoryIdCams); + CreateLink($data[IPSCAM_PROPERTY_NAME], IPS_GetObjectIDByIdent(IPSCAM_VAR_CAMHTML, $categoryIdCam), $instanceIdStreams, 10); + } + + $instanceIdHistory = CreateDummyInstance("History", $mobileId, 200); + CreateLink('Auswahl', IPS_GetObjectIDByIdent(IPSCAM_VAR_CAMSELECT, $categoryIdCommon), $instanceIdHistory, 10); + CreateLink('History Bild', IPS_GetObjectIDByIdent(IPSCAM_VAR_CAMHIST, $categoryIdCommon), $instanceIdHistory, 20); + CreateLink('Uhrzeit', IPS_GetObjectIDByIdent(IPSCAM_VAR_NAVTIME, $categoryIdCommon), $instanceIdHistory, 30); + CreateLink('Voriges Bild', IPSUtil_ObjectIDByPath('Program.IPSLibrary.app.modules.IPSCam.IPSCam_NavPicPrev'), $instanceIdHistory, 100); + CreateLink('Nächstes Bild', IPSUtil_ObjectIDByPath('Program.IPSLibrary.app.modules.IPSCam.IPSCam_NavPicNext'), $instanceIdHistory, 110); + CreateLink('Voriger Tag', IPSUtil_ObjectIDByPath('Program.IPSLibrary.app.modules.IPSCam.IPSCam_NavDayPrev'), $instanceIdHistory, 120); + CreateLink('Nächster Tag', IPSUtil_ObjectIDByPath('Program.IPSLibrary.app.modules.IPSCam.IPSCam_NavDayNext'), $instanceIdHistory, 130); + } + +?> \ No newline at end of file diff --git a/IPSLibrary/install/InstallationScripts/IPSEDIP_Installation.ips.php b/IPSLibrary/install/InstallationScripts/IPSEDIP_Installation.ips.php index f3073d6..5cda742 100644 --- a/IPSLibrary/install/InstallationScripts/IPSEDIP_Installation.ips.php +++ b/IPSLibrary/install/InstallationScripts/IPSEDIP_Installation.ips.php @@ -73,21 +73,23 @@ $id_value = CreateVariable(EDIP_VAR_OBJECTEDIT, 1 /*Integer*/, $id_Instance, 70, '', null, 0); // Create Serial Port - $id_IOComPort = null; - if ($configData[EDIP_CONFIG_COMPORT] <> '') { + $id_IOComPort = null; + if (array_key_exists(EDIP_CONFIG_IOINSTANCE, $configData)) { + $id_IOComPort = $configData[EDIP_CONFIG_IOINSTANCE]; + } elseif ($configData[EDIP_CONFIG_COMPORT] <> '') { $id_IOComPort = CreateSerialPort('EDIP_'.$configData[EDIP_CONFIG_NAME], $configData[EDIP_CONFIG_COMPORT], 115200, 1, 8, 'None',0, $IgnoreIOPortInstanceError); } // Create Register Variable $registerIdConfig = $configData[EDIP_CONFIG_REGISTER]; if ($registerIdConfig==null) { - if ($id_IOComPort==null) { - throw new IPSConfigHandlerException('Register Variable and ComPort not defined !!!'); - } + if ($id_IOComPort==null) { + throw new IPSConfigHandlerException('Register Variable and ComPort not defined !!!'); + } $registerIdConfig = CreateRegisterVariable($configData[EDIP_CONFIG_NAME].'_Register', $CategoryIdHW, $id_ScriptReceive, $id_IOComPort); } // Create Root Category if (!is_numeric($configData[EDIP_CONFIG_ROOT])) { - CreateCategoryPath($configData[EDIP_CONFIG_ROOT]); + CreateCategoryPath($configData[EDIP_CONFIG_ROOT]); } SetValue($id_Register, IPSUtil_ObjectIDByPath($registerIdConfig)); diff --git a/IPSLibrary/install/InstallationScripts/IPSHighcharts_Installation.ips.php b/IPSLibrary/install/InstallationScripts/IPSHighcharts_Installation.ips.php new file mode 100644 index 0000000..e51f74f --- /dev/null +++ b/IPSLibrary/install/InstallationScripts/IPSHighcharts_Installation.ips.php @@ -0,0 +1,79 @@ += 2.50 + * - IPSModuleManager >= 2.50.2 + * - IPSLogger >= 2.50.1 + * - IPSComponent >= 2.50.1 + * + * @page install_ipshighcharts Installations Schritte + * Folgende Schritte sind zur Installation der IPSHighcharts Ansteuerung nötig: + * - Laden des Modules (siehe IPSModuleManager) + * - Konfiguration (Details siehe Konfiguration) + * - Installation (siehe IPSModuleManager) + * + * @file IPSHighcharts_Installation.ips.php + * @author Andreas Brauneis + * @version + * Version 2.50.1, 29.09.2012
+ * + */ + + if (!isset($moduleManager)) { + IPSUtils_Include ('IPSModuleManager.class.php', 'IPSLibrary::install::IPSModuleManager'); + + echo 'ModuleManager Variable not set --> Create "default" ModuleManager'; + $moduleManager = new IPSModuleManager('IPSHighcharts'); + } + + $moduleManager->VersionHandler()->CheckModuleVersion('IPS','2.50'); + $moduleManager->VersionHandler()->CheckModuleVersion('IPSModuleManager','2.50.2'); + $moduleManager->VersionHandler()->CheckModuleVersion('IPSLogger','2.50.2'); + + IPSUtils_Include ("IPSInstaller.inc.php", "IPSLibrary::install::IPSInstaller"); + IPSUtils_Include ("IPSHighcharts.inc.php", "IPSLibrary::app::modules::Charts::IPSHighcharts"); + + // ---------------------------------------------------------------------------------------------------------------------------- + // Program Installation + // ---------------------------------------------------------------------------------------------------------------------------- + $CategoryIdData = $moduleManager->GetModuleCategoryID('data'); + $CategoryIdApp = $moduleManager->GetModuleCategoryID('app'); + + +?> \ No newline at end of file diff --git a/IPSLibrary/install/InstallationScripts/IPSHomematic_Installation.ips.php b/IPSLibrary/install/InstallationScripts/IPSHomematic_Installation.ips.php new file mode 100644 index 0000000..81b400d --- /dev/null +++ b/IPSLibrary/install/InstallationScripts/IPSHomematic_Installation.ips.php @@ -0,0 +1,241 @@ += 2.50 + * - IPSModuleManager >= 2.50.1 + * - IPSLogger >= 2.50.1 + * + * @section ipshomematic_visu Visualisierungen für ipshomematic + * - WebFront 10Zoll + * - Mobile + * + * @page install_ipshomematic_install Installations Schritte + * Folgende Schritte sind zur Installation der Homematic Ansteuerung nötig: + * - Laden des Modules (siehe IPSModuleManager) + * - Konfiguration (Details siehe Konfiguration) + * - Installation (siehe IPSModuleManager) + * + * @file IPSHomematic_Installation.ips.php + * @author Andreas Brauneis + * @version + * Version 2.50.1, 02.07.2012
+ * + */ + + if (!isset($moduleManager)) { + IPSUtils_Include ('IPSModuleManager.class.php', 'IPSLibrary::install::IPSModuleManager'); + + echo 'ModuleManager Variable not set --> Create "default" ModuleManager'.PHP_EOL; + $moduleManager = new IPSModuleManager('ipshomematic'); + } + + $moduleManager->VersionHandler()->CheckModuleVersion('IPS','2.50'); + $moduleManager->VersionHandler()->CheckModuleVersion('IPSModuleManager','2.50.2'); + $moduleManager->VersionHandler()->CheckModuleVersion('IPSLogger','2.50.2'); + + IPSUtils_Include ("IPSInstaller.inc.php", "IPSLibrary::install::IPSInstaller"); + + $WFC10_Enabled = $moduleManager->GetConfigValue('Enabled', 'WFC10'); + $WFC10_ConfigId = $moduleManager->GetConfigValueIntDef('ID', 'WFC10', GetWFCIdDefault()); + $WFC10_Path = $moduleManager->GetConfigValue('Path', 'WFC10'); + $WFC10_TabPaneItem = $moduleManager->GetConfigValue('TabPaneItem', 'WFC10'); + $WFC10_TabPaneParent = $moduleManager->GetConfigValue('TabPaneParent', 'WFC10'); + $WFC10_TabPaneName = $moduleManager->GetConfigValue('TabPaneName', 'WFC10'); + $WFC10_TabPaneOrder = $moduleManager->GetConfigValueInt('TabPaneOrder', 'WFC10'); + $WFC10_TabPaneIcon = $moduleManager->GetConfigValue('TabPaneIcon', 'WFC10'); + $WFC10_TabPaneExclusive = $moduleManager->GetConfigValueBoolDef('TabPaneExclusive', 'WFC10', false); + + $WFC10_TabItem1 = $moduleManager->GetConfigValue('TabItem1', 'WFC10'); + $WFC10_TabName1 = $moduleManager->GetConfigValue('TabName1', 'WFC10'); + $WFC10_TabIcon1 = $moduleManager->GetConfigValue('TabIcon1', 'WFC10'); + $WFC10_TabOrder1 = $moduleManager->GetConfigValueInt('TabOrder1', 'WFC10'); + + $Mobile_Enabled = $moduleManager->GetConfigValue('Enabled', 'Mobile'); + $Mobile_Path = $moduleManager->GetConfigValue('Path', 'Mobile'); + $Mobile_PathOrder = $moduleManager->GetConfigValueInt('PathOrder', 'Mobile'); + $Mobile_PathIcon = $moduleManager->GetConfigValue('PathIcon', 'Mobile'); + $Mobile_Name1 = $moduleManager->GetConfigValue('Name1', 'Mobile'); + $Mobile_Order1 = $moduleManager->GetConfigValueInt('Order1', 'Mobile'); + $Mobile_Icon1 = $moduleManager->GetConfigValue('Icon1', 'Mobile'); + + // ---------------------------------------------------------------------------------------------------------------------------- + // Program Installation + // ---------------------------------------------------------------------------------------------------------------------------- + $CategoryIdData = $moduleManager->GetModuleCategoryID('data'); + $CategoryIdApp = $moduleManager->GetModuleCategoryID('app'); + $CategoryIdHardware = CreateCategoryPath('Hardware.Homematic'); + + IPSUtils_Include ('IPSHomematic_Constants.inc.php', 'IPSLibrary::app::hardware::IPSHomematic'); + IPSUtils_Include ('IPSHomematic_Configuration.inc.php', 'IPSLibrary::config::hardware::IPSHomematic'); + + // Scripts + $scriptIdTimerRefreshServiceMessages = IPS_GetScriptIDByName('IPSHomematic_TimerRefreshServiceMessages', $CategoryIdApp); + $scriptIdTimerRefreshRSSI = IPS_GetScriptIDByName('IPSHomematic_TimerRefreshRSSI', $CategoryIdApp); + $scriptIdRefreshRSSI = IPS_GetScriptIDByName('IPSHomematic_RefreshRSSI', $CategoryIdApp); + $scriptIdRefreshServiceMessages = IPS_GetScriptIDByName('IPSHomematic_RefreshServiceMessages', $CategoryIdApp); + $scriptIdRefreshStatusVariables = IPS_GetScriptIDByName('IPSHomematic_RefreshStatusVariables', $CategoryIdApp); + $scriptIdResetServiceMessage = IPS_GetScriptIDByName('IPSHomematic_ResetServiceMessages', $CategoryIdApp); + $scriptIdChangeSettings = IPS_GetScriptIDByName('IPSHomematic_ChangeSettings', $CategoryIdApp); + $scriptIdSmokeDetector = IPS_GetScriptIDByName('IPSHomematic_SmokeDetector', $CategoryIdApp); + + // Timer + CreateTimer_CyclicByMinutes ('Check', $scriptIdTimerRefreshServiceMessages, 5); + CreateTimer_OnceADay ('Refresh_03', $scriptIdTimerRefreshRSSI, 3, 0); + CreateTimer_OnceADay ('Refresh_14', $scriptIdTimerRefreshRSSI, 14, 0); + + // Profiles + CreateProfile_Count ('IPSHomematic_Priority', 1, 1, 10, null, "", null); + + // Variables + $categoryIdStatus = CreateCategory('StatusMessages', $CategoryIdData, 100); + $controlIdRSSI = CreateVariable(HM_CONTROL_RSSI, 3 /*String*/, $categoryIdStatus, 10, '~HTMLBox', null, '', 'Intensity'); + $controlIdRSSIDevice = CreateVariable(HM_CONTROL_RSSIDEVICE, 3 /*String*/, $categoryIdStatus, 20, '~HTMLBox', null, '', 'Intensity'); + $controlIdRSSIPeer = CreateVariable(HM_CONTROL_RSSIPEER, 3 /*String*/, $categoryIdStatus, 30, '~HTMLBox', null, '', 'Intensity'); + $controlIdMessages = CreateVariable(HM_CONTROL_MESSAGES, 3 /*String*/, $categoryIdStatus, 40, '~HTMLBox', null, '', 'Warning'); + + $categoryIdSettings = CreateCategory('Settings', $CategoryIdData, 200); + $controlIdPriority = CreateVariable(HM_CONTROL_PRIORITY, 1 /*Integer*/, $categoryIdSettings, 10, 'IPSHomematic_Priority', $scriptIdChangeSettings, 2, 'Warning'); + + $moduleManager->LogHandler()->Log("Check Homematic Instances"); + + // Homematic Instances + foreach (get_HomematicConfiguration() as $component=>$componentData) { + $propertyAddress = $componentData[0]; + $propertyChannel = $componentData[1]; + $propertyProtocol = $componentData[2]; + $propertyType = $componentData[3]; + $propertyName = $component; + + $DeviceId = CreateHomematicInstance($moduleManager, + $propertyAddress, + $propertyChannel, + $propertyName, + $CategoryIdHardware, + $propertyProtocol); + + $SystemId = CreateHomematicInstance($moduleManager, + $propertyAddress, + 0, + $propertyName.'#', + $CategoryIdHardware, + $propertyProtocol); + + if ($propertyType==HM_TYPE_SMOKEDETECTOR) { + $variableId = IPS_GetVariableIDByName('STATE', $DeviceId); + + CreateEvent ($propertyName, $variableId, $scriptIdSmokeDetector); + } + } + + // ---------------------------------------------------------------------------------------------------------------------------- + // Webfront Installation + // ---------------------------------------------------------------------------------------------------------------------------- + if ($WFC10_Enabled) { + $moduleManager->LogHandler()->Log('Generate WebFront Interface'); + + $categoryIdWebFront = CreateCategoryPath($WFC10_Path); + EmptyCategory($categoryIdWebFront); + $categoryIdWebFrontLeft = CreateCategory('Left', $categoryIdWebFront, 10); + $categoryIdWebFrontRight = CreateCategory('Right', $categoryIdWebFront, 20); + $categoryIdWebFrontRightDetail1 = CreateCategory('RSSI Sender', $categoryIdWebFrontRight, 20); + $categoryIdWebFrontRightDetail2 = CreateCategory('RSSI Empfänger', $categoryIdWebFrontRight, 30); + CreateLink('Service Meldungen', $controlIdMessages, $categoryIdWebFrontRight, 10); + CreateLink('Empfangsstärken', $controlIdRSSI, $categoryIdWebFrontRight, 20); + CreateLink('RSSI Sender', $controlIdRSSIDevice, $categoryIdWebFrontRightDetail1, 10); + CreateLink('RSSI Empfänger', $controlIdRSSIPeer, $categoryIdWebFrontRightDetail2, 10); + + $instanceId = CreateDummyInstance('Service Meldungen', $categoryIdWebFrontLeft, 10); + CreateLink('Meldungen laden', $scriptIdRefreshServiceMessages, $instanceId, 10); + CreateLink('Meldungen bestätigen', $scriptIdResetServiceMessage, $instanceId, 20); + CreateLink('Priorität Notifizierung', $controlIdPriority, $instanceId, 30); + CreateLink('Refresh Empfangsstärken', $scriptIdRefreshRSSI, $categoryIdWebFrontLeft, 20); + CreateLink('Refresh Statusvariablen', $scriptIdRefreshStatusVariables, $categoryIdWebFrontLeft, 30); + + $WFC10Tab = $WFC10_TabPaneItem.$WFC10_TabItem1; + DeleteWFCItems($WFC10_ConfigId, $WFC10Tab); + CreateWFCItemTabPane ($WFC10_ConfigId, $WFC10_TabPaneItem, $WFC10_TabPaneParent, $WFC10_TabPaneOrder, $WFC10_TabPaneName, $WFC10_TabPaneIcon); + CreateWFCItemSplitPane ($WFC10_ConfigId, $WFC10Tab.'', $WFC10_TabPaneItem.'', $WFC10_TabOrder1, $WFC10_TabName1, $WFC10_TabIcon1, 1 /*Vertical*/, 40 /*Widht*/, 0 /*Target=Pane1*/, 0/*UsePercent*/, 'true'); + CreateWFCItemCategory ($WFC10_ConfigId, $WFC10Tab.'_Left', $WFC10Tab.'', 10, '', '', $categoryIdWebFrontLeft /*BaseId*/, 'false' /*BarBottomVisible*/); + CreateWFCItemCategory ($WFC10_ConfigId, $WFC10Tab.'_Right',$WFC10Tab.'', 20, '', '', $categoryIdWebFrontRight /*BaseId*/, 'true' /*BarBottomVisible*/); + + ReloadAllWebFronts(); + } + + // ---------------------------------------------------------------------------------------------------------------------------- + // Mobile Installation + // ---------------------------------------------------------------------------------------------------------------------------- + if ($Mobile_Enabled) { + $moduleManager->LogHandler()->Log('Generate Mobile Interface'); + + $categoryIdMobile = CreateCategoryPath($Mobile_Path, $Mobile_PathOrder, $Mobile_PathIcon); + $categoryIdMobile = CreateCategory($Mobile_Name1, $categoryIdMobile, $Mobile_Order1, $Mobile_Icon1); + + $instanceId = CreateDummyInstance('Empfangsstärken', $categoryIdMobile, 10); + CreateLink('RSSI Sender', $controlIdRSSIDevice, $instanceId, 10); + CreateLink('RSSI Empfänger', $controlIdRSSIPeer, $instanceId, 20); + CreateLink('Refresh', $scriptIdRefreshRSSI, $instanceId, 30); + + $instanceId = CreateDummyInstance('Service Meldungen', $categoryIdMobile, 20); + CreateLink('Aktuelle Meldungen', $controlIdMessages, $instanceId, 10); + CreateLink('Priorität Notifizierung', $controlIdPriority, $instanceId, 20); + CreateLink('Meldungen laden', $scriptIdRefreshServiceMessages, $instanceId, 30); + CreateLink('Meldungen bestätigen', $scriptIdResetServiceMessage, $instanceId, 40); + + $instanceId = CreateDummyInstance('Status Variablen', $categoryIdMobile, 30); + CreateLink('Refresh', $scriptIdRefreshStatusVariables, $instanceId, 10); + } + + // ---------------------------------------------------------------------------------------------------------------------------- + // Local Functions + // ---------------------------------------------------------------------------------------------------------------------------- + function CreateHomematicInstance($moduleManager, $Address, $Channel, $Name, $ParentId, $Protocol='BidCos-RF') { + foreach (IPS_GetInstanceListByModuleID("{EE4A81C6-5C90-4DB7-AD2F-F6BBD521412E}") as $HomematicModuleId ) { + $HMAddress = HM_GetAddress($HomematicModuleId); + if ($HMAddress=="$Address:$Channel") { + $moduleManager->LogHandler()->Log("Found existing HomaticModule '$Name' Address=$Address, Channel=$Channel, Protocol=$Protocol"); + return $HomematicModuleId; + } + } + + $moduleManager->LogHandler()->Log("Create HomaticModule '$Name' Address=$Address, Channel=$Channel, Protocol=$Protocol"); + $HomematicModuleId = IPS_CreateInstance("{EE4A81C6-5C90-4DB7-AD2F-F6BBD521412E}"); + IPS_SetParent($HomematicModuleId, $ParentId); + IPS_SetName($HomematicModuleId, $Name); + HM_SetAddress($HomematicModuleId, $Address.':'.$Channel); + if ($Protocol == 'BidCos-RF') { + $Protocol = 0; + } else { + $Protocol = 1; + } + HM_SetProtocol($HomematicModuleId, $Protocol); + HM_SetEmulateStatus($HomematicModuleId, true); + // Apply Changes + IPS_ApplyChanges($HomematicModuleId); + + return $HomematicModuleId; + } + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/install/InstallationScripts/IPSLight_Installation.ips.php b/IPSLibrary/install/InstallationScripts/IPSLight_Installation.ips.php new file mode 100644 index 0000000..189f998 --- /dev/null +++ b/IPSLibrary/install/InstallationScripts/IPSLight_Installation.ips.php @@ -0,0 +1,353 @@ += 2.50 + * - IPSModuleManager >= 2.50.2 + * - IPSLogger >= 2.50.1 + * - IPSComponent >= 2.50.1 + * - IPSMessageHandler >= 2.50.1 + * + * @page install_IPSLight Installations Schritte + * Folgende Schritte sind zur Installation der IPSLight Ansteuerung nötig: + * - Laden des Modules (siehe IPSModuleManager) + * - Konfiguration (Details siehe Konfiguration) + * - Installation (siehe IPSModuleManager) + * + * @file IPSLight_Installation.ips.php + * @author Andreas Brauneis + * @version + * Version 2.50.1, 19.03.2012
+ * + */ + + if (!isset($moduleManager)) { + IPSUtils_Include ('IPSModuleManager.class.php', 'IPSLibrary::install::IPSModuleManager'); + + echo 'ModuleManager Variable not set --> Create "default" ModuleManager'; + $moduleManager = new IPSModuleManager('IPSLight'); + } + + $moduleManager->VersionHandler()->CheckModuleVersion('IPS','2.50'); + $moduleManager->VersionHandler()->CheckModuleVersion('IPSModuleManager','2.50.2'); + $moduleManager->VersionHandler()->CheckModuleVersion('IPSLogger','2.50.2'); + $moduleManager->VersionHandler()->CheckModuleVersion('IPSComponent','2.50.1'); + $moduleManager->VersionHandler()->CheckModuleVersion('IPSMessageHandler','2.50.1'); + + IPSUtils_Include ("IPSInstaller.inc.php", "IPSLibrary::install::IPSInstaller"); + IPSUtils_Include ("IPSLight.inc.php", "IPSLibrary::app::modules::IPSLight"); + IPSUtils_Include ("IPSLight_Constants.inc.php", "IPSLibrary::app::modules::IPSLight"); + IPSUtils_Include ("IPSLight_Configuration.inc.php", "IPSLibrary::config::modules::IPSLight"); + + $WFC10_Enabled = $moduleManager->GetConfigValueBool('Enabled', 'WFC10'); + $WFC10_ConfigId = $moduleManager->GetConfigValueIntDef('ID', 'WFC10', GetWFCIdDefault()); + $WFC10_Path = $moduleManager->GetConfigValue('Path', 'WFC10'); + $WFC10_TabPaneItem = $moduleManager->GetConfigValue('TabPaneItem', 'WFC10'); + $WFC10_TabPaneParent = $moduleManager->GetConfigValue('TabPaneParent', 'WFC10'); + $WFC10_TabPaneName = $moduleManager->GetConfigValue('TabPaneName', 'WFC10'); + $WFC10_TabPaneIcon = $moduleManager->GetConfigValue('TabPaneIcon', 'WFC10'); + $WFC10_TabPaneOrder = $moduleManager->GetConfigValueInt('TabPaneOrder', 'WFC10'); + + $mobile_Enabled = $moduleManager->GetConfigValue('Enabled', 'Mobile'); + $mobile_Path = $moduleManager->GetConfigValue('Path', 'Mobile'); + $mobile_PathOrder = $moduleManager->GetConfigValueInt('PathOrder', 'Mobile'); + $mobile_PathIcon = $moduleManager->GetConfigValue('PathIcon', 'Mobile'); + + $WFC10_Regenerate = true; + $mobile_Regenerate = false; + + // ---------------------------------------------------------------------------------------------------------------------------- + // Program Installation + // ---------------------------------------------------------------------------------------------------------------------------- + $CategoryIdData = $moduleManager->GetModuleCategoryID('data'); + $CategoryIdApp = $moduleManager->GetModuleCategoryID('app'); + + $categoryIdSwitches = CreateCategory('Switches', $CategoryIdData, 10); + $categoryIdGroups = CreateCategory('Groups', $CategoryIdData, 20); + $categoryIdPrograms = CreateCategory('Programs', $CategoryIdData, 30); + $categoryIdSimulation = CreateCategory('Simulation', $CategoryIdData, 40); + + // Add Scripts + $scriptIdActionScript = IPS_GetScriptIDByName('IPSLight_ActionScript', $CategoryIdApp); + + // Profiles + CreateProfile_Switch ("IPSLight_Light", 'Aus', 'An', $Icon="", -1, 0x00ff00, $IconOff="BulbOff", $IconOn="BulbOn"); + CreateProfile_Count ('IPSLight_SimulationDays', 1, 1, 31, null, ' Tage', null); + CreateProfile_Associations ('IPSLight_SimulationMode', array(IPSLIGHT_SIMULATION_MODEDAYS => 'Tage zurück', + IPSLIGHT_SIMULATION_MODEUSR1 => 'Simulation 1', + IPSLIGHT_SIMULATION_MODEUSR2 => 'Simulation 2')); + + $statusId = CreateVariable(IPSLIGHT_SIMULATION_VARSTATE, 0 /*Boolean*/, $categoryIdSimulation, 10, '~Switch', $scriptIdActionScript, false, 'Motion'); + $statusId = CreateVariable(IPSLIGHT_SIMULATION_VARMODE, 1 /*Integer*/, $categoryIdSimulation, 20, 'IPSLight_SimulationMode', $scriptIdActionScript, 0, 'Gear'); + $statusId = CreateVariable(IPSLIGHT_SIMULATION_VARDAYS, 1 /*Integer*/, $categoryIdSimulation, 30, 'IPSLight_SimulationDays', $scriptIdActionScript, 7, 'Clock'); + $statusId = CreateVariable(IPSLIGHT_SIMULATION_VARDATE, 3 /*String*/, $categoryIdSimulation, 40, '~String', null, '', ''); + $statusId = CreateVariable(IPSLIGHT_SIMULATION_VARTIME, 3 /*String*/, $categoryIdSimulation, 50, '~String', null, '', ''); + + $directory = IPS_GetKernelDir().'\\Simulation'; + if (!file_exists($directory)) { + mkdir($directory, 0, true); + } + + // =================================================================================================== + // Add Light Devices + // =================================================================================================== + $idx = 10; + $lightConfig = IPSLight_GetLightConfiguration(); + foreach ($lightConfig as $deviceName=>$deviceData) { + $deviceType = $deviceData[IPSLIGHT_TYPE]; + + switch ($deviceType) { + case IPSLIGHT_TYPE_SWITCH: + $switchId = CreateVariable($deviceName, 0 /*Boolean*/, $categoryIdSwitches, $idx, '~Switch', $scriptIdActionScript, false, 'Bulb'); + break; + case IPSLIGHT_TYPE_DIMMER: + $switchId = CreateVariable($deviceName, 0 /*Boolean*/, $categoryIdSwitches, $idx, '~Switch', $scriptIdActionScript, false, 'Bulb'); + $levelId = CreateVariable($deviceName.IPSLIGHT_DEVICE_LEVEL, 1 /*Integer*/, $categoryIdSwitches, $idx, '~Intensity.100', $scriptIdActionScript, false, 'Intensity'); + break; + case IPSLIGHT_TYPE_RGB: + $switchId = CreateVariable($deviceName, 0 /*Boolean*/, $categoryIdSwitches, $idx, '~Switch', $scriptIdActionScript, false, 'Bulb'); + $colorId = CreateVariable($deviceName.IPSLIGHT_DEVICE_COLOR, 1 /*Integer*/, $categoryIdSwitches, $idx, '~HexColor', $scriptIdActionScript, false, 'HollowDoubleArrowRight'); + $levelId = CreateVariable($deviceName.IPSLIGHT_DEVICE_LEVEL, 1 /*Integer*/, $categoryIdSwitches, $idx, '~Intensity.100', $scriptIdActionScript, false, 'Intensity'); + break; + default: + trigger_error('Unknown DeviceType '.$deviceType.' found for Light '.$devicename); + } + $idx = $idx + 1; + } + + // =================================================================================================== + // Add Groups + // =================================================================================================== + $idx = 10; + $groupConfig = IPSLight_GetGroupConfiguration(); + foreach ($groupConfig as $groupName=>$groupData) { + $switchId = CreateVariable($groupName, 0 /*Boolean*/, $categoryIdGroups, $idx, '~Switch', $scriptIdActionScript, false, 'Bulb'); + $idx = $idx + 1; + } + + // =================================================================================================== + // Add Programs + // =================================================================================================== + $idx = 10; + $programConfig = IPSLight_GetProgramConfiguration(); + foreach ($programConfig as $programName=>$programData) { + $itemIdx = 0; + $programAssociations = array(); + foreach ($programData as $programItemName=>$programItemData) { + $programAssociations[]=$programItemName; + } + CreateProfile_Associations ('IPSLight_'.$programName, $programAssociations, "ArrowRight"); + $programId = CreateVariable($programName, 1 /*Integer*/, $categoryIdPrograms, $idx, 'IPSLight_'.$programName, $scriptIdActionScript, 0); + $idx = $idx + 1; + } + + // Register Events for Device Synchronization + // ------------------------------------------ + IPSUtils_Include ('IPSMessageHandler.class.php', 'IPSLibrary::app::core::IPSMessageHandler'); + $messageHandler = new IPSMessageHandler(); + $lightConfig = IPSLight_GetLightConfiguration(); + foreach ($lightConfig as $deviceName=>$deviceData) { + $component = $deviceData[IPSLIGHT_COMPONENT]; + $componentParams = explode(',', $component); + $componentClass = $componentParams[0]; + + // Homematic + if ($componentClass=='IPSComponentSwitch_Homematic') { + $instanceId = IPSUtil_ObjectIDByPath($componentParams[1]); + $variableId = @IPS_GetObjectIDByIdent('STATE', $instanceId); + if ($variableId===false) { + $moduleManager->LogHandler()->Log('Variable with Name STATE could NOT be found for Homematic Instance='.$instanceId); + } else { + $moduleManager->LogHandler()->Log('Register OnChangeEvent vor Homematic Instance='.$instanceId); + $messageHandler->RegisterOnChangeEvent($variableId, $component, 'IPSModuleSwitch_IPSLight,'); + } + // EIB + } elseif ($componentClass=='IPSComponentSwitch_EIB') { + $instanceId = IPSUtil_ObjectIDByPath($componentParams[1]); + $variableId = @IPS_GetObjectIDByIdent('Value', $instanceId); + if ($variableId===false) { + $moduleManager->LogHandler()->Log('Variable with Ident Value could NOT be found for EIB Instance='.$instanceId); + } else { + $moduleManager->LogHandler()->Log('Register OnChangeEvent vor EIB Instance='.$instanceId); + $messageHandler->RegisterOnChangeEvent($variableId, $component, 'IPSModuleSwitch_IPSLight,'); + } + // LCN + } elseif ($componentClass=='IPSComponentSwitch_LCN') { + $instanceId = IPSUtil_ObjectIDByPath($componentParams[1]); + $variableId = @IPS_GetObjectIDByIdent('Status', $instanceId); + if ($variableId===false) { + $moduleManager->LogHandler()->Log('Variable with Ident Status could NOT be found for LCN Instance='.$instanceId); + } else { + $moduleManager->LogHandler()->Log('Register OnChangeEvent vor LCN Instance='.$instanceId); + $messageHandler->RegisterOnChangeEvent($variableId, $component, 'IPSModuleSwitch_IPSLight,'); + } + // LCNa + } elseif ($componentClass=='IPSComponentSwitch_LCNa') { + $instanceId = IPSUtil_ObjectIDByPath($componentParams[1]); + $variableId = @IPS_GetObjectIDByIdent('Intensity', $instanceId); + if ($variableId===false) { + $moduleManager->LogHandler()->Log('Variable with Ident Intensity could NOT be found for LCN Instance='.$instanceId); + } else { + $moduleManager->LogHandler()->Log('Register OnChangeEvent vor LCN Instance='.$instanceId); + $messageHandler->RegisterOnChangeEvent($variableId, $component, 'IPSModuleSwitch_IPSLight,'); + } + } else { + //$moduleManager->LogHandler()->Log('Found Component '.$componentClass); + } + } + + + // ---------------------------------------------------------------------------------------------------------------------------- + // Webfront Installation + // ---------------------------------------------------------------------------------------------------------------------------- + if ($WFC10_Enabled) { + $categoryId_WebFront = CreateCategoryPath($WFC10_Path); + if ($WFC10_Regenerate) { + EmptyCategory($categoryId_WebFront); + DeleteWFCItems($WFC10_ConfigId, $WFC10_TabPaneItem); + DeleteWFCItems($WFC10_ConfigId, 'Light_TP'); + } + CreateWFCItemTabPane ($WFC10_ConfigId, $WFC10_TabPaneItem, $WFC10_TabPaneParent, $WFC10_TabPaneOrder, $WFC10_TabPaneName, $WFC10_TabPaneIcon); + + $webFrontConfig = IPSLight_GetWebFrontConfiguration(); + $order = 10; + foreach($webFrontConfig as $tabName=>$tabData) { + $tabCategoryId = CreateCategory($tabName, $categoryId_WebFront, $order); + foreach($tabData as $WFCItem) { + $order = $order + 10; + switch($WFCItem[0]) { + case IPSLIGHT_WFCSPLITPANEL: + CreateWFCItemSplitPane ($WFC10_ConfigId, $WFCItem[1], $WFCItem[2]/*Parent*/,$order,$WFCItem[3],$WFCItem[4],(int)$WFCItem[5],(int)$WFCItem[6],(int)$WFCItem[7],(int)$WFCItem[8],$WFCItem[9]); + break; + case IPSLIGHT_WFCCATEGORY: + $categoryId = CreateCategory($WFCItem[1], $tabCategoryId, $order); + CreateWFCItemCategory ($WFC10_ConfigId, $WFCItem[1], $WFCItem[2]/*Parent*/,$order, $WFCItem[3]/*Name*/,$WFCItem[4]/*Icon*/, $categoryId, 'false'); + break; + case IPSLIGHT_WFCGROUP: + case IPSLIGHT_WFCLINKS: + $categoryId = IPS_GetCategoryIDByName($WFCItem[2], $tabCategoryId); + if ($WFCItem[0]==IPSLIGHT_WFCGROUP) { + $categoryId = CreateDummyInstance ($WFCItem[1], $categoryId, $order); + } + $links = explode(',', $WFCItem[3]); + $names = $links; + if (array_key_exists(4, $WFCItem)) { + $names = explode(',', $WFCItem[4]); + } + foreach ($links as $idx=>$link) { + $order = $order + 1; + CreateLinkByDestination($names[$idx], get_VariableId($link,$categoryIdSwitches,$categoryIdGroups,$categoryIdPrograms), $categoryId, $order); + } + break; + default: + trigger_error('Unknown WFCItem='.$WFCItem[0]); + } + } + } + } + + // ---------------------------------------------------------------------------------------------------------------------------- + // Mobile Installation + // ---------------------------------------------------------------------------------------------------------------------------- + if ($mobile_Enabled ) { + $mobileId = CreateCategoryPath($mobile_Path, $mobile_PathOrder, $mobile_PathIcon); + if ($mobile_Regenerate) { + EmptyCategory($mobileId); + } + $order = 10; + foreach (IPSLight_GetMobileConfiguration() as $roomName=>$roomData) { + if (is_array($roomData)) { + $roomId = CreateCategory($roomName, $mobileId, $order); + foreach($roomData as $roomItem) { + $order = $order + 10; + switch($roomItem[0]) { + case IPSLIGHT_WFCGROUP: + case IPSLIGHT_WFCLINKS: + $instanceId = $roomId; + if ($roomItem[0]==IPSLIGHT_WFCGROUP) { + $instanceId = CreateDummyInstance ($roomItem[1], $roomId, $order); + } + $links = explode(',', $roomItem[2]); + $names = $links; + if (array_key_exists(3, $roomItem)) { + $names = explode(',', $roomItem[3]); + } + foreach ($links as $idx=>$link) { + $order = $order + 1; + CreateLinkByDestination($names[$idx], get_VariableId($link,$categoryIdSwitches,$categoryIdGroups,$categoryIdPrograms), $instanceId, $order); + } + break; + + default: + trigger_error('Unknown RoomItem='.$roomItem[0]); + } + } + } else { + $links = explode(',', $roomData); + foreach ($links as $link) { + CreateLink($link, get_VariableId($link,$categoryIdSwitches,$categoryIdGroups,$categoryIdPrograms), $mobileId, $order); + $order = $order + 10; + } + } + } + } + + // ---------------------------------------------------------------------------------------------------------------------------- + function get_VariableId($name, $switchCategoryId, $groupCategoryId, $categoryIdPrograms) { + $childrenIds = IPS_GetChildrenIDs($switchCategoryId); + foreach ($childrenIds as $childId) { + if (IPS_GetName($childId)==$name) { + return $childId; + } + } + $childrenIds = IPS_GetChildrenIDs($groupCategoryId); + foreach ($childrenIds as $childId) { + if (IPS_GetName($childId)==$name) { + return $childId; + } + } + $childrenIds = IPS_GetChildrenIDs($categoryIdPrograms); + foreach ($childrenIds as $childId) { + if (IPS_GetName($childId)==$name) { + return $childId; + } + } + trigger_error("$name could NOT be found in 'Switches' and 'Groups'"); + } + +?> \ No newline at end of file diff --git a/IPSLibrary/install/InstallationScripts/IPSModuleManagerGUI_Installation.ips.php b/IPSLibrary/install/InstallationScripts/IPSModuleManagerGUI_Installation.ips.php new file mode 100644 index 0000000..7ccc89c --- /dev/null +++ b/IPSLibrary/install/InstallationScripts/IPSModuleManagerGUI_Installation.ips.php @@ -0,0 +1,131 @@ += 2.50 + * - IPSModuleManager >= 2.50.3 + * - IPSLogger >= 2.50.1 + * + * @page install_IPSModuleManagerGUI Installations Schritte + * Folgende Schritte sind zur Installation der IPSModuleManagerGUI Ansteuerung nötig: + * - Laden des Modules (siehe IPSModuleManager) + * - Konfiguration (Details siehe Konfiguration) + * - Installation (siehe IPSModuleManager) + * + * @file IPSModuleManagerGUI_Installation.ips.php + * @author Andreas Brauneis + * @version + * Version 2.50.1, 29.10.2012
+ * + */ + + if (!isset($moduleManager)) { + IPSUtils_Include ('IPSModuleManager.class.php', 'IPSLibrary::install::IPSModuleManager'); + + echo 'ModuleManager Variable not set --> Create "default" ModuleManager'; + $moduleManager = new IPSModuleManager('IPSModuleManagerGUI'); + } + + $moduleManager->VersionHandler()->CheckModuleVersion('IPS','2.50'); + $moduleManager->VersionHandler()->CheckModuleVersion('IPSModuleManager','2.50.3'); + $moduleManager->VersionHandler()->CheckModuleVersion('IPSLogger','2.50.2'); + + IPSUtils_Include ("IPSInstaller.inc.php", "IPSLibrary::install::IPSInstaller"); + IPSUtils_Include ("IPSModuleManagerGUI.inc.php", "IPSLibrary::app::modules::IPSModuleManagerGUI"); + IPSUtils_Include ("IPSModuleManagerGUI_Constants.inc.php", "IPSLibrary::app::modules::IPSModuleManagerGUI"); + + $WFC10_Enabled = $moduleManager->GetConfigValue('Enabled', 'WFC10'); + $WFC10_ConfigId = $moduleManager->GetConfigValueIntDef('ID', 'WFC10', GetWFCIdDefault()); + $WFC10_Path = $moduleManager->GetConfigValue('Path', 'WFC10'); + $WFC10_TabPaneItem = $moduleManager->GetConfigValue('TabPaneItem', 'WFC10'); + $WFC10_TabPaneParent = $moduleManager->GetConfigValue('TabPaneParent', 'WFC10'); + $WFC10_TabPaneName = $moduleManager->GetConfigValue('TabPaneName', 'WFC10'); + $WFC10_TabPaneIcon = $moduleManager->GetConfigValue('TabPaneIcon', 'WFC10'); + $WFC10_TabPaneOrder = $moduleManager->GetConfigValueInt('TabPaneOrder', 'WFC10'); + $WFC10_TabItem = $moduleManager->GetConfigValue('TabItem', 'WFC10'); + $WFC10_TabName = $moduleManager->GetConfigValue('TabName', 'WFC10'); + $WFC10_TabIcon = $moduleManager->GetConfigValue('TabIcon', 'WFC10'); + $WFC10_TabOrder = $moduleManager->GetConfigValueInt('TabOrder', 'WFC10'); + + // ---------------------------------------------------------------------------------------------------------------------------- + // Program Installation + // ---------------------------------------------------------------------------------------------------------------------------- + $CategoryIdData = $moduleManager->GetModuleCategoryID('data'); + $CategoryIdApp = $moduleManager->GetModuleCategoryID('app'); + + // Add Scripts + $scriptIdSearchUpdates = IPS_GetScriptIDByName('IPSModuleManagerGUI_SearchUpdates', $CategoryIdApp); + + // Add Update Scripts + $timerId_SearchUpdates = CreateTimer_OnceADay ('SearchUpdates', $scriptIdSearchUpdates, rand(0,4), rand(0,59)) ; + + + // =================================================================================================== + // Add Module Details + // =================================================================================================== + $variableIdStatus = CreateVariable(IPSMMG_VAR_ACTION, 3 /*String*/, $CategoryIdData, 10, '~String', null, 'Overview', ''); + $variableIdModule = CreateVariable(IPSMMG_VAR_MODULE, 3 /*String*/, $CategoryIdData, 20, '~String', null, '', ''); + $variableIdInfo = CreateVariable(IPSMMG_VAR_INFO, 3 /*String*/, $CategoryIdData, 30, '~String', null, '', ''); + $variableIdHTML = CreateVariable(IPSMMG_VAR_HTML, 3 /*String*/, $CategoryIdData, 40, '~HTMLBox', null, '', 'Graph'); + + foreach (IPSPowerControl_GetValueConfiguration() as $idx=>$data) { + $valueType = $data[IPSPC_PROPERTY_VALUETYPE]; + switch($valueType) { + case IPSPC_VALUETYPE_GAS: + $variableIdValueM3 = CreateVariable(IPSPC_VAR_VALUEM3.$idx, 2 /*float*/, $categoryIdValues, 100+$idx, '~Gas', null, 0, 'Lightning'); + break; + case IPSPC_VALUETYPE_WATER: + $variableIdValueM3 = CreateVariable(IPSPC_VAR_VALUEM3.$idx, 2 /*float*/, $categoryIdValues, 100+$idx, '~Water', null, 0, 'Lightning'); + break; + default: + $variableIdValueKWH = CreateVariable(IPSPC_VAR_VALUEKWH.$idx, 2 /*float*/, $categoryIdValues, 100+$idx, '~Electricity', null, 0, 'Lightning'); + $variableIdValueWatt = CreateVariable(IPSPC_VAR_VALUEWATT.$idx, 2 /*float*/, $categoryIdValues, 200+$idx, '~Watt.14490', null, 0, 'Lightning'); + } + $variableIdSelectValue = CreateVariable(IPSPC_VAR_SELECTVALUE.$idx, 0 /*Boolean*/, $categoryIdCommon, 100+$idx, '~Switch', $scriptIdActionScript, 0, 'Lightning'); + } + + // =================================================================================================== + // Activate Variable Logging + // =================================================================================================== + $archiveHandlerList = IPS_GetInstanceListByModuleID ('{43192F0B-135B-4CE7-A0A7-1475603F3060}'); + $archiveHandlerId = $archiveHandlerList[0]; + foreach (IPSPowerControl_GetValueConfiguration() as $idx=>$data) { + $variableId = @IPS_GetObjectIDByIdent(IPSPC_VAR_VALUEKWH.$idx, $categoryIdValues); + if ($variableId!==false and !AC_GetLoggingStatus($archiveHandlerId, $variableId)) { + AC_SetLoggingStatus($archiveHandlerId, $variableId, true); + AC_SetAggregationType($archiveHandlerId, $variableId, 1); + } + $variableId = @IPS_GetObjectIDByIdent(IPSPC_VAR_VALUEWATT.$idx, $categoryIdValues); + if ($variableId!==false and !AC_GetLoggingStatus($archiveHandlerId, $variableId)) { + AC_SetLoggingStatus($archiveHandlerId, $variableId, true); + //AC_SetAggregationType($archiveHandlerId, $variableId, 1); + } + $variableId = @IPS_GetObjectIDByIdent(IPSPC_VAR_VALUEM3.$idx, $categoryIdValues); + if ($variableId!==false and !AC_GetLoggingStatus($archiveHandlerId, $variableId)) { + AC_SetLoggingStatus($archiveHandlerId, $variableId, true); + AC_SetAggregationType($archiveHandlerId, $variableId, 1); + } + } + IPS_ApplyChanges($archiveHandlerId); + + // ---------------------------------------------------------------------------------------------------------------------------- + // Webfront Installation + // ---------------------------------------------------------------------------------------------------------------------------- + if ($WFC10_Enabled) { + $categoryId_WebFront = CreateCategoryPath($WFC10_Path); + EmptyCategory($categoryId_WebFront); + $categoryIdLeft = CreateCategory('Left', $categoryId_WebFront, 10); + $categoryIdRight = CreateCategory('Right', $categoryId_WebFront, 20); + + $tabItem = $WFC10_TabPaneItem.$WFC10_TabItem; + DeleteWFCItems($WFC10_ConfigId, $tabItem); + CreateWFCItemTabPane ($WFC10_ConfigId, $WFC10_TabPaneItem, $WFC10_TabPaneParent, $WFC10_TabPaneOrder, $WFC10_TabPaneName, $WFC10_TabPaneIcon); + CreateWFCItemSplitPane ($WFC10_ConfigId, $tabItem, $WFC10_TabPaneItem, $WFC10_TabOrder, $WFC10_TabName, $WFC10_TabIcon, 1 /*Vertical*/, 360 /*Width*/, 0 /*Target=Pane1*/, 1/*UsePixel*/, 'true'); + CreateWFCItemCategory ($WFC10_ConfigId, $tabItem.'_Left', $tabItem, 10, '', '', $categoryIdLeft /*BaseId*/, 'false' /*BarBottomVisible*/); + CreateWFCItemCategory ($WFC10_ConfigId, $tabItem.'_Right', $tabItem, 20, '', '', $categoryIdRight /*BaseId*/, 'false' /*BarBottomVisible*/); + + // Left Panel + $instanceId = CreateDummyInstance("Stromkreise", $categoryIdLeft, 30); + foreach (IPSPowerControl_GetValueConfiguration() as $idx=>$data) { + if ($data[IPSPC_PROPERTY_DISPLAY]) { + $variableIdSelectValue = IPS_GetObjectIDByIdent(IPSPC_VAR_SELECTVALUE.$idx, $categoryIdCommon); + $valueType = $data[IPSPC_PROPERTY_VALUETYPE]; + switch($valueType) { + case IPSPC_VALUETYPE_GAS: + CreateLink($data[IPSPC_PROPERTY_NAME], $variableIdSelectValue, $categoryIdLeft, $idx); + break; + case IPSPC_VALUETYPE_WATER: + CreateLink($data[IPSPC_PROPERTY_NAME], $variableIdSelectValue, $categoryIdLeft, $idx); + break; + default: + CreateLink($data[IPSPC_PROPERTY_NAME], $variableIdSelectValue, $instanceId, $idx); + } + } + } + + // Right Panel + CreateLink('Type/Offset', $variableIdTypeOffset, $categoryIdRight, 10); + CreateLink('Zeitraum', $variableIdPeriodCount, $categoryIdRight, 20); + CreateLink('Chart', $variableIdChartHtml, $categoryIdRight, 40); + + ReloadAllWebFronts(); + } + + // ---------------------------------------------------------------------------------------------------------------------------- + // Mobile Installation + // ---------------------------------------------------------------------------------------------------------------------------- + if ($Mobile_Enabled ) { + $mobileId = CreateCategoryPath($Mobile_Path, $Mobile_PathOrder, $Mobile_PathIcon); + $mobileId = CreateCategory($Mobile_Name, $mobileId, $Mobile_Order, $Mobile_Icon); + EmptyCategory($mobileId); + + CreateLink('Chart', $variableIdChartHtml, $mobileId, 10); + + $instanceIdChart = CreateDummyInstance("Chart Auswahl", $mobileId, 20); + CreateLink('Statistic', $variableIdTypeOffset, $instanceIdChart, 10); + + $instanceIdChart = CreateDummyInstance("Zeitraum", $mobileId, 30); + CreateLink('Zeitraum', $variableIdPeriodCount, $instanceIdChart, 50); + CreateLink('Anzahl', $variableIdTimeCount, $instanceIdChart, 60); + CreateLink('Anzahl -', $scriptIdCountMinus, $instanceIdChart, 70); + CreateLink('Anzahl +', $scriptIdCountPlus, $instanceIdChart, 80); + CreateLink('Zeit Offset', $variableIdTimeOffset, $instanceIdChart, 20); + CreateLink('Zeit Zurück', $scriptIdNavPrev, $instanceIdChart, 30); + CreateLink('Zeit Vorwärts', $scriptIdNavNext, $instanceIdChart, 40); + + $instanceIdChart = CreateDummyInstance("Auswahl Verbraucher", $mobileId, 40); + foreach (IPSPowerControl_GetValueConfiguration() as $idx=>$data) { + if ($data[IPSPC_PROPERTY_DISPLAY]) { + $variableIdSelectValue = IPS_GetObjectIDByIdent(IPSPC_VAR_SELECTVALUE.$idx, $categoryIdCommon); + $valueType = $data[IPSPC_PROPERTY_VALUETYPE]; + switch($valueType) { + case IPSPC_VALUETYPE_GAS: + CreateLink($data[IPSPC_PROPERTY_NAME], $variableIdSelectValue, $instanceIdChart, $idx); + break; + case IPSPC_VALUETYPE_WATER: + CreateLink($data[IPSPC_PROPERTY_NAME], $variableIdSelectValue, $instanceIdChart, $idx); + break; + default: + CreateLink($data[IPSPC_PROPERTY_NAME], $variableIdSelectValue, $instanceIdChart, $idx); + } + } + } + } + +?> \ No newline at end of file diff --git a/IPSLibrary/install/InstallationScripts/IPSShadowing_Installation.ips.php b/IPSLibrary/install/InstallationScripts/IPSShadowing_Installation.ips.php new file mode 100644 index 0000000..aed50b4 --- /dev/null +++ b/IPSLibrary/install/InstallationScripts/IPSShadowing_Installation.ips.php @@ -0,0 +1,924 @@ + + * Detailansicht eines eines Beschattungselementes + * @image html IPSShadowing_WFDevice.png + * + *@}*/ + + /**@defgroup ipsshadowing_install IPSShadowing Installation + * @ingroup ipsshadowing + * @{ + * + * Script zur kompletten Installation der IPSShadowing Steuerung. + * + * Vor der Installation muß das File IPSShadowing_Configuration.inc.php an die persönlichen + * Bedürfnisse angepasst werden. + * + * @page rquirements_ipsshadowing Installations Voraussetzungen + * - IPS Kernel >= 2.50 + * - IPSModuleManager >= 2.50.2 + * - IPSLogger >= 2.50.1 + * - IPSComponent >= 2.50.1 + * + * @page install_ipsshadowing Installations Schritte + * Folgende Schritte sind zur Installation der IPSShadowing Ansteuerung nötig: + * - Laden des Modules (siehe IPSModuleManager) + * - Konfiguration (Details siehe Konfiguration) + * - Installation (siehe IPSModuleManager) + * + * @file IPSShadowing_Installation.ips.php + * @author Andreas Brauneis + * + * @version + * Version 2.50.1, 19.03.2012
+ * + */ + + if (!isset($moduleManager)) { + IPSUtils_Include ('IPSModuleManager.class.php', 'IPSLibrary::install::IPSModuleManager'); + + echo 'ModuleManager Variable not set --> Create "default" ModuleManager'; + $moduleManager = new IPSModuleManager('IPSShadowing'); + } + + $moduleManager->VersionHandler()->CheckModuleVersion('IPS','2.50'); + $moduleManager->VersionHandler()->CheckModuleVersion('IPSModuleManager','2.50.2'); + $moduleManager->VersionHandler()->CheckModuleVersion('IPSLogger','2.50.2'); + $moduleManager->VersionHandler()->CheckModuleVersion('IPSComponent','2.50.1'); + $moduleManager->VersionHandler()->CheckModuleVersion('IPSTwilight','2.50.1'); + + IPSUtils_Include ("IPSInstaller.inc.php", "IPSLibrary::install::IPSInstaller"); + IPSUtils_Include ("IPSShadowing.inc.php", "IPSLibrary::app::modules::IPSShadowing"); + IPSUtils_Include ("IPSShadowing_Constants.inc.php", "IPSLibrary::app::modules::IPSShadowing"); + IPSUtils_Include ("IPSShadowing_Configuration.inc.php", "IPSLibrary::config::modules::IPSShadowing"); + + $WFC10_Enabled = $moduleManager->GetConfigValue('Enabled', 'WFC10'); + $WFC10_ConfigId = $moduleManager->GetConfigValueIntDef('ID', 'WFC10', GetWFCIdDefault()); + $WFC10_Path = $moduleManager->GetConfigValue('Path', 'WFC10'); + $WFC10_TabPaneItem = $moduleManager->GetConfigValue('TabPaneItem', 'WFC10'); + $WFC10_TabPaneParent = $moduleManager->GetConfigValue('TabPaneParent', 'WFC10'); + $WFC10_TabPaneName = $moduleManager->GetConfigValue('TabPaneName', 'WFC10'); + $WFC10_TabPaneIcon = $moduleManager->GetConfigValue('TabPaneIcon', 'WFC10'); + $WFC10_TabPaneOrder = $moduleManager->GetConfigValueInt('TabPaneOrder', 'WFC10'); + $WFC10_TabName1 = $moduleManager->GetConfigValue('TabName1', 'WFC10'); + $WFC10_TabIcon1 = $moduleManager->GetConfigValue('TabIcon1', 'WFC10'); + + $Mobile_Enabled = $moduleManager->GetConfigValue('Enabled', 'Mobile'); + $Mobile_Path = $moduleManager->GetConfigValue('Path', 'Mobile'); + $Mobile_PathOrder = $moduleManager->GetConfigValueInt('PathOrder', 'Mobile'); + $Mobile_PathIcon = $moduleManager->GetConfigValue('PathIcon', 'Mobile'); + + // ---------------------------------------------------------------------------------------------------------------------------- + // Program Installation + // ---------------------------------------------------------------------------------------------------------------------------- + $CategoryIdData = $moduleManager->GetModuleCategoryID('data'); + $CategoryIdApp = $moduleManager->GetModuleCategoryID('app'); + + + // Add Scripts + $ScriptIdChangeSettings = IPS_GetScriptIDByName('IPSShadowing_ChangeSettings', $CategoryIdApp); + $ScriptIdAutomaticOn = IPS_GetScriptIDByName('IPSShadowing_AutomaticOn', $CategoryIdApp); + $ScriptIdAutomaticOff = IPS_GetScriptIDByName('IPSShadowing_AutomaticOff', $CategoryIdApp); + $ScriptIdAutomaticReset = IPS_GetScriptIDByName('IPSShadowing_AutomaticReset', $CategoryIdApp); + $ScriptIdRefreshTimer = IPS_GetScriptIDByName('IPSShadowing_RefreshTimer', $CategoryIdApp); + $ScriptIdProgramTimer = IPS_GetScriptIDByName('IPSShadowing_ProgramTimer', $CategoryIdApp); + $ScriptIdResetTimer = IPS_GetScriptIDByName('IPSShadowing_ResetTimer', $CategoryIdApp); + $ScriptIdScenarioCreate = IPS_GetScriptIDByName('IPSShadowing_ScenarioCreate', $CategoryIdApp); + $ScriptIdScenarioDelete = IPS_GetScriptIDByName('IPSShadowing_ScenarioDelete', $CategoryIdApp); + $ScriptIdProfileTempCreate = IPS_GetScriptIDByName('IPSShadowing_ProfileTempCreate', $CategoryIdApp); + $ScriptIdProfileTempDelete = IPS_GetScriptIDByName('IPSShadowing_ProfileTempDelete', $CategoryIdApp); + $ScriptIdProfileSunCreate = IPS_GetScriptIDByName('IPSShadowing_ProfileSunCreate', $CategoryIdApp); + $ScriptIdProfileSunDelete = IPS_GetScriptIDByName('IPSShadowing_ProfileSunDelete', $CategoryIdApp); + $ScriptIdProfileWeatherCreate = IPS_GetScriptIDByName('IPSShadowing_ProfileWeatherCreate', $CategoryIdApp); + $ScriptIdProfileWeatherDelete = IPS_GetScriptIDByName('IPSShadowing_ProfileWeatherDelete', $CategoryIdApp); + $ScriptIdProfileBgnOfDayCreate = IPS_GetScriptIDByName('IPSShadowing_ProfileBgnOfDayCreate', $CategoryIdApp); + $ScriptIdProfileBgnOfDayDelete = IPS_GetScriptIDByName('IPSShadowing_ProfileBgnOfDayDelete', $CategoryIdApp); + $ScriptIdProfileEndOfDayCreate = IPS_GetScriptIDByName('IPSShadowing_ProfileEndOfDayCreate', $CategoryIdApp); + $ScriptIdProfileEndOfDayDelete = IPS_GetScriptIDByName('IPSShadowing_ProfileEndOfDayDelete', $CategoryIdApp); + + // Create Circles and Controls + // ---------------------------------------------------------------------------------------------------------------------------- + $IPSShadowing_ProgNigJal = array( + c_ProgramId_Manual => c_Program_Manual, + c_ProgramId_Opened => c_Program_Opened, + c_ProgramId_Dimout => c_Program_Dimout); + $IPSShadowing_ProgDayJal = array( + c_ProgramId_Manual => c_Program_Manual, + c_ProgramId_Opened => c_Program_Opened, + c_ProgramId_OpenedOrShadowing => c_Program_OpenedOrShadowing, + c_ProgramId_Dimout => c_Program_Dimout); + $IPSShadowing_ProgTmpJal = array( + c_ProgramId_Manual => c_Program_Manual, + c_ProgramId_DimoutOrShadowing => c_Program_DimoutOrShadowing, + c_ProgramId_DimoutAndShadowing => c_Program_DimoutAndShadowing, + c_ProgramId_Dimout => c_Program_Dimout); + $IPSShadowing_ProgPreJal = array( + c_ProgramId_Manual => c_Program_Manual, + c_ProgramId_Opened => c_Program_Opened, + c_ProgramId_OpenedDay => c_Program_OpenedDay, + c_ProgramId_OpenedNight => c_Program_OpenedNight); + + $IPSShadowing_ProgNigSht = array( + c_ProgramId_Manual => c_Program_Manual, + c_ProgramId_Opened => c_Program_Opened, + c_ProgramId_25 => c_Program_25, + c_ProgramId_50 => c_Program_50, + c_ProgramId_75 => c_Program_75, + c_ProgramId_90 => c_Program_90, + c_ProgramId_Closed => c_Program_Closed); + $IPSShadowing_ProgDaySht = array( + c_ProgramId_Manual => c_Program_Manual, + c_ProgramId_Opened => c_Program_Opened, + c_ProgramId_25 => c_Program_25, + c_ProgramId_50 => c_Program_50, + c_ProgramId_75 => c_Program_75, + c_ProgramId_90 => c_Program_90, + c_ProgramId_Closed => c_Program_Closed); + $IPSShadowing_ProgTmpSht = array( + c_ProgramId_Manual => c_Program_Manual, + c_ProgramId_25 => c_Program_25, + c_ProgramId_50 => c_Program_50, + c_ProgramId_75 => c_Program_75, + c_ProgramId_90 => c_Program_90, + c_ProgramId_Closed => c_Program_Closed); + $IPSShadowing_ProgPreSht = array( + c_ProgramId_Manual => c_Program_Manual, + c_ProgramId_Opened => c_Program_Opened, + c_ProgramId_OpenedDay => c_Program_OpenedDay, + c_ProgramId_OpenedNight => c_Program_OpenedNight); + + $IPSShadowing_ProgNigMar = array( + c_ProgramId_Manual => c_Program_Manual, + c_ProgramId_MovedIn => c_Program_MovedIn, + c_ProgramId_MovedOut => c_Program_MovedOut); + $IPSShadowing_ProgDayMar = array( + c_ProgramId_Manual => c_Program_Manual, + c_ProgramId_MovedIn => c_Program_MovedIn, + c_ProgramId_50 => c_Program_50, + c_ProgramId_75 => c_Program_75, + c_ProgramId_MovedOut => c_Program_MovedOut); + $IPSShadowing_ProgTmpMar = array( + c_ProgramId_Manual => c_Program_Manual, + c_ProgramId_50 => c_Program_50, + c_ProgramId_75 => c_Program_75, + c_ProgramId_MovedOut => c_Program_MovedOut); + $IPSShadowing_ProgPreMar = array( + c_ProgramId_Manual => c_Program_Manual, + c_ProgramId_50 => c_Program_50, + c_ProgramId_75 => c_Program_75, + c_ProgramId_MovedOut => c_Program_MovedOut, + c_ProgramId_MovedOutTemp => c_Program_MovedOutTemp); + $IPSShadowing_ProgWeaMar = array( + c_ProgramId_Manual => c_Program_Manual, + c_ProgramId_MovedIn => c_Program_MovedIn); + + $IPSShadowing_Movement = array( + c_MovementId_Opened => c_Movement_Opened, + c_MovementId_Space => c_Movement_Space, + c_MovementId_Down => c_Movement_Down, + c_MovementId_Stop => c_Movement_Stop, + c_MovementId_Up => c_Movement_Up, + ); + $IPSShadowing_MovementJal = $IPSShadowing_Movement; + $IPSShadowing_MovementJal[c_MovementId_Shadowing] = c_Movement_Shadowing; + $IPSShadowing_MovementJal[c_MovementId_Dimout] = c_Movement_Dimout; + + $IPSShadowing_MovementSht = $IPSShadowing_Movement; + $IPSShadowing_MovementSht[c_MovementId_Closed] = c_Movement_Closed; + $IPSShadowing_MovementSht[c_MovementId_90] = c_Movement_90; + $IPSShadowing_MovementSht[c_MovementId_75] = c_Movement_75; + $IPSShadowing_MovementSht[c_MovementId_50] = c_Movement_50; + + $IPSShadowing_MovementMar = array( + c_MovementId_MovedOut => c_Movement_MovedOut, + c_MovementId_75 => c_Movement_75, + c_MovementId_50 => c_Movement_50, + c_MovementId_MovedIn => c_Movement_MovedIn, + c_MovementId_Space => c_Movement_Space, + c_MovementId_MovingOut => c_Movement_MovingOut, + c_MovementId_Stop => c_Movement_Stop, + c_MovementId_MovingIn => c_Movement_MovingIn, + ); + $IPSShadowing_MovementCol = array( + c_MovementId_Stop => -1, + c_MovementId_Down => 0x00FF00, + c_MovementId_Up => 0x00FF00, + c_MovementId_MovingIn => 0x00FF00, + c_MovementId_MovingOut => 0x00FF00, + c_MovementId_Space => 0, + c_MovementId_NoAction => 0xAAAAAA, + c_MovementId_Opened => 0xAAAAAA, + c_MovementId_MovedIn => 0xAAAAAA, + c_MovementId_25 => 0xAAAAAA, + c_MovementId_50 => 0xAAAAAA, + c_MovementId_75 => 0xAAAAAA, + c_MovementId_90 => 0xAAAAAA, + c_MovementId_Shadowing => 0xAAAAAA, + c_MovementId_Dimout => 0xAAAAAA, + c_MovementId_Closed => 0xAAAAAA, + c_MovementId_MovedOut => 0xAAAAAA, + ); + + $IPSShadowing_MovementJal[c_MovementId_Shadowing] = c_Movement_Shadowing; + + CreateProfile_Associations ('IPSShadowing_ProgNigSht', $IPSShadowing_ProgNigSht); + CreateProfile_Associations ('IPSShadowing_ProgDaySht', $IPSShadowing_ProgDaySht); + CreateProfile_Associations ('IPSShadowing_ProgTmpSht', $IPSShadowing_ProgTmpSht); + CreateProfile_Associations ('IPSShadowing_ProgPreSht', $IPSShadowing_ProgPreSht); + CreateProfile_Associations ('IPSShadowing_ProgNigJal', $IPSShadowing_ProgNigJal); + CreateProfile_Associations ('IPSShadowing_ProgDayJal', $IPSShadowing_ProgDayJal); + CreateProfile_Associations ('IPSShadowing_ProgTmpJal', $IPSShadowing_ProgTmpJal); + CreateProfile_Associations ('IPSShadowing_ProgPreJal', $IPSShadowing_ProgPreJal); + CreateProfile_Associations ('IPSShadowing_ProgNigMar', $IPSShadowing_ProgNigMar); + CreateProfile_Associations ('IPSShadowing_ProgDayMar', $IPSShadowing_ProgDayMar); + CreateProfile_Associations ('IPSShadowing_ProgTmpMar', $IPSShadowing_ProgTmpMar); + CreateProfile_Associations ('IPSShadowing_ProgPreMar', $IPSShadowing_ProgPreMar); + CreateProfile_Associations ('IPSShadowing_ProgWeaMar', $IPSShadowing_ProgWeaMar); + + CreateProfile_Associations ('IPSShadowing_MovementJal', $IPSShadowing_MovementJal, "", $IPSShadowing_MovementCol, true); + CreateProfile_Associations ('IPSShadowing_MovementSht', $IPSShadowing_MovementSht, "", $IPSShadowing_MovementCol, true); + CreateProfile_Associations ('IPSShadowing_MovementMar', $IPSShadowing_MovementMar, "", $IPSShadowing_MovementCol, true); + + CreateProfile_Count ('IPSShadowing_Step', 1, 1, 4, null, "", null); + CreateProfile_Count ('IPSShadowing_Priority', 1, 1, 10, null, "", null); + CreateProfile_Count ('IPSShadowing_TempDelta', 1, 1, 5, null, " °C", null); + CreateProfile_Count ('IPSShadowing_Position', 0, 1, 100, null, "%", null); + + CreateProfile_Associations ('IPSShadowing_TempLevelOutShadow', array(22=>'Aussen >= 22°C', 23=>'>= 23°C', 24=>'>= 24°C', 25=>'>= 25°C', 26=>'>= 26°C', c_TempLevel_Ignore=>'Ignorieren')); + CreateProfile_Associations ('IPSShadowing_TempLevelInShadow', array(22=>'Innen >= 22°C', 23=>'>= 23°C', 24=>'>= 24°C', 25=>'>= 25°C', 26=>'>= 26°C', c_TempLevel_Ignore=>'Ignorieren')); + CreateProfile_Associations ('IPSShadowing_TempLevelOutClose', array(22=>'Aussen >= 22°C', 23=>'>= 23°C', 24=>'>= 24°C', 25=>'>= 25°C', 26=>'>= 26°C', c_TempLevel_Ignore=>'Ignorieren')); + CreateProfile_Associations ('IPSShadowing_TempLevelInClose', array(22=>'Innen >= 22°C', 23=>'>= 23°C', 24=>'>= 24°C', 25=>'>= 25°C', 26=>'>= 26°C', c_TempLevel_Ignore=>'Ignorieren')); + CreateProfile_Associations ('IPSShadowing_TempLevelOutOpen', array(22=>'Aussen <= 22°C', 23=>'<= 23°C', 24=>'<= 24°C', 25=>'<= 25°C', 26=>'<= 26°C', c_TempLevel_Ignore=>'Ignorieren')); + CreateProfile_Associations ('IPSShadowing_TempLevelInOpen', array(22=>'Innen <= 22°C', 23=>'<= 23°C', 24=>'<= 24°C', 25=>'<= 25°C', 26=>'<= 26°C', c_TempLevel_Ignore=>'Ignorieren')); + CreateProfile_Count ('IPSShadowing_Brightness', 0, 2000, 100000, null, " Lux", null); + + CreateProfile_Count ('IPSShadowing_AzimuthBgn', 0, 5, 360, null, " °", null); + CreateProfile_Count ('IPSShadowing_AzimuthEnd', 0, 5, 360, null, " °", null); + CreateProfile_Count ('IPSShadowing_Elevation', 0, 1, 90, null, " °", null); + CreateProfile_Count ('IPSShadowing_Date', 1, 1, 12, null, "%", null); + + CreateProfile_Associations ('IPSShadowing_TimeMode', array('individuelle Zeit', 'Dämmerung', 'Dämmerung (begrenzt)')); + CreateProfile_Count ('IPSShadowing_TimeOffset', -120, 5, 120, null, " Min", null); + + CreateProfile_Count ('IPSShadowing_Wind', 0, 10, 100, null, " kmh", null); + + CreateProfile_Associations ('IPSShadowing_ProfileBgnOfDay', array()); + CreateProfile_Associations ('IPSShadowing_ProfileEndOfDay', array()); + CreateProfile_Associations ('IPSShadowing_ProfileTemp', array()); + CreateProfile_Associations ('IPSShadowing_ProfileWeather', array()); + CreateProfile_Associations ('IPSShadowing_ProfileSun', array()); + + CreateProfile_Associations ('IPSShadowing_ScenarioSelect', array()); + CreateProfile_Associations ('IPSShadowing_ScenarioActivate', array(0=>'Inaktiv')); + CreateProfile_Associations ('IPSShadowing_ScenarioShutter', array( + c_MovementId_NoAction => c_Movement_NoAction, + c_MovementId_Closed => c_Movement_Closed, + c_MovementId_90 => c_Movement_90, + c_MovementId_75 => c_Movement_75, + c_MovementId_50 => c_Movement_50, + c_MovementId_Opened => c_Movement_Opened, + c_MovementId_Stop => c_Movement_Stop),"", $IPSShadowing_MovementCol, true); + CreateProfile_Associations ('IPSShadowing_ScenarioJalousie', array( + c_MovementId_NoAction => c_Movement_NoAction, + c_MovementId_Shadowing => c_Movement_Shadowing, + c_MovementId_Dimout => c_Movement_Dimout, + c_MovementId_Opened => c_Movement_Opened, + c_MovementId_Stop => c_Movement_Stop),"", $IPSShadowing_MovementCol, true); + CreateProfile_Associations ('IPSShadowing_ScenarioMarquees', array( + c_MovementId_NoAction => c_Movement_NoAction, + c_MovementId_MovedOut => c_Movement_MovedOut, + c_MovementId_75 => c_Movement_75, + c_MovementId_50 => c_Movement_50, + c_MovementId_MovedIn => c_Movement_MovedIn, + c_MovementId_Stop => c_Movement_Stop),"", $IPSShadowing_MovementCol, true); + + $CategoryIdDevices = CreateCategory('Devices', $CategoryIdData, 20); + + + + // Profile Manager + // ==================================================================================================================================== + $CategoryIdProfiles = CreateCategory('Profiles', $CategoryIdData, 30); + $CategoryIdProfilesTemp = CreateCategory( 'Temp', $CategoryIdProfiles, 10); + $CategoryIdProfilesSun = CreateCategory( 'Sun', $CategoryIdProfiles, 20); + $CategoryIdProfilesWeather = CreateCategory( 'Weather', $CategoryIdProfiles, 30); + $CategoryIdProfilesBgnOfDay = CreateCategory( 'BgnOfDay', $CategoryIdProfiles, 40); + $CategoryIdProfilesEndOfDay = CreateCategory( 'EndOfDay', $CategoryIdProfiles, 50); + + $CategoryIdProfileManager = CreateCategory('ProfileManager', $CategoryIdData, 35); + $ControlIdProfileTempSelect = CreateVariable(c_Control_ProfileTempSelect, 1 /*Integer*/, $CategoryIdProfileManager, 10, 'IPSShadowing_ProfileTemp', $ScriptIdChangeSettings, 0, 'Temperature'); + $ControlIdProfileSunSelect = CreateVariable(c_Control_ProfileSunSelect, 1 /*Integer*/, $CategoryIdProfileManager, 20, 'IPSShadowing_ProfileSun', $ScriptIdChangeSettings, 0, 'Sun'); + $ControlIdProfileWeatherSelect = CreateVariable(c_Control_ProfileWeatherSelect, 1 /*Integer*/, $CategoryIdProfileManager, 30, 'IPSShadowing_ProfileWeather', $ScriptIdChangeSettings, 0, 'Drops'); + $ControlIdProfileBgnOfDaySelect = CreateVariable(c_Control_ProfileBgnOfDaySelect, 1 /*Integer*/, $CategoryIdProfileManager, 40, 'IPSShadowing_ProfileBgnOfDay', $ScriptIdChangeSettings, 0, 'Clock'); + $ControlIdProfileEndOfDaySelect = CreateVariable(c_Control_ProfileEndOfDaySelect, 1 /*Integer*/, $CategoryIdProfileManager, 50, 'IPSShadowing_ProfileEndOfDay', $ScriptIdChangeSettings, 0, 'Clock'); + $CategoryIdProfileTempDisplay = CreateCategory('DisplayTemp', $CategoryIdProfileManager, 100); + $CategoryIdProfileSunDisplay = CreateCategory('DisplaySun', $CategoryIdProfileManager, 110); + $CategoryIdProfileWeatherDisplay = CreateCategory('DisplayWeather', $CategoryIdProfileManager, 120); + $CategoryIdProfileBgnOfDayDisplay = CreateCategory('DisplayBgnOfDay', $CategoryIdProfileManager, 130); + $CategoryIdProfileEndOfDayDisplay = CreateCategory('DisplayEndOfDay', $CategoryIdProfileManager, 140); + $CategoryIdProfileSunGraphs = CreateCategory('GraphsSun', $CategoryIdProfileManager, 200); + $MediaIdAzimuth = CreateMedia ('Sonnenstand', $CategoryIdProfileSunGraphs, IPS_GetKernelDir().'media\\IPSShadowing_Azimuth.gif', false, 1, 'Sun'); + + //++Migration v2.50.2 --> 2.50.3 + $categoryIdTempProfiles = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSShadowing.Profiles.Temp'); + $categoryIdListTempProfiles = IPS_GetChildrenIDs($categoryIdTempProfiles); + foreach ($categoryIdListTempProfiles as $categoryIdTempProfile) { + CreateVariable(c_Control_TempLevelOutShadow, 1 /*Integer*/, $categoryIdTempProfile, 10, 'IPSShadowing_TempLevelOutShadow', $ScriptIdChangeSettings, c_TempLevel_Ignore, 'Temperature'); + CreateVariable(c_Control_TempLevelInShadow, 1 /*Integer*/, $categoryIdTempProfile, 20, 'IPSShadowing_TempLevelInShadow', $ScriptIdChangeSettings, c_TempLevel_Ignore, 'Temperature'); + CreateVariable(c_Control_TempLevelOutClose, 1 /*Integer*/, $categoryIdTempProfile, 30, 'IPSShadowing_TempLevelOutClose', $ScriptIdChangeSettings, c_TempLevel_Ignore, 'Temperature'); + CreateVariable(c_Control_TempLevelInClose, 1 /*Integer*/, $categoryIdTempProfile, 40, 'IPSShadowing_TempLevelInClose', $ScriptIdChangeSettings, c_TempLevel_Ignore, 'Temperature'); + CreateVariable(c_Control_TempLevelOutOpen, 1 /*Integer*/, $categoryIdTempProfile, 50, 'IPSShadowing_TempLevelOutOpen', $ScriptIdChangeSettings, c_TempLevel_Ignore, 'Temperature'); + CreateVariable(c_Control_TempLevelInOpen, 1 /*Integer*/, $categoryIdTempProfile, 60, 'IPSShadowing_TempLevelInOpen', $ScriptIdChangeSettings, c_TempLevel_Ignore, 'Temperature'); + $variableId = @IPS_GetObjectIDByName('TempDiffClosing', $categoryIdTempProfile); if ($variableId!==false) { IPS_DeleteVariable($variableId); } + $variableId = @IPS_GetObjectIDByName('TempDiffShadowing', $categoryIdTempProfile); if ($variableId!==false) { IPS_DeleteVariable($variableId); } + $variableId = @IPS_GetObjectIDByName('TempDiffOpening', $categoryIdTempProfile); if ($variableId!==false) { IPS_DeleteVariable($variableId); } + + //++Migration v2.50.15 --> 2.50.16 + CreateVariable(c_Control_BrightnessLow, 1 /*Integer*/, $categoryIdTempProfile, 65, 'IPSShadowing_Brightness', $ScriptIdChangeSettings, 0, 'Sun'); + } + $linkId = @IPS_GetObjectIDByName('Differenz Beschattung', $CategoryIdProfileTempDisplay); if ($linkId!==false) { IPS_DeleteLink($linkId); } + $linkId = @IPS_GetObjectIDByName('Differenz Abdunkelung', $CategoryIdProfileTempDisplay); if ($linkId!==false) { IPS_DeleteLink($linkId); } + $linkId = @IPS_GetObjectIDByName('Differenz Öffnen', $CategoryIdProfileTempDisplay); if ($linkId!==false) { IPS_DeleteLink($linkId); } + @IPS_DeleteVariableProfile('IPSShadowing_TempDiffShadowing'); + @IPS_DeleteVariableProfile('IPSShadowing_TempDiffClosing'); + @IPS_DeleteVariableProfile('IPSShadowing_TempDiffOpening'); + + //++Migration v2.50.15 --> 2.50.16 + $id = @IPS_GetObjectIdByName("Helligkeits Grenze", $CategoryIdProfileTempDisplay); + if ($id!==false) { + EmptyCategory($id); + IPS_DeleteInstance($id); + } + $profileId = GetValue($ControlIdProfileTempSelect); + if ($profileId<>0) { + $profile = new IPSShadowing_ProfileTemp($profileId); + $profile->Display($CategoryIdProfileTempDisplay); + } + + CreateProfile_Associations ('IPSShadowing_WindBeaufort', array( + 0 => 'Windstille (0 km/h)', + 1 => 'leiser Zug (2 km/h)', + 2 => 'leichte Brise (6 km/h)', + 3 => 'schwache Brise (12 km/h)', + 4 => 'mäßige Brise (20 km/h)', + 5 => 'frischer Wind (29 km/h)', + 6 => 'starker Wind (39 km/h)', + 7 => 'steifer Wind (50 km/h)', + 8 => 'stürmischer Wind (62 km/h)', + 9 => 'Sturm (75 km/h)', + 10 => 'schwerer Sturm (89 km/h)', + 11 => 'orkanartiger Sturm (103 km/h)', + 12 => 'Orkan (117 km/h)' + )); + + $profiles=IPS_GetChildrenIDs($CategoryIdProfilesWeather); + foreach ($profiles as $profileId) { + $windlevelID=IPS_GetObjectIDByIdent("WindLevel", $profileId); + $variableinfo=IPS_GetVariable($windlevelID); + $customprofile=$variableinfo['VariableCustomProfile']; + $value=GetValue($windlevelID); + if (defined('IPSSHADOWING_WINDLEVEL_CLASSIFICATION') and IPSSHADOWING_WINDLEVEL_CLASSIFICATION) { + if ($customprofile=="IPSShadowing_Wind") { + IPS_SetVariableCustomProfile ($windlevelID,'IPSShadowing_WindBeaufort'); + SetValue($windlevelID,intval($value/3.6)); + } + } else { + if ($customprofile=="IPSShadowing_WindBeaufort") { + IPS_SetVariableCustomProfile ($windlevelID,'IPSShadowing_Wind'); + SetValue($windlevelID,round($value*3.6,-1)); + } + } + } + + $profileManager = new IPSShadowing_ProfileManager(); + $profileManager->AssignAllProfileAssociations(); + + $Profiles = IPS_GetChildrenIDs($CategoryIdProfilesTemp); + if (count($Profiles)==0) { + $profileManager->CreateTemp('Standard'); + } + $Profiles = IPS_GetChildrenIDs($CategoryIdProfilesSun); + if (count($Profiles)==0) { + $profileManager->CreateSun('Süden'); + } + $Profiles = IPS_GetChildrenIDs($CategoryIdProfilesWeather); + if (count($Profiles)==0) { + $profileManager->CreateWeather('Standard'); + } else { + } + $Profiles = IPS_GetChildrenIDs($CategoryIdProfilesBgnOfDay); + if (count($Profiles)==0) { + $profileManager->CreateBgnOfDay('Dämmerung'); + } + $Profiles = IPS_GetChildrenIDs($CategoryIdProfilesEndOfDay); + if (count($Profiles)==0) { + $profileManager->CreateEndOfDay('Dämmerung'); + } + // Scenario Manager + // ==================================================================================================================================== + $CategoryIdScenarios = CreateCategory('Scenarios', $CategoryIdData, 40); + $CategoryIdScenarioManager = CreateCategory('ScenarioManager', $CategoryIdData, 45); + $ControlIdScenarioSelect = CreateVariable(c_Control_ScenarioSelect, 1 /*Integer*/, $CategoryIdScenarioManager, 10, 'IPSShadowing_ScenarioSelect', $ScriptIdChangeSettings, 0, 'Shutter'); + $ControlIdScenarioActivate = CreateVariable(c_Control_ScenarioActivate, 1 /*Integer*/, $CategoryIdScenarioManager, 20, 'IPSShadowing_ScenarioActivate', $ScriptIdChangeSettings, 0, 'Shutter'); + $CategoryIdScenarioDisplay = CreateCategory('Display', $CategoryIdScenarioManager, 20); + + $scenarioManager = new IPSShadowing_ScenarioManager(); + $scenarioManager->AssignAllScenarioAssociations(); + + $ScenarioId = @IPS_GetObjectIDByName('Alle Schliessen', $CategoryIdScenarios); + if ($ScenarioId===false) { + echo 'Create Scenario "Alle Schliessen"'.PHP_EOL; + $scenarioId = $scenarioManager->Create('Alle Schliessen', c_MovementId_Closed); + $scenario = new IPSShadowing_Scenario($scenarioId); + $scenario->ResetEditMode(); + + } + $ScenarioId = @IPS_GetObjectIDByName('Alle Öffnen', $CategoryIdScenarios); + if ($ScenarioId===false) { + echo 'Create Scenario "Alle Öffnen"'.PHP_EOL; + $scenarioManager->Create('Alle Öffnen', c_MovementId_Opened); + $scenario = new IPSShadowing_Scenario($scenarioId); + $scenario->ResetEditMode(); + } + + // Settings + // ==================================================================================================================================== + $CategoryIdSettings = CreateCategory('Settings', $CategoryIdData, 30); + $ControlIdMsgPrioTemp = CreateVariable(c_Control_MsgPrioTemp, 1 /*Integer*/, $CategoryIdSettings, 10, 'IPSShadowing_Priority', $ScriptIdChangeSettings, 2); + $ControlIdMsgPrioProg = CreateVariable(c_Control_MsgPrioProg, 1 /*Integer*/, $CategoryIdSettings, 20, 'IPSShadowing_Priority', $ScriptIdChangeSettings, 4); + + // Logging + // ==================================================================================================================================== + $CategoryIdLog = CreateCategory('Log', $CategoryIdData, 40); + $ControlIdLog = CreateVariable('LogMessages', 3 /*String*/, $CategoryIdLog, 10, '~HTMLBox', null, ""); + $ControlIdLogId = CreateVariable('LogId', 1 /*Integer*/, $CategoryIdLog, 20, '', null, 0); + + // Shadowing Devices + // ==================================================================================================================================== + $DeviceConfig = get_ShadowingConfiguration(); + $Idx = 10; + foreach ($DeviceConfig as $DeviceName=>$DeviceData) { + $ShadowingType = $DeviceConfig[$DeviceName][c_Property_ShadowingType]; + $DeviceId = CreateCategory($DeviceName, $CategoryIdDevices, $Idx); + + $ControlIdDisplay = CreateVariable(c_Control_Display, 3 /*String*/, $DeviceId, 50, '~String', null, 'Manuell', 'Information'); + $ControlIdStepsToDo = CreateVariable(c_Control_StepsToDo, 3 /*String*/, $DeviceId, 60, '~String', null, ''); + $ControlIdStep = CreateVariable(c_Control_Step, 1 /*Integer*/, $DeviceId, 70, 'IPSShadowing_Step', null, -1); + $ControlIdStartTime = CreateVariable(c_Control_StartTime, 1 /*Integer*/, $DeviceId, 80, '~UnixTimestamp', null, -1); + $ControlIdProgramTime = CreateVariable(c_Control_ProgramTime, 1 /*Integer*/, $DeviceId, 85, '~UnixTimestamp', null, -1); + $ControlIdPosition = CreateVariable(c_Control_Position, 1 /*Integer*/, $DeviceId, 90, 'IPSShadowing_Position', $ScriptIdChangeSettings, 0, 'Intensity'); + $ControlIdManualChange = CreateVariable(c_Control_ManualChange, 0 /*Boolean*/, $DeviceId, 110, '~Switch', $ScriptIdChangeSettings, false, 'Warning'); + $ControlIdTempChange = CreateVariable(c_Control_TempChange, 0 /*Boolean*/, $DeviceId, 120, '~Switch', null , false, 'Warning'); + $ControlIdTempLastPos = CreateVariable(c_Control_TempLastPos, 1 /*Integer*/, $DeviceId, 125, '', null , false, 'Information'); + $ControlIdAutomatic = CreateVariable(c_Control_Automatic , 0 /*Boolean*/, $DeviceId, 130, '~Switch', $ScriptIdChangeSettings, false, 'Power'); + + $ControlIdTempProfile = CreateVariable(c_Control_ProfileTemp, 1 /*Integer*/, $DeviceId, 330, 'IPSShadowing_ProfileTemp', $ScriptIdChangeSettings, 0, 'Temperature'); + $ControlIdSunProfile = CreateVariable(c_Control_ProfileSun, 1 /*Integer*/, $DeviceId, 340, 'IPSShadowing_ProfileSun', $ScriptIdChangeSettings, 0, 'Sun'); + $ControlIdBgnOfDayProfile = CreateVariable(c_Control_ProfileBgnOfDay,1 /*Integer*/, $DeviceId, 350, 'IPSShadowing_ProfileBgnOfDay', $ScriptIdChangeSettings, 0, 'Clock'); + $ControlIdEndOfDayProfile = CreateVariable(c_Control_ProfileEndOfDay,1 /*Integer*/, $DeviceId, 360, 'IPSShadowing_ProfileEndOfDay', $ScriptIdChangeSettings, 0, 'Clock'); + $ControlIdProfileInfo = CreateVariable(c_Control_ProfileInfo, 3 /*String*/, $DeviceId, 380, '~String', null, '', 'Information'); + + if ($ShadowingType==c_ShadowingType_Shutter) { + $ControlIdMovement = CreateVariable(c_Control_Movement, 1 /*Integer*/, $DeviceId, 10, 'IPSShadowing_MovementSht', $ScriptIdChangeSettings, c_MovementId_Stop, 'Shutter'); + $ControlIdProgramNight = CreateVariable(c_Control_ProgramNight, 1 /*Integer*/, $DeviceId, 200, 'IPSShadowing_ProgNigSht', $ScriptIdChangeSettings, c_ProgramId_Manual, 'Bed'); + $ControlIdProgramDay = CreateVariable(c_Control_ProgramDay, 1 /*Integer*/, $DeviceId, 210, 'IPSShadowing_ProgDaySht', $ScriptIdChangeSettings, c_ProgramId_Manual, 'Sun'); + $ControlIdProgramTemp = CreateVariable(c_Control_ProgramTemp, 1 /*Integer*/, $DeviceId, 220, 'IPSShadowing_ProgTmpSht', $ScriptIdChangeSettings, c_ProgramId_Manual, 'Temperature'); + $ControlIdProgramPresent = CreateVariable(c_Control_ProgramPresent, 1 /*Integer*/, $DeviceId, 230, 'IPSShadowing_ProgPreSht', $ScriptIdChangeSettings, c_ProgramId_Manual, 'Motion'); + } elseif ($ShadowingType==c_ShadowingType_Jalousie) { + $ControlIdMovement = CreateVariable(c_Control_Movement, 1 /*Integer*/, $DeviceId, 10, 'IPSShadowing_MovementJal', $ScriptIdChangeSettings, c_MovementId_Stop, 'Shutter'); + $ControlIdProgramNight = CreateVariable(c_Control_ProgramNight, 1 /*Integer*/, $DeviceId, 200, 'IPSShadowing_ProgNigJal', $ScriptIdChangeSettings, c_ProgramId_Manual, 'Bed'); + $ControlIdProgramDay = CreateVariable(c_Control_ProgramDay, 1 /*Integer*/, $DeviceId, 210, 'IPSShadowing_ProgDayJal', $ScriptIdChangeSettings, c_ProgramId_Manual, 'Sun'); + $ControlIdProgramTemp = CreateVariable(c_Control_ProgramTemp, 1 /*Integer*/, $DeviceId, 220, 'IPSShadowing_ProgTmpJal', $ScriptIdChangeSettings, c_ProgramId_Manual, 'Temperature'); + $ControlIdProgramPresent = CreateVariable(c_Control_ProgramPresent, 1 /*Integer*/, $DeviceId, 230, 'IPSShadowing_ProgPreJal', $ScriptIdChangeSettings, c_ProgramId_Manual, 'Motion'); + } elseif ($ShadowingType==c_ShadowingType_Marquees) { + $ControlIdMovement = CreateVariable(c_Control_Movement, 1 /*Integer*/, $DeviceId, 10, 'IPSShadowing_MovementMar', $ScriptIdChangeSettings, c_MovementId_Stop, 'Shutter'); + $ControlIdProgramNight = CreateVariable(c_Control_ProgramNight, 1 /*Integer*/, $DeviceId, 200, 'IPSShadowing_ProgNigMar', $ScriptIdChangeSettings, c_ProgramId_Manual, 'Bed'); + $ControlIdProgramDay = CreateVariable(c_Control_ProgramDay, 1 /*Integer*/, $DeviceId, 210, 'IPSShadowing_ProgDayMar', $ScriptIdChangeSettings, c_ProgramId_Manual, 'Sun'); + $ControlIdProgramTemp = CreateVariable(c_Control_ProgramTemp, 1 /*Integer*/, $DeviceId, 220, 'IPSShadowing_ProgTmpMar', $ScriptIdChangeSettings, c_ProgramId_Manual, 'Temperature'); + $ControlIdProgramWeather = CreateVariable(c_Control_ProgramWeather, 1 /*Integer*/, $DeviceId, 220, 'IPSShadowing_ProgWeaMar', $ScriptIdChangeSettings, c_ProgramId_Manual, 'Drops'); + $ControlIdProgramPresent = CreateVariable(c_Control_ProgramPresent, 1 /*Integer*/, $DeviceId, 230, 'IPSShadowing_ProgPreMar', $ScriptIdChangeSettings, c_ProgramId_Manual, 'Motion'); + $ControlIdWeatherProfile = CreateVariable(c_Control_ProfileWeather, 1 /*Integer*/, $DeviceId, 370, 'IPSShadowing_ProfileWeather', $ScriptIdChangeSettings, 0, 'Drops'); + } else { + throw new Exception('Unknown ShadowingType '.$ShadowingType); + } + $Idx = $Idx + 10; + } + + // Deletion of old Devices + // ----------------------- + $deviceConfig = get_ShadowingConfiguration(); + $categoryIdDevices = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSShadowing.Devices'); + $deviceIds = IPS_GetChildrenIDs($categoryIdDevices); + foreach ($deviceIds as $deviceIdx=>$deviceId) { + $deviceName = IPS_GetName($deviceId); + if (!array_key_exists($deviceName, $deviceConfig)) { + echo 'Remove DeviceData of unknown Device='.$deviceName.PHP_EOL; + EmptyCategory($deviceId); + DeleteCategory($deviceId); + } + } + + // Type Correction of Scenarios + // ---------------------------- + $MovementIds = array( + c_MovementId_Space => c_Movement_Space, + c_MovementId_NoAction => c_Movement_NoAction, + c_MovementId_Up => c_Movement_Up, + c_MovementId_Down => c_Movement_Down, + c_MovementId_Stop => c_Movement_Stop, + c_MovementId_90 => c_Movement_90, + c_MovementId_75 => c_Movement_75, + c_MovementId_50 => c_Movement_50, + c_MovementId_Closed => c_Movement_Closed, + c_MovementId_Opened => c_Movement_Opened, + c_MovementId_Dimout => c_Movement_Dimout, + c_MovementId_Shadowing => c_Movement_Shadowing, + c_MovementId_MovedOut => c_Movement_MovedOut, + c_MovementId_MovedIn => c_Movement_MovedIn, + c_MovementId_MovingOut => c_Movement_MovingOut, + c_MovementId_MovingIn => c_Movement_MovingIn, + ); + $categoryIdDevices = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSShadowing.Devices'); + $categoryIdScenarios = IPSUtil_ObjectIDByPath('Program.IPSLibrary.data.modules.IPSShadowing.Scenarios'); + $scenarios = IPS_GetChildrenIDs($categoryIdScenarios); + $deviceConfig = get_ShadowingConfiguration(); + foreach ($scenarios as $scenarioId) { + echo 'Found Scenario='.IPS_GetName($scenarioId).PHP_EOL; + foreach ($deviceConfig as $deviceIdent=>$deviceData) { + $controlId = @IPS_GetObjectIDByIdent($deviceIdent, $scenarioId); + if ($controlId!==false) { + $movementId = GetValue($controlId); + $invalid = false; + switch ($deviceData[c_Property_ShadowingType]) { + case c_ShadowingType_Jalousie: + if ($movementId<>c_MovementId_NoAction and $movementId<>c_MovementId_Shadowing and $movementId<>c_MovementId_Dimout + and $movementId<>c_MovementId_Opened and $movementId<>c_MovementId_Stop) { + $invalid = true; + } + break; + case c_ShadowingType_Shutter: + if ($movementId<>c_MovementId_NoAction and $movementId<>c_MovementId_Closed and $movementId<>c_MovementId_90 + and $movementId<>c_MovementId_50 and $movementId<>c_MovementId_50 + and $movementId<>c_MovementId_Opened and $movementId<>c_MovementId_Stop) { + $invalid = true; + } + break; + case c_ShadowingType_Marquees: + if ($movementId<>c_MovementId_NoAction and $movementId<>c_MovementId_MovedOut and $movementId<>c_MovementId_MovedIn + and $movementId<>c_MovementId_75 and $movementId<>c_MovementId_50 and $movementId<>c_MovementId_Stop) { + $invalid = true; + } + break; + } + if ($invalid) { + echo ' INVALID --> '.IPS_GetName($controlId).'='.$MovementIds[$movementId].PHP_EOL; + echo ' --> Repair, Set "NoAction"'.PHP_EOL; + SetValue($controlId, c_MovementId_NoAction); + } else { + echo ' OK --> '.IPS_GetName($controlId).'='.$MovementIds[$movementId].PHP_EOL; + } + } + } + } + + // Correction of Profiles + // ---------------------- + $profileManager = new IPSShadowing_ProfileManager(); + $profileManager->AssignAllProfileAssociations(); + $profileManager->CorrectDeletedDeviceProfiles(); + + // Register Events for Device Synchronization + // ------------------------------------------ + IPSUtils_Include ('IPSMessageHandler.class.php', 'IPSLibrary::app::core::IPSMessageHandler'); + $messageHandler = new IPSMessageHandler(); + foreach ($DeviceConfig as $DeviceName=>$DeviceData) { + $component = $DeviceConfig[$DeviceName][c_Property_Component]; + $componentParams = explode(',', $component); + $componentClass = $componentParams[0]; + + // Homematic + if ($componentClass=='IPSComponentShutter_Homematic') { + $instanceId = IPSUtil_ObjectIDByPath($componentParams[1]); + $variableId = @IPS_GetObjectIDByName('LEVEL', $instanceId); + if ($variableId===false) { + $moduleManager->LogHandler()->Log('Variable with Name LEVEL could NOT be found for Homematic Instance='.$instanceId); + } else { + $moduleManager->LogHandler()->Log('Register OnChangeEvent vor Homematic Instance='.$instanceId); + $messageHandler->RegisterOnChangeEvent($variableId, $component, 'IPSModuleShutter_IPSShadowing,'); + } + } else { + $moduleManager->LogHandler()->Log('Found Component '.$componentClass); + } + } + + CreateTimer_OnceADay ('Reset', $ScriptIdResetTimer, 0, 5); + CreateTimer_CyclicBySeconds ('Refresh', $ScriptIdRefreshTimer, 1, false); + CreateTimer_CyclicByMinutes ('Program', $ScriptIdProgramTimer, 5); + + // ---------------------------------------------------------------------------------------------------------------------------- + // Webfront Definition + // ---------------------------------------------------------------------------------------------------------------------------- + if ($WFC10_Enabled) { + $categoryId_WebFront = CreateCategoryPath($WFC10_Path); + EmptyCategory($categoryId_WebFront); + DeleteWFCItems($WFC10_ConfigId, $WFC10_TabPaneItem); + DeleteWFCItems($WFC10_ConfigId, 'ShadowTP'); + CreateWFCItemTabPane ($WFC10_ConfigId, $WFC10_TabPaneItem, $WFC10_TabPaneParent, $WFC10_TabPaneOrder, $WFC10_TabPaneName, $WFC10_TabPaneIcon); + + // WebFront Overview + $WebFrontOverviewId = CreateCategory('Overview', $categoryId_WebFront, 10); + $WebFrontOverviewTop1 = CreateCategory( 'Top1', $WebFrontOverviewId, 10); + $WebFrontOverviewTop2 = CreateCategory( 'Top2', $WebFrontOverviewId, 20); + $WebFrontOverviewBottom1 = CreateCategory( 'Bottom1', $WebFrontOverviewId, 30); + $WebFrontOverviewBottom2 = CreateCategory( 'Bottom2', $WebFrontOverviewId, 40); + $UniqueId = date('H:i'); + CreateWFCItemSplitPane ($WFC10_ConfigId, $WFC10_TabPaneItem.'_OV', $WFC10_TabPaneItem.'', 10, $WFC10_TabName1, $WFC10_TabIcon1, 0 /*Horizontal*/, 160 /*Height*/, 1 /*Target=Pane2*/, 1/*UsePixel*/, 'true'); + CreateWFCItemSplitPane ($WFC10_ConfigId, $WFC10_TabPaneItem.'_OVTop', $WFC10_TabPaneItem.'_OV', 10, '', '', 1 /*Vertical*/, 300 /*Width*/, 1 /*Target=Pane2*/, 1/*UsePixel*/, 'true'); + CreateWFCItemSplitPane ($WFC10_ConfigId, $WFC10_TabPaneItem.'_OVBottom', $WFC10_TabPaneItem.'_OV', 20, '', '', 1 /*Vertical*/, 430 /*Width*/, 1 /*Target=Pane2*/, 1/*UsePixel*/, 'true'); + CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem.'_OVTop1'.$UniqueId, $WFC10_TabPaneItem.'_OVTop', 10, 'Top1', '', $WebFrontOverviewTop1 /*BaseId*/, 'false' /*BarBottomVisible*/); + CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem.'_OVTop2'.$UniqueId, $WFC10_TabPaneItem.'_OVTop', 20, 'Top2', '', $WebFrontOverviewTop2 /*BaseId*/, 'false' /*BarBottomVisible*/); + CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem.'_OVBottom1'.$UniqueId,$WFC10_TabPaneItem.'_OVBottom', 10, 'Bottom1', '', $WebFrontOverviewBottom1 /*BaseId*/, 'false' /*BarBottomVisible*/); + CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem.'_OVBottom2'.$UniqueId,$WFC10_TabPaneItem.'_OVBottom', 20, 'Bottom2', '', $WebFrontOverviewBottom2 /*BaseId*/, 'false' /*BarBottomVisible*/); + $Idx = 10; + foreach ($DeviceConfig as $DeviceIdent=>$DeviceData) { + $DeviceId = IPS_GetObjectIDByIdent($DeviceIdent, $CategoryIdDevices); + $DeviceName = $DeviceData[c_Property_Name]; + CreateLink($DeviceName, IPS_GetObjectIDByIdent(c_Control_Movement, $DeviceId), $WebFrontOverviewTop1, $Idx); + CreateLinkByDestination('Status', IPS_GetObjectIDByIdent(c_Control_Display, $DeviceId), $WebFrontOverviewTop2, $Idx); + $Idx = $Idx + 10; + } + CreateLink('Szenarien', $ControlIdScenarioActivate, $WebFrontOverviewBottom1, 10); + CreateLink('Automatic Ein', $ScriptIdAutomaticOn, $WebFrontOverviewBottom2, 10); + CreateLink('Automatic Aus', $ScriptIdAutomaticOff, $WebFrontOverviewBottom2, 20); + CreateLink('Automatic Reset', $ScriptIdAutomaticReset, $WebFrontOverviewBottom2, 30); + + // Shadowing Devices + CreateWFCItemTabPane ($WFC10_ConfigId, $WFC10_TabPaneItem.'_Devices', $WFC10_TabPaneItem, 20, 'Beschattungs Elemente', 'Information'); + $Idx = 10; + foreach ($DeviceConfig as $DeviceIdent=>$DeviceData) { + $DeviceId = IPS_GetObjectIDByIdent($DeviceIdent, $CategoryIdDevices); + $DeviceName = $DeviceData[c_Property_Name]; + + $WebFrontDetailId = CreateCategory($DeviceName, $categoryId_WebFront, 100+$Idx); + $WebFrontDetailTopId = CreateCategory("Top", $WebFrontDetailId, 100+$Idx); + $WebFrontDetailBottomLeftId = CreateCategory("BottomLeft", $WebFrontDetailId, 100+$Idx); + $WebFrontDetailBottomRightId = CreateCategory("BottomRight", $WebFrontDetailId, 100+$Idx); + CreateWFCItemSplitPane ($WFC10_ConfigId, $WFC10_TabPaneItem."_Devices$DeviceName", $WFC10_TabPaneItem.'_Devices', 100+$Idx, $DeviceName, '', 0 /*Horizontal*/, 315 /*Hight*/, 0 /*Target=Pane1*/, 1/*UsePixel*/, 'true'); + CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem."_Devices$DeviceName"."Top".$UniqueId, $WFC10_TabPaneItem."_Devices$DeviceName", 10, '', '', $WebFrontDetailTopId /*BaseId*/, 'false' /*BarBottomVisible*/); + CreateWFCItemSplitPane ($WFC10_ConfigId, $WFC10_TabPaneItem."_Devices$DeviceName"."Bottom", $WFC10_TabPaneItem."_Devices$DeviceName", 20, '', '', 1 /*Vertical*/, 65 /*Width*/, 0 /*Target=Pane1*/, 0/*UsePercentage*/, 'true'); + CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem."_Devices$DeviceName"."BottomLeft".$UniqueId, $WFC10_TabPaneItem."_Devices$DeviceName"."Bottom", 10, '', '', $WebFrontDetailBottomLeftId /*BaseId*/, 'false' /*BarBottomVisible*/); + CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem."_Devices$DeviceName"."BottomRight".$UniqueId,$WFC10_TabPaneItem."_Devices$DeviceName"."Bottom", 10, '', '', $WebFrontDetailBottomRightId /*BaseId*/, 'false' /*BarBottomVisible*/); + + CreateLink('Steuerung', IPS_GetObjectIDByIdent(c_Control_Movement, $DeviceId), $WebFrontDetailTopId, 10); + $ProgramDeviceId = CreateDummyInstance("Programme", $WebFrontDetailTopId, 20); + CreateLink('Programm Nacht', IPS_GetObjectIDByIdent(c_Control_ProgramNight, $DeviceId), $ProgramDeviceId, 10); + CreateLink('Programm Tag', IPS_GetObjectIDByIdent(c_Control_ProgramDay, $DeviceId), $ProgramDeviceId, 20); + CreateLink('Programm Temperatur', IPS_GetObjectIDByIdent(c_Control_ProgramTemp, $DeviceId), $ProgramDeviceId, 30); + CreateLink('Programm Anwesenend', IPS_GetObjectIDByIdent(c_Control_ProgramPresent, $DeviceId), $ProgramDeviceId, 40); + $controlIdProgramWeather = @IPS_GetObjectIDByIdent(c_Control_ProgramWeather, $DeviceId); + if ($controlIdProgramWeather!==false) { + CreateLink('Programm Wetter', $controlIdProgramWeather, $ProgramDeviceId, 35); + } + + CreateLink('Tagesbeginn Profil', IPS_GetObjectIDByIdent(c_Control_ProfileBgnOfDay, $DeviceId), $WebFrontDetailBottomLeftId, 10); + CreateLink('Tagesende Profil', IPS_GetObjectIDByIdent(c_Control_ProfileEndOfDay, $DeviceId), $WebFrontDetailBottomLeftId, 20); + CreateLink('Temperatur Profil', IPS_GetObjectIDByIdent(c_Control_ProfileTemp, $DeviceId), $WebFrontDetailBottomLeftId, 30); + CreateLink('Sonnenstand Profil', IPS_GetObjectIDByIdent(c_Control_ProfileSun, $DeviceId), $WebFrontDetailBottomLeftId, 40); + if ($controlIdProgramWeather!==false) { + CreateLink('Wetter Profil', IPS_GetObjectIDByIdent(c_Control_ProfileWeather, $DeviceId), $WebFrontDetailBottomLeftId, 50); + } + CreateLink('Profil Information', IPS_GetObjectIDByIdent(c_Control_ProfileInfo, $DeviceId), $WebFrontDetailBottomLeftId, 60); + + CreateLink('Automatik', IPS_GetObjectIDByIdent(c_Control_Automatic, $DeviceId), $WebFrontDetailBottomRightId, 10); + CreateLink('Manueller Modus', IPS_GetObjectIDByIdent(c_Control_ManualChange, $DeviceId), $WebFrontDetailBottomRightId, 20); + CreateLink('Temperatur Modus', IPS_GetObjectIDByIdent(c_Control_TempChange, $DeviceId), $WebFrontDetailBottomRightId, 25); + CreateLink('Status', IPS_GetObjectIDByIdent(c_Control_Display, $DeviceId), $WebFrontDetailBottomRightId, 30); + CreateLink('Position', IPS_GetObjectIDByIdent(c_Control_Position, $DeviceId), $WebFrontDetailBottomRightId, 40); + + $Idx = $Idx + 10; + } + + // Scenarien + $WebFrontScenariosId = CreateCategory('Scenarien', $categoryId_WebFront, 30); + $WebFrontScenariosIdTopL = CreateCategory( 'TopLeft', $WebFrontScenariosId, 10); + $WebFrontScenariosIdTopR = CreateCategory( 'TopRight', $WebFrontScenariosId, 20); + $WebFrontScenariosIdBot = CreateCategory( 'Bottom', $WebFrontScenariosId, 30); + CreateWFCItemSplitPane ($WFC10_ConfigId, $WFC10_TabPaneItem."_Scenarios", $WFC10_TabPaneItem, 30, 'Szenarien', 'Script', 0 /*Horizontal*/, 108 /*Hight*/, 0 /*Target=Pane1*/, 1/*UsePixel*/, 'true'); + CreateWFCItemSplitPane ($WFC10_ConfigId, $WFC10_TabPaneItem."_ScenariosTop", $WFC10_TabPaneItem."_Scenarios", 10, '', '', 1 /*Vertical*/, 300/*Width*/, 1 /*Target=Pane2*/, 1/*UsePixel*/, 'true'); + CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem."_ScenariosBot", $WFC10_TabPaneItem."_Scenarios", 20, '', '', $CategoryIdScenarioDisplay /*BaseId*/, 'false' /*BarBottomVisible*/); + CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem."_ScenariosTopL",$WFC10_TabPaneItem."_ScenariosTop", 10, '', '', $WebFrontScenariosIdTopL /*BaseId*/, 'false' /*BarBottomVisible*/); + CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem."_ScenariosTopR",$WFC10_TabPaneItem."_ScenariosTop", 20, '', '', $WebFrontScenariosIdTopR /*BaseId*/, 'false' /*BarBottomVisible*/); + CreateLink('Szenario Auswahl', $ControlIdScenarioSelect, $WebFrontScenariosIdTopL, 10); + CreateLink('Neues Szenario', $ScriptIdScenarioCreate, $WebFrontScenariosIdTopR, 10); + CreateLink('Szenario löschen', $ScriptIdScenarioDelete, $WebFrontScenariosIdTopR, 20); + + // Profiles + $WebFrontProfilesId = CreateCategory('Profiles', $categoryId_WebFront, 40); + $WebFrontProfilesId1 = CreateCategory( 'ProfilesTemp', $WebFrontProfilesId, 10); + $WebFrontProfilesId1TopL = CreateCategory( 'TopLeft', $WebFrontProfilesId1, 10); + $WebFrontProfilesId1TopR = CreateCategory( 'TopRight', $WebFrontProfilesId1, 20); + $WebFrontProfilesId1BotR = CreateCategory( 'BottomRight', $WebFrontProfilesId1, 30); + $WebFrontProfilesId2 = CreateCategory( 'ProfilesSun', $WebFrontProfilesId, 20); + $WebFrontProfilesId2TopL = CreateCategory( 'TopLeft', $WebFrontProfilesId2, 10); + $WebFrontProfilesId2TopR = CreateCategory( 'TopRight', $WebFrontProfilesId2, 20); + $WebFrontProfilesId2Bot = CreateCategory( 'Bottom', $WebFrontProfilesId2, 30); + $WebFrontProfilesId3 = CreateCategory( 'ProfilesWeather', $WebFrontProfilesId, 30); + $WebFrontProfilesId3TopL = CreateCategory( 'TopLeft', $WebFrontProfilesId3, 10); + $WebFrontProfilesId3TopR = CreateCategory( 'TopRight', $WebFrontProfilesId3, 20); + $WebFrontProfilesId3Bot = CreateCategory( 'Bottom', $WebFrontProfilesId3, 30); + $WebFrontProfilesId4 = CreateCategory( 'ProfilesBgnOfDay', $WebFrontProfilesId, 40); + $WebFrontProfilesId4TopL = CreateCategory( 'TopLeft', $WebFrontProfilesId4, 10); + $WebFrontProfilesId4TopR = CreateCategory( 'TopRight', $WebFrontProfilesId4, 20); + $WebFrontProfilesId4BotR = CreateCategory( 'BottomRight', $WebFrontProfilesId4, 30); + $WebFrontProfilesId5 = CreateCategory( 'ProfilesEndOfDay', $WebFrontProfilesId, 50); + $WebFrontProfilesId5TopL = CreateCategory( 'TopLeft', $WebFrontProfilesId5, 10); + $WebFrontProfilesId5TopR = CreateCategory( 'TopRight', $WebFrontProfilesId5, 20); + $WebFrontProfilesId5BotR = CreateCategory( 'BottomRight', $WebFrontProfilesId5, 30); + CreateWFCItemTabPane ($WFC10_ConfigId, $WFC10_TabPaneItem.'_Profiles', $WFC10_TabPaneItem, 40, 'Profile', 'Clock'); + + CreateWFCItemSplitPane ($WFC10_ConfigId, $WFC10_TabPaneItem."_Profiles1", $WFC10_TabPaneItem.'_Profiles', 10, 'Temperatur', 'Temperature', 0 /*Horizontal*/, 108 /*Hight*/, 0 /*Target=Pane1*/, 1/*UsePixel*/, 'true'); + CreateWFCItemSplitPane ($WFC10_ConfigId, $WFC10_TabPaneItem."_Profiles1Top", $WFC10_TabPaneItem."_Profiles1", 10, '', '', 1 /*Vertical*/, 300/*Width*/, 1 /*Target=Pane2*/, 1/*UsePixel*/, 'true'); + CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem."_Profiles1Bot", $WFC10_TabPaneItem."_Profiles1", 20, '', '', $CategoryIdProfileTempDisplay /*BaseId*/, 'false' /*BarBottomVisible*/); + CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem."_Profiles1TopL",$WFC10_TabPaneItem."_Profiles1Top", 10, '', '', $WebFrontProfilesId1TopL /*BaseId*/, 'false' /*BarBottomVisible*/); + CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem."_Profiles1TopR",$WFC10_TabPaneItem."_Profiles1Top", 20, '', '', $WebFrontProfilesId1TopR /*BaseId*/, 'false' /*BarBottomVisible*/); + CreateWFCItemSplitPane ($WFC10_ConfigId, $WFC10_TabPaneItem."_Profiles2", $WFC10_TabPaneItem.'_Profiles', 20, 'Sonnenstand', 'Sun', 0 /*Horizontal*/, 108 /*Hight*/, 0 /*Target=Pane1*/, 1/*UsePixel*/, 'true'); + CreateWFCItemSplitPane ($WFC10_ConfigId, $WFC10_TabPaneItem."_Profiles2Top", $WFC10_TabPaneItem."_Profiles2", 10, '', '', 1 /*Vertical*/, 300/*Width*/, 1 /*Target=Pane2*/, 1/*UsePixel*/, 'true'); + CreateWFCItemSplitPane ($WFC10_ConfigId, $WFC10_TabPaneItem."_Profiles2Bot", $WFC10_TabPaneItem."_Profiles2", 20, '', '', 1 /*Vertical*/, 420/*Width*/, 1 /*Target=Pane2*/, 1/*UsePixel*/, 'true'); + CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem."_Profiles2BotL",$WFC10_TabPaneItem."_Profiles2Bot", 10, '', '', $CategoryIdProfileSunDisplay /*BaseId*/, 'false' /*BarBottomVisible*/); + CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem."_Profiles2BotR",$WFC10_TabPaneItem."_Profiles2Bot", 20, '', '', $CategoryIdProfileSunGraphs /*BaseId*/, 'false' /*BarBottomVisible*/); + CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem."_Profiles2TopL",$WFC10_TabPaneItem."_Profiles2Top", 10, '', '', $WebFrontProfilesId2TopL /*BaseId*/, 'false' /*BarBottomVisible*/); + CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem."_Profiles2TopR",$WFC10_TabPaneItem."_Profiles2Top", 20, '', '', $WebFrontProfilesId2TopR /*BaseId*/, 'false' /*BarBottomVisible*/); + CreateWFCItemSplitPane ($WFC10_ConfigId, $WFC10_TabPaneItem."_Profiles3", $WFC10_TabPaneItem.'_Profiles', 20, 'Wetter', 'Drops', 0 /*Horizontal*/, 108 /*Hight*/, 0 /*Target=Pane1*/, 1/*UsePixel*/, 'true'); + CreateWFCItemSplitPane ($WFC10_ConfigId, $WFC10_TabPaneItem."_Profiles3Top", $WFC10_TabPaneItem."_Profiles3", 10, '', '', 1 /*Vertical*/, 300/*Width*/, 1 /*Target=Pane2*/, 1/*UsePixel*/, 'true'); + CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem."_Profiles3Bot", $WFC10_TabPaneItem."_Profiles3", 20, '', '', $CategoryIdProfileWeatherDisplay /*BaseId*/, 'false' /*BarBottomVisible*/); + CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem."_Profiles3TopL",$WFC10_TabPaneItem."_Profiles3Top", 10, '', '', $WebFrontProfilesId3TopL /*BaseId*/, 'false' /*BarBottomVisible*/); + CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem."_Profiles3TopR",$WFC10_TabPaneItem."_Profiles3Top", 20, '', '', $WebFrontProfilesId3TopR /*BaseId*/, 'false' /*BarBottomVisible*/); + CreateWFCItemSplitPane ($WFC10_ConfigId, $WFC10_TabPaneItem."_Profiles4", $WFC10_TabPaneItem.'_Profiles', 20, 'Tagesbeginn', 'Clock', 0 /*Horizontal*/, 108 /*Hight*/, 0 /*Target=Pane1*/, 1/*UsePixel*/, 'true'); + CreateWFCItemSplitPane ($WFC10_ConfigId, $WFC10_TabPaneItem."_Profiles4Top", $WFC10_TabPaneItem."_Profiles4", 10, '', '', 1 /*Vertical*/, 300/*Width*/, 1 /*Target=Pane2*/, 1/*UsePixel*/, 'true'); + CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem."_Profiles4Bot", $WFC10_TabPaneItem."_Profiles4", 20, '', '', $CategoryIdProfileBgnOfDayDisplay /*BaseId*/, 'false' /*BarBottomVisible*/); + CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem."_Profiles4TopL",$WFC10_TabPaneItem."_Profiles4Top", 10, '', '', $WebFrontProfilesId4TopL /*BaseId*/, 'false' /*BarBottomVisible*/); + CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem."_Profiles4TopR",$WFC10_TabPaneItem."_Profiles4Top", 20, '', '', $WebFrontProfilesId4TopR /*BaseId*/, 'false' /*BarBottomVisible*/); + CreateWFCItemSplitPane ($WFC10_ConfigId, $WFC10_TabPaneItem."_Profiles5", $WFC10_TabPaneItem.'_Profiles', 30, 'Tagesende', 'Clock', 0 /*Horizontal*/, 108 /*Hight*/, 0 /*Target=Pane1*/, 1/*UsePixel*/, 'true'); + CreateWFCItemSplitPane ($WFC10_ConfigId, $WFC10_TabPaneItem."_Profiles5Top", $WFC10_TabPaneItem."_Profiles5", 10, '', '', 1 /*Vertical*/, 300/*Width*/, 1 /*Target=Pane2*/, 1/*UsePixel*/, 'true'); + CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem."_Profiles5Bot", $WFC10_TabPaneItem."_Profiles5", 20, '', '', $CategoryIdProfileEndOfDayDisplay /*BaseId*/, 'false' /*BarBottomVisible*/); + CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem."_Profiles5TopL",$WFC10_TabPaneItem."_Profiles5Top", 10, '', '', $WebFrontProfilesId5TopL /*BaseId*/, 'false' /*BarBottomVisible*/); + CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem."_Profiles5TopR",$WFC10_TabPaneItem."_Profiles5Top", 20, '', '', $WebFrontProfilesId5TopR /*BaseId*/, 'false' /*BarBottomVisible*/); + CreateLink('Profil Auswahl', $ControlIdProfileTempSelect, $WebFrontProfilesId1TopL, 10); + CreateLink('Neues Profil', $ScriptIdProfileTempCreate, $WebFrontProfilesId1TopR, 10); + CreateLink('Profil löschen', $ScriptIdProfileTempDelete, $WebFrontProfilesId1TopR, 20); + CreateLink('Profil Auswahl', $ControlIdProfileSunSelect, $WebFrontProfilesId2TopL, 10); + CreateLink('Neues Profil', $ScriptIdProfileSunCreate, $WebFrontProfilesId2TopR, 10); + CreateLink('Profil löschen', $ScriptIdProfileSunDelete, $WebFrontProfilesId2TopR, 20); + CreateLink('Profil Auswahl', $ControlIdProfileWeatherSelect, $WebFrontProfilesId3TopL, 10); + CreateLink('Neues Profil', $ScriptIdProfileWeatherCreate, $WebFrontProfilesId3TopR, 10); + CreateLink('Profil löschen', $ScriptIdProfileWeatherDelete, $WebFrontProfilesId3TopR, 20); + CreateLink('Profile Auswahl', $ControlIdProfileBgnOfDaySelect, $WebFrontProfilesId4TopL, 10); + CreateLink('Neues Profil', $ScriptIdProfileBgnOfDayCreate, $WebFrontProfilesId4TopR, 10); + CreateLink('Profil löschen', $ScriptIdProfileBgnOfDayDelete, $WebFrontProfilesId4TopR, 20); + CreateLink('Profile Auswahl', $ControlIdProfileEndOfDaySelect, $WebFrontProfilesId5TopL, 10); + CreateLink('Neues Profil', $ScriptIdProfileEndOfDayCreate, $WebFrontProfilesId5TopR, 10); + CreateLink('Profil löschen', $ScriptIdProfileEndOfDayDelete, $WebFrontProfilesId5TopR, 20); + + // Common Settings + $WebFrontSettingId = CreateCategory('Settings', $categoryId_WebFront, 50); + CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem.'_Settings', $WFC10_TabPaneItem, 50, 'Einstellungen', 'Gear', $WebFrontSettingId /*BaseId*/, 'true' /*BarBottomVisible*/); + CreateLink('Msg Prio. Temparatur', IPS_GetObjectIDByIdent(c_Control_MsgPrioTemp, $CategoryIdSettings), $WebFrontSettingId, 60); + CreateLink('Msg Prio. Programm', IPS_GetObjectIDByIdent(c_Control_MsgPrioProg, $CategoryIdSettings), $WebFrontSettingId, 70); + + // Application Logging + $WebFrontLoggingId = CreateCategory('Logging', $categoryId_WebFront, 60); + CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem."_Logging", $WFC10_TabPaneItem, 60, 'Meldungen', 'Window', $WebFrontLoggingId /*BaseId*/, 'false' /*BarBottomVisible*/); + CreateLink('Meldungen', $ControlIdLog, $WebFrontLoggingId, 10); + + ReloadAllWebFronts(); + } + + // ---------------------------------------------------------------------------------------------------------------------------- + // Mobile Definition + // ---------------------------------------------------------------------------------------------------------------------------- + if ($Mobile_Enabled ) { + $MobileId = CreateCategoryPath($Mobile_Path, $Mobile_PathOrder, $Mobile_PathIcon); + EmptyCategory($MobileId); + + $MobileDevicesId = CreateCategory('Beschattungselemente', $MobileId, 10, 'Information'); + $MobileSettingsId = CreateCategory('Einstellungen', $MobileId, 40, 'Gear'); + $MobileLogId = CreateCategory('Meldungen', $MobileId, 50, 'Window'); + + $MobileScenariosId = CreateDummyInstance("Szenarien", $MobileId, 5); + CreateLink('Auswahl', $ControlIdScenarioActivate, $MobileScenariosId, 10); + $Idx = 10; + foreach ($DeviceConfig as $DeviceIdent=>$DeviceData) { + $DeviceId = IPS_GetObjectIDByIdent($DeviceIdent, $CategoryIdDevices); + $DeviceName = $DeviceData[c_Property_Name]; + + // Mobile Overview + CreateLink($DeviceName, IPS_GetObjectIDByIdent(c_Control_Movement, $DeviceId), $MobileId, $Idx); + + // Detailed DeviceData + $MobileDeviceDetailId = CreateCategory($DeviceName, $MobileDevicesId, $Idx); + CreateLink('Bewegung', IPS_GetObjectIDByIdent(c_Control_Movement, $DeviceId), $MobileDeviceDetailId, 10); + CreateLink('Status', IPS_GetObjectIDByIdent(c_Control_Display, $DeviceId), $MobileDeviceDetailId, 20); + CreateLink('Position', IPS_GetObjectIDByIdent(c_Control_Position, $DeviceId), $MobileDeviceDetailId, 30); + $ProgramDeviceId = CreateDummyInstance("Programme", $MobileDeviceDetailId, 1000); + CreateLink('Nacht', IPS_GetObjectIDByIdent(c_Control_ProgramNight, $DeviceId), $ProgramDeviceId, 10); + CreateLink('Tag', IPS_GetObjectIDByIdent(c_Control_ProgramDay, $DeviceId), $ProgramDeviceId, 20); + CreateLink('Temperatur', IPS_GetObjectIDByIdent(c_Control_ProgramTemp, $DeviceId), $ProgramDeviceId, 30); + CreateLink('Anwesenend', IPS_GetObjectIDByIdent(c_Control_ProgramPresent, $DeviceId), $ProgramDeviceId, 40); + $controlIdProgramWeather = @IPS_GetObjectIDByIdent(c_Control_ProgramWeather, $DeviceId); + if ($controlIdProgramWeather!==false) { + CreateLink('Programm Wetter', $controlIdProgramWeather, $ProgramDeviceId, 35); + } + $ProfileDeviceId = CreateDummyInstance("Profile", $MobileDeviceDetailId, 1100); + CreateLink('Temperatur Profil', IPS_GetObjectIDByIdent(c_Control_ProfileTemp, $DeviceId), $ProfileDeviceId, 10); + CreateLink('Sonnenstand Profil', IPS_GetObjectIDByIdent(c_Control_ProfileSun, $DeviceId), $ProfileDeviceId, 20); + if ($controlIdProgramWeather!==false) { + CreateLink('Wetter Profil', IPS_GetObjectIDByIdent(c_Control_ProfileWeather, $DeviceId), $ProfileDeviceId, 30); + } + CreateLink('Tagesbeginn Profil', IPS_GetObjectIDByIdent(c_Control_ProfileBgnOfDay, $DeviceId), $ProfileDeviceId, 40); + CreateLink('Tagesende Profil', IPS_GetObjectIDByIdent(c_Control_ProfileEndOfDay, $DeviceId), $ProfileDeviceId, 50); + CreateLink('Profil Information', IPS_GetObjectIDByIdent(c_Control_ProfileInfo, $DeviceId), $ProfileDeviceId, 60); + $SettingsDeviceId = CreateDummyInstance("Einstellungen", $MobileDeviceDetailId, 1200); + CreateLink('Automatik', IPS_GetObjectIDByIdent(c_Control_Automatic, $DeviceId), $SettingsDeviceId, 10); + CreateLink('Manueller Modus', IPS_GetObjectIDByIdent(c_Control_ManualChange, $DeviceId), $SettingsDeviceId, 20); + CreateLink('Temperatur Modus', IPS_GetObjectIDByIdent(c_Control_TempChange, $DeviceId), $SettingsDeviceId, 25); + CreateLink('Status', IPS_GetObjectIDByIdent(c_Control_Display, $DeviceId), $SettingsDeviceId, 30); + CreateLink('Position', IPS_GetObjectIDByIdent(c_Control_Position, $DeviceId), $SettingsDeviceId, 40); + + $Idx = $Idx + 10; + } + + CreateLink('Automatic Ein', $ScriptIdAutomaticOn, $MobileSettingsId, 10); + CreateLink('Automatic Aus', $ScriptIdAutomaticOff, $MobileSettingsId, 20); + CreateLink('Automatic Reset', $ScriptIdAutomaticReset, $MobileSettingsId, 30); + CreateLink('Msg Prio. Temparatur', $ControlIdMsgPrioTemp, $MobileSettingsId, 100); + CreateLink('Msg Prio. Programm', $ControlIdMsgPrioTemp, $MobileSettingsId, 110); + + $MobileSettingScenarioId = CreateCategory('Szenarien', $MobileSettingsId, 10, 'Script'); + CreateLink('Szenario Auswahl', $ControlIdScenarioSelect, $MobileSettingScenarioId, 10); + CreateLink('Szenario Einstellungen', $CategoryIdScenarioDisplay, $MobileSettingScenarioId, 10); + CreateLink('Neues Szenario', $ScriptIdScenarioCreate, $MobileSettingScenarioId, 20); + CreateLink('Szenario löschen', $ScriptIdScenarioDelete, $MobileSettingScenarioId, 30); + + $MobileSettingProfileId = CreateCategory('Temperatur Profile', $MobileSettingsId, 10, 'Temperature'); + CreateLink('Profil Auswahl', $ControlIdProfileTempSelect, $MobileSettingProfileId, 10); + CreateLink('Profil Einstellungen', $CategoryIdProfileTempDisplay, $MobileSettingProfileId,10); + CreateLink('Neues Profil', $ScriptIdProfileTempCreate, $MobileSettingProfileId, 30); + CreateLink('Profil löschen', $ScriptIdProfileTempDelete, $MobileSettingProfileId, 40); + $MobileSettingProfileId = CreateCategory('Sonnenstand Profile', $MobileSettingsId, 20, 'Sun'); + CreateLink('Profil Auswahl', $ControlIdProfileSunSelect, $MobileSettingProfileId, 10); + CreateLink('Profil Einstellungen', $CategoryIdProfileSunDisplay, $MobileSettingProfileId,10); + //CreateLink('Profil Graph', $CategoryIdProfileSunGraphs, $MobileSettingProfileId,20); + CreateLink('Profil Graph', $MediaIdAzimuth, $MobileSettingProfileId,20); + + CreateLink('Neues Profil', $ScriptIdProfileSunCreate, $MobileSettingProfileId, 30); + CreateLink('Profil löschen', $ScriptIdProfileSunDelete, $MobileSettingProfileId, 40); + $MobileSettingProfileId = CreateCategory('Wetter Profile', $MobileSettingsId, 30, 'Drops'); + CreateLink('Profil Auswahl', $ControlIdProfileWeatherSelect, $MobileSettingProfileId, 10); + CreateLink('Profil Einstellungen', $CategoryIdProfileWeatherDisplay, $MobileSettingProfileId,10); + CreateLink('Neues Profil', $ScriptIdProfileWeatherCreate, $MobileSettingProfileId, 30); + CreateLink('Profil löschen', $ScriptIdProfileWeatherDelete, $MobileSettingProfileId, 40); + $MobileSettingProfileId = CreateCategory('Tagesbeginn Profile',$MobileSettingsId, 40, 'Clock'); + CreateLink('Profile Auswahl', $ControlIdProfileBgnOfDaySelect, $MobileSettingProfileId, 10); + CreateLink('Profil Einstellungen', $CategoryIdProfileBgnOfDayDisplay,$MobileSettingProfileId,10); + CreateLink('Neues Profil', $ScriptIdProfileBgnOfDayCreate, $MobileSettingProfileId, 20); + CreateLink('Profil löschen', $ScriptIdProfileBgnOfDayDelete, $MobileSettingProfileId, 30); + $MobileSettingProfileId = CreateCategory('Tagesende Profile', $MobileSettingsId, 50, 'Clock'); + CreateLink('Profile Auswahl', $ControlIdProfileEndOfDaySelect, $MobileSettingProfileId, 10); + CreateLink('Profil Einstellungen', $CategoryIdProfileEndOfDayDisplay,$MobileSettingProfileId,10); + CreateLink('Neues Profil', $ScriptIdProfileEndOfDayCreate, $MobileSettingProfileId, 20); + CreateLink('Profil löschen', $ScriptIdProfileEndOfDayDelete, $MobileSettingProfileId, 30); + + CreateLink('Meldungen', $ControlIdLog, $MobileLogId, 100); + } + + + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/install/InstallationScripts/IPSTwilight_Installation.ips.php b/IPSLibrary/install/InstallationScripts/IPSTwilight_Installation.ips.php index e42a47f..f615743 100644 --- a/IPSLibrary/install/InstallationScripts/IPSTwilight_Installation.ips.php +++ b/IPSLibrary/install/InstallationScripts/IPSTwilight_Installation.ips.php @@ -173,7 +173,7 @@ DeleteWFCItems($WFC10_ConfigId, 'WeatherTPSunrise'); DeleteWFCItems($WFC10_ConfigId, $tabItem); CreateWFCItemTabPane ($WFC10_ConfigId, $WFC10_TabPaneItem, $WFC10_TabPaneParent, $WFC10_TabPaneOrder, $WFC10_TabPaneName, $WFC10_TabPaneIcon); - CreateWFCItemSplitPane ($WFC10_ConfigId, $tabItem, $WFC10_TabPaneItem, $WFC10_TabOrder, $WFC10_TabName, $WFC10_TabIcon, 1 /*Vertical*/, 300 /*Width*/, 1 /*Target=Pane2*/, 1/*UsePixel*/, 'true'); + CreateWFCItemSplitPane ($WFC10_ConfigId, $tabItem, $WFC10_TabPaneItem, $WFC10_TabOrder, $WFC10_TabName, $WFC10_TabIcon, 1 /*Vertical*/, 310 /*Width*/, 1 /*Target=Pane2*/, 1/*UsePixel*/, 'true'); CreateWFCItemSplitPane ($WFC10_ConfigId, $tabItem.'_Left', $tabItem, 10, '', '', 0 /*Horicontal*/, 205 /*Height*/, 0 /*Target=Pane1*/, 1 /*UsePixel*/, 'true'); CreateWFCItemCategory ($WFC10_ConfigId, $tabItem.'_Right'.$UId, $tabItem, 20, '', '', $categoryId_WebFrontRight /*BaseId*/, 'false' /*BarBottomVisible*/); CreateWFCItemSplitPane ($WFC10_ConfigId, $tabItem.'_Top', $tabItem.'_Left', 10, '', '', 1 /*Vertical*/, 50 /*Width*/, 0 /*Target=Pane1*/, 0 /*UsePercentage*/, 'true'); diff --git a/IPSLibrary/install/InstallationScripts/IPSWatering_Installation.ips.php b/IPSLibrary/install/InstallationScripts/IPSWatering_Installation.ips.php index f833974..d3b1b7e 100644 --- a/IPSLibrary/install/InstallationScripts/IPSWatering_Installation.ips.php +++ b/IPSLibrary/install/InstallationScripts/IPSWatering_Installation.ips.php @@ -124,7 +124,14 @@ c_ProgramId_Every3Day => c_Program_Every3Day, c_ProgramId_MonWedFri => c_Program_MonWedFri, c_ProgramId_MonTur => c_Program_MonTur, - c_ProgramId_Sunday => c_Program_Sunday)); + c_ProgramId_Sunday => c_Program_Sunday, + c_ProgramId_Monday => c_Program_Monday, + c_ProgramId_Tuesday => c_Program_Tuesday, + c_ProgramId_Wednesday => c_Program_Wednesday, + c_ProgramId_Thursday => c_Program_Thursday, + c_ProgramId_Friday => c_Program_Friday, + c_ProgramId_Saturday => c_Program_Saturday + )); CreateProfile_Associations ('IPSWatering_Sensor', array( 0 => 'Aus', 1 => '1 mm', @@ -172,14 +179,15 @@ $WebFrontOverviewBottom2 = CreateCategory( 'Bottom_2', $WebFrontOverviewId, 40); DeleteWFCItems($WFC10_ConfigId, $WFC10_TabPaneItem); + $UId = date('Hi'); CreateWFCItemTabPane ($WFC10_ConfigId, $WFC10_TabPaneItem, $WFC10_TabPaneParent, $WFC10_TabPaneOrder, $WFC10_TabPaneName, $WFC10_TabPaneIcon); CreateWFCItemSplitPane ($WFC10_ConfigId, $WFC10_TabPaneItem.'_OV', $WFC10_TabPaneItem.'', 10, $WFC10_TabName1, $WFC10_TabIcon1, 0 /*Horizontal*/, 300 /*Hight*/, 0 /*Target=Pane1*/, 1/*UsePixel*/, 'true'); CreateWFCItemSplitPane ($WFC10_ConfigId, $WFC10_TabPaneItem.'_OVTop', $WFC10_TabPaneItem.'_OV', 10, '', '', 1 /*Vertical*/, 430 /*Width*/, 1 /*Target=Pane2*/, 1/*UsePixel*/, 'true'); CreateWFCItemSplitPane ($WFC10_ConfigId, $WFC10_TabPaneItem.'_OVBottom', $WFC10_TabPaneItem.'_OV', 20, '', '', 1 /*Vertical*/, 430 /*Width*/, 1 /*Target=Pane2*/, 1/*UsePixel*/, 'true'); - CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem.'_OVTop1', $WFC10_TabPaneItem.'_OVTop', 10, 'Column_1', '', $WebFrontOverviewTop1 /*BaseId*/, 'false' /*BarBottomVisible*/); - CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem.'_OVTop2', $WFC10_TabPaneItem.'_OVTop', 10, 'Column_2', '', $WebFrontOverviewTop2 /*BaseId*/, 'false' /*BarBottomVisible*/); - CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem.'_OVBottom1',$WFC10_TabPaneItem.'_OVBottom', 20, 'Column_1', '', $WebFrontOverviewBottom1 /*BaseId*/, 'false' /*BarBottomVisible*/); - CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem.'_OVBottom2',$WFC10_TabPaneItem.'_OVBottom', 20, 'Column_2', '', $WebFrontOverviewBottom2 /*BaseId*/, 'false' /*BarBottomVisible*/); + CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem.'_OVTop1'.$UId, $WFC10_TabPaneItem.'_OVTop', 10, 'Column_1', '', $WebFrontOverviewTop1 /*BaseId*/, 'false' /*BarBottomVisible*/); + CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem.'_OVTop2'.$UId, $WFC10_TabPaneItem.'_OVTop', 10, 'Column_2', '', $WebFrontOverviewTop2 /*BaseId*/, 'false' /*BarBottomVisible*/); + CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem.'_OVBottom1'.$UId,$WFC10_TabPaneItem.'_OVBottom', 20, 'Column_1', '', $WebFrontOverviewBottom1 /*BaseId*/, 'false' /*BarBottomVisible*/); + CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem.'_OVBottom2'.$UId,$WFC10_TabPaneItem.'_OVBottom', 20, 'Column_2', '', $WebFrontOverviewBottom2 /*BaseId*/, 'false' /*BarBottomVisible*/); // Webfront Overview $Idx = 10; @@ -191,8 +199,8 @@ CreateLinkByDestination ('Status', get_WateringControlId(c_Control_ToBeDone, $CirclyId), $WebFrontOverviewTop2, $Idx); // Detailed CirclyData - $WebFrontDetailId = CreateCategory($CircleName, $WebFrontId, 100+$Idx); - CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem.'_'.$Idx,$WFC10_TabPaneItem.'', 100+$Idx, $CircleName, '', $WebFrontDetailId /*BaseId*/, 'false' /*BarBottomVisible*/); + $WebFrontDetailId = CreateCategory($CircleId, $WebFrontId, 100+$Idx); + CreateWFCItemCategory ($WFC10_ConfigId, $WFC10_TabPaneItem.'_'.$Idx.$UId,$WFC10_TabPaneItem.'', 100+$Idx, $CircleName, '', $WebFrontDetailId /*BaseId*/, 'false' /*BarBottomVisible*/); CreateLink('Status', get_WateringControlId(c_Control_Active, $CirclyId), $WebFrontDetailId, 10); CreateLink('Automatik', get_WateringControlId(c_Control_Automatic, $CirclyId), $WebFrontDetailId, 20); CreateLink('Programm', get_WateringControlId(c_Control_Program, $CirclyId), $WebFrontDetailId, 30); @@ -248,8 +256,7 @@ } } - - // ------------------------------------------------------------------------------------------------ + // ------------------------------------------------------------------------------------------------ function get_WateringCirclyId($DeviceName, $ParentId) { $CategoryId = IPS_GetObjectIDByIdent($DeviceName, $ParentId); return $CategoryId; diff --git a/IPSLibrary/install/InstallationScripts/IPSWeatherForcastAT_Installation.ips.php b/IPSLibrary/install/InstallationScripts/IPSWeatherForcastAT_Installation.ips.php index 7d96c3f..55cc912 100644 --- a/IPSLibrary/install/InstallationScripts/IPSWeatherForcastAT_Installation.ips.php +++ b/IPSLibrary/install/InstallationScripts/IPSWeatherForcastAT_Installation.ips.php @@ -88,7 +88,7 @@ $Mobile_Enabled = $moduleManager->GetConfigValue('Enabled', 'Mobile'); $Mobile_Path = $moduleManager->GetConfigValue('Path', 'Mobile'); $Mobile_PathOrder = $moduleManager->GetConfigValueInt('PathOrder', 'Mobile'); - $Mobile_PathIcon = $moduleManager->GetConfigValue('PathOrder', 'Mobile'); + $Mobile_PathIcon = $moduleManager->GetConfigValue('PathIcon', 'Mobile'); $Mobile_Name = $moduleManager->GetConfigValue('Name', 'Mobile'); $Mobile_Order = $moduleManager->GetConfigValueInt('Order', 'Mobile'); $Mobile_Icon = $moduleManager->GetConfigValue('Icon', 'Mobile'); @@ -104,43 +104,46 @@ $scriptId_Refresh = IPS_GetScriptIDByName('IPSWeatherForcastAT_Refresh', $categoryId_App); $timerId_Refresh = CreateTimer_CyclicByMinutes ('Refresh', $scriptId_Refresh, 30) ; + CreateProfile_Count ('IPSWeatherForcastAT_Temp', null, null, null, null, " °C", null); + // Create Variables - $LastRefreshDateTime = CreateVariable("LastRefreshDateTime", 3 /*String*/, $categoryId_Data, 10, '~String', null, ''); - $LastRefreshTime = CreateVariable("LastRefreshTime", 3 /*String*/, $categoryId_Data, 20, '~String', null, ''); + $LastRefreshDateTime = CreateVariable("LastRefreshDateTime", 3 /*String*/, $categoryId_Data, 10, '~String', null, ''); + $LastRefreshTime = CreateVariable("LastRefreshTime", 3 /*String*/, $categoryId_Data, 20, '~String', null, ''); $TodaySeaLevel = CreateVariable("SeaLevel", 1 /*Integer*/, $categoryId_Data, 30, null, null, 0); $TodayAirHumidity = CreateVariable("AirHumidity", 3 /*String*/, $categoryId_Data, 40, '~String', null, ''); $TodayWind = CreateVariable("Wind", 3 /*String*/, $categoryId_Data, 50, '~String', null, ''); $TodayDayOfWeek = CreateVariable("TodayDay", 3 /*String*/, $categoryId_Data, 100, '~String', null, ''); - $TodayTempCurrent = CreateVariable("TodayTempCurrent", 1 /*Integer*/, $categoryId_Data, 110, null, null, 0); - $TodayTempMin = CreateVariable("TodayTempMin", 1 /*Integer*/, $categoryId_Data, 120, null, null, 0); - $TodayTempMax = CreateVariable("TodayTempMax", 1 /*Integer*/, $categoryId_Data, 130, null, null, 0); + $TodayTempCurrent = CreateVariable("TodayTempCurrent", 1 /*Integer*/, $categoryId_Data, 110, 'IPSWeatherForcastAT_Temp', null, 0); + $TodayTempMin = CreateVariable("TodayTempMin", 1 /*Integer*/, $categoryId_Data, 120, 'IPSWeatherForcastAT_Temp', null, 0); + $TodayTempMax = CreateVariable("TodayTempMax", 1 /*Integer*/, $categoryId_Data, 130, 'IPSWeatherForcastAT_Temp', null, 0); $TodayIcon = CreateVariable("TodayIcon", 3 /*String*/, $categoryId_Data, 140, '~String', null, ''); $TodayTextShort = CreateVariable("TodayForecastLong", 3 /*String*/, $categoryId_Data, 150, '~String', null, ''); - $TodayTextLong = CreateVariable("TodayForecastShort", 3 /*String*/, $categoryId_Data, 160, '~String', null, ''); + $TodayTextLong = CreateVariable("TodayForecastShort", 3 /*String*/, $categoryId_Data, 160, '~String', null, ''); $Forecast1DayOfWeek = CreateVariable("TomorrowDay", 3 /*String*/, $categoryId_Data, 200, '~String', null, ''); - $Forecast1TempMin = CreateVariable("TomorrowTempMin", 1 /*Integer*/, $categoryId_Data, 210, null, null, 0); - $Forecast1TempMax = CreateVariable("TomorrowTempMax", 1 /*Integer*/, $categoryId_Data, 220, null, null, 0); + $Forecast1TempMin = CreateVariable("TomorrowTempMin", 1 /*Integer*/, $categoryId_Data, 210, 'IPSWeatherForcastAT_Temp', null, 0); + $Forecast1TempMax = CreateVariable("TomorrowTempMax", 1 /*Integer*/, $categoryId_Data, 220, 'IPSWeatherForcastAT_Temp', null, 0); $Forecast1TextShort = CreateVariable("TomorrowForecastLong", 3 /*String*/, $categoryId_Data, 230, '~String', null, ''); $Forecast1TextLong = CreateVariable("TomorrowForecastShort", 3 /*String*/, $categoryId_Data, 240, '~String', null, ''); $Forecast1Icon = CreateVariable("TomorrowIcon", 3 /*String*/, $categoryId_Data, 250, '~String', null, ''); $Forecast2DayOfWeek = CreateVariable("Tomorrow1Day", 3 /*String*/, $categoryId_Data, 300, '~String', null, ''); - $Forecast2TempMin = CreateVariable("Tomorrow1TempMin", 1 /*Integer*/, $categoryId_Data, 310, null, null, 0); - $Forecast2TempMax = CreateVariable("Tomorrow1TempMax", 1 /*Integer*/, $categoryId_Data, 320, null, null, 0); + $Forecast2TempMin = CreateVariable("Tomorrow1TempMin", 1 /*Integer*/, $categoryId_Data, 310, 'IPSWeatherForcastAT_Temp', null, 0); + $Forecast2TempMax = CreateVariable("Tomorrow1TempMax", 1 /*Integer*/, $categoryId_Data, 320, 'IPSWeatherForcastAT_Temp', null, 0); $Forecast2TextShort = CreateVariable("Tomorrow1ForecastLong", 3 /*String*/, $categoryId_Data, 330, '~String', null, ''); $Forecast2TextLong = CreateVariable("Tomorrow1ForecastShort",3 /*String*/, $categoryId_Data, 340, '~String', null, ''); $Forecast2Icon = CreateVariable("Tomorrow1Icon", 3 /*String*/, $categoryId_Data, 350, '~String', null, ''); $Forecast3DayOfWeek = CreateVariable("Tomorrow2Day", 3 /*String*/, $categoryId_Data, 400, '~String', null, ''); - $Forecast3TempMin = CreateVariable("Tomorrow2TempMin", 1 /*Integer*/, $categoryId_Data, 410, null, null, 0); - $Forecast3TempMax = CreateVariable("Tomorrow2TempMax", 1 /*Integer*/, $categoryId_Data, 420, null, null, 0); + $Forecast3TempMin = CreateVariable("Tomorrow2TempMin", 1 /*Integer*/, $categoryId_Data, 410, 'IPSWeatherForcastAT_Temp', null, 0); + $Forecast3TempMax = CreateVariable("Tomorrow2TempMax", 1 /*Integer*/, $categoryId_Data, 420, 'IPSWeatherForcastAT_Temp', null, 0); $Forecast3TextShort = CreateVariable("Tomorrow2ForecastLong", 3 /*String*/, $categoryId_Data, 430, '~String', null, ''); $Forecast3TextLong = CreateVariable("Tomorrow2ForecastShort",3 /*String*/, $categoryId_Data, 440, '~String', null, ''); $Forecast3Icon = CreateVariable("Tomorrow2Icon", 3 /*String*/, $categoryId_Data, 450, '~String', null, ''); - $iForecast = CreateVariable("iForecast", 3 /*String*/, $categoryId_Data, 1000, '~HTMLBox', null, ''); // Webfront Installation if ($WFC10_Enabled) { @@ -152,10 +155,12 @@ // iPhone Installation if ($Mobile_Enabled) { - $mobileId = CreateCategoryPath($Mobile_Path, $Mobile_PathOrder, $Mobile_PathIcon); - $mobileId = CreateCategoryPath($Mobile_Path.'.'.$Mobile_Name, $Mobile_Order, $Mobile_Icon); - - CreateLink('Vorhersage', $iForecast, $mobileId, 10); + $mobileId = CreateCategoryPath($Mobile_Path, $Mobile_PathOrder, $Mobile_PathIcon); + $categoryId = @IPS_GetObjectIDByIdent($Mobile_Name, $mobileId); + if ($categoryId!==false) { + DeleteCategory($categoryId); + } + CreateLink($Mobile_Name, $iForecast, $mobileId, $Mobile_Order); } // Execute Data Refresh diff --git a/IPSLibrary/install/InstallationScripts/NetPlayer2_Installation.ips.php b/IPSLibrary/install/InstallationScripts/NetPlayer2_Installation.ips.php new file mode 100644 index 0000000..5d99d8c --- /dev/null +++ b/IPSLibrary/install/InstallationScripts/NetPlayer2_Installation.ips.php @@ -0,0 +1,158 @@ + + * + * NetPlayer Installation + * + * Script zur kompletten Installation des NetPlayers. + * + * @page requirements_netplayer Installations Voraussetzungen + * - IPS Kernel >= 2.50 + * - IPSModuleManager >= 2.5.1 + * - IPSLogger >= 2.5.1 + * + * @page install_netplayer Installations Schritte + * Folgende Schritte sind zur Installation des NetPlayers nötig: + * - Laden des Modules (siehe IPSModuleManager) + * - Konfiguration (Details siehe Konfiguration) + * - Installation (siehe IPSModuleManager) + * + */ + + if (!isset($moduleManager)) { + IPSUtils_Include ('IPSModuleManager.class.php', 'IPSLibrary::install::IPSModuleManager'); + + echo 'ModuleManager Variable not set --> Create "default" ModuleManager'.PHP_EOL; + $moduleManager = new IPSModuleManager('NetPlayer'); + } + + $moduleManager->VersionHandler()->CheckModuleVersion('IPS','2.50'); + $moduleManager->VersionHandler()->CheckModuleVersion('IPSLogger','2.50.1'); + $moduleManager->VersionHandler()->CheckModuleVersion('IPSModuleManager','2.50.1'); + + IPSUtils_Include ("IPSInstaller.inc.php", "IPSLibrary::install::IPSInstaller"); + IPSUtils_Include ("IPSMessageHandler.class.php", "IPSLibrary::app::core::IPSMessageHandler"); + IPSUtils_Include ("NetPlayer_Constants.inc.php", "IPSLibrary::app::modules::NetPlayer2"); + IPSUtils_Include ("NetPlayer_Configuration.inc.php", "IPSLibrary::config::modules::NetPlayer2"); + + + // ---------------------------------------------------------------------------------------------------------------------------- + // Program Installation + // ---------------------------------------------------------------------------------------------------------------------------- + + echo "--- Create NetPlayer -------------------------------------------------------------------\n"; + $CategoryIdData = $moduleManager->GetModuleCategoryID('data'); + $CategoryIdApp = $moduleManager->GetModuleCategoryID('app'); + $CategoryIdHw = CreateCategoryPath('Hardware.NetPlayer'); + + // Scripts + $actionScriptId = IPS_GetScriptIDByName('NetPlayer_ActionScript', $CategoryIdApp); + $eventScriptId = IPS_GetScriptIDByName('NetPlayer_EventScript', $CategoryIdApp); + + // Controls + CreateProfile_Associations ('NetPlayer_Category', array('Root')); + CreateProfile_Associations ('NetPlayer_CDAlbumList', array('...')); + CreateProfile_Associations ('NetPlayer_CDAlbumNav', array('<<','>>')); + CreateProfile_Associations ('NetPlayer_CDTrackList', array('...')); + CreateProfile_Associations ('NetPlayer_CDTrackList2', array('xx', 'yyy')); + CreateProfile_Associations ('NetPlayer_CDTrackNav', array('<<','>>')); + CreateProfile_Associations ('NetPlayer_RadioList', array('...')); + CreateProfile_Associations ('NetPlayer_RadioNav', array('<<','>>')); + CreateProfile_Associations ('NetPlayer_Control', array('Play','Pause','Stop','<<','>>')); + CreateProfile_Associations ('NetPlayer_Source', array('CD Player','Radio Player')); + + // MP3 Player + $mp3PlayerInstanceId = CreateInstance("CDPlayer", $CategoryIdData, "{485D0419-BE97-4548-AA9C-C083EB82E61E}",1000); + $categoryId = CreateVariable("Category", 1 /*Integer*/, $CategoryIdData, 150 , 'NetPlayer_Category', $actionScriptId, 0); + $cdCategoryNameId = CreateVariable("CategoryName", 3 /*String*/, $mp3PlayerInstanceId, 10 , '~TextBox', null/*NoAS*/, ""); + $cdIdxId = CreateVariable("DirectoryIdx", 1 /*Integer*/, $mp3PlayerInstanceId, 20 , '', null/*NoAS*/, 0); + $cddirectoryPath = CreateVariable("DirectoryPath", 3 /*String*/, $mp3PlayerInstanceId, 30 , '~TextBox'); + $cddirectoryName = CreateVariable("DirectoryName", 3 /*String*/, $mp3PlayerInstanceId, 40 , '~TextBox'); + $cdTrackListHtmlId= CreateVariable("TrackListHtml", 3 /*String*/, $mp3PlayerInstanceId, 50 , '~HTMLBox'); + $cdTrackIdxId = CreateVariable("TrackIdx", 1 /*Integer*/, $mp3PlayerInstanceId, 60 , '', null/*NoAS*/, 0); + + // WebRadio + $webRadioInstanceId = CreateInstance("RadioPlayer", $CategoryIdData, "{485D0419-BE97-4548-AA9C-C083EB82E61E}",1010); + $radioNameId = CreateVariable("Name", 3 /*String*/, $webRadioInstanceId, 10 , '~TextBox'); + $radioUrlId = CreateVariable("Url", 3 /*String*/, $webRadioInstanceId, 20 , '~TextBox'); + $radioIdxId = CreateVariable("Idx", 1 /*Integer*/, $webRadioInstanceId, 30 , '', null/*NoAS*/, 0); + + $powerId = CreateVariable("Power", 0 /*Boolean*/, $CategoryIdData, 100 , '~Switch', $actionScriptId, 0); + $sourceId = CreateVariable("Source", 1 /*Integer*/, $CategoryIdData, 110 , 'NetPlayer_Source', $actionScriptId, 0 /*CD*/); + $controlId = CreateVariable("Control", 1 /*Integer*/, $CategoryIdData, 120 , 'NetPlayer_Control', $actionScriptId, 2 /*Stop*/); + $albumId = CreateVariable("Album", 3 /*String*/, $CategoryIdData, 130, '~String'); + $interpretId = CreateVariable("Interpret", 3 /*String*/, $CategoryIdData, 140, '~String'); + $categoryId = CreateVariable("Category", 1 /*Integer*/, $CategoryIdData, 150 , 'NetPlayer_Category', $actionScriptId, 0); + $cdAlbumNavId = CreateVariable("CDAlbumNav", 1 /*Integer*/, $CategoryIdData, 160 , 'NetPlayer_CDAlbumNav', $actionScriptId, -1); + $cdAlbumListId = CreateVariable("CDAlbumList", 1 /*Integer*/, $CategoryIdData, 170 , 'NetPlayer_CDAlbumList', $actionScriptId, -1); + $cdTrackNavId = CreateVariable("CDTrackNav", 1 /*Integer*/, $CategoryIdData, 180 , 'NetPlayer_CDTrackNav', $actionScriptId, -1); + $cdTrackListId = CreateVariable("CDTrackList", 1 /*Integer*/, $CategoryIdData, 190 , 'NetPlayer_CDTrackList', $actionScriptId, -1); + $radioNavId = CreateVariable("RadioNav", 1 /*Integer*/, $CategoryIdData, 200 , 'NetPlayer_RadioNav', $actionScriptId, -1); + $radioListId = CreateVariable("RadioList", 1 /*Integer*/, $CategoryIdData, 210 , 'NetPlayer_RadioList', $actionScriptId,-1); + $controlTypeId = CreateVariable("ControlType", 1 /*Integer*/, $CategoryIdData, 300 , '', null, 0); + $remoteControlId = CreateVariable("RemoteControl", 3 /*String*/, $CategoryIdData, 310 , '~HTMLBox', null, ''); + + + // Register Variable Constants + SetVariableConstant ("NP_ID_CDCATEGORYNAME", $cdCategoryNameId, 'NetPlayer_IDs.inc.php', 'IPSLibrary::app::modules::NetPlayer2'); + SetVariableConstant ("NP_ID_CDDIRECTORYPATH", $cddirectoryPath, 'NetPlayer_IDs.inc.php', 'IPSLibrary::app::modules::NetPlayer2'); + SetVariableConstant ("NP_ID_CDDIRECTORYNAME", $cddirectoryName, 'NetPlayer_IDs.inc.php', 'IPSLibrary::app::modules::NetPlayer2'); + SetVariableConstant ("NP_ID_CDDIRECTORYIDX", $cdIdxId, 'NetPlayer_IDs.inc.php', 'IPSLibrary::app::modules::NetPlayer2'); + SetVariableConstant ("NP_ID_CDTRACKLISTHTML", $cdTrackListHtmlId, 'NetPlayer_IDs.inc.php', 'IPSLibrary::app::modules::NetPlayer2'); + SetVariableConstant ("NP_ID_CDTRACKIDX", $cdTrackIdxId, 'NetPlayer_IDs.inc.php', 'IPSLibrary::app::modules::NetPlayer2'); + + SetVariableConstant ("NP_ID_RADIONAME", $radioNameId, 'NetPlayer_IDs.inc.php', 'IPSLibrary::app::modules::NetPlayer2'); + SetVariableConstant ("NP_ID_RADIOURL", $radioUrlId, 'NetPlayer_IDs.inc.php', 'IPSLibrary::app::modules::NetPlayer2'); + SetVariableConstant ("NP_ID_RADIOIDX", $radioIdxId, 'NetPlayer_IDs.inc.php', 'IPSLibrary::app::modules::NetPlayer2'); + + SetVariableConstant ("NP_ID_POWER", $powerId, 'NetPlayer_IDs.inc.php', 'IPSLibrary::app::modules::NetPlayer2'); + SetVariableConstant ("NP_ID_REMOTECONTROL", $remoteControlId, 'NetPlayer_IDs.inc.php', 'IPSLibrary::app::modules::NetPlayer2'); + SetVariableConstant ("NP_ID_MOBILECONTROL", $mobileControlId, 'NetPlayer_IDs.inc.php', 'IPSLibrary::app::modules::NetPlayer2'); + SetVariableConstant ("NP_ID_CONTROLTYPE", $controlTypeId, 'NetPlayer_IDs.inc.php', 'IPSLibrary::app::modules::NetPlayer2'); + SetVariableConstant ('"NP_ID_CDALBUM"', $albumId, 'NetPlayer_IDs.inc.php', 'IPSLibrary::app::modules::NetPlayer2'); + SetVariableConstant ("NP_ID_CDINTERPRET", $interpretId, 'NetPlayer_IDs.inc.php', 'IPSLibrary::app::modules::NetPlayer2'); + + SetVariableConstant ("NP_ID_CATEGORYLIST", $categoryId, 'NetPlayer_IDs.inc.php', 'IPSLibrary::app::modules::NetPlayer2'); + SetVariableConstant ("NP_ID_CDALBUMLIST", $cdAlbumListId, 'NetPlayer_IDs.inc.php', 'IPSLibrary::app::modules::NetPlayer2'); + SetVariableConstant ("NP_ID_CDALBUMNAV", $cdAlbumNavId, 'NetPlayer_IDs.inc.php', 'IPSLibrary::app::modules::NetPlayer2'); + SetVariableConstant ('"NP_ID_CDTRACKLIST"', $cdTrackListId, 'NetPlayer_IDs.inc.php', 'IPSLibrary::app::modules::NetPlayer2'); + SetVariableConstant ("NP_ID_CDTRACKNAV", $cdTrackNavId, 'NetPlayer_IDs.inc.php', 'IPSLibrary::app::modules::NetPlayer2'); + SetVariableConstant ("NP_ID_RADIOLIST", $radioListId, 'NetPlayer_IDs.inc.php', 'IPSLibrary::app::modules::NetPlayer2'); + SetVariableConstant ("NP_ID_RADIONAV", $radioNavId, 'NetPlayer_IDs.inc.php', 'IPSLibrary::app::modules::NetPlayer2'); + SetVariableConstant ("NP_ID_SOURCE", $sourceId, 'NetPlayer_IDs.inc.php', 'IPSLibrary::app::modules::NetPlayer2'); + SetVariableConstant ('"NP_ID_CONTROL"', $controlId, 'NetPlayer_IDs.inc.php', 'IPSLibrary::app::modules::NetPlayer2'); + + // Installation of Components + IPSUtils_Include ("NetPlayer_Constants.inc.php", "IPSLibrary::app::modules::NetPlayer2"); + IPSUtils_Include ("NetPlayer_Configuration.inc.php", "IPSLibrary::config::modules::NetPlayer2"); + + $params = explode(',',NETPLAYER_COMPONENT); + if ($params[0] == 'IPSComponentPlayer_Mediaplayer') { + if (!is_numeric($params[1])) { + $pathItems = explode('.',$params[1]); + $mediaPlayerName = $pathItems[count($pathItems)-1]; + unset($pathItems[count($pathItems)-1]); + $path = implode('.', $pathItems); + $categoryId = CreateCategoryPath($path); + + // Create MediaPlayer + $mediaPlayerInstanceId = CreateMediaPlayer($mediaPlayerName, $categoryId, 0); + $mediaPlayerTitel = IPS_GetVariableIDByName('Titel', $mediaPlayerInstanceId); + + // Register Message Handler + IPSMessageHandler::RegisterOnChangeEvent($mediaPlayerTitel/*Var*/, 'IPSComponentPlayer_MediaPlayer,'.$mediaPlayerInstanceId, 'IPSModulePlayer_NetPlayer'); + } + } + + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/webfront/Entertainment/Remote.css b/IPSLibrary/webfront/Entertainment/Remote.css index 4d11e16..29848aa 100644 --- a/IPSLibrary/webfront/Entertainment/Remote.css +++ b/IPSLibrary/webfront/Entertainment/Remote.css @@ -1,4 +1,4 @@ -html, body { font: normal 14px verdana; color: #ffffff;} +html, body { font: normal 14px verdana;} #containerLeft{position:absolute; left:0px; top:0px; width:48%; float:left; } #containerRight{position:absolute; right:0px; top:0px; width:48%; } @@ -8,11 +8,11 @@ #containerBottomLeft{position:absolute; left:0px; top:60px; width:48%; float:left; } #containerBottomRight{position:absolute; right:0px; top:60px; width:48%; } -.rc_button {background:#282828; border:1px solid #9ab3ca; overflow:hidden; height:34px;font:normal 14px verdana;width:14%} +.rc_button { border:1px solid #9ab3ca; overflow:hidden; height:34px;font:normal 14px verdana;width:14%} .rc_button_template{overflow:hidden; height:34px;font:normal 14px verdana;width:14%} -.rc_button14 {background:#282828; border:1px solid #9ab3ca; overflow:hidden; height:34px;font:normal 14px verdana;width:14%} +.rc_button14 { border:1px solid #9ab3ca; overflow:hidden; height:34px;font:normal 14px verdana;width:14%} .rc_button14_template{overflow:hidden; height:34px;font:normal 14px verdana;width:14%} -.rc_button33 {background:#282828; border:1px solid #9ab3ca; overflow:hidden; height:34px;font:normal 14px verdana;width:33%} +.rc_button33 { border:1px solid #9ab3ca; overflow:hidden; height:34px;font:normal 14px verdana;width:33%} .rc_button33_template{overflow:hidden; height:34px;font:normal 14px verdana;width:33%} .rc_button33_blue {background:#283344; border:1px solid #9ab3ca; overflow:hidden; height:34px;font:normal 14px verdana;width:33%} .rc_button_pressed {background:#454545;background-color:#354050;background-image:url(./icons/bgActionBar.png);background-repeat:repeat} diff --git a/IPSLibrary/webfront/Entertainment/Remote_PhilipsTVProgram_Simple.php b/IPSLibrary/webfront/Entertainment/Remote_PhilipsTVProgram_Simple.php index e112093..8a1f4ef 100644 --- a/IPSLibrary/webfront/Entertainment/Remote_PhilipsTVProgram_Simple.php +++ b/IPSLibrary/webfront/Entertainment/Remote_PhilipsTVProgram_Simple.php @@ -14,13 +14,15 @@
- - + + - - + + +
Programm +Programm +Volume +
Programm -Programm -Volume -
+ diff --git a/IPSLibrary/webfront/Entertainment/Remote_Sender.php b/IPSLibrary/webfront/Entertainment/Remote_Sender.php index 9e4f9fa..9215979 100644 --- a/IPSLibrary/webfront/Entertainment/Remote_Sender.php +++ b/IPSLibrary/webfront/Entertainment/Remote_Sender.php @@ -1,6 +1,28 @@ + + + + - + + + + diff --git a/IPSLibrary/webfront/IPSCam/IPSCam_CameraWebFront.css b/IPSLibrary/webfront/IPSCam/IPSCam_CameraWebFront.css new file mode 100644 index 0000000..4c735af --- /dev/null +++ b/IPSLibrary/webfront/IPSCam/IPSCam_CameraWebFront.css @@ -0,0 +1,24 @@ +body {color:#fff;font-size:17px;font-family:arial,sans-serif;text-align:center} + +.containerCam{ text-align:center; display:block; cursor:default;} +.containerCamPreDef{ text-align:center; float:left; max-width:100%; border:0px solid rgba(255,255,255,0.25); overflow:auto;} + +.camContainer{margin: 0 0 10px; border-width: 1px; border-style: solid; border-color: rgba(255, 255, 255, 0.246094); overflow: hidden; position: relative;} +.camContentStream{text-align:center; max-width:100%; border:0px solid rgba(255,255,255,0.5);} +.camContent{display:table-row; position:relative;} +.camIcon{display:table-cell; position:relative; vertical-align:middle;} +.camTitle{display:table-cell; padding-left: 10px; position: relative; white-space: nowrap; line-height: 36px; vertical-align: middle; cursor: default;} +.camText{display: inline-block; white-space: nowrap; line-height: 36px; cursor: default;} +.camData{display: table-cell; padding-left: 10px; position: relative; text-align: right; width: 100%; cursor: default;} +.camDataEnum{margin: 0 3px 3px 0;display: inline-block; border: 0 none; vertical-align: top; position: relative; text-align: right;} +.camDataEnumBlock{text-align: right; display: block; } +.camButton{display: inline-block; vertical-align: top;background-color: rgba(255, 255, 255, 0.1);background-image: url(../../img/bgCategoryElement.png);background-repeat: repeat;background-position: center top;margin: 3px 0 0 3px;padding: 0 10px;line-height: 28px;min-height: 28px;border-width: 1px 0;border-style: solid;border-color: transparent;color: rgba(255, 255, 255, 0.3);} +.camButtonSelected{ background-color: rgba(255, 255, 255, 0.3); color: white;} + + +.camIconImage{ margin-left: 10px; min-height: 32px; position: relative;min-width: 32px;background-position: center center;background-repeat: no-repeat; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAABQ0lEQVRYhe2XsUrEQBCGv0g4D7FWELEQK7EQ66strXwGsdRC0aewthSfwEKsBN9ELBVFcoWoCL+Fu9yw5LzsJbkVuR+GmSWZmY8hTJJMEik1k7Q7kJt40qPI4A9MIATo80PWpvV/A4hRDpwA+zVqgCRvklSY8yg71kDbEXmFy0FSrQksmnhj3CJ1AL5MnA+9q0GATeAc2EoFcAnsAWfu/GGuzTq/CzwAB20AdJ1fcr5sAofACnDaBsBn0KwMwPsuFRUD8Oz8MjA/BCBaMQB3plkvAOhMAuDWxEdBbu4g1tz5qXLViE3YkfRqtt+Lie+deV1U3YSxq3g9aFSmQlKvLQAkLUi6MoW8HiXdSFodkV8bwNuOaX4dkdfYy+g9eAjHUlMAcykA3kxcefM1CfA/JpBp8GMy/SyfAiSR3WBZCoDkE/gGc9EzW3W/UKQAAAAASUVORK5CYII=);} +.camIconArrowUp{ margin-left: 10px; min-height: 32px; position: relative;min-width: 32px;background-position: center center;background-repeat: no-repeat; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAABgklEQVRYhe2WsUoDQRRFb5YgFhYiIkHEH7C3ELGQYCF+hliIWIQUIjbWwcJOELFRxEKsrP0AERERCUF/QESCiCDisdi3ZF2TuDubJSh58JqZN/eendl5TA5QN8PrqnsPoAeQEiAv6UzSuaR+ZxXANUs0YtNVJ+fYBwqSapIGJH1Kepc0IekhqZDrEVTM/EDSjvwj2HZScti2adv2F6AADAKPNjafVC+puQdcm1kpNL5oYzWgL0uAVTO6BfKRuQubW88KYASom8lsk/lJm3sFxrMA2DeD4zY1e1Zz0mmAqdDXjbWpGwaerbbYKQAPuDLRtRj1K1Z7x8//xAlg2QSrxPvDwzelnBYgvKVzMY9LfO8Vo2kAdk3oNIF5kIe29sgVILhWbyS4VqEs2A4AzCQF8Gg0lg0H8yDLpnFDix+y1cIlW3hPwtYayTz+bQC/i8YCGAKebNFCCvMgi6ZVx++mvwJskV1Uon7N3gOX8h8YnY4PSdXooOuLqGPxp1/FPYD/AfAF01RovrT0qAQAAAAASUVORK5CYII=);} +.camIconArrowDown{ margin-left: 10px; min-height: 32px; position: relative;min-width: 32px;background-position: center center;background-repeat: no-repeat; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAABmElEQVRYhe2WPUsDQRRFb8KyWIqIiEgKQfwBgoWIhQQLEeytg4VICrEQEeztrUQsgoiFWFj4I1KISBARrQURCX4hCsdiXxHWbDI7CUYwAwNh5t77zk52ZicDqJMt29HqXYAuQAJAQdKnJNrcPyQtugCMSQr8nymxhZLGf4wC8T4AVIlavs582j5vWY9AX3w+yVQ00xUQtFA8BG4ta6meJskYAJdmXGsBYNMyykA2DYCAaTM/A4MexXPAu2VMJOmahRxawIEHwIl5dxvpmoUM2QoATKUoPmueJ6C/FQARvQMAFyT8j7EeAtfmWW6mdwEIiHYDwIqDft205y7Arkuad1zSYeDVtJMu2WleqmML3mugOTLNvmtuGoBczdPV21YzNlclOk3bDiBgw4qUY+MBULG5YprMtAAhcGOFCjXjqzbmulO8AQTMWbEHoJfolPQ5K7wBBJxawR2gZL9LPlkZ8LqWj0iq2Dc+K+lF0qik+7RBvleyO0nbNf4tn+KSvFdAknoknUl6k7Qg6eu3AdrS/uStuAvwvwC+AQN3CwBDJIm5AAAAAElFTkSuQmCC);} +.camIconArrowLeft{ margin-left: 10px; min-height: 32px; position: relative;min-width: 32px;background-position: center center;background-repeat: no-repeat; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAABgklEQVRYhe3Xv2pVQRDH8cnlElKJhBCCiEUeIoWEFBIsxMcIFiIWwUI0jbV1qhBSiIpFSOED+AAiIiIi4hOIiIRERMLH4uySNebm792NiAPD4XBmf7/vYWCGHUGcZfTO1P0/QAOAyYh4GBELAytQI/u4jW+6+Dmotob5HN76M6oDXMDTwvA95lsA9HEHm8loM7330/eqAPPpT3M8xtSemioAl7BeiL/B7IDaoQKM4h62kuhX3ELvgDNDA7iGj4XgKiaOcO7UANN4Xgi9xMwxwE8MMIYH+J4EPmPhGManBniRDu5gGedPYH4owEG7YDs9exFxLiLGhrYhjrgL+lj0+4BZtDtgqrcg5xQeFULvcKUlQM5Z3cDJ8QwXWwKEbuCUa3YLd3UDqglAzkmsFeIfcLUlQM7LeF2YbOj2RDOA3Jabur1AN7iW7LalOkDOCawUhp9wvSVAzhndvtgbzQByW27gSzL/Mah2hKpXs/GIuB8RryLiyX4FtQEOjX/+ZvT3A/wCmNZY3a3SCOQAAAAASUVORK5CYII=);} +.camIconArrowRight{ margin-left: 10px; min-height: 32px; position: relative;min-width: 32px;background-position: center center;background-repeat: no-repeat; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAABh0lEQVRYhe3XsWoUURTG8ZNlCWIZgiwiFjZ5gxQhWEhIIT6BdbCQYCEpQkiTWvIEIViIiIWkCD6FhYiIiPgCBpEYQiKB/CzmXpiE7GZndjIr6Adfceeey/nPPcw5zARinOqMNft/gEsAHkbEZkRMXSkB+vm3Qj/wCJ0BsbU9aPO83mF2HAAP8K203sJ0mwCBSazjKD37iccaKMuwANm3sVPae4+5NgGyF/GlFPMcN9oEyGVZxWGK28cTFcsyCkD2LbwuxX/AfJsA2ffwqXTuBXptAgS6eIqDdPYgrbttAWT30g1kve0Xe1XD6DgifkXEaVpfrzML6t7AEvbS2SNs4FobJZhVzIusXdy57FwTANPYLsV/xf1hwUcB6GBZMRcoGtKaokENXbK6APOKhpP1RjEnKn8xVQF6eFna+4yFOomrAnSx4myDWTGgwTQJsJDeNOsVbo6auApA1kfcbSrxMAAnKXEesyNf90WeoO+v2VJEzETEs4j43mCbPqNBAK3or/4z+jcA/gBZllrDkZU8/QAAAABJRU5ErkJggg==);} +.camIconWindDirection{margin-left: 10px; min-height: 32px; position: relative;min-width: 32px;background-position: center center;background-repeat: no-repeat; background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAACfklEQVRYhcWWP2gUQRTGfwmHHFcsKVKksBAJFqJHDILNeUWIQdJYWQsR5SRYWSiilZXFVUHOeIFgkcoqhRAwWGghguSPAS28QAoLS7EIJqCfxX5r9ja5veRW3A8eczPzzZu3730zN32SyBP9ue7+DwIYsuUWwIgttwBGbT2jkDGAcxnXp2ZgDAgSY0WgHOsnM1A2J47Avg6GpE4WSHonaTwxviCp4PlftsBjCwnuuH0EnfZJK8EP4CHwCngK3AG2gV3gHvAGWDJ3BKh6DqAE1IEacMm+jpyByBoKsSmpIqkmaUdSU9KsremxmjmbXtPo5r/vEDdhCdjw144BW8Blzz1ze9PtEnACeG3OWWetI9JEGIlpG7gGTAAXgVaM89sWoWXOhNdEmyeF+RdpGjgF3CWs63s7fwTcIszINDBg7kfgCWFGGuaeAa4Dx4DH5uxHlxoVJD1wfSNMucZNSV9sTY9NxXg7ku7bR8c9ugUQSKp6gwgbFl4Ss56L0PTajkcwKcIhwuM0SnjDjRIKagn4Gqv1AHAeGE4kswV8AL673w8cJxTjFrACrLpdA75FpHzRQwnWU0qwftQS5C7CtIuoTPsxvEJY59uEF8808Mnc0+wdwxlCfSwCF8hwDIux3xVJnyUNSpqJfWVDe1e1PDdobqWDrzZLE+FPtyXgObAMvKVd/f20C3nYnGWvKSV87cNhTkEdOAlMAjcIU7sLzMU4cx5bNGfSa+pdvXcR4Xgs1SWPzVuYVUkvbVWPzZtTipUm+Z449Cn4Lw+StADGDlhYlFSO9TdtUb98gOAC++r5PZCGF26v9uog66t4NeP6zAGs5B3AWtYAsmogM3L/O/4DyNp3dEI1AY0AAAAASUVORK5CYII=);} \ No newline at end of file diff --git a/IPSLibrary/webfront/IPSCam/icons/arrow_down.png b/IPSLibrary/webfront/IPSCam/icons/arrow_down.png new file mode 100644 index 0000000..bfb47e5 Binary files /dev/null and b/IPSLibrary/webfront/IPSCam/icons/arrow_down.png differ diff --git a/IPSLibrary/webfront/IPSCam/icons/arrow_left.png b/IPSLibrary/webfront/IPSCam/icons/arrow_left.png new file mode 100644 index 0000000..8598475 Binary files /dev/null and b/IPSLibrary/webfront/IPSCam/icons/arrow_left.png differ diff --git a/IPSLibrary/webfront/IPSCam/icons/arrow_right.png b/IPSLibrary/webfront/IPSCam/icons/arrow_right.png new file mode 100644 index 0000000..742cc3e Binary files /dev/null and b/IPSLibrary/webfront/IPSCam/icons/arrow_right.png differ diff --git a/IPSLibrary/webfront/IPSCam/icons/arrow_up.png b/IPSLibrary/webfront/IPSCam/icons/arrow_up.png new file mode 100644 index 0000000..62383ab Binary files /dev/null and b/IPSLibrary/webfront/IPSCam/icons/arrow_up.png differ diff --git a/IPSLibrary/webfront/IPSCam/jquery.min.js b/IPSLibrary/webfront/IPSCam/jquery.min.js new file mode 100644 index 0000000..b1ae21d --- /dev/null +++ b/IPSLibrary/webfront/IPSCam/jquery.min.js @@ -0,0 +1,19 @@ +/* + * jQuery JavaScript Library v1.3.2 + * http://jquery.com/ + * + * Copyright (c) 2009 John Resig + * Dual licensed under the MIT and GPL licenses. + * http://docs.jquery.com/License + * + * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009) + * Revision: 6246 + */ +(function(){var l=this,g,y=l.jQuery,p=l.$,o=l.jQuery=l.$=function(E,F){return new o.fn.init(E,F)},D=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;o.fn=o.prototype={init:function(E,H){E=E||document;if(E.nodeType){this[0]=E;this.length=1;this.context=E;return this}if(typeof E==="string"){var G=D.exec(E);if(G&&(G[1]||!H)){if(G[1]){E=o.clean([G[1]],H)}else{var I=document.getElementById(G[3]);if(I&&I.id!=G[3]){return o().find(E)}var F=o(I||[]);F.context=document;F.selector=E;return F}}else{return o(H).find(E)}}else{if(o.isFunction(E)){return o(document).ready(E)}}if(E.selector&&E.context){this.selector=E.selector;this.context=E.context}return this.setArray(o.isArray(E)?E:o.makeArray(E))},selector:"",jquery:"1.3.2",size:function(){return this.length},get:function(E){return E===g?Array.prototype.slice.call(this):this[E]},pushStack:function(F,H,E){var G=o(F);G.prevObject=this;G.context=this.context;if(H==="find"){G.selector=this.selector+(this.selector?" ":"")+E}else{if(H){G.selector=this.selector+"."+H+"("+E+")"}}return G},setArray:function(E){this.length=0;Array.prototype.push.apply(this,E);return this},each:function(F,E){return o.each(this,F,E)},index:function(E){return o.inArray(E&&E.jquery?E[0]:E,this)},attr:function(F,H,G){var E=F;if(typeof F==="string"){if(H===g){return this[0]&&o[G||"attr"](this[0],F)}else{E={};E[F]=H}}return this.each(function(I){for(F in E){o.attr(G?this.style:this,F,o.prop(this,E[F],G,I,F))}})},css:function(E,F){if((E=="width"||E=="height")&&parseFloat(F)<0){F=g}return this.attr(E,F,"curCSS")},text:function(F){if(typeof F!=="object"&&F!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(F))}var E="";o.each(F||this,function(){o.each(this.childNodes,function(){if(this.nodeType!=8){E+=this.nodeType!=1?this.nodeValue:o.fn.text([this])}})});return E},wrapAll:function(E){if(this[0]){var F=o(E,this[0].ownerDocument).clone();if(this[0].parentNode){F.insertBefore(this[0])}F.map(function(){var G=this;while(G.firstChild){G=G.firstChild}return G}).append(this)}return this},wrapInner:function(E){return this.each(function(){o(this).contents().wrapAll(E)})},wrap:function(E){return this.each(function(){o(this).wrapAll(E)})},append:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.appendChild(E)}})},prepend:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.insertBefore(E,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this)})},after:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this.nextSibling)})},end:function(){return this.prevObject||o([])},push:[].push,sort:[].sort,splice:[].splice,find:function(E){if(this.length===1){var F=this.pushStack([],"find",E);F.length=0;o.find(E,this[0],F);return F}else{return this.pushStack(o.unique(o.map(this,function(G){return o.find(E,G)})),"find",E)}},clone:function(G){var E=this.map(function(){if(!o.support.noCloneEvent&&!o.isXMLDoc(this)){var I=this.outerHTML;if(!I){var J=this.ownerDocument.createElement("div");J.appendChild(this.cloneNode(true));I=J.innerHTML}return o.clean([I.replace(/ jQuery\d+="(?:\d+|null)"/g,"").replace(/^\s*/,"")])[0]}else{return this.cloneNode(true)}});if(G===true){var H=this.find("*").andSelf(),F=0;E.find("*").andSelf().each(function(){if(this.nodeName!==H[F].nodeName){return}var I=o.data(H[F],"events");for(var K in I){for(var J in I[K]){o.event.add(this,K,I[K][J],I[K][J].data)}}F++})}return E},filter:function(E){return this.pushStack(o.isFunction(E)&&o.grep(this,function(G,F){return E.call(G,F)})||o.multiFilter(E,o.grep(this,function(F){return F.nodeType===1})),"filter",E)},closest:function(E){var G=o.expr.match.POS.test(E)?o(E):null,F=0;return this.map(function(){var H=this;while(H&&H.ownerDocument){if(G?G.index(H)>-1:o(H).is(E)){o.data(H,"closest",F);return H}H=H.parentNode;F++}})},not:function(E){if(typeof E==="string"){if(f.test(E)){return this.pushStack(o.multiFilter(E,this,true),"not",E)}else{E=o.multiFilter(E,this)}}var F=E.length&&E[E.length-1]!==g&&!E.nodeType;return this.filter(function(){return F?o.inArray(this,E)<0:this!=E})},add:function(E){return this.pushStack(o.unique(o.merge(this.get(),typeof E==="string"?o(E):o.makeArray(E))))},is:function(E){return !!E&&o.multiFilter(E,this).length>0},hasClass:function(E){return !!E&&this.is("."+E)},val:function(K){if(K===g){var E=this[0];if(E){if(o.nodeName(E,"option")){return(E.attributes.value||{}).specified?E.value:E.text}if(o.nodeName(E,"select")){var I=E.selectedIndex,L=[],M=E.options,H=E.type=="select-one";if(I<0){return null}for(var F=H?I:0,J=H?I+1:M.length;F=0||o.inArray(this.name,K)>=0)}else{if(o.nodeName(this,"select")){var N=o.makeArray(K);o("option",this).each(function(){this.selected=(o.inArray(this.value,N)>=0||o.inArray(this.text,N)>=0)});if(!N.length){this.selectedIndex=-1}}else{this.value=K}}})},html:function(E){return E===g?(this[0]?this[0].innerHTML.replace(/ jQuery\d+="(?:\d+|null)"/g,""):null):this.empty().append(E)},replaceWith:function(E){return this.after(E).remove()},eq:function(E){return this.slice(E,+E+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(E){return this.pushStack(o.map(this,function(G,F){return E.call(G,F,G)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(J,M,L){if(this[0]){var I=(this[0].ownerDocument||this[0]).createDocumentFragment(),F=o.clean(J,(this[0].ownerDocument||this[0]),I),H=I.firstChild;if(H){for(var G=0,E=this.length;G1||G>0?I.cloneNode(true):I)}}if(F){o.each(F,z)}}return this;function K(N,O){return M&&o.nodeName(N,"table")&&o.nodeName(O,"tr")?(N.getElementsByTagName("tbody")[0]||N.appendChild(N.ownerDocument.createElement("tbody"))):N}}};o.fn.init.prototype=o.fn;function z(E,F){if(F.src){o.ajax({url:F.src,async:false,dataType:"script"})}else{o.globalEval(F.text||F.textContent||F.innerHTML||"")}if(F.parentNode){F.parentNode.removeChild(F)}}function e(){return +new Date}o.extend=o.fn.extend=function(){var J=arguments[0]||{},H=1,I=arguments.length,E=false,G;if(typeof J==="boolean"){E=J;J=arguments[1]||{};H=2}if(typeof J!=="object"&&!o.isFunction(J)){J={}}if(I==H){J=this;--H}for(;H-1}},swap:function(H,G,I){var E={};for(var F in G){E[F]=H.style[F];H.style[F]=G[F]}I.call(H);for(var F in G){H.style[F]=E[F]}},css:function(H,F,J,E){if(F=="width"||F=="height"){var L,G={position:"absolute",visibility:"hidden",display:"block"},K=F=="width"?["Left","Right"]:["Top","Bottom"];function I(){L=F=="width"?H.offsetWidth:H.offsetHeight;if(E==="border"){return}o.each(K,function(){if(!E){L-=parseFloat(o.curCSS(H,"padding"+this,true))||0}if(E==="margin"){L+=parseFloat(o.curCSS(H,"margin"+this,true))||0}else{L-=parseFloat(o.curCSS(H,"border"+this+"Width",true))||0}})}if(H.offsetWidth!==0){I()}else{o.swap(H,G,I)}return Math.max(0,Math.round(L))}return o.curCSS(H,F,J)},curCSS:function(I,F,G){var L,E=I.style;if(F=="opacity"&&!o.support.opacity){L=o.attr(E,"opacity");return L==""?"1":L}if(F.match(/float/i)){F=w}if(!G&&E&&E[F]){L=E[F]}else{if(q.getComputedStyle){if(F.match(/float/i)){F="float"}F=F.replace(/([A-Z])/g,"-$1").toLowerCase();var M=q.getComputedStyle(I,null);if(M){L=M.getPropertyValue(F)}if(F=="opacity"&&L==""){L="1"}}else{if(I.currentStyle){var J=F.replace(/\-(\w)/g,function(N,O){return O.toUpperCase()});L=I.currentStyle[F]||I.currentStyle[J];if(!/^\d+(px)?$/i.test(L)&&/^\d/.test(L)){var H=E.left,K=I.runtimeStyle.left;I.runtimeStyle.left=I.currentStyle.left;E.left=L||0;L=E.pixelLeft+"px";E.left=H;I.runtimeStyle.left=K}}}}return L},clean:function(F,K,I){K=K||document;if(typeof K.createElement==="undefined"){K=K.ownerDocument||K[0]&&K[0].ownerDocument||document}if(!I&&F.length===1&&typeof F[0]==="string"){var H=/^<(\w+)\s*\/?>$/.exec(F[0]);if(H){return[K.createElement(H[1])]}}var G=[],E=[],L=K.createElement("div");o.each(F,function(P,S){if(typeof S==="number"){S+=""}if(!S){return}if(typeof S==="string"){S=S.replace(/(<(\w+)[^>]*?)\/>/g,function(U,V,T){return T.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?U:V+">"});var O=S.replace(/^\s+/,"").substring(0,10).toLowerCase();var Q=!O.indexOf("",""]||!O.indexOf("",""]||O.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"
","
"]||!O.indexOf("",""]||(!O.indexOf("",""]||!O.indexOf("",""]||!o.support.htmlSerialize&&[1,"div
","
"]||[0,"",""];L.innerHTML=Q[1]+S+Q[2];while(Q[0]--){L=L.lastChild}if(!o.support.tbody){var R=/"&&!R?L.childNodes:[];for(var M=N.length-1;M>=0;--M){if(o.nodeName(N[M],"tbody")&&!N[M].childNodes.length){N[M].parentNode.removeChild(N[M])}}}if(!o.support.leadingWhitespace&&/^\s/.test(S)){L.insertBefore(K.createTextNode(S.match(/^\s*/)[0]),L.firstChild)}S=o.makeArray(L.childNodes)}if(S.nodeType){G.push(S)}else{G=o.merge(G,S)}});if(I){for(var J=0;G[J];J++){if(o.nodeName(G[J],"script")&&(!G[J].type||G[J].type.toLowerCase()==="text/javascript")){E.push(G[J].parentNode?G[J].parentNode.removeChild(G[J]):G[J])}else{if(G[J].nodeType===1){G.splice.apply(G,[J+1,0].concat(o.makeArray(G[J].getElementsByTagName("script"))))}I.appendChild(G[J])}}return E}return G},attr:function(J,G,K){if(!J||J.nodeType==3||J.nodeType==8){return g}var H=!o.isXMLDoc(J),L=K!==g;G=H&&o.props[G]||G;if(J.tagName){var F=/href|src|style/.test(G);if(G=="selected"&&J.parentNode){J.parentNode.selectedIndex}if(G in J&&H&&!F){if(L){if(G=="type"&&o.nodeName(J,"input")&&J.parentNode){throw"type property can't be changed"}J[G]=K}if(o.nodeName(J,"form")&&J.getAttributeNode(G)){return J.getAttributeNode(G).nodeValue}if(G=="tabIndex"){var I=J.getAttributeNode("tabIndex");return I&&I.specified?I.value:J.nodeName.match(/(button|input|object|select|textarea)/i)?0:J.nodeName.match(/^(a|area)$/i)&&J.href?0:g}return J[G]}if(!o.support.style&&H&&G=="style"){return o.attr(J.style,"cssText",K)}if(L){J.setAttribute(G,""+K)}var E=!o.support.hrefNormalized&&H&&F?J.getAttribute(G,2):J.getAttribute(G);return E===null?g:E}if(!o.support.opacity&&G=="opacity"){if(L){J.zoom=1;J.filter=(J.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(K)+""=="NaN"?"":"alpha(opacity="+K*100+")")}return J.filter&&J.filter.indexOf("opacity=")>=0?(parseFloat(J.filter.match(/opacity=([^)]*)/)[1])/100)+"":""}G=G.replace(/-([a-z])/ig,function(M,N){return N.toUpperCase()});if(L){J[G]=K}return J[G]},trim:function(E){return(E||"").replace(/^\s+|\s+$/g,"")},makeArray:function(G){var E=[];if(G!=null){var F=G.length;if(F==null||typeof G==="string"||o.isFunction(G)||G.setInterval){E[0]=G}else{while(F){E[--F]=G[F]}}}return E},inArray:function(G,H){for(var E=0,F=H.length;E0?this.clone(true):this).get();o.fn[F].apply(o(L[K]),I);J=J.concat(I)}return this.pushStack(J,E,G)}});o.each({removeAttr:function(E){o.attr(this,E,"");if(this.nodeType==1){this.removeAttribute(E)}},addClass:function(E){o.className.add(this,E)},removeClass:function(E){o.className.remove(this,E)},toggleClass:function(F,E){if(typeof E!=="boolean"){E=!o.className.has(this,F)}o.className[E?"add":"remove"](this,F)},remove:function(E){if(!E||o.filter(E,[this]).length){o("*",this).add([this]).each(function(){o.event.remove(this);o.removeData(this)});if(this.parentNode){this.parentNode.removeChild(this)}}},empty:function(){o(this).children().remove();while(this.firstChild){this.removeChild(this.firstChild)}}},function(E,F){o.fn[E]=function(){return this.each(F,arguments)}});function j(E,F){return E[0]&&parseInt(o.curCSS(E[0],F,true),10)||0}var h="jQuery"+e(),v=0,A={};o.extend({cache:{},data:function(F,E,G){F=F==l?A:F;var H=F[h];if(!H){H=F[h]=++v}if(E&&!o.cache[H]){o.cache[H]={}}if(G!==g){o.cache[H][E]=G}return E?o.cache[H][E]:H},removeData:function(F,E){F=F==l?A:F;var H=F[h];if(E){if(o.cache[H]){delete o.cache[H][E];E="";for(E in o.cache[H]){break}if(!E){o.removeData(F)}}}else{try{delete F[h]}catch(G){if(F.removeAttribute){F.removeAttribute(h)}}delete o.cache[H]}},queue:function(F,E,H){if(F){E=(E||"fx")+"queue";var G=o.data(F,E);if(!G||o.isArray(H)){G=o.data(F,E,o.makeArray(H))}else{if(H){G.push(H)}}}return G},dequeue:function(H,G){var E=o.queue(H,G),F=E.shift();if(!G||G==="fx"){F=E[0]}if(F!==g){F.call(H)}}});o.fn.extend({data:function(E,G){var H=E.split(".");H[1]=H[1]?"."+H[1]:"";if(G===g){var F=this.triggerHandler("getData"+H[1]+"!",[H[0]]);if(F===g&&this.length){F=o.data(this[0],E)}return F===g&&H[1]?this.data(H[0]):F}else{return this.trigger("setData"+H[1]+"!",[H[0],G]).each(function(){o.data(this,E,G)})}},removeData:function(E){return this.each(function(){o.removeData(this,E)})},queue:function(E,F){if(typeof E!=="string"){F=E;E="fx"}if(F===g){return o.queue(this[0],E)}return this.each(function(){var G=o.queue(this,E,F);if(E=="fx"&&G.length==1){G[0].call(this)}})},dequeue:function(E){return this.each(function(){o.dequeue(this,E)})}}); +/* + * Sizzle CSS Selector Engine - v0.9.3 + * Copyright 2009, The Dojo Foundation + * Released under the MIT, BSD, and GPL Licenses. + * More information: http://sizzlejs.com/ + */ +(function(){var R=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,L=0,H=Object.prototype.toString;var F=function(Y,U,ab,ac){ab=ab||[];U=U||document;if(U.nodeType!==1&&U.nodeType!==9){return[]}if(!Y||typeof Y!=="string"){return ab}var Z=[],W,af,ai,T,ad,V,X=true;R.lastIndex=0;while((W=R.exec(Y))!==null){Z.push(W[1]);if(W[2]){V=RegExp.rightContext;break}}if(Z.length>1&&M.exec(Y)){if(Z.length===2&&I.relative[Z[0]]){af=J(Z[0]+Z[1],U)}else{af=I.relative[Z[0]]?[U]:F(Z.shift(),U);while(Z.length){Y=Z.shift();if(I.relative[Y]){Y+=Z.shift()}af=J(Y,af)}}}else{var ae=ac?{expr:Z.pop(),set:E(ac)}:F.find(Z.pop(),Z.length===1&&U.parentNode?U.parentNode:U,Q(U));af=F.filter(ae.expr,ae.set);if(Z.length>0){ai=E(af)}else{X=false}while(Z.length){var ah=Z.pop(),ag=ah;if(!I.relative[ah]){ah=""}else{ag=Z.pop()}if(ag==null){ag=U}I.relative[ah](ai,ag,Q(U))}}if(!ai){ai=af}if(!ai){throw"Syntax error, unrecognized expression: "+(ah||Y)}if(H.call(ai)==="[object Array]"){if(!X){ab.push.apply(ab,ai)}else{if(U.nodeType===1){for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&(ai[aa]===true||ai[aa].nodeType===1&&K(U,ai[aa]))){ab.push(af[aa])}}}else{for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&ai[aa].nodeType===1){ab.push(af[aa])}}}}}else{E(ai,ab)}if(V){F(V,U,ab,ac);if(G){hasDuplicate=false;ab.sort(G);if(hasDuplicate){for(var aa=1;aa":function(Z,U,aa){var X=typeof U==="string";if(X&&!/\W/.test(U)){U=aa?U:U.toUpperCase();for(var V=0,T=Z.length;V=0)){if(!V){T.push(Y)}}else{if(V){U[X]=false}}}}return false},ID:function(T){return T[1].replace(/\\/g,"")},TAG:function(U,T){for(var V=0;T[V]===false;V++){}return T[V]&&Q(T[V])?U[1]:U[1].toUpperCase()},CHILD:function(T){if(T[1]=="nth"){var U=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(T[2]=="even"&&"2n"||T[2]=="odd"&&"2n+1"||!/\D/.test(T[2])&&"0n+"+T[2]||T[2]);T[2]=(U[1]+(U[2]||1))-0;T[3]=U[3]-0}T[0]=L++;return T},ATTR:function(X,U,V,T,Y,Z){var W=X[1].replace(/\\/g,"");if(!Z&&I.attrMap[W]){X[1]=I.attrMap[W]}if(X[2]==="~="){X[4]=" "+X[4]+" "}return X},PSEUDO:function(X,U,V,T,Y){if(X[1]==="not"){if(X[3].match(R).length>1||/^\w/.test(X[3])){X[3]=F(X[3],null,null,U)}else{var W=F.filter(X[3],U,V,true^Y);if(!V){T.push.apply(T,W)}return false}}else{if(I.match.POS.test(X[0])||I.match.CHILD.test(X[0])){return true}}return X},POS:function(T){T.unshift(true);return T}},filters:{enabled:function(T){return T.disabled===false&&T.type!=="hidden"},disabled:function(T){return T.disabled===true},checked:function(T){return T.checked===true},selected:function(T){T.parentNode.selectedIndex;return T.selected===true},parent:function(T){return !!T.firstChild},empty:function(T){return !T.firstChild},has:function(V,U,T){return !!F(T[3],V).length},header:function(T){return/h\d/i.test(T.nodeName)},text:function(T){return"text"===T.type},radio:function(T){return"radio"===T.type},checkbox:function(T){return"checkbox"===T.type},file:function(T){return"file"===T.type},password:function(T){return"password"===T.type},submit:function(T){return"submit"===T.type},image:function(T){return"image"===T.type},reset:function(T){return"reset"===T.type},button:function(T){return"button"===T.type||T.nodeName.toUpperCase()==="BUTTON"},input:function(T){return/input|select|textarea|button/i.test(T.nodeName)}},setFilters:{first:function(U,T){return T===0},last:function(V,U,T,W){return U===W.length-1},even:function(U,T){return T%2===0},odd:function(U,T){return T%2===1},lt:function(V,U,T){return UT[3]-0},nth:function(V,U,T){return T[3]-0==U},eq:function(V,U,T){return T[3]-0==U}},filter:{PSEUDO:function(Z,V,W,aa){var U=V[1],X=I.filters[U];if(X){return X(Z,W,V,aa)}else{if(U==="contains"){return(Z.textContent||Z.innerText||"").indexOf(V[3])>=0}else{if(U==="not"){var Y=V[3];for(var W=0,T=Y.length;W=0)}}},ID:function(U,T){return U.nodeType===1&&U.getAttribute("id")===T},TAG:function(U,T){return(T==="*"&&U.nodeType===1)||U.nodeName===T},CLASS:function(U,T){return(" "+(U.className||U.getAttribute("class"))+" ").indexOf(T)>-1},ATTR:function(Y,W){var V=W[1],T=I.attrHandle[V]?I.attrHandle[V](Y):Y[V]!=null?Y[V]:Y.getAttribute(V),Z=T+"",X=W[2],U=W[4];return T==null?X==="!=":X==="="?Z===U:X==="*="?Z.indexOf(U)>=0:X==="~="?(" "+Z+" ").indexOf(U)>=0:!U?Z&&T!==false:X==="!="?Z!=U:X==="^="?Z.indexOf(U)===0:X==="$="?Z.substr(Z.length-U.length)===U:X==="|="?Z===U||Z.substr(0,U.length+1)===U+"-":false},POS:function(X,U,V,Y){var T=U[2],W=I.setFilters[T];if(W){return W(X,V,U,Y)}}}};var M=I.match.POS;for(var O in I.match){I.match[O]=RegExp(I.match[O].source+/(?![^\[]*\])(?![^\(]*\))/.source)}var E=function(U,T){U=Array.prototype.slice.call(U);if(T){T.push.apply(T,U);return T}return U};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(N){E=function(X,W){var U=W||[];if(H.call(X)==="[object Array]"){Array.prototype.push.apply(U,X)}else{if(typeof X.length==="number"){for(var V=0,T=X.length;V";var T=document.documentElement;T.insertBefore(U,T.firstChild);if(!!document.getElementById(V)){I.find.ID=function(X,Y,Z){if(typeof Y.getElementById!=="undefined"&&!Z){var W=Y.getElementById(X[1]);return W?W.id===X[1]||typeof W.getAttributeNode!=="undefined"&&W.getAttributeNode("id").nodeValue===X[1]?[W]:g:[]}};I.filter.ID=function(Y,W){var X=typeof Y.getAttributeNode!=="undefined"&&Y.getAttributeNode("id");return Y.nodeType===1&&X&&X.nodeValue===W}}T.removeChild(U)})();(function(){var T=document.createElement("div");T.appendChild(document.createComment(""));if(T.getElementsByTagName("*").length>0){I.find.TAG=function(U,Y){var X=Y.getElementsByTagName(U[1]);if(U[1]==="*"){var W=[];for(var V=0;X[V];V++){if(X[V].nodeType===1){W.push(X[V])}}X=W}return X}}T.innerHTML="";if(T.firstChild&&typeof T.firstChild.getAttribute!=="undefined"&&T.firstChild.getAttribute("href")!=="#"){I.attrHandle.href=function(U){return U.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var T=F,U=document.createElement("div");U.innerHTML="

";if(U.querySelectorAll&&U.querySelectorAll(".TEST").length===0){return}F=function(Y,X,V,W){X=X||document;if(!W&&X.nodeType===9&&!Q(X)){try{return E(X.querySelectorAll(Y),V)}catch(Z){}}return T(Y,X,V,W)};F.find=T.find;F.filter=T.filter;F.selectors=T.selectors;F.matches=T.matches})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){(function(){var T=document.createElement("div");T.innerHTML="
";if(T.getElementsByClassName("e").length===0){return}T.lastChild.className="e";if(T.getElementsByClassName("e").length===1){return}I.order.splice(1,0,"CLASS");I.find.CLASS=function(U,V,W){if(typeof V.getElementsByClassName!=="undefined"&&!W){return V.getElementsByClassName(U[1])}}})()}function P(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W0){X=T;break}}}T=T[U]}ad[W]=X}}}var K=document.compareDocumentPosition?function(U,T){return U.compareDocumentPosition(T)&16}:function(U,T){return U!==T&&(U.contains?U.contains(T):true)};var Q=function(T){return T.nodeType===9&&T.documentElement.nodeName!=="HTML"||!!T.ownerDocument&&Q(T.ownerDocument)};var J=function(T,aa){var W=[],X="",Y,V=aa.nodeType?[aa]:aa;while((Y=I.match.PSEUDO.exec(T))){X+=Y[0];T=T.replace(I.match.PSEUDO,"")}T=I.relative[T]?T+"*":T;for(var Z=0,U=V.length;Z0||T.offsetHeight>0};F.selectors.filters.animated=function(T){return o.grep(o.timers,function(U){return T===U.elem}).length};o.multiFilter=function(V,T,U){if(U){V=":not("+V+")"}return F.matches(V,T)};o.dir=function(V,U){var T=[],W=V[U];while(W&&W!=document){if(W.nodeType==1){T.push(W)}W=W[U]}return T};o.nth=function(X,T,V,W){T=T||1;var U=0;for(;X;X=X[V]){if(X.nodeType==1&&++U==T){break}}return X};o.sibling=function(V,U){var T=[];for(;V;V=V.nextSibling){if(V.nodeType==1&&V!=U){T.push(V)}}return T};return;l.Sizzle=F})();o.event={add:function(I,F,H,K){if(I.nodeType==3||I.nodeType==8){return}if(I.setInterval&&I!=l){I=l}if(!H.guid){H.guid=this.guid++}if(K!==g){var G=H;H=this.proxy(G);H.data=K}var E=o.data(I,"events")||o.data(I,"events",{}),J=o.data(I,"handle")||o.data(I,"handle",function(){return typeof o!=="undefined"&&!o.event.triggered?o.event.handle.apply(arguments.callee.elem,arguments):g});J.elem=I;o.each(F.split(/\s+/),function(M,N){var O=N.split(".");N=O.shift();H.type=O.slice().sort().join(".");var L=E[N];if(o.event.specialAll[N]){o.event.specialAll[N].setup.call(I,K,O)}if(!L){L=E[N]={};if(!o.event.special[N]||o.event.special[N].setup.call(I,K,O)===false){if(I.addEventListener){I.addEventListener(N,J,false)}else{if(I.attachEvent){I.attachEvent("on"+N,J)}}}}L[H.guid]=H;o.event.global[N]=true});I=null},guid:1,global:{},remove:function(K,H,J){if(K.nodeType==3||K.nodeType==8){return}var G=o.data(K,"events"),F,E;if(G){if(H===g||(typeof H==="string"&&H.charAt(0)==".")){for(var I in G){this.remove(K,I+(H||""))}}else{if(H.type){J=H.handler;H=H.type}o.each(H.split(/\s+/),function(M,O){var Q=O.split(".");O=Q.shift();var N=RegExp("(^|\\.)"+Q.slice().sort().join(".*\\.")+"(\\.|$)");if(G[O]){if(J){delete G[O][J.guid]}else{for(var P in G[O]){if(N.test(G[O][P].type)){delete G[O][P]}}}if(o.event.specialAll[O]){o.event.specialAll[O].teardown.call(K,Q)}for(F in G[O]){break}if(!F){if(!o.event.special[O]||o.event.special[O].teardown.call(K,Q)===false){if(K.removeEventListener){K.removeEventListener(O,o.data(K,"handle"),false)}else{if(K.detachEvent){K.detachEvent("on"+O,o.data(K,"handle"))}}}F=null;delete G[O]}}})}for(F in G){break}if(!F){var L=o.data(K,"handle");if(L){L.elem=null}o.removeData(K,"events");o.removeData(K,"handle")}}},trigger:function(I,K,H,E){var G=I.type||I;if(!E){I=typeof I==="object"?I[h]?I:o.extend(o.Event(G),I):o.Event(G);if(G.indexOf("!")>=0){I.type=G=G.slice(0,-1);I.exclusive=true}if(!H){I.stopPropagation();if(this.global[G]){o.each(o.cache,function(){if(this.events&&this.events[G]){o.event.trigger(I,K,this.handle.elem)}})}}if(!H||H.nodeType==3||H.nodeType==8){return g}I.result=g;I.target=H;K=o.makeArray(K);K.unshift(I)}I.currentTarget=H;var J=o.data(H,"handle");if(J){J.apply(H,K)}if((!H[G]||(o.nodeName(H,"a")&&G=="click"))&&H["on"+G]&&H["on"+G].apply(H,K)===false){I.result=false}if(!E&&H[G]&&!I.isDefaultPrevented()&&!(o.nodeName(H,"a")&&G=="click")){this.triggered=true;try{H[G]()}catch(L){}}this.triggered=false;if(!I.isPropagationStopped()){var F=H.parentNode||H.ownerDocument;if(F){o.event.trigger(I,K,F,true)}}},handle:function(K){var J,E;K=arguments[0]=o.event.fix(K||l.event);K.currentTarget=this;var L=K.type.split(".");K.type=L.shift();J=!L.length&&!K.exclusive;var I=RegExp("(^|\\.)"+L.slice().sort().join(".*\\.")+"(\\.|$)");E=(o.data(this,"events")||{})[K.type];for(var G in E){var H=E[G];if(J||I.test(H.type)){K.handler=H;K.data=H.data;var F=H.apply(this,arguments);if(F!==g){K.result=F;if(F===false){K.preventDefault();K.stopPropagation()}}if(K.isImmediatePropagationStopped()){break}}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(H){if(H[h]){return H}var F=H;H=o.Event(F);for(var G=this.props.length,J;G;){J=this.props[--G];H[J]=F[J]}if(!H.target){H.target=H.srcElement||document}if(H.target.nodeType==3){H.target=H.target.parentNode}if(!H.relatedTarget&&H.fromElement){H.relatedTarget=H.fromElement==H.target?H.toElement:H.fromElement}if(H.pageX==null&&H.clientX!=null){var I=document.documentElement,E=document.body;H.pageX=H.clientX+(I&&I.scrollLeft||E&&E.scrollLeft||0)-(I.clientLeft||0);H.pageY=H.clientY+(I&&I.scrollTop||E&&E.scrollTop||0)-(I.clientTop||0)}if(!H.which&&((H.charCode||H.charCode===0)?H.charCode:H.keyCode)){H.which=H.charCode||H.keyCode}if(!H.metaKey&&H.ctrlKey){H.metaKey=H.ctrlKey}if(!H.which&&H.button){H.which=(H.button&1?1:(H.button&2?3:(H.button&4?2:0)))}return H},proxy:function(F,E){E=E||function(){return F.apply(this,arguments)};E.guid=F.guid=F.guid||E.guid||this.guid++;return E},special:{ready:{setup:B,teardown:function(){}}},specialAll:{live:{setup:function(E,F){o.event.add(this,F[0],c)},teardown:function(G){if(G.length){var E=0,F=RegExp("(^|\\.)"+G[0]+"(\\.|$)");o.each((o.data(this,"events").live||{}),function(){if(F.test(this.type)){E++}});if(E<1){o.event.remove(this,G[0],c)}}}}}};o.Event=function(E){if(!this.preventDefault){return new o.Event(E)}if(E&&E.type){this.originalEvent=E;this.type=E.type}else{this.type=E}this.timeStamp=e();this[h]=true};function k(){return false}function u(){return true}o.Event.prototype={preventDefault:function(){this.isDefaultPrevented=u;var E=this.originalEvent;if(!E){return}if(E.preventDefault){E.preventDefault()}E.returnValue=false},stopPropagation:function(){this.isPropagationStopped=u;var E=this.originalEvent;if(!E){return}if(E.stopPropagation){E.stopPropagation()}E.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u;this.stopPropagation()},isDefaultPrevented:k,isPropagationStopped:k,isImmediatePropagationStopped:k};var a=function(F){var E=F.relatedTarget;while(E&&E!=this){try{E=E.parentNode}catch(G){E=this}}if(E!=this){F.type=F.data;o.event.handle.apply(this,arguments)}};o.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(F,E){o.event.special[E]={setup:function(){o.event.add(this,F,a,E)},teardown:function(){o.event.remove(this,F,a)}}});o.fn.extend({bind:function(F,G,E){return F=="unload"?this.one(F,G,E):this.each(function(){o.event.add(this,F,E||G,E&&G)})},one:function(G,H,F){var E=o.event.proxy(F||H,function(I){o(this).unbind(I,E);return(F||H).apply(this,arguments)});return this.each(function(){o.event.add(this,G,E,F&&H)})},unbind:function(F,E){return this.each(function(){o.event.remove(this,F,E)})},trigger:function(E,F){return this.each(function(){o.event.trigger(E,F,this)})},triggerHandler:function(E,G){if(this[0]){var F=o.Event(E);F.preventDefault();F.stopPropagation();o.event.trigger(F,G,this[0]);return F.result}},toggle:function(G){var E=arguments,F=1;while(F=0){var E=G.slice(I,G.length);G=G.slice(0,I)}var H="GET";if(J){if(o.isFunction(J)){K=J;J=null}else{if(typeof J==="object"){J=o.param(J);H="POST"}}}var F=this;o.ajax({url:G,type:H,dataType:"html",data:J,complete:function(M,L){if(L=="success"||L=="notmodified"){F.html(E?o("
").append(M.responseText.replace(//g,"")).find(E):M.responseText)}if(K){F.each(K,[M.responseText,L,M])}}});return this},serialize:function(){return o.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?o.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password|search/i.test(this.type))}).map(function(E,F){var G=o(this).val();return G==null?null:o.isArray(G)?o.map(G,function(I,H){return{name:F.name,value:I}}):{name:F.name,value:G}}).get()}});o.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(E,F){o.fn[F]=function(G){return this.bind(F,G)}});var r=e();o.extend({get:function(E,G,H,F){if(o.isFunction(G)){H=G;G=null}return o.ajax({type:"GET",url:E,data:G,success:H,dataType:F})},getScript:function(E,F){return o.get(E,null,F,"script")},getJSON:function(E,F,G){return o.get(E,F,G,"json")},post:function(E,G,H,F){if(o.isFunction(G)){H=G;G={}}return o.ajax({type:"POST",url:E,data:G,success:H,dataType:F})},ajaxSetup:function(E){o.extend(o.ajaxSettings,E)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return l.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(M){M=o.extend(true,M,o.extend(true,{},o.ajaxSettings,M));var W,F=/=\?(&|$)/g,R,V,G=M.type.toUpperCase();if(M.data&&M.processData&&typeof M.data!=="string"){M.data=o.param(M.data)}if(M.dataType=="jsonp"){if(G=="GET"){if(!M.url.match(F)){M.url+=(M.url.match(/\?/)?"&":"?")+(M.jsonp||"callback")+"=?"}}else{if(!M.data||!M.data.match(F)){M.data=(M.data?M.data+"&":"")+(M.jsonp||"callback")+"=?"}}M.dataType="json"}if(M.dataType=="json"&&(M.data&&M.data.match(F)||M.url.match(F))){W="jsonp"+r++;if(M.data){M.data=(M.data+"").replace(F,"="+W+"$1")}M.url=M.url.replace(F,"="+W+"$1");M.dataType="script";l[W]=function(X){V=X;I();L();l[W]=g;try{delete l[W]}catch(Y){}if(H){H.removeChild(T)}}}if(M.dataType=="script"&&M.cache==null){M.cache=false}if(M.cache===false&&G=="GET"){var E=e();var U=M.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+E+"$2");M.url=U+((U==M.url)?(M.url.match(/\?/)?"&":"?")+"_="+E:"")}if(M.data&&G=="GET"){M.url+=(M.url.match(/\?/)?"&":"?")+M.data;M.data=null}if(M.global&&!o.active++){o.event.trigger("ajaxStart")}var Q=/^(\w+:)?\/\/([^\/?#]+)/.exec(M.url);if(M.dataType=="script"&&G=="GET"&&Q&&(Q[1]&&Q[1]!=location.protocol||Q[2]!=location.host)){var H=document.getElementsByTagName("head")[0];var T=document.createElement("script");T.src=M.url;if(M.scriptCharset){T.charset=M.scriptCharset}if(!W){var O=false;T.onload=T.onreadystatechange=function(){if(!O&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){O=true;I();L();T.onload=T.onreadystatechange=null;H.removeChild(T)}}}H.appendChild(T);return g}var K=false;var J=M.xhr();if(M.username){J.open(G,M.url,M.async,M.username,M.password)}else{J.open(G,M.url,M.async)}try{if(M.data){J.setRequestHeader("Content-Type",M.contentType)}if(M.ifModified){J.setRequestHeader("If-Modified-Since",o.lastModified[M.url]||"Thu, 01 Jan 1970 00:00:00 GMT")}J.setRequestHeader("X-Requested-With","XMLHttpRequest");J.setRequestHeader("Accept",M.dataType&&M.accepts[M.dataType]?M.accepts[M.dataType]+", */*":M.accepts._default)}catch(S){}if(M.beforeSend&&M.beforeSend(J,M)===false){if(M.global&&!--o.active){o.event.trigger("ajaxStop")}J.abort();return false}if(M.global){o.event.trigger("ajaxSend",[J,M])}var N=function(X){if(J.readyState==0){if(P){clearInterval(P);P=null;if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}}else{if(!K&&J&&(J.readyState==4||X=="timeout")){K=true;if(P){clearInterval(P);P=null}R=X=="timeout"?"timeout":!o.httpSuccess(J)?"error":M.ifModified&&o.httpNotModified(J,M.url)?"notmodified":"success";if(R=="success"){try{V=o.httpData(J,M.dataType,M)}catch(Z){R="parsererror"}}if(R=="success"){var Y;try{Y=J.getResponseHeader("Last-Modified")}catch(Z){}if(M.ifModified&&Y){o.lastModified[M.url]=Y}if(!W){I()}}else{o.handleError(M,J,R)}L();if(X){J.abort()}if(M.async){J=null}}}};if(M.async){var P=setInterval(N,13);if(M.timeout>0){setTimeout(function(){if(J&&!K){N("timeout")}},M.timeout)}}try{J.send(M.data)}catch(S){o.handleError(M,J,null,S)}if(!M.async){N()}function I(){if(M.success){M.success(V,R)}if(M.global){o.event.trigger("ajaxSuccess",[J,M])}}function L(){if(M.complete){M.complete(J,R)}if(M.global){o.event.trigger("ajaxComplete",[J,M])}if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}return J},handleError:function(F,H,E,G){if(F.error){F.error(H,E,G)}if(F.global){o.event.trigger("ajaxError",[H,F,G])}},active:0,httpSuccess:function(F){try{return !F.status&&location.protocol=="file:"||(F.status>=200&&F.status<300)||F.status==304||F.status==1223}catch(E){}return false},httpNotModified:function(G,E){try{var H=G.getResponseHeader("Last-Modified");return G.status==304||H==o.lastModified[E]}catch(F){}return false},httpData:function(J,H,G){var F=J.getResponseHeader("content-type"),E=H=="xml"||!H&&F&&F.indexOf("xml")>=0,I=E?J.responseXML:J.responseText;if(E&&I.documentElement.tagName=="parsererror"){throw"parsererror"}if(G&&G.dataFilter){I=G.dataFilter(I,H)}if(typeof I==="string"){if(H=="script"){o.globalEval(I)}if(H=="json"){I=l["eval"]("("+I+")")}}return I},param:function(E){var G=[];function H(I,J){G[G.length]=encodeURIComponent(I)+"="+encodeURIComponent(J)}if(o.isArray(E)||E.jquery){o.each(E,function(){H(this.name,this.value)})}else{for(var F in E){if(o.isArray(E[F])){o.each(E[F],function(){H(F,this)})}else{H(F,o.isFunction(E[F])?E[F]():E[F])}}}return G.join("&").replace(/%20/g,"+")}});var m={},n,d=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];function t(F,E){var G={};o.each(d.concat.apply([],d.slice(0,E)),function(){G[this]=F});return G}o.fn.extend({show:function(J,L){if(J){return this.animate(t("show",3),J,L)}else{for(var H=0,F=this.length;H").appendTo("body");K=I.css("display");if(K==="none"){K="block"}I.remove();m[G]=K}o.data(this[H],"olddisplay",K)}}for(var H=0,F=this.length;H=0;H--){if(G[H].elem==this){if(E){G[H](true)}G.splice(H,1)}}});if(!E){this.dequeue()}return this}});o.each({slideDown:t("show",1),slideUp:t("hide",1),slideToggle:t("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(E,F){o.fn[E]=function(G,H){return this.animate(F,G,H)}});o.extend({speed:function(G,H,F){var E=typeof G==="object"?G:{complete:F||!F&&H||o.isFunction(G)&&G,duration:G,easing:F&&H||H&&!o.isFunction(H)&&H};E.duration=o.fx.off?0:typeof E.duration==="number"?E.duration:o.fx.speeds[E.duration]||o.fx.speeds._default;E.old=E.complete;E.complete=function(){if(E.queue!==false){o(this).dequeue()}if(o.isFunction(E.old)){E.old.call(this)}};return E},easing:{linear:function(G,H,E,F){return E+F*G},swing:function(G,H,E,F){return((-Math.cos(G*Math.PI)/2)+0.5)*F+E}},timers:[],fx:function(F,E,G){this.options=E;this.elem=F;this.prop=G;if(!E.orig){E.orig={}}}});o.fx.prototype={update:function(){if(this.options.step){this.options.step.call(this.elem,this.now,this)}(o.fx.step[this.prop]||o.fx.step._default)(this);if((this.prop=="height"||this.prop=="width")&&this.elem.style){this.elem.style.display="block"}},cur:function(F){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var E=parseFloat(o.css(this.elem,this.prop,F));return E&&E>-10000?E:parseFloat(o.curCSS(this.elem,this.prop))||0},custom:function(I,H,G){this.startTime=e();this.start=I;this.end=H;this.unit=G||this.unit||"px";this.now=this.start;this.pos=this.state=0;var E=this;function F(J){return E.step(J)}F.elem=this.elem;if(F()&&o.timers.push(F)&&!n){n=setInterval(function(){var K=o.timers;for(var J=0;J=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var E=true;for(var F in this.options.curAnim){if(this.options.curAnim[F]!==true){E=false}}if(E){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(o.css(this.elem,"display")=="none"){this.elem.style.display="block"}}if(this.options.hide){o(this.elem).hide()}if(this.options.hide||this.options.show){for(var I in this.options.curAnim){o.attr(this.elem.style,I,this.options.orig[I])}}this.options.complete.call(this.elem)}return false}else{var J=G-this.startTime;this.state=J/this.options.duration;this.pos=o.easing[this.options.easing||(o.easing.swing?"swing":"linear")](this.state,J,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update()}return true}};o.extend(o.fx,{speeds:{slow:600,fast:200,_default:400},step:{opacity:function(E){o.attr(E.elem.style,"opacity",E.now)},_default:function(E){if(E.elem.style&&E.elem.style[E.prop]!=null){E.elem.style[E.prop]=E.now+E.unit}else{E.elem[E.prop]=E.now}}}});if(document.documentElement.getBoundingClientRect){o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}var G=this[0].getBoundingClientRect(),J=this[0].ownerDocument,F=J.body,E=J.documentElement,L=E.clientTop||F.clientTop||0,K=E.clientLeft||F.clientLeft||0,I=G.top+(self.pageYOffset||o.boxModel&&E.scrollTop||F.scrollTop)-L,H=G.left+(self.pageXOffset||o.boxModel&&E.scrollLeft||F.scrollLeft)-K;return{top:I,left:H}}}else{o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}o.offset.initialized||o.offset.initialize();var J=this[0],G=J.offsetParent,F=J,O=J.ownerDocument,M,H=O.documentElement,K=O.body,L=O.defaultView,E=L.getComputedStyle(J,null),N=J.offsetTop,I=J.offsetLeft;while((J=J.parentNode)&&J!==K&&J!==H){M=L.getComputedStyle(J,null);N-=J.scrollTop,I-=J.scrollLeft;if(J===G){N+=J.offsetTop,I+=J.offsetLeft;if(o.offset.doesNotAddBorder&&!(o.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(J.tagName))){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}F=G,G=J.offsetParent}if(o.offset.subtractsBorderForOverflowNotVisible&&M.overflow!=="visible"){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}E=M}if(E.position==="relative"||E.position==="static"){N+=K.offsetTop,I+=K.offsetLeft}if(E.position==="fixed"){N+=Math.max(H.scrollTop,K.scrollTop),I+=Math.max(H.scrollLeft,K.scrollLeft)}return{top:N,left:I}}}o.offset={initialize:function(){if(this.initialized){return}var L=document.body,F=document.createElement("div"),H,G,N,I,M,E,J=L.style.marginTop,K='
';M={position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"};for(E in M){F.style[E]=M[E]}F.innerHTML=K;L.insertBefore(F,L.firstChild);H=F.firstChild,G=H.firstChild,I=H.nextSibling.firstChild.firstChild;this.doesNotAddBorder=(G.offsetTop!==5);this.doesAddBorderForTableAndCells=(I.offsetTop===5);H.style.overflow="hidden",H.style.position="relative";this.subtractsBorderForOverflowNotVisible=(G.offsetTop===-5);L.style.marginTop="1px";this.doesNotIncludeMarginInBodyOffset=(L.offsetTop===0);L.style.marginTop=J;L.removeChild(F);this.initialized=true},bodyOffset:function(E){o.offset.initialized||o.offset.initialize();var G=E.offsetTop,F=E.offsetLeft;if(o.offset.doesNotIncludeMarginInBodyOffset){G+=parseInt(o.curCSS(E,"marginTop",true),10)||0,F+=parseInt(o.curCSS(E,"marginLeft",true),10)||0}return{top:G,left:F}}};o.fn.extend({position:function(){var I=0,H=0,F;if(this[0]){var G=this.offsetParent(),J=this.offset(),E=/^body|html$/i.test(G[0].tagName)?{top:0,left:0}:G.offset();J.top-=j(this,"marginTop");J.left-=j(this,"marginLeft");E.top+=j(G,"borderTopWidth");E.left+=j(G,"borderLeftWidth");F={top:J.top-E.top,left:J.left-E.left}}return F},offsetParent:function(){var E=this[0].offsetParent||document.body;while(E&&(!/^body|html$/i.test(E.tagName)&&o.css(E,"position")=="static")){E=E.offsetParent}return o(E)}});o.each(["Left","Top"],function(F,E){var G="scroll"+E;o.fn[G]=function(H){if(!this[0]){return null}return H!==g?this.each(function(){this==l||this==document?l.scrollTo(!F?H:o(l).scrollLeft(),F?H:o(l).scrollTop()):this[G]=H}):this[0]==l||this[0]==document?self[F?"pageYOffset":"pageXOffset"]||o.boxModel&&document.documentElement[G]||document.body[G]:this[0][G]}});o.each(["Height","Width"],function(I,G){var E=I?"Left":"Top",H=I?"Right":"Bottom",F=G.toLowerCase();o.fn["inner"+G]=function(){return this[0]?o.css(this[0],F,false,"padding"):null};o.fn["outer"+G]=function(K){return this[0]?o.css(this[0],F,false,K?"margin":"border"):null};var J=G.toLowerCase();o.fn[J]=function(K){return this[0]==l?document.compatMode=="CSS1Compat"&&document.documentElement["client"+G]||document.body["client"+G]:this[0]==document?Math.max(document.documentElement["client"+G],document.body["scroll"+G],document.documentElement["scroll"+G],document.body["offset"+G],document.documentElement["offset"+G]):K===g?(this.length?o.css(this[0],J):null):this.css(J,typeof K==="string"?K:K+"px")}})})(); \ No newline at end of file diff --git a/IPSLibrary/webfront/IPSHighcharts/Highcharts/js/highcharts-more.js b/IPSLibrary/webfront/IPSHighcharts/Highcharts/js/highcharts-more.js new file mode 100644 index 0000000..d56e27d --- /dev/null +++ b/IPSLibrary/webfront/IPSHighcharts/Highcharts/js/highcharts-more.js @@ -0,0 +1,34 @@ +/* + Highcharts JS v2.3.2 (2012-08-31) + + (c) 2009-2011 Torstein Hønsi + + License: www.highcharts.com/license +*/ +(function(h,t){function z(a,b,c){this.init.call(this,a,b,c)}function A(a,b,c){a.call(this,b,c);if(this.chart.polar)this.closeSegment=function(a){var b=this.xAxis.center;a.push("L",b[0],b[1])},this.closedStacks=!0}function B(a,b){var c=this.chart,d=this.options.animation,f=this.group,e=this.markerGroup,g=this.xAxis.center,i=c.plotLeft,m=c.plotTop;if(c.polar){if(c.renderer.isSVG)if(d===!0&&(d={}),b){if(f.attrSetters.scaleX=f.attrSetters.scaleY=function(a,b){this[b]=a;this.scaleX!==t&&this.scaleY!== +t&&this.element.setAttribute("transform","translate("+this.translateX+","+this.translateY+") scale("+this.scaleX+","+this.scaleY+")");return!1},c={translateX:g[0]+i,translateY:g[1]+m,scaleX:0,scaleY:0},f.attr(c),e)e.attrSetters=f.attrSetters,e.attr(c)}else c={translateX:i,translateY:m,scaleX:1,scaleY:1},f.animate(c,d),e&&e.animate(c,d),this.animate=null}else a.call(this,b)}var p=h.each,u=h.extend,o=h.merge,D=h.map,n=h.pick,v=h.pInt,j=h.getOptions().plotOptions,k=h.seriesTypes,w=h.extendClass,l=h.wrap, +q=h.Axis,F=h.Tick,y=h.Series,r=k.column.prototype,s=function(){};u(z.prototype,{init:function(a,b,c){var d=this,f=d.defaultOptions;d.chart=b;if(b.angular)f.background={};d.options=a=o(f,a);(a=a.background)&&p([].concat(h.splat(a)).reverse(),function(a){var b=a.backgroundColor,a=o(d.defaultBackgroundOptions,a);if(b)a.backgroundColor=b;a.color=a.backgroundColor;c.options.plotBands.unshift(a)})},defaultOptions:{center:["50%","50%"],size:"85%",startAngle:0},defaultBackgroundOptions:{shape:"circle",borderWidth:1, +borderColor:"silver",backgroundColor:{linearGradient:{x1:0,y1:0,x2:0,y2:1},stops:[[0,"#FFF"],[1,"#DDD"]]},from:Number.MIN_VALUE,innerRadius:0,to:Number.MAX_VALUE,outerRadius:"105%"}});var x=q.prototype,q=F.prototype,G={getOffset:s,redraw:function(){this.isDirty=!1},render:function(){this.isDirty=!1},setScale:s,setCategories:s,setTitle:s},E={isRadial:!0,defaultRadialGaugeOptions:{labels:{align:"center",x:0,y:null},minorGridLineWidth:0,minorTickInterval:"auto",minorTickLength:10,minorTickPosition:"inside", +minorTickWidth:1,plotBands:[],tickLength:10,tickPosition:"inside",tickWidth:2,title:{rotation:0},zIndex:2},defaultRadialXOptions:{gridLineWidth:1,labels:{align:null,distance:15,x:0,y:null},maxPadding:0,minPadding:0,plotBands:[],showLastLabel:!1,tickLength:0},defaultRadialYOptions:{gridLineInterpolation:"circle",labels:{align:"right",x:-3,y:-2},plotBands:[],showLastLabel:!1,title:{x:4,text:null,rotation:90}},setOptions:function(a){this.options=o(this.defaultOptions,this.defaultRadialOptions,a)},getOffset:function(){x.getOffset.call(this); +this.chart.axisOffset[this.side]=0;this.center=this.pane.center=k.pie.prototype.getCenter.call(this.pane)},getLinePath:function(a,b){var c=this.center,b=n(b,c[2]/2-this.offset);return this.chart.renderer.symbols.arc(this.left+c[0],this.top+c[1],b,b,{start:this.startAngleRad,end:this.endAngleRad,open:!0,innerR:0})},setAxisTranslation:function(){x.setAxisTranslation.call(this);if(this.center&&(this.transA=this.isCircular?(this.endAngleRad-this.startAngleRad)/(this.max-this.min||1):this.center[2]/2/ +(this.max-this.min||1),this.isXAxis))this.minPixelPadding=this.transA*this.minPointOffset+(this.reversed?(this.endAngleRad-this.startAngleRad)/4:0)},beforeSetTickPositions:function(){this.autoConnect&&(this.max+=this.categories&&1||this.pointRange||this.closestPointRange)},setAxisSize:function(){x.setAxisSize.call(this);if(this.center)this.len=this.width=this.height=this.isCircular?this.center[2]*(this.endAngleRad-this.startAngleRad)/2:this.center[2]/2},getPosition:function(a,b){if(!this.isCircular)b= +this.translate(a),a=this.min;return this.postTranslate(this.translate(a),n(b,this.center[2]/2)-this.offset)},postTranslate:function(a,b){var c=this.chart,d=this.center,a=this.startAngleRad+a;return{x:c.plotLeft+d[0]+Math.cos(a)*b,y:c.plotTop+d[1]+Math.sin(a)*b}},getPlotBandPath:function(a,b,c){var d=this.center,f=this.startAngleRad,e=d[2]/2,g=[n(c.outerRadius,"100%"),c.innerRadius,n(c.thickness,10)],i=/%$/,m,C=this.isCircular;this.options.gridLineInterpolation==="polygon"?d=this.getPlotLinePath(a).concat(this.getPlotLinePath(b, +!0)):(C||(g[0]=this.translate(a),g[1]=this.translate(b)),g=D(g,function(a){i.test(a)&&(a=v(a,10)*e/100);return a}),c.shape==="circle"||!C?(a=-Math.PI/2,b=Math.PI*1.5,m=!0):(a=f+this.translate(a),b=f+this.translate(b)),d=this.chart.renderer.symbols.arc(this.left+d[0],this.top+d[1],g[0],g[0],{start:a,end:b,innerR:n(g[1],g[0]-g[2]),open:m}));return d},getPlotLinePath:function(a,b){var c=this.center,d=this.chart,f=this.getPosition(a),e,g,i;this.isCircular?i=["M",c[0]+d.plotLeft,c[1]+d.plotTop,"L",f.x, +f.y]:this.options.gridLineInterpolation==="circle"?(a=this.translate(a))&&(i=this.getLinePath(0,a)):(e=d.xAxis[0],i=[],a=this.translate(a),c=e.tickPositions,e.autoConnect&&(c=c.concat([c[0]])),b&&(c=[].concat(c).reverse()),p(c,function(b,c){g=e.getPosition(b,a);i.push(c?"L":"M",g.x,g.y)}));return i},getTitlePosition:function(){var a=this.center,b=this.chart,c=this.options.title;return{x:b.plotLeft+a[0]+(c.x||0),y:b.plotTop+a[1]-{high:0.5,middle:0.25,low:0}[c.align]*a[2]+(c.y||0)}}};l(x,"init",function(a, +b,c){var d=this,f=b.angular,e=b.polar,g=c.isX,i=f&&g,m;if(f){if(u(this,i?G:E),m=!g)this.defaultRadialOptions=this.defaultRadialGaugeOptions}else if(e)u(this,E),this.defaultRadialOptions=(m=g)?this.defaultRadialXOptions:o(this.defaultYAxisOptions,this.defaultRadialYOptions);a.call(this,b,c);if(!i&&(f||e)){a=this.options;if(!b.panes)b.panes=D(h.splat(b.options.pane),function(a){return new z(a,b,d)});this.pane=f=b.panes[c.pane||0];e=f.options;b.inverted=!1;b.options.chart.zoomType=null;this.startAngleRad= +f=(e.startAngle-90)*Math.PI/180;this.endAngleRad=e=(n(e.endAngle,e.startAngle+360)-90)*Math.PI/180;this.offset=a.offset||0;if((this.isCircular=m)&&c.max===t&&e-f===2*Math.PI)this.autoConnect=!0}});l(q,"getPosition",function(a,b,c,d,f){var e=this.axis;return e.getPosition?e.getPosition(c):a.call(this,b,c,d,f)});l(q,"getLabelPosition",function(a,b,c,d,f,e,g,i,m){var h=this.axis,k=e.y,j=e.align,l=(h.translate(this.pos)+h.startAngleRad+Math.PI/2)/Math.PI*180;h.isRadial?(a=h.getPosition(this.pos,h.center[2]/ +2+n(e.distance,-25)),e.rotation==="auto"?d.attr({rotation:l}):k===null&&(k=v(d.styles.lineHeight)*0.9-d.getBBox().height/2),j===null&&(j=h.isCircular?l>20&&l<160?"left":l>200&&l<340?"right":"center":"center",d.attr({align:j})),a.x+=e.x,a.y+=k):a=a.call(this,b,c,d,f,e,g,i,m);return a});l(q,"getMarkPath",function(a,b,c,d,f,e,g){var i=this.axis;i.isRadial?(a=i.getPosition(this.pos,i.center[2]/2+d),b=["M",b,c,"L",a.x,a.y]):b=a.call(this,b,c,d,f,e,g);return b});j.arearange=o(j.area,{lineWidth:1,marker:null, +threshold:null,tooltip:{pointFormat:'{series.name}: {point.low} - {point.high}
'},trackByArea:!0,dataLabels:{xLow:0,xHigh:0,yLow:16,yHigh:-6},shadow:!1});q=h.extendClass(h.Point,{applyOptions:function(a,b){var c=this.series,d=c.pointArrayMap,f=0,e=0,g=d.length;if(typeof a==="object"&&typeof a.length!=="number")u(this,a),this.options=a;else if(a.length){if(a.length>g){if(typeof a[0]==="string")this.name=a[0];else if(typeof a[0]==="number")this.x= +a[0];f++}for(;eMath.PI/2&&(j-=Math.PI),i=f+Math.cos(j)*b,h=e+Math.sin(j)*b,g=f+Math.cos(Math.PI+j)*k,j=e+Math.sin(Math.PI+j)*k,c.rightContX=g,c.rightContY= +j;d?(c=["C",a.rightContX||a.plotX,a.rightContY||a.plotY,i||f,h||e,f,e],a.rightContX=a.rightContY=null):c=["M",f,e]}else c=a.call(this,b,c,d);return c});l(j,"translate",function(a){a.call(this);if(this.chart.polar&&!this.preventPostTranslate)for(var a=this.points,b=a.length;b--;)this.toXY(a[b])});l(j,"getSegmentPath",function(a,b){var c=this.points;if(this.chart.polar&&this.options.connectEnds!==!1&&b[b.length-1]===c[c.length-1]&&c[0].y!==null)this.connectEnds=!0,b=[].concat(b,[c[0]]);return a.call(this, +b)});l(j,"animate",B);l(r,"animate",B);l(j,"setTooltipPoints",function(a,b){this.chart.polar&&u(this.xAxis,{tooltipLen:360,tooltipPosName:"deg"});return a.call(this,b)});l(r,"translate",function(a){var b=this.xAxis,c=this.yAxis.len,d=b.center,f=b.startAngleRad,e=this.chart.renderer,g;this.preventPostTranslate=!0;a.call(this);if(b.isRadial){a=this.points;for(g=a.length;g--;)b=a[g],b.shapeType="path",b.shapeArgs={d:e.symbols.arc(d[0],d[1],c-b.plotY,null,{start:f+b.barX,end:f+b.barX+b.pointWidth,innerR:c- +n(b.yBottom,c)})},this.toXY(b)}});l(w,"getIndex",function(a,b){var c,d=this.chart,f;d.polar?(f=d.xAxis[0].center,c=b.chartX-f[0]-d.plotLeft,d=b.chartY-f[1]-d.plotTop,c=180-Math.round(Math.atan2(c,d)/Math.PI*180)):c=a.call(this,b);return c});l(w,"getMouseCoordinates",function(a,b){var c=this.chart,d={xAxis:[],yAxis:[]};c.polar?p(c.axes,function(a){var e=a.isXAxis,g=a.center,h=b.chartX-g[0]-c.plotLeft,g=b.chartY-g[1]-c.plotTop;d[e?"xAxis":"yAxis"].push({axis:a,value:a.translate(e?Math.PI-Math.atan2(h, +g):Math.sqrt(Math.pow(h,2)+Math.pow(g,2)),!0)})}):d=a.call(this,b);return d})})(Highcharts); diff --git a/IPSLibrary/webfront/IPSHighcharts/Highcharts/js/highcharts.js b/IPSLibrary/webfront/IPSHighcharts/Highcharts/js/highcharts.js new file mode 100644 index 0000000..0a7fd0f --- /dev/null +++ b/IPSLibrary/webfront/IPSHighcharts/Highcharts/js/highcharts.js @@ -0,0 +1,245 @@ +/* + Highcharts JS v2.3.2 (2012-08-31) + + (c) 2009-2011 Torstein Hønsi + + License: www.highcharts.com/license +*/ +(function(){function s(a,b){var c;a||(a={});for(c in b)a[c]=b[c];return a}function la(){for(var a=0,b=arguments,c=b.length,d={};a-1?b.split(".")[1].length:0):a=isNaN(b=N(b))?2:b;var b=a,c=c===void 0?e.decimalPoint:c,d=d===void 0?e.thousandsSep:d,e=f<0?"-":"",a=String(A(f=N(+f||0).toFixed(b))),g=a.length>3?a.length%3:0;return e+(g?a.substr(0,g)+d:"")+a.substr(g).replace(/(\d{3})(?=\d)/g, +"$1"+d)+(b?c+N(f-a).toFixed(b).slice(2):"")}function sa(a,b){return Array((b||2)+1-String(a).length).join(0)+a}function hb(a,b,c,d){var e,c=p(c,1);e=a/c;b||(b=[1,2,2.5,5,10],d&&d.allowDecimals===!1&&(c===1?b=[1,2,5,10]:c<=0.1&&(b=[1/c])));for(d=0;d=D[ib]&&(i.setMilliseconds(0),i.setSeconds(b>=D[Ua]?0:j*V(i.getSeconds()/j)));if(b>=D[Ua])i[Ab](b>=D[Ja]?0:j*V(i[jb]()/j));if(b>=D[Ja])i[Bb](b>=D[pa]?0:j*V(i[kb]()/ +j));if(b>=D[pa])i[lb](b>=D[Ka]?1:j*V(i[La]()/j));b>=D[Ka]&&(i[Cb](b>=D[ta]?0:j*V(i[Wa]()/j)),h=i[Xa]());b>=D[ta]&&(h-=h%j,i[Db](h));if(b===D[Va])i[lb](i[La]()-i[mb]()+p(d,1));d=1;h=i[Xa]();for(var k=i.getTime(),l=i[Wa](),m=i[La](),i=g?0:(864E5+i.getTimezoneOffset()*6E4)%864E5;kc&&(c=a[b]);return c}function Aa(a,b){for(var c in a)a[c]&&a[c]!==b&&a[c].destroy&&a[c].destroy(),delete a[c]}function Na(a){Za||(Za=S(ia));a&&Za.appendChild(a);Za.innerHTML=""}function $a(a, +b){var c="Highcharts error #"+a+": www.highcharts.com/errors/"+a;if(b)throw c;else L.console&&console.log(c)}function ja(a){return parseFloat(a.toPrecision(14))}function ua(a,b){Oa=p(a,b.animation)}function Gb(){var a=O.global.useUTC,b=a?"getUTC":"get",c=a?"setUTC":"set";Ya=a?Date.UTC:function(a,b,c,g,h,i){return(new Date(a,b,p(c,1),p(g,0),p(h,0),p(i,0))).getTime()};jb=b+"Minutes";kb=b+"Hours";mb=b+"Day";La=b+"Date";Wa=b+"Month";Xa=b+"FullYear";Ab=c+"Minutes";Bb=c+"Hours";lb=c+"Date";Cb=c+"Month"; +Db=c+"FullYear"}function va(){}function Pa(a,b,c){this.axis=a;this.pos=b;this.type=c||"";this.isNew=!0;c||this.addLabel()}function nb(a,b){this.axis=a;if(b)this.options=b,this.id=b.id;return this}function Hb(a,b,c,d,e){var f=a.chart.inverted;this.axis=a;this.isNegative=c;this.options=b;this.x=d;this.stack=e;this.alignOptions={align:b.align||(f?c?"left":"right":"center"),verticalAlign:b.verticalAlign||(f?"middle":c?"bottom":"top"),y:p(b.y,f?4:c?14:-6),x:p(b.x,f?c?-6:6:0)};this.textAlign=b.textAlign|| +(f?c?"right":"left":"center")}function ob(){this.init.apply(this,arguments)}function pb(a,b){var c=b.borderWidth,d=b.style,e=A(d.padding);this.chart=a;this.options=b;this.crosshairs=[];this.now={x:0,y:0};this.isHidden=!0;this.label=a.renderer.label("",0,0,b.shape,null,null,b.useHTML,null,"tooltip").attr({padding:e,fill:b.backgroundColor,"stroke-width":c,r:b.borderRadius,zIndex:8}).css(d).css({padding:0}).hide().add();$||this.label.shadow(b.shadow);this.shared=b.shared}function qb(a,b){var c=$?"": +b.chart.zoomType;this.zoomX=/x/.test(c);this.zoomY=/y/.test(c);this.options=b;this.chart=a;this.init(a,b.tooltip)}function rb(a){this.init(a)}function sb(a,b){var c,d=a.series;a.series=null;c=C(O,a);c.series=a.series=d;var d=c.chart,e=d.margin,e=Z(e)?e:[e,e,e,e];this.optionsMarginTop=p(d.marginTop,e[0]);this.optionsMarginRight=p(d.marginRight,e[1]);this.optionsMarginBottom=p(d.marginBottom,e[2]);this.optionsMarginLeft=p(d.marginLeft,e[3]);this.runChartClick=(e=d.events)&&!!e.click;this.callback=b; +this.isResizing=0;this.options=c;this.axes=[];this.series=[];this.hasCartesianSeries=d.showAxes;this.init(e)}var x,z=document,L=window,K=Math,t=K.round,V=K.floor,wa=K.ceil,v=K.max,P=K.min,N=K.abs,W=K.cos,aa=K.sin,xa=K.PI,ab=xa*2/360,Ba=navigator.userAgent,Ib=L.opera,Ha=/msie/i.test(Ba)&&!Ib,Qa=z.documentMode===8,tb=/AppleWebKit/.test(Ba),bb=/Firefox/.test(Ba),fa=!!z.createElementNS&&!!z.createElementNS("http://www.w3.org/2000/svg","svg").createSVGRect,Pb=bb&&parseInt(Ba.split("Firefox/")[1],10)<4, +$=!fa&&!Ha&&!!z.createElement("canvas").getContext,Ra,ga=z.documentElement.ontouchstart!==x,Jb={},ub=0,Za,O,cb,Oa,vb,D,Ca=function(){},ia="div",T="none",wb="rgba(192,192,192,"+(fa?1.0E-6:0.0020)+")",zb="millisecond",ib="second",Ua="minute",Ja="hour",pa="day",Va="week",Ka="month",ta="year",Ya,jb,kb,mb,La,Wa,Xa,Ab,Bb,lb,Cb,Db,ba={};L.Highcharts={};cb=function(a,b,c){if(!u(b)||isNaN(b))return"Invalid date";var a=p(a,"%Y-%m-%d %H:%M:%S"),d=new Date(b),e,f=d[kb](),g=d[mb](),h=d[La](),i=d[Wa](),j=d[Xa](), +k=O.lang,l=k.weekdays,b={a:l[g].substr(0,3),A:l[g],d:sa(h),e:h,b:k.shortMonths[i],B:k.months[i],m:sa(i+1),y:j.toString().substr(2,2),Y:j,H:sa(f),I:sa(f%12||12),l:f%12||12,M:sa(d[jb]()),p:f<12?"AM":"PM",P:f<12?"am":"pm",S:sa(d.getSeconds()),L:sa(t(b%1E3),3)};for(e in b)a=a.replace("%"+e,b[e]);return c?a.substr(0,1).toUpperCase()+a.substr(1):a};Eb.prototype={wrapColor:function(a){if(this.color>=a)this.color=0},wrapSymbol:function(a){if(this.symbol>=a)this.symbol=0}};D=la(zb,1,ib,1E3,Ua,6E4,Ja,36E5, +pa,864E5,Va,6048E5,Ka,2592E6,ta,31556952E3);vb={init:function(a,b,c){var b=b||"",d=a.shift,e=b.indexOf("C")>-1,f=e?7:3,g,b=b.split(" "),c=[].concat(c),h,i,j=function(a){for(g=a.length;g--;)a[g]==="M"&&a.splice(g+1,0,a[g+1],a[g+2],a[g+1],a[g+2])};e&&(j(b),j(c));a.isArea&&(h=b.splice(b.length-6,6),i=c.splice(c.length-6,6));if(d<=c.length/f)for(;d--;)c=[].concat(c).splice(0,f).concat(c);a.shift=0;if(b.length)for(a=c.length;b.length{point.key}
',pointFormat:'{series.name}: {point.y}
',shadow:!0,shared:$,snap:ga?25:10,style:{color:"#333333",fontSize:"12px",padding:"5px",whiteSpace:"nowrap"}},credits:{enabled:!0,text:"Highcharts.com",href:"http://www.highcharts.com",position:{align:"right",x:-10,verticalAlign:"bottom",y:-5},style:{cursor:"pointer", +color:"#909090",fontSize:"10px"}}};var Y=O.plotOptions,X=Y.line;Gb();var qa=function(a){var b=[],c;(function(a){(c=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]?(?:\.[0-9]+)?)\s*\)/.exec(a))?b=[A(c[1]),A(c[2]),A(c[3]),parseFloat(c[4],10)]:(c=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(a))&&(b=[A(c[1],16),A(c[2],16),A(c[3],16),1])})(a);return{get:function(c){return b&&!isNaN(b[0])?c==="rgb"?"rgb("+b[0]+","+b[1]+","+b[2]+")":c==="a"?b[3]:"rgba("+b.join(",")+ +")":a},brighten:function(a){if(Ga(a)&&a!==0){var c;for(c=0;c<3;c++)b[c]+=A(a*255),b[c]<0&&(b[c]=0),b[c]>255&&(b[c]=255)}return this},setOpacity:function(a){b[3]=a;return this}}};va.prototype={init:function(a,b){this.element=b==="span"?S(b):z.createElementNS("http://www.w3.org/2000/svg",b);this.renderer=a;this.attrSetters={}},animate:function(a,b,c){b=p(b,Oa,!0);eb(this);if(b){b=C(b);if(c)b.complete=c;xb(this,a,b)}else this.attr(a),c&&c()},attr:function(a,b){var c,d,e,f,g=this.element,h=g.nodeName, +i=this.renderer,j,k=this.attrSetters,l=this.shadows,m,o,r=this;ma(a)&&u(b)&&(c=a,a={},a[c]=b);if(ma(a))c=a,h==="circle"?c={x:"cx",y:"cy"}[c]||c:c==="strokeWidth"&&(c="stroke-width"),r=B(g,c)||this[c]||0,c!=="d"&&c!=="visibility"&&(r=parseFloat(r));else for(c in a)if(j=!1,d=a[c],e=k[c]&&k[c].call(this,d,c),e!==!1){e!==x&&(d=e);if(c==="d")d&&d.join&&(d=d.join(" ")),/(NaN| {2}|^$)/.test(d)&&(d="M 0 0");else if(c==="x"&&h==="text"){for(e=0;em&&/[ \-]/.test(b.innerText)&&(G(b,{width:m+"px",display:"block",whiteSpace:"normal"}),k=m);m=a.fontMetrics(b.style.fontSize).b;q=r<0&&-k;y=o<0&&-l;ea=r*o<0;q+=o*m*(ea?1-h:h);y-=r*m*(j?ea?h:1-h:1);i&&(q-=k*h*(r<0?-1:1),j&&(y-=l*h*(o<0?-1:1)),G(b,{textAlign:g}));this.xCorr=q;this.yCorr=y}G(b,{left:e+q+"px",top:f+y+"px"});this.cTT=M}}else this.alignOnAdd= +!0},updateTransform:function(){var a=this.translateX||0,b=this.translateY||0,c=this.inverted,d=this.rotation,e=[];c&&(a+=this.attr("width"),b+=this.attr("height"));(a||b)&&e.push("translate("+a+","+b+")");c?e.push("rotate(90) scale(-1,1)"):d&&e.push("rotate("+d+" "+(this.x||0)+" "+(this.y||0)+")");e.length&&B(this.element,"transform",e.join(" "))},toFront:function(){var a=this.element;a.parentNode.appendChild(a);return this},align:function(a,b,c){a?(this.alignOptions=a,this.alignByTranslate=b,c|| +this.renderer.alignedObjects.push(this)):(a=this.alignOptions,b=this.alignByTranslate);var c=p(c,this.renderer),d=a.align,e=a.verticalAlign,f=(c.x||0)+(a.x||0),g=(c.y||0)+(a.y||0),h={};/^(right|center)$/.test(d)&&(f+=(c.width-(a.width||0))/{right:1,center:2}[d]);h[b?"translateX":"x"]=t(f);/^(bottom|middle)$/.test(e)&&(g+=(c.height-(a.height||0))/({bottom:1,middle:2}[e]||1));h[b?"translateY":"y"]=t(g);this[this.placed?"animate":"attr"](h);this.placed=!0;this.alignAttr=h;return this},getBBox:function(){var a= +this.bBox,b=this.renderer,c,d=this.rotation;c=this.element;var e=d*ab;if(!a){if(c.namespaceURI==="http://www.w3.org/2000/svg"||b.forExport){try{a=c.getBBox?s({},c.getBBox()):{width:c.offsetWidth,height:c.offsetHeight}}catch(f){}if(!a||a.width<0)a={width:0,height:0}}else a=this.htmlGetBBox();if(b.isSVG&&(b=a.width,c=a.height,d))a.width=N(c*aa(e))+N(b*W(e)),a.height=N(c*W(e))+N(b*aa(e));this.bBox=a}return a},show:function(){return this.attr({visibility:"visible"})},hide:function(){return this.attr({visibility:"hidden"})}, +add:function(a){var b=this.renderer,c=a||b,d=c.element||b.box,e=d.childNodes,f=this.element,g=B(f,"zIndex"),h;if(a)this.parentGroup=a;this.parentInverted=a&&a.inverted;this.textStr!==void 0&&b.buildText(this);if(g)c.handleZ=!0,g=A(g);if(c.handleZ)for(c=0;cg||!u(g)&&u(b))){d.insertBefore(f,a);h=!0;break}h||d.appendChild(f);this.added=!0;E(this,"add");return this},safeRemoveChild:function(a){var b=a.parentNode;b&&b.removeChild(a)},destroy:function(){var a= +this,b=a.element||{},c=a.shadows,d=a.box,e,f;b.onclick=b.onmouseout=b.onmouseover=b.onmousemove=null;eb(a);if(a.clipPath)a.clipPath=a.clipPath.destroy();if(a.stops){for(f=0;f/g,'').replace(/<(i|em)>/g,'').replace(//g,"").split(//g),d=b.childNodes,e=/style="([^"]+)"/,f=/href="([^"]+)"/,g=B(b,"x"),h=a.styles,i=h&&A(h.width),j=h&&h.lineHeight,k,h=d.length,l=[];h--;)b.removeChild(d[h]);i&&!a.added&&this.box.appendChild(b); +c[c.length-1]===""&&c.pop();n(c,function(c,d){var h,ea=0,q,c=c.replace(//g,"|||");h=c.split("|||");n(h,function(c){if(c!==""||h.length===1){var m={},p=z.createElementNS("http://www.w3.org/2000/svg","tspan");e.test(c)&&B(p,"style",c.match(e)[1].replace(/(;| |^)color([ :])/,"$1fill$2"));f.test(c)&&(B(p,"onclick",'location.href="'+c.match(f)[1]+'"'),G(p,{cursor:"pointer"}));c=(c.replace(/<(.|\n)*?>/g,"")||" ").replace(/</g,"<").replace(/>/g,">");p.appendChild(z.createTextNode(c)); +ea?m.dx=3:m.x=g;if(!ea){if(d){!fa&&a.renderer.forExport&&G(p,{display:"block"});q=L.getComputedStyle&&A(L.getComputedStyle(k,null).getPropertyValue("line-height"));if(!q||isNaN(q)){var n;if(!(n=j))if(!(n=k.offsetHeight))l[d]=b.getBBox?b.getBBox().height:a.renderer.fontMetrics(b.style.fontSize).h,n=t(l[d]-(l[d-1]||0))||18;q=n}B(p,"dy",q)}k=p}B(p,m);b.appendChild(p);ea++;if(i)for(var c=c.replace(/-/g,"- ").split(" "),I=[];c.length||I.length;)delete a.bBox,n=a.getBBox().width,m=n>i,!m||c.length===1? +(c=I,I=[],c.length&&(p=z.createElementNS("http://www.w3.org/2000/svg","tspan"),B(p,{dy:j||16,x:g}),b.appendChild(p),n>i&&(i=n))):(p.removeChild(p.firstChild),I.unshift(c.pop())),c.length&&p.appendChild(z.createTextNode(c.join(" ").replace(/- /g,"-")))}})})},button:function(a,b,c,d,e,f,g){var h=this.label(a,b,c),i=0,j,k,l,m,o,a={x1:0,y1:0,x2:0,y2:1},e=C(la("stroke-width",1,"stroke","#999","fill",la("linearGradient",a,"stops",[[0,"#FFF"],[1,"#DDD"]]),"r",3,"padding",3,"style",la("color","black")),e); +l=e.style;delete e.style;f=C(e,la("stroke","#68A","fill",la("linearGradient",a,"stops",[[0,"#FFF"],[1,"#ACF"]])),f);m=f.style;delete f.style;g=C(e,la("stroke","#68A","fill",la("linearGradient",a,"stops",[[0,"#9BD"],[1,"#CDF"]])),g);o=g.style;delete g.style;H(h.element,"mouseenter",function(){h.attr(f).css(m)});H(h.element,"mouseleave",function(){j=[e,f,g][i];k=[l,m,o][i];h.attr(j).css(k)});h.setState=function(a){(i=a)?a===2&&h.attr(g).css(o):h.attr(e).css(l)};return h.on("click",function(){d.call(h)}).attr(e).css(s({cursor:"default"}, +l))},crispLine:function(a,b){a[1]===a[4]&&(a[1]=a[4]=t(a[1])-b%2/2);a[2]===a[5]&&(a[2]=a[5]=t(a[2])+b%2/2);return a},path:function(a){var b={fill:T};Fa(a)?b.d=a:Z(a)&&s(b,a);return this.createElement("path").attr(b)},circle:function(a,b,c){a=Z(a)?a:{x:a,y:b,r:c};return this.createElement("circle").attr(a)},arc:function(a,b,c,d,e,f){if(Z(a))b=a.y,c=a.r,d=a.innerR,e=a.start,f=a.end,a=a.x;return this.symbol("arc",a||0,b||0,c||0,c||0,{innerR:d||0,start:e||0,end:f||0})},rect:function(a,b,c,d,e,f){e=Z(a)? +a.r:e;e=this.createElement("rect").attr({rx:e,ry:e,fill:T});return e.attr(Z(a)?a:e.crisp(f,a,b,v(c,0),v(d,0)))},setSize:function(a,b,c){var d=this.alignedObjects,e=d.length;this.width=a;this.height=b;for(this.boxWrapper[p(c,!0)?"animate":"attr"]({width:a,height:b});e--;)d[e].align()},g:function(a){var b=this.createElement("g");return u(a)?b.attr({"class":"highcharts-"+a}):b},image:function(a,b,c,d,e){var f={preserveAspectRatio:T};arguments.length>1&&s(f,{x:b,y:c,width:d,height:e});f=this.createElement("image").attr(f); +f.element.setAttributeNS?f.element.setAttributeNS("http://www.w3.org/1999/xlink","href",a):f.element.setAttribute("hc-svg-href",a);return f},symbol:function(a,b,c,d,e,f){var g,h=this.symbols[a],h=h&&h(t(b),t(c),d,e,f),i=/^url\((.*?)\)$/,j,k;h?(g=this.path(h),s(g,{symbolName:a,x:b,y:c,width:d,height:e}),f&&s(g,f)):i.test(a)&&(k=function(a,b){a.attr({width:b[0],height:b[1]});a.alignByTranslate||a.translate(-t(b[0]/2),-t(b[1]/2))},j=a.match(i)[1],a=Jb[j],g=this.image(j).attr({x:b,y:c}),a?k(g,a):(g.attr({width:0, +height:0}),S("img",{onload:function(){k(g,Jb[j]=[this.width,this.height])},src:j})));return g},symbols:{circle:function(a,b,c,d){var e=0.166*c;return["M",a+c/2,b,"C",a+c+e,b,a+c+e,b+d,a+c/2,b+d,"C",a-e,b+d,a-e,b,a+c/2,b,"Z"]},square:function(a,b,c,d){return["M",a,b,"L",a+c,b,a+c,b+d,a,b+d,"Z"]},triangle:function(a,b,c,d){return["M",a+c/2,b,"L",a+c,b+d,a,b+d,"Z"]},"triangle-down":function(a,b,c,d){return["M",a,b,"L",a+c,b,a+c/2,b+d,"Z"]},diamond:function(a,b,c,d){return["M",a+c/2,b,"L",a+c,b+d/2,a+ +c/2,b+d,a,b+d/2,"Z"]},arc:function(a,b,c,d,e){var f=e.start,c=e.r||c||d,g=e.end-1.0E-6,d=e.innerR,h=e.open,i=W(f),j=aa(f),k=W(g),g=aa(g),e=e.end-f');if(b)c=b===ia||b==="span"||b==="img"?c.join(""):a.prepVML(c),this.element=S(c);this.renderer=a;this.attrSetters={}},add:function(a){var b=this.renderer,c=this.element,d=b.box,d=a?a.element||a:d;a&&a.inverted&&b.invertChild(c,d);d.appendChild(c);this.added=!0;this.alignOnAdd&&!this.deferUpdateTransform&&this.updateTransform();E(this,"add");return this},updateTransform:va.prototype.htmlUpdateTransform, +attr:function(a,b){var c,d,e,f=this.element||{},g=f.style,h=f.nodeName,i=this.renderer,j=this.symbolName,k,l=this.shadows,m,o=this.attrSetters,r=this;ma(a)&&u(b)&&(c=a,a={},a[c]=b);if(ma(a))c=a,r=c==="strokeWidth"||c==="stroke-width"?this.strokeweight:this[c];else for(c in a)if(d=a[c],m=!1,e=o[c]&&o[c].call(this,d,c),e!==!1&&d!==null){e!==x&&(d=e);if(j&&/^(x|y|r|start|end|width|height|innerR|anchorX|anchorY)/.test(c))k||(this.symbolAttr(a),k=!0),m=!0;else if(c==="d"){d=d||[];this.d=d.join(" ");e= +d.length;for(m=[];e--;)m[e]=Ga(d[e])?t(d[e]*10)-5:d[e]==="Z"?"x":d[e];d=m.join(" ")||"x";f.path=d;if(l)for(e=l.length;e--;)l[e].path=l[e].cutOff?this.cutOffPath(d,l[e].cutOff):d;m=!0}else if(c==="visibility"){if(l)for(e=l.length;e--;)l[e].style[c]=d;h==="DIV"&&(d=d==="hidden"?"-999em":0,c="top");g[c]=d;m=!0}else if(c==="zIndex")d&&(g[c]=d),m=!0;else if(c==="width"||c==="height")d=v(0,d),this[c]=d,this.updateClipping?(this[c]=d,this.updateClipping()):g[c]=d,m=!0;else if(c==="x"||c==="y")this[c]=d, +g[{x:"left",y:"top"}[c]]=d;else if(c==="class")f.className=d;else if(c==="stroke")d=i.color(d,f,c),c="strokecolor";else if(c==="stroke-width"||c==="strokeWidth")f.stroked=d?!0:!1,c="strokeweight",this[c]=d,Ga(d)&&(d+="px");else if(c==="dashstyle")(f.getElementsByTagName("stroke")[0]||S(i.prepVML([""]),null,null,f))[c]=d||"solid",this.dashstyle=d,m=!0;else if(c==="fill")h==="SPAN"?g.color=d:(f.filled=d!==T?!0:!1,d=i.color(d,f,c,this),c="fillcolor");else if(h==="shape"&&c==="rotation")this[c]= +d,f.style.left=-t(aa(d*ab)+1)+"px",f.style.top=t(W(d*ab))+"px";else if(c==="translateX"||c==="translateY"||c==="rotation")this[c]=d,this.updateTransform(),m=!0;else if(c==="text")this.bBox=null,f.innerHTML=d,m=!0;m||(Qa?f[c]=d:B(f,c,d))}return r},clip:function(a){var b=this,c,d=b.element,e=d.parentNode;a?(c=a.members,c.push(b),b.destroyClip=function(){ya(c,b)},e&&e.className==="highcharts-tracker"&&!Qa&&G(d,{visibility:"hidden"}),a=a.getCSS(b)):(b.destroyClip&&b.destroyClip(),a={clip:Qa?"inherit": +"rect(auto)"});return b.css(a)},css:va.prototype.htmlCss,safeRemoveChild:function(a){a.parentNode&&Na(a)},destroy:function(){this.destroyClip&&this.destroyClip();return va.prototype.destroy.apply(this)},empty:function(){for(var a=this.element.childNodes,b=a.length,c;b--;)c=a[b],c.parentNode.removeChild(c)},on:function(a,b){this.element["on"+a]=function(){var a=L.event;a.target=a.srcElement;b(a)};return this},cutOffPath:function(a,b){var c,a=a.split(/[ ,]/);c=a.length;if(c===9||c===11)a[c-4]=a[c-2]= +A(a[c-2])-10*b;return a.join(" ")},shadow:function(a,b,c){var d=[],e,f=this.element,g=this.renderer,h,i=f.style,j,k=f.path,l,m,o,r;k&&typeof k.value!=="string"&&(k="x");m=k;if(a){o=p(a.width,3);r=(a.opacity||0.15)/o;for(e=1;e<=3;e++){l=o*2+1-2*e;c&&(m=this.cutOffPath(k.value,l+0.5));j=[''];h=S(g.prepVML(j),null,{left:A(i.left)+(a.offsetX||1),top:A(i.top)+(a.offsetY||1)});if(c)h.cutOff= +l+1;j=[''];S(g.prepVML(j),null,null,h);b?b.element.appendChild(h):f.parentNode.insertBefore(h,f);d.push(h)}this.shadows=d}return this}};ka=da(va,ka);var ha={Element:ka,isIE8:Ba.indexOf("MSIE 8.0")>-1,init:function(a,b,c){var d,e;this.alignedObjects=[];d=this.createElement(ia);e=d.element;e.style.position="relative";a.appendChild(d.element);this.box=e;this.boxWrapper=d;this.setSize(b,c,!1);if(!z.namespaces.hcv)z.namespaces.add("hcv","urn:schemas-microsoft-com:vml"), +z.createStyleSheet().cssText="hcv\\:fill, hcv\\:path, hcv\\:shape, hcv\\:stroke{ behavior:url(#default#VML); display: inline-block; } "},isHidden:function(){return!this.box.offsetWidth},clipRect:function(a,b,c,d){var e=this.createElement(),f=Z(a);return s(e,{members:[],left:f?a.x:a,top:f?a.y:b,width:f?a.width:c,height:f?a.height:d,getCSS:function(a){var b=a.inverted,c=this.top,d=this.left,e=d+this.width,f=c+this.height,c={clip:"rect("+t(b?d:c)+"px,"+t(b?f:e)+"px,"+t(b?e:f)+"px,"+t(b?c:d)+"px)"};!b&& +Qa&&a.element.nodeName!=="IMG"&&s(c,{width:e+"px",height:f+"px"});return c},updateClipping:function(){n(e.members,function(a){a.css(e.getCSS(a))})}})},color:function(a,b,c,d){var e=this,f,g=/^rgba/,h,i,j=T;a&&a.linearGradient?i="gradient":a&&a.radialGradient&&(i="pattern");if(i){var k,l,m=a.linearGradient||a.radialGradient,o,r,p,q,y,M="",a=a.stops,u,w=[],I=function(){h=[''];S(e.prepVML(h), +null,null,b)};o=a[0];u=a[a.length-1];o[0]>0&&a.unshift([0,o[1]]);u[0]<1&&a.push([1,u[1]]);n(a,function(a,b){g.test(a[1])?(f=qa(a[1]),k=f.get("rgb"),l=f.get("a")):(k=a[1],l=1);w.push(a[0]*100+"% "+k);b?(p=l,q=k):(r=l,y=k)});if(c==="fill")if(i==="gradient")c=m.x1||m[0]||0,a=m.y1||m[1]||0,o=m.x2||m[2]||0,m=m.y2||m[3]||0,M='angle="'+(90-K.atan((m-a)/(o-c))*180/xa)+'"',I();else{var j=m.r,J=j*2,Q=j*2,t=m.cx,s=m.cy,v=b.radialReference,x,j=function(){v&&(x=d.getBBox(),t+=(v[0]-x.x)/x.width-0.5,s+=(v[1]-x.y)/ +x.height-0.5,J*=v[2]/x.width,Q*=v[2]/x.height);M='src="'+O.global.VMLRadialGradientURL+'" size="'+J+","+Q+'" origin="0.5,0.5" position="'+t+","+s+'" color2="'+y+'" ';I()};d.added?j():H(d,"add",j);j=q}else j=k}else if(g.test(a)&&b.tagName!=="IMG")f=qa(a),h=["<",c,' opacity="',f.get("a"),'"/>'],S(this.prepVML(h),null,null,b),j=f.get("rgb");else{j=b.getElementsByTagName(c);if(j.length)j[0].opacity=1;j=a}return j},prepVML:function(a){var b=this.isIE8,a=a.join("");b?(a=a.replace("/>",' xmlns="urn:schemas-microsoft-com:vml" />'), +a=a.indexOf('style="')===-1?a.replace("/>",' style="display:inline-block;behavior:url(#default#VML);" />'):a.replace('style="','style="display:inline-block;behavior:url(#default#VML);')):a=a.replace("<","1&&f.css({left:b,top:c,width:d,height:e});return f},rect:function(a,b,c,d,e,f){if(Z(a))b=a.y,c=a.width,d=a.height,f=a.strokeWidth,a=a.x;var g=this.symbol("rect");g.r=e;return g.attr(g.crisp(f,a,b,v(c,0),v(d,0)))},invertChild:function(a,b){var c=b.style;G(a,{flip:"x",left:A(c.width)-1,top:A(c.height)-1,rotation:-90})},symbols:{arc:function(a,b, +c,d,e){var f=e.start,g=e.end,h=e.r||c||d,c=W(f),d=aa(f),i=W(g),j=aa(g),k=e.innerR,l=0.08/h,m=k&&0.1/k||0;if(g-f===0)return["x"];else 2*xa-g+fj&&(c=!1)):h+k>m&&(h=m-k,d&&h+l0&&b.height>0){f= +C({align:c&&k&&"center",x:c?!k&&4:10,verticalAlign:!c&&k&&"middle",y:c?k?16:10:k?6:-4,rotation:c&&!k&&90},f);if(!g)a.label=g=t.text(f.text,0,0).attr({align:f.textAlign||f.align,rotation:f.rotation,zIndex:y}).css(f.style).add();b=[r[1],r[4],p(r[6],r[1])];r=[r[2],r[5],p(r[7],r[2])];c=Ma(b);k=Ma(r);g.align(f,!1,{x:c,y:k,width:za(b)-c,height:za(r)-k});g.show()}else g&&g.hide();return a},destroy:function(){ya(this.axis.plotLinesAndBands,this);Aa(this,this.axis)}};Hb.prototype={destroy:function(){Aa(this, +this.axis)},setTotal:function(a){this.cum=this.total=a},render:function(a){var b=this.options.formatter.call(this);this.label?this.label.attr({text:b,visibility:"hidden"}):this.label=this.axis.chart.renderer.text(b,0,0).css(this.options.style).attr({align:this.textAlign,rotation:this.options.rotation,visibility:"hidden"}).add(a)},setOffset:function(a,b){var c=this.axis,d=c.chart,e=d.inverted,f=this.isNegative,g=c.translate(this.total,0,0,0,1),c=c.translate(0),c=N(g-c),h=d.xAxis[0].translate(this.x)+ +a,d=d.plotHeight,e={x:e?f?g:g-c:h,y:e?d-h-b:f?d-g-c:d-g,width:e?c:b,height:e?b:c};this.label&&this.label.align(this.alignOptions,null,e).attr({visibility:"visible"})}};ob.prototype={defaultOptions:{dateTimeLabelFormats:{millisecond:"%H:%M:%S.%L",second:"%H:%M:%S",minute:"%H:%M",hour:"%H:%M",day:"%e. %b",week:"%e. %b",month:"%b '%y",year:"%Y"},endOnTick:!1,gridLineColor:"#C0C0C0",labels:F,lineColor:"#C0D0E0",lineWidth:1,minPadding:0.01,maxPadding:0.01,minorGridLineColor:"#E0E0E0",minorGridLineWidth:1, +minorTickColor:"#A0A0A0",minorTickLength:2,minorTickPosition:"outside",startOfWeek:1,startOnTick:!1,tickColor:"#C0D0E0",tickLength:5,tickmarkPlacement:"between",tickPixelInterval:100,tickPosition:"outside",tickWidth:1,title:{align:"middle",style:{color:"#6D869F",fontWeight:"bold"}},type:"linear"},defaultYAxisOptions:{endOnTick:!0,gridLineWidth:1,tickPixelInterval:72,showLastLabel:!0,labels:{align:"right",x:-8,y:3},lineWidth:0,maxPadding:0.05,minPadding:0.05,startOnTick:!0,tickWidth:0,title:{rotation:270, +text:"Y-values"},stackLabels:{enabled:!1,formatter:function(){return this.total},style:F.style}},defaultLeftAxisOptions:{labels:{align:"right",x:-8,y:null},title:{rotation:270}},defaultRightAxisOptions:{labels:{align:"left",x:8,y:null},title:{rotation:90}},defaultBottomAxisOptions:{labels:{align:"center",x:0,y:14},title:{rotation:0}},defaultTopAxisOptions:{labels:{align:"center",x:0,y:-5},title:{rotation:0}},init:function(a,b){var c=b.isX;this.horiz=a.inverted?!c:c;this.xOrY=(this.isXAxis=c)?"x": +"y";this.opposite=b.opposite;this.side=this.horiz?this.opposite?0:2:this.opposite?1:3;this.setOptions(b);var d=this.options,e=d.type,f=e==="datetime";this.labelFormatter=d.labels.formatter||this.defaultLabelFormatter;this.staggerLines=this.horiz&&d.labels.staggerLines;this.userOptions=b;this.minPixelPadding=0;this.chart=a;this.reversed=d.reversed;this.categories=d.categories;this.isLog=e==="logarithmic";this.isLinked=u(d.linkedTo);this.isDatetimeAxis=f;this.tickmarkOffset=d.categories&&d.tickmarkPlacement=== +"between"?0.5:0;this.ticks={};this.minorTicks={};this.plotLinesAndBands=[];this.alternateBands={};this.len=0;this.minRange=this.userMinRange=d.minRange||d.maxZoom;this.range=d.range;this.offset=d.offset||0;this.stacks={};this.min=this.max=null;var g,d=this.options.events;a.axes.push(this);a[c?"xAxis":"yAxis"].push(this);this.series=[];if(a.inverted&&c&&this.reversed===x)this.reversed=!0;this.removePlotLine=this.removePlotBand=this.removePlotBandOrLine;this.addPlotLine=this.addPlotBand=this.addPlotBandOrLine; +for(g in d)H(this,g,d[g]);if(this.isLog)this.val2lin=na,this.lin2val=ca},setOptions:function(a){this.options=C(this.defaultOptions,this.isXAxis?{}:this.defaultYAxisOptions,[this.defaultTopAxisOptions,this.defaultRightAxisOptions,this.defaultBottomAxisOptions,this.defaultLeftAxisOptions][this.side],C(O[this.isXAxis?"xAxis":"yAxis"],a))},defaultLabelFormatter:function(){var a=this.axis,b=this.value,c=this.dateTimeLabelFormat,d=O.lang.numericSymbols,e=d&&d.length,f,g=a.isLog?b:a.tickInterval;if(a.categories)f= +b;else if(c)f=cb(c,b);else if(e&&g>=1E3)for(;e--&&f===x;)a=Math.pow(1E3,e+1),g>=a&&d[e]!==null&&(f=Ia(b/a,-1)+d[e]);f===x&&(f=b>=1E3?Ia(b,0):Ia(b,-1));return f},getSeriesExtremes:function(){var a=this,b=a.chart,c=a.stacks,d=[],e=[],f;a.hasVisibleSeries=!1;a.dataMin=a.dataMax=null;n(a.series,function(g){if(g.visible||!b.options.chart.ignoreHiddenSeries){var h=g.options,i,j,k,l,m,o,r,n,q,y=h.threshold,t,s=[],w=0;a.hasVisibleSeries=!0;if(a.isLog&&y<=0)y=h.threshold=null;if(a.isXAxis){if(h=g.xData,h.length)a.dataMin= +P(p(a.dataMin,h[0]),Ma(h)),a.dataMax=v(p(a.dataMax,h[0]),za(h))}else{var I,J,Q,C=g.cropped,Ea=g.xAxis.getExtremes(),A=!!g.modifyValue;i=h.stacking;a.usePercentage=i==="percent";if(i)m=h.stack,l=g.type+p(m,""),o="-"+l,g.stackKey=l,j=d[l]||[],d[l]=j,k=e[o]||[],e[o]=k;if(a.usePercentage)a.dataMin=0,a.dataMax=99;h=g.processedXData;r=g.processedYData;t=r.length;for(f=0;f=Ea.min&&(h[f-1]||n)<=Ea.max))if(n=q.length)for(;n--;)q[n]!==null&&(s[w++]=q[n]);else s[w++]=q;if(!a.usePercentage&&s.length)a.dataMin=P(p(a.dataMin,s[0]),Ma(s)),a.dataMax=v(p(a.dataMax,s[0]),za(s));if(u(y))if(a.dataMin>=y)a.dataMin=y,a.ignoreMinPadding=!0;else if(a.dataMaxe+this.width)l=!0}else if(c=e,h=k-this.right,gf+this.height)l=!0;return l?null:d.renderer.crispLine(["M",c,g,"L",h,i],b||0)},getPlotBandPath:function(a,b){var c=this.getPlotLinePath(b),d=this.getPlotLinePath(a);d&&c?d.push(c[4],c[5],c[1],c[2]):d=null;return d},getLinearTickPositions:function(a,b,c){for(var d,b=ja(V(b/a)*a),c=ja(wa(c/a)*a),e=[];b<=c;){e.push(b);b=ja(b+a);if(b===d)break;d=b}return e},getLogTickPositions:function(a,b,c,d){var e= +this.options,f=this.len,g=[];if(!d)this._minorAutoInterval=null;if(a>=0.5)a=t(a),g=this.getLinearTickPositions(a,b,c);else if(a>=0.08)for(var f=V(b),h,i,j,k,l,e=a>0.3?[1,2,4]:a>0.15?[1,2,4,6,8]:[1,2,3,4,5,6,7,8,9];fb&&g.push(k),k>c&&(l=!0),k=j}else if(b=ca(b),c=ca(c),a=e[d?"minorTickInterval":"tickInterval"],a=p(a==="auto"?null:a,this._minorAutoInterval,(c-b)*(e.tickPixelInterval/(d?5:1))/((d?f/this.tickPositions.length:f)||1)),a=hb(a, +null,K.pow(10,V(K.log(a)/K.LN10))),g=Sa(this.getLinearTickPositions(a,b,c),na),!d)this._minorAutoInterval=a/5;if(!d)this.tickInterval=a;return g},getMinorTickPositions:function(){var a=this.tickPositions,b=this.minorTickInterval,c=[],d,e;if(this.isLog){e=a.length;for(d=1;d= +this.minRange,f,g,h,i,j;if(this.isXAxis&&this.minRange===x&&!this.isLog)u(a.min)||u(a.max)?this.minRange=null:(n(this.series,function(a){i=a.xData;for(g=j=a.xIncrement?1:i.length-1;g>0;g--)if(h=i[g]-i[g-1],f===x||h0||!b.ignoreMaxPadding))b.max+=c*j}b.tickInterval=b.min===b.max||b.min===void 0||b.max===void 0?1:h&&!l&&o===b.linkedParent.options.tickPixelInterval? +b.linkedParent.tickInterval:p(l,r?1:(b.max-b.min)*o/(b.len||1));g&&!a&&n(b.series,function(a){a.processData(b.min!==b.oldMin||b.max!==b.oldMax)});b.setAxisTranslation(a);b.beforeSetTickPositions&&b.beforeSetTickPositions();if(b.postProcessTickInterval)b.tickInterval=b.postProcessTickInterval(b.tickInterval);if(!l&&b.tickIntervale&&i.shift(),d.endOnTick?b.max=f:b.max+hb[d]&&this.options.alignTicks!==!1)b[d]=c.length;a.maxTicks=b},adjustTickAmount:function(){var a=this.xOrY,b=this.tickPositions,c=this.chart.maxTicks;if(c&&c[a]&&!this.isDatetimeAxis&&!this.categories&&!this.isLinked&&this.options.alignTicks!==!1){var d=this.tickAmount,e=b.length;this.tickAmount=a=c[a];if(ea||a===null?a=c:b=a.min&&b<=a.max)j[b]||(j[b]=new Pa(a,b)),y&&j[b].isNew&&j[b].render(c,!0),j[b].isActive=!0,j[b].render(c)}),o&&n(g,function(b,c){if(c%2===0&&b1||N(b-f.y)>1)?function(){e.move(a,b,c,d)}:null},hide:function(){if(!this.isHidden){var a=this.chart.hoverPoints; +this.label.hide();a&&n(a,function(a){a.setState()});this.chart.hoverPoints=null;this.isHidden=!0}},hideCrosshairs:function(){n(this.crosshairs,function(a){a&&a.hide()})},getAnchor:function(a,b){var c,d=this.chart,e=d.inverted,f=0,g=0,h,a=oa(a);c=a[0].tooltipPos;c||(n(a,function(a){h=a.series.yAxis;f+=a.plotX;g+=(a.plotLow?(a.plotLow+a.plotHigh)/2:a.plotY)+(!e&&h?h.top-d.plotTop:0)}),f/=a.length,g/=a.length,c=[e?d.plotWidth-g:f,this.shared&&!e&&a.length>1&&b?b.chartY-d.plotTop:e?d.plotHeight-f:g]); +return Sa(c,t)},getPosition:function(a,b,c){var d=this.chart,e=d.plotLeft,f=d.plotTop,g=d.plotWidth,h=d.plotHeight,i=p(this.options.distance,12),j=c.plotX,c=c.plotY,d=j+e+(d.inverted?i:-a-i),k=c-b+f+15,l;d<7&&(d=e+j+i);d+a>e+g&&(d-=d+a-(e+g),k=c-b+f-i,l=!0);k=k&&c<=k+b&&(k=c+f+i));k+b>f+h&&(k=v(f,f+h-b-i));return{x:d,y:k}},refresh:function(a,b){function c(){var a=this.points||oa(this),b=a[0].series,c;c=[b.tooltipHeaderFormatter(a[0].key)];n(a,function(a){b=a.series;c.push(b.tooltipFormatter&& +b.tooltipFormatter(a)||a.point.tooltipFormatter(b.tooltipOptions.pointFormat))});c.push(f.footerFormat||"");return c.join("")}var d=this.chart,e=this.label,f=this.options,g,h,i,j={},k,l=[];k=f.formatter||c;var j=d.hoverPoints,m,o=f.crosshairs;i=this.shared;h=this.getAnchor(a,b);g=h[0];h=h[1];i&&(!a.series||!a.series.noSharedTooltip)?(d.hoverPoints=a,j&&n(j,function(a){a.setState()}),n(a,function(a){a.setState("hover");l.push(a.getLabelConfig())}),j={x:a[0].category,y:a[0].y},j.points=l,a=a[0]):j= +a.getLabelConfig();k=k.call(j);j=a.series;i=i||!j.isCartesian||j.tooltipOutsidePlot||d.isInsidePlot(g,h);k===!1||!i?this.hide():(this.isHidden&&e.show(),e.attr({text:k}),m=f.borderColor||a.color||j.color||"#606060",e.attr({stroke:m}),e=(f.positioner||this.getPosition).call(this,e.width,e.height,{plotX:g,plotY:h}),this.move(t(e.x),t(e.y),g+d.plotLeft,h+d.plotTop),this.isHidden=!1);if(o){o=oa(o);for(e=o.length;e--;)if(i=a.series[e?"yAxis":"xAxis"],o[e]&&i)if(i=i.getPlotLinePath(e?p(a.stackY,a.y):a.x, +1),this.crosshairs[e])this.crosshairs[e].attr({d:i,visibility:"visible"});else{j={"stroke-width":o[e].width||1,stroke:o[e].color||"#C0C0C0",zIndex:o[e].zIndex||2};if(o[e].dashStyle)j.dashstyle=o[e].dashStyle;this.crosshairs[e]=d.renderer.path(i).attr(j).add()}}E(d,"tooltipRefresh",{text:k,x:g+d.plotLeft,y:h+d.plotTop,borderColor:m})},tick:function(){this.tooltipTick&&this.tooltipTick()}};qb.prototype={normalizeMouseEvent:function(a){var b,c,d,a=a||L.event;if(!a.target)a.target=a.srcElement;a=Lb(a); +d=a.touches?a.touches.item(0):a;this.chartPosition=b=Sb(this.chart.container);d.pageX===x?(c=a.x,b=a.y):(c=d.pageX-b.left,b=d.pageY-b.top);return s(a,{chartX:t(c),chartY:t(b)})},getMouseCoordinates:function(a){var b={xAxis:[],yAxis:[]},c=this.chart;n(c.axes,function(d){var e=d.isXAxis;b[e?"xAxis":"yAxis"].push({axis:d,value:d.translate(((c.inverted?!e:e)?a.chartX-c.plotLeft:d.top+d.len-a.chartY)-d.minPixelPadding,!0)})});return b},getIndex:function(a){var b=this.chart;return b.inverted?b.plotHeight+ +b.plotTop-a.chartY:a.chartX-b.plotLeft},onmousemove:function(a){var b=this.chart,c=b.series,d=b.tooltip,e,f=b.hoverPoint,g=b.hoverSeries,h,i,j=b.chartWidth,k=this.getIndex(a);if(d&&this.options.tooltip.shared&&(!g||!g.noSharedTooltip)){e=[];h=c.length;for(i=0;i +j&&e.splice(h,1);if(e.length&&e[0].plotX!==this.hoverX)d.refresh(e,a),this.hoverX=e[0].plotX}if(g&&g.tracker&&(b=g.tooltipPoints[k])&&b!==f)b.onMouseOver()},resetTracker:function(a){var b=this.chart,c=b.hoverSeries,d=b.hoverPoint,e=b.tooltip,b=e&&e.shared?b.hoverPoints:d;(a=a&&e&&b)&&oa(b)[0].plotX===x&&(a=!1);if(a)e.refresh(b);else{if(d)d.onMouseOut();if(c)c.onMouseOut();e&&(e.hide(),e.hideCrosshairs());this.hoverX=null}},setDOMEvents:function(){function a(){if(b.selectionMarker){var f={xAxis:[], +yAxis:[]},g=b.selectionMarker.getBBox(),h=g.x-c.plotLeft,l=g.y-c.plotTop,m;e&&(n(c.axes,function(a){if(a.options.zoomEnabled!==!1){var b=a.isXAxis,d=c.inverted?!b:b,e=a.translate(d?h:c.plotHeight-l-g.height,!0,0,0,1),d=a.translate((d?h+g.width:c.plotHeight-l)-2*a.minPixelPadding,!0,0,0,1);!isNaN(e)&&!isNaN(d)&&(f[b?"xAxis":"yAxis"].push({axis:a,min:P(e,d),max:v(e,d)}),m=!0)}}),m&&E(c,"selection",f,function(a){c.zoom(a)}));b.selectionMarker=b.selectionMarker.destroy()}if(c)G(d,{cursor:"auto"}),c.cancelClick= +e,c.mouseIsDown=e=!1;U(z,ga?"touchend":"mouseup",a)}var b=this,c=b.chart,d=c.container,e,f=b.zoomX&&!c.inverted||b.zoomY&&c.inverted,g=b.zoomY&&!c.inverted||b.zoomX&&c.inverted;b.hideTooltipOnMouseMove=function(a){a=Lb(a);b.chartPosition&&c.hoverSeries&&c.hoverSeries.isCartesian&&!c.isInsidePlot(a.pageX-b.chartPosition.left-c.plotLeft,a.pageY-b.chartPosition.top-c.plotTop)&&b.resetTracker()};b.hideTooltipOnMouseLeave=function(){b.resetTracker();b.chartPosition=null};d.onmousedown=function(d){d=b.normalizeMouseEvent(d); +!ga&&d.preventDefault&&d.preventDefault();c.mouseIsDown=!0;c.cancelClick=!1;c.mouseDownX=b.mouseDownX=d.chartX;b.mouseDownY=d.chartY;H(z,ga?"touchend":"mouseup",a)};var h=function(a){if(!a||!(a.touches&&a.touches.length>1)){a=b.normalizeMouseEvent(a);if(!ga)a.returnValue=!1;var d=a.chartX,h=a.chartY,l=!c.isInsidePlot(d-c.plotLeft,h-c.plotTop);ga&&a.type==="touchstart"&&(B(a.target,"isTracker")?c.runTrackerClick||a.preventDefault():!c.runChartClick&&!l&&a.preventDefault());if(l)dc.plotLeft+c.plotWidth&&(d=c.plotLeft+c.plotWidth),hc.plotTop+c.plotHeight&&(h=c.plotTop+c.plotHeight);if(c.mouseIsDown&&a.type!=="touchstart"&&(e=Math.sqrt(Math.pow(b.mouseDownX-d,2)+Math.pow(b.mouseDownY-h,2)),e>10)){var m=c.isInsidePlot(b.mouseDownX-c.plotLeft,b.mouseDownY-c.plotTop);if(c.hasCartesianSeries&&(b.zoomX||b.zoomY)&&m&&!b.selectionMarker)b.selectionMarker=c.renderer.rect(c.plotLeft,c.plotTop,f?1:c.plotWidth,g?1:c.plotHeight,0).attr({fill:b.options.chart.selectionMarkerFill|| +"rgba(69,114,167,0.25)",zIndex:7}).add();if(b.selectionMarker&&f){var o=d-b.mouseDownX;b.selectionMarker.attr({width:N(o),x:(o>0?0:o)+b.mouseDownX})}b.selectionMarker&&g&&(h-=b.mouseDownY,b.selectionMarker.attr({height:N(h),y:(h>0?0:h)+b.mouseDownY}));m&&!b.selectionMarker&&b.options.chart.panning&&c.pan(d)}if(!l)b.onmousemove(a);return l||!c.hasCartesianSeries}};d.onmousemove=h;H(d,"mouseleave",b.hideTooltipOnMouseLeave);H(z,"mousemove",b.hideTooltipOnMouseMove);d.ontouchstart=function(a){if(b.zoomX|| +b.zoomY)d.onmousedown(a);h(a)};d.ontouchmove=h;d.ontouchend=function(){e&&b.resetTracker()};d.onclick=function(a){var d=c.hoverPoint,e,f,a=b.normalizeMouseEvent(a);a.cancelBubble=!0;if(!c.cancelClick)d&&(B(a.target,"isTracker")||B(a.target.parentNode,"isTracker"))?(e=d.plotX,f=d.plotY,s(d,{pageX:b.chartPosition.left+c.plotLeft+(c.inverted?c.plotWidth-f:e),pageY:b.chartPosition.top+c.plotTop+(c.inverted?c.plotHeight-e:f)}),E(d.series,"click",s(a,{point:d})),d.firePointEvent("click",a)):(s(a,b.getMouseCoordinates(a)), +c.isInsidePlot(a.chartX-c.plotLeft,a.chartY-c.plotTop)&&E(c,"click",a))}},destroy:function(){var a=this.chart,b=a.container;if(a.trackerGroup)a.trackerGroup=a.trackerGroup.destroy();U(b,"mouseleave",this.hideTooltipOnMouseLeave);U(z,"mousemove",this.hideTooltipOnMouseMove);b.onclick=b.onmousedown=b.onmousemove=b.ontouchstart=b.ontouchend=b.ontouchmove=null;clearInterval(this.tooltipInterval)},init:function(a,b){if(!a.trackerGroup)a.trackerGroup=a.renderer.g("tracker").attr({zIndex:9}).add();if(b.enabled)a.tooltip= +new pb(a,b),this.tooltipInterval=setInterval(function(){a&&a.tooltip&&a.tooltip.tick()},32);this.setDOMEvents()}};rb.prototype={init:function(a){var b=this,c=b.options=a.options.legend;if(c.enabled){var d=c.itemStyle,e=p(c.padding,8),f=c.itemMarginTop||0;b.baseline=A(d.fontSize)+3+f;b.itemStyle=d;b.itemHiddenStyle=C(d,c.itemHiddenStyle);b.itemMarginTop=f;b.padding=e;b.initialItemX=e;b.initialItemY=e-5;b.maxItemWidth=0;b.chart=a;b.itemHeight=0;b.lastLineHeight=0;b.render();H(b.chart,"endResize",function(){b.positionCheckboxes()})}}, +colorizeItem:function(a,b){var c=this.options,d=a.legendItem,e=a.legendLine,f=a.legendSymbol,g=this.itemHiddenStyle.color,c=b?c.itemStyle.color:g,g=b?a.color:g;d&&d.css({fill:c});e&&e.attr({stroke:g});f&&f.attr({stroke:g,fill:g})},positionItem:function(a){var b=this.options,c=b.symbolPadding,b=!b.rtl,d=a._legendItemPos,e=d[0],d=d[1],f=a.checkbox;a.legendGroup&&a.legendGroup.translate(b?e:this.legendWidth-e-2*c-4,d);if(f)f.x=e,f.y=d},destroyItem:function(a){var b=a.checkbox;n(["legendItem","legendLine", +"legendSymbol","legendGroup"],function(b){a[b]&&a[b].destroy()});b&&Na(a.checkbox)},destroy:function(){var a=this.group,b=this.box;if(b)this.box=b.destroy();if(a)this.group=a.destroy()},positionCheckboxes:function(){var a=this;n(a.allItems,function(b){var c=b.checkbox,d=a.group.alignAttr;c&&G(c,{left:d.translateX+b.legendItemWidth+c.x-20+"px",top:d.translateY+c.y+3+"px"})})},renderItem:function(a){var q;var b=this,c=b.chart,d=c.renderer,e=b.options,f=e.layout==="horizontal",g=e.symbolWidth,h=e.symbolPadding, +i=b.itemStyle,j=b.itemHiddenStyle,k=b.padding,l=!e.rtl,m=e.width,o=e.itemMarginBottom||0,r=b.itemMarginTop,p=b.initialItemX,n=a.legendItem,y=a.series||a,u=y.options,t=u.showCheckbox;if(!n&&(a.legendGroup=d.g("legend-item").attr({zIndex:1}).add(b.scrollGroup),y.drawLegendSymbol(b,a),a.legendItem=n=d.text(e.labelFormatter.call(a),l?g+h:-h,b.baseline,e.useHTML).css(C(a.visible?i:j)).attr({align:l?"left":"right",zIndex:2}).add(a.legendGroup),a.legendGroup.on("mouseover",function(){a.setState("hover"); +n.css(b.options.itemHoverStyle)}).on("mouseout",function(){n.css(a.visible?i:j);a.setState()}).on("click",function(b){var c=function(){a.setVisible()},b={browserEvent:b};a.firePointEvent?a.firePointEvent("legendItemClick",b,c):E(a,"legendItemClick",b,c)}),b.colorizeItem(a,a.visible),u&&t))a.checkbox=S("input",{type:"checkbox",checked:a.selected,defaultChecked:a.selected},e.itemCheckboxStyle,c.container),H(a.checkbox,"click",function(b){E(a,"checkboxClick",{checked:b.target.checked},function(){a.select()})}); +d=n.getBBox();q=a.legendItemWidth=e.itemWidth||g+h+d.width+k+(t?20:0),e=q;b.itemHeight=g=d.height;if(f&&b.itemX-p+e>(m||c.chartWidth-2*k-p))b.itemX=p,b.itemY+=r+b.lastLineHeight+o,b.lastLineHeight=0;b.maxItemWidth=v(b.maxItemWidth,e);b.lastItemY=r+b.itemY+o;b.lastLineHeight=v(g,b.lastLineHeight);a._legendItemPos=[b.itemX,b.itemY];f?b.itemX+=e:(b.itemY+=r+g+o,b.lastLineHeight=g);b.offsetWidth=m||v(f?b.itemX-p:e,b.offsetWidth)},render:function(){var a=this,b=a.chart,c=b.renderer,d=a.group,e,f,g,h,i= +a.box,j=a.options,k=a.padding,l=j.borderWidth,m=j.backgroundColor;a.itemX=a.initialItemX;a.itemY=a.initialItemY;a.offsetWidth=0;a.lastItemY=0;if(!d)a.group=d=c.g("legend").attr({zIndex:7}).add(),a.contentGroup=c.g().attr({zIndex:1}).add(d),a.scrollGroup=c.g().add(a.contentGroup),a.clipRect=c.clipRect(0,0,9999,b.chartHeight),a.contentGroup.clip(a.clipRect);e=[];n(b.series,function(a){var b=a.options;b.showInLegend&&(e=e.concat(a.legendItems||(b.legendType==="point"?a.data:a)))});Fb(e,function(a,b){return(a.options&& +a.options.legendIndex||0)-(b.options&&b.options.legendIndex||0)});j.reversed&&e.reverse();a.allItems=e;a.display=f=!!e.length;n(e,function(b){a.renderItem(b)});g=j.width||a.offsetWidth;h=a.lastItemY+a.lastLineHeight;h=a.handleOverflow(h);if(l||m){g+=k;h+=k;if(i){if(g>0&&h>0)i[i.isNew?"attr":"animate"](i.crisp(null,null,null,g,h)),i.isNew=!1}else a.box=i=c.rect(0,0,g,h,j.borderRadius,l||0).attr({stroke:j.borderColor,"stroke-width":l||0,fill:m||T}).add(d).shadow(j.shadow),i.isNew=!0;i[f?"show":"hide"]()}a.legendWidth= +g;a.legendHeight=h;n(e,function(b){a.positionItem(b)});f&&d.align(s({width:g,height:h},j),!0,b.spacingBox);b.isResizing||this.positionCheckboxes()},handleOverflow:function(a){var b=this,c=this.chart,d=c.renderer,e=this.options,f=e.y,f=c.spacingBox.height+(e.verticalAlign==="top"?-f:f)-this.padding,g=e.maxHeight,h=this.clipRect,i=e.navigation,j=p(i.animation,!0),k=i.arrowSize||12,l=this.nav;e.layout==="horizontal"&&(f/=2);g&&(f=P(f,g));if(a>f){this.clipHeight=c=f-20;this.pageCount=wa(a/c);this.currentPage= +p(this.currentPage,1);this.fullHeight=a;h.attr({height:c});if(!l)this.nav=l=d.g().attr({zIndex:1}).add(this.group),this.up=d.symbol("triangle",0,0,k,k).on("click",function(){b.scroll(-1,j)}).add(l),this.pager=d.text("",15,10).css(i.style).add(l),this.down=d.symbol("triangle-down",0,0,k,k).on("click",function(){b.scroll(1,j)}).add(l);b.scroll(0);a=f}else l&&(h.attr({height:c.chartHeight}),l.hide(),this.scrollGroup.attr({translateY:1}));return a},scroll:function(a,b){var c=this.pageCount,d=this.currentPage+ +a,e=this.clipHeight,f=this.options.navigation,g=f.activeColor,f=f.inactiveColor,h=this.pager,i=this.padding;d>c&&(d=c);if(d>0)b!==x&&ua(b,this.chart),this.nav.attr({translateX:i,translateY:e+7,visibility:"visible"}),this.up.attr({fill:d===1?f:g}).css({cursor:d===1?"default":"pointer"}),h.attr({text:d+"/"+this.pageCount}),this.down.attr({x:18+this.pager.getBBox().width,fill:d===c?f:g}).css({cursor:d===c?"default":"pointer"}),this.scrollGroup.animate({translateY:-P(e*(d-1),this.fullHeight-e+i)+1}), +h.attr({text:d+"/"+c}),this.currentPage=d}};sb.prototype={initSeries:function(a){var b=this.options.chart,b=new ba[a.type||b.type||b.defaultSeriesType];b.init(this,a);return b},addSeries:function(a,b,c){var d,e=this;a&&(ua(c,e),b=p(b,!0),E(e,"addSeries",{options:a},function(){d=e.initSeries(a);e.isDirtyLegend=!0;b&&e.redraw()}));return d},isInsidePlot:function(a,b,c){var d=c?b:a,a=c?a:b;return d>=0&&d<=this.plotWidth&&a>=0&&a<=this.plotHeight},adjustTickAmounts:function(){this.options.chart.alignTicks!== +!1&&n(this.axes,function(a){a.adjustTickAmount()});this.maxTicks=null},redraw:function(a){var b=this.axes,c=this.series,d=this.tracker,e=this.legend,f=this.isDirtyLegend,g,h=this.isDirtyBox,i=c.length,j=i,k=this.renderer,l=k.isHidden();ua(a,this);for(l&&this.cloneRenderTo();j--;)if(a=c[j],a.isDirty&&a.options.stacking){g=!0;break}if(g)for(j=i;j--;)if(a=c[j],a.options.stacking)a.isDirty=!0;n(c,function(a){a.isDirty&&a.options.legendType==="point"&&(f=!0)});if(f&&e.options.enabled)e.render(),this.isDirtyLegend= +!1;if(this.hasCartesianSeries){if(!this.isResizing)this.maxTicks=null,n(b,function(a){a.setScale()});this.adjustTickAmounts();this.getMargins();n(b,function(a){if(a.isDirtyExtremes)a.isDirtyExtremes=!1,E(a,"afterSetExtremes",a.getExtremes());if(a.isDirty||h||g)a.redraw(),h=!0})}h&&this.drawChartBox();n(c,function(a){a.isDirty&&a.visible&&(!a.isCartesian||a.xAxis)&&a.redraw()});d&&d.resetTracker&&d.resetTracker(!0);k.draw();E(this,"redraw");l&&this.cloneRenderTo(!0)},showLoading:function(a){var b= +this.options,c=this.loadingDiv,d=b.loading;if(!c)this.loadingDiv=c=S(ia,{className:"highcharts-loading"},s(d.style,{left:this.plotLeft+"px",top:this.plotTop+"px",width:this.plotWidth+"px",height:this.plotHeight+"px",zIndex:10,display:T}),this.container),this.loadingSpan=S("span",null,d.labelStyle,c);this.loadingSpan.innerHTML=a||b.lang.loading;if(!this.loadingShown)G(c,{opacity:0,display:""}),xb(c,{opacity:d.style.opacity},{duration:d.showDuration||0}),this.loadingShown=!0},hideLoading:function(){var a= +this.options,b=this.loadingDiv;b&&xb(b,{opacity:0},{duration:a.loading.hideDuration||100,complete:function(){G(b,{display:T})}});this.loadingShown=!1},get:function(a){var b=this.axes,c=this.series,d,e;for(d=0;dP(e.dataMin,e.min)&&c19?this.containerHeight:400)},cloneRenderTo:function(a){var b=this.renderToClone,c=this.container;a?b&&(this.renderTo.appendChild(c),Na(b),delete this.renderToClone):(c&&this.renderTo.removeChild(c),this.renderToClone=b=this.renderTo.cloneNode(0),G(b,{position:"absolute",top:"-9999px",display:"block"}),z.body.appendChild(b),c&&b.appendChild(c))},getContainer:function(){var a, +b=this.options.chart,c,d,e;this.renderTo=a=b.renderTo;e="highcharts-"+ub++;if(ma(a))this.renderTo=a=z.getElementById(a);a||$a(13,!0);a.innerHTML="";a.offsetWidth||this.cloneRenderTo();this.getChartSize();c=this.chartWidth;d=this.chartHeight;this.container=a=S(ia,{className:"highcharts-container"+(b.className?" "+b.className:""),id:e},s({position:"relative",overflow:"hidden",width:c+"px",height:d+"px",textAlign:"left",lineHeight:"normal",zIndex:0},b.style),this.renderToClone||a);this.renderer=b.forExport? +new ra(a,c,d,!0):new Ra(a,c,d);$&&this.renderer.create(this,a,c,d)},getMargins:function(){var a=this.options.chart,b=a.spacingTop,c=a.spacingRight,d=a.spacingBottom,a=a.spacingLeft,e,f=this.legend,g=this.optionsMarginTop,h=this.optionsMarginLeft,i=this.optionsMarginRight,j=this.optionsMarginBottom,k=this.chartTitleOptions,l=this.chartSubtitleOptions,m=this.options.legend,o=p(m.margin,10),r=m.x,t=m.y,q=m.align,y=m.verticalAlign;this.resetMargins();e=this.axisOffset;if((this.title||this.subtitle)&& +!u(this.optionsMarginTop))if(l=v(this.title&&!k.floating&&!k.verticalAlign&&k.y||0,this.subtitle&&!l.floating&&!l.verticalAlign&&l.y||0))this.plotTop=v(this.plotTop,l+p(k.margin,15)+b);if(f.display&&!m.floating)if(q==="right"){if(!u(i))this.marginRight=v(this.marginRight,f.legendWidth-r+o+c)}else if(q==="left"){if(!u(h))this.plotLeft=v(this.plotLeft,f.legendWidth+r+o+a)}else if(y==="top"){if(!u(g))this.plotTop=v(this.plotTop,f.legendHeight+t+o+b)}else if(y==="bottom"&&!u(j))this.marginBottom=v(this.marginBottom, +f.legendHeight-t+o+d);this.extraBottomMargin&&(this.marginBottom+=this.extraBottomMargin);this.extraTopMargin&&(this.plotTop+=this.extraTopMargin);this.hasCartesianSeries&&n(this.axes,function(a){a.getOffset()});u(h)||(this.plotLeft+=e[3]);u(g)||(this.plotTop+=e[0]);u(j)||(this.marginBottom+=e[2]);u(i)||(this.marginRight+=e[1]);this.setChartSize()},initReflow:function(){function a(a){var g=c.width||db(d,"width"),h=c.height||db(d,"height"),a=a?a.target:L;if(g&&h&&(a===L||a===z)){if(g!==b.containerWidth|| +h!==b.containerHeight)clearTimeout(e),e=setTimeout(function(){b.resize(g,h,!1)},100);b.containerWidth=g;b.containerHeight=h}}var b=this,c=b.options.chart,d=b.renderTo,e;H(L,"resize",a);H(b,"destroy",function(){U(L,"resize",a)})},resize:function(a,b,c){var d=this,e,f,g=d.resetZoomButton,h=d.title,i=d.subtitle,j;d.isResizing+=1;j=function(){d&&E(d,"endResize",null,function(){d.isResizing-=1})};ua(c,d);d.oldChartHeight=d.chartHeight;d.oldChartWidth=d.chartWidth;if(u(a))d.chartWidth=e=t(a);if(u(b))d.chartHeight= +f=t(b);G(d.container,{width:e+"px",height:f+"px"});d.renderer.setSize(e,f,c);d.plotWidth=e-d.plotLeft-d.marginRight;d.plotHeight=f-d.plotTop-d.marginBottom;d.maxTicks=null;n(d.axes,function(a){a.isDirty=!0;a.setScale()});n(d.series,function(a){a.isDirty=!0});d.isDirtyLegend=!0;d.isDirtyBox=!0;d.getMargins();a=d.spacingBox;h&&h.align(null,null,a);i&&i.align(null,null,a);g&&g.align(null,null,d[g.alignTo]);d.redraw(c);d.oldChartHeight=null;E(d,"resize");Oa===!1?j():setTimeout(j,Oa&&Oa.duration||500)}, +setChartSize:function(){var a=this.inverted,b=this.chartWidth,c=this.chartHeight,d=this.options.chart,e=d.spacingTop,f=d.spacingRight,g=d.spacingBottom,h=d.spacingLeft,i,j,k,l;this.plotLeft=i=t(this.plotLeft);this.plotTop=j=t(this.plotTop);this.plotWidth=k=t(b-i-this.marginRight);this.plotHeight=l=t(c-j-this.marginBottom);this.plotSizeX=a?l:k;this.plotSizeY=a?k:l;this.plotBorderWidth=a=d.plotBorderWidth||0;this.spacingBox={x:h,y:e,width:b-h-f,height:c-e-g};this.plotBox={x:i,y:j,width:k,height:l}; +this.clipBox={x:a/2,y:a/2,width:this.plotSizeX-a,height:this.plotSizeY-a};n(this.axes,function(a){a.setAxisSize();a.setAxisTranslation()})},resetMargins:function(){var a=this.options.chart,b=a.spacingRight,c=a.spacingBottom,d=a.spacingLeft;this.plotTop=p(this.optionsMarginTop,a.spacingTop);this.marginRight=p(this.optionsMarginRight,b);this.marginBottom=p(this.optionsMarginBottom,c);this.plotLeft=p(this.optionsMarginLeft,d);this.axisOffset=[0,0,0,0]},drawChartBox:function(){var a=this.options.chart, +b=this.renderer,c=this.chartWidth,d=this.chartHeight,e=this.chartBackground,f=this.plotBackground,g=this.plotBorder,h=this.plotBGImage,i=a.borderWidth||0,j=a.backgroundColor,k=a.plotBackgroundColor,l=a.plotBackgroundImage,m=a.plotBorderWidth||0,o,p=this.plotLeft,n=this.plotTop,q=this.plotWidth,y=this.plotHeight,t=this.plotBox,u=this.clipRect,w=this.clipBox;o=i+(a.shadow?8:0);if(i||j)if(e)e.animate(e.crisp(null,null,null,c-o,d-o));else{e={fill:j||T};if(i)e.stroke=a.borderColor,e["stroke-width"]=i; +this.chartBackground=b.rect(o/2,o/2,c-o,d-o,a.borderRadius,i).attr(e).add().shadow(a.shadow)}if(k)f?f.animate(t):this.plotBackground=b.rect(p,n,q,y,0).attr({fill:k}).add().shadow(a.plotShadow);if(l)h?h.animate(t):this.plotBGImage=b.image(l,p,n,q,y).add();u?u.animate({width:w.width,height:w.height}):this.clipRect=b.clipRect(w);if(m)g?g.animate(g.crisp(null,p,n,q,y)):this.plotBorder=b.rect(p,n,q,y,0,m).attr({stroke:a.plotBorderColor,"stroke-width":m,zIndex:1}).add();this.isDirtyBox=!1},propFromSeries:function(){var a= +this,b=a.options.chart,c,d=a.options.series,e,f;n(["inverted","angular","polar"],function(g){c=ba[b.type||b.defaultSeriesType];f=a[g]||b[g]||c&&c.prototype[g];for(e=d&&d.length;!f&&e--;)(c=ba[d[e].type])&&c.prototype[g]&&(f=!0);a[g]=f})},render:function(){var a=this,b=a.axes,c=a.renderer,d=a.options,e=d.labels,d=d.credits,f;a.setTitle();a.legend=new rb(a);n(b,function(a){a.setScale()});a.getMargins();a.maxTicks=null;n(b,function(a){a.setTickPositions(!0);a.setMaxTicks()});a.adjustTickAmounts();a.getMargins(); +a.drawChartBox();a.hasCartesianSeries&&n(b,function(a){a.render()});if(!a.seriesGroup)a.seriesGroup=c.g("series-group").attr({zIndex:3}).add();n(a.series,function(a){a.translate();a.setTooltipPoints();a.render()});e.items&&n(e.items,function(b){var d=s(e.style,b.style),f=A(d.left)+a.plotLeft,j=A(d.top)+a.plotTop+12;delete d.left;delete d.top;c.text(b.html,f,j).attr({zIndex:2}).css(d).add()});if(d.enabled&&!a.credits)f=d.href,a.credits=c.text(d.text,0,0).on("click",function(){if(f)location.href=f}).attr({align:d.position.align, +zIndex:8}).css(d.style).add().align(d.position);a.hasRendered=!0},destroy:function(){var a=this,b=a.axes,c=a.series,d=a.container,e,f=d&&d.parentNode;if(a!==null){E(a,"destroy");U(a);for(e=b.length;e--;)b[e]=b[e].destroy();for(e=c.length;e--;)c[e]=c[e].destroy();n("title,subtitle,chartBackground,plotBackground,plotBGImage,plotBorder,seriesGroup,clipRect,credits,tracker,scroller,rangeSelector,legend,resetZoomButton,tooltip,renderer".split(","),function(b){var c=a[b];c&&(a[b]=c.destroy())});if(d)d.innerHTML= +"",U(d),f&&Na(d),d=null;for(e in a)delete a[e];a=a.options=null}},firstRender:function(){var a=this,b=a.options,c=a.callback;if(!fa&&L==L.top&&z.readyState!=="complete"||$&&!L.canvg)$?Mb.push(function(){a.firstRender()},b.global.canvasToolsURL):z.attachEvent("onreadystatechange",function(){z.detachEvent("onreadystatechange",a.firstRender);z.readyState==="complete"&&a.firstRender()});else{a.getContainer();E(a,"init");if(Highcharts.RangeSelector&&b.rangeSelector.enabled)a.rangeSelector=new Highcharts.RangeSelector(a); +a.resetMargins();a.setChartSize();a.propFromSeries();a.getAxes();n(b.series||[],function(b){a.initSeries(b)});if(Highcharts.Scroller&&(b.navigator.enabled||b.scrollbar.enabled))a.scroller=new Highcharts.Scroller(a);a.tracker=new qb(a,b);a.render();a.renderer.draw();c&&c.apply(a,[a]);n(a.callbacks,function(b){b.apply(a,[a])});a.cloneRenderTo(!0);E(a,"load")}},init:function(a){var b=this.options.chart,c;b.reflow!==!1&&H(this,"load",this.initReflow);if(a)for(c in a)H(this,c,a[c]);this.xAxis=[];this.yAxis= +[];this.animation=$?!1:p(b.animation,!0);this.setSize=this.resize;this.pointCount=0;this.counters=new Eb;this.firstRender()}};sb.prototype.callbacks=[];var Ta=function(){};Ta.prototype={init:function(a,b,c){var d=a.chart.counters;this.series=a;this.applyOptions(b,c);this.pointAttr={};if(a.options.colorByPoint)b=a.chart.options.colors,this.color=this.color||b[d.color++],d.wrapColor(b.length);a.chart.pointCount++;return this},applyOptions:function(a,b){var c=this.series,d=typeof a;this.config=a;if(d=== +"number"||a===null)this.y=a;else if(typeof a[0]==="number")this.x=a[0],this.y=a[1];else if(d==="object"&&typeof a.length!=="number"){s(this,a);this.options=a;if(a.dataLabels)c._hasPointLabels=!0;if(a.marker)c._hasPointMarkers=!0}else if(typeof a[0]==="string")this.name=a[0],this.y=a[1];if(this.x===x)this.x=b===x?c.autoIncrement():b},destroy:function(){var a=this.series.chart,b=a.hoverPoints,c;a.pointCount--;if(b&&(this.setState(),ya(b,this),!b.length))a.hoverPoints=null;if(this===a.hoverPoint)this.onMouseOut(); +if(this.graphic||this.dataLabel)U(this),this.destroyElements();this.legendItem&&a.legend.destroyItem(this);for(c in this)this[c]=null},destroyElements:function(){for(var a="graphic,tracker,dataLabel,group,connector,shadowGroup".split(","),b,c=6;c--;)b=a[c],this[b]&&(this[b]=this[b].destroy())},getLabelConfig:function(){return{x:this.category,y:this.y,key:this.name||this.category,series:this.series,point:this,percentage:this.percentage,total:this.total||this.stackTotal}},select:function(a,b){var c= +this,d=c.series.chart,a=p(a,!c.selected);c.firePointEvent(a?"select":"unselect",{accumulate:b},function(){c.selected=a;c.setState(a&&"select");b||n(d.getSelectedPoints(),function(a){if(a.selected&&a!==c)a.selected=!1,a.setState(""),a.firePointEvent("unselect")})})},onMouseOver:function(){var a=this.series,b=a.chart,c=b.tooltip,d=b.hoverPoint;if(d&&d!==this)d.onMouseOut();this.firePointEvent("mouseOver");c&&(!c.shared||a.noSharedTooltip)&&c.refresh(this);this.setState("hover");b.hoverPoint=this},onMouseOut:function(){var a= +this.series.chart,b=a.hoverPoints;if(!b||Rb(this,b)===-1)this.firePointEvent("mouseOut"),this.setState(),a.hoverPoint=null},tooltipFormatter:function(a){var b=this.series,c=b.tooltipOptions,d=a.match(/\{(series|point)\.[a-zA-Z]+\}/g),e=/[{\.}]/,f,g,h,i,j={y:0,open:0,high:0,low:0,close:0,percentage:1,total:1};c.valuePrefix=c.valuePrefix||c.yPrefix;c.valueDecimals=c.valueDecimals||c.yDecimals;c.valueSuffix=c.valueSuffix||c.ySuffix;for(i in d)g=d[i],ma(g)&&g!==a&&(h=(" "+g).split(e),f={point:this,series:b}[h[1]], +h=h[2],f===this&&j.hasOwnProperty(h)?(f=j[h]?h:"value",f=(c[f+"Prefix"]||"")+Ia(this[h],p(c[f+"Decimals"],-1))+(c[f+"Suffix"]||"")):f=f[h],a=a.replace(g,f));return a},update:function(a,b,c){var d=this,e=d.series,f=d.graphic,g,h=e.data,i=h.length,j=e.chart,b=p(b,!0);d.firePointEvent("update",{options:a},function(){d.applyOptions(a);Z(a)&&(e.getAttribs(),f&&f.attr(d.pointAttr[e.state]));for(g=0;ga+1&&b.push(d.slice(a+1,g)),a=g):g===e-1&&b.push(d.slice(a+1,g+1))});this.segments=b},setOptions:function(a){var b=this.chart.options,c=b.plotOptions,d=c[this.type],e=a.data;a.data=null;c=C(d,c.series,a);c.data=a.data=e;this.tooltipOptions=C(b.tooltip,c.tooltip); +d.marker===null&&delete c.marker;return c},getColor:function(){var a=this.options,b=this.chart.options.colors,c=this.chart.counters;this.color=a.color||!a.colorByPoint&&b[c.color++]||"gray";c.wrapColor(b.length)},getSymbol:function(){var a=this.options.marker,b=this.chart,c=b.options.symbols,b=b.counters;this.symbol=a.symbol||c[b.symbol++];if(/^url/.test(this.symbol))a.radius=0;b.wrapSymbol(c.length)},drawLegendSymbol:function(a){var b=this.options,c=b.marker,d=a.options.symbolWidth,e=this.chart.renderer, +f=this.legendGroup,a=a.baseline,g;if(b.lineWidth){g={"stroke-width":b.lineWidth};if(b.dashStyle)g.dashstyle=b.dashStyle;this.legendLine=e.path(["M",0,a-4,"L",d,a-4]).attr(g).add(f)}if(c&&c.enabled)b=c.radius,this.legendSymbol=e.symbol(this.symbol,d/2-b,a-4-b,2*b,2*b).attr(this.pointAttr[""]).add(f)},addPoint:function(a,b,c,d){var e=this.data,f=this.graph,g=this.area,h=this.chart,i=this.xData,j=this.yData,k=f&&f.shift||0,l=this.options.data,m=this.pointClass.prototype;ua(d,h);if(f&&c)f.shift=k+1;if(g){if(c)g.shift= +k+1;g.isArea=!0}b=p(b,!0);d={series:this};m.applyOptions.apply(d,[a]);i.push(d.x);j.push(m.toYData?m.toYData.call(d):d.y);l.push(a);c&&(e[0]&&e[0].remove?e[0].remove(!1):(e.shift(),i.shift(),j.shift(),l.shift()));this.getAttribs();this.isDirtyData=this.isDirty=!0;b&&h.redraw()},setData:function(a,b){var c=this.points,d=this.options,e=this.initialColor,f=this.chart,g=null,h=this.xAxis,i,j=this.pointClass.prototype;this.xIncrement=null;this.pointRange=h&&h.categories?1:d.pointRange;if(u(e))f.counters.color= +e;var e=[],k=[],l=a?a.length:[],m=(i=this.pointArrayMap)&&i.length;if(l>(d.turboThreshold||1E3)){for(i=0;g===null&&ik||this.forceCrop))if(a=i.getExtremes(),i=a.min,k=a.max,b[d-1]k)b=[],c=[];else if(b[0]k){for(a=0;a=i){e=v(0,a-1);break}for(;ak){f=a+1;break}b=b.slice(e,f);c=c.slice(e,f);g=!0}for(a=b.length-1;a>0;a--)if(d=b[a]-b[a-1],d>0&&(h===x||d=0&&c<=d;)i[c++]=g}this.tooltipPoints=i}},tooltipHeaderFormatter:function(a){var b=this.tooltipOptions,c=b.xDateFormat,d=this.xAxis,e=d&&d.options.type==="datetime",f;if(e&& +!c)for(f in D)if(D[f]>=d.closestPointRange){c=b.dateTimeLabelFormats[f];break}return b.headerFormat.replace("{point.key}",e?cb(c,a):a).replace("{series.name}",this.name).replace("{series.color}",this.color)},onMouseOver:function(){var a=this.chart,b=a.hoverSeries;if(b&&b!==this)b.onMouseOut();this.options.events.mouseOver&&E(this,"mouseOver");this.setState("hover");a.hoverSeries=this},onMouseOut:function(){var a=this.options,b=this.chart,c=b.tooltip,d=b.hoverPoint;if(d)d.onMouseOut();this&&a.events.mouseOut&& +E(this,"mouseOut");c&&!a.stickyTracking&&!c.shared&&c.hide();this.setState();b.hoverSeries=null},animate:function(a){var b=this,c=b.chart,d=c.renderer,e;e=b.options.animation;var f=c.clipBox,g=c.inverted,h;if(e&&!Z(e))e=Y[b.type].animation;h="_sharedClip"+e.duration+e.easing;if(a)a=c[h],e=c[h+"m"],a||(c[h]=a=d.clipRect(s(f,{width:0})),c[h+"m"]=e=d.clipRect(-99,g?-c.plotLeft:-c.plotTop,99,g?c.chartWidth:c.chartHeight)),b.group.clip(a),b.markerGroup.clip(e),b.sharedClipKey=h;else{if(a=c[h])a.animate({width:c.plotSizeX}, +e),c[h+"m"].animate({width:c.plotSizeX+99},e);b.animate=null;b.animationTimeout=setTimeout(function(){b.afterAnimate()},e.duration)}},afterAnimate:function(){var a=this.chart,b=this.sharedClipKey,c=this.group;c&&this.options.clip!==!1&&(c.clip(a.clipRect),this.markerGroup.clip());setTimeout(function(){b&&a[b]&&(a[b]=a[b].destroy(),a[b+"m"]=a[b+"m"].destroy())},100)},drawPoints:function(){var a,b=this.points,c=this.chart,d,e,f,g,h,i,j,k,l=this.options.marker,m,o=this.markerGroup;if(l.enabled||this._hasPointMarkers)for(f= +b.length;f--;)if(g=b[f],d=g.plotX,e=g.plotY,k=g.graphic,i=g.marker||{},a=l.enabled&&i.enabled===x||i.enabled,m=c.isInsidePlot(d,e,c.inverted),a&&e!==x&&!isNaN(e))if(a=g.pointAttr[g.selected?"select":""],h=a.r,i=p(i.symbol,this.symbol),j=i.indexOf("url")===0,k)k.attr({visibility:m?fa?"inherit":"visible":"hidden"}).animate(s({x:d-h,y:e-h},k.symbolName?{width:2*h,height:2*h}:{}));else if(m&&(h>0||j))g.graphic=c.renderer.symbol(i,d-h,e-h,2*h,2*h).attr(a).add(o)},convertAttribs:function(a,b,c,d){var e= +this.pointAttrToOptions,f,g,h={},a=a||{},b=b||{},c=c||{},d=d||{};for(f in e)g=e[f],h[f]=p(a[g],b[f],c[f],d[f]);return h},getAttribs:function(){var a=this,b=Y[a.type].marker?a.options.marker:a.options,c=b.states,d=c.hover,e,f=a.color,g={stroke:f,fill:f},h=a.points||[],i=[],j,k=a.pointAttrToOptions,l;a.options.marker?(d.radius=d.radius||b.radius+2,d.lineWidth=d.lineWidth||b.lineWidth+1):d.color=d.color||qa(d.color||f).brighten(d.brightness).get();i[""]=a.convertAttribs(b,g);n(["hover","select"],function(b){i[b]= +a.convertAttribs(c[b],i[""])});a.pointAttr=i;for(f=h.length;f--;){g=h[f];if((b=g.options&&g.options.marker||g.options)&&b.enabled===!1)b.radius=0;e=a.options.colorByPoint;if(g.options)for(l in k)u(b[k[l]])&&(e=!0);if(e){b=b||{};j=[];c=b.states||{};e=c.hover=c.hover||{};if(!a.options.marker)e.color=qa(e.color||g.color).brighten(e.brightness||d.brightness).get();j[""]=a.convertAttribs(s({color:g.color},b),i[""]);j.hover=a.convertAttribs(c.hover,i.hover,j[""]);j.select=a.convertAttribs(c.select,i.select, +j[""])}else j=i;g.pointAttr=j}},destroy:function(){var a=this,b=a.chart,c=/AppleWebKit\/533/.test(Ba),d,e,f=a.data||[],g,h,i;E(a,"destroy");U(a);n(["xAxis","yAxis"],function(b){if(i=a[b])ya(i.series,a),i.isDirty=!0});a.legendItem&&a.chart.legend.destroyItem(a);for(e=f.length;e--;)(g=f[e])&&g.destroy&&g.destroy();a.points=null;clearTimeout(a.animationTimeout);n("area,graph,dataLabelsGroup,group,markerGroup,tracker,trackerGroup".split(","),function(b){a[b]&&(d=c&&b==="group"?"hide":"destroy",a[b][d]())}); +if(b.hoverSeries===a)b.hoverSeries=null;ya(b.series,a);for(h in a)delete a[h]},drawDataLabels:function(){var a=this,b=a.options,c=b.dataLabels;if(c.enabled||a._hasPointLabels){var d,e,f=a.points,g,h,i,j,k=a.chart,l=k.renderer,m=k.inverted,o=a.type,r=b.stacking,s=o==="column"||o==="bar",q=c.verticalAlign===null,y=c.y===null,v=l.fontMetrics(c.style.fontSize),A=v.h,w=v.b;s&&(v={top:w,middle:w-A/2,bottom:-A+w},r?(q&&(c=C(c,{verticalAlign:"middle"})),y&&(c=C(c,{y:v[c.verticalAlign]}))):q?c=C(c,{verticalAlign:"top"}): +y&&(c=C(c,{y:v[c.verticalAlign]})));j=a.plotGroup("dataLabelsGroup","data-labels",a.visible?"visible":"hidden",6);h=c;n(f,function(f){var n,q,y,v,B=f.dataLabel;c=h;(g=f.options)&&g.dataLabels&&(c=C(c,g.dataLabels));if(v=c.enabled)n=f.barX&&f.barX+f.barW/2||p(f.plotX,-999),q=p(f.plotY,-999),y=c.y===null?f.y>=b.threshold?-A+w:w:c.y,d=(m?k.plotWidth-q:n)+c.x,e=t((m?k.plotHeight-n:q)+y);a.isCartesian&&!k.isInsidePlot(d-c.x,e)&&(v=!1);if(B&&!v)f.dataLabel=B.destroy();else if(v){n=c.align;var z;i=c.formatter.call(f.getLabelConfig(), +c);o==="column"&&(d+={left:-1,right:1}[n]*f.barW/2||0);!r&&m&&f.y<0&&(n="right",d-=10);c.style.color=p(c.color,c.style.color,a.color,"black");if(B)B.attr({text:i}).animate({x:d,y:e});else if(u(i)){B={align:n,fill:c.backgroundColor,stroke:c.borderColor,"stroke-width":c.borderWidth,r:c.borderRadius||0,rotation:c.rotation,padding:c.padding,zIndex:1};for(z in B)B[z]===x&&delete B[z];B=f.dataLabel=l[c.rotation?"text":"label"](i,d,e,null,null,null,c.useHTML,!0).attr(B).css(c.style).add(j).shadow(c.shadow)}if(s&& +b.stacking&&B)z=f.barX,n=f.barY,q=f.barW,f=f.barH,B.align(c,null,{x:m?k.plotWidth-n-f:z,y:m?k.plotHeight-z-q:n,width:m?f:q,height:m?q:f})}})}},getSegmentPath:function(a){var b=this,c=[];n(a,function(d,e){b.getPointSpline?c.push.apply(c,b.getPointSpline(a,d,e)):(c.push(e?"L":"M"),e&&b.options.step&&c.push(d.plotX,a[e-1].plotY),c.push(d.plotX,d.plotY))});return c},getGraphPath:function(){var a=this,b=[],c,d=[];n(a.segments,function(e){c=a.getSegmentPath(e);e.length>1?b=b.concat(c):d.push(e[0])});a.singlePoints= +d;return a.graphPath=b},drawGraph:function(){var a=this.options,b=this.graph,c=this.group,d=a.lineColor||this.color,e=a.lineWidth,f=a.dashStyle,g=this.getGraphPath();if(b)eb(b),b.animate({d:g});else if(e){b={stroke:d,"stroke-width":e,zIndex:1};if(f)b.dashstyle=f;this.graph=this.chart.renderer.path(g).attr(b).add(c).shadow(a.shadow)}},invertGroups:function(){function a(){var a={width:b.yAxis.len,height:b.xAxis.len};n(["group","trackerGroup","markerGroup"],function(c){b[c]&&b[c].attr(a).invert()})} +var b=this,c=b.chart;H(c,"resize",a);H(b,"destroy",function(){U(c,"resize",a)});a();b.invertGroups=a},plotGroup:function(a,b,c,d,e){var f=this[a],g=this.chart,h=this.xAxis,i=this.yAxis;f||(this[a]=f=g.renderer.g(b).attr({visibility:c,zIndex:d||0.1}).add(e));f.translate(h?h.left:g.plotLeft,i?i.top:g.plotTop);return f},render:function(){var a=this.chart,b,c=this.options,d=c.animation&&!!this.animate,e=this.visible?"visible":"hidden",f=c.zIndex,g=this.hasRendered,h=a.seriesGroup;b=this.plotGroup("group", +"series",e,f,h);this.markerGroup=this.plotGroup("markerGroup","markers",e,f,h);this.drawDataLabels();d&&this.animate(!0);this.getAttribs();b.inverted=a.inverted;this.drawGraph&&this.drawGraph();this.drawPoints();this.options.enableMouseTracking!==!1&&this.drawTracker();a.inverted&&this.invertGroups();c.clip!==!1&&!this.sharedClipKey&&!g&&(b.clip(a.clipRect),this.trackerGroup&&this.trackerGroup.clip(a.clipRect));d?this.animate():g||this.afterAnimate();this.isDirty=this.isDirtyData=!1;this.hasRendered= +!0},redraw:function(){var a=this.chart,b=this.isDirtyData,c=this.group;c&&(a.inverted&&c.attr({width:a.plotWidth,height:a.plotHeight}),c.animate({translateX:this.xAxis.left,translateY:this.yAxis.top}));this.translate();this.setTooltipPoints(!0);this.render();b&&E(this,"updatedData")},setState:function(a){var b=this.options,c=this.graph,d=b.states,b=b.lineWidth,a=a||"";if(this.state!==a)this.state=a,d[a]&&d[a].enabled===!1||(a&&(b=d[a].lineWidth||b+1),c&&!c.dashstyle&&c.attr({"stroke-width":b},a?0: +500))},setVisible:function(a,b){var c=this.chart,d=this.legendItem,e=this.group,f=this.tracker,g=this.dataLabelsGroup,h=this.markerGroup,i,j=this.points,k=c.options.chart.ignoreHiddenSeries;i=this.visible;i=(this.visible=a=a===x?!i:a)?"show":"hide";if(e)e[i]();if(h)h[i]();if(f)f[i]();else if(j)for(e=j.length;e--;)if(f=j[e],f.tracker)f.tracker[i]();if(g)g[i]();d&&c.legend.colorizeItem(this,a);this.isDirty=!0;this.options.stacking&&n(c.series,function(a){if(a.options.stacking&&a.visible)a.isDirty=!0}); +if(k)c.isDirtyBox=!0;b!==!1&&c.redraw();E(this,i)},show:function(){this.setVisible(!0)},hide:function(){this.setVisible(!1)},select:function(a){this.selected=a=a===x?!this.selected:a;if(this.checkbox)this.checkbox.checked=a;E(this,a?"select":"unselect")},drawTracker:function(){var a=this,b=a.options,c=b.trackByArea,d=[].concat(c?a.areaPath:a.graphPath),e=d.length,f=a.chart,g=f.renderer,h=f.options.tooltip.snap,i=a.tracker,j=b.cursor,j=j&&{cursor:j},k=a.singlePoints,l=this.isCartesian&&this.plotGroup("trackerGroup", +null,"visible",b.zIndex||1,f.trackerGroup),m;if(e&&!c)for(m=e+1;m--;)d[m]==="M"&&d.splice(m+1,0,d[m+1]-h,d[m+2],"L"),(m&&d[m]==="M"||m===e)&&d.splice(m,0,"L",d[m-2]+h,d[m-1]);for(m=0;m=0;d--)da&&i>e?(i=v(a,e),k=2*e-i):ig&&k>e?(k=v(g,e),i=2*e-k):kw?g-w:A-(f<=A?w:0));s(c,{barX:h,barY:i,barW:y,barH:j,pointWidth:q});c.shapeType="rect";c.shapeArgs=f=b.renderer.Element.prototype.crisp.call(0,e,h,i,y,j);e%2&&(f.y-=1,f.height+=1);c.trackerArgs=N(j)<3&&C(c.shapeArgs,{height:6,y:i-3})})},getSymbol:Ca,drawLegendSymbol:F.prototype.drawLegendSymbol, +drawGraph:Ca,drawPoints:function(){var a=this,b=a.options,c=a.chart.renderer,d,e;n(a.points,function(f){var g=f.plotY;if(g!==x&&!isNaN(g)&&f.y!==null)d=f.graphic,e=f.shapeArgs,d?(eb(d),d.animate(C(e))):f.graphic=d=c[f.shapeType](e).attr(f.pointAttr[f.selected?"select":""]).add(a.group).shadow(b.shadow,null,b.stacking&&!b.borderRadius)})},drawTracker:function(){var a=this,b=a.chart,c=b.renderer,d,e,f=+new Date,g=a.options,h=g.cursor,i=h&&{cursor:h},j=a.isCartesian&&a.plotGroup("trackerGroup",null, +"visible",g.zIndex||1,b.trackerGroup),k,l,m;n(a.points,function(h){e=h.tracker;d=h.trackerArgs||h.shapeArgs;l=h.plotY;m=!a.isCartesian||l!==x&&!isNaN(l);delete d.strokeWidth;if(h.y!==null&&m)e?e.attr(d):h.tracker=c[h.shapeType](d).attr({isTracker:f,fill:wb,visibility:a.visible?"visible":"hidden"}).on(ga?"touchstart":"mouseover",function(c){k=c.relatedTarget||c.fromElement;if(b.hoverSeries!==a&&B(k,"isTracker")!==f)a.onMouseOver();h.onMouseOver()}).on("mouseout",function(b){if(!g.stickyTracking&&(k= +b.relatedTarget||b.toElement,B(k,"isTracker")!==f))a.onMouseOut()}).css(i).add(h.group||j)})},animate:function(a){var b=this,c=b.points,d=b.options;if(!a)n(c,function(a){var c=a.graphic,a=a.shapeArgs,g=b.yAxis,h=d.threshold;c&&(c.attr({height:0,y:u(h)?g.getThreshold(h):g.translate(g.getExtremes().min,0,1,0,1)}),c.animate({height:a.height,y:a.y},d.animation))}),b.animate=null},remove:function(){var a=this,b=a.chart;b.hasRendered&&n(b.series,function(b){if(b.type===a.type)b.isDirty=!0});R.prototype.remove.apply(a, +arguments)}});ba.column=Ca;Y.bar=C(Y.column,{dataLabels:{align:"left",x:5,y:null,verticalAlign:"middle"}});ha=da(Ca,{type:"bar",inverted:!0});ba.bar=ha;Y.scatter=C(X,{lineWidth:0,states:{hover:{lineWidth:0}},tooltip:{headerFormat:'{series.name}
',pointFormat:"x: {point.x}
y: {point.y}
"}});ha=da(R,{type:"scatter",sorted:!1,translate:function(){var a=this;R.prototype.translate.apply(a);n(a.points,function(b){b.shapeType= +"circle";b.shapeArgs={x:b.plotX,y:b.plotY,r:a.chart.options.tooltip.snap}})},drawTracker:function(){for(var a=this,b=a.options.cursor,b=b&&{cursor:b},c=a.points,d=c.length,e;d--;)if(e=c[d].graphic)e.element._i=d;a._hasTracking?a._hasTracking=!0:a.markerGroup.attr({isTracker:!0}).on(ga?"touchstart":"mouseover",function(b){a.onMouseOver();if(b.target._i!==x)c[b.target._i].onMouseOver()}).on("mouseout",function(){if(!a.options.stickyTracking)a.onMouseOut()}).css(b)}});ba.scatter=ha;Y.pie=C(X,{borderColor:"#FFFFFF", +borderWidth:1,center:["50%","50%"],colorByPoint:!0,dataLabels:{distance:30,enabled:!0,formatter:function(){return this.point.name},y:5},legendType:"point",marker:null,size:"75%",showInLegend:!1,slicedOffset:10,states:{hover:{brightness:0.1,shadow:!1}}});X={type:"pie",isCartesian:!1,pointClass:da(Ta,{init:function(){Ta.prototype.init.apply(this,arguments);var a=this,b;s(a,{visible:a.visible!==!1,name:p(a.name,"Slice")});b=function(){a.slice()};H(a,"select",b);H(a,"unselect",b);return a},setVisible:function(a){var b= +this.series,c=b.chart,d=this.tracker,e=this.dataLabel,f=this.connector,g=this.shadowGroup,h;h=(this.visible=a=a===x?!this.visible:a)?"show":"hide";this.group[h]();if(d)d[h]();if(e)e[h]();if(f)f[h]();if(g)g[h]();this.legendItem&&c.legend.colorizeItem(this,a);if(!b.isDirty&&b.options.ignoreHiddenPoint)b.isDirty=!0,c.redraw()},slice:function(a,b,c){var d=this.series.chart,e=this.slicedTranslation;ua(c,d);p(b,!0);a=this.sliced=u(a)?a:!this.sliced;a={translateX:a?e[0]:d.plotLeft,translateY:a?e[1]:d.plotTop}; +this.group.animate(a);this.shadowGroup&&this.shadowGroup.animate(a)}}),pointAttrToOptions:{stroke:"borderColor","stroke-width":"borderWidth",fill:"color"},getColor:function(){this.initialColor=this.chart.counters.color},animate:function(){var a=this;n(a.points,function(b){var c=b.graphic,b=b.shapeArgs,d=-xa/2;c&&(c.attr({r:0,start:d,end:d}),c.animate({r:b.r,start:b.start,end:b.end},a.options.animation))});a.animate=null},setData:function(a,b){R.prototype.setData.call(this,a,!1);this.processData(); +this.generatePoints();p(b,!0)&&this.chart.redraw()},getCenter:function(){var a=this.options,b=this.chart,c=b.plotWidth,d=b.plotHeight,a=a.center.concat([a.size,a.innerSize||0]),e=P(c,d),f;return Sa(a,function(a,b){return(f=/%$/.test(a))?[c,d,e,e][b]*A(a)/100:a})},translate:function(){this.generatePoints();var a=0,b=-0.25,c=this.options,d=c.slicedOffset,e=d+c.borderWidth,f,g=this.chart,h,i,j,k=this.points,l=2*xa,m,o,p,s=c.dataLabels.distance,q=c.ignoreHiddenPoint;this.center=f=this.getCenter();this.getX= +function(a,b){j=K.asin((a-f[1])/(f[2]/2+s));return f[0]+(b?-1:1)*W(j)*(f[2]/2+s)};n(k,function(b){a+=q&&!b.visible?0:b.y});n(k,function(c){m=a?c.y/a:0;h=t(b*l*1E3)/1E3;if(!q||c.visible)b+=m;i=t(b*l*1E3)/1E3;c.shapeType="arc";c.shapeArgs={x:f[0],y:f[1],r:f[2]/2,innerR:f[3]/2,start:h,end:i};j=(i+h)/2;c.slicedTranslation=Sa([W(j)*d+g.plotLeft,aa(j)*d+g.plotTop],t);o=W(j)*f[2]/2;p=aa(j)*f[2]/2;c.tooltipPos=[f[0]+o*0.7,f[1]+p*0.7];c.labelPos=[f[0]+o+W(j)*s,f[1]+p+aa(j)*s,f[0]+o+W(j)*e,f[1]+p+aa(j)*e,f[0]+ +o,f[1]+p,s<0?"center":j0,r=[[],[]],s,q,t,u,v=2,w;if(d.enabled||this._hasPointLabels){R.prototype.drawDataLabels.apply(this);n(a,function(a){a.dataLabel&&r[a.labelPos[7]0){for(w=m-l-j;w<=m+l+j;w+=a)x.push(w);t=x.length;if(C>t){h=[].concat(A);h.sort(u);for(w=C;w--;)h[w].rank=w;for(w=C;w--;)A[w].rank>=t&& +A.splice(w,1);C=A.length}for(w=0;w0){if(q=B.pop(),z=q.i,q=q.y,s>q&&x[z+1]!==null||s/g, '') + .split(//g), + childNodes = textNode.childNodes, + styleRegex = /style="([^"]+)"/, + hrefRegex = /href="([^"]+)"/, + parentX = attr(textNode, 'x'), + textStyles = wrapper.styles, + width = textStyles && pInt(textStyles.width), + textLineHeight = textStyles && textStyles.lineHeight, + lastLine, + GET_COMPUTED_STYLE = 'getComputedStyle', + i = childNodes.length, + linePositions = []; + + // Needed in IE9 because it doesn't report tspan's offsetHeight (#893) + function getLineHeightByBBox(lineNo) { + linePositions[lineNo] = textNode.getBBox ? + textNode.getBBox().height : + wrapper.renderer.fontMetrics(textNode.style.fontSize).h; // #990 + return mathRound(linePositions[lineNo] - (linePositions[lineNo - 1] || 0)); + } + + // remove old text + while (i--) { + textNode.removeChild(childNodes[i]); + } + + if (width && !wrapper.added) { + this.box.appendChild(textNode); // attach it to the DOM to read offset width + } + + // remove empty line at end + if (lines[lines.length - 1] === '') { + lines.pop(); + } + + // build the lines + each(lines, function (line, lineNo) { + var spans, spanNo = 0, lineHeight; + + line = line.replace(//g, '|||'); + spans = line.split('|||'); + + each(spans, function (span) { + if (span !== '' || spans.length === 1) { + var attributes = {}, + tspan = doc.createElementNS(SVG_NS, 'tspan'); + if (styleRegex.test(span)) { + attr( + tspan, + 'style', + span.match(styleRegex)[1].replace(/(;| |^)color([ :])/, '$1fill$2') + ); + } + if (hrefRegex.test(span)) { + attr(tspan, 'onclick', 'location.href=\"' + span.match(hrefRegex)[1] + '\"'); + css(tspan, { cursor: 'pointer' }); + } + + span = (span.replace(/<(.|\n)*?>/g, '') || ' ') + .replace(/</g, '<') + .replace(/>/g, '>'); + + // issue #38 workaround. + /*if (reverse) { + arr = []; + i = span.length; + while (i--) { + arr.push(span.charAt(i)); + } + span = arr.join(''); + }*/ + + // add the text node + tspan.appendChild(doc.createTextNode(span)); + + if (!spanNo) { // first span in a line, align it to the left + attributes.x = parentX; + } else { + // Firefox ignores spaces at the front or end of the tspan + attributes.dx = 3; // space + } + + // first span on subsequent line, add the line height + if (!spanNo) { + if (lineNo) { + + // allow getting the right offset height in exporting in IE + if (!hasSVG && wrapper.renderer.forExport) { + css(tspan, { display: 'block' }); + } + + // Webkit and opera sometimes return 'normal' as the line height. In that + // case, webkit uses offsetHeight, while Opera falls back to 18 + lineHeight = win[GET_COMPUTED_STYLE] && + pInt(win[GET_COMPUTED_STYLE](lastLine, null).getPropertyValue('line-height')); + + if (!lineHeight || isNaN(lineHeight)) { + lineHeight = textLineHeight || lastLine.offsetHeight || getLineHeightByBBox(lineNo) || 18; + } + attr(tspan, 'dy', lineHeight); + } + lastLine = tspan; // record for use in next line + } + + // add attributes + attr(tspan, attributes); + + // append it + textNode.appendChild(tspan); + + spanNo++; + + // check width and apply soft breaks + if (width) { + var words = span.replace(/-/g, '- ').split(' '), + tooLong, + actualWidth, + rest = []; + + while (words.length || rest.length) { + delete wrapper.bBox; // delete cache + actualWidth = wrapper.getBBox().width; + tooLong = actualWidth > width; + if (!tooLong || words.length === 1) { // new line needed + words = rest; + rest = []; + if (words.length) { + tspan = doc.createElementNS(SVG_NS, 'tspan'); + attr(tspan, { + dy: textLineHeight || 16, + x: parentX + }); + textNode.appendChild(tspan); + + if (actualWidth > width) { // a single word is pressing it out + width = actualWidth; + } + } + } else { // append to existing line tspan + tspan.removeChild(tspan.firstChild); + rest.unshift(words.pop()); + } + if (words.length) { + tspan.appendChild(doc.createTextNode(words.join(' ').replace(/- /g, '-'))); + } + } + } + } + }); + }); + }, + + /** + * Create a button with preset states + * @param {String} text + * @param {Number} x + * @param {Number} y + * @param {Function} callback + * @param {Object} normalState + * @param {Object} hoverState + * @param {Object} pressedState + */ + button: function (text, x, y, callback, normalState, hoverState, pressedState) { + var label = this.label(text, x, y), + curState = 0, + stateOptions, + stateStyle, + normalStyle, + hoverStyle, + pressedStyle, + STYLE = 'style', + verticalGradient = { x1: 0, y1: 0, x2: 0, y2: 1 }; + + // prepare the attributes + /*jslint white: true*/ + normalState = merge(hash( + STROKE_WIDTH, 1, + STROKE, '#999', + FILL, hash( + LINEAR_GRADIENT, verticalGradient, + STOPS, [ + [0, '#FFF'], + [1, '#DDD'] + ] + ), + 'r', 3, + 'padding', 3, + STYLE, hash( + 'color', 'black' + ) + ), normalState); + /*jslint white: false*/ + normalStyle = normalState[STYLE]; + delete normalState[STYLE]; + + /*jslint white: true*/ + hoverState = merge(normalState, hash( + STROKE, '#68A', + FILL, hash( + LINEAR_GRADIENT, verticalGradient, + STOPS, [ + [0, '#FFF'], + [1, '#ACF'] + ] + ) + ), hoverState); + /*jslint white: false*/ + hoverStyle = hoverState[STYLE]; + delete hoverState[STYLE]; + + /*jslint white: true*/ + pressedState = merge(normalState, hash( + STROKE, '#68A', + FILL, hash( + LINEAR_GRADIENT, verticalGradient, + STOPS, [ + [0, '#9BD'], + [1, '#CDF'] + ] + ) + ), pressedState); + /*jslint white: false*/ + pressedStyle = pressedState[STYLE]; + delete pressedState[STYLE]; + + // add the events + addEvent(label.element, 'mouseenter', function () { + label.attr(hoverState) + .css(hoverStyle); + }); + addEvent(label.element, 'mouseleave', function () { + stateOptions = [normalState, hoverState, pressedState][curState]; + stateStyle = [normalStyle, hoverStyle, pressedStyle][curState]; + label.attr(stateOptions) + .css(stateStyle); + }); + + label.setState = function (state) { + curState = state; + if (!state) { + label.attr(normalState) + .css(normalStyle); + } else if (state === 2) { + label.attr(pressedState) + .css(pressedStyle); + } + }; + + return label + .on('click', function () { + callback.call(label); + }) + .attr(normalState) + .css(extend({ cursor: 'default' }, normalStyle)); + }, + + /** + * Make a straight line crisper by not spilling out to neighbour pixels + * @param {Array} points + * @param {Number} width + */ + crispLine: function (points, width) { + // points format: [M, 0, 0, L, 100, 0] + // normalize to a crisp line + if (points[1] === points[4]) { + // Substract due to #1129. Now bottom and left axis gridlines behave the same. + points[1] = points[4] = mathRound(points[1]) - (width % 2 / 2); + } + if (points[2] === points[5]) { + points[2] = points[5] = mathRound(points[2]) + (width % 2 / 2); + } + return points; + }, + + + /** + * Draw a path + * @param {Array} path An SVG path in array form + */ + path: function (path) { + var attr = { + fill: NONE + }; + if (isArray(path)) { + attr.d = path; + } else if (isObject(path)) { // attributes + extend(attr, path); + } + return this.createElement('path').attr(attr); + }, + + /** + * Draw and return an SVG circle + * @param {Number} x The x position + * @param {Number} y The y position + * @param {Number} r The radius + */ + circle: function (x, y, r) { + var attr = isObject(x) ? + x : + { + x: x, + y: y, + r: r + }; + + return this.createElement('circle').attr(attr); + }, + + /** + * Draw and return an arc + * @param {Number} x X position + * @param {Number} y Y position + * @param {Number} r Radius + * @param {Number} innerR Inner radius like used in donut charts + * @param {Number} start Starting angle + * @param {Number} end Ending angle + */ + arc: function (x, y, r, innerR, start, end) { + // arcs are defined as symbols for the ability to set + // attributes in attr and animate + + if (isObject(x)) { + y = x.y; + r = x.r; + innerR = x.innerR; + start = x.start; + end = x.end; + x = x.x; + } + return this.symbol('arc', x || 0, y || 0, r || 0, r || 0, { + innerR: innerR || 0, + start: start || 0, + end: end || 0 + }); + }, + + /** + * Draw and return a rectangle + * @param {Number} x Left position + * @param {Number} y Top position + * @param {Number} width + * @param {Number} height + * @param {Number} r Border corner radius + * @param {Number} strokeWidth A stroke width can be supplied to allow crisp drawing + */ + rect: function (x, y, width, height, r, strokeWidth) { + + r = isObject(x) ? x.r : r; + + var wrapper = this.createElement('rect').attr({ + rx: r, + ry: r, + fill: NONE + }); + return wrapper.attr( + isObject(x) ? + x : + // do not crispify when an object is passed in (as in column charts) + wrapper.crisp(strokeWidth, x, y, mathMax(width, 0), mathMax(height, 0)) + ); + }, + + /** + * Resize the box and re-align all aligned elements + * @param {Object} width + * @param {Object} height + * @param {Boolean} animate + * + */ + setSize: function (width, height, animate) { + var renderer = this, + alignedObjects = renderer.alignedObjects, + i = alignedObjects.length; + + renderer.width = width; + renderer.height = height; + + renderer.boxWrapper[pick(animate, true) ? 'animate' : 'attr']({ + width: width, + height: height + }); + + while (i--) { + alignedObjects[i].align(); + } + }, + + /** + * Create a group + * @param {String} name The group will be given a class name of 'highcharts-{name}'. + * This can be used for styling and scripting. + */ + g: function (name) { + var elem = this.createElement('g'); + return defined(name) ? elem.attr({ 'class': PREFIX + name }) : elem; + }, + + /** + * Display an image + * @param {String} src + * @param {Number} x + * @param {Number} y + * @param {Number} width + * @param {Number} height + */ + image: function (src, x, y, width, height) { + var attribs = { + preserveAspectRatio: NONE + }, + elemWrapper; + + // optional properties + if (arguments.length > 1) { + extend(attribs, { + x: x, + y: y, + width: width, + height: height + }); + } + + elemWrapper = this.createElement('image').attr(attribs); + + // set the href in the xlink namespace + if (elemWrapper.element.setAttributeNS) { + elemWrapper.element.setAttributeNS('http://www.w3.org/1999/xlink', + 'href', src); + } else { + // could be exporting in IE + // using href throws "not supported" in ie7 and under, requries regex shim to fix later + elemWrapper.element.setAttribute('hc-svg-href', src); + } + + return elemWrapper; + }, + + /** + * Draw a symbol out of pre-defined shape paths from the namespace 'symbol' object. + * + * @param {Object} symbol + * @param {Object} x + * @param {Object} y + * @param {Object} radius + * @param {Object} options + */ + symbol: function (symbol, x, y, width, height, options) { + + var obj, + + // get the symbol definition function + symbolFn = this.symbols[symbol], + + // check if there's a path defined for this symbol + path = symbolFn && symbolFn( + mathRound(x), + mathRound(y), + width, + height, + options + ), + + imageRegex = /^url\((.*?)\)$/, + imageSrc, + imageSize, + centerImage; + + if (path) { + + obj = this.path(path); + // expando properties for use in animate and attr + extend(obj, { + symbolName: symbol, + x: x, + y: y, + width: width, + height: height + }); + if (options) { + extend(obj, options); + } + + + // image symbols + } else if (imageRegex.test(symbol)) { + + // On image load, set the size and position + centerImage = function (img, size) { + img.attr({ + width: size[0], + height: size[1] + }); + + if (!img.alignByTranslate) { // #185 + img.translate( + -mathRound(size[0] / 2), + -mathRound(size[1] / 2) + ); + } + }; + + imageSrc = symbol.match(imageRegex)[1]; + imageSize = symbolSizes[imageSrc]; + + // create the image synchronously, add attribs async + obj = this.image(imageSrc) + .attr({ + x: x, + y: y + }); + + if (imageSize) { + centerImage(obj, imageSize); + } else { + // initialize image to be 0 size so export will still function if there's no cached sizes + obj.attr({ width: 0, height: 0 }); + + // create a dummy JavaScript image to get the width and height + createElement('img', { + onload: function () { + var img = this; + + centerImage(obj, symbolSizes[imageSrc] = [img.width, img.height]); + }, + src: imageSrc + }); + } + } + + return obj; + }, + + /** + * An extendable collection of functions for defining symbol paths. + */ + symbols: { + 'circle': function (x, y, w, h) { + var cpw = 0.166 * w; + return [ + M, x + w / 2, y, + 'C', x + w + cpw, y, x + w + cpw, y + h, x + w / 2, y + h, + 'C', x - cpw, y + h, x - cpw, y, x + w / 2, y, + 'Z' + ]; + }, + + 'square': function (x, y, w, h) { + return [ + M, x, y, + L, x + w, y, + x + w, y + h, + x, y + h, + 'Z' + ]; + }, + + 'triangle': function (x, y, w, h) { + return [ + M, x + w / 2, y, + L, x + w, y + h, + x, y + h, + 'Z' + ]; + }, + + 'triangle-down': function (x, y, w, h) { + return [ + M, x, y, + L, x + w, y, + x + w / 2, y + h, + 'Z' + ]; + }, + 'diamond': function (x, y, w, h) { + return [ + M, x + w / 2, y, + L, x + w, y + h / 2, + x + w / 2, y + h, + x, y + h / 2, + 'Z' + ]; + }, + 'arc': function (x, y, w, h, options) { + var start = options.start, + radius = options.r || w || h, + end = options.end - 0.000001, // to prevent cos and sin of start and end from becoming equal on 360 arcs + innerRadius = options.innerR, + open = options.open, + cosStart = mathCos(start), + sinStart = mathSin(start), + cosEnd = mathCos(end), + sinEnd = mathSin(end), + longArc = options.end - start < mathPI ? 0 : 1; + + return [ + M, + x + radius * cosStart, + y + radius * sinStart, + 'A', // arcTo + radius, // x radius + radius, // y radius + 0, // slanting + longArc, // long or short arc + 1, // clockwise + x + radius * cosEnd, + y + radius * sinEnd, + open ? M : L, + x + innerRadius * cosEnd, + y + innerRadius * sinEnd, + 'A', // arcTo + innerRadius, // x radius + innerRadius, // y radius + 0, // slanting + longArc, // long or short arc + 0, // clockwise + x + innerRadius * cosStart, + y + innerRadius * sinStart, + + open ? '' : 'Z' // close + ]; + } + }, + + /** + * Define a clipping rectangle + * @param {String} id + * @param {Number} x + * @param {Number} y + * @param {Number} width + * @param {Number} height + */ + clipRect: function (x, y, width, height) { + var wrapper, + id = PREFIX + idCounter++, + + clipPath = this.createElement('clipPath').attr({ + id: id + }).add(this.defs); + + wrapper = this.rect(x, y, width, height, 0).add(clipPath); + wrapper.id = id; + wrapper.clipPath = clipPath; + + return wrapper; + }, + + + /** + * Take a color and return it if it's a string, make it a gradient if it's a + * gradient configuration object. Prior to Highstock, an array was used to define + * a linear gradient with pixel positions relative to the SVG. In newer versions + * we change the coordinates to apply relative to the shape, using coordinates + * 0-1 within the shape. To preserve backwards compatibility, linearGradient + * in this definition is an object of x1, y1, x2 and y2. + * + * @param {Object} color The color or config object + */ + color: function (color, elem, prop) { + var renderer = this, + colorObject, + regexRgba = /^rgba/, + gradName; + + // Apply linear or radial gradients + if (color && color.linearGradient) { + gradName = 'linearGradient'; + } else if (color && color.radialGradient) { + gradName = 'radialGradient'; + } + + if (gradName) { + var gradAttr = color[gradName], + gradients = renderer.gradients, + gradientObject, + stopColor, + stopOpacity, + radialReference = elem.radialReference; + + // Check if a gradient object with the same config object is created within this renderer + if (!gradAttr.id || !gradients[gradAttr.id]) { + + // Keep < 2.2 kompatibility + if (isArray(gradAttr)) { + color[gradName] = gradAttr = { + x1: gradAttr[0], + y1: gradAttr[1], + x2: gradAttr[2], + y2: gradAttr[3], + gradientUnits: 'userSpaceOnUse' + }; + } + + // Correct the radial gradient for the radial reference system + if (gradName === 'radialGradient' && radialReference && !defined(gradAttr.gradientUnits)) { + extend(gradAttr, { + cx: (radialReference[0] - radialReference[2] / 2) + gradAttr.cx * radialReference[2], + cy: (radialReference[1] - radialReference[2] / 2) + gradAttr.cy * radialReference[2], + r: gradAttr.r * radialReference[2], + gradientUnits: 'userSpaceOnUse' + }); + } + + // Set the id and create the element + gradAttr.id = PREFIX + idCounter++; + gradients[gradAttr.id] = gradientObject = renderer.createElement(gradName) + .attr(gradAttr) + .add(renderer.defs); + + + // The gradient needs to keep a list of stops to be able to destroy them + gradientObject.stops = []; + each(color.stops, function (stop) { + var stopObject; + if (regexRgba.test(stop[1])) { + colorObject = Color(stop[1]); + stopColor = colorObject.get('rgb'); + stopOpacity = colorObject.get('a'); + } else { + stopColor = stop[1]; + stopOpacity = 1; + } + stopObject = renderer.createElement('stop').attr({ + offset: stop[0], + 'stop-color': stopColor, + 'stop-opacity': stopOpacity + }).add(gradientObject); + + // Add the stop element to the gradient + gradientObject.stops.push(stopObject); + }); + } + + // Return the reference to the gradient object + return 'url(' + renderer.url + '#' + gradAttr.id + ')'; + + // Webkit and Batik can't show rgba. + } else if (regexRgba.test(color)) { + colorObject = Color(color); + attr(elem, prop + '-opacity', colorObject.get('a')); + + return colorObject.get('rgb'); + + + } else { + // Remove the opacity attribute added above. Does not throw if the attribute is not there. + elem.removeAttribute(prop + '-opacity'); + + return color; + } + + }, + + + /** + * Add text to the SVG object + * @param {String} str + * @param {Number} x Left position + * @param {Number} y Top position + * @param {Boolean} useHTML Use HTML to render the text + */ + text: function (str, x, y, useHTML) { + + // declare variables + var renderer = this, + defaultChartStyle = defaultOptions.chart.style, + wrapper; + + if (useHTML && !renderer.forExport) { + return renderer.html(str, x, y); + } + + x = mathRound(pick(x, 0)); + y = mathRound(pick(y, 0)); + + wrapper = renderer.createElement('text') + .attr({ + x: x, + y: y, + text: str + }) + .css({ + fontFamily: defaultChartStyle.fontFamily, + fontSize: defaultChartStyle.fontSize + }); + + // Prevent wrapping from creating false offsetWidths in export in legacy IE (#1079, #1063) + if (!hasSVG && renderer.forExport) { + wrapper.css({ + position: ABSOLUTE + }); + } + + wrapper.x = x; + wrapper.y = y; + return wrapper; + }, + + + /** + * Create HTML text node. This is used by the VML renderer as well as the SVG + * renderer through the useHTML option. + * + * @param {String} str + * @param {Number} x + * @param {Number} y + */ + html: function (str, x, y) { + var defaultChartStyle = defaultOptions.chart.style, + wrapper = this.createElement('span'), + attrSetters = wrapper.attrSetters, + element = wrapper.element, + renderer = wrapper.renderer; + + // Text setter + attrSetters.text = function (value) { + if (value !== element.innerHTML) { + delete this.bBox; + } + element.innerHTML = value; + return false; + }; + + // Various setters which rely on update transform + attrSetters.x = attrSetters.y = attrSetters.align = function (value, key) { + if (key === 'align') { + key = 'textAlign'; // Do not overwrite the SVGElement.align method. Same as VML. + } + wrapper[key] = value; + wrapper.htmlUpdateTransform(); + return false; + }; + + // Set the default attributes + wrapper.attr({ + text: str, + x: mathRound(x), + y: mathRound(y) + }) + .css({ + position: ABSOLUTE, + whiteSpace: 'nowrap', + fontFamily: defaultChartStyle.fontFamily, + fontSize: defaultChartStyle.fontSize + }); + + // Use the HTML specific .css method + wrapper.css = wrapper.htmlCss; + + // This is specific for HTML within SVG + if (renderer.isSVG) { + wrapper.add = function (svgGroupWrapper) { + + var htmlGroup, + container = renderer.box.parentNode, + parentGroup, + parents = []; + + // Create a mock group to hold the HTML elements + if (svgGroupWrapper) { + htmlGroup = svgGroupWrapper.div; + if (!htmlGroup) { + + // Read the parent chain into an array and read from top down + parentGroup = svgGroupWrapper; + while (parentGroup) { + + parents.push(parentGroup); + + // Move up to the next parent group + parentGroup = parentGroup.parentGroup; + } + + // Ensure dynamically updating position when any parent is translated + each(parents.reverse(), function (parentGroup) { + var htmlGroupStyle; + + // Create a HTML div and append it to the parent div to emulate + // the SVG group structure + htmlGroup = parentGroup.div = parentGroup.div || createElement(DIV, { + className: attr(parentGroup.element, 'class') + }, { + position: ABSOLUTE, + left: (parentGroup.translateX || 0) + PX, + top: (parentGroup.translateY || 0) + PX + }, htmlGroup || container); // the top group is appended to container + + // Shortcut + htmlGroupStyle = htmlGroup.style; + + // Set listeners to update the HTML div's position whenever the SVG group + // position is changed + extend(parentGroup.attrSetters, { + translateX: function (value) { + htmlGroupStyle.left = value + PX; + }, + translateY: function (value) { + htmlGroupStyle.top = value + PX; + }, + visibility: function (value, key) { + htmlGroupStyle[key] = value; + } + }); + }); + + } + } else { + htmlGroup = container; + } + + htmlGroup.appendChild(element); + + // Shared with VML: + wrapper.added = true; + if (wrapper.alignOnAdd) { + wrapper.htmlUpdateTransform(); + } + + return wrapper; + }; + } + return wrapper; + }, + + /** + * Utility to return the baseline offset and total line height from the font size + */ + fontMetrics: function (fontSize) { + fontSize = pInt(fontSize || 11); + + // Empirical values found by comparing font size and bounding box height. + // Applies to the default font family. http://jsfiddle.net/highcharts/7xvn7/ + var lineHeight = fontSize < 24 ? fontSize + 4 : mathRound(fontSize * 1.2), + baseline = mathRound(lineHeight * 0.8); + + return { + h: lineHeight, + b: baseline + }; + }, + + /** + * Add a label, a text item that can hold a colored or gradient background + * as well as a border and shadow. + * @param {string} str + * @param {Number} x + * @param {Number} y + * @param {String} shape + * @param {Number} anchorX In case the shape has a pointer, like a flag, this is the + * coordinates it should be pinned to + * @param {Number} anchorY + * @param {Boolean} baseline Whether to position the label relative to the text baseline, + * like renderer.text, or to the upper border of the rectangle. + * @param {String} className Class name for the group + */ + label: function (str, x, y, shape, anchorX, anchorY, useHTML, baseline, className) { + + var renderer = this, + wrapper = renderer.g(className), + text = renderer.text('', 0, 0, useHTML) + .attr({ + zIndex: 1 + }), + //.add(wrapper), + box, + bBox, + alignFactor = 0, + padding = 3, + width, + height, + wrapperX, + wrapperY, + crispAdjust = 0, + deferredAttr = {}, + baselineOffset, + attrSetters = wrapper.attrSetters; + + /** + * This function runs after the label is added to the DOM (when the bounding box is + * available), and after the text of the label is updated to detect the new bounding + * box and reflect it in the border box. + */ + function updateBoxSize() { + var boxY, + style = text.element.style; + + bBox = (width === undefined || height === undefined || wrapper.styles.textAlign) && + text.getBBox(); + wrapper.width = (width || bBox.width || 0) + 2 * padding; + wrapper.height = (height || bBox.height || 0) + 2 * padding; + + // update the label-scoped y offset + baselineOffset = padding + renderer.fontMetrics(style && style.fontSize).b; + + + // create the border box if it is not already present + if (!box) { + boxY = baseline ? -baselineOffset : 0; + + wrapper.box = box = shape ? + renderer.symbol(shape, -alignFactor * padding, boxY, wrapper.width, wrapper.height) : + renderer.rect(-alignFactor * padding, boxY, wrapper.width, wrapper.height, 0, deferredAttr[STROKE_WIDTH]); + box.add(wrapper); + } + + // apply the box attributes + box.attr(merge({ + width: wrapper.width, + height: wrapper.height + }, deferredAttr)); + deferredAttr = null; + } + + /** + * This function runs after setting text or padding, but only if padding is changed + */ + function updateTextPadding() { + var styles = wrapper.styles, + textAlign = styles && styles.textAlign, + x = padding * (1 - alignFactor), + y; + + // determin y based on the baseline + y = baseline ? 0 : baselineOffset; + + // compensate for alignment + if (defined(width) && (textAlign === 'center' || textAlign === 'right')) { + x += { center: 0.5, right: 1 }[textAlign] * (width - bBox.width); + } + + // update if anything changed + if (x !== text.x || y !== text.y) { + text.attr({ + x: x, + y: y + }); + } + + // record current values + text.x = x; + text.y = y; + } + + /** + * Set a box attribute, or defer it if the box is not yet created + * @param {Object} key + * @param {Object} value + */ + function boxAttr(key, value) { + if (box) { + box.attr(key, value); + } else { + deferredAttr[key] = value; + } + } + + function getSizeAfterAdd() { + text.add(wrapper); + wrapper.attr({ + text: str, // alignment is available now + x: x, + y: y + }); + + if (defined(anchorX)) { + wrapper.attr({ + anchorX: anchorX, + anchorY: anchorY + }); + } + } + + /** + * After the text element is added, get the desired size of the border box + * and add it before the text in the DOM. + */ + addEvent(wrapper, 'add', getSizeAfterAdd); + + /* + * Add specific attribute setters. + */ + + // only change local variables + attrSetters.width = function (value) { + width = value; + return false; + }; + attrSetters.height = function (value) { + height = value; + return false; + }; + attrSetters.padding = function (value) { + if (defined(value) && value !== padding) { + padding = value; + updateTextPadding(); + } + + return false; + }; + + // change local variable and set attribue as well + attrSetters.align = function (value) { + alignFactor = { left: 0, center: 0.5, right: 1 }[value]; + return false; // prevent setting text-anchor on the group + }; + + // apply these to the box and the text alike + attrSetters.text = function (value, key) { + text.attr(key, value); + updateBoxSize(); + updateTextPadding(); + return false; + }; + + // apply these to the box but not to the text + attrSetters[STROKE_WIDTH] = function (value, key) { + crispAdjust = value % 2 / 2; + boxAttr(key, value); + return false; + }; + attrSetters.stroke = attrSetters.fill = attrSetters.r = function (value, key) { + boxAttr(key, value); + return false; + }; + attrSetters.anchorX = function (value, key) { + anchorX = value; + boxAttr(key, value + crispAdjust - wrapperX); + return false; + }; + attrSetters.anchorY = function (value, key) { + anchorY = value; + boxAttr(key, value - wrapperY); + return false; + }; + + // rename attributes + attrSetters.x = function (value) { + wrapper.x = value; // for animation getter + value -= alignFactor * ((width || bBox.width) + padding); + wrapperX = mathRound(value); + + wrapper.attr('translateX', wrapperX); + return false; + }; + attrSetters.y = function (value) { + wrapperY = wrapper.y = mathRound(value); + wrapper.attr('translateY', value); + return false; + }; + + // Redirect certain methods to either the box or the text + var baseCss = wrapper.css; + return extend(wrapper, { + /** + * Pick up some properties and apply them to the text instead of the wrapper + */ + css: function (styles) { + if (styles) { + var textStyles = {}; + styles = merge({}, styles); // create a copy to avoid altering the original object (#537) + each(['fontSize', 'fontWeight', 'fontFamily', 'color', 'lineHeight', 'width'], function (prop) { + if (styles[prop] !== UNDEFINED) { + textStyles[prop] = styles[prop]; + delete styles[prop]; + } + }); + text.css(textStyles); + } + return baseCss.call(wrapper, styles); + }, + /** + * Return the bounding box of the box, not the group + */ + getBBox: function () { + return box.getBBox(); + }, + /** + * Apply the shadow to the box + */ + shadow: function (b) { + box.shadow(b); + return wrapper; + }, + /** + * Destroy and release memory. + */ + destroy: function () { + removeEvent(wrapper, 'add', getSizeAfterAdd); + + // Added by button implementation + removeEvent(wrapper.element, 'mouseenter'); + removeEvent(wrapper.element, 'mouseleave'); + + if (text) { + // Destroy the text element + text = text.destroy(); + } + // Call base implementation to destroy the rest + SVGElement.prototype.destroy.call(wrapper); + } + }); + } +}; // end SVGRenderer + + +// general renderer +Renderer = SVGRenderer; + + +/* **************************************************************************** + * * + * START OF INTERNET EXPLORER <= 8 SPECIFIC CODE * + * * + * For applications and websites that don't need IE support, like platform * + * targeted mobile apps and web apps, this code can be removed. * + * * + *****************************************************************************/ + +/** + * @constructor + */ +var VMLRenderer; +if (!hasSVG && !useCanVG) { + +/** + * The VML element wrapper. + */ +var VMLElement = { + + /** + * Initialize a new VML element wrapper. It builds the markup as a string + * to minimize DOM traffic. + * @param {Object} renderer + * @param {Object} nodeName + */ + init: function (renderer, nodeName) { + var wrapper = this, + markup = ['<', nodeName, ' filled="f" stroked="f"'], + style = ['position: ', ABSOLUTE, ';']; + + // divs and shapes need size + if (nodeName === 'shape' || nodeName === DIV) { + style.push('left:0;top:0;width:1px;height:1px;'); + } + if (docMode8) { + style.push('visibility: ', nodeName === DIV ? HIDDEN : VISIBLE); + } + + markup.push(' style="', style.join(''), '"/>'); + + // create element with default attributes and style + if (nodeName) { + markup = nodeName === DIV || nodeName === 'span' || nodeName === 'img' ? + markup.join('') + : renderer.prepVML(markup); + wrapper.element = createElement(markup); + } + + wrapper.renderer = renderer; + wrapper.attrSetters = {}; + }, + + /** + * Add the node to the given parent + * @param {Object} parent + */ + add: function (parent) { + var wrapper = this, + renderer = wrapper.renderer, + element = wrapper.element, + box = renderer.box, + inverted = parent && parent.inverted, + + // get the parent node + parentNode = parent ? + parent.element || parent : + box; + + + // if the parent group is inverted, apply inversion on all children + if (inverted) { // only on groups + renderer.invertChild(element, parentNode); + } + + // append it + parentNode.appendChild(element); + + // align text after adding to be able to read offset + wrapper.added = true; + if (wrapper.alignOnAdd && !wrapper.deferUpdateTransform) { + wrapper.updateTransform(); + } + + // fire an event for internal hooks + fireEvent(wrapper, 'add'); + + return wrapper; + }, + + /** + * VML always uses htmlUpdateTransform + */ + updateTransform: SVGElement.prototype.htmlUpdateTransform, + + /** + * Get or set attributes + */ + attr: function (hash, val) { + var wrapper = this, + key, + value, + i, + result, + element = wrapper.element || {}, + elemStyle = element.style, + nodeName = element.nodeName, + renderer = wrapper.renderer, + symbolName = wrapper.symbolName, + hasSetSymbolSize, + shadows = wrapper.shadows, + skipAttr, + attrSetters = wrapper.attrSetters, + ret = wrapper; + + // single key-value pair + if (isString(hash) && defined(val)) { + key = hash; + hash = {}; + hash[key] = val; + } + + // used as a getter, val is undefined + if (isString(hash)) { + key = hash; + if (key === 'strokeWidth' || key === 'stroke-width') { + ret = wrapper.strokeweight; + } else { + ret = wrapper[key]; + } + + // setter + } else { + for (key in hash) { + value = hash[key]; + skipAttr = false; + + // check for a specific attribute setter + result = attrSetters[key] && attrSetters[key].call(wrapper, value, key); + + if (result !== false && value !== null) { // #620 + + if (result !== UNDEFINED) { + value = result; // the attribute setter has returned a new value to set + } + + + // prepare paths + // symbols + if (symbolName && /^(x|y|r|start|end|width|height|innerR|anchorX|anchorY)/.test(key)) { + // if one of the symbol size affecting parameters are changed, + // check all the others only once for each call to an element's + // .attr() method + if (!hasSetSymbolSize) { + wrapper.symbolAttr(hash); + + hasSetSymbolSize = true; + } + skipAttr = true; + + } else if (key === 'd') { + value = value || []; + wrapper.d = value.join(' '); // used in getter for animation + + // convert paths + i = value.length; + var convertedPath = []; + while (i--) { + + // Multiply by 10 to allow subpixel precision. + // Substracting half a pixel seems to make the coordinates + // align with SVG, but this hasn't been tested thoroughly + if (isNumber(value[i])) { + convertedPath[i] = mathRound(value[i] * 10) - 5; + } else if (value[i] === 'Z') { // close the path + convertedPath[i] = 'x'; + } else { + convertedPath[i] = value[i]; + } + + } + value = convertedPath.join(' ') || 'x'; + element.path = value; + + // update shadows + if (shadows) { + i = shadows.length; + while (i--) { + shadows[i].path = shadows[i].cutOff ? this.cutOffPath(value, shadows[i].cutOff) : value; + } + } + skipAttr = true; + + // handle visibility + } else if (key === 'visibility') { + + // let the shadow follow the main element + if (shadows) { + i = shadows.length; + while (i--) { + shadows[i].style[key] = value; + } + } + + // Instead of toggling the visibility CSS property, move the div out of the viewport. + // This works around #61 and #586 + if (nodeName === 'DIV') { + value = value === HIDDEN ? '-999em' : 0; + key = 'top'; + } + + elemStyle[key] = value; + skipAttr = true; + + // directly mapped to css + } else if (key === 'zIndex') { + + if (value) { + elemStyle[key] = value; + } + skipAttr = true; + + // width and height + } else if (key === 'width' || key === 'height') { + + value = mathMax(0, value); // don't set width or height below zero (#311) + + this[key] = value; // used in getter + + // clipping rectangle special + if (wrapper.updateClipping) { + wrapper[key] = value; + wrapper.updateClipping(); + } else { + // normal + elemStyle[key] = value; + } + + skipAttr = true; + + // x and y + } else if (key === 'x' || key === 'y') { + wrapper[key] = value; // used in getter + elemStyle[{ x: 'left', y: 'top' }[key]] = value; + + // class name + } else if (key === 'class') { + // IE8 Standards mode has problems retrieving the className + element.className = value; + + // stroke + } else if (key === 'stroke') { + + value = renderer.color(value, element, key); + + key = 'strokecolor'; + + // stroke width + } else if (key === 'stroke-width' || key === 'strokeWidth') { + element.stroked = value ? true : false; + key = 'strokeweight'; + wrapper[key] = value; // used in getter, issue #113 + if (isNumber(value)) { + value += PX; + } + + // dashStyle + } else if (key === 'dashstyle') { + var strokeElem = element.getElementsByTagName('stroke')[0] || + createElement(renderer.prepVML(['']), null, null, element); + strokeElem[key] = value || 'solid'; + wrapper.dashstyle = value; /* because changing stroke-width will change the dash length + and cause an epileptic effect */ + skipAttr = true; + + // fill + } else if (key === 'fill') { + + if (nodeName === 'SPAN') { // text color + elemStyle.color = value; + } else { + element.filled = value !== NONE ? true : false; + + value = renderer.color(value, element, key, wrapper); + + key = 'fillcolor'; + } + + // rotation on VML elements + } else if (nodeName === 'shape' && key === 'rotation') { + wrapper[key] = value; + // Correction for the 1x1 size of the shape container. Used in gauge needles. + element.style.left = -mathRound(mathSin(value * deg2rad) + 1) + PX; + element.style.top = mathRound(mathCos(value * deg2rad)) + PX; + + // translation for animation + } else if (key === 'translateX' || key === 'translateY' || key === 'rotation') { + wrapper[key] = value; + wrapper.updateTransform(); + + skipAttr = true; + + // text for rotated and non-rotated elements + } else if (key === 'text') { + this.bBox = null; + element.innerHTML = value; + skipAttr = true; + } + + if (!skipAttr) { + if (docMode8) { // IE8 setAttribute bug + element[key] = value; + } else { + attr(element, key, value); + } + } + + } + } + } + return ret; + }, + + /** + * Set the element's clipping to a predefined rectangle + * + * @param {String} id The id of the clip rectangle + */ + clip: function (clipRect) { + var wrapper = this, + clipMembers, + element = wrapper.element, + parentNode = element.parentNode, + cssRet; + + if (clipRect) { + clipMembers = clipRect.members; + clipMembers.push(wrapper); + wrapper.destroyClip = function () { + erase(clipMembers, wrapper); + }; + // Issue #863 workaround - related to #140, #61, #74 + if (parentNode && parentNode.className === 'highcharts-tracker' && !docMode8) { + css(element, { visibility: HIDDEN }); + } + cssRet = clipRect.getCSS(wrapper); + + } else { + if (wrapper.destroyClip) { + wrapper.destroyClip(); + } + cssRet = { clip: docMode8 ? 'inherit' : 'rect(auto)' }; // #1214 + } + + return wrapper.css(cssRet); + + }, + + /** + * Set styles for the element + * @param {Object} styles + */ + css: SVGElement.prototype.htmlCss, + + /** + * Removes a child either by removeChild or move to garbageBin. + * Issue 490; in VML removeChild results in Orphaned nodes according to sIEve, discardElement does not. + */ + safeRemoveChild: function (element) { + // discardElement will detach the node from its parent before attaching it + // to the garbage bin. Therefore it is important that the node is attached and have parent. + if (element.parentNode) { + discardElement(element); + } + }, + + /** + * Extend element.destroy by removing it from the clip members array + */ + destroy: function () { + if (this.destroyClip) { + this.destroyClip(); + } + + return SVGElement.prototype.destroy.apply(this); + }, + + /** + * Remove all child nodes of a group, except the v:group element + */ + empty: function () { + var element = this.element, + childNodes = element.childNodes, + i = childNodes.length, + node; + + while (i--) { + node = childNodes[i]; + node.parentNode.removeChild(node); + } + }, + + /** + * Add an event listener. VML override for normalizing event parameters. + * @param {String} eventType + * @param {Function} handler + */ + on: function (eventType, handler) { + // simplest possible event model for internal use + this.element['on' + eventType] = function () { + var evt = win.event; + evt.target = evt.srcElement; + handler(evt); + }; + return this; + }, + + /** + * In stacked columns, cut off the shadows so that they don't overlap + */ + cutOffPath: function (path, length) { + + var len; + + path = path.split(/[ ,]/); + len = path.length; + + if (len === 9 || len === 11) { + path[len - 4] = path[len - 2] = pInt(path[len - 2]) - 10 * length; + } + return path.join(' '); + }, + + /** + * Apply a drop shadow by copying elements and giving them different strokes + * @param {Boolean|Object} shadowOptions + */ + shadow: function (shadowOptions, group, cutOff) { + var shadows = [], + i, + element = this.element, + renderer = this.renderer, + shadow, + elemStyle = element.style, + markup, + path = element.path, + strokeWidth, + modifiedPath, + shadowWidth, + shadowElementOpacity; + + // some times empty paths are not strings + if (path && typeof path.value !== 'string') { + path = 'x'; + } + modifiedPath = path; + + if (shadowOptions) { + shadowWidth = pick(shadowOptions.width, 3); + shadowElementOpacity = (shadowOptions.opacity || 0.15) / shadowWidth; + for (i = 1; i <= 3; i++) { + + strokeWidth = (shadowWidth * 2) + 1 - (2 * i); + + // Cut off shadows for stacked column items + if (cutOff) { + modifiedPath = this.cutOffPath(path.value, strokeWidth + 0.5); + } + + markup = ['']; + + shadow = createElement(renderer.prepVML(markup), + null, { + left: pInt(elemStyle.left) + (shadowOptions.offsetX || 1), + top: pInt(elemStyle.top) + (shadowOptions.offsetY || 1) + } + ); + if (cutOff) { + shadow.cutOff = strokeWidth + 1; + } + + // apply the opacity + markup = ['']; + createElement(renderer.prepVML(markup), null, null, shadow); + + + // insert it + if (group) { + group.element.appendChild(shadow); + } else { + element.parentNode.insertBefore(shadow, element); + } + + // record it + shadows.push(shadow); + + } + + this.shadows = shadows; + } + return this; + + } +}; +VMLElement = extendClass(SVGElement, VMLElement); + +/** + * The VML renderer + */ +var VMLRendererExtension = { // inherit SVGRenderer + + Element: VMLElement, + isIE8: userAgent.indexOf('MSIE 8.0') > -1, + + + /** + * Initialize the VMLRenderer + * @param {Object} container + * @param {Number} width + * @param {Number} height + */ + init: function (container, width, height) { + var renderer = this, + boxWrapper, + box; + + renderer.alignedObjects = []; + + boxWrapper = renderer.createElement(DIV); + box = boxWrapper.element; + box.style.position = RELATIVE; // for freeform drawing using renderer directly + container.appendChild(boxWrapper.element); + + + // generate the containing box + renderer.box = box; + renderer.boxWrapper = boxWrapper; + + + renderer.setSize(width, height, false); + + // The only way to make IE6 and IE7 print is to use a global namespace. However, + // with IE8 the only way to make the dynamic shapes visible in screen and print mode + // seems to be to add the xmlns attribute and the behaviour style inline. + if (!doc.namespaces.hcv) { + + doc.namespaces.add('hcv', 'urn:schemas-microsoft-com:vml'); + + // setup default css + doc.createStyleSheet().cssText = + 'hcv\\:fill, hcv\\:path, hcv\\:shape, hcv\\:stroke' + + '{ behavior:url(#default#VML); display: inline-block; } '; + + } + }, + + + /** + * Detect whether the renderer is hidden. This happens when one of the parent elements + * has display: none + */ + isHidden: function () { + return !this.box.offsetWidth; + }, + + /** + * Define a clipping rectangle. In VML it is accomplished by storing the values + * for setting the CSS style to all associated members. + * + * @param {Number} x + * @param {Number} y + * @param {Number} width + * @param {Number} height + */ + clipRect: function (x, y, width, height) { + + // create a dummy element + var clipRect = this.createElement(), + isObj = isObject(x); + + // mimic a rectangle with its style object for automatic updating in attr + return extend(clipRect, { + members: [], + left: isObj ? x.x : x, + top: isObj ? x.y : y, + width: isObj ? x.width : width, + height: isObj ? x.height : height, + getCSS: function (wrapper) { + var inverted = wrapper.inverted, + rect = this, + top = rect.top, + left = rect.left, + right = left + rect.width, + bottom = top + rect.height, + ret = { + clip: 'rect(' + + mathRound(inverted ? left : top) + 'px,' + + mathRound(inverted ? bottom : right) + 'px,' + + mathRound(inverted ? right : bottom) + 'px,' + + mathRound(inverted ? top : left) + 'px)' + }; + + // issue 74 workaround + if (!inverted && docMode8 && wrapper.element.nodeName !== 'IMG') { + extend(ret, { + width: right + PX, + height: bottom + PX + }); + } + + return ret; + }, + + // used in attr and animation to update the clipping of all members + updateClipping: function () { + each(clipRect.members, function (member) { + member.css(clipRect.getCSS(member)); + }); + } + }); + + }, + + + /** + * Take a color and return it if it's a string, make it a gradient if it's a + * gradient configuration object, and apply opacity. + * + * @param {Object} color The color or config object + */ + color: function (color, elem, prop, wrapper) { + var renderer = this, + colorObject, + regexRgba = /^rgba/, + markup, + fillType, + ret = NONE; + + // Check for linear or radial gradient + if (color && color.linearGradient) { + fillType = 'gradient'; + } else if (color && color.radialGradient) { + fillType = 'pattern'; + } + + + if (fillType) { + + var stopColor, + stopOpacity, + gradient = color.linearGradient || color.radialGradient, + x1, + y1, + x2, + y2, + opacity1, + opacity2, + color1, + color2, + fillAttr = '', + stops = color.stops, + firstStop, + lastStop, + colors = [], + addFillNode = function () { + // Add the fill subnode. When colors attribute is used, the meanings of opacity and o:opacity2 + // are reversed. + markup = ['']; + createElement(renderer.prepVML(markup), null, null, elem); + }; + + // Extend from 0 to 1 + firstStop = stops[0]; + lastStop = stops[stops.length - 1]; + if (firstStop[0] > 0) { + stops.unshift([ + 0, + firstStop[1] + ]); + } + if (lastStop[0] < 1) { + stops.push([ + 1, + lastStop[1] + ]); + } + + // Compute the stops + each(stops, function (stop, i) { + if (regexRgba.test(stop[1])) { + colorObject = Color(stop[1]); + stopColor = colorObject.get('rgb'); + stopOpacity = colorObject.get('a'); + } else { + stopColor = stop[1]; + stopOpacity = 1; + } + + // Build the color attribute + colors.push((stop[0] * 100) + '% ' + stopColor); + + // Only start and end opacities are allowed, so we use the first and the last + if (!i) { + opacity1 = stopOpacity; + color2 = stopColor; + } else { + opacity2 = stopOpacity; + color1 = stopColor; + } + }); + + // Apply the gradient to fills only. + if (prop === 'fill') { + + // Handle linear gradient angle + if (fillType === 'gradient') { + x1 = gradient.x1 || gradient[0] || 0; + y1 = gradient.y1 || gradient[1] || 0; + x2 = gradient.x2 || gradient[2] || 0; + y2 = gradient.y2 || gradient[3] || 0; + fillAttr = 'angle="' + (90 - math.atan( + (y2 - y1) / // y vector + (x2 - x1) // x vector + ) * 180 / mathPI) + '"'; + + addFillNode(); + + // Radial (circular) gradient + } else { + + var r = gradient.r, + sizex = r * 2, + sizey = r * 2, + cx = gradient.cx, + cy = gradient.cy, + radialReference = elem.radialReference, + bBox, + applyRadialGradient = function () { + if (radialReference) { + bBox = wrapper.getBBox(); + cx += (radialReference[0] - bBox.x) / bBox.width - 0.5; + cy += (radialReference[1] - bBox.y) / bBox.height - 0.5; + sizex *= radialReference[2] / bBox.width; + sizey *= radialReference[2] / bBox.height; + } + fillAttr = 'src="' + defaultOptions.global.VMLRadialGradientURL + '" ' + + 'size="' + sizex + ',' + sizey + '" ' + + 'origin="0.5,0.5" ' + + 'position="' + cx + ',' + cy + '" ' + + 'color2="' + color2 + '" '; + + addFillNode(); + }; + + // Apply radial gradient + if (wrapper.added) { + applyRadialGradient(); + } else { + // We need to know the bounding box to get the size and position right + addEvent(wrapper, 'add', applyRadialGradient); + } + + // The fill element's color attribute is broken in IE8 standards mode, so we + // need to set the parent shape's fillcolor attribute instead. + ret = color1; + } + + // Gradients are not supported for VML stroke, return the first color. #722. + } else { + ret = stopColor; + } + + // if the color is an rgba color, split it and add a fill node + // to hold the opacity component + } else if (regexRgba.test(color) && elem.tagName !== 'IMG') { + + colorObject = Color(color); + + markup = ['<', prop, ' opacity="', colorObject.get('a'), '"/>']; + createElement(this.prepVML(markup), null, null, elem); + + ret = colorObject.get('rgb'); + + + } else { + var strokeNodes = elem.getElementsByTagName(prop); + if (strokeNodes.length) { + strokeNodes[0].opacity = 1; + } + ret = color; + } + + return ret; + }, + + /** + * Take a VML string and prepare it for either IE8 or IE6/IE7. + * @param {Array} markup A string array of the VML markup to prepare + */ + prepVML: function (markup) { + var vmlStyle = 'display:inline-block;behavior:url(#default#VML);', + isIE8 = this.isIE8; + + markup = markup.join(''); + + if (isIE8) { // add xmlns and style inline + markup = markup.replace('/>', ' xmlns="urn:schemas-microsoft-com:vml" />'); + if (markup.indexOf('style="') === -1) { + markup = markup.replace('/>', ' style="' + vmlStyle + '" />'); + } else { + markup = markup.replace('style="', 'style="' + vmlStyle); + } + + } else { // add namespace + markup = markup.replace('<', ' 1) { + obj.css({ + left: x, + top: y, + width: width, + height: height + }); + } + return obj; + }, + + /** + * VML uses a shape for rect to overcome bugs and rotation problems + */ + rect: function (x, y, width, height, r, strokeWidth) { + + if (isObject(x)) { + y = x.y; + width = x.width; + height = x.height; + strokeWidth = x.strokeWidth; + x = x.x; + } + var wrapper = this.symbol('rect'); + wrapper.r = r; + + return wrapper.attr(wrapper.crisp(strokeWidth, x, y, mathMax(width, 0), mathMax(height, 0))); + }, + + /** + * In the VML renderer, each child of an inverted div (group) is inverted + * @param {Object} element + * @param {Object} parentNode + */ + invertChild: function (element, parentNode) { + var parentStyle = parentNode.style; + css(element, { + flip: 'x', + left: pInt(parentStyle.width) - 1, + top: pInt(parentStyle.height) - 1, + rotation: -90 + }); + }, + + /** + * Symbol definitions that override the parent SVG renderer's symbols + * + */ + symbols: { + // VML specific arc function + arc: function (x, y, w, h, options) { + var start = options.start, + end = options.end, + radius = options.r || w || h, + cosStart = mathCos(start), + sinStart = mathSin(start), + cosEnd = mathCos(end), + sinEnd = mathSin(end), + innerRadius = options.innerR, + circleCorrection = 0.08 / radius, // #760 + innerCorrection = (innerRadius && 0.1 / innerRadius) || 0, + ret; + + if (end - start === 0) { // no angle, don't show it. + return ['x']; + + } else if (2 * mathPI - end + start < circleCorrection) { // full circle + // empirical correction found by trying out the limits for different radii + cosEnd = -circleCorrection; + } else if (end - start < innerCorrection) { // issue #186, another mysterious VML arc problem + cosEnd = mathCos(start + innerCorrection); + } + + ret = [ + 'wa', // clockwise arc to + x - radius, // left + y - radius, // top + x + radius, // right + y + radius, // bottom + x + radius * cosStart, // start x + y + radius * sinStart, // start y + x + radius * cosEnd, // end x + y + radius * sinEnd // end y + ]; + + if (options.open && !innerRadius) { + ret.push( + 'e', + M, + x,// - innerRadius, + y// - innerRadius + ); + } + + ret.push( + 'at', // anti clockwise arc to + x - innerRadius, // left + y - innerRadius, // top + x + innerRadius, // right + y + innerRadius, // bottom + x + innerRadius * cosEnd, // start x + y + innerRadius * sinEnd, // start y + x + innerRadius * cosStart, // end x + y + innerRadius * sinStart, // end y + 'x', // finish path + 'e' // close + ); + + return ret; + + }, + // Add circle symbol path. This performs significantly faster than v:oval. + circle: function (x, y, w, h) { + + return [ + 'wa', // clockwisearcto + x, // left + y, // top + x + w, // right + y + h, // bottom + x + w, // start x + y + h / 2, // start y + x + w, // end x + y + h / 2, // end y + //'x', // finish path + 'e' // close + ]; + }, + /** + * Add rectangle symbol path which eases rotation and omits arcsize problems + * compared to the built-in VML roundrect shape + * + * @param {Number} left Left position + * @param {Number} top Top position + * @param {Number} r Border radius + * @param {Object} options Width and height + */ + + rect: function (left, top, width, height, options) { + + var right = left + width, + bottom = top + height, + ret, + r; + + // No radius, return the more lightweight square + if (!defined(options) || !options.r) { + ret = SVGRenderer.prototype.symbols.square.apply(0, arguments); + + // Has radius add arcs for the corners + } else { + + r = mathMin(options.r, width, height); + ret = [ + M, + left + r, top, + + L, + right - r, top, + 'wa', + right - 2 * r, top, + right, top + 2 * r, + right - r, top, + right, top + r, + + L, + right, bottom - r, + 'wa', + right - 2 * r, bottom - 2 * r, + right, bottom, + right, bottom - r, + right - r, bottom, + + L, + left + r, bottom, + 'wa', + left, bottom - 2 * r, + left + 2 * r, bottom, + left + r, bottom, + left, bottom - r, + + L, + left, top + r, + 'wa', + left, top, + left + 2 * r, top + 2 * r, + left, top + r, + left + r, top, + + + 'x', + 'e' + ]; + } + return ret; + } + } +}; +VMLRenderer = function () { + this.init.apply(this, arguments); +}; +VMLRenderer.prototype = merge(SVGRenderer.prototype, VMLRendererExtension); + + // general renderer + Renderer = VMLRenderer; +} + +/* **************************************************************************** + * * + * END OF INTERNET EXPLORER <= 8 SPECIFIC CODE * + * * + *****************************************************************************/ +/* **************************************************************************** + * * + * START OF ANDROID < 3 SPECIFIC CODE. THIS CAN BE REMOVED IF YOU'RE NOT * + * TARGETING THAT SYSTEM. * + * * + *****************************************************************************/ +var CanVGRenderer, + CanVGController; + +if (useCanVG) { + /** + * The CanVGRenderer is empty from start to keep the source footprint small. + * When requested, the CanVGController downloads the rest of the source packaged + * together with the canvg library. + */ + CanVGRenderer = function () { + // Empty constructor + }; + + /** + * Start with an empty symbols object. This is needed when exporting is used (exporting.src.js will add a few symbols), but + * the implementation from SvgRenderer will not be merged in until first render. + */ + CanVGRenderer.prototype.symbols = {}; + + /** + * Handles on demand download of canvg rendering support. + */ + CanVGController = (function () { + // List of renderering calls + var deferredRenderCalls = []; + + /** + * When downloaded, we are ready to draw deferred charts. + */ + function drawDeferred() { + var callLength = deferredRenderCalls.length, + callIndex; + + // Draw all pending render calls + for (callIndex = 0; callIndex < callLength; callIndex++) { + deferredRenderCalls[callIndex](); + } + // Clear the list + deferredRenderCalls = []; + } + + return { + push: function (func, scriptLocation) { + // Only get the script once + if (deferredRenderCalls.length === 0) { + getScript(scriptLocation, drawDeferred); + } + // Register render call + deferredRenderCalls.push(func); + } + }; + }()); +} // end CanVGRenderer + +/* **************************************************************************** + * * + * END OF ANDROID < 3 SPECIFIC CODE * + * * + *****************************************************************************/ + +/** + * General renderer + */ +Renderer = VMLRenderer || CanVGRenderer || SVGRenderer; +/** + * The Tick class + */ +function Tick(axis, pos, type) { + this.axis = axis; + this.pos = pos; + this.type = type || ''; + this.isNew = true; + + if (!type) { + this.addLabel(); + } +} + +Tick.prototype = { + /** + * Write the tick label + */ + addLabel: function () { + var tick = this, + axis = tick.axis, + options = axis.options, + chart = axis.chart, + horiz = axis.horiz, + categories = axis.categories, + pos = tick.pos, + labelOptions = options.labels, + str, + tickPositions = axis.tickPositions, + width = (categories && horiz && categories.length && + !labelOptions.step && !labelOptions.staggerLines && + !labelOptions.rotation && + chart.plotWidth / tickPositions.length) || + (!horiz && chart.plotWidth / 2), + isFirst = pos === tickPositions[0], + isLast = pos === tickPositions[tickPositions.length - 1], + css, + attr, + value = categories && defined(categories[pos]) ? categories[pos] : pos, + label = tick.label, + tickPositionInfo = tickPositions.info, + dateTimeLabelFormat; + + // Set the datetime label format. If a higher rank is set for this position, use that. If not, + // use the general format. + if (axis.isDatetimeAxis && tickPositionInfo) { + dateTimeLabelFormat = options.dateTimeLabelFormats[tickPositionInfo.higherRanks[pos] || tickPositionInfo.unitName]; + } + + // set properties for access in render method + tick.isFirst = isFirst; + tick.isLast = isLast; + + // get the string + str = axis.labelFormatter.call({ + axis: axis, + chart: chart, + isFirst: isFirst, + isLast: isLast, + dateTimeLabelFormat: dateTimeLabelFormat, + value: axis.isLog ? correctFloat(lin2log(value)) : value + }); + + // prepare CSS + css = width && { width: mathMax(1, mathRound(width - 2 * (labelOptions.padding || 10))) + PX }; + css = extend(css, labelOptions.style); + + // first call + if (!defined(label)) { + attr = { + align: labelOptions.align + }; + if (isNumber(labelOptions.rotation)) { + attr.rotation = labelOptions.rotation; + } + tick.label = + defined(str) && labelOptions.enabled ? + chart.renderer.text( + str, + 0, + 0, + labelOptions.useHTML + ) + .attr(attr) + // without position absolute, IE export sometimes is wrong + .css(css) + .add(axis.labelGroup) : + null; + + // update + } else if (label) { + label.attr({ + text: str + }) + .css(css); + } + }, + + /** + * Get the offset height or width of the label + */ + getLabelSize: function () { + var label = this.label, + axis = this.axis; + return label ? + ((this.labelBBox = label.getBBox()))[axis.horiz ? 'height' : 'width'] : + 0; + }, + + /** + * Find how far the labels extend to the right and left of the tick's x position. Used for anti-collision + * detection with overflow logic. + */ + getLabelSides: function () { + var bBox = this.labelBBox, // assume getLabelSize has run at this point + axis = this.axis, + options = axis.options, + labelOptions = options.labels, + width = bBox.width, + leftSide = width * { left: 0, center: 0.5, right: 1 }[labelOptions.align] - labelOptions.x; + + return [-leftSide, width - leftSide]; + }, + + /** + * Handle the label overflow by adjusting the labels to the left and right edge, or + * hide them if they collide into the neighbour label. + */ + handleOverflow: function (index, xy) { + var show = true, + axis = this.axis, + chart = axis.chart, + isFirst = this.isFirst, + isLast = this.isLast, + x = xy.x, + reversed = axis.reversed, + tickPositions = axis.tickPositions; + + if (isFirst || isLast) { + + var sides = this.getLabelSides(), + leftSide = sides[0], + rightSide = sides[1], + plotLeft = chart.plotLeft, + plotRight = plotLeft + axis.len, + neighbour = axis.ticks[tickPositions[index + (isFirst ? 1 : -1)]], + neighbourEdge = neighbour && neighbour.label.xy && neighbour.label.xy.x + neighbour.getLabelSides()[isFirst ? 0 : 1]; + + if ((isFirst && !reversed) || (isLast && reversed)) { + // Is the label spilling out to the left of the plot area? + if (x + leftSide < plotLeft) { + + // Align it to plot left + x = plotLeft - leftSide; + + // Hide it if it now overlaps the neighbour label + if (neighbour && x + rightSide > neighbourEdge) { + show = false; + } + } + + } else { + // Is the label spilling out to the right of the plot area? + if (x + rightSide > plotRight) { + + // Align it to plot right + x = plotRight - rightSide; + + // Hide it if it now overlaps the neighbour label + if (neighbour && x + leftSide < neighbourEdge) { + show = false; + } + + } + } + + // Set the modified x position of the label + xy.x = x; + } + return show; + }, + + /** + * Get the x and y position for ticks and labels + */ + getPosition: function (horiz, pos, tickmarkOffset, old) { + var axis = this.axis, + chart = axis.chart, + cHeight = (old && chart.oldChartHeight) || chart.chartHeight; + + return { + x: horiz ? + axis.translate(pos + tickmarkOffset, null, null, old) + axis.transB : + axis.left + axis.offset + (axis.opposite ? ((old && chart.oldChartWidth) || chart.chartWidth) - axis.right - axis.left : 0), + + y: horiz ? + cHeight - axis.bottom + axis.offset - (axis.opposite ? axis.height : 0) : + cHeight - axis.translate(pos + tickmarkOffset, null, null, old) - axis.transB + }; + + }, + + /** + * Get the x, y position of the tick label + */ + getLabelPosition: function (x, y, label, horiz, labelOptions, tickmarkOffset, index, step) { + var axis = this.axis, + transA = axis.transA, + reversed = axis.reversed, + staggerLines = axis.staggerLines; + + x = x + labelOptions.x - (tickmarkOffset && horiz ? + tickmarkOffset * transA * (reversed ? -1 : 1) : 0); + y = y + labelOptions.y - (tickmarkOffset && !horiz ? + tickmarkOffset * transA * (reversed ? 1 : -1) : 0); + + // Vertically centered + if (!defined(labelOptions.y)) { + y += pInt(label.styles.lineHeight) * 0.9 - label.getBBox().height / 2; + } + + // Correct for staggered labels + if (staggerLines) { + y += (index / (step || 1) % staggerLines) * 16; + } + + return { + x: x, + y: y + }; + }, + + /** + * Extendible method to return the path of the marker + */ + getMarkPath: function (x, y, tickLength, tickWidth, horiz, renderer) { + return renderer.crispLine([ + M, + x, + y, + L, + x + (horiz ? 0 : -tickLength), + y + (horiz ? tickLength : 0) + ], tickWidth); + }, + + /** + * Put everything in place + * + * @param index {Number} + * @param old {Boolean} Use old coordinates to prepare an animation into new position + */ + render: function (index, old) { + var tick = this, + axis = tick.axis, + options = axis.options, + chart = axis.chart, + renderer = chart.renderer, + horiz = axis.horiz, + type = tick.type, + label = tick.label, + pos = tick.pos, + labelOptions = options.labels, + gridLine = tick.gridLine, + gridPrefix = type ? type + 'Grid' : 'grid', + tickPrefix = type ? type + 'Tick' : 'tick', + gridLineWidth = options[gridPrefix + 'LineWidth'], + gridLineColor = options[gridPrefix + 'LineColor'], + dashStyle = options[gridPrefix + 'LineDashStyle'], + tickLength = options[tickPrefix + 'Length'], + tickWidth = options[tickPrefix + 'Width'] || 0, + tickColor = options[tickPrefix + 'Color'], + tickPosition = options[tickPrefix + 'Position'], + gridLinePath, + mark = tick.mark, + markPath, + step = labelOptions.step, + attribs, + show = true, + tickmarkOffset = axis.tickmarkOffset, + xy = tick.getPosition(horiz, pos, tickmarkOffset, old), + x = xy.x, + y = xy.y, + staggerLines = axis.staggerLines; + + // create the grid line + if (gridLineWidth) { + gridLinePath = axis.getPlotLinePath(pos + tickmarkOffset, gridLineWidth, old); + + if (gridLine === UNDEFINED) { + attribs = { + stroke: gridLineColor, + 'stroke-width': gridLineWidth + }; + if (dashStyle) { + attribs.dashstyle = dashStyle; + } + if (!type) { + attribs.zIndex = 1; + } + tick.gridLine = gridLine = + gridLineWidth ? + renderer.path(gridLinePath) + .attr(attribs).add(axis.gridGroup) : + null; + } + + // If the parameter 'old' is set, the current call will be followed + // by another call, therefore do not do any animations this time + if (!old && gridLine && gridLinePath) { + gridLine[tick.isNew ? 'attr' : 'animate']({ + d: gridLinePath + }); + } + } + + // create the tick mark + if (tickWidth && tickLength) { + + // negate the length + if (tickPosition === 'inside') { + tickLength = -tickLength; + } + if (axis.opposite) { + tickLength = -tickLength; + } + + markPath = tick.getMarkPath(x, y, tickLength, tickWidth, horiz, renderer); + + if (mark) { // updating + mark.animate({ + d: markPath + }); + } else { // first time + tick.mark = renderer.path( + markPath + ).attr({ + stroke: tickColor, + 'stroke-width': tickWidth + }).add(axis.axisGroup); + } + } + + // the label is created on init - now move it into place + if (label && !isNaN(x)) { + label.xy = xy = tick.getLabelPosition(x, y, label, horiz, labelOptions, tickmarkOffset, index, step); + + // apply show first and show last + if ((tick.isFirst && !pick(options.showFirstLabel, 1)) || + (tick.isLast && !pick(options.showLastLabel, 1))) { + show = false; + + // Handle label overflow and show or hide accordingly + } else if (!staggerLines && horiz && labelOptions.overflow === 'justify' && !tick.handleOverflow(index, xy)) { + show = false; + } + + // apply step + if (step && index % step) { + // show those indices dividable by step + show = false; + } + + // Set the new position, and show or hide + if (show) { + label[tick.isNew ? 'attr' : 'animate'](xy); + label.show(); + tick.isNew = false; + } else { + label.hide(); + } + } + }, + + /** + * Destructor for the tick prototype + */ + destroy: function () { + destroyObjectProperties(this, this.axis); + } +}; + +/** + * The object wrapper for plot lines and plot bands + * @param {Object} options + */ +function PlotLineOrBand(axis, options) { + this.axis = axis; + + if (options) { + this.options = options; + this.id = options.id; + } + + //plotLine.render() + return this; +} + +PlotLineOrBand.prototype = { + + /** + * Render the plot line or plot band. If it is already existing, + * move it. + */ + render: function () { + var plotLine = this, + axis = plotLine.axis, + horiz = axis.horiz, + halfPointRange = (axis.pointRange || 0) / 2, + options = plotLine.options, + optionsLabel = options.label, + label = plotLine.label, + width = options.width, + to = options.to, + from = options.from, + isBand = defined(from) && defined(to), + value = options.value, + dashStyle = options.dashStyle, + svgElem = plotLine.svgElem, + path = [], + addEvent, + eventType, + xs, + ys, + x, + y, + color = options.color, + zIndex = options.zIndex, + events = options.events, + attribs, + renderer = axis.chart.renderer; + + // logarithmic conversion + if (axis.isLog) { + from = log2lin(from); + to = log2lin(to); + value = log2lin(value); + } + + // plot line + if (width) { + path = axis.getPlotLinePath(value, width); + attribs = { + stroke: color, + 'stroke-width': width + }; + if (dashStyle) { + attribs.dashstyle = dashStyle; + } + } else if (isBand) { // plot band + + // keep within plot area + from = mathMax(from, axis.min - halfPointRange); + to = mathMin(to, axis.max + halfPointRange); + + path = axis.getPlotBandPath(from, to, options); + attribs = { + fill: color + }; + if (options.borderWidth) { + attribs.stroke = options.borderColor; + attribs['stroke-width'] = options.borderWidth; + } + } else { + return; + } + // zIndex + if (defined(zIndex)) { + attribs.zIndex = zIndex; + } + + // common for lines and bands + if (svgElem) { + if (path) { + svgElem.animate({ + d: path + }, null, svgElem.onGetPath); + } else { + svgElem.hide(); + svgElem.onGetPath = function () { + svgElem.show(); + }; + } + } else if (path && path.length) { + plotLine.svgElem = svgElem = renderer.path(path) + .attr(attribs).add(); + + // events + if (events) { + addEvent = function (eventType) { + svgElem.on(eventType, function (e) { + events[eventType].apply(plotLine, [e]); + }); + }; + for (eventType in events) { + addEvent(eventType); + } + } + } + + // the plot band/line label + if (optionsLabel && defined(optionsLabel.text) && path && path.length && axis.width > 0 && axis.height > 0) { + // apply defaults + optionsLabel = merge({ + align: horiz && isBand && 'center', + x: horiz ? !isBand && 4 : 10, + verticalAlign : !horiz && isBand && 'middle', + y: horiz ? isBand ? 16 : 10 : isBand ? 6 : -4, + rotation: horiz && !isBand && 90 + }, optionsLabel); + + // add the SVG element + if (!label) { + plotLine.label = label = renderer.text( + optionsLabel.text, + 0, + 0 + ) + .attr({ + align: optionsLabel.textAlign || optionsLabel.align, + rotation: optionsLabel.rotation, + zIndex: zIndex + }) + .css(optionsLabel.style) + .add(); + } + + // get the bounding box and align the label + xs = [path[1], path[4], pick(path[6], path[1])]; + ys = [path[2], path[5], pick(path[7], path[2])]; + x = arrayMin(xs); + y = arrayMin(ys); + + label.align(optionsLabel, false, { + x: x, + y: y, + width: arrayMax(xs) - x, + height: arrayMax(ys) - y + }); + label.show(); + + } else if (label) { // move out of sight + label.hide(); + } + + // chainable + return plotLine; + }, + + /** + * Remove the plot line or band + */ + destroy: function () { + var plotLine = this, + axis = plotLine.axis; + + // remove it from the lookup + erase(axis.plotLinesAndBands, plotLine); + + destroyObjectProperties(plotLine, this.axis); + } +}; +/** + * The class for stack items + */ +function StackItem(axis, options, isNegative, x, stackOption) { + var inverted = axis.chart.inverted; + + this.axis = axis; + + // Tells if the stack is negative + this.isNegative = isNegative; + + // Save the options to be able to style the label + this.options = options; + + // Save the x value to be able to position the label later + this.x = x; + + // Save the stack option on the series configuration object + this.stack = stackOption; + + // The align options and text align varies on whether the stack is negative and + // if the chart is inverted or not. + // First test the user supplied value, then use the dynamic. + this.alignOptions = { + align: options.align || (inverted ? (isNegative ? 'left' : 'right') : 'center'), + verticalAlign: options.verticalAlign || (inverted ? 'middle' : (isNegative ? 'bottom' : 'top')), + y: pick(options.y, inverted ? 4 : (isNegative ? 14 : -6)), + x: pick(options.x, inverted ? (isNegative ? -6 : 6) : 0) + }; + + this.textAlign = options.textAlign || (inverted ? (isNegative ? 'right' : 'left') : 'center'); +} + +StackItem.prototype = { + destroy: function () { + destroyObjectProperties(this, this.axis); + }, + + /** + * Sets the total of this stack. Should be called when a serie is hidden or shown + * since that will affect the total of other stacks. + */ + setTotal: function (total) { + this.total = total; + this.cum = total; + }, + + /** + * Renders the stack total label and adds it to the stack label group. + */ + render: function (group) { + var str = this.options.formatter.call(this); // format the text in the label + + // Change the text to reflect the new total and set visibility to hidden in case the serie is hidden + if (this.label) { + this.label.attr({text: str, visibility: HIDDEN}); + // Create new label + } else { + this.label = + this.axis.chart.renderer.text(str, 0, 0) // dummy positions, actual position updated with setOffset method in columnseries + .css(this.options.style) // apply style + .attr({align: this.textAlign, // fix the text-anchor + rotation: this.options.rotation, // rotation + visibility: HIDDEN }) // hidden until setOffset is called + .add(group); // add to the labels-group + } + }, + + /** + * Sets the offset that the stack has from the x value and repositions the label. + */ + setOffset: function (xOffset, xWidth) { + var stackItem = this, + axis = stackItem.axis, + chart = axis.chart, + inverted = chart.inverted, + neg = this.isNegative, // special treatment is needed for negative stacks + y = axis.translate(this.total, 0, 0, 0, 1), // stack value translated mapped to chart coordinates + yZero = axis.translate(0), // stack origin + h = mathAbs(y - yZero), // stack height + x = chart.xAxis[0].translate(this.x) + xOffset, // stack x position + plotHeight = chart.plotHeight, + stackBox = { // this is the box for the complete stack + x: inverted ? (neg ? y : y - h) : x, + y: inverted ? plotHeight - x - xWidth : (neg ? (plotHeight - y - h) : plotHeight - y), + width: inverted ? h : xWidth, + height: inverted ? xWidth : h + }; + + if (this.label) { + this.label + .align(this.alignOptions, null, stackBox) // align the label to the box + .attr({visibility: VISIBLE}); // set visibility + } + + } +}; +/** + * Create a new axis object + * @param {Object} chart + * @param {Object} options + */ +function Axis() { + this.init.apply(this, arguments); +} + +Axis.prototype = { + + /** + * Default options for the X axis - the Y axis has extended defaults + */ + defaultOptions: { + // allowDecimals: null, + // alternateGridColor: null, + // categories: [], + dateTimeLabelFormats: { + millisecond: '%H:%M:%S.%L', + second: '%H:%M:%S', + minute: '%H:%M', + hour: '%H:%M', + day: '%e. %b', + week: '%e. %b', + month: '%b \'%y', + year: '%Y' + }, + endOnTick: false, + gridLineColor: '#C0C0C0', + // gridLineDashStyle: 'solid', + // gridLineWidth: 0, + // reversed: false, + + labels: defaultLabelOptions, + // { step: null }, + lineColor: '#C0D0E0', + lineWidth: 1, + //linkedTo: null, + //max: undefined, + //min: undefined, + minPadding: 0.01, + maxPadding: 0.01, + //minRange: null, + minorGridLineColor: '#E0E0E0', + // minorGridLineDashStyle: null, + minorGridLineWidth: 1, + minorTickColor: '#A0A0A0', + //minorTickInterval: null, + minorTickLength: 2, + minorTickPosition: 'outside', // inside or outside + //minorTickWidth: 0, + //opposite: false, + //offset: 0, + //plotBands: [{ + // events: {}, + // zIndex: 1, + // labels: { align, x, verticalAlign, y, style, rotation, textAlign } + //}], + //plotLines: [{ + // events: {} + // dashStyle: {} + // zIndex: + // labels: { align, x, verticalAlign, y, style, rotation, textAlign } + //}], + //reversed: false, + // showFirstLabel: true, + // showLastLabel: true, + startOfWeek: 1, + startOnTick: false, + tickColor: '#C0D0E0', + //tickInterval: null, + tickLength: 5, + tickmarkPlacement: 'between', // on or between + tickPixelInterval: 100, + tickPosition: 'outside', + tickWidth: 1, + title: { + //text: null, + align: 'middle', // low, middle or high + //margin: 0 for horizontal, 10 for vertical axes, + //rotation: 0, + //side: 'outside', + style: { + color: '#6D869F', + //font: defaultFont.replace('normal', 'bold') + fontWeight: 'bold' + } + //x: 0, + //y: 0 + }, + type: 'linear' // linear, logarithmic or datetime + }, + + /** + * This options set extends the defaultOptions for Y axes + */ + defaultYAxisOptions: { + endOnTick: true, + gridLineWidth: 1, + tickPixelInterval: 72, + showLastLabel: true, + labels: { + align: 'right', + x: -8, + y: 3 + }, + lineWidth: 0, + maxPadding: 0.05, + minPadding: 0.05, + startOnTick: true, + tickWidth: 0, + title: { + rotation: 270, + text: 'Y-values' + }, + stackLabels: { + enabled: false, + //align: dynamic, + //y: dynamic, + //x: dynamic, + //verticalAlign: dynamic, + //textAlign: dynamic, + //rotation: 0, + formatter: function () { + return this.total; + }, + style: defaultLabelOptions.style + } + }, + + /** + * These options extend the defaultOptions for left axes + */ + defaultLeftAxisOptions: { + labels: { + align: 'right', + x: -8, + y: null + }, + title: { + rotation: 270 + } + }, + + /** + * These options extend the defaultOptions for right axes + */ + defaultRightAxisOptions: { + labels: { + align: 'left', + x: 8, + y: null + }, + title: { + rotation: 90 + } + }, + + /** + * These options extend the defaultOptions for bottom axes + */ + defaultBottomAxisOptions: { + labels: { + align: 'center', + x: 0, + y: 14 + // overflow: undefined, + // staggerLines: null + }, + title: { + rotation: 0 + } + }, + /** + * These options extend the defaultOptions for left axes + */ + defaultTopAxisOptions: { + labels: { + align: 'center', + x: 0, + y: -5 + // overflow: undefined + // staggerLines: null + }, + title: { + rotation: 0 + } + }, + + /** + * Initialize the axis + */ + init: function (chart, userOptions) { + + + var isXAxis = userOptions.isX, + axis = this; + + // Flag, is the axis horizontal + axis.horiz = chart.inverted ? !isXAxis : isXAxis; + + // Flag, isXAxis + axis.isXAxis = isXAxis; + axis.xOrY = isXAxis ? 'x' : 'y'; + + + axis.opposite = userOptions.opposite; // needed in setOptions + axis.side = axis.horiz ? + (axis.opposite ? 0 : 2) : // top : bottom + (axis.opposite ? 1 : 3); // right : left + + axis.setOptions(userOptions); + + + var options = this.options, + type = options.type, + isDatetimeAxis = type === 'datetime'; + + axis.labelFormatter = options.labels.formatter || axis.defaultLabelFormatter; // can be overwritten by dynamic format + + + // Flag, stagger lines or not + axis.staggerLines = axis.horiz && options.labels.staggerLines; + axis.userOptions = userOptions; + + //axis.axisTitleMargin = UNDEFINED,// = options.title.margin, + axis.minPixelPadding = 0; + //axis.ignoreMinPadding = UNDEFINED; // can be set to true by a column or bar series + //axis.ignoreMaxPadding = UNDEFINED; + + axis.chart = chart; + axis.reversed = options.reversed; + + // Initial categories + axis.categories = options.categories; + + // Elements + //axis.axisGroup = UNDEFINED; + //axis.gridGroup = UNDEFINED; + //axis.axisTitle = UNDEFINED; + //axis.axisLine = UNDEFINED; + + // Flag if type === logarithmic + axis.isLog = type === 'logarithmic'; + + // Flag, if axis is linked to another axis + axis.isLinked = defined(options.linkedTo); + // Linked axis. + //axis.linkedParent = UNDEFINED; + + // Flag if type === datetime + axis.isDatetimeAxis = isDatetimeAxis; + + // Flag if percentage mode + //axis.usePercentage = UNDEFINED; + + + // Tick positions + //axis.tickPositions = UNDEFINED; // array containing predefined positions + // Tick intervals + //axis.tickInterval = UNDEFINED; + //axis.minorTickInterval = UNDEFINED; + + axis.tickmarkOffset = (options.categories && options.tickmarkPlacement === 'between') ? 0.5 : 0; + + // Major ticks + axis.ticks = {}; + // Minor ticks + axis.minorTicks = {}; + //axis.tickAmount = UNDEFINED; + + // List of plotLines/Bands + axis.plotLinesAndBands = []; + + // Alternate bands + axis.alternateBands = {}; + + // Axis metrics + //axis.left = UNDEFINED; + //axis.top = UNDEFINED; + //axis.width = UNDEFINED; + //axis.height = UNDEFINED; + //axis.bottom = UNDEFINED; + //axis.right = UNDEFINED; + //axis.transA = UNDEFINED; + //axis.transB = UNDEFINED; + //axis.oldTransA = UNDEFINED; + axis.len = 0; + //axis.oldMin = UNDEFINED; + //axis.oldMax = UNDEFINED; + //axis.oldUserMin = UNDEFINED; + //axis.oldUserMax = UNDEFINED; + //axis.oldAxisLength = UNDEFINED; + axis.minRange = axis.userMinRange = options.minRange || options.maxZoom; + axis.range = options.range; + axis.offset = options.offset || 0; + + + // Dictionary for stacks + axis.stacks = {}; + + // Min and max in the data + //axis.dataMin = UNDEFINED, + //axis.dataMax = UNDEFINED, + + // The axis range + axis.max = null; + axis.min = null; + + // User set min and max + //axis.userMin = UNDEFINED, + //axis.userMax = UNDEFINED, + + // Run Axis + + var eventType, + events = axis.options.events; + + // Register + chart.axes.push(axis); + chart[isXAxis ? 'xAxis' : 'yAxis'].push(axis); + + axis.series = []; // populated by Series + + // inverted charts have reversed xAxes as default + if (chart.inverted && isXAxis && axis.reversed === UNDEFINED) { + axis.reversed = true; + } + + axis.removePlotBand = axis.removePlotBandOrLine; + axis.removePlotLine = axis.removePlotBandOrLine; + axis.addPlotBand = axis.addPlotBandOrLine; + axis.addPlotLine = axis.addPlotBandOrLine; + + + // register event listeners + for (eventType in events) { + addEvent(axis, eventType, events[eventType]); + } + + // extend logarithmic axis + if (axis.isLog) { + axis.val2lin = log2lin; + axis.lin2val = lin2log; + } + }, + + /** + * Merge and set options + */ + setOptions: function (userOptions) { + this.options = merge( + this.defaultOptions, + this.isXAxis ? {} : this.defaultYAxisOptions, + [this.defaultTopAxisOptions, this.defaultRightAxisOptions, + this.defaultBottomAxisOptions, this.defaultLeftAxisOptions][this.side], + merge( + defaultOptions[this.isXAxis ? 'xAxis' : 'yAxis'], // if set in setOptions (#1053) + userOptions + ) + ); + }, + + + /** + * The default label formatter. The context is a special config object for the label. + */ + defaultLabelFormatter: function () { + var axis = this.axis, + value = this.value, + categories = axis.categories, + dateTimeLabelFormat = this.dateTimeLabelFormat, + numericSymbols = defaultOptions.lang.numericSymbols, + i = numericSymbols && numericSymbols.length, + multi, + ret, + + // make sure the same symbol is added for all labels on a linear axis + numericSymbolDetector = axis.isLog ? value : axis.tickInterval; + + if (categories) { + ret = value; + + } else if (dateTimeLabelFormat) { // datetime axis + ret = dateFormat(dateTimeLabelFormat, value); + + } else if (i && numericSymbolDetector >= 1000) { + // Decide whether we should add a numeric symbol like k (thousands) or M (millions). + // If we are to enable this in tooltip or other places as well, we can move this + // logic to the numberFormatter and enable it by a parameter. + while (i-- && ret === UNDEFINED) { + multi = Math.pow(1000, i + 1); + if (numericSymbolDetector >= multi && numericSymbols[i] !== null) { + ret = numberFormat(value / multi, -1) + numericSymbols[i]; + } + } + } + + if (ret === UNDEFINED) { + if (value >= 1000) { // add thousands separators + ret = numberFormat(value, 0); + + } else { // small numbers + ret = numberFormat(value, -1); + } + } + + return ret; + }, + + /** + * Get the minimum and maximum for the series of each axis + */ + getSeriesExtremes: function () { + var axis = this, + chart = axis.chart, + stacks = axis.stacks, + posStack = [], + negStack = [], + i; + + axis.hasVisibleSeries = false; + + // reset dataMin and dataMax in case we're redrawing + axis.dataMin = axis.dataMax = null; + + // loop through this axis' series + each(axis.series, function (series) { + + if (series.visible || !chart.options.chart.ignoreHiddenSeries) { + + var seriesOptions = series.options, + stacking, + posPointStack, + negPointStack, + stackKey, + stackOption, + negKey, + xData, + yData, + x, + y, + threshold = seriesOptions.threshold, + yDataLength, + activeYData = [], + activeCounter = 0; + + axis.hasVisibleSeries = true; + + // Validate threshold in logarithmic axes + if (axis.isLog && threshold <= 0) { + threshold = seriesOptions.threshold = null; + } + + // Get dataMin and dataMax for X axes + if (axis.isXAxis) { + xData = series.xData; + if (xData.length) { + axis.dataMin = mathMin(pick(axis.dataMin, xData[0]), arrayMin(xData)); + axis.dataMax = mathMax(pick(axis.dataMax, xData[0]), arrayMax(xData)); + } + + // Get dataMin and dataMax for Y axes, as well as handle stacking and processed data + } else { + var isNegative, + pointStack, + key, + cropped = series.cropped, + xExtremes = series.xAxis.getExtremes(), + //findPointRange, + //pointRange, + j, + hasModifyValue = !!series.modifyValue; + + + // Handle stacking + stacking = seriesOptions.stacking; + axis.usePercentage = stacking === 'percent'; + + // create a stack for this particular series type + if (stacking) { + stackOption = seriesOptions.stack; + stackKey = series.type + pick(stackOption, ''); + negKey = '-' + stackKey; + series.stackKey = stackKey; // used in translate + + posPointStack = posStack[stackKey] || []; // contains the total values for each x + posStack[stackKey] = posPointStack; + + negPointStack = negStack[negKey] || []; + negStack[negKey] = negPointStack; + } + if (axis.usePercentage) { + axis.dataMin = 0; + axis.dataMax = 99; + } + + // processData can alter series.pointRange, so this goes after + //findPointRange = series.pointRange === null; + + xData = series.processedXData; + yData = series.processedYData; + yDataLength = yData.length; + + // loop over the non-null y values and read them into a local array + for (i = 0; i < yDataLength; i++) { + x = xData[i]; + y = yData[i]; + if (y !== null && y !== UNDEFINED) { + + // read stacked values into a stack based on the x value, + // the sign of y and the stack key + if (stacking) { + isNegative = y < threshold; + pointStack = isNegative ? negPointStack : posPointStack; + key = isNegative ? negKey : stackKey; + + y = pointStack[x] = + defined(pointStack[x]) ? + pointStack[x] + y : y; + + + // add the series + if (!stacks[key]) { + stacks[key] = {}; + } + + // If the StackItem is there, just update the values, + // if not, create one first + if (!stacks[key][x]) { + stacks[key][x] = new StackItem(axis, axis.options.stackLabels, isNegative, x, stackOption); + } + stacks[key][x].setTotal(y); + + + // general hook, used for Highstock compare values feature + } else if (hasModifyValue) { + y = series.modifyValue(y); + } + + // get the smallest distance between points + /*if (i) { + distance = mathAbs(xData[i] - xData[i - 1]); + pointRange = pointRange === UNDEFINED ? distance : mathMin(distance, pointRange); + }*/ + + // for points within the visible range, including the first point outside the + // visible range, consider y extremes + if (cropped || ((xData[i + 1] || x) >= xExtremes.min && (xData[i - 1] || x) <= xExtremes.max)) { + + j = y.length; + if (j) { // array, like ohlc or range data + while (j--) { + if (y[j] !== null) { + activeYData[activeCounter++] = y[j]; + } + } + } else { + activeYData[activeCounter++] = y; + } + } + } + } + + // record the least unit distance + /*if (findPointRange) { + series.pointRange = pointRange || 1; + } + series.closestPointRange = pointRange;*/ + + // Get the dataMin and dataMax so far. If percentage is used, the min and max are + // always 0 and 100. If the length of activeYData is 0, continue with null values. + if (!axis.usePercentage && activeYData.length) { + axis.dataMin = mathMin(pick(axis.dataMin, activeYData[0]), arrayMin(activeYData)); + axis.dataMax = mathMax(pick(axis.dataMax, activeYData[0]), arrayMax(activeYData)); + } + + // Adjust to threshold + if (defined(threshold)) { + if (axis.dataMin >= threshold) { + axis.dataMin = threshold; + axis.ignoreMinPadding = true; + } else if (axis.dataMax < threshold) { + axis.dataMax = threshold; + axis.ignoreMaxPadding = true; + } + } + } + } + }); + + }, + + /** + * Translate from axis value to pixel position on the chart, or back + * + */ + translate: function (val, backwards, cvsCoord, old, handleLog, pointPlacementBetween) { + var axis = this, + axisLength = axis.len, + sign = 1, + cvsOffset = 0, + localA = old ? axis.oldTransA : axis.transA, + localMin = old ? axis.oldMin : axis.min, + returnValue, + postTranslate = axis.options.ordinal || (axis.isLog && handleLog); + + if (!localA) { + localA = axis.transA; + } + + if (cvsCoord) { + sign *= -1; // canvas coordinates inverts the value + cvsOffset = axisLength; + } + if (axis.reversed) { // reversed axis + sign *= -1; + cvsOffset -= sign * axisLength; + } + + if (backwards) { // reverse translation + if (axis.reversed) { + val = axisLength - val; + } + returnValue = val / localA + localMin; // from chart pixel to value + if (postTranslate) { // log and ordinal axes + returnValue = axis.lin2val(returnValue); + } + + } else { // normal translation, from axis value to pixel, relative to plot + if (postTranslate) { // log and ordinal axes + val = axis.val2lin(val); + } + + returnValue = sign * (val - localMin) * localA + cvsOffset + (sign * axis.minPixelPadding) + + (pointPlacementBetween ? localA * axis.pointRange / 2 : 0); + } + + return returnValue; + }, + + /** + * Create the path for a plot line that goes from the given value on + * this axis, across the plot to the opposite side + * @param {Number} value + * @param {Number} lineWidth Used for calculation crisp line + * @param {Number] old Use old coordinates (for resizing and rescaling) + */ + getPlotLinePath: function (value, lineWidth, old) { + var axis = this, + chart = axis.chart, + axisLeft = axis.left, + axisTop = axis.top, + x1, + y1, + x2, + y2, + translatedValue = axis.translate(value, null, null, old), + cHeight = (old && chart.oldChartHeight) || chart.chartHeight, + cWidth = (old && chart.oldChartWidth) || chart.chartWidth, + skip, + transB = axis.transB; + + x1 = x2 = mathRound(translatedValue + transB); + y1 = y2 = mathRound(cHeight - translatedValue - transB); + + if (isNaN(translatedValue)) { // no min or max + skip = true; + + } else if (axis.horiz) { + y1 = axisTop; + y2 = cHeight - axis.bottom; + if (x1 < axisLeft || x1 > axisLeft + axis.width) { + skip = true; + } + } else { + x1 = axisLeft; + x2 = cWidth - axis.right; + + if (y1 < axisTop || y1 > axisTop + axis.height) { + skip = true; + } + } + return skip ? + null : + chart.renderer.crispLine([M, x1, y1, L, x2, y2], lineWidth || 0); + }, + + /** + * Create the path for a plot band + */ + getPlotBandPath: function (from, to) { + + var toPath = this.getPlotLinePath(to), + path = this.getPlotLinePath(from); + + if (path && toPath) { + path.push( + toPath[4], + toPath[5], + toPath[1], + toPath[2] + ); + } else { // outside the axis area + path = null; + } + + return path; + }, + + /** + * Set the tick positions of a linear axis to round values like whole tens or every five. + */ + getLinearTickPositions: function (tickInterval, min, max) { + var pos, + lastPos, + roundedMin = correctFloat(mathFloor(min / tickInterval) * tickInterval), + roundedMax = correctFloat(mathCeil(max / tickInterval) * tickInterval), + tickPositions = []; + + // Populate the intermediate values + pos = roundedMin; + while (pos <= roundedMax) { + + // Place the tick on the rounded value + tickPositions.push(pos); + + // Always add the raw tickInterval, not the corrected one. + pos = correctFloat(pos + tickInterval); + + // If the interval is not big enough in the current min - max range to actually increase + // the loop variable, we need to break out to prevent endless loop. Issue #619 + if (pos === lastPos) { + break; + } + + // Record the last value + lastPos = pos; + } + return tickPositions; + }, + + /** + * Set the tick positions of a logarithmic axis + */ + getLogTickPositions: function (interval, min, max, minor) { + var axis = this, + options = axis.options, + axisLength = axis.len; + + // Since we use this method for both major and minor ticks, + // use a local variable and return the result + var positions = []; + + // Reset + if (!minor) { + axis._minorAutoInterval = null; + } + + // First case: All ticks fall on whole logarithms: 1, 10, 100 etc. + if (interval >= 0.5) { + interval = mathRound(interval); + positions = axis.getLinearTickPositions(interval, min, max); + + // Second case: We need intermediary ticks. For example + // 1, 2, 4, 6, 8, 10, 20, 40 etc. + } else if (interval >= 0.08) { + var roundedMin = mathFloor(min), + intermediate, + i, + j, + len, + pos, + lastPos, + break2; + + if (interval > 0.3) { + intermediate = [1, 2, 4]; + } else if (interval > 0.15) { // 0.2 equals five minor ticks per 1, 10, 100 etc + intermediate = [1, 2, 4, 6, 8]; + } else { // 0.1 equals ten minor ticks per 1, 10, 100 etc + intermediate = [1, 2, 3, 4, 5, 6, 7, 8, 9]; + } + + for (i = roundedMin; i < max + 1 && !break2; i++) { + len = intermediate.length; + for (j = 0; j < len && !break2; j++) { + pos = log2lin(lin2log(i) * intermediate[j]); + + if (pos > min) { + positions.push(lastPos); + } + + if (lastPos > max) { + break2 = true; + } + lastPos = pos; + } + } + + // Third case: We are so deep in between whole logarithmic values that + // we might as well handle the tick positions like a linear axis. For + // example 1.01, 1.02, 1.03, 1.04. + } else { + var realMin = lin2log(min), + realMax = lin2log(max), + tickIntervalOption = options[minor ? 'minorTickInterval' : 'tickInterval'], + filteredTickIntervalOption = tickIntervalOption === 'auto' ? null : tickIntervalOption, + tickPixelIntervalOption = options.tickPixelInterval / (minor ? 5 : 1), + totalPixelLength = minor ? axisLength / axis.tickPositions.length : axisLength; + + interval = pick( + filteredTickIntervalOption, + axis._minorAutoInterval, + (realMax - realMin) * tickPixelIntervalOption / (totalPixelLength || 1) + ); + + interval = normalizeTickInterval( + interval, + null, + math.pow(10, mathFloor(math.log(interval) / math.LN10)) + ); + + positions = map(axis.getLinearTickPositions( + interval, + realMin, + realMax + ), log2lin); + + if (!minor) { + axis._minorAutoInterval = interval / 5; + } + } + + // Set the axis-level tickInterval variable + if (!minor) { + axis.tickInterval = interval; + } + return positions; + }, + + /** + * Return the minor tick positions. For logarithmic axes, reuse the same logic + * as for major ticks. + */ + getMinorTickPositions: function () { + var axis = this, + tickPositions = axis.tickPositions, + minorTickInterval = axis.minorTickInterval; + + var minorTickPositions = [], + pos, + i, + len; + + if (axis.isLog) { + len = tickPositions.length; + for (i = 1; i < len; i++) { + minorTickPositions = minorTickPositions.concat( + axis.getLogTickPositions(minorTickInterval, tickPositions[i - 1], tickPositions[i], true) + ); + } + + } else { + for (pos = axis.min + (tickPositions[0] - axis.min) % minorTickInterval; pos <= axis.max; pos += minorTickInterval) { + minorTickPositions.push(pos); + } + } + + return minorTickPositions; + }, + + /** + * Adjust the min and max for the minimum range. Keep in mind that the series data is + * not yet processed, so we don't have information on data cropping and grouping, or + * updated axis.pointRange or series.pointRange. The data can't be processed until + * we have finally established min and max. + */ + adjustForMinRange: function () { + var axis = this, + options = axis.options, + min = axis.min, + max = axis.max, + zoomOffset, + spaceAvailable = axis.dataMax - axis.dataMin >= axis.minRange, + closestDataRange, + i, + distance, + xData, + loopLength, + minArgs, + maxArgs; + + // Set the automatic minimum range based on the closest point distance + if (axis.isXAxis && axis.minRange === UNDEFINED && !axis.isLog) { + + if (defined(options.min) || defined(options.max)) { + axis.minRange = null; // don't do this again + + } else { + + // Find the closest distance between raw data points, as opposed to + // closestPointRange that applies to processed points (cropped and grouped) + each(axis.series, function (series) { + xData = series.xData; + loopLength = series.xIncrement ? 1 : xData.length - 1; + for (i = loopLength; i > 0; i--) { + distance = xData[i] - xData[i - 1]; + if (closestDataRange === UNDEFINED || distance < closestDataRange) { + closestDataRange = distance; + } + } + }); + axis.minRange = mathMin(closestDataRange * 5, axis.dataMax - axis.dataMin); + } + } + + // if minRange is exceeded, adjust + if (max - min < axis.minRange) { + var minRange = axis.minRange; + zoomOffset = (minRange - max + min) / 2; + + // if min and max options have been set, don't go beyond it + minArgs = [min - zoomOffset, pick(options.min, min - zoomOffset)]; + if (spaceAvailable) { // if space is available, stay within the data range + minArgs[2] = axis.dataMin; + } + min = arrayMax(minArgs); + + maxArgs = [min + minRange, pick(options.max, min + minRange)]; + if (spaceAvailable) { // if space is availabe, stay within the data range + maxArgs[2] = axis.dataMax; + } + + max = arrayMin(maxArgs); + + // now if the max is adjusted, adjust the min back + if (max - min < minRange) { + minArgs[0] = max - minRange; + minArgs[1] = pick(options.min, max - minRange); + min = arrayMax(minArgs); + } + } + + // Record modified extremes + axis.min = min; + axis.max = max; + }, + + /** + * Update translation information + */ + setAxisTranslation: function () { + var axis = this, + range = axis.max - axis.min, + pointRange = 0, + closestPointRange, + minPointOffset = 0, + pointRangePadding = 0, + transA = axis.transA; + + // adjust translation for padding + if (axis.isXAxis) { + if (axis.isLinked) { + minPointOffset = axis.linkedParent.minPointOffset; + } else { + each(axis.series, function (series) { + var seriesPointRange = series.pointRange, + pointPlacement = series.options.pointPlacement, + seriesClosestPointRange = series.closestPointRange; + + pointRange = mathMax(pointRange, seriesPointRange); + + // minPointOffset is the value padding to the left of the axis in order to make + // room for points with a pointRange, typically columns. When the pointPlacement option + // is 'between' or 'on', this padding does not apply. + minPointOffset = mathMax( + minPointOffset, + pointPlacement ? 0 : seriesPointRange / 2 + ); + + // Determine the total padding needed to the length of the axis to make room for the + // pointRange. If the series' pointPlacement is 'on', no padding is added. + pointRangePadding = mathMax( + pointRangePadding, + pointPlacement === 'on' ? 0 : seriesPointRange + ); + + // Set the closestPointRange + if (!series.noSharedTooltip && defined(seriesClosestPointRange)) { + closestPointRange = defined(closestPointRange) ? + mathMin(closestPointRange, seriesClosestPointRange) : + seriesClosestPointRange; + } + }); + } + + // Record minPointOffse + axis.minPointOffset = minPointOffset; + + // pointRange means the width reserved for each point, like in a column chart + axis.pointRange = pointRange; + + // closestPointRange means the closest distance between points. In columns + // it is mostly equal to pointRange, but in lines pointRange is 0 while closestPointRange + // is some other value + axis.closestPointRange = closestPointRange; + } + + // secondary values + axis.oldTransA = transA; + //axis.translationSlope = axis.transA = transA = axis.len / ((range + (2 * minPointOffset)) || 1); + axis.translationSlope = axis.transA = transA = axis.len / ((range + pointRangePadding) || 1); + axis.transB = axis.horiz ? axis.left : axis.bottom; // translation addend + axis.minPixelPadding = transA * minPointOffset; + }, + + /** + * Set the tick positions to round values and optionally extend the extremes + * to the nearest tick + */ + setTickPositions: function (secondPass) { + var axis = this, + chart = axis.chart, + options = axis.options, + isLog = axis.isLog, + isDatetimeAxis = axis.isDatetimeAxis, + isXAxis = axis.isXAxis, + isLinked = axis.isLinked, + tickPositioner = axis.options.tickPositioner, + magnitude, + maxPadding = options.maxPadding, + minPadding = options.minPadding, + length, + linkedParentExtremes, + tickIntervalOption = options.tickInterval, + minTickIntervalOption = options.minTickInterval, + tickPixelIntervalOption = options.tickPixelInterval, + tickPositions, + categories = axis.categories; + + // linked axis gets the extremes from the parent axis + if (isLinked) { + axis.linkedParent = chart[isXAxis ? 'xAxis' : 'yAxis'][options.linkedTo]; + linkedParentExtremes = axis.linkedParent.getExtremes(); + axis.min = pick(linkedParentExtremes.min, linkedParentExtremes.dataMin); + axis.max = pick(linkedParentExtremes.max, linkedParentExtremes.dataMax); + if (options.type !== axis.linkedParent.options.type) { + error(11, 1); // Can't link axes of different type + } + } else { // initial min and max from the extreme data values + axis.min = pick(axis.userMin, options.min, axis.dataMin); + axis.max = pick(axis.userMax, options.max, axis.dataMax); + } + + if (isLog) { + if (!secondPass && mathMin(axis.min, pick(axis.dataMin, axis.min)) <= 0) { // #978 + error(10, 1); // Can't plot negative values on log axis + } + axis.min = correctFloat(log2lin(axis.min)); // correctFloat cures #934 + axis.max = correctFloat(log2lin(axis.max)); + } + + // handle zoomed range + if (axis.range) { + axis.userMin = axis.min = mathMax(axis.min, axis.max - axis.range); // #618 + axis.userMax = axis.max; + if (secondPass) { + axis.range = null; // don't use it when running setExtremes + } + } + + // adjust min and max for the minimum range + axis.adjustForMinRange(); + + // pad the values to get clear of the chart's edges + if (!categories && !axis.usePercentage && !isLinked && defined(axis.min) && defined(axis.max)) { + length = (axis.max - axis.min) || 1; + if (!defined(options.min) && !defined(axis.userMin) && minPadding && (axis.dataMin < 0 || !axis.ignoreMinPadding)) { + axis.min -= length * minPadding; + } + if (!defined(options.max) && !defined(axis.userMax) && maxPadding && (axis.dataMax > 0 || !axis.ignoreMaxPadding)) { + axis.max += length * maxPadding; + } + } + + // get tickInterval + if (axis.min === axis.max || axis.min === undefined || axis.max === undefined) { + axis.tickInterval = 1; + } else if (isLinked && !tickIntervalOption && + tickPixelIntervalOption === axis.linkedParent.options.tickPixelInterval) { + axis.tickInterval = axis.linkedParent.tickInterval; + } else { + axis.tickInterval = pick( + tickIntervalOption, + categories ? // for categoried axis, 1 is default, for linear axis use tickPix + 1 : + (axis.max - axis.min) * tickPixelIntervalOption / (axis.len || 1) + ); + } + + // Now we're finished detecting min and max, crop and group series data. This + // is in turn needed in order to find tick positions in ordinal axes. + if (isXAxis && !secondPass) { + each(axis.series, function (series) { + series.processData(axis.min !== axis.oldMin || axis.max !== axis.oldMax); + }); + } + + // set the translation factor used in translate function + axis.setAxisTranslation(secondPass); + + // hook for ordinal axes and radial axes + if (axis.beforeSetTickPositions) { + axis.beforeSetTickPositions(); + } + + // hook for extensions, used in Highstock ordinal axes + if (axis.postProcessTickInterval) { + axis.tickInterval = axis.postProcessTickInterval(axis.tickInterval); + } + + // Before normalizing the tick interval, handle minimum tick interval. This applies only if tickInterval is not defined. + if (!tickIntervalOption && axis.tickInterval < minTickIntervalOption) { + axis.tickInterval = minTickIntervalOption; + } + + // for linear axes, get magnitude and normalize the interval + if (!isDatetimeAxis && !isLog) { // linear + magnitude = math.pow(10, mathFloor(math.log(axis.tickInterval) / math.LN10)); + if (!tickIntervalOption) { + axis.tickInterval = normalizeTickInterval(axis.tickInterval, null, magnitude, options); + } + } + + // get minorTickInterval + axis.minorTickInterval = options.minorTickInterval === 'auto' && axis.tickInterval ? + axis.tickInterval / 5 : options.minorTickInterval; + + // find the tick positions + axis.tickPositions = tickPositions = options.tickPositions || (tickPositioner && tickPositioner.apply(axis, [axis.min, axis.max])); + if (!tickPositions) { + if (isDatetimeAxis) { + tickPositions = (axis.getNonLinearTimeTicks || getTimeTicks)( + normalizeTimeTickInterval(axis.tickInterval, options.units), + axis.min, + axis.max, + options.startOfWeek, + axis.ordinalPositions, + axis.closestPointRange, + true + ); + } else if (isLog) { + tickPositions = axis.getLogTickPositions(axis.tickInterval, axis.min, axis.max); + } else { + tickPositions = axis.getLinearTickPositions(axis.tickInterval, axis.min, axis.max); + } + axis.tickPositions = tickPositions; + } + + if (!isLinked) { + + // reset min/max or remove extremes based on start/end on tick + var roundedMin = tickPositions[0], + roundedMax = tickPositions[tickPositions.length - 1], + minPointOffset = axis.minPointOffset || 0; + + if (options.startOnTick) { + axis.min = roundedMin; + } else if (axis.min - minPointOffset > roundedMin) { + tickPositions.shift(); + } + + if (options.endOnTick) { + axis.max = roundedMax; + } else if (axis.max + minPointOffset < roundedMax) { + tickPositions.pop(); + } + + } + }, + + /** + * Set the max ticks of either the x and y axis collection + */ + setMaxTicks: function () { + + var chart = this.chart, + maxTicks = chart.maxTicks, + tickPositions = this.tickPositions, + xOrY = this.xOrY; + + if (!maxTicks) { // first call, or maxTicks have been reset after a zoom operation + maxTicks = { + x: 0, + y: 0 + }; + } + + if (!this.isLinked && !this.isDatetimeAxis && tickPositions.length > maxTicks[xOrY] && this.options.alignTicks !== false) { + maxTicks[xOrY] = tickPositions.length; + } + chart.maxTicks = maxTicks; + }, + + /** + * When using multiple axes, adjust the number of ticks to match the highest + * number of ticks in that group + */ + adjustTickAmount: function () { + var axis = this, + chart = axis.chart, + xOrY = axis.xOrY, + tickPositions = axis.tickPositions, + maxTicks = chart.maxTicks; + + if (maxTicks && maxTicks[xOrY] && !axis.isDatetimeAxis && !axis.categories && !axis.isLinked && axis.options.alignTicks !== false) { // only apply to linear scale + var oldTickAmount = axis.tickAmount, + calculatedTickAmount = tickPositions.length, + tickAmount; + + // set the axis-level tickAmount to use below + axis.tickAmount = tickAmount = maxTicks[xOrY]; + + if (calculatedTickAmount < tickAmount) { + while (tickPositions.length < tickAmount) { + tickPositions.push(correctFloat( + tickPositions[tickPositions.length - 1] + axis.tickInterval + )); + } + axis.transA *= (calculatedTickAmount - 1) / (tickAmount - 1); + axis.max = tickPositions[tickPositions.length - 1]; + + } + if (defined(oldTickAmount) && tickAmount !== oldTickAmount) { + axis.isDirty = true; + } + } + }, + + /** + * Set the scale based on data min and max, user set min and max or options + * + */ + setScale: function () { + var axis = this, + stacks = axis.stacks, + type, + i, + isDirtyData, + isDirtyAxisLength; + + axis.oldMin = axis.min; + axis.oldMax = axis.max; + axis.oldAxisLength = axis.len; + + // set the new axisLength + axis.setAxisSize(); + //axisLength = horiz ? axisWidth : axisHeight; + isDirtyAxisLength = axis.len !== axis.oldAxisLength; + + // is there new data? + each(axis.series, function (series) { + if (series.isDirtyData || series.isDirty || + series.xAxis.isDirty) { // when x axis is dirty, we need new data extremes for y as well + isDirtyData = true; + } + }); + + // do we really need to go through all this? + if (isDirtyAxisLength || isDirtyData || axis.isLinked || + axis.userMin !== axis.oldUserMin || axis.userMax !== axis.oldUserMax) { + + // get data extremes if needed + axis.getSeriesExtremes(); + + // get fixed positions based on tickInterval + axis.setTickPositions(); + + // record old values to decide whether a rescale is necessary later on (#540) + axis.oldUserMin = axis.userMin; + axis.oldUserMax = axis.userMax; + + // Mark as dirty if it is not already set to dirty and extremes have changed. #595. + if (!axis.isDirty) { + axis.isDirty = isDirtyAxisLength || axis.min !== axis.oldMin || axis.max !== axis.oldMax; + } + } + + + // reset stacks + if (!axis.isXAxis) { + for (type in stacks) { + for (i in stacks[type]) { + stacks[type][i].cum = stacks[type][i].total; + } + } + } + + // Set the maximum tick amount + axis.setMaxTicks(); + }, + + /** + * Set the extremes and optionally redraw + * @param {Number} newMin + * @param {Number} newMax + * @param {Boolean} redraw + * @param {Boolean|Object} animation Whether to apply animation, and optionally animation + * configuration + * @param {Object} eventArguments + * + */ + setExtremes: function (newMin, newMax, redraw, animation, eventArguments) { + var axis = this, + chart = axis.chart; + + redraw = pick(redraw, true); // defaults to true + + // Extend the arguments with min and max + eventArguments = extend(eventArguments, { + min: newMin, + max: newMax + }); + + // Fire the event + fireEvent(axis, 'setExtremes', eventArguments, function () { // the default event handler + + axis.userMin = newMin; + axis.userMax = newMax; + + // Mark for running afterSetExtremes + axis.isDirtyExtremes = true; + + // redraw + if (redraw) { + chart.redraw(animation); + } + }); + }, + + /** + * Overridable method for zooming chart. Pulled out in a separate method to allow overriding + * in stock charts. + */ + zoom: function (newMin, newMax) { + this.setExtremes(newMin, newMax, false, UNDEFINED, { trigger: 'zoom' }); + return true; + }, + + /** + * Update the axis metrics + */ + setAxisSize: function () { + var axis = this, + chart = axis.chart, + options = axis.options; + + var offsetLeft = options.offsetLeft || 0, + offsetRight = options.offsetRight || 0; + + // basic values + // expose to use in Series object and navigator + axis.left = pick(options.left, chart.plotLeft + offsetLeft); + axis.top = pick(options.top, chart.plotTop); + axis.width = pick(options.width, chart.plotWidth - offsetLeft + offsetRight); + axis.height = pick(options.height, chart.plotHeight); + axis.bottom = chart.chartHeight - axis.height - axis.top; + axis.right = chart.chartWidth - axis.width - axis.left; + axis.len = mathMax(axis.horiz ? axis.width : axis.height, 0); // mathMax fixes #905 + }, + + /** + * Get the actual axis extremes + */ + getExtremes: function () { + var axis = this, + isLog = axis.isLog; + + return { + min: isLog ? correctFloat(lin2log(axis.min)) : axis.min, + max: isLog ? correctFloat(lin2log(axis.max)) : axis.max, + dataMin: axis.dataMin, + dataMax: axis.dataMax, + userMin: axis.userMin, + userMax: axis.userMax + }; + }, + + /** + * Get the zero plane either based on zero or on the min or max value. + * Used in bar and area plots + */ + getThreshold: function (threshold) { + var axis = this, + isLog = axis.isLog; + + var realMin = isLog ? lin2log(axis.min) : axis.min, + realMax = isLog ? lin2log(axis.max) : axis.max; + + if (realMin > threshold || threshold === null) { + threshold = realMin; + } else if (realMax < threshold) { + threshold = realMax; + } + + return axis.translate(threshold, 0, 1, 0, 1); + }, + + /** + * Add a plot band or plot line after render time + * + * @param options {Object} The plotBand or plotLine configuration object + */ + addPlotBandOrLine: function (options) { + var obj = new PlotLineOrBand(this, options).render(); + this.plotLinesAndBands.push(obj); + return obj; + }, + + /** + * Render the tick labels to a preliminary position to get their sizes + */ + getOffset: function () { + var axis = this, + chart = axis.chart, + renderer = chart.renderer, + options = axis.options, + tickPositions = axis.tickPositions, + ticks = axis.ticks, + horiz = axis.horiz, + side = axis.side, + hasData, + showAxis, + titleOffset = 0, + titleOffsetOption, + titleMargin = 0, + axisTitleOptions = options.title, + labelOptions = options.labels, + labelOffset = 0, // reset + axisOffset = chart.axisOffset, + directionFactor = [-1, 1, 1, -1][side], + n; + + + // For reuse in Axis.render + axis.hasData = hasData = (axis.hasVisibleSeries || (defined(axis.min) && defined(axis.max) && !!tickPositions)); + axis.showAxis = showAxis = hasData || pick(options.showEmpty, true); + + + // Create the axisGroup and gridGroup elements on first iteration + if (!axis.axisGroup) { + axis.gridGroup = renderer.g('grid') + .attr({ zIndex: options.gridZIndex || 1 }) + .add(); + axis.axisGroup = renderer.g('axis') + .attr({ zIndex: options.zIndex || 2 }) + .add(); + axis.labelGroup = renderer.g('axis-labels') + .attr({ zIndex: labelOptions.zIndex || 7 }) + .add(); + } + + if (hasData || axis.isLinked) { + each(tickPositions, function (pos) { + if (!ticks[pos]) { + ticks[pos] = new Tick(axis, pos); + } else { + ticks[pos].addLabel(); // update labels depending on tick interval + } + + }); + + each(tickPositions, function (pos) { + // left side must be align: right and right side must have align: left for labels + if (side === 0 || side === 2 || { 1: 'left', 3: 'right' }[side] === labelOptions.align) { + + // get the highest offset + labelOffset = mathMax( + ticks[pos].getLabelSize(), + labelOffset + ); + } + + }); + + if (axis.staggerLines) { + labelOffset += (axis.staggerLines - 1) * 16; + } + + } else { // doesn't have data + for (n in ticks) { + ticks[n].destroy(); + delete ticks[n]; + } + } + + if (axisTitleOptions && axisTitleOptions.text) { + if (!axis.axisTitle) { + axis.axisTitle = renderer.text( + axisTitleOptions.text, + 0, + 0, + axisTitleOptions.useHTML + ) + .attr({ + zIndex: 7, + rotation: axisTitleOptions.rotation || 0, + align: + axisTitleOptions.textAlign || + { low: 'left', middle: 'center', high: 'right' }[axisTitleOptions.align] + }) + .css(axisTitleOptions.style) + .add(axis.axisGroup); + axis.axisTitle.isNew = true; + } + + if (showAxis) { + titleOffset = axis.axisTitle.getBBox()[horiz ? 'height' : 'width']; + titleMargin = pick(axisTitleOptions.margin, horiz ? 5 : 10); + titleOffsetOption = axisTitleOptions.offset; + } + + // hide or show the title depending on whether showEmpty is set + axis.axisTitle[showAxis ? 'show' : 'hide'](); + } + + // handle automatic or user set offset + axis.offset = directionFactor * pick(options.offset, axisOffset[side]); + + + axis.axisTitleMargin = + pick(titleOffsetOption, + labelOffset + titleMargin + + (side !== 2 && labelOffset && directionFactor * options.labels[horiz ? 'y' : 'x']) + ); + + axisOffset[side] = mathMax( + axisOffset[side], + axis.axisTitleMargin + titleOffset + directionFactor * axis.offset + ); + + }, + + /** + * Get the path for the axis line + */ + getLinePath: function (lineWidth) { + var chart = this.chart, + opposite = this.opposite, + offset = this.offset, + horiz = this.horiz, + lineLeft = this.left + (opposite ? this.width : 0) + offset, + lineTop = chart.chartHeight - this.bottom - (opposite ? this.height : 0) + offset; + + this.lineTop = lineTop; // used by flag series + + return chart.renderer.crispLine([ + M, + horiz ? + this.left : + lineLeft, + horiz ? + lineTop : + this.top, + L, + horiz ? + chart.chartWidth - this.right : + lineLeft, + horiz ? + lineTop : + chart.chartHeight - this.bottom + ], lineWidth); + }, + + /** + * Position the title + */ + getTitlePosition: function () { + // compute anchor points for each of the title align options + var horiz = this.horiz, + axisLeft = this.left, + axisTop = this.top, + axisLength = this.len, + axisTitleOptions = this.options.title, + margin = horiz ? axisLeft : axisTop, + opposite = this.opposite, + offset = this.offset, + fontSize = pInt(axisTitleOptions.style.fontSize || 12), + + // the position in the length direction of the axis + alongAxis = { + low: margin + (horiz ? 0 : axisLength), + middle: margin + axisLength / 2, + high: margin + (horiz ? axisLength : 0) + }[axisTitleOptions.align], + + // the position in the perpendicular direction of the axis + offAxis = (horiz ? axisTop + this.height : axisLeft) + + (horiz ? 1 : -1) * // horizontal axis reverses the margin + (opposite ? -1 : 1) * // so does opposite axes + this.axisTitleMargin + + (this.side === 2 ? fontSize : 0); + + return { + x: horiz ? + alongAxis : + offAxis + (opposite ? this.width : 0) + offset + + (axisTitleOptions.x || 0), // x + y: horiz ? + offAxis - (opposite ? this.height : 0) + offset : + alongAxis + (axisTitleOptions.y || 0) // y + }; + }, + + /** + * Render the axis + */ + render: function () { + var axis = this, + chart = axis.chart, + renderer = chart.renderer, + options = axis.options, + isLog = axis.isLog, + isLinked = axis.isLinked, + tickPositions = axis.tickPositions, + axisTitle = axis.axisTitle, + stacks = axis.stacks, + ticks = axis.ticks, + minorTicks = axis.minorTicks, + alternateBands = axis.alternateBands, + stackLabelOptions = options.stackLabels, + alternateGridColor = options.alternateGridColor, + tickmarkOffset = axis.tickmarkOffset, + lineWidth = options.lineWidth, + linePath, + hasRendered = chart.hasRendered, + slideInTicks = hasRendered && defined(axis.oldMin) && !isNaN(axis.oldMin), + hasData = axis.hasData, + showAxis = axis.showAxis, + from, + to; + + // If the series has data draw the ticks. Else only the line and title + if (hasData || isLinked) { + + // minor ticks + if (axis.minorTickInterval && !axis.categories) { + each(axis.getMinorTickPositions(), function (pos) { + if (!minorTicks[pos]) { + minorTicks[pos] = new Tick(axis, pos, 'minor'); + } + + // render new ticks in old position + if (slideInTicks && minorTicks[pos].isNew) { + minorTicks[pos].render(null, true); + } + + + minorTicks[pos].isActive = true; + minorTicks[pos].render(); + }); + } + + // Major ticks. Pull out the first item and render it last so that + // we can get the position of the neighbour label. #808. + each(tickPositions.slice(1).concat([tickPositions[0]]), function (pos, i) { + + // Reorganize the indices + i = (i === tickPositions.length - 1) ? 0 : i + 1; + + // linked axes need an extra check to find out if + if (!isLinked || (pos >= axis.min && pos <= axis.max)) { + + if (!ticks[pos]) { + ticks[pos] = new Tick(axis, pos); + } + + // render new ticks in old position + if (slideInTicks && ticks[pos].isNew) { + ticks[pos].render(i, true); + } + + ticks[pos].isActive = true; + ticks[pos].render(i); + } + + }); + + // alternate grid color + if (alternateGridColor) { + each(tickPositions, function (pos, i) { + if (i % 2 === 0 && pos < axis.max) { + if (!alternateBands[pos]) { + alternateBands[pos] = new PlotLineOrBand(axis); + } + from = pos + tickmarkOffset; // #949 + to = tickPositions[i + 1] !== UNDEFINED ? tickPositions[i + 1] + tickmarkOffset : axis.max; + alternateBands[pos].options = { + from: isLog ? lin2log(from) : from, + to: isLog ? lin2log(to) : to, + color: alternateGridColor + }; + alternateBands[pos].render(); + alternateBands[pos].isActive = true; + } + }); + } + + // custom plot lines and bands + if (!axis._addedPlotLB) { // only first time + each((options.plotLines || []).concat(options.plotBands || []), function (plotLineOptions) { + //plotLinesAndBands.push(new PlotLineOrBand(plotLineOptions).render()); + axis.addPlotBandOrLine(plotLineOptions); + }); + axis._addedPlotLB = true; + } + + } // end if hasData + + // remove inactive ticks + each([ticks, minorTicks, alternateBands], function (coll) { + var pos; + for (pos in coll) { + if (!coll[pos].isActive) { + coll[pos].destroy(); + delete coll[pos]; + } else { + coll[pos].isActive = false; // reset + } + } + }); + + // Static items. As the axis group is cleared on subsequent calls + // to render, these items are added outside the group. + // axis line + if (lineWidth) { + linePath = axis.getLinePath(lineWidth); + if (!axis.axisLine) { + axis.axisLine = renderer.path(linePath) + .attr({ + stroke: options.lineColor, + 'stroke-width': lineWidth, + zIndex: 7 + }) + .add(axis.axisGroup); + } else { + axis.axisLine.animate({ d: linePath }); + } + + // show or hide the line depending on options.showEmpty + axis.axisLine[showAxis ? 'show' : 'hide'](); + } + + if (axisTitle && showAxis) { + + axisTitle[axisTitle.isNew ? 'attr' : 'animate']( + axis.getTitlePosition() + ); + axisTitle.isNew = false; + } + + // Stacked totals: + if (stackLabelOptions && stackLabelOptions.enabled) { + var stackKey, oneStack, stackCategory, + stackTotalGroup = axis.stackTotalGroup; + + // Create a separate group for the stack total labels + if (!stackTotalGroup) { + axis.stackTotalGroup = stackTotalGroup = + renderer.g('stack-labels') + .attr({ + visibility: VISIBLE, + zIndex: 6 + }) + .add(); + } + + // plotLeft/Top will change when y axis gets wider so we need to translate the + // stackTotalGroup at every render call. See bug #506 and #516 + stackTotalGroup.translate(chart.plotLeft, chart.plotTop); + + // Render each stack total + for (stackKey in stacks) { + oneStack = stacks[stackKey]; + for (stackCategory in oneStack) { + oneStack[stackCategory].render(stackTotalGroup); + } + } + } + // End stacked totals + + axis.isDirty = false; + }, + + /** + * Remove a plot band or plot line from the chart by id + * @param {Object} id + */ + removePlotBandOrLine: function (id) { + var plotLinesAndBands = this.plotLinesAndBands, + i = plotLinesAndBands.length; + while (i--) { + if (plotLinesAndBands[i].id === id) { + plotLinesAndBands[i].destroy(); + } + } + }, + + /** + * Update the axis title by options + */ + setTitle: function (newTitleOptions, redraw) { + var chart = this.chart, + options = this.options, + axisTitle = this.axisTitle; + + options.title = merge(options.title, newTitleOptions); + + this.axisTitle = axisTitle && axisTitle.destroy(); // #922 + this.isDirty = true; + + if (pick(redraw, true)) { + chart.redraw(); + } + }, + + /** + * Redraw the axis to reflect changes in the data or axis extremes + */ + redraw: function () { + var axis = this, + chart = axis.chart; + + // hide tooltip and hover states + if (chart.tracker.resetTracker) { + chart.tracker.resetTracker(true); + } + + // render the axis + axis.render(); + + // move plot lines and bands + each(axis.plotLinesAndBands, function (plotLine) { + plotLine.render(); + }); + + // mark associated series as dirty and ready for redraw + each(axis.series, function (series) { + series.isDirty = true; + }); + + }, + + /** + * Set new axis categories and optionally redraw + * @param {Array} newCategories + * @param {Boolean} doRedraw + */ + setCategories: function (newCategories, doRedraw) { + var axis = this, + chart = axis.chart; + + // set the categories + axis.categories = axis.userOptions.categories = newCategories; + + // force reindexing tooltips + each(axis.series, function (series) { + series.translate(); + series.setTooltipPoints(true); + }); + + + // optionally redraw + axis.isDirty = true; + + if (pick(doRedraw, true)) { + chart.redraw(); + } + }, + + /** + * Destroys an Axis instance. + */ + destroy: function () { + var axis = this, + stacks = axis.stacks, + stackKey; + + // Remove the events + removeEvent(axis); + + // Destroy each stack total + for (stackKey in stacks) { + destroyObjectProperties(stacks[stackKey]); + + stacks[stackKey] = null; + } + + // Destroy collections + each([axis.ticks, axis.minorTicks, axis.alternateBands, axis.plotLinesAndBands], function (coll) { + destroyObjectProperties(coll); + }); + + // Destroy local variables + each(['stackTotalGroup', 'axisLine', 'axisGroup', 'gridGroup', 'labelGroup', 'axisTitle'], function (prop) { + if (axis[prop]) { + axis[prop] = axis[prop].destroy(); + } + }); + } + + +}; // end Axis + +/** + * The tooltip object + * @param {Object} chart The chart instance + * @param {Object} options Tooltip options + */ +function Tooltip(chart, options) { + var borderWidth = options.borderWidth, + style = options.style, + padding = pInt(style.padding); + + // Save the chart and options + this.chart = chart; + this.options = options; + + // Keep track of the current series + //this.currentSeries = UNDEFINED; + + // List of crosshairs + this.crosshairs = []; + + // Current values of x and y when animating + this.now = { x: 0, y: 0 }; + + // The tooltipTick function, initialized to nothing + //this.tooltipTick = UNDEFINED; + + // The tooltip is initially hidden + this.isHidden = true; + + // create the label + this.label = chart.renderer.label('', 0, 0, options.shape, null, null, options.useHTML, null, 'tooltip') + .attr({ + padding: padding, + fill: options.backgroundColor, + 'stroke-width': borderWidth, + r: options.borderRadius, + zIndex: 8 + }) + .css(style) + .css({ padding: 0 }) // Remove it from VML, the padding is applied as an attribute instead (#1117) + .hide() + .add(); + + // When using canVG the shadow shows up as a gray circle + // even if the tooltip is hidden. + if (!useCanVG) { + this.label.shadow(options.shadow); + } + + // Public property for getting the shared state. + this.shared = options.shared; +} + +Tooltip.prototype = { + /** + * Destroy the tooltip and its elements. + */ + destroy: function () { + each(this.crosshairs, function (crosshair) { + if (crosshair) { + crosshair.destroy(); + } + }); + + // Destroy and clear local variables + if (this.label) { + this.label = this.label.destroy(); + } + }, + + /** + * Provide a soft movement for the tooltip + * + * @param {Number} x + * @param {Number} y + * @private + */ + move: function (x, y, anchorX, anchorY) { + var tooltip = this, + now = tooltip.now, + animate = tooltip.options.animation !== false && !tooltip.isHidden; + + // get intermediate values for animation + extend(now, { + x: animate ? (2 * now.x + x) / 3 : x, + y: animate ? (now.y + y) / 2 : y, + anchorX: animate ? (2 * now.anchorX + anchorX) / 3 : anchorX, + anchorY: animate ? (now.anchorY + anchorY) / 2 : anchorY + }); + + // move to the intermediate value + tooltip.label.attr(now); + + // run on next tick of the mouse tracker + if (animate && (mathAbs(x - now.x) > 1 || mathAbs(y - now.y) > 1)) { + tooltip.tooltipTick = function () { + tooltip.move(x, y, anchorX, anchorY); + }; + } else { + tooltip.tooltipTick = null; + } + }, + + /** + * Hide the tooltip + */ + hide: function () { + if (!this.isHidden) { + var hoverPoints = this.chart.hoverPoints; + + this.label.hide(); + + // hide previous hoverPoints and set new + if (hoverPoints) { + each(hoverPoints, function (point) { + point.setState(); + }); + } + + this.chart.hoverPoints = null; + this.isHidden = true; + } + }, + + /** + * Hide the crosshairs + */ + hideCrosshairs: function () { + each(this.crosshairs, function (crosshair) { + if (crosshair) { + crosshair.hide(); + } + }); + }, + + /** + * Extendable method to get the anchor position of the tooltip + * from a point or set of points + */ + getAnchor: function (points, mouseEvent) { + var ret, + chart = this.chart, + inverted = chart.inverted, + plotX = 0, + plotY = 0, + yAxis; + + points = splat(points); + + // Pie uses a special tooltipPos + ret = points[0].tooltipPos; + + // When shared, use the average position + if (!ret) { + each(points, function (point) { + yAxis = point.series.yAxis; + plotX += point.plotX; + plotY += (point.plotLow ? (point.plotLow + point.plotHigh) / 2 : point.plotY) + + (!inverted && yAxis ? yAxis.top - chart.plotTop : 0); // #1151 + }); + + plotX /= points.length; + plotY /= points.length; + + ret = [ + inverted ? chart.plotWidth - plotY : plotX, + this.shared && !inverted && points.length > 1 && mouseEvent ? + mouseEvent.chartY - chart.plotTop : // place shared tooltip next to the mouse (#424) + inverted ? chart.plotHeight - plotX : plotY + ]; + } + + return map(ret, mathRound); + }, + + /** + * Place the tooltip in a chart without spilling over + * and not covering the point it self. + */ + getPosition: function (boxWidth, boxHeight, point) { + + // Set up the variables + var chart = this.chart, + plotLeft = chart.plotLeft, + plotTop = chart.plotTop, + plotWidth = chart.plotWidth, + plotHeight = chart.plotHeight, + distance = pick(this.options.distance, 12), + pointX = point.plotX, + pointY = point.plotY, + x = pointX + plotLeft + (chart.inverted ? distance : -boxWidth - distance), + y = pointY - boxHeight + plotTop + 15, // 15 means the point is 15 pixels up from the bottom of the tooltip + alignedRight; + + // It is too far to the left, adjust it + if (x < 7) { + x = plotLeft + pointX + distance; + } + + // Test to see if the tooltip is too far to the right, + // if it is, move it back to be inside and then up to not cover the point. + if ((x + boxWidth) > (plotLeft + plotWidth)) { + x -= (x + boxWidth) - (plotLeft + plotWidth); + y = pointY - boxHeight + plotTop - distance; + alignedRight = true; + } + + // If it is now above the plot area, align it to the top of the plot area + if (y < plotTop + 5) { + y = plotTop + 5; + + // If the tooltip is still covering the point, move it below instead + if (alignedRight && pointY >= y && pointY <= (y + boxHeight)) { + y = pointY + plotTop + distance; // below + } + } + + // Now if the tooltip is below the chart, move it up. It's better to cover the + // point than to disappear outside the chart. #834. + if (y + boxHeight > plotTop + plotHeight) { + y = mathMax(plotTop, plotTop + plotHeight - boxHeight - distance); // below + } + + + return {x: x, y: y}; + }, + + /** + * Refresh the tooltip's text and position. + * @param {Object} point + */ + refresh: function (point, mouseEvent) { + var tooltip = this, + chart = tooltip.chart, + label = tooltip.label, + options = tooltip.options; + + /** + * In case no user defined formatter is given, this will be used + */ + function defaultFormatter() { + var pThis = this, + items = pThis.points || splat(pThis), + series = items[0].series, + s; + + // build the header + s = [series.tooltipHeaderFormatter(items[0].key)]; + + // build the values + each(items, function (item) { + series = item.series; + s.push((series.tooltipFormatter && series.tooltipFormatter(item)) || + item.point.tooltipFormatter(series.tooltipOptions.pointFormat)); + }); + + // footer + s.push(options.footerFormat || ''); + + return s.join(''); + } + + var x, + y, + show, + anchor, + textConfig = {}, + text, + pointConfig = [], + formatter = options.formatter || defaultFormatter, + hoverPoints = chart.hoverPoints, + placedTooltipPoint, + borderColor, + crosshairsOptions = options.crosshairs, + shared = tooltip.shared, + currentSeries; + + // get the reference point coordinates (pie charts use tooltipPos) + anchor = tooltip.getAnchor(point, mouseEvent); + x = anchor[0]; + y = anchor[1]; + + // shared tooltip, array is sent over + if (shared && !(point.series && point.series.noSharedTooltip)) { + + // hide previous hoverPoints and set new + + chart.hoverPoints = point; + if (hoverPoints) { + each(hoverPoints, function (point) { + point.setState(); + }); + } + + each(point, function (item) { + item.setState(HOVER_STATE); + + pointConfig.push(item.getLabelConfig()); + }); + + textConfig = { + x: point[0].category, + y: point[0].y + }; + textConfig.points = pointConfig; + point = point[0]; + + // single point tooltip + } else { + textConfig = point.getLabelConfig(); + } + text = formatter.call(textConfig); + + // register the current series + currentSeries = point.series; + + + // For line type series, hide tooltip if the point falls outside the plot + show = shared || !currentSeries.isCartesian || currentSeries.tooltipOutsidePlot || chart.isInsidePlot(x, y); + + // update the inner HTML + if (text === false || !show) { + this.hide(); + } else { + + // show it + if (tooltip.isHidden) { + label.show(); + } + + // update text + label.attr({ + text: text + }); + + // set the stroke color of the box + borderColor = options.borderColor || point.color || currentSeries.color || '#606060'; + label.attr({ + stroke: borderColor + }); + + placedTooltipPoint = (options.positioner || tooltip.getPosition).call( + tooltip, + label.width, + label.height, + { plotX: x, plotY: y } + ); + + // do the move + tooltip.move( + mathRound(placedTooltipPoint.x), + mathRound(placedTooltipPoint.y), + x + chart.plotLeft, + y + chart.plotTop + ); + + + tooltip.isHidden = false; + } + + // crosshairs + if (crosshairsOptions) { + crosshairsOptions = splat(crosshairsOptions); // [x, y] + + var path, + i = crosshairsOptions.length, + attribs, + axis; + + while (i--) { + axis = point.series[i ? 'yAxis' : 'xAxis']; + if (crosshairsOptions[i] && axis) { + + path = axis.getPlotLinePath( + i ? pick(point.stackY, point.y) : point.x, // #814 + 1 + ); + + if (tooltip.crosshairs[i]) { + tooltip.crosshairs[i].attr({ d: path, visibility: VISIBLE }); + } else { + attribs = { + 'stroke-width': crosshairsOptions[i].width || 1, + stroke: crosshairsOptions[i].color || '#C0C0C0', + zIndex: crosshairsOptions[i].zIndex || 2 + }; + if (crosshairsOptions[i].dashStyle) { + attribs.dashstyle = crosshairsOptions[i].dashStyle; + } + tooltip.crosshairs[i] = chart.renderer.path(path) + .attr(attribs) + .add(); + } + } + } + } + fireEvent(chart, 'tooltipRefresh', { + text: text, + x: x + chart.plotLeft, + y: y + chart.plotTop, + borderColor: borderColor + }); + }, + + /** + * Runs the tooltip animation one tick. + */ + tick: function () { + if (this.tooltipTick) { + this.tooltipTick(); + } + } +}; +/** + * The mouse tracker object + * @param {Object} chart The Chart instance + * @param {Object} options The root options object + */ +function MouseTracker(chart, options) { + var zoomType = useCanVG ? '' : options.chart.zoomType; + + // Zoom status + this.zoomX = /x/.test(zoomType); + this.zoomY = /y/.test(zoomType); + + // Store reference to options + this.options = options; + + // Reference to the chart + this.chart = chart; + + // The interval id + //this.tooltipInterval = UNDEFINED; + + // The cached x hover position + //this.hoverX = UNDEFINED; + + // The chart position + //this.chartPosition = UNDEFINED; + + // The selection marker element + //this.selectionMarker = UNDEFINED; + + // False or a value > 0 if a dragging operation + //this.mouseDownX = UNDEFINED; + //this.mouseDownY = UNDEFINED; + this.init(chart, options.tooltip); +} + +MouseTracker.prototype = { + /** + * Add crossbrowser support for chartX and chartY + * @param {Object} e The event object in standard browsers + */ + normalizeMouseEvent: function (e) { + var chartPosition, + chartX, + chartY, + ePos; + + // common IE normalizing + e = e || win.event; + if (!e.target) { + e.target = e.srcElement; + } + + // Framework specific normalizing (#1165) + e = washMouseEvent(e); + + // iOS + ePos = e.touches ? e.touches.item(0) : e; + + // get mouse position + this.chartPosition = chartPosition = offset(this.chart.container); + + // chartX and chartY + if (ePos.pageX === UNDEFINED) { // IE < 9. #886. + chartX = e.x; + chartY = e.y; + } else { + chartX = ePos.pageX - chartPosition.left; + chartY = ePos.pageY - chartPosition.top; + } + + return extend(e, { + chartX: mathRound(chartX), + chartY: mathRound(chartY) + }); + }, + + /** + * Get the click position in terms of axis values. + * + * @param {Object} e A mouse event + */ + getMouseCoordinates: function (e) { + var coordinates = { + xAxis: [], + yAxis: [] + }, + chart = this.chart; + + each(chart.axes, function (axis) { + var isXAxis = axis.isXAxis, + isHorizontal = chart.inverted ? !isXAxis : isXAxis; + + coordinates[isXAxis ? 'xAxis' : 'yAxis'].push({ + axis: axis, + value: axis.translate( + (isHorizontal ? + e.chartX - chart.plotLeft : + axis.top + axis.len - e.chartY) - axis.minPixelPadding, // #1051 + true + ) + }); + }); + return coordinates; + }, + + /** + * Return the index in the tooltipPoints array, corresponding to pixel position in + * the plot area. + */ + getIndex: function (e) { + var chart = this.chart; + return chart.inverted ? + chart.plotHeight + chart.plotTop - e.chartY : + e.chartX - chart.plotLeft; + }, + + /** + * With line type charts with a single tracker, get the point closest to the mouse + */ + onmousemove: function (e) { + var mouseTracker = this, + chart = mouseTracker.chart, + series = chart.series, + tooltip = chart.tooltip, + point, + points, + hoverPoint = chart.hoverPoint, + hoverSeries = chart.hoverSeries, + i, + j, + distance = chart.chartWidth, + index = mouseTracker.getIndex(e); + + // shared tooltip + if (tooltip && mouseTracker.options.tooltip.shared && !(hoverSeries && hoverSeries.noSharedTooltip)) { + points = []; + + // loop over all series and find the ones with points closest to the mouse + i = series.length; + for (j = 0; j < i; j++) { + if (series[j].visible && + series[j].options.enableMouseTracking !== false && + !series[j].noSharedTooltip && series[j].tooltipPoints.length) { + point = series[j].tooltipPoints[index]; + point._dist = mathAbs(index - point[series[j].xAxis.tooltipPosName || 'plotX']); + distance = mathMin(distance, point._dist); + points.push(point); + } + } + // remove furthest points + i = points.length; + while (i--) { + if (points[i]._dist > distance) { + points.splice(i, 1); + } + } + // refresh the tooltip if necessary + if (points.length && (points[0].plotX !== mouseTracker.hoverX)) { + tooltip.refresh(points, e); + mouseTracker.hoverX = points[0].plotX; + } + } + + // separate tooltip and general mouse events + if (hoverSeries && hoverSeries.tracker) { // only use for line-type series with common tracker + + // get the point + point = hoverSeries.tooltipPoints[index]; + + // a new point is hovered, refresh the tooltip + if (point && point !== hoverPoint) { + + // trigger the events + point.onMouseOver(); + + } + } + }, + + + + /** + * Reset the tracking by hiding the tooltip, the hover series state and the hover point + * + * @param allowMove {Boolean} Instead of destroying the tooltip altogether, allow moving it if possible + */ + resetTracker: function (allowMove) { + var mouseTracker = this, + chart = mouseTracker.chart, + hoverSeries = chart.hoverSeries, + hoverPoint = chart.hoverPoint, + tooltip = chart.tooltip, + tooltipPoints = tooltip && tooltip.shared ? chart.hoverPoints : hoverPoint; + + // Narrow in allowMove + allowMove = allowMove && tooltip && tooltipPoints; + + // Check if the points have moved outside the plot area, #1003 + if (allowMove && splat(tooltipPoints)[0].plotX === UNDEFINED) { + allowMove = false; + } + + // Just move the tooltip, #349 + if (allowMove) { + tooltip.refresh(tooltipPoints); + + // Full reset + } else { + + if (hoverPoint) { + hoverPoint.onMouseOut(); + } + + if (hoverSeries) { + hoverSeries.onMouseOut(); + } + + if (tooltip) { + tooltip.hide(); + tooltip.hideCrosshairs(); + } + + mouseTracker.hoverX = null; + + } + }, + + /** + * Set the JS events on the container element + */ + setDOMEvents: function () { + var lastWasOutsidePlot = true, + mouseTracker = this, + chart = mouseTracker.chart, + container = chart.container, + hasDragged, + zoomHor = (mouseTracker.zoomX && !chart.inverted) || (mouseTracker.zoomY && chart.inverted), + zoomVert = (mouseTracker.zoomY && !chart.inverted) || (mouseTracker.zoomX && chart.inverted); + + /** + * Mouse up or outside the plot area + */ + function drop() { + if (mouseTracker.selectionMarker) { + var selectionData = { + xAxis: [], + yAxis: [] + }, + selectionBox = mouseTracker.selectionMarker.getBBox(), + selectionLeft = selectionBox.x - chart.plotLeft, + selectionTop = selectionBox.y - chart.plotTop, + runZoom; + + // a selection has been made + if (hasDragged) { + + // record each axis' min and max + each(chart.axes, function (axis) { + if (axis.options.zoomEnabled !== false) { + var isXAxis = axis.isXAxis, + isHorizontal = chart.inverted ? !isXAxis : isXAxis, + selectionMin = axis.translate( + isHorizontal ? + selectionLeft : + chart.plotHeight - selectionTop - selectionBox.height, + true, + 0, + 0, + 1 + ), + selectionMax = axis.translate( + (isHorizontal ? + selectionLeft + selectionBox.width : + chart.plotHeight - selectionTop) - + 2 * axis.minPixelPadding, // #875 + true, + 0, + 0, + 1 + ); + + if (!isNaN(selectionMin) && !isNaN(selectionMax)) { // #859 + selectionData[isXAxis ? 'xAxis' : 'yAxis'].push({ + axis: axis, + min: mathMin(selectionMin, selectionMax), // for reversed axes, + max: mathMax(selectionMin, selectionMax) + }); + runZoom = true; + } + } + }); + if (runZoom) { + fireEvent(chart, 'selection', selectionData, function (args) { chart.zoom(args); }); + } + + } + mouseTracker.selectionMarker = mouseTracker.selectionMarker.destroy(); + } + + if (chart) { // it may be destroyed on mouse up - #877 + css(container, { cursor: 'auto' }); + chart.cancelClick = hasDragged; // #370 + chart.mouseIsDown = hasDragged = false; + } + + removeEvent(doc, hasTouch ? 'touchend' : 'mouseup', drop); + } + + /** + * Special handler for mouse move that will hide the tooltip when the mouse leaves the plotarea. + */ + mouseTracker.hideTooltipOnMouseMove = function (e) { + + // Get e.pageX and e.pageY back in MooTools + e = washMouseEvent(e); + + // If we're outside, hide the tooltip + if (mouseTracker.chartPosition && chart.hoverSeries && chart.hoverSeries.isCartesian && + !chart.isInsidePlot(e.pageX - mouseTracker.chartPosition.left - chart.plotLeft, + e.pageY - mouseTracker.chartPosition.top - chart.plotTop)) { + mouseTracker.resetTracker(); + } + }; + + /** + * When mouse leaves the container, hide the tooltip. + */ + mouseTracker.hideTooltipOnMouseLeave = function () { + mouseTracker.resetTracker(); + mouseTracker.chartPosition = null; // also reset the chart position, used in #149 fix + }; + + + /* + * Record the starting position of a dragoperation + */ + container.onmousedown = function (e) { + e = mouseTracker.normalizeMouseEvent(e); + + // issue #295, dragging not always working in Firefox + if (!hasTouch && e.preventDefault) { + e.preventDefault(); + } + + // record the start position + chart.mouseIsDown = true; + chart.cancelClick = false; + chart.mouseDownX = mouseTracker.mouseDownX = e.chartX; + mouseTracker.mouseDownY = e.chartY; + + addEvent(doc, hasTouch ? 'touchend' : 'mouseup', drop); + }; + + // The mousemove, touchmove and touchstart event handler + var mouseMove = function (e) { + // let the system handle multitouch operations like two finger scroll + // and pinching + if (e && e.touches && e.touches.length > 1) { + return; + } + + // normalize + e = mouseTracker.normalizeMouseEvent(e); + if (!hasTouch) { // not for touch devices + e.returnValue = false; + } + + var chartX = e.chartX, + chartY = e.chartY, + isOutsidePlot = !chart.isInsidePlot(chartX - chart.plotLeft, chartY - chart.plotTop); + + // on touch devices, only trigger click if a handler is defined + if (hasTouch && e.type === 'touchstart') { + if (attr(e.target, 'isTracker')) { + if (!chart.runTrackerClick) { + e.preventDefault(); + } + } else if (!chart.runChartClick && !isOutsidePlot) { + e.preventDefault(); + } + } + + // cancel on mouse outside + if (isOutsidePlot) { + + /*if (!lastWasOutsidePlot) { + // reset the tracker + resetTracker(); + }*/ + + // drop the selection if any and reset mouseIsDown and hasDragged + //drop(); + if (chartX < chart.plotLeft) { + chartX = chart.plotLeft; + } else if (chartX > chart.plotLeft + chart.plotWidth) { + chartX = chart.plotLeft + chart.plotWidth; + } + + if (chartY < chart.plotTop) { + chartY = chart.plotTop; + } else if (chartY > chart.plotTop + chart.plotHeight) { + chartY = chart.plotTop + chart.plotHeight; + } + } + + if (chart.mouseIsDown && e.type !== 'touchstart') { // make selection + + // determine if the mouse has moved more than 10px + hasDragged = Math.sqrt( + Math.pow(mouseTracker.mouseDownX - chartX, 2) + + Math.pow(mouseTracker.mouseDownY - chartY, 2) + ); + if (hasDragged > 10) { + var clickedInside = chart.isInsidePlot(mouseTracker.mouseDownX - chart.plotLeft, mouseTracker.mouseDownY - chart.plotTop); + + // make a selection + if (chart.hasCartesianSeries && (mouseTracker.zoomX || mouseTracker.zoomY) && clickedInside) { + if (!mouseTracker.selectionMarker) { + mouseTracker.selectionMarker = chart.renderer.rect( + chart.plotLeft, + chart.plotTop, + zoomHor ? 1 : chart.plotWidth, + zoomVert ? 1 : chart.plotHeight, + 0 + ) + .attr({ + fill: mouseTracker.options.chart.selectionMarkerFill || 'rgba(69,114,167,0.25)', + zIndex: 7 + }) + .add(); + } + } + + // adjust the width of the selection marker + if (mouseTracker.selectionMarker && zoomHor) { + var xSize = chartX - mouseTracker.mouseDownX; + mouseTracker.selectionMarker.attr({ + width: mathAbs(xSize), + x: (xSize > 0 ? 0 : xSize) + mouseTracker.mouseDownX + }); + } + // adjust the height of the selection marker + if (mouseTracker.selectionMarker && zoomVert) { + var ySize = chartY - mouseTracker.mouseDownY; + mouseTracker.selectionMarker.attr({ + height: mathAbs(ySize), + y: (ySize > 0 ? 0 : ySize) + mouseTracker.mouseDownY + }); + } + + // panning + if (clickedInside && !mouseTracker.selectionMarker && mouseTracker.options.chart.panning) { + chart.pan(chartX); + } + } + + } + + // Show the tooltip and run mouse over events (#977) + if (!isOutsidePlot) { + mouseTracker.onmousemove(e); + } + + lastWasOutsidePlot = isOutsidePlot; + + // when outside plot, allow touch-drag by returning true + return isOutsidePlot || !chart.hasCartesianSeries; + }; + + /* + * When the mouse enters the container, run mouseMove + */ + container.onmousemove = mouseMove; + + /* + * When the mouse leaves the container, hide the tracking (tooltip). + */ + addEvent(container, 'mouseleave', mouseTracker.hideTooltipOnMouseLeave); + + // issue #149 workaround + // The mouseleave event above does not always fire. Whenever the mouse is moving + // outside the plotarea, hide the tooltip + addEvent(doc, 'mousemove', mouseTracker.hideTooltipOnMouseMove); + + container.ontouchstart = function (e) { + // For touch devices, use touchmove to zoom + if (mouseTracker.zoomX || mouseTracker.zoomY) { + container.onmousedown(e); + } + // Show tooltip and prevent the lower mouse pseudo event + mouseMove(e); + }; + + /* + * Allow dragging the finger over the chart to read the values on touch + * devices + */ + container.ontouchmove = mouseMove; + + /* + * Allow dragging the finger over the chart to read the values on touch + * devices + */ + container.ontouchend = function () { + if (hasDragged) { + mouseTracker.resetTracker(); + } + }; + + + // MooTools 1.2.3 doesn't fire this in IE when using addEvent + container.onclick = function (e) { + var hoverPoint = chart.hoverPoint, + plotX, + plotY; + e = mouseTracker.normalizeMouseEvent(e); + + e.cancelBubble = true; // IE specific + + + if (!chart.cancelClick) { + // Detect clicks on trackers or tracker groups, #783 + if (hoverPoint && (attr(e.target, 'isTracker') || attr(e.target.parentNode, 'isTracker'))) { + plotX = hoverPoint.plotX; + plotY = hoverPoint.plotY; + + // add page position info + extend(hoverPoint, { + pageX: mouseTracker.chartPosition.left + chart.plotLeft + + (chart.inverted ? chart.plotWidth - plotY : plotX), + pageY: mouseTracker.chartPosition.top + chart.plotTop + + (chart.inverted ? chart.plotHeight - plotX : plotY) + }); + + // the series click event + fireEvent(hoverPoint.series, 'click', extend(e, { + point: hoverPoint + })); + + // the point click event + hoverPoint.firePointEvent('click', e); + + } else { + extend(e, mouseTracker.getMouseCoordinates(e)); + + // fire a click event in the chart + if (chart.isInsidePlot(e.chartX - chart.plotLeft, e.chartY - chart.plotTop)) { + fireEvent(chart, 'click', e); + } + } + + + } + }; + + }, + + /** + * Destroys the MouseTracker object and disconnects DOM events. + */ + destroy: function () { + var mouseTracker = this, + chart = mouseTracker.chart, + container = chart.container; + + // Destroy the tracker group element + if (chart.trackerGroup) { + chart.trackerGroup = chart.trackerGroup.destroy(); + } + + removeEvent(container, 'mouseleave', mouseTracker.hideTooltipOnMouseLeave); + removeEvent(doc, 'mousemove', mouseTracker.hideTooltipOnMouseMove); + container.onclick = container.onmousedown = container.onmousemove = container.ontouchstart = container.ontouchend = container.ontouchmove = null; + + // memory and CPU leak + clearInterval(this.tooltipInterval); + }, + + // Run MouseTracker + init: function (chart, options) { + if (!chart.trackerGroup) { + chart.trackerGroup = chart.renderer.g('tracker') + .attr({ zIndex: 9 }) + .add(); + } + + if (options.enabled) { + chart.tooltip = new Tooltip(chart, options); + + // set the fixed interval ticking for the smooth tooltip + this.tooltipInterval = setInterval(function () { + // The interval function may still be running during destroy, so check that the chart is really there before calling. + if (chart && chart.tooltip) { + chart.tooltip.tick(); + } + }, 32); + } + + this.setDOMEvents(); + } +}; +/** + * The overview of the chart's series + */ +function Legend(chart) { + + this.init(chart); +} + +Legend.prototype = { + + /** + * Initialize the legend + */ + init: function (chart) { + var legend = this, + options = legend.options = chart.options.legend; + + if (!options.enabled) { + return; + } + + var //style = options.style || {}, // deprecated + itemStyle = options.itemStyle, + padding = pick(options.padding, 8), + itemMarginTop = options.itemMarginTop || 0; + + legend.baseline = pInt(itemStyle.fontSize) + 3 + itemMarginTop; // used in Series prototype + legend.itemStyle = itemStyle; + legend.itemHiddenStyle = merge(itemStyle, options.itemHiddenStyle); + legend.itemMarginTop = itemMarginTop; + legend.padding = padding; + legend.initialItemX = padding; + legend.initialItemY = padding - 5; // 5 is the number of pixels above the text + legend.maxItemWidth = 0; + legend.chart = chart; + //legend.allItems = UNDEFINED; + //legend.legendWidth = UNDEFINED; + //legend.legendHeight = UNDEFINED; + //legend.offsetWidth = UNDEFINED; + legend.itemHeight = 0; + legend.lastLineHeight = 0; + //legend.itemX = UNDEFINED; + //legend.itemY = UNDEFINED; + //legend.lastItemY = UNDEFINED; + + // Elements + //legend.group = UNDEFINED; + //legend.box = UNDEFINED; + + // run legend + legend.render(); + + // move checkboxes + addEvent(legend.chart, 'endResize', function () { legend.positionCheckboxes(); }); + +/* // expose + return { + colorizeItem: colorizeItem, + destroyItem: destroyItem, + render: render, + destroy: destroy, + getLegendWidth: getLegendWidth, + getLegendHeight: getLegendHeight + };*/ + }, + + /** + * Set the colors for the legend item + * @param {Object} item A Series or Point instance + * @param {Object} visible Dimmed or colored + */ + colorizeItem: function (item, visible) { + var legend = this, + options = legend.options, + legendItem = item.legendItem, + legendLine = item.legendLine, + legendSymbol = item.legendSymbol, + hiddenColor = legend.itemHiddenStyle.color, + textColor = visible ? options.itemStyle.color : hiddenColor, + symbolColor = visible ? item.color : hiddenColor; + + if (legendItem) { + legendItem.css({ fill: textColor }); + } + if (legendLine) { + legendLine.attr({ stroke: symbolColor }); + } + if (legendSymbol) { + legendSymbol.attr({ + stroke: symbolColor, + fill: symbolColor + }); + } + }, + + /** + * Position the legend item + * @param {Object} item A Series or Point instance + */ + positionItem: function (item) { + var legend = this, + options = legend.options, + symbolPadding = options.symbolPadding, + ltr = !options.rtl, + legendItemPos = item._legendItemPos, + itemX = legendItemPos[0], + itemY = legendItemPos[1], + checkbox = item.checkbox; + + if (item.legendGroup) { + item.legendGroup.translate( + ltr ? itemX : legend.legendWidth - itemX - 2 * symbolPadding - 4, + itemY + ); + } + + if (checkbox) { + checkbox.x = itemX; + checkbox.y = itemY; + } + }, + + /** + * Destroy a single legend item + * @param {Object} item The series or point + */ + destroyItem: function (item) { + var checkbox = item.checkbox; + + // destroy SVG elements + each(['legendItem', 'legendLine', 'legendSymbol', 'legendGroup'], function (key) { + if (item[key]) { + item[key].destroy(); + } + }); + + if (checkbox) { + discardElement(item.checkbox); + } + }, + + /** + * Destroys the legend. + */ + destroy: function () { + var legend = this, + legendGroup = legend.group, + box = legend.box; + + if (box) { + legend.box = box.destroy(); + } + + if (legendGroup) { + legend.group = legendGroup.destroy(); + } + }, + + /** + * Position the checkboxes after the width is determined + */ + positionCheckboxes: function () { + var legend = this; + + each(legend.allItems, function (item) { + var checkbox = item.checkbox, + alignAttr = legend.group.alignAttr; + if (checkbox) { + css(checkbox, { + left: (alignAttr.translateX + item.legendItemWidth + checkbox.x - 20) + PX, + top: (alignAttr.translateY + checkbox.y + 3) + PX + }); + } + }); + }, + + /** + * Render a single specific legend item + * @param {Object} item A series or point + */ + renderItem: function (item) { + var legend = this, + chart = legend.chart, + renderer = chart.renderer, + options = legend.options, + horizontal = options.layout === 'horizontal', + symbolWidth = options.symbolWidth, + symbolPadding = options.symbolPadding, + itemStyle = legend.itemStyle, + itemHiddenStyle = legend.itemHiddenStyle, + padding = legend.padding, + ltr = !options.rtl, + itemHeight, + widthOption = options.width, + itemMarginBottom = options.itemMarginBottom || 0, + itemMarginTop = legend.itemMarginTop, + initialItemX = legend.initialItemX, + bBox, + itemWidth, + li = item.legendItem, + series = item.series || item, + itemOptions = series.options, + showCheckbox = itemOptions.showCheckbox; + + if (!li) { // generate it once, later move it + + // Generate the group box + // A group to hold the symbol and text. Text is to be appended in Legend class. + item.legendGroup = renderer.g('legend-item') + .attr({ zIndex: 1 }) + .add(legend.scrollGroup); + + // Draw the legend symbol inside the group box + series.drawLegendSymbol(legend, item); + + // Generate the list item text and add it to the group + item.legendItem = li = renderer.text( + options.labelFormatter.call(item), + ltr ? symbolWidth + symbolPadding : -symbolPadding, + legend.baseline, + options.useHTML + ) + .css(merge(item.visible ? itemStyle : itemHiddenStyle)) // merge to prevent modifying original (#1021) + .attr({ + align: ltr ? 'left' : 'right', + zIndex: 2 + }) + .add(item.legendGroup); + + // Set the events on the item group + item.legendGroup.on('mouseover', function () { + item.setState(HOVER_STATE); + li.css(legend.options.itemHoverStyle); + }) + .on('mouseout', function () { + li.css(item.visible ? itemStyle : itemHiddenStyle); + item.setState(); + }) + .on('click', function (event) { + var strLegendItemClick = 'legendItemClick', + fnLegendItemClick = function () { + item.setVisible(); + }; + + // Pass over the click/touch event. #4. + event = { + browserEvent: event + }; + + // click the name or symbol + if (item.firePointEvent) { // point + item.firePointEvent(strLegendItemClick, event, fnLegendItemClick); + } else { + fireEvent(item, strLegendItemClick, event, fnLegendItemClick); + } + }); + + // Colorize the items + legend.colorizeItem(item, item.visible); + + // add the HTML checkbox on top + if (itemOptions && showCheckbox) { + item.checkbox = createElement('input', { + type: 'checkbox', + checked: item.selected, + defaultChecked: item.selected // required by IE7 + }, options.itemCheckboxStyle, chart.container); + + addEvent(item.checkbox, 'click', function (event) { + var target = event.target; + fireEvent(item, 'checkboxClick', { + checked: target.checked + }, + function () { + item.select(); + } + ); + }); + } + } + + // calculate the positions for the next line + bBox = li.getBBox(); + + itemWidth = item.legendItemWidth = + options.itemWidth || symbolWidth + symbolPadding + bBox.width + padding + + (showCheckbox ? 20 : 0); + legend.itemHeight = itemHeight = bBox.height; + + // if the item exceeds the width, start a new line + if (horizontal && legend.itemX - initialItemX + itemWidth > + (widthOption || (chart.chartWidth - 2 * padding - initialItemX))) { + legend.itemX = initialItemX; + legend.itemY += itemMarginTop + legend.lastLineHeight + itemMarginBottom; + legend.lastLineHeight = 0; // reset for next line + } + + // If the item exceeds the height, start a new column + /*if (!horizontal && legend.itemY + options.y + itemHeight > chart.chartHeight - spacingTop - spacingBottom) { + legend.itemY = legend.initialItemY; + legend.itemX += legend.maxItemWidth; + legend.maxItemWidth = 0; + }*/ + + // Set the edge positions + legend.maxItemWidth = mathMax(legend.maxItemWidth, itemWidth); + legend.lastItemY = itemMarginTop + legend.itemY + itemMarginBottom; + legend.lastLineHeight = mathMax(itemHeight, legend.lastLineHeight); // #915 + + // cache the position of the newly generated or reordered items + item._legendItemPos = [legend.itemX, legend.itemY]; + + // advance + if (horizontal) { + legend.itemX += itemWidth; + + } else { + legend.itemY += itemMarginTop + itemHeight + itemMarginBottom; + legend.lastLineHeight = itemHeight; + } + + // the width of the widest item + legend.offsetWidth = widthOption || mathMax( + horizontal ? legend.itemX - initialItemX : itemWidth, + legend.offsetWidth + ); + }, + + /** + * Render the legend. This method can be called both before and after + * chart.render. If called after, it will only rearrange items instead + * of creating new ones. + */ + render: function () { + var legend = this, + chart = legend.chart, + renderer = chart.renderer, + legendGroup = legend.group, + allItems, + display, + legendWidth, + legendHeight, + box = legend.box, + options = legend.options, + padding = legend.padding, + legendBorderWidth = options.borderWidth, + legendBackgroundColor = options.backgroundColor; + + legend.itemX = legend.initialItemX; + legend.itemY = legend.initialItemY; + legend.offsetWidth = 0; + legend.lastItemY = 0; + + if (!legendGroup) { + legend.group = legendGroup = renderer.g('legend') + // #414, #759. Trackers will be drawn above the legend, but we have + // to sacrifice that because tooltips need to be above the legend + // and trackers above tooltips + .attr({ zIndex: 7 }) + .add(); + legend.contentGroup = renderer.g() + .attr({ zIndex: 1 }) // above background + .add(legendGroup); + legend.scrollGroup = renderer.g() + .add(legend.contentGroup); + legend.clipRect = renderer.clipRect(0, 0, 9999, chart.chartHeight); + legend.contentGroup.clip(legend.clipRect); + } + + // add each series or point + allItems = []; + each(chart.series, function (serie) { + var seriesOptions = serie.options; + + if (!seriesOptions.showInLegend) { + return; + } + + // use points or series for the legend item depending on legendType + allItems = allItems.concat( + serie.legendItems || + (seriesOptions.legendType === 'point' ? + serie.data : + serie) + ); + }); + + // sort by legendIndex + stableSort(allItems, function (a, b) { + return ((a.options && a.options.legendIndex) || 0) - ((b.options && b.options.legendIndex) || 0); + }); + + // reversed legend + if (options.reversed) { + allItems.reverse(); + } + + legend.allItems = allItems; + legend.display = display = !!allItems.length; + + // render the items + each(allItems, function (item) { + legend.renderItem(item); + }); + + // Draw the border + legendWidth = options.width || legend.offsetWidth; + legendHeight = legend.lastItemY + legend.lastLineHeight; + + + legendHeight = legend.handleOverflow(legendHeight); + + if (legendBorderWidth || legendBackgroundColor) { + legendWidth += padding; + legendHeight += padding; + + if (!box) { + legend.box = box = renderer.rect( + 0, + 0, + legendWidth, + legendHeight, + options.borderRadius, + legendBorderWidth || 0 + ).attr({ + stroke: options.borderColor, + 'stroke-width': legendBorderWidth || 0, + fill: legendBackgroundColor || NONE + }) + .add(legendGroup) + .shadow(options.shadow); + box.isNew = true; + + } else if (legendWidth > 0 && legendHeight > 0) { + box[box.isNew ? 'attr' : 'animate']( + box.crisp(null, null, null, legendWidth, legendHeight) + ); + box.isNew = false; + } + + // hide the border if no items + box[display ? 'show' : 'hide'](); + } + + legend.legendWidth = legendWidth; + legend.legendHeight = legendHeight; + + // Now that the legend width and height are established, put the items in the + // final position + each(allItems, function (item) { + legend.positionItem(item); + }); + + // 1.x compatibility: positioning based on style + /*var props = ['left', 'right', 'top', 'bottom'], + prop, + i = 4; + while (i--) { + prop = props[i]; + if (options.style[prop] && options.style[prop] !== 'auto') { + options[i < 2 ? 'align' : 'verticalAlign'] = prop; + options[i < 2 ? 'x' : 'y'] = pInt(options.style[prop]) * (i % 2 ? -1 : 1); + } + }*/ + + if (display) { + legendGroup.align(extend({ + width: legendWidth, + height: legendHeight + }, options), true, chart.spacingBox); + } + + if (!chart.isResizing) { + this.positionCheckboxes(); + } + }, + + /** + * Set up the overflow handling by adding navigation with up and down arrows below the + * legend. + */ + handleOverflow: function (legendHeight) { + var legend = this, + chart = this.chart, + renderer = chart.renderer, + pageCount, + options = this.options, + optionsY = options.y, + alignTop = options.verticalAlign === 'top', + spaceHeight = chart.spacingBox.height + (alignTop ? -optionsY : optionsY) - this.padding, + maxHeight = options.maxHeight, + clipHeight, + clipRect = this.clipRect, + navOptions = options.navigation, + animation = pick(navOptions.animation, true), + arrowSize = navOptions.arrowSize || 12, + nav = this.nav; + + // Adjust the height + if (options.layout === 'horizontal') { + spaceHeight /= 2; + } + if (maxHeight) { + spaceHeight = mathMin(spaceHeight, maxHeight); + } + + // Reset the legend height and adjust the clipping rectangle + if (legendHeight > spaceHeight) { + + this.clipHeight = clipHeight = spaceHeight - 20; + this.pageCount = pageCount = mathCeil(legendHeight / clipHeight); + this.currentPage = pick(this.currentPage, 1); + this.fullHeight = legendHeight; + + clipRect.attr({ + height: clipHeight + }); + + // Add navigation elements + if (!nav) { + this.nav = nav = renderer.g().attr({ zIndex: 1 }).add(this.group); + this.up = renderer.symbol('triangle', 0, 0, arrowSize, arrowSize) + .on('click', function () { + legend.scroll(-1, animation); + }) + .add(nav); + this.pager = renderer.text('', 15, 10) + .css(navOptions.style) + .add(nav); + this.down = renderer.symbol('triangle-down', 0, 0, arrowSize, arrowSize) + .on('click', function () { + legend.scroll(1, animation); + }) + .add(nav); + } + + // Set initial position + legend.scroll(0); + + legendHeight = spaceHeight; + + } else if (nav) { + clipRect.attr({ + height: chart.chartHeight + }); + nav.hide(); + this.scrollGroup.attr({ + translateY: 1 + }); + } + + return legendHeight; + }, + + /** + * Scroll the legend by a number of pages + * @param {Object} scrollBy + * @param {Object} animation + */ + scroll: function (scrollBy, animation) { + var pageCount = this.pageCount, + currentPage = this.currentPage + scrollBy, + clipHeight = this.clipHeight, + navOptions = this.options.navigation, + activeColor = navOptions.activeColor, + inactiveColor = navOptions.inactiveColor, + pager = this.pager, + padding = this.padding; + + // When resizing while looking at the last page + if (currentPage > pageCount) { + currentPage = pageCount; + } + + if (currentPage > 0) { + + if (animation !== UNDEFINED) { + setAnimation(animation, this.chart); + } + + this.nav.attr({ + translateX: padding, + translateY: clipHeight + 7, + visibility: VISIBLE + }); + this.up.attr({ + fill: currentPage === 1 ? inactiveColor : activeColor + }) + .css({ + cursor: currentPage === 1 ? 'default' : 'pointer' + }); + pager.attr({ + text: currentPage + '/' + this.pageCount + }); + this.down.attr({ + x: 18 + this.pager.getBBox().width, // adjust to text width + fill: currentPage === pageCount ? inactiveColor : activeColor + }) + .css({ + cursor: currentPage === pageCount ? 'default' : 'pointer' + }); + + this.scrollGroup.animate({ + translateY: -mathMin(clipHeight * (currentPage - 1), this.fullHeight - clipHeight + padding) + 1 + }); + pager.attr({ + text: currentPage + '/' + pageCount + }); + + + this.currentPage = currentPage; + } + + } + +}; + + +/** + * The chart class + * @param {Object} options + * @param {Function} callback Function to run when the chart has loaded + */ +function Chart(userOptions, callback) { + // Handle regular options + var options, + seriesOptions = userOptions.series; // skip merging data points to increase performance + userOptions.series = null; + options = merge(defaultOptions, userOptions); // do the merge + options.series = userOptions.series = seriesOptions; // set back the series data + + var optionsChart = options.chart, + optionsMargin = optionsChart.margin, + margin = isObject(optionsMargin) ? + optionsMargin : + [optionsMargin, optionsMargin, optionsMargin, optionsMargin]; + + this.optionsMarginTop = pick(optionsChart.marginTop, margin[0]); + this.optionsMarginRight = pick(optionsChart.marginRight, margin[1]); + this.optionsMarginBottom = pick(optionsChart.marginBottom, margin[2]); + this.optionsMarginLeft = pick(optionsChart.marginLeft, margin[3]); + + var chartEvents = optionsChart.events; + + this.runChartClick = chartEvents && !!chartEvents.click; + this.callback = callback; + this.isResizing = 0; + this.options = options; + //chartTitleOptions = UNDEFINED; + //chartSubtitleOptions = UNDEFINED; + + this.axes = []; + this.series = []; + this.hasCartesianSeries = optionsChart.showAxes; + //this.axisOffset = UNDEFINED; + //this.maxTicks = UNDEFINED; // handle the greatest amount of ticks on grouped axes + //this.inverted = UNDEFINED; + //this.loadingShown = UNDEFINED; + //this.container = UNDEFINED; + //this.chartWidth = UNDEFINED; + //this.chartHeight = UNDEFINED; + //this.marginRight = UNDEFINED; + //this.marginBottom = UNDEFINED; + //this.containerWidth = UNDEFINED; + //this.containerHeight = UNDEFINED; + //this.oldChartWidth = UNDEFINED; + //this.oldChartHeight = UNDEFINED; + + //this.renderTo = UNDEFINED; + //this.renderToClone = UNDEFINED; + //this.tracker = UNDEFINED; + + //this.spacingBox = UNDEFINED + + //this.legend = UNDEFINED; + + // Elements + //this.chartBackground = UNDEFINED; + //this.plotBackground = UNDEFINED; + //this.plotBGImage = UNDEFINED; + //this.plotBorder = UNDEFINED; + //this.loadingDiv = UNDEFINED; + //this.loadingSpan = UNDEFINED; + + this.init(chartEvents); +} + +Chart.prototype = { + + /** + * Initialize an individual series, called internally before render time + */ + initSeries: function (options) { + var chart = this, + optionsChart = chart.options.chart, + type = options.type || optionsChart.type || optionsChart.defaultSeriesType, + series = new seriesTypes[type](); + + series.init(this, options); + return series; + }, + + /** + * Add a series dynamically after time + * + * @param {Object} options The config options + * @param {Boolean} redraw Whether to redraw the chart after adding. Defaults to true. + * @param {Boolean|Object} animation Whether to apply animation, and optionally animation + * configuration + * + * @return {Object} series The newly created series object + */ + addSeries: function (options, redraw, animation) { + var series, + chart = this; + + if (options) { + setAnimation(animation, chart); + redraw = pick(redraw, true); // defaults to true + + fireEvent(chart, 'addSeries', { options: options }, function () { + series = chart.initSeries(options); + + chart.isDirtyLegend = true; // the series array is out of sync with the display + if (redraw) { + chart.redraw(); + } + }); + } + + return series; + }, + + /** + * Check whether a given point is within the plot area + * + * @param {Number} plotX Pixel x relative to the plot area + * @param {Number} plotY Pixel y relative to the plot area + * @param {Boolean} inverted Whether the chart is inverted + */ + isInsidePlot: function (plotX, plotY, inverted) { + var x = inverted ? plotY : plotX, + y = inverted ? plotX : plotY; + + return x >= 0 && + x <= this.plotWidth && + y >= 0 && + y <= this.plotHeight; + }, + + /** + * Adjust all axes tick amounts + */ + adjustTickAmounts: function () { + if (this.options.chart.alignTicks !== false) { + each(this.axes, function (axis) { + axis.adjustTickAmount(); + }); + } + this.maxTicks = null; + }, + + /** + * Redraw legend, axes or series based on updated data + * + * @param {Boolean|Object} animation Whether to apply animation, and optionally animation + * configuration + */ + redraw: function (animation) { + var chart = this, + axes = chart.axes, + series = chart.series, + tracker = chart.tracker, + legend = chart.legend, + redrawLegend = chart.isDirtyLegend, + hasStackedSeries, + isDirtyBox = chart.isDirtyBox, // todo: check if it has actually changed? + seriesLength = series.length, + i = seriesLength, + serie, + renderer = chart.renderer, + isHiddenChart = renderer.isHidden(); + + setAnimation(animation, chart); + + if (isHiddenChart) { + chart.cloneRenderTo(); + } + + // link stacked series + while (i--) { + serie = series[i]; + if (serie.isDirty && serie.options.stacking) { + hasStackedSeries = true; + break; + } + } + if (hasStackedSeries) { // mark others as dirty + i = seriesLength; + while (i--) { + serie = series[i]; + if (serie.options.stacking) { + serie.isDirty = true; + } + } + } + + // handle updated data in the series + each(series, function (serie) { + if (serie.isDirty) { // prepare the data so axis can read it + if (serie.options.legendType === 'point') { + redrawLegend = true; + } + } + }); + + // handle added or removed series + if (redrawLegend && legend.options.enabled) { // series or pie points are added or removed + // draw legend graphics + legend.render(); + + chart.isDirtyLegend = false; + } + + + if (chart.hasCartesianSeries) { + if (!chart.isResizing) { + + // reset maxTicks + chart.maxTicks = null; + + // set axes scales + each(axes, function (axis) { + axis.setScale(); + }); + } + chart.adjustTickAmounts(); + chart.getMargins(); + + // redraw axes + each(axes, function (axis) { + + // Fire 'afterSetExtremes' only if extremes are set + if (axis.isDirtyExtremes) { // #821 + axis.isDirtyExtremes = false; + fireEvent(axis, 'afterSetExtremes', axis.getExtremes()); // #747, #751 + } + + if (axis.isDirty || isDirtyBox || hasStackedSeries) { + axis.redraw(); + isDirtyBox = true; // #792 + } + }); + + + } + + // the plot areas size has changed + if (isDirtyBox) { + chart.drawChartBox(); + } + + + // redraw affected series + each(series, function (serie) { + if (serie.isDirty && serie.visible && + (!serie.isCartesian || serie.xAxis)) { // issue #153 + serie.redraw(); + } + }); + + + // move tooltip or reset + if (tracker && tracker.resetTracker) { + tracker.resetTracker(true); + } + + // redraw if canvas + renderer.draw(); + + // fire the event + fireEvent(chart, 'redraw'); // jQuery breaks this when calling it from addEvent. Overwrites chart.redraw + + if (isHiddenChart) { + chart.cloneRenderTo(true); + } + }, + + + + /** + * Dim the chart and show a loading text or symbol + * @param {String} str An optional text to show in the loading label instead of the default one + */ + showLoading: function (str) { + var chart = this, + options = chart.options, + loadingDiv = chart.loadingDiv; + + var loadingOptions = options.loading; + + // create the layer at the first call + if (!loadingDiv) { + chart.loadingDiv = loadingDiv = createElement(DIV, { + className: PREFIX + 'loading' + }, extend(loadingOptions.style, { + left: chart.plotLeft + PX, + top: chart.plotTop + PX, + width: chart.plotWidth + PX, + height: chart.plotHeight + PX, + zIndex: 10, + display: NONE + }), chart.container); + + chart.loadingSpan = createElement( + 'span', + null, + loadingOptions.labelStyle, + loadingDiv + ); + + } + + // update text + chart.loadingSpan.innerHTML = str || options.lang.loading; + + // show it + if (!chart.loadingShown) { + css(loadingDiv, { opacity: 0, display: '' }); + animate(loadingDiv, { + opacity: loadingOptions.style.opacity + }, { + duration: loadingOptions.showDuration || 0 + }); + chart.loadingShown = true; + } + }, + + /** + * Hide the loading layer + */ + hideLoading: function () { + var options = this.options, + loadingDiv = this.loadingDiv; + + if (loadingDiv) { + animate(loadingDiv, { + opacity: 0 + }, { + duration: options.loading.hideDuration || 100, + complete: function () { + css(loadingDiv, { display: NONE }); + } + }); + } + this.loadingShown = false; + }, + + /** + * Get an axis, series or point object by id. + * @param id {String} The id as given in the configuration options + */ + get: function (id) { + var chart = this, + axes = chart.axes, + series = chart.series; + + var i, + j, + points; + + // search axes + for (i = 0; i < axes.length; i++) { + if (axes[i].options.id === id) { + return axes[i]; + } + } + + // search series + for (i = 0; i < series.length; i++) { + if (series[i].options.id === id) { + return series[i]; + } + } + + // search points + for (i = 0; i < series.length; i++) { + points = series[i].points || []; + for (j = 0; j < points.length; j++) { + if (points[j].id === id) { + return points[j]; + } + } + } + return null; + }, + + /** + * Create the Axis instances based on the config options + */ + getAxes: function () { + var chart = this, + options = this.options; + + var xAxisOptions = options.xAxis || {}, + yAxisOptions = options.yAxis || {}, + optionsArray, + axis; + + // make sure the options are arrays and add some members + xAxisOptions = splat(xAxisOptions); + each(xAxisOptions, function (axis, i) { + axis.index = i; + axis.isX = true; + }); + + yAxisOptions = splat(yAxisOptions); + each(yAxisOptions, function (axis, i) { + axis.index = i; + }); + + // concatenate all axis options into one array + optionsArray = xAxisOptions.concat(yAxisOptions); + + each(optionsArray, function (axisOptions) { + axis = new Axis(chart, axisOptions); + }); + + chart.adjustTickAmounts(); + }, + + + /** + * Get the currently selected points from all series + */ + getSelectedPoints: function () { + var points = []; + each(this.series, function (serie) { + points = points.concat(grep(serie.points, function (point) { + return point.selected; + })); + }); + return points; + }, + + /** + * Get the currently selected series + */ + getSelectedSeries: function () { + return grep(this.series, function (serie) { + return serie.selected; + }); + }, + + /** + * Display the zoom button + */ + showResetZoom: function () { + var chart = this, + lang = defaultOptions.lang, + btnOptions = chart.options.chart.resetZoomButton, + theme = btnOptions.theme, + states = theme.states, + alignTo = btnOptions.relativeTo === 'chart' ? null : 'plotBox'; + + this.resetZoomButton = chart.renderer.button(lang.resetZoom, null, null, function () { chart.zoomOut(); }, theme, states && states.hover) + .attr({ + align: btnOptions.position.align, + title: lang.resetZoomTitle + }) + .add() + .align(btnOptions.position, false, chart[alignTo]); + this.resetZoomButton.alignTo = alignTo; + + }, + + /** + * Zoom out to 1:1 + */ + zoomOut: function () { + var chart = this, + resetZoomButton = chart.resetZoomButton; + + fireEvent(chart, 'selection', { resetSelection: true }, function () { chart.zoom(); }); + if (resetZoomButton) { + chart.resetZoomButton = resetZoomButton.destroy(); + } + }, + + /** + * Zoom into a given portion of the chart given by axis coordinates + * @param {Object} event + */ + zoom: function (event) { + var chart = this, + hasZoomed; + + // if zoom is called with no arguments, reset the axes + if (!event || event.resetSelection) { + each(chart.axes, function (axis) { + hasZoomed = axis.zoom(); + }); + } else { // else, zoom in on all axes + each(event.xAxis.concat(event.yAxis), function (axisData) { + var axis = axisData.axis; + + // don't zoom more than minRange + if (chart.tracker[axis.isXAxis ? 'zoomX' : 'zoomY']) { + hasZoomed = axis.zoom(axisData.min, axisData.max); + } + }); + } + + // Show the Reset zoom button + if (!chart.resetZoomButton) { + chart.showResetZoom(); + } + + + // Redraw + if (hasZoomed) { + chart.redraw( + pick(chart.options.chart.animation, chart.pointCount < 100) // animation + ); + } + }, + + /** + * Pan the chart by dragging the mouse across the pane. This function is called + * on mouse move, and the distance to pan is computed from chartX compared to + * the first chartX position in the dragging operation. + */ + pan: function (chartX) { + var chart = this; + + var xAxis = chart.xAxis[0], + mouseDownX = chart.mouseDownX, + halfPointRange = xAxis.pointRange / 2, + extremes = xAxis.getExtremes(), + newMin = xAxis.translate(mouseDownX - chartX, true) + halfPointRange, + newMax = xAxis.translate(mouseDownX + chart.plotWidth - chartX, true) - halfPointRange, + hoverPoints = chart.hoverPoints; + + // remove active points for shared tooltip + if (hoverPoints) { + each(hoverPoints, function (point) { + point.setState(); + }); + } + + if (xAxis.series.length && newMin > mathMin(extremes.dataMin, extremes.min) && newMax < mathMax(extremes.dataMax, extremes.max)) { + xAxis.setExtremes(newMin, newMax, true, false, { trigger: 'pan' }); + } + + chart.mouseDownX = chartX; // set new reference for next run + css(chart.container, { cursor: 'move' }); + }, + + /** + * Show the title and subtitle of the chart + * + * @param titleOptions {Object} New title options + * @param subtitleOptions {Object} New subtitle options + * + */ + setTitle: function (titleOptions, subtitleOptions) { + var chart = this, + options = chart.options, + chartTitleOptions, + chartSubtitleOptions; + + chart.chartTitleOptions = chartTitleOptions = merge(options.title, titleOptions); + chart.chartSubtitleOptions = chartSubtitleOptions = merge(options.subtitle, subtitleOptions); + + // add title and subtitle + each([ + ['title', titleOptions, chartTitleOptions], + ['subtitle', subtitleOptions, chartSubtitleOptions] + ], function (arr) { + var name = arr[0], + title = chart[name], + titleOptions = arr[1], + chartTitleOptions = arr[2]; + + if (title && titleOptions) { + chart[name] = title = title.destroy(); // remove old + } + + if (chartTitleOptions && chartTitleOptions.text && !title) { + chart[name] = chart.renderer.text( + chartTitleOptions.text, + 0, + 0, + chartTitleOptions.useHTML + ) + .attr({ + align: chartTitleOptions.align, + 'class': PREFIX + name, + zIndex: chartTitleOptions.zIndex || 4 + }) + .css(chartTitleOptions.style) + .add() + .align(chartTitleOptions, false, chart.spacingBox); + } + }); + + }, + + /** + * Get chart width and height according to options and container size + */ + getChartSize: function () { + var chart = this, + optionsChart = chart.options.chart, + renderTo = chart.renderToClone || chart.renderTo; + + // get inner width and height from jQuery (#824) + chart.containerWidth = adapterRun(renderTo, 'width'); + chart.containerHeight = adapterRun(renderTo, 'height'); + + chart.chartWidth = optionsChart.width || chart.containerWidth || 600; + chart.chartHeight = optionsChart.height || + // the offsetHeight of an empty container is 0 in standard browsers, but 19 in IE7: + (chart.containerHeight > 19 ? chart.containerHeight : 400); + }, + + /** + * Create a clone of the chart's renderTo div and place it outside the viewport to allow + * size computation on chart.render and chart.redraw + */ + cloneRenderTo: function (revert) { + var clone = this.renderToClone, + container = this.container; + + // Destroy the clone and bring the container back to the real renderTo div + if (revert) { + if (clone) { + this.renderTo.appendChild(container); + discardElement(clone); + delete this.renderToClone; + } + + // Set up the clone + } else { + if (container) { + this.renderTo.removeChild(container); // do not clone this + } + this.renderToClone = clone = this.renderTo.cloneNode(0); + css(clone, { + position: ABSOLUTE, + top: '-9999px', + display: 'block' // #833 + }); + doc.body.appendChild(clone); + if (container) { + clone.appendChild(container); + } + } + }, + + /** + * Get the containing element, determine the size and create the inner container + * div to hold the chart + */ + getContainer: function () { + var chart = this, + container, + optionsChart = chart.options.chart, + chartWidth, + chartHeight, + renderTo, + containerId; + + chart.renderTo = renderTo = optionsChart.renderTo; + containerId = PREFIX + idCounter++; + + if (isString(renderTo)) { + chart.renderTo = renderTo = doc.getElementById(renderTo); + } + + // Display an error if the renderTo is wrong + if (!renderTo) { + error(13, true); + } + + // remove previous chart + renderTo.innerHTML = ''; + + // If the container doesn't have an offsetWidth, it has or is a child of a node + // that has display:none. We need to temporarily move it out to a visible + // state to determine the size, else the legend and tooltips won't render + // properly + if (!renderTo.offsetWidth) { + chart.cloneRenderTo(); + } + + // get the width and height + chart.getChartSize(); + chartWidth = chart.chartWidth; + chartHeight = chart.chartHeight; + + // create the inner container + chart.container = container = createElement(DIV, { + className: PREFIX + 'container' + + (optionsChart.className ? ' ' + optionsChart.className : ''), + id: containerId + }, extend({ + position: RELATIVE, + overflow: HIDDEN, // needed for context menu (avoid scrollbars) and + // content overflow in IE + width: chartWidth + PX, + height: chartHeight + PX, + textAlign: 'left', + lineHeight: 'normal', // #427 + zIndex: 0 // #1072 + }, optionsChart.style), + chart.renderToClone || renderTo + ); + + chart.renderer = + optionsChart.forExport ? // force SVG, used for SVG export + new SVGRenderer(container, chartWidth, chartHeight, true) : + new Renderer(container, chartWidth, chartHeight); + + if (useCanVG) { + // If we need canvg library, extend and configure the renderer + // to get the tracker for translating mouse events + chart.renderer.create(chart, container, chartWidth, chartHeight); + } + }, + + /** + * Calculate margins by rendering axis labels in a preliminary position. Title, + * subtitle and legend have already been rendered at this stage, but will be + * moved into their final positions + */ + getMargins: function () { + var chart = this, + optionsChart = chart.options.chart, + spacingTop = optionsChart.spacingTop, + spacingRight = optionsChart.spacingRight, + spacingBottom = optionsChart.spacingBottom, + spacingLeft = optionsChart.spacingLeft, + axisOffset, + legend = chart.legend, + optionsMarginTop = chart.optionsMarginTop, + optionsMarginLeft = chart.optionsMarginLeft, + optionsMarginRight = chart.optionsMarginRight, + optionsMarginBottom = chart.optionsMarginBottom, + chartTitleOptions = chart.chartTitleOptions, + chartSubtitleOptions = chart.chartSubtitleOptions, + legendOptions = chart.options.legend, + legendMargin = pick(legendOptions.margin, 10), + legendX = legendOptions.x, + legendY = legendOptions.y, + align = legendOptions.align, + verticalAlign = legendOptions.verticalAlign, + titleOffset; + + chart.resetMargins(); + axisOffset = chart.axisOffset; + + // adjust for title and subtitle + if ((chart.title || chart.subtitle) && !defined(chart.optionsMarginTop)) { + titleOffset = mathMax( + (chart.title && !chartTitleOptions.floating && !chartTitleOptions.verticalAlign && chartTitleOptions.y) || 0, + (chart.subtitle && !chartSubtitleOptions.floating && !chartSubtitleOptions.verticalAlign && chartSubtitleOptions.y) || 0 + ); + if (titleOffset) { + chart.plotTop = mathMax(chart.plotTop, titleOffset + pick(chartTitleOptions.margin, 15) + spacingTop); + } + } + // adjust for legend + if (legend.display && !legendOptions.floating) { + if (align === 'right') { // horizontal alignment handled first + if (!defined(optionsMarginRight)) { + chart.marginRight = mathMax( + chart.marginRight, + legend.legendWidth - legendX + legendMargin + spacingRight + ); + } + } else if (align === 'left') { + if (!defined(optionsMarginLeft)) { + chart.plotLeft = mathMax( + chart.plotLeft, + legend.legendWidth + legendX + legendMargin + spacingLeft + ); + } + + } else if (verticalAlign === 'top') { + if (!defined(optionsMarginTop)) { + chart.plotTop = mathMax( + chart.plotTop, + legend.legendHeight + legendY + legendMargin + spacingTop + ); + } + + } else if (verticalAlign === 'bottom') { + if (!defined(optionsMarginBottom)) { + chart.marginBottom = mathMax( + chart.marginBottom, + legend.legendHeight - legendY + legendMargin + spacingBottom + ); + } + } + } + + // adjust for scroller + if (chart.extraBottomMargin) { + chart.marginBottom += chart.extraBottomMargin; + } + if (chart.extraTopMargin) { + chart.plotTop += chart.extraTopMargin; + } + + // pre-render axes to get labels offset width + if (chart.hasCartesianSeries) { + each(chart.axes, function (axis) { + axis.getOffset(); + }); + } + + if (!defined(optionsMarginLeft)) { + chart.plotLeft += axisOffset[3]; + } + if (!defined(optionsMarginTop)) { + chart.plotTop += axisOffset[0]; + } + if (!defined(optionsMarginBottom)) { + chart.marginBottom += axisOffset[2]; + } + if (!defined(optionsMarginRight)) { + chart.marginRight += axisOffset[1]; + } + + chart.setChartSize(); + + }, + + /** + * Add the event handlers necessary for auto resizing + * + */ + initReflow: function () { + var chart = this, + optionsChart = chart.options.chart, + renderTo = chart.renderTo; + + var reflowTimeout; + function reflow(e) { + var width = optionsChart.width || adapterRun(renderTo, 'width'), + height = optionsChart.height || adapterRun(renderTo, 'height'), + target = e ? e.target : win; // #805 - MooTools doesn't supply e + + // Width and height checks for display:none. Target is doc in IE8 and Opera, + // win in Firefox, Chrome and IE9. + if (width && height && (target === win || target === doc)) { + + if (width !== chart.containerWidth || height !== chart.containerHeight) { + clearTimeout(reflowTimeout); + reflowTimeout = setTimeout(function () { + chart.resize(width, height, false); + }, 100); + } + chart.containerWidth = width; + chart.containerHeight = height; + } + } + addEvent(win, 'resize', reflow); + addEvent(chart, 'destroy', function () { + removeEvent(win, 'resize', reflow); + }); + }, + + /** + * Resize the chart to a given width and height + * @param {Number} width + * @param {Number} height + * @param {Object|Boolean} animation + */ + // TODO: This method is called setSize in the api + resize: function (width, height, animation) { + var chart = this, + chartWidth, + chartHeight, + spacingBox, + resetZoomButton = chart.resetZoomButton, + chartTitle = chart.title, + chartSubtitle = chart.subtitle, + fireEndResize; + + // Handle the isResizing counter + chart.isResizing += 1; + fireEndResize = function () { + if (chart) { + fireEvent(chart, 'endResize', null, function () { + chart.isResizing -= 1; + }); + } + }; + + // set the animation for the current process + setAnimation(animation, chart); + + chart.oldChartHeight = chart.chartHeight; + chart.oldChartWidth = chart.chartWidth; + if (defined(width)) { + chart.chartWidth = chartWidth = mathRound(width); + } + if (defined(height)) { + chart.chartHeight = chartHeight = mathRound(height); + } + + css(chart.container, { + width: chartWidth + PX, + height: chartHeight + PX + }); + chart.renderer.setSize(chartWidth, chartHeight, animation); + + // update axis lengths for more correct tick intervals: + chart.plotWidth = chartWidth - chart.plotLeft - chart.marginRight; + chart.plotHeight = chartHeight - chart.plotTop - chart.marginBottom; + + // handle axes + chart.maxTicks = null; + each(chart.axes, function (axis) { + axis.isDirty = true; + axis.setScale(); + }); + + // make sure non-cartesian series are also handled + each(chart.series, function (serie) { + serie.isDirty = true; + }); + + chart.isDirtyLegend = true; // force legend redraw + chart.isDirtyBox = true; // force redraw of plot and chart border + + chart.getMargins(); + + // move titles + spacingBox = chart.spacingBox; + if (chartTitle) { + chartTitle.align(null, null, spacingBox); + } + if (chartSubtitle) { + chartSubtitle.align(null, null, spacingBox); + } + + // Move resize button (#1115) + if (resetZoomButton) { + resetZoomButton.align(null, null, chart[resetZoomButton.alignTo]); + } + + chart.redraw(animation); + + + chart.oldChartHeight = null; + fireEvent(chart, 'resize'); + + // fire endResize and set isResizing back + // If animation is disabled, fire without delay + if (globalAnimation === false) { + fireEndResize(); + } else { // else set a timeout with the animation duration + setTimeout(fireEndResize, (globalAnimation && globalAnimation.duration) || 500); + } + }, + + /** + * Set the public chart properties. This is done before and after the pre-render + * to determine margin sizes + */ + setChartSize: function () { + var chart = this, + inverted = chart.inverted, + chartWidth = chart.chartWidth, + chartHeight = chart.chartHeight, + optionsChart = chart.options.chart, + spacingTop = optionsChart.spacingTop, + spacingRight = optionsChart.spacingRight, + spacingBottom = optionsChart.spacingBottom, + spacingLeft = optionsChart.spacingLeft, + plotLeft, + plotTop, + plotWidth, + plotHeight, + plotBorderWidth; + + chart.plotLeft = plotLeft = mathRound(chart.plotLeft); + chart.plotTop = plotTop = mathRound(chart.plotTop); + chart.plotWidth = plotWidth = mathRound(chartWidth - plotLeft - chart.marginRight); + chart.plotHeight = plotHeight = mathRound(chartHeight - plotTop - chart.marginBottom); + + chart.plotSizeX = inverted ? plotHeight : plotWidth; + chart.plotSizeY = inverted ? plotWidth : plotHeight; + + chart.plotBorderWidth = plotBorderWidth = optionsChart.plotBorderWidth || 0; + + // Set boxes used for alignment + chart.spacingBox = { + x: spacingLeft, + y: spacingTop, + width: chartWidth - spacingLeft - spacingRight, + height: chartHeight - spacingTop - spacingBottom + }; + chart.plotBox = { + x: plotLeft, + y: plotTop, + width: plotWidth, + height: plotHeight + }; + chart.clipBox = { + x: plotBorderWidth / 2, + y: plotBorderWidth / 2, + width: chart.plotSizeX - plotBorderWidth, + height: chart.plotSizeY - plotBorderWidth + }; + + each(chart.axes, function (axis) { + axis.setAxisSize(); + axis.setAxisTranslation(); + }); + }, + + /** + * Initial margins before auto size margins are applied + */ + resetMargins: function () { + var chart = this, + optionsChart = chart.options.chart, + spacingTop = optionsChart.spacingTop, + spacingRight = optionsChart.spacingRight, + spacingBottom = optionsChart.spacingBottom, + spacingLeft = optionsChart.spacingLeft; + + chart.plotTop = pick(chart.optionsMarginTop, spacingTop); + chart.marginRight = pick(chart.optionsMarginRight, spacingRight); + chart.marginBottom = pick(chart.optionsMarginBottom, spacingBottom); + chart.plotLeft = pick(chart.optionsMarginLeft, spacingLeft); + chart.axisOffset = [0, 0, 0, 0]; // top, right, bottom, left + }, + + /** + * Draw the borders and backgrounds for chart and plot area + */ + drawChartBox: function () { + var chart = this, + optionsChart = chart.options.chart, + renderer = chart.renderer, + chartWidth = chart.chartWidth, + chartHeight = chart.chartHeight, + chartBackground = chart.chartBackground, + plotBackground = chart.plotBackground, + plotBorder = chart.plotBorder, + plotBGImage = chart.plotBGImage, + chartBorderWidth = optionsChart.borderWidth || 0, + chartBackgroundColor = optionsChart.backgroundColor, + plotBackgroundColor = optionsChart.plotBackgroundColor, + plotBackgroundImage = optionsChart.plotBackgroundImage, + plotBorderWidth = optionsChart.plotBorderWidth || 0, + mgn, + bgAttr, + plotLeft = chart.plotLeft, + plotTop = chart.plotTop, + plotWidth = chart.plotWidth, + plotHeight = chart.plotHeight, + plotBox = chart.plotBox, + clipRect = chart.clipRect, + clipBox = chart.clipBox; + + // Chart area + mgn = chartBorderWidth + (optionsChart.shadow ? 8 : 0); + + if (chartBorderWidth || chartBackgroundColor) { + if (!chartBackground) { + + bgAttr = { + fill: chartBackgroundColor || NONE + }; + if (chartBorderWidth) { // #980 + bgAttr.stroke = optionsChart.borderColor; + bgAttr['stroke-width'] = chartBorderWidth; + } + chart.chartBackground = renderer.rect(mgn / 2, mgn / 2, chartWidth - mgn, chartHeight - mgn, + optionsChart.borderRadius, chartBorderWidth) + .attr(bgAttr) + .add() + .shadow(optionsChart.shadow); + + } else { // resize + chartBackground.animate( + chartBackground.crisp(null, null, null, chartWidth - mgn, chartHeight - mgn) + ); + } + } + + + // Plot background + if (plotBackgroundColor) { + if (!plotBackground) { + chart.plotBackground = renderer.rect(plotLeft, plotTop, plotWidth, plotHeight, 0) + .attr({ + fill: plotBackgroundColor + }) + .add() + .shadow(optionsChart.plotShadow); + } else { + plotBackground.animate(plotBox); + } + } + if (plotBackgroundImage) { + if (!plotBGImage) { + chart.plotBGImage = renderer.image(plotBackgroundImage, plotLeft, plotTop, plotWidth, plotHeight) + .add(); + } else { + plotBGImage.animate(plotBox); + } + } + + // Plot clip + if (!clipRect) { + chart.clipRect = renderer.clipRect(clipBox); + } else { + clipRect.animate({ + width: clipBox.width, + height: clipBox.height + }); + } + + // Plot area border + if (plotBorderWidth) { + if (!plotBorder) { + chart.plotBorder = renderer.rect(plotLeft, plotTop, plotWidth, plotHeight, 0, plotBorderWidth) + .attr({ + stroke: optionsChart.plotBorderColor, + 'stroke-width': plotBorderWidth, + zIndex: 1 + }) + .add(); + } else { + plotBorder.animate( + plotBorder.crisp(null, plotLeft, plotTop, plotWidth, plotHeight) + ); + } + } + + // reset + chart.isDirtyBox = false; + }, + + /** + * Detect whether a certain chart property is needed based on inspecting its options + * and series. This mainly applies to the chart.invert property, and in extensions to + * the chart.angular and chart.polar properties. + */ + propFromSeries: function () { + var chart = this, + optionsChart = chart.options.chart, + klass, + seriesOptions = chart.options.series, + i, + value; + + + each(['inverted', 'angular', 'polar'], function (key) { + + // The default series type's class + klass = seriesTypes[optionsChart.type || optionsChart.defaultSeriesType]; + + // Get the value from available chart-wide properties + value = ( + chart[key] || // 1. it is set before + optionsChart[key] || // 2. it is set in the options + (klass && klass.prototype[key]) // 3. it's default series class requires it + ); + + // 4. Check if any the chart's series require it + i = seriesOptions && seriesOptions.length; + while (!value && i--) { + klass = seriesTypes[seriesOptions[i].type]; + if (klass && klass.prototype[key]) { + value = true; + } + } + + // Set the chart property + chart[key] = value; + }); + + }, + + /** + * Render all graphics for the chart + */ + render: function () { + var chart = this, + axes = chart.axes, + renderer = chart.renderer, + options = chart.options; + + var labels = options.labels, + credits = options.credits, + creditsHref; + + // Title + chart.setTitle(); + + + // Legend + chart.legend = new Legend(chart); + + // Get margins by pre-rendering axes + // set axes scales + each(axes, function (axis) { + axis.setScale(); + }); + chart.getMargins(); + + chart.maxTicks = null; // reset for second pass + each(axes, function (axis) { + axis.setTickPositions(true); // update to reflect the new margins + axis.setMaxTicks(); + }); + chart.adjustTickAmounts(); + chart.getMargins(); // second pass to check for new labels + + + // Draw the borders and backgrounds + chart.drawChartBox(); + + + // Axes + if (chart.hasCartesianSeries) { + each(axes, function (axis) { + axis.render(); + }); + } + + // The series + if (!chart.seriesGroup) { + chart.seriesGroup = renderer.g('series-group') + .attr({ zIndex: 3 }) + .add(); + } + each(chart.series, function (serie) { + serie.translate(); + serie.setTooltipPoints(); + serie.render(); + }); + + // Labels + if (labels.items) { + each(labels.items, function (label) { + var style = extend(labels.style, label.style), + x = pInt(style.left) + chart.plotLeft, + y = pInt(style.top) + chart.plotTop + 12; + + // delete to prevent rewriting in IE + delete style.left; + delete style.top; + + renderer.text( + label.html, + x, + y + ) + .attr({ zIndex: 2 }) + .css(style) + .add(); + + }); + } + + // Credits + if (credits.enabled && !chart.credits) { + creditsHref = credits.href; + chart.credits = renderer.text( + credits.text, + 0, + 0 + ) + .on('click', function () { + if (creditsHref) { + location.href = creditsHref; + } + }) + .attr({ + align: credits.position.align, + zIndex: 8 + }) + .css(credits.style) + .add() + .align(credits.position); + } + + // Set flag + chart.hasRendered = true; + + }, + + /** + * Clean up memory usage + */ + destroy: function () { + var chart = this, + axes = chart.axes, + series = chart.series, + container = chart.container; + + var i, + parentNode = container && container.parentNode; + + // If the chart is destroyed already, do nothing. + // This will happen if if a script invokes chart.destroy and + // then it will be called again on win.unload + if (chart === null) { + return; + } + + // fire the chart.destoy event + fireEvent(chart, 'destroy'); + + // remove events + removeEvent(chart); + + // ==== Destroy collections: + // Destroy axes + i = axes.length; + while (i--) { + axes[i] = axes[i].destroy(); + } + + // Destroy each series + i = series.length; + while (i--) { + series[i] = series[i].destroy(); + } + + // ==== Destroy chart properties: + each(['title', 'subtitle', 'chartBackground', 'plotBackground', 'plotBGImage', 'plotBorder', 'seriesGroup', 'clipRect', 'credits', 'tracker', 'scroller', 'rangeSelector', 'legend', 'resetZoomButton', 'tooltip', 'renderer'], function (name) { + var prop = chart[name]; + + if (prop) { + chart[name] = prop.destroy(); + } + }); + + // remove container and all SVG + if (container) { // can break in IE when destroyed before finished loading + container.innerHTML = ''; + removeEvent(container); + if (parentNode) { + discardElement(container); + } + + // IE6 leak + container = null; + } + + // clean it all up + for (i in chart) { + delete chart[i]; + } + + chart.options = null; + chart = null; + }, + + /** + * Prepare for first rendering after all data are loaded + */ + firstRender: function () { + var chart = this, + options = chart.options, + callback = chart.callback; + + // VML namespaces can't be added until after complete. Listening + // for Perini's doScroll hack is not enough. + var ONREADYSTATECHANGE = 'onreadystatechange', + COMPLETE = 'complete'; + // Note: in spite of JSLint's complaints, win == win.top is required + /*jslint eqeq: true*/ + if ((!hasSVG && (win == win.top && doc.readyState !== COMPLETE)) || (useCanVG && !win.canvg)) { + /*jslint eqeq: false*/ + if (useCanVG) { + // Delay rendering until canvg library is downloaded and ready + CanVGController.push(function () { chart.firstRender(); }, options.global.canvasToolsURL); + } else { + doc.attachEvent(ONREADYSTATECHANGE, function () { + doc.detachEvent(ONREADYSTATECHANGE, chart.firstRender); + if (doc.readyState === COMPLETE) { + chart.firstRender(); + } + }); + } + return; + } + + // create the container + chart.getContainer(); + + // Run an early event after the container and renderer are established + fireEvent(chart, 'init'); + + // Initialize range selector for stock charts + if (Highcharts.RangeSelector && options.rangeSelector.enabled) { + chart.rangeSelector = new Highcharts.RangeSelector(chart); + } + + chart.resetMargins(); + chart.setChartSize(); + + // Set the common chart properties (mainly invert) from the given series + chart.propFromSeries(); + + // get axes + chart.getAxes(); + + // Initialize the series + each(options.series || [], function (serieOptions) { + chart.initSeries(serieOptions); + }); + + // Run an event where series and axes can be added + //fireEvent(chart, 'beforeRender'); + + // Initialize scroller for stock charts + if (Highcharts.Scroller && (options.navigator.enabled || options.scrollbar.enabled)) { + chart.scroller = new Highcharts.Scroller(chart); + } + + // depends on inverted and on margins being set + chart.tracker = new MouseTracker(chart, options); + + chart.render(); + + // add canvas + chart.renderer.draw(); + // run callbacks + if (callback) { + callback.apply(chart, [chart]); + } + each(chart.callbacks, function (fn) { + fn.apply(chart, [chart]); + }); + + + // If the chart was rendered outside the top container, put it back in + chart.cloneRenderTo(true); + + fireEvent(chart, 'load'); + + }, + + init: function (chartEvents) { + var chart = this, + optionsChart = chart.options.chart, + eventType; + + // Run chart + + // Set up auto resize + if (optionsChart.reflow !== false) { + addEvent(chart, 'load', chart.initReflow); + } + + // Chart event handlers + if (chartEvents) { + for (eventType in chartEvents) { + addEvent(chart, eventType, chartEvents[eventType]); + } + } + + chart.xAxis = []; + chart.yAxis = []; + + // Expose methods and variables + chart.animation = useCanVG ? false : pick(optionsChart.animation, true); + chart.setSize = chart.resize; + chart.pointCount = 0; + chart.counters = new ChartCounters(); + /* + if ($) $(function () { + $container = $('#container'); + var origChartWidth, + origChartHeight; + if ($container) { + $('') + .insertBefore($container) + .click(function () { + if (origChartWidth === UNDEFINED) { + origChartWidth = chartWidth; + origChartHeight = chartHeight; + } + chart.resize(chartWidth *= 1.1, chartHeight *= 1.1); + }); + $('') + .insertBefore($container) + .click(function () { + if (origChartWidth === UNDEFINED) { + origChartWidth = chartWidth; + origChartHeight = chartHeight; + } + chart.resize(chartWidth *= 0.9, chartHeight *= 0.9); + }); + $('') + .insertBefore($container) + .click(function () { + if (origChartWidth === UNDEFINED) { + origChartWidth = chartWidth; + origChartHeight = chartHeight; + } + chart.resize(origChartWidth, origChartHeight); + }); + } + }) + */ + + chart.firstRender(); + } +}; // end Chart + +// Hook for exporting module +Chart.prototype.callbacks = []; +/** + * The Point object and prototype. Inheritable and used as base for PiePoint + */ +var Point = function () {}; +Point.prototype = { + + /** + * Initialize the point + * @param {Object} series The series object containing this point + * @param {Object} options The data in either number, array or object format + */ + init: function (series, options, x) { + var point = this, + counters = series.chart.counters, + defaultColors; + point.series = series; + point.applyOptions(options, x); + point.pointAttr = {}; + + if (series.options.colorByPoint) { + defaultColors = series.chart.options.colors; + point.color = point.color || defaultColors[counters.color++]; + + // loop back to zero + counters.wrapColor(defaultColors.length); + } + + series.chart.pointCount++; + return point; + }, + /** + * Apply the options containing the x and y data and possible some extra properties. + * This is called on point init or from point.update. + * + * @param {Object} options + */ + applyOptions: function (options, x) { + var point = this, + series = point.series, + optionsType = typeof options; + + point.config = options; + + // onedimensional array input + if (optionsType === 'number' || options === null) { + point.y = options; + } else if (typeof options[0] === 'number') { // two-dimentional array + point.x = options[0]; + point.y = options[1]; + } else if (optionsType === 'object' && typeof options.length !== 'number') { // object input + // copy options directly to point + extend(point, options); + point.options = options; + + // This is the fastest way to detect if there are individual point dataLabels that need + // to be considered in drawDataLabels. These can only occur in object configs. + if (options.dataLabels) { + series._hasPointLabels = true; + } + + // Same approach as above for markers + if (options.marker) { + series._hasPointMarkers = true; + } + } else if (typeof options[0] === 'string') { // categorized data with name in first position + point.name = options[0]; + point.y = options[1]; + } + + /* + * If no x is set by now, get auto incremented value. All points must have an + * x value, however the y value can be null to create a gap in the series + */ + // todo: skip this? It is only used in applyOptions, in translate it should not be used + if (point.x === UNDEFINED) { + point.x = x === UNDEFINED ? series.autoIncrement() : x; + } + + }, + + /** + * Destroy a point to clear memory. Its reference still stays in series.data. + */ + destroy: function () { + var point = this, + series = point.series, + chart = series.chart, + hoverPoints = chart.hoverPoints, + prop; + + chart.pointCount--; + + if (hoverPoints) { + point.setState(); + erase(hoverPoints, point); + if (!hoverPoints.length) { + chart.hoverPoints = null; + } + + } + if (point === chart.hoverPoint) { + point.onMouseOut(); + } + + // remove all events + if (point.graphic || point.dataLabel) { // removeEvent and destroyElements are performance expensive + removeEvent(point); + point.destroyElements(); + } + + if (point.legendItem) { // pies have legend items + chart.legend.destroyItem(point); + } + + for (prop in point) { + point[prop] = null; + } + + + }, + + /** + * Destroy SVG elements associated with the point + */ + destroyElements: function () { + var point = this, + props = ['graphic', 'tracker', 'dataLabel', 'group', 'connector', 'shadowGroup'], + prop, + i = 6; + while (i--) { + prop = props[i]; + if (point[prop]) { + point[prop] = point[prop].destroy(); + } + } + }, + + /** + * Return the configuration hash needed for the data label and tooltip formatters + */ + getLabelConfig: function () { + var point = this; + return { + x: point.category, + y: point.y, + key: point.name || point.category, + series: point.series, + point: point, + percentage: point.percentage, + total: point.total || point.stackTotal + }; + }, + + /** + * Toggle the selection status of a point + * @param {Boolean} selected Whether to select or unselect the point. + * @param {Boolean} accumulate Whether to add to the previous selection. By default, + * this happens if the control key (Cmd on Mac) was pressed during clicking. + */ + select: function (selected, accumulate) { + var point = this, + series = point.series, + chart = series.chart; + + selected = pick(selected, !point.selected); + + // fire the event with the defalut handler + point.firePointEvent(selected ? 'select' : 'unselect', { accumulate: accumulate }, function () { + point.selected = selected; + point.setState(selected && SELECT_STATE); + + // unselect all other points unless Ctrl or Cmd + click + if (!accumulate) { + each(chart.getSelectedPoints(), function (loopPoint) { + if (loopPoint.selected && loopPoint !== point) { + loopPoint.selected = false; + loopPoint.setState(NORMAL_STATE); + loopPoint.firePointEvent('unselect'); + } + }); + } + }); + }, + + onMouseOver: function () { + var point = this, + series = point.series, + chart = series.chart, + tooltip = chart.tooltip, + hoverPoint = chart.hoverPoint; + + // set normal state to previous series + if (hoverPoint && hoverPoint !== point) { + hoverPoint.onMouseOut(); + } + + // trigger the event + point.firePointEvent('mouseOver'); + + // update the tooltip + if (tooltip && (!tooltip.shared || series.noSharedTooltip)) { + tooltip.refresh(point); + } + + // hover this + point.setState(HOVER_STATE); + chart.hoverPoint = point; + }, + + onMouseOut: function () { + var chart = this.series.chart, + hoverPoints = chart.hoverPoints; + + if (!hoverPoints || inArray(this, hoverPoints) === -1) { // #887 + this.firePointEvent('mouseOut'); + + this.setState(); + chart.hoverPoint = null; + } + }, + + /** + * Extendable method for formatting each point's tooltip line + * + * @return {String} A string to be concatenated in to the common tooltip text + */ + tooltipFormatter: function (pointFormat) { + var point = this, + series = point.series, + seriesTooltipOptions = series.tooltipOptions, + match = pointFormat.match(/\{(series|point)\.[a-zA-Z]+\}/g), + splitter = /[{\.}]/, + obj, + key, + replacement, + repOptionKey, + parts, + prop, + i, + cfg = { // docs: percentageDecimals, percentagePrefix, percentageSuffix, totalDecimals, totalPrefix, totalSuffix + y: 0, // 0: use 'value' for repOptionKey + open: 0, + high: 0, + low: 0, + close: 0, + percentage: 1, // 1: use the self name for repOptionKey + total: 1 + }; + + // Backwards compatibility to y naming in early Highstock + seriesTooltipOptions.valuePrefix = seriesTooltipOptions.valuePrefix || seriesTooltipOptions.yPrefix; + seriesTooltipOptions.valueDecimals = seriesTooltipOptions.valueDecimals || seriesTooltipOptions.yDecimals; + seriesTooltipOptions.valueSuffix = seriesTooltipOptions.valueSuffix || seriesTooltipOptions.ySuffix; + + // loop over the variables defined on the form {series.name}, {point.y} etc + for (i in match) { + key = match[i]; + if (isString(key) && key !== pointFormat) { // IE matches more than just the variables + + // Split it further into parts + parts = (' ' + key).split(splitter); // add empty string because IE and the rest handles it differently + obj = { 'point': point, 'series': series }[parts[1]]; + prop = parts[2]; + + // Add some preformatting + if (obj === point && cfg.hasOwnProperty(prop)) { + repOptionKey = cfg[prop] ? prop : 'value'; + replacement = (seriesTooltipOptions[repOptionKey + 'Prefix'] || '') + + numberFormat(point[prop], pick(seriesTooltipOptions[repOptionKey + 'Decimals'], -1)) + + (seriesTooltipOptions[repOptionKey + 'Suffix'] || ''); + + // Automatic replacement + } else { + replacement = obj[prop]; + } + + pointFormat = pointFormat.replace(key, replacement); + } + } + + return pointFormat; + }, + + /** + * Update the point with new options (typically x/y data) and optionally redraw the series. + * + * @param {Object} options Point options as defined in the series.data array + * @param {Boolean} redraw Whether to redraw the chart or wait for an explicit call + * @param {Boolean|Object} animation Whether to apply animation, and optionally animation + * configuration + * + */ + update: function (options, redraw, animation) { + var point = this, + series = point.series, + graphic = point.graphic, + i, + data = series.data, + dataLength = data.length, + chart = series.chart; + + redraw = pick(redraw, true); + + // fire the event with a default handler of doing the update + point.firePointEvent('update', { options: options }, function () { + + point.applyOptions(options); + + // update visuals + if (isObject(options)) { + series.getAttribs(); + if (graphic) { + graphic.attr(point.pointAttr[series.state]); + } + } + + // record changes in the parallel arrays + for (i = 0; i < dataLength; i++) { + if (data[i] === point) { + series.xData[i] = point.x; + series.yData[i] = point.y; + series.options.data[i] = options; + break; + } + } + + // redraw + series.isDirty = true; + series.isDirtyData = true; + if (redraw) { + chart.redraw(animation); + } + }); + }, + + /** + * Remove a point and optionally redraw the series and if necessary the axes + * @param {Boolean} redraw Whether to redraw the chart or wait for an explicit call + * @param {Boolean|Object} animation Whether to apply animation, and optionally animation + * configuration + */ + remove: function (redraw, animation) { + var point = this, + series = point.series, + chart = series.chart, + i, + data = series.data, + dataLength = data.length; + + setAnimation(animation, chart); + redraw = pick(redraw, true); + + // fire the event with a default handler of removing the point + point.firePointEvent('remove', null, function () { + + //erase(series.data, point); + + for (i = 0; i < dataLength; i++) { + if (data[i] === point) { + + // splice all the parallel arrays + data.splice(i, 1); + series.options.data.splice(i, 1); + series.xData.splice(i, 1); + series.yData.splice(i, 1); + break; + } + } + + point.destroy(); + + + // redraw + series.isDirty = true; + series.isDirtyData = true; + if (redraw) { + chart.redraw(); + } + }); + + + }, + + /** + * Fire an event on the Point object. Must not be renamed to fireEvent, as this + * causes a name clash in MooTools + * @param {String} eventType + * @param {Object} eventArgs Additional event arguments + * @param {Function} defaultFunction Default event handler + */ + firePointEvent: function (eventType, eventArgs, defaultFunction) { + var point = this, + series = this.series, + seriesOptions = series.options; + + // load event handlers on demand to save time on mouseover/out + if (seriesOptions.point.events[eventType] || (point.options && point.options.events && point.options.events[eventType])) { + this.importEvents(); + } + + // add default handler if in selection mode + if (eventType === 'click' && seriesOptions.allowPointSelect) { + defaultFunction = function (event) { + // Control key is for Windows, meta (= Cmd key) for Mac, Shift for Opera + point.select(null, event.ctrlKey || event.metaKey || event.shiftKey); + }; + } + + fireEvent(this, eventType, eventArgs, defaultFunction); + }, + /** + * Import events from the series' and point's options. Only do it on + * demand, to save processing time on hovering. + */ + importEvents: function () { + if (!this.hasImportedEvents) { + var point = this, + options = merge(point.series.options.point, point.options), + events = options.events, + eventType; + + point.events = events; + + for (eventType in events) { + addEvent(point, eventType, events[eventType]); + } + this.hasImportedEvents = true; + + } + }, + + /** + * Set the point's state + * @param {String} state + */ + setState: function (state) { + var point = this, + plotX = point.plotX, + plotY = point.plotY, + series = point.series, + stateOptions = series.options.states, + markerOptions = defaultPlotOptions[series.type].marker && series.options.marker, + normalDisabled = markerOptions && !markerOptions.enabled, + markerStateOptions = markerOptions && markerOptions.states[state], + stateDisabled = markerStateOptions && markerStateOptions.enabled === false, + stateMarkerGraphic = series.stateMarkerGraphic, + chart = series.chart, + radius, + pointAttr = point.pointAttr; + + state = state || NORMAL_STATE; // empty string + + if ( + // already has this state + state === point.state || + // selected points don't respond to hover + (point.selected && state !== SELECT_STATE) || + // series' state options is disabled + (stateOptions[state] && stateOptions[state].enabled === false) || + // point marker's state options is disabled + (state && (stateDisabled || (normalDisabled && !markerStateOptions.enabled))) + + ) { + return; + } + + // apply hover styles to the existing point + if (point.graphic) { + radius = markerOptions && point.graphic.symbolName && pointAttr[state].r; + point.graphic.attr(merge( + pointAttr[state], + radius ? { // new symbol attributes (#507, #612) + x: plotX - radius, + y: plotY - radius, + width: 2 * radius, + height: 2 * radius + } : {} + )); + } else { + // if a graphic is not applied to each point in the normal state, create a shared + // graphic for the hover state + if (state && markerStateOptions) { + radius = markerStateOptions.radius; + if (!stateMarkerGraphic) { // add + series.stateMarkerGraphic = stateMarkerGraphic = chart.renderer.symbol( + series.symbol, + plotX - radius, + plotY - radius, + 2 * radius, + 2 * radius + ) + .attr(pointAttr[state]) + .add(series.markerGroup); + + } else { // update + stateMarkerGraphic.attr({ // #1054 + x: plotX - radius, + y: plotY - radius + }); + } + } + + if (stateMarkerGraphic) { + stateMarkerGraphic[state && chart.isInsidePlot(plotX, plotY) ? 'show' : 'hide'](); + } + } + + point.state = state; + } +}; + +/** + * @classDescription The base function which all other series types inherit from. The data in the series is stored + * in various arrays. + * + * - First, series.options.data contains all the original config options for + * each point whether added by options or methods like series.addPoint. + * - Next, series.data contains those values converted to points, but in case the series data length + * exceeds the cropThreshold, or if the data is grouped, series.data doesn't contain all the points. It + * only contains the points that have been created on demand. + * - Then there's series.points that contains all currently visible point objects. In case of cropping, + * the cropped-away points are not part of this array. The series.points array starts at series.cropStart + * compared to series.data and series.options.data. If however the series data is grouped, these can't + * be correlated one to one. + * - series.xData and series.processedXData contain clean x values, equivalent to series.data and series.points. + * - series.yData and series.processedYData contain clean x values, equivalent to series.data and series.points. + * + * @param {Object} chart + * @param {Object} options + */ +var Series = function () {}; + +Series.prototype = { + + isCartesian: true, + type: 'line', + pointClass: Point, + sorted: true, // requires the data to be sorted + pointAttrToOptions: { // mapping between SVG attributes and the corresponding options + stroke: 'lineColor', + 'stroke-width': 'lineWidth', + fill: 'fillColor', + r: 'radius' + }, + init: function (chart, options) { + var series = this, + eventType, + events; + + series.chart = chart; + series.options = options = series.setOptions(options); // merge with plotOptions + + // bind the axes + series.bindAxes(); + + // set some variables + extend(series, { + name: options.name, + state: NORMAL_STATE, + pointAttr: {}, + visible: options.visible !== false, // true by default + selected: options.selected === true // false by default + }); + + // special + if (useCanVG) { + options.animation = false; + } + + // register event listeners + events = options.events; + for (eventType in events) { + addEvent(series, eventType, events[eventType]); + } + if ( + (events && events.click) || + (options.point && options.point.events && options.point.events.click) || + options.allowPointSelect + ) { + chart.runTrackerClick = true; + } + + series.getColor(); + series.getSymbol(); + + // set the data + series.setData(options.data, false); + + // Mark cartesian + if (series.isCartesian) { + chart.hasCartesianSeries = true; + } + + // Register it in the chart + chart.series.push(series); + + // Sort series according to index option (#248, #1123) + stableSort(chart.series, function (a, b) { + return (a.options.index || 0) - (b.options.index || 0); + }); + each(chart.series, function (series, i) { + series.index = i; + series.name = series.name || 'Series ' + (i + 1); + }); + }, + + /** + * Set the xAxis and yAxis properties of cartesian series, and register the series + * in the axis.series array + */ + bindAxes: function () { + var series = this, + seriesOptions = series.options, + chart = series.chart, + axisOptions; + + if (series.isCartesian) { + + each(['xAxis', 'yAxis'], function (AXIS) { // repeat for xAxis and yAxis + + each(chart[AXIS], function (axis) { // loop through the chart's axis objects + + axisOptions = axis.options; + + // apply if the series xAxis or yAxis option mathches the number of the + // axis, or if undefined, use the first axis + if ((seriesOptions[AXIS] === axisOptions.index) || + (seriesOptions[AXIS] === UNDEFINED && axisOptions.index === 0)) { + + // register this series in the axis.series lookup + axis.series.push(series); + + // set this series.xAxis or series.yAxis reference + series[AXIS] = axis; + + // mark dirty for redraw + axis.isDirty = true; + } + }); + + }); + } + }, + + + /** + * Return an auto incremented x value based on the pointStart and pointInterval options. + * This is only used if an x value is not given for the point that calls autoIncrement. + */ + autoIncrement: function () { + var series = this, + options = series.options, + xIncrement = series.xIncrement; + + xIncrement = pick(xIncrement, options.pointStart, 0); + + series.pointInterval = pick(series.pointInterval, options.pointInterval, 1); + + series.xIncrement = xIncrement + series.pointInterval; + return xIncrement; + }, + + /** + * Divide the series data into segments divided by null values. + */ + getSegments: function () { + var series = this, + lastNull = -1, + segments = [], + i, + points = series.points, + pointsLength = points.length; + + if (pointsLength) { // no action required for [] + + // if connect nulls, just remove null points + if (series.options.connectNulls) { + i = pointsLength; + while (i--) { + if (points[i].y === null) { + points.splice(i, 1); + } + } + if (points.length) { + segments = [points]; + } + + // else, split on null points + } else { + each(points, function (point, i) { + if (point.y === null) { + if (i > lastNull + 1) { + segments.push(points.slice(lastNull + 1, i)); + } + lastNull = i; + } else if (i === pointsLength - 1) { // last value + segments.push(points.slice(lastNull + 1, i + 1)); + } + }); + } + } + + // register it + series.segments = segments; + }, + /** + * Set the series options by merging from the options tree + * @param {Object} itemOptions + */ + setOptions: function (itemOptions) { + var chart = this.chart, + chartOptions = chart.options, + plotOptions = chartOptions.plotOptions, + typeOptions = plotOptions[this.type], + data = itemOptions.data, + options; + + itemOptions.data = null; // remove from merge to prevent looping over the data set + + options = merge( + typeOptions, + plotOptions.series, + itemOptions + ); + + // Re-insert the data array to the options and the original config (#717) + options.data = itemOptions.data = data; + + // the tooltip options are merged between global and series specific options + this.tooltipOptions = merge(chartOptions.tooltip, options.tooltip); + + // Delte marker object if not allowed (#1125) + if (typeOptions.marker === null) { + delete options.marker; + } + + return options; + + }, + /** + * Get the series' color + */ + getColor: function () { + var options = this.options, + defaultColors = this.chart.options.colors, + counters = this.chart.counters; + this.color = options.color || + (!options.colorByPoint && defaultColors[counters.color++]) || 'gray'; + counters.wrapColor(defaultColors.length); + }, + /** + * Get the series' symbol + */ + getSymbol: function () { + var series = this, + seriesMarkerOption = series.options.marker, + chart = series.chart, + defaultSymbols = chart.options.symbols, + counters = chart.counters; + series.symbol = seriesMarkerOption.symbol || defaultSymbols[counters.symbol++]; + + // don't substract radius in image symbols (#604) + if (/^url/.test(series.symbol)) { + seriesMarkerOption.radius = 0; + } + counters.wrapSymbol(defaultSymbols.length); + }, + + /** + * Get the series' symbol in the legend. This method should be overridable to create custom + * symbols through Highcharts.seriesTypes[type].prototype.drawLegendSymbols. + * + * @param {Object} legend The legend object + */ + drawLegendSymbol: function (legend) { + + var options = this.options, + markerOptions = options.marker, + radius, + legendOptions = legend.options, + legendSymbol, + symbolWidth = legendOptions.symbolWidth, + renderer = this.chart.renderer, + legendItemGroup = this.legendGroup, + baseline = legend.baseline, + attr; + + // Draw the line + if (options.lineWidth) { + attr = { + 'stroke-width': options.lineWidth + }; + if (options.dashStyle) { + attr.dashstyle = options.dashStyle; + } + this.legendLine = renderer.path([ + M, + 0, + baseline - 4, + L, + symbolWidth, + baseline - 4 + ]) + .attr(attr) + .add(legendItemGroup); + } + + // Draw the marker + if (markerOptions && markerOptions.enabled) { + radius = markerOptions.radius; + this.legendSymbol = legendSymbol = renderer.symbol( + this.symbol, + (symbolWidth / 2) - radius, + baseline - 4 - radius, + 2 * radius, + 2 * radius + ) + .attr(this.pointAttr[NORMAL_STATE]) + .add(legendItemGroup); + } + }, + + /** + * Add a point dynamically after chart load time + * @param {Object} options Point options as given in series.data + * @param {Boolean} redraw Whether to redraw the chart or wait for an explicit call + * @param {Boolean} shift If shift is true, a point is shifted off the start + * of the series as one is appended to the end. + * @param {Boolean|Object} animation Whether to apply animation, and optionally animation + * configuration + */ + addPoint: function (options, redraw, shift, animation) { + var series = this, + data = series.data, + graph = series.graph, + area = series.area, + chart = series.chart, + xData = series.xData, + yData = series.yData, + currentShift = (graph && graph.shift) || 0, + dataOptions = series.options.data, + point, + proto = series.pointClass.prototype; + + setAnimation(animation, chart); + + // Make graph animate sideways + if (graph && shift) { + graph.shift = currentShift + 1; + } + if (area) { + if (shift) { // #780 + area.shift = currentShift + 1; + } + area.isArea = true; // needed in animation, both with and without shift + } + + // Optional redraw, defaults to true + redraw = pick(redraw, true); + + // Get options and push the point to xData, yData and series.options. In series.generatePoints + // the Point instance will be created on demand and pushed to the series.data array. + point = { series: series }; + proto.applyOptions.apply(point, [options]); + xData.push(point.x); + yData.push(proto.toYData ? proto.toYData.call(point) : point.y); + dataOptions.push(options); + + + // Shift the first point off the parallel arrays + // todo: consider series.removePoint(i) method + if (shift) { + if (data[0] && data[0].remove) { + data[0].remove(false); + } else { + data.shift(); + xData.shift(); + yData.shift(); + dataOptions.shift(); + } + } + series.getAttribs(); + + // redraw + series.isDirty = true; + series.isDirtyData = true; + if (redraw) { + chart.redraw(); + } + }, + + /** + * Replace the series data with a new set of data + * @param {Object} data + * @param {Object} redraw + */ + setData: function (data, redraw) { + var series = this, + oldData = series.points, + options = series.options, + initialColor = series.initialColor, + chart = series.chart, + firstPoint = null, + xAxis = series.xAxis, + i, + pointProto = series.pointClass.prototype; + + // reset properties + series.xIncrement = null; + series.pointRange = xAxis && xAxis.categories ? 1 : options.pointRange; + + if (defined(initialColor)) { // reset colors for pie + chart.counters.color = initialColor; + } + + // parallel arrays + var xData = [], + yData = [], + dataLength = data ? data.length : [], + turboThreshold = options.turboThreshold || 1000, + pt, + pointArrayMap = series.pointArrayMap, + valueCount = pointArrayMap && pointArrayMap.length; + + // In turbo mode, only one- or twodimensional arrays of numbers are allowed. The + // first value is tested, and we assume that all the rest are defined the same + // way. Although the 'for' loops are similar, they are repeated inside each + // if-else conditional for max performance. + if (dataLength > turboThreshold) { + + // find the first non-null point + i = 0; + while (firstPoint === null && i < dataLength) { + firstPoint = data[i]; + i++; + } + + + if (isNumber(firstPoint)) { // assume all points are numbers + var x = pick(options.pointStart, 0), + pointInterval = pick(options.pointInterval, 1); + + for (i = 0; i < dataLength; i++) { + xData[i] = x; + yData[i] = data[i]; + x += pointInterval; + } + series.xIncrement = x; + } else if (isArray(firstPoint)) { // assume all points are arrays + if (valueCount) { // [x, low, high] or [x, o, h, l, c] + for (i = 0; i < dataLength; i++) { + pt = data[i]; + xData[i] = pt[0]; + yData[i] = pt.slice(1, valueCount + 1); + } + } else { // [x, y] + for (i = 0; i < dataLength; i++) { + pt = data[i]; + xData[i] = pt[0]; + yData[i] = pt[1]; + } + } + } /* else { + error(12); // Highcharts expects configs to be numbers or arrays in turbo mode + }*/ + } else { + for (i = 0; i < dataLength; i++) { + pt = { series: series }; + pointProto.applyOptions.apply(pt, [data[i]]); + xData[i] = pt.x; + yData[i] = pointProto.toYData ? pointProto.toYData.call(pt) : pt.y; + } + } + + // Forgetting to cast strings to numbers is a common caveat when handling CSV or JSON + if (isString(yData[0])) { + error(14, true); + } + + series.data = []; + series.options.data = data; + series.xData = xData; + series.yData = yData; + + // destroy old points + i = (oldData && oldData.length) || 0; + while (i--) { + if (oldData[i] && oldData[i].destroy) { + oldData[i].destroy(); + } + } + + // reset minRange (#878) + if (xAxis) { + xAxis.minRange = xAxis.userMinRange; + } + + // redraw + series.isDirty = series.isDirtyData = chart.isDirtyBox = true; + if (pick(redraw, true)) { + chart.redraw(false); + } + }, + + /** + * Remove a series and optionally redraw the chart + * + * @param {Boolean} redraw Whether to redraw the chart or wait for an explicit call + * @param {Boolean|Object} animation Whether to apply animation, and optionally animation + * configuration + */ + + remove: function (redraw, animation) { + var series = this, + chart = series.chart; + redraw = pick(redraw, true); + + if (!series.isRemoving) { /* prevent triggering native event in jQuery + (calling the remove function from the remove event) */ + series.isRemoving = true; + + // fire the event with a default handler of removing the point + fireEvent(series, 'remove', null, function () { + + + // destroy elements + series.destroy(); + + + // redraw + chart.isDirtyLegend = chart.isDirtyBox = true; + if (redraw) { + chart.redraw(animation); + } + }); + + } + series.isRemoving = false; + }, + + /** + * Process the data by cropping away unused data points if the series is longer + * than the crop threshold. This saves computing time for lage series. + */ + processData: function (force) { + var series = this, + processedXData = series.xData, // copied during slice operation below + processedYData = series.yData, + dataLength = processedXData.length, + cropStart = 0, + cropEnd = dataLength, + cropped, + distance, + closestPointRange, + xAxis = series.xAxis, + i, // loop variable + options = series.options, + cropThreshold = options.cropThreshold, + isCartesian = series.isCartesian; + + // If the series data or axes haven't changed, don't go through this. Return false to pass + // the message on to override methods like in data grouping. + if (isCartesian && !series.isDirty && !xAxis.isDirty && !series.yAxis.isDirty && !force) { + return false; + } + + // optionally filter out points outside the plot area + if (isCartesian && series.sorted && (!cropThreshold || dataLength > cropThreshold || series.forceCrop)) { + var extremes = xAxis.getExtremes(), + min = extremes.min, + max = extremes.max; + + // it's outside current extremes + if (processedXData[dataLength - 1] < min || processedXData[0] > max) { + processedXData = []; + processedYData = []; + + // only crop if it's actually spilling out + } else if (processedXData[0] < min || processedXData[dataLength - 1] > max) { + + // iterate up to find slice start + for (i = 0; i < dataLength; i++) { + if (processedXData[i] >= min) { + cropStart = mathMax(0, i - 1); + break; + } + } + // proceed to find slice end + for (; i < dataLength; i++) { + if (processedXData[i] > max) { + cropEnd = i + 1; + break; + } + + } + processedXData = processedXData.slice(cropStart, cropEnd); + processedYData = processedYData.slice(cropStart, cropEnd); + cropped = true; + } + } + + + // Find the closest distance between processed points + for (i = processedXData.length - 1; i > 0; i--) { + distance = processedXData[i] - processedXData[i - 1]; + if (distance > 0 && (closestPointRange === UNDEFINED || distance < closestPointRange)) { + closestPointRange = distance; + } + } + + // Record the properties + series.cropped = cropped; // undefined or true + series.cropStart = cropStart; + series.processedXData = processedXData; + series.processedYData = processedYData; + + if (options.pointRange === null) { // null means auto, as for columns, candlesticks and OHLC + series.pointRange = closestPointRange || 1; + } + series.closestPointRange = closestPointRange; + + }, + + /** + * Generate the data point after the data has been processed by cropping away + * unused points and optionally grouped in Highcharts Stock. + */ + generatePoints: function () { + var series = this, + options = series.options, + dataOptions = options.data, + data = series.data, + dataLength, + processedXData = series.processedXData, + processedYData = series.processedYData, + pointClass = series.pointClass, + processedDataLength = processedXData.length, + cropStart = series.cropStart || 0, + cursor, + hasGroupedData = series.hasGroupedData, + point, + points = [], + i; + + if (!data && !hasGroupedData) { + var arr = []; + arr.length = dataOptions.length; + data = series.data = arr; + } + + for (i = 0; i < processedDataLength; i++) { + cursor = cropStart + i; + if (!hasGroupedData) { + if (data[cursor]) { + point = data[cursor]; + } else if (dataOptions[cursor] !== UNDEFINED) { // #970 + data[cursor] = point = (new pointClass()).init(series, dataOptions[cursor], processedXData[i]); + } + points[i] = point; + } else { + // splat the y data in case of ohlc data array + points[i] = (new pointClass()).init(series, [processedXData[i]].concat(splat(processedYData[i]))); + } + } + + // Hide cropped-away points - this only runs when the number of points is above cropThreshold, or when + // swithching view from non-grouped data to grouped data (#637) + if (data && (processedDataLength !== (dataLength = data.length) || hasGroupedData)) { + for (i = 0; i < dataLength; i++) { + if (i === cropStart && !hasGroupedData) { // when has grouped data, clear all points + i += processedDataLength; + } + if (data[i]) { + data[i].destroyElements(); + data[i].plotX = UNDEFINED; // #1003 + } + } + } + + series.data = data; + series.points = points; + }, + + /** + * Translate data points from raw data values to chart specific positioning data + * needed later in drawPoints, drawGraph and drawTracker. + */ + translate: function () { + if (!this.processedXData) { // hidden series + this.processData(); + } + this.generatePoints(); + var series = this, + chart = series.chart, + options = series.options, + stacking = options.stacking, + xAxis = series.xAxis, + categories = xAxis.categories, + yAxis = series.yAxis, + points = series.points, + dataLength = points.length, + hasModifyValue = !!series.modifyValue, + isBottomSeries, + allStackSeries = yAxis.series, + i = allStackSeries.length, + placeBetween = options.pointPlacement === 'between'; + //nextSeriesDown; + + // Is it the last visible series? + while (i--) { + if (allStackSeries[i].visible) { + if (allStackSeries[i] === series) { // #809 + isBottomSeries = true; + } + break; + } + } + + // Translate each point + for (i = 0; i < dataLength; i++) { + var point = points[i], + xValue = point.x, + yValue = point.y, + yBottom = point.low, + stack = yAxis.stacks[(yValue < options.threshold ? '-' : '') + series.stackKey], + pointStack, + pointStackTotal; + + // get the plotX translation + //point.plotX = mathRound(xAxis.translate(xValue, 0, 0, 0, 1) * 10) / 10; // Math.round fixes #591 + point.plotX = xAxis.translate(xValue, 0, 0, 0, 1, placeBetween); // Math.round fixes #591 + + // calculate the bottom y value for stacked series + if (stacking && series.visible && stack && stack[xValue]) { + pointStack = stack[xValue]; + pointStackTotal = pointStack.total; + pointStack.cum = yBottom = pointStack.cum - yValue; // start from top + yValue = yBottom + yValue; + + if (isBottomSeries) { + yBottom = pick(options.threshold, yAxis.isLog ? null : yAxis.min); // #1200 + } + + if (stacking === 'percent') { + yBottom = pointStackTotal ? yBottom * 100 / pointStackTotal : 0; + yValue = pointStackTotal ? yValue * 100 / pointStackTotal : 0; + } + + point.percentage = pointStackTotal ? point.y * 100 / pointStackTotal : 0; + point.total = point.stackTotal = pointStackTotal; + point.stackY = yValue; + } + + // Set translated yBottom or remove it + point.yBottom = defined(yBottom) ? + yAxis.translate(yBottom, 0, 1, 0, 1) : + null; + + // general hook, used for Highstock compare mode + if (hasModifyValue) { + yValue = series.modifyValue(yValue, point); + } + + // Set the the plotY value, reset it for redraws + point.plotY = (typeof yValue === 'number') ? + mathRound(yAxis.translate(yValue, 0, 1, 0, 1) * 10) / 10 : // Math.round fixes #591 + UNDEFINED; + + // set client related positions for mouse tracking + point.clientX = chart.inverted ? + chart.plotHeight - point.plotX : + point.plotX; // for mouse tracking + + // some API data + point.category = categories && categories[point.x] !== UNDEFINED ? + categories[point.x] : point.x; + + + } + + // now that we have the cropped data, build the segments + series.getSegments(); + }, + /** + * Memoize tooltip texts and positions + */ + setTooltipPoints: function (renew) { + var series = this, + points = [], + pointsLength, + low, + high, + xAxis = series.xAxis, + axisLength = xAxis ? (xAxis.tooltipLen || xAxis.len) : series.chart.plotSizeX, // tooltipLen and tooltipPosName used in polar + plotX = (xAxis && xAxis.tooltipPosName) || 'plotX', + point, + i, + tooltipPoints = []; // a lookup array for each pixel in the x dimension + + // don't waste resources if tracker is disabled + if (series.options.enableMouseTracking === false) { + return; + } + + // renew + if (renew) { + series.tooltipPoints = null; + } + + // concat segments to overcome null values + each(series.segments || series.points, function (segment) { + points = points.concat(segment); + }); + + // Reverse the points in case the X axis is reversed + if (xAxis && xAxis.reversed) { + points = points.reverse(); + } + + // Assign each pixel position to the nearest point + pointsLength = points.length; + for (i = 0; i < pointsLength; i++) { + point = points[i]; + // Set this range's low to the last range's high plus one + low = points[i - 1] ? high + 1 : 0; + // Now find the new high + high = points[i + 1] ? + mathMax(0, mathFloor((point[plotX] + (points[i + 1] ? points[i + 1][plotX] : axisLength)) / 2)) : + axisLength; + + while (low >= 0 && low <= high) { + tooltipPoints[low++] = point; + } + } + series.tooltipPoints = tooltipPoints; + }, + + /** + * Format the header of the tooltip + */ + tooltipHeaderFormatter: function (key) { + var series = this, + tooltipOptions = series.tooltipOptions, + xDateFormat = tooltipOptions.xDateFormat, + xAxis = series.xAxis, + isDateTime = xAxis && xAxis.options.type === 'datetime', + n; + + // Guess the best date format based on the closest point distance (#568) + if (isDateTime && !xDateFormat) { + for (n in timeUnits) { + if (timeUnits[n] >= xAxis.closestPointRange) { + xDateFormat = tooltipOptions.dateTimeLabelFormats[n]; + break; + } + } + } + + return tooltipOptions.headerFormat + .replace('{point.key}', isDateTime ? dateFormat(xDateFormat, key) : key) + .replace('{series.name}', series.name) + .replace('{series.color}', series.color); + }, + + /** + * Series mouse over handler + */ + onMouseOver: function () { + var series = this, + chart = series.chart, + hoverSeries = chart.hoverSeries; + + /*if (!hasTouch && chart.mouseIsDown) { + return; + }*/ + + // set normal state to previous series + if (hoverSeries && hoverSeries !== series) { + hoverSeries.onMouseOut(); + } + + // trigger the event, but to save processing time, + // only if defined + if (series.options.events.mouseOver) { + fireEvent(series, 'mouseOver'); + } + + // hover this + series.setState(HOVER_STATE); + chart.hoverSeries = series; + }, + + /** + * Series mouse out handler + */ + onMouseOut: function () { + // trigger the event only if listeners exist + var series = this, + options = series.options, + chart = series.chart, + tooltip = chart.tooltip, + hoverPoint = chart.hoverPoint; + + // trigger mouse out on the point, which must be in this series + if (hoverPoint) { + hoverPoint.onMouseOut(); + } + + // fire the mouse out event + if (series && options.events.mouseOut) { + fireEvent(series, 'mouseOut'); + } + + + // hide the tooltip + if (tooltip && !options.stickyTracking && !tooltip.shared) { + tooltip.hide(); + } + + // set normal state + series.setState(); + chart.hoverSeries = null; + }, + + /** + * Animate in the series + */ + animate: function (init) { + var series = this, + chart = series.chart, + renderer = chart.renderer, + clipRect, + markerClipRect, + animation = series.options.animation, + clipBox = chart.clipBox, + inverted = chart.inverted, + sharedClipKey; + + // Animation option is set to true + if (animation && !isObject(animation)) { + animation = defaultPlotOptions[series.type].animation; + } + sharedClipKey = '_sharedClip' + animation.duration + animation.easing; + + // Initialize the animation. Set up the clipping rectangle. + if (init) { + + // If a clipping rectangle with the same properties is currently present in the chart, use that. + clipRect = chart[sharedClipKey]; + markerClipRect = chart[sharedClipKey + 'm']; + if (!clipRect) { + chart[sharedClipKey] = clipRect = renderer.clipRect( + extend(clipBox, { width: 0 }) + ); + + chart[sharedClipKey + 'm'] = markerClipRect = renderer.clipRect( + -99, // include the width of the first marker + inverted ? -chart.plotLeft : -chart.plotTop, + 99, + inverted ? chart.chartWidth : chart.chartHeight + ); + } + series.group.clip(clipRect); + series.markerGroup.clip(markerClipRect); + series.sharedClipKey = sharedClipKey; + + // Run the animation + } else { + clipRect = chart[sharedClipKey]; + if (clipRect) { + clipRect.animate({ + width: chart.plotSizeX + }, animation); + chart[sharedClipKey + 'm'].animate({ + width: chart.plotSizeX + 99 + }, animation); + } + + // Delete this function to allow it only once + series.animate = null; + + // Call the afterAnimate function on animation complete (but don't overwrite the animation.complete option + // which should be available to the user). + series.animationTimeout = setTimeout(function () { + series.afterAnimate(); + }, animation.duration); + } + }, + + /** + * This runs after animation to land on the final plot clipping + */ + afterAnimate: function () { + var chart = this.chart, + sharedClipKey = this.sharedClipKey, + group = this.group; + + if (group && this.options.clip !== false) { + group.clip(chart.clipRect); + this.markerGroup.clip(); // no clip + } + + // Remove the shared clipping rectancgle when all series are shown + setTimeout(function () { + if (sharedClipKey && chart[sharedClipKey]) { + chart[sharedClipKey] = chart[sharedClipKey].destroy(); + chart[sharedClipKey + 'm'] = chart[sharedClipKey + 'm'].destroy(); + } + }, 100); + }, + + /** + * Draw the markers + */ + drawPoints: function () { + var series = this, + pointAttr, + points = series.points, + chart = series.chart, + plotX, + plotY, + i, + point, + radius, + symbol, + isImage, + graphic, + options = series.options, + seriesMarkerOptions = options.marker, + pointMarkerOptions, + enabled, + isInside, + markerGroup = series.markerGroup; + + if (seriesMarkerOptions.enabled || series._hasPointMarkers) { + + i = points.length; + while (i--) { + point = points[i]; + plotX = point.plotX; + plotY = point.plotY; + graphic = point.graphic; + pointMarkerOptions = point.marker || {}; + enabled = (seriesMarkerOptions.enabled && pointMarkerOptions.enabled === UNDEFINED) || pointMarkerOptions.enabled; + isInside = chart.isInsidePlot(plotX, plotY, chart.inverted); + + // only draw the point if y is defined + if (enabled && plotY !== UNDEFINED && !isNaN(plotY)) { + + // shortcuts + pointAttr = point.pointAttr[point.selected ? SELECT_STATE : NORMAL_STATE]; + radius = pointAttr.r; + symbol = pick(pointMarkerOptions.symbol, series.symbol); + isImage = symbol.indexOf('url') === 0; + + if (graphic) { // update + graphic + .attr({ // Since the marker group isn't clipped, each individual marker must be toggled + visibility: isInside ? (hasSVG ? 'inherit' : VISIBLE) : HIDDEN + }) + .animate(extend({ + x: plotX - radius, + y: plotY - radius + }, graphic.symbolName ? { // don't apply to image symbols #507 + width: 2 * radius, + height: 2 * radius + } : {})); + } else if (isInside && (radius > 0 || isImage)) { + point.graphic = graphic = chart.renderer.symbol( + symbol, + plotX - radius, + plotY - radius, + 2 * radius, + 2 * radius + ) + .attr(pointAttr) + .add(markerGroup); + } + } + } + } + + }, + + /** + * Convert state properties from API naming conventions to SVG attributes + * + * @param {Object} options API options object + * @param {Object} base1 SVG attribute object to inherit from + * @param {Object} base2 Second level SVG attribute object to inherit from + */ + convertAttribs: function (options, base1, base2, base3) { + var conversion = this.pointAttrToOptions, + attr, + option, + obj = {}; + + options = options || {}; + base1 = base1 || {}; + base2 = base2 || {}; + base3 = base3 || {}; + + for (attr in conversion) { + option = conversion[attr]; + obj[attr] = pick(options[option], base1[attr], base2[attr], base3[attr]); + } + return obj; + }, + + /** + * Get the state attributes. Each series type has its own set of attributes + * that are allowed to change on a point's state change. Series wide attributes are stored for + * all series, and additionally point specific attributes are stored for all + * points with individual marker options. If such options are not defined for the point, + * a reference to the series wide attributes is stored in point.pointAttr. + */ + getAttribs: function () { + var series = this, + normalOptions = defaultPlotOptions[series.type].marker ? series.options.marker : series.options, + stateOptions = normalOptions.states, + stateOptionsHover = stateOptions[HOVER_STATE], + pointStateOptionsHover, + seriesColor = series.color, + normalDefaults = { + stroke: seriesColor, + fill: seriesColor + }, + points = series.points || [], // #927 + i, + point, + seriesPointAttr = [], + pointAttr, + pointAttrToOptions = series.pointAttrToOptions, + hasPointSpecificOptions, + key; + + // series type specific modifications + if (series.options.marker) { // line, spline, area, areaspline, scatter + + // if no hover radius is given, default to normal radius + 2 + stateOptionsHover.radius = stateOptionsHover.radius || normalOptions.radius + 2; + stateOptionsHover.lineWidth = stateOptionsHover.lineWidth || normalOptions.lineWidth + 1; + + } else { // column, bar, pie + + // if no hover color is given, brighten the normal color + stateOptionsHover.color = stateOptionsHover.color || + Color(stateOptionsHover.color || seriesColor) + .brighten(stateOptionsHover.brightness).get(); + } + + // general point attributes for the series normal state + seriesPointAttr[NORMAL_STATE] = series.convertAttribs(normalOptions, normalDefaults); + + // HOVER_STATE and SELECT_STATE states inherit from normal state except the default radius + each([HOVER_STATE, SELECT_STATE], function (state) { + seriesPointAttr[state] = + series.convertAttribs(stateOptions[state], seriesPointAttr[NORMAL_STATE]); + }); + + // set it + series.pointAttr = seriesPointAttr; + + + // Generate the point-specific attribute collections if specific point + // options are given. If not, create a referance to the series wide point + // attributes + i = points.length; + while (i--) { + point = points[i]; + normalOptions = (point.options && point.options.marker) || point.options; + if (normalOptions && normalOptions.enabled === false) { + normalOptions.radius = 0; + } + hasPointSpecificOptions = series.options.colorByPoint; // #868 + + // check if the point has specific visual options + if (point.options) { + for (key in pointAttrToOptions) { + if (defined(normalOptions[pointAttrToOptions[key]])) { + hasPointSpecificOptions = true; + } + } + } + + + + // a specific marker config object is defined for the individual point: + // create it's own attribute collection + if (hasPointSpecificOptions) { + normalOptions = normalOptions || {}; + pointAttr = []; + stateOptions = normalOptions.states || {}; // reassign for individual point + pointStateOptionsHover = stateOptions[HOVER_STATE] = stateOptions[HOVER_STATE] || {}; + + // Handle colors for column and pies + if (!series.options.marker) { // column, bar, point + // if no hover color is given, brighten the normal color + pointStateOptionsHover.color = + Color(pointStateOptionsHover.color || point.color) + .brighten(pointStateOptionsHover.brightness || + stateOptionsHover.brightness).get(); + + } + + // normal point state inherits series wide normal state + pointAttr[NORMAL_STATE] = series.convertAttribs(extend({ + color: point.color // #868 + }, normalOptions), seriesPointAttr[NORMAL_STATE]); + + // inherit from point normal and series hover + pointAttr[HOVER_STATE] = series.convertAttribs( + stateOptions[HOVER_STATE], + seriesPointAttr[HOVER_STATE], + pointAttr[NORMAL_STATE] + ); + // inherit from point normal and series hover + pointAttr[SELECT_STATE] = series.convertAttribs( + stateOptions[SELECT_STATE], + seriesPointAttr[SELECT_STATE], + pointAttr[NORMAL_STATE] + ); + + + + // no marker config object is created: copy a reference to the series-wide + // attribute collection + } else { + pointAttr = seriesPointAttr; + } + + point.pointAttr = pointAttr; + + } + + }, + + + /** + * Clear DOM objects and free up memory + */ + destroy: function () { + var series = this, + chart = series.chart, + issue134 = /AppleWebKit\/533/.test(userAgent), + destroy, + i, + data = series.data || [], + point, + prop, + axis; + + // add event hook + fireEvent(series, 'destroy'); + + // remove all events + removeEvent(series); + + // erase from axes + each(['xAxis', 'yAxis'], function (AXIS) { + axis = series[AXIS]; + if (axis) { + erase(axis.series, series); + axis.isDirty = true; + } + }); + + // remove legend items + if (series.legendItem) { + series.chart.legend.destroyItem(series); + } + + // destroy all points with their elements + i = data.length; + while (i--) { + point = data[i]; + if (point && point.destroy) { + point.destroy(); + } + } + series.points = null; + + // Clear the animation timeout if we are destroying the series during initial animation + clearTimeout(series.animationTimeout); + + // destroy all SVGElements associated to the series + each(['area', 'graph', 'dataLabelsGroup', 'group', 'markerGroup', 'tracker', 'trackerGroup'], function (prop) { + if (series[prop]) { + + // issue 134 workaround + destroy = issue134 && prop === 'group' ? + 'hide' : + 'destroy'; + + series[prop][destroy](); + } + }); + + // remove from hoverSeries + if (chart.hoverSeries === series) { + chart.hoverSeries = null; + } + erase(chart.series, series); + + // clear all members + for (prop in series) { + delete series[prop]; + } + }, + + /** + * Draw the data labels + */ + drawDataLabels: function () { + + var series = this, + seriesOptions = series.options, + options = seriesOptions.dataLabels; + + if (options.enabled || series._hasPointLabels) { + var x, + y, + points = series.points, + pointOptions, + generalOptions, + str, + dataLabelsGroup, + chart = series.chart, + renderer = chart.renderer, + inverted = chart.inverted, + seriesType = series.type, + stacking = seriesOptions.stacking, + isBarLike = seriesType === 'column' || seriesType === 'bar', + vAlignIsNull = options.verticalAlign === null, + yIsNull = options.y === null, + fontMetrics = renderer.fontMetrics(options.style.fontSize), // height and baseline + fontLineHeight = fontMetrics.h, + fontBaseline = fontMetrics.b; + + if (isBarLike) { + var defaultYs = { + top: fontBaseline, + middle: fontBaseline - fontLineHeight / 2, + bottom: -fontLineHeight + fontBaseline + }; + if (stacking) { + // In stacked series the default label placement is inside the bars + if (vAlignIsNull) { + options = merge(options, {verticalAlign: 'middle'}); + } + + // If no y delta is specified, try to create a good default + if (yIsNull) { + options = merge(options, { y: defaultYs[options.verticalAlign]}); + } + } else { + // In non stacked series the default label placement is on top of the bars + if (vAlignIsNull) { + options = merge(options, {verticalAlign: 'top'}); + + // If no y delta is specified, try to create a good default (like default bar) + } else if (yIsNull) { + options = merge(options, { y: defaultYs[options.verticalAlign]}); + } + + } + } + + + // create a separate group for the data labels to avoid rotation + dataLabelsGroup = series.plotGroup( + 'dataLabelsGroup', + 'data-labels', + series.visible ? VISIBLE : HIDDEN, + 6 + ); + + // make the labels for each point + generalOptions = options; + each(points, function (point) { + + var plotX, + plotY, + individualYDelta, + enabled, + dataLabel = point.dataLabel; + + // Merge in individual options from point + options = generalOptions; // reset changes from previous points + pointOptions = point.options; + if (pointOptions && pointOptions.dataLabels) { + options = merge(options, pointOptions.dataLabels); + } + enabled = options.enabled; + + // Get the positions + if (enabled) { + plotX = (point.barX && point.barX + point.barW / 2) || pick(point.plotX, -999); + plotY = pick(point.plotY, -999); + + // if options.y is null, which happens by default on column charts, set the position + // above or below the column depending on the threshold + individualYDelta = options.y === null ? + (point.y >= seriesOptions.threshold ? + -fontLineHeight + fontBaseline : // below the threshold + fontBaseline) : // above the threshold + options.y; + + x = (inverted ? chart.plotWidth - plotY : plotX) + options.x; + y = mathRound((inverted ? chart.plotHeight - plotX : plotY) + individualYDelta); + + } + + // Check if the individual label must be disabled due to either falling + // ouside the plot area, or the enabled option being switched off + if (series.isCartesian && !chart.isInsidePlot(x - options.x, y)) { + enabled = false; + } + + // If the point is outside the plot area, destroy it. #678, #820 + if (dataLabel && !enabled) { + point.dataLabel = dataLabel.destroy(); + + // Individual labels are disabled if the are explicitly disabled + // in the point options, or if they fall outside the plot area. + } else if (enabled) { + + var align = options.align, + attr, + name; + + // Get the string + str = options.formatter.call(point.getLabelConfig(), options); + + // in columns, align the string to the column + if (seriesType === 'column') { + x += { left: -1, right: 1 }[align] * point.barW / 2 || 0; + } + + if (!stacking && inverted && point.y < 0) { + align = 'right'; + x -= 10; + } + + // Determine the color + options.style.color = pick(options.color, options.style.color, series.color, 'black'); + + + // update existing label + if (dataLabel) { + // vertically centered + dataLabel + .attr({ + text: str + }).animate({ + x: x, + y: y + }); + // create new label + } else if (defined(str)) { + attr = { + align: align, + fill: options.backgroundColor, + stroke: options.borderColor, + 'stroke-width': options.borderWidth, + r: options.borderRadius || 0, + rotation: options.rotation, + padding: options.padding, + zIndex: 1 + }; + // Remove unused attributes (#947) + for (name in attr) { + if (attr[name] === UNDEFINED) { + delete attr[name]; + } + } + + dataLabel = point.dataLabel = renderer[options.rotation ? 'text' : 'label']( // labels don't support rotation + str, + x, + y, + null, + null, + null, + options.useHTML, + true // baseline for backwards compat + ) + .attr(attr) + .css(options.style) + .add(dataLabelsGroup) + .shadow(options.shadow); + } + + if (isBarLike && seriesOptions.stacking && dataLabel) { + var barX = point.barX, + barY = point.barY, + barW = point.barW, + barH = point.barH; + + dataLabel.align(options, null, + { + x: inverted ? chart.plotWidth - barY - barH : barX, + y: inverted ? chart.plotHeight - barX - barW : barY, + width: inverted ? barH : barW, + height: inverted ? barW : barH + }); + } + + + } + }); + } + }, + + /** + * Return the graph path of a segment + */ + getSegmentPath: function (segment) { + var series = this, + segmentPath = []; + + // build the segment line + each(segment, function (point, i) { + + if (series.getPointSpline) { // generate the spline as defined in the SplineSeries object + segmentPath.push.apply(segmentPath, series.getPointSpline(segment, point, i)); + + } else { + + // moveTo or lineTo + segmentPath.push(i ? L : M); + + // step line? + if (i && series.options.step) { + var lastPoint = segment[i - 1]; + segmentPath.push( + point.plotX, + lastPoint.plotY + ); + } + + // normal line to next point + segmentPath.push( + point.plotX, + point.plotY + ); + } + }); + + return segmentPath; + }, + + /** + * Get the graph path + */ + getGraphPath: function () { + var series = this, + graphPath = [], + segmentPath, + singlePoints = []; // used in drawTracker + + // Divide into segments and build graph and area paths + each(series.segments, function (segment) { + + segmentPath = series.getSegmentPath(segment); + + // add the segment to the graph, or a single point for tracking + if (segment.length > 1) { + graphPath = graphPath.concat(segmentPath); + } else { + singlePoints.push(segment[0]); + } + }); + + // Record it for use in drawGraph and drawTracker, and return graphPath + series.singlePoints = singlePoints; + series.graphPath = graphPath; + + return graphPath; + + }, + + /** + * Draw the actual graph + */ + drawGraph: function () { + var options = this.options, + graph = this.graph, + group = this.group, + color = options.lineColor || this.color, + lineWidth = options.lineWidth, + dashStyle = options.dashStyle, + attribs, + graphPath = this.getGraphPath(); + + + // draw the graph + if (graph) { + stop(graph); // cancel running animations, #459 + graph.animate({ d: graphPath }); + + } else { + if (lineWidth) { + attribs = { + stroke: color, + 'stroke-width': lineWidth, + zIndex: 1 // #1069 + }; + if (dashStyle) { + attribs.dashstyle = dashStyle; + } + + this.graph = this.chart.renderer.path(graphPath) + .attr(attribs).add(group).shadow(options.shadow); + } + } + }, + + /** + * Initialize and perform group inversion on series.group and series.trackerGroup + */ + invertGroups: function () { + var series = this, + chart = series.chart; + + // A fixed size is needed for inversion to work + function setInvert() { + var size = { + width: series.yAxis.len, + height: series.xAxis.len + }; + + each(['group', 'trackerGroup', 'markerGroup'], function (groupName) { + if (series[groupName]) { + series[groupName].attr(size).invert(); + } + }); + } + + addEvent(chart, 'resize', setInvert); // do it on resize + addEvent(series, 'destroy', function () { + removeEvent(chart, 'resize', setInvert); + }); + + // Do it now + setInvert(); // do it now + + // On subsequent render and redraw, just do setInvert without setting up events again + series.invertGroups = setInvert; + }, + + /** + * General abstraction for creating plot groups like series.group, series.trackerGroup, series.dataLabelsGroup and + * series.markerGroup. On subsequent calls, the group will only be adjusted to the updated plot size. + */ + plotGroup: function (prop, name, visibility, zIndex, parent) { + var group = this[prop], + chart = this.chart, + xAxis = this.xAxis, + yAxis = this.yAxis; + + // Generate it on first call + if (!group) { + this[prop] = group = chart.renderer.g(name) + .attr({ + visibility: visibility, + zIndex: zIndex || 0.1 // IE8 needs this + }) + .add(parent); + } + // Place it on first and subsequent (redraw) calls + group.translate( + xAxis ? xAxis.left : chart.plotLeft, + yAxis ? yAxis.top : chart.plotTop + ); + + return group; + + }, + + /** + * Render the graph and markers + */ + render: function () { + var series = this, + chart = series.chart, + group, + options = series.options, + animation = options.animation, + doAnimation = animation && !!series.animate, + visibility = series.visible ? VISIBLE : HIDDEN, + zIndex = options.zIndex, + hasRendered = series.hasRendered, + chartSeriesGroup = chart.seriesGroup; + + // the group + group = series.plotGroup( + 'group', + 'series', + visibility, + zIndex, + chartSeriesGroup + ); + + series.markerGroup = series.plotGroup( + 'markerGroup', + 'markers', + visibility, + zIndex, + chartSeriesGroup + ); + + series.drawDataLabels(); + + // initiate the animation + if (doAnimation) { + series.animate(true); + } + + // cache attributes for shapes + series.getAttribs(); + + // SVGRenderer needs to know this before drawing elements (#1089) + group.inverted = chart.inverted; + + // draw the graph if any + if (series.drawGraph) { + series.drawGraph(); + } + + // draw the points + series.drawPoints(); + + // draw the mouse tracking area + if (series.options.enableMouseTracking !== false) { + series.drawTracker(); + } + + // Handle inverted series and tracker groups + if (chart.inverted) { + series.invertGroups(); + } + + // Initial clipping, must be defined after inverting groups for VML + if (options.clip !== false && !series.sharedClipKey && !hasRendered) { + group.clip(chart.clipRect); + if (this.trackerGroup) { + this.trackerGroup.clip(chart.clipRect); + } + } + + // Run the animation + if (doAnimation) { + series.animate(); + } else if (!hasRendered) { + series.afterAnimate(); + } + + series.isDirty = series.isDirtyData = false; // means data is in accordance with what you see + // (See #322) series.isDirty = series.isDirtyData = false; // means data is in accordance with what you see + series.hasRendered = true; + }, + + /** + * Redraw the series after an update in the axes. + */ + redraw: function () { + var series = this, + chart = series.chart, + wasDirtyData = series.isDirtyData, // cache it here as it is set to false in render, but used after + group = series.group; + + // reposition on resize + if (group) { + if (chart.inverted) { + group.attr({ + width: chart.plotWidth, + height: chart.plotHeight + }); + } + + group.animate({ + translateX: series.xAxis.left, + translateY: series.yAxis.top + }); + } + + series.translate(); + series.setTooltipPoints(true); + + series.render(); + if (wasDirtyData) { + fireEvent(series, 'updatedData'); + } + }, + + /** + * Set the state of the graph + */ + setState: function (state) { + var series = this, + options = series.options, + graph = series.graph, + stateOptions = options.states, + lineWidth = options.lineWidth; + + state = state || NORMAL_STATE; + + if (series.state !== state) { + series.state = state; + + if (stateOptions[state] && stateOptions[state].enabled === false) { + return; + } + + if (state) { + lineWidth = stateOptions[state].lineWidth || lineWidth + 1; + } + + if (graph && !graph.dashstyle) { // hover is turned off for dashed lines in VML + graph.attr({ // use attr because animate will cause any other animation on the graph to stop + 'stroke-width': lineWidth + }, state ? 0 : 500); + } + } + }, + + /** + * Set the visibility of the graph + * + * @param vis {Boolean} True to show the series, false to hide. If UNDEFINED, + * the visibility is toggled. + */ + setVisible: function (vis, redraw) { + var series = this, + chart = series.chart, + legendItem = series.legendItem, + seriesGroup = series.group, + seriesTracker = series.tracker, + dataLabelsGroup = series.dataLabelsGroup, + markerGroup = series.markerGroup, + showOrHide, + i, + points = series.points, + point, + ignoreHiddenSeries = chart.options.chart.ignoreHiddenSeries, + oldVisibility = series.visible; + + // if called without an argument, toggle visibility + series.visible = vis = vis === UNDEFINED ? !oldVisibility : vis; + showOrHide = vis ? 'show' : 'hide'; + + // show or hide series + if (seriesGroup) { // pies don't have one + seriesGroup[showOrHide](); + } + if (markerGroup) { + markerGroup[showOrHide](); + } + + // show or hide trackers + if (seriesTracker) { + seriesTracker[showOrHide](); + } else if (points) { + i = points.length; + while (i--) { + point = points[i]; + if (point.tracker) { + point.tracker[showOrHide](); + } + } + } + + + if (dataLabelsGroup) { + dataLabelsGroup[showOrHide](); + } + + if (legendItem) { + chart.legend.colorizeItem(series, vis); + } + + + // rescale or adapt to resized chart + series.isDirty = true; + // in a stack, all other series are affected + if (series.options.stacking) { + each(chart.series, function (otherSeries) { + if (otherSeries.options.stacking && otherSeries.visible) { + otherSeries.isDirty = true; + } + }); + } + + if (ignoreHiddenSeries) { + chart.isDirtyBox = true; + } + if (redraw !== false) { + chart.redraw(); + } + + fireEvent(series, showOrHide); + }, + + /** + * Show the graph + */ + show: function () { + this.setVisible(true); + }, + + /** + * Hide the graph + */ + hide: function () { + this.setVisible(false); + }, + + + /** + * Set the selected state of the graph + * + * @param selected {Boolean} True to select the series, false to unselect. If + * UNDEFINED, the selection state is toggled. + */ + select: function (selected) { + var series = this; + // if called without an argument, toggle + series.selected = selected = (selected === UNDEFINED) ? !series.selected : selected; + + if (series.checkbox) { + series.checkbox.checked = selected; + } + + fireEvent(series, selected ? 'select' : 'unselect'); + }, + + /** + * Draw the tracker object that sits above all data labels and markers to + * track mouse events on the graph or points. For the line type charts + * the tracker uses the same graphPath, but with a greater stroke width + * for better control. + */ + drawTracker: function () { + var series = this, + options = series.options, + trackByArea = options.trackByArea, + trackerPath = [].concat(trackByArea ? series.areaPath : series.graphPath), + trackerPathLength = trackerPath.length, + chart = series.chart, + renderer = chart.renderer, + snap = chart.options.tooltip.snap, + tracker = series.tracker, + cursor = options.cursor, + css = cursor && { cursor: cursor }, + singlePoints = series.singlePoints, + trackerGroup = this.isCartesian && this.plotGroup('trackerGroup', null, VISIBLE, options.zIndex || 1, chart.trackerGroup), + singlePoint, + i; + + // Extend end points. A better way would be to use round linecaps, + // but those are not clickable in VML. + if (trackerPathLength && !trackByArea) { + i = trackerPathLength + 1; + while (i--) { + if (trackerPath[i] === M) { // extend left side + trackerPath.splice(i + 1, 0, trackerPath[i + 1] - snap, trackerPath[i + 2], L); + } + if ((i && trackerPath[i] === M) || i === trackerPathLength) { // extend right side + trackerPath.splice(i, 0, L, trackerPath[i - 2] + snap, trackerPath[i - 1]); + } + } + } + + // handle single points + for (i = 0; i < singlePoints.length; i++) { + singlePoint = singlePoints[i]; + trackerPath.push(M, singlePoint.plotX - snap, singlePoint.plotY, + L, singlePoint.plotX + snap, singlePoint.plotY); + } + + + + // draw the tracker + if (tracker) { + tracker.attr({ d: trackerPath }); + + } else { // create + + series.tracker = renderer.path(trackerPath) + .attr({ + isTracker: true, + 'stroke-linejoin': 'bevel', + visibility: series.visible ? VISIBLE : HIDDEN, + stroke: TRACKER_FILL, + fill: trackByArea ? TRACKER_FILL : NONE, + 'stroke-width' : options.lineWidth + (trackByArea ? 0 : 2 * snap) + }) + .on(hasTouch ? 'touchstart' : 'mouseover', function () { + if (chart.hoverSeries !== series) { + series.onMouseOver(); + } + }) + .on('mouseout', function () { + if (!options.stickyTracking) { + series.onMouseOut(); + } + }) + .css(css) + .add(trackerGroup); + } + + } + +}; // end Series prototype + + +/** + * LineSeries object + */ +var LineSeries = extendClass(Series); +seriesTypes.line = LineSeries; + +/** + * Set the default options for area + */ +defaultPlotOptions.area = merge(defaultSeriesOptions, { + threshold: 0 + // trackByArea: false, + // lineColor: null, // overrides color, but lets fillColor be unaltered + // fillOpacity: 0.75, + // fillColor: null +}); + +/** + * AreaSeries object + */ +var AreaSeries = extendClass(Series, { + type: 'area', + + /** + * Extend the base Series getSegmentPath method by adding the path for the area. + * This path is pushed to the series.areaPath property. + */ + getSegmentPath: function (segment) { + + var segmentPath = Series.prototype.getSegmentPath.call(this, segment), // call base method + areaSegmentPath = [].concat(segmentPath), // work on a copy for the area path + i, + options = this.options, + segLength = segmentPath.length; + + if (segLength === 3) { // for animation from 1 to two points + areaSegmentPath.push(L, segmentPath[1], segmentPath[2]); + } + if (options.stacking && !this.closedStacks) { + + // Follow stack back. Todo: implement areaspline. A general solution could be to + // reverse the entire graphPath of the previous series, though may be hard with + // splines and with series with different extremes + for (i = segment.length - 1; i >= 0; i--) { + + // step line? + if (i < segment.length - 1 && options.step) { + areaSegmentPath.push(segment[i + 1].plotX, segment[i].yBottom); + } + + areaSegmentPath.push(segment[i].plotX, segment[i].yBottom); + } + + } else { // follow zero line back + this.closeSegment(areaSegmentPath, segment); + } + this.areaPath = this.areaPath.concat(areaSegmentPath); + + return segmentPath; + }, + + /** + * Extendable method to close the segment path of an area. This is overridden in polar + * charts. + */ + closeSegment: function (path, segment) { + var translatedThreshold = this.yAxis.getThreshold(this.options.threshold); + path.push( + L, + segment[segment.length - 1].plotX, + translatedThreshold, + L, + segment[0].plotX, + translatedThreshold + ); + }, + + /** + * Draw the graph and the underlying area. This method calls the Series base + * function and adds the area. The areaPath is calculated in the getSegmentPath + * method called from Series.prototype.drawGraph. + */ + drawGraph: function () { + + // Define or reset areaPath + this.areaPath = []; + + // Call the base method + Series.prototype.drawGraph.apply(this); + + // Define local variables + var areaPath = this.areaPath, + options = this.options, + area = this.area; + + // Create or update the area + if (area) { // update + area.animate({ d: areaPath }); + + } else { // create + this.area = this.chart.renderer.path(areaPath) + .attr({ + fill: pick( + options.fillColor, + Color(this.color).setOpacity(options.fillOpacity || 0.75).get() + ), + zIndex: 0 // #1069 + }).add(this.group); + } + }, + + /** + * Get the series' symbol in the legend + * + * @param {Object} legend The legend object + * @param {Object} item The series (this) or point + */ + drawLegendSymbol: function (legend, item) { + + item.legendSymbol = this.chart.renderer.rect( + 0, + legend.baseline - 11, + legend.options.symbolWidth, + 12, + 2 + ).attr({ + zIndex: 3 + }).add(item.legendGroup); + + } +}); + +seriesTypes.area = AreaSeries;/** + * Set the default options for spline + */ +defaultPlotOptions.spline = merge(defaultSeriesOptions); + +/** + * SplineSeries object + */ +var SplineSeries = extendClass(Series, { + type: 'spline', + + /** + * Get the spline segment from a given point's previous neighbour to the given point + */ + getPointSpline: function (segment, point, i) { + var smoothing = 1.5, // 1 means control points midway between points, 2 means 1/3 from the point, 3 is 1/4 etc + denom = smoothing + 1, + plotX = point.plotX, + plotY = point.plotY, + lastPoint = segment[i - 1], + nextPoint = segment[i + 1], + leftContX, + leftContY, + rightContX, + rightContY, + ret; + + // find control points + if (lastPoint && nextPoint) { + + var lastX = lastPoint.plotX, + lastY = lastPoint.plotY, + nextX = nextPoint.plotX, + nextY = nextPoint.plotY, + correction; + + leftContX = (smoothing * plotX + lastX) / denom; + leftContY = (smoothing * plotY + lastY) / denom; + rightContX = (smoothing * plotX + nextX) / denom; + rightContY = (smoothing * plotY + nextY) / denom; + + // have the two control points make a straight line through main point + correction = ((rightContY - leftContY) * (rightContX - plotX)) / + (rightContX - leftContX) + plotY - rightContY; + + leftContY += correction; + rightContY += correction; + + // to prevent false extremes, check that control points are between + // neighbouring points' y values + if (leftContY > lastY && leftContY > plotY) { + leftContY = mathMax(lastY, plotY); + rightContY = 2 * plotY - leftContY; // mirror of left control point + } else if (leftContY < lastY && leftContY < plotY) { + leftContY = mathMin(lastY, plotY); + rightContY = 2 * plotY - leftContY; + } + if (rightContY > nextY && rightContY > plotY) { + rightContY = mathMax(nextY, plotY); + leftContY = 2 * plotY - rightContY; + } else if (rightContY < nextY && rightContY < plotY) { + rightContY = mathMin(nextY, plotY); + leftContY = 2 * plotY - rightContY; + } + + // record for drawing in next point + point.rightContX = rightContX; + point.rightContY = rightContY; + + } + + // Visualize control points for debugging + /* + if (leftContX) { + this.chart.renderer.circle(leftContX + this.chart.plotLeft, leftContY + this.chart.plotTop, 2) + .attr({ + stroke: 'red', + 'stroke-width': 1, + fill: 'none' + }) + .add(); + this.chart.renderer.path(['M', leftContX + this.chart.plotLeft, leftContY + this.chart.plotTop, + 'L', plotX + this.chart.plotLeft, plotY + this.chart.plotTop]) + .attr({ + stroke: 'red', + 'stroke-width': 1 + }) + .add(); + this.chart.renderer.circle(rightContX + this.chart.plotLeft, rightContY + this.chart.plotTop, 2) + .attr({ + stroke: 'green', + 'stroke-width': 1, + fill: 'none' + }) + .add(); + this.chart.renderer.path(['M', rightContX + this.chart.plotLeft, rightContY + this.chart.plotTop, + 'L', plotX + this.chart.plotLeft, plotY + this.chart.plotTop]) + .attr({ + stroke: 'green', + 'stroke-width': 1 + }) + .add(); + } + // */ + + // moveTo or lineTo + if (!i) { + ret = [M, plotX, plotY]; + } else { // curve from last point to this + ret = [ + 'C', + lastPoint.rightContX || lastPoint.plotX, + lastPoint.rightContY || lastPoint.plotY, + leftContX || plotX, + leftContY || plotY, + plotX, + plotY + ]; + lastPoint.rightContX = lastPoint.rightContY = null; // reset for updating series later + } + return ret; + } +}); +seriesTypes.spline = SplineSeries; + +/** + * Set the default options for areaspline + */ +defaultPlotOptions.areaspline = merge(defaultPlotOptions.area); + +/** + * AreaSplineSeries object + */ +var areaProto = AreaSeries.prototype, + AreaSplineSeries = extendClass(SplineSeries, { + type: 'areaspline', + closedStacks: true, // instead of following the previous graph back, follow the threshold back + + // Mix in methods from the area series + getSegmentPath: areaProto.getSegmentPath, + closeSegment: areaProto.closeSegment, + drawGraph: areaProto.drawGraph + }); +seriesTypes.areaspline = AreaSplineSeries; + +/** + * Set the default options for column + */ +defaultPlotOptions.column = merge(defaultSeriesOptions, { + borderColor: '#FFFFFF', + borderWidth: 1, + borderRadius: 0, + //colorByPoint: undefined, + groupPadding: 0.2, + //grouping: true, + marker: null, // point options are specified in the base options + pointPadding: 0.1, + //pointWidth: null, + minPointLength: 0, + cropThreshold: 50, // when there are more points, they will not animate out of the chart on xAxis.setExtremes + pointRange: null, // null means auto, meaning 1 in a categorized axis and least distance between points if not categories + states: { + hover: { + brightness: 0.1, + shadow: false + }, + select: { + color: '#C0C0C0', + borderColor: '#000000', + shadow: false + } + }, + dataLabels: { + y: null, + verticalAlign: null + }, + threshold: 0 +}); + +/** + * ColumnSeries object + */ +var ColumnSeries = extendClass(Series, { + type: 'column', + tooltipOutsidePlot: true, + pointAttrToOptions: { // mapping between SVG attributes and the corresponding options + stroke: 'borderColor', + 'stroke-width': 'borderWidth', + fill: 'color', + r: 'borderRadius' + }, + + /** + * Initialize the series + */ + init: function () { + Series.prototype.init.apply(this, arguments); + + var series = this, + chart = series.chart; + + // if the series is added dynamically, force redraw of other + // series affected by a new column + if (chart.hasRendered) { + each(chart.series, function (otherSeries) { + if (otherSeries.type === series.type) { + otherSeries.isDirty = true; + } + }); + } + }, + + /** + * Translate each point to the plot area coordinate system and find shape positions + */ + translate: function () { + var series = this, + chart = series.chart, + options = series.options, + stacking = options.stacking, + borderWidth = options.borderWidth, + columnCount = 0, + xAxis = series.xAxis, + reversedXAxis = xAxis.reversed, + stackGroups = {}, + stackKey, + columnIndex; + + Series.prototype.translate.apply(series); + + // Get the total number of column type series. + // This is called on every series. Consider moving this logic to a + // chart.orderStacks() function and call it on init, addSeries and removeSeries + if (options.grouping === false) { + columnCount = 1; + + } else { + each(chart.series, function (otherSeries) { + var otherOptions = otherSeries.options; + if (otherSeries.type === series.type && otherSeries.visible && + series.options.group === otherOptions.group) { // used in Stock charts navigator series + if (otherOptions.stacking) { + stackKey = otherSeries.stackKey; + if (stackGroups[stackKey] === UNDEFINED) { + stackGroups[stackKey] = columnCount++; + } + columnIndex = stackGroups[stackKey]; + } else if (otherOptions.grouping !== false) { // #1162 + columnIndex = columnCount++; + } + otherSeries.columnIndex = columnIndex; + } + }); + } + + // calculate the width and position of each column based on + // the number of column series in the plot, the groupPadding + // and the pointPadding options + var points = series.points, + categoryWidth = mathAbs(xAxis.transA) * (xAxis.ordinalSlope || options.pointRange || xAxis.closestPointRange || 1), + groupPadding = categoryWidth * options.groupPadding, + groupWidth = categoryWidth - 2 * groupPadding, + pointOffsetWidth = groupWidth / columnCount, + optionPointWidth = options.pointWidth, + pointPadding = defined(optionPointWidth) ? (pointOffsetWidth - optionPointWidth) / 2 : + pointOffsetWidth * options.pointPadding, + pointWidth = pick(optionPointWidth, pointOffsetWidth - 2 * pointPadding), // exact point width, used in polar charts + barW = mathCeil(mathMax(pointWidth, 1 + 2 * borderWidth)), // rounded and postprocessed for border width + colIndex = (reversedXAxis ? columnCount - + series.columnIndex : series.columnIndex) || 0, + pointXOffset = pointPadding + (groupPadding + colIndex * + pointOffsetWidth - (categoryWidth / 2)) * + (reversedXAxis ? -1 : 1), + threshold = options.threshold, + translatedThreshold = series.yAxis.getThreshold(threshold), + minPointLength = pick(options.minPointLength, 5); + + // record the new values + each(points, function (point) { + var plotY = point.plotY, + yBottom = pick(point.yBottom, translatedThreshold), + barX = point.plotX + pointXOffset, + barY = mathCeil(mathMin(plotY, yBottom)), + barH = mathCeil(mathMax(plotY, yBottom) - barY), + stack = series.yAxis.stacks[(point.y < 0 ? '-' : '') + series.stackKey], + shapeArgs; + + // Record the offset'ed position and width of the bar to be able to align the stacking total correctly + if (stacking && series.visible && stack && stack[point.x]) { + stack[point.x].setOffset(pointXOffset, barW); + } + + // handle options.minPointLength + if (mathAbs(barH) < minPointLength) { + if (minPointLength) { + barH = minPointLength; + barY = + mathAbs(barY - translatedThreshold) > minPointLength ? // stacked + yBottom - minPointLength : // keep position + translatedThreshold - (plotY <= translatedThreshold ? minPointLength : 0); + } + } + + extend(point, { + barX: barX, + barY: barY, + barW: barW, + barH: barH, + pointWidth: pointWidth + }); + + // create shape type and shape args that are reused in drawPoints and drawTracker + point.shapeType = 'rect'; + point.shapeArgs = shapeArgs = chart.renderer.Element.prototype.crisp.call(0, borderWidth, barX, barY, barW, barH); + + if (borderWidth % 2) { // correct for shorting in crisp method, visible in stacked columns with 1px border + shapeArgs.y -= 1; + shapeArgs.height += 1; + } + + // make small columns responsive to mouse + point.trackerArgs = mathAbs(barH) < 3 && merge(point.shapeArgs, { + height: 6, + y: barY - 3 + }); + }); + + }, + + getSymbol: noop, + + /** + * Use a solid rectangle like the area series types + */ + drawLegendSymbol: AreaSeries.prototype.drawLegendSymbol, + + + /** + * Columns have no graph + */ + drawGraph: noop, + + /** + * Draw the columns. For bars, the series.group is rotated, so the same coordinates + * apply for columns and bars. This method is inherited by scatter series. + * + */ + drawPoints: function () { + var series = this, + options = series.options, + renderer = series.chart.renderer, + graphic, + shapeArgs; + + + // draw the columns + each(series.points, function (point) { + var plotY = point.plotY; + if (plotY !== UNDEFINED && !isNaN(plotY) && point.y !== null) { + graphic = point.graphic; + shapeArgs = point.shapeArgs; + if (graphic) { // update + stop(graphic); + graphic.animate(merge(shapeArgs)); + + } else { + point.graphic = graphic = renderer[point.shapeType](shapeArgs) + .attr(point.pointAttr[point.selected ? SELECT_STATE : NORMAL_STATE]) + .add(series.group) + .shadow(options.shadow, null, options.stacking && !options.borderRadius); + } + + } + }); + }, + /** + * Draw the individual tracker elements. + * This method is inherited by scatter and pie charts too. + */ + drawTracker: function () { + var series = this, + chart = series.chart, + renderer = chart.renderer, + shapeArgs, + tracker, + trackerLabel = +new Date(), + options = series.options, + cursor = options.cursor, + css = cursor && { cursor: cursor }, + trackerGroup = series.isCartesian && series.plotGroup('trackerGroup', null, VISIBLE, options.zIndex || 1, chart.trackerGroup), + rel, + plotY, + validPlotY; + + each(series.points, function (point) { + tracker = point.tracker; + shapeArgs = point.trackerArgs || point.shapeArgs; + plotY = point.plotY; + validPlotY = !series.isCartesian || (plotY !== UNDEFINED && !isNaN(plotY)); + delete shapeArgs.strokeWidth; + if (point.y !== null && validPlotY) { + if (tracker) {// update + tracker.attr(shapeArgs); + + } else { + point.tracker = + renderer[point.shapeType](shapeArgs) + .attr({ + isTracker: trackerLabel, + fill: TRACKER_FILL, + visibility: series.visible ? VISIBLE : HIDDEN + }) + .on(hasTouch ? 'touchstart' : 'mouseover', function (event) { + rel = event.relatedTarget || event.fromElement; + if (chart.hoverSeries !== series && attr(rel, 'isTracker') !== trackerLabel) { + series.onMouseOver(); + } + point.onMouseOver(); + + }) + .on('mouseout', function (event) { + if (!options.stickyTracking) { + rel = event.relatedTarget || event.toElement; + if (attr(rel, 'isTracker') !== trackerLabel) { + series.onMouseOut(); + } + } + }) + .css(css) + .add(point.group || trackerGroup); // pies have point group - see issue #118 + } + } + }); + }, + + + /** + * Animate the column heights one by one from zero + * @param {Boolean} init Whether to initialize the animation or run it + */ + animate: function (init) { + var series = this, + points = series.points, + options = series.options; + + if (!init) { // run the animation + /* + * Note: Ideally the animation should be initialized by calling + * series.group.hide(), and then calling series.group.show() + * after the animation was started. But this rendered the shadows + * invisible in IE8 standards mode. If the columns flicker on large + * datasets, this is the cause. + */ + + each(points, function (point) { + var graphic = point.graphic, + shapeArgs = point.shapeArgs, + yAxis = series.yAxis, + threshold = options.threshold; + + if (graphic) { + // start values + graphic.attr({ + height: 0, + y: defined(threshold) ? + yAxis.getThreshold(threshold) : + yAxis.translate(yAxis.getExtremes().min, 0, 1, 0, 1) + }); + + // animate + graphic.animate({ + height: shapeArgs.height, + y: shapeArgs.y + }, options.animation); + } + }); + + + // delete this function to allow it only once + series.animate = null; + } + + }, + /** + * Remove this series from the chart + */ + remove: function () { + var series = this, + chart = series.chart; + + // column and bar series affects other series of the same type + // as they are either stacked or grouped + if (chart.hasRendered) { + each(chart.series, function (otherSeries) { + if (otherSeries.type === series.type) { + otherSeries.isDirty = true; + } + }); + } + + Series.prototype.remove.apply(series, arguments); + } +}); +seriesTypes.column = ColumnSeries; +/** + * Set the default options for bar + */ +defaultPlotOptions.bar = merge(defaultPlotOptions.column, { + dataLabels: { + align: 'left', + x: 5, + y: null, + verticalAlign: 'middle' + } +}); +/** + * The Bar series class + */ +var BarSeries = extendClass(ColumnSeries, { + type: 'bar', + inverted: true +}); +seriesTypes.bar = BarSeries; + +/** + * Set the default options for scatter + */ +defaultPlotOptions.scatter = merge(defaultSeriesOptions, { + lineWidth: 0, + states: { + hover: { + lineWidth: 0 + } + }, + tooltip: { + headerFormat: '{series.name}
', + pointFormat: 'x: {point.x}
y: {point.y}
' + } +}); + +/** + * The scatter series class + */ +var ScatterSeries = extendClass(Series, { + type: 'scatter', + sorted: false, + /** + * Extend the base Series' translate method by adding shape type and + * arguments for the point trackers + */ + translate: function () { + var series = this; + + Series.prototype.translate.apply(series); + + each(series.points, function (point) { + point.shapeType = 'circle'; + point.shapeArgs = { + x: point.plotX, + y: point.plotY, + r: series.chart.options.tooltip.snap + }; + }); + }, + + /** + * Add tracking event listener to the series group, so the point graphics + * themselves act as trackers + */ + drawTracker: function () { + var series = this, + cursor = series.options.cursor, + css = cursor && { cursor: cursor }, + points = series.points, + i = points.length, + graphic; + + // Set an expando property for the point index, used below + while (i--) { + graphic = points[i].graphic; + if (graphic) { // doesn't exist for null points + graphic.element._i = i; + } + } + + // Add the event listeners, we need to do this only once + if (!series._hasTracking) { + series.markerGroup + .attr({ + isTracker: true + }) + .on(hasTouch ? 'touchstart' : 'mouseover', function (e) { + series.onMouseOver(); + if (e.target._i !== UNDEFINED) { // undefined on graph in scatterchart + points[e.target._i].onMouseOver(); + } + }) + .on('mouseout', function () { + if (!series.options.stickyTracking) { + series.onMouseOut(); + } + }) + .css(css); + } else { + series._hasTracking = true; + } + } +}); +seriesTypes.scatter = ScatterSeries; + +/** + * Set the default options for pie + */ +defaultPlotOptions.pie = merge(defaultSeriesOptions, { + borderColor: '#FFFFFF', + borderWidth: 1, + center: ['50%', '50%'], + colorByPoint: true, // always true for pies + dataLabels: { + // align: null, + // connectorWidth: 1, + // connectorColor: point.color, + // connectorPadding: 5, + distance: 30, + enabled: true, + formatter: function () { + return this.point.name; + }, + // softConnector: true, + y: 5 + }, + //innerSize: 0, + legendType: 'point', + marker: null, // point options are specified in the base options + size: '75%', + showInLegend: false, + slicedOffset: 10, + states: { + hover: { + brightness: 0.1, + shadow: false + } + } +}); + +/** + * Extended point object for pies + */ +var PiePoint = extendClass(Point, { + /** + * Initiate the pie slice + */ + init: function () { + + Point.prototype.init.apply(this, arguments); + + var point = this, + toggleSlice; + + //visible: options.visible !== false, + extend(point, { + visible: point.visible !== false, + name: pick(point.name, 'Slice') + }); + + // add event listener for select + toggleSlice = function () { + point.slice(); + }; + addEvent(point, 'select', toggleSlice); + addEvent(point, 'unselect', toggleSlice); + + return point; + }, + + /** + * Toggle the visibility of the pie slice + * @param {Boolean} vis Whether to show the slice or not. If undefined, the + * visibility is toggled + */ + setVisible: function (vis) { + var point = this, + series = point.series, + chart = series.chart, + tracker = point.tracker, + dataLabel = point.dataLabel, + connector = point.connector, + shadowGroup = point.shadowGroup, + method; + + // if called without an argument, toggle visibility + point.visible = vis = vis === UNDEFINED ? !point.visible : vis; + + method = vis ? 'show' : 'hide'; + + point.group[method](); + if (tracker) { + tracker[method](); + } + if (dataLabel) { + dataLabel[method](); + } + if (connector) { + connector[method](); + } + if (shadowGroup) { + shadowGroup[method](); + } + if (point.legendItem) { + chart.legend.colorizeItem(point, vis); + } + + // Handle ignore hidden slices + if (!series.isDirty && series.options.ignoreHiddenPoint) { + series.isDirty = true; + chart.redraw(); + } + }, + + /** + * Set or toggle whether the slice is cut out from the pie + * @param {Boolean} sliced When undefined, the slice state is toggled + * @param {Boolean} redraw Whether to redraw the chart. True by default. + */ + slice: function (sliced, redraw, animation) { + var point = this, + series = point.series, + chart = series.chart, + slicedTranslation = point.slicedTranslation, + translation; + + setAnimation(animation, chart); + + // redraw is true by default + redraw = pick(redraw, true); + + // if called without an argument, toggle + sliced = point.sliced = defined(sliced) ? sliced : !point.sliced; + + translation = { + translateX: (sliced ? slicedTranslation[0] : chart.plotLeft), + translateY: (sliced ? slicedTranslation[1] : chart.plotTop) + }; + point.group.animate(translation); + if (point.shadowGroup) { + point.shadowGroup.animate(translation); + } + + } +}); + +/** + * The Pie series class + */ +var PieSeries = { + type: 'pie', + isCartesian: false, + pointClass: PiePoint, + pointAttrToOptions: { // mapping between SVG attributes and the corresponding options + stroke: 'borderColor', + 'stroke-width': 'borderWidth', + fill: 'color' + }, + + /** + * Pies have one color each point + */ + getColor: function () { + // record first color for use in setData + this.initialColor = this.chart.counters.color; + }, + + /** + * Animate the pies in + */ + animate: function () { + var series = this, + points = series.points; + + each(points, function (point) { + var graphic = point.graphic, + args = point.shapeArgs, + up = -mathPI / 2; + + if (graphic) { + // start values + graphic.attr({ + r: 0, + start: up, + end: up + }); + + // animate + graphic.animate({ + r: args.r, + start: args.start, + end: args.end + }, series.options.animation); + } + }); + + // delete this function to allow it only once + series.animate = null; + + }, + + /** + * Extend the basic setData method by running processData and generatePoints immediately, + * in order to access the points from the legend. + */ + setData: function (data, redraw) { + Series.prototype.setData.call(this, data, false); + this.processData(); + this.generatePoints(); + if (pick(redraw, true)) { + this.chart.redraw(); + } + }, + + /** + * Get the center of the pie based on the size and center options relative to the + * plot area. Borrowed by the polar and gauge series types. + */ + getCenter: function () { + + var options = this.options, + chart = this.chart, + plotWidth = chart.plotWidth, + plotHeight = chart.plotHeight, + positions = options.center.concat([options.size, options.innerSize || 0]), + smallestSize = mathMin(plotWidth, plotHeight), + isPercent; + + return map(positions, function (length, i) { + + isPercent = /%$/.test(length); + return isPercent ? + // i == 0: centerX, relative to width + // i == 1: centerY, relative to height + // i == 2: size, relative to smallestSize + // i == 4: innerSize, relative to smallestSize + [plotWidth, plotHeight, smallestSize, smallestSize][i] * + pInt(length) / 100 : + length; + }); + }, + + /** + * Do translation for pie slices + */ + translate: function () { + this.generatePoints(); + + var total = 0, + series = this, + cumulative = -0.25, // start at top + precision = 1000, // issue #172 + options = series.options, + slicedOffset = options.slicedOffset, + connectorOffset = slicedOffset + options.borderWidth, + positions, + chart = series.chart, + start, + end, + angle, + points = series.points, + circ = 2 * mathPI, + fraction, + radiusX, // the x component of the radius vector for a given point + radiusY, + labelDistance = options.dataLabels.distance, + ignoreHiddenPoint = options.ignoreHiddenPoint; + + // get positions - either an integer or a percentage string must be given + series.center = positions = series.getCenter(); + + // utility for getting the x value from a given y, used for anticollision logic in data labels + series.getX = function (y, left) { + + angle = math.asin((y - positions[1]) / (positions[2] / 2 + labelDistance)); + + return positions[0] + + (left ? -1 : 1) * + (mathCos(angle) * (positions[2] / 2 + labelDistance)); + }; + + // get the total sum + each(points, function (point) { + total += (ignoreHiddenPoint && !point.visible) ? 0 : point.y; + }); + + each(points, function (point) { + // set start and end angle + fraction = total ? point.y / total : 0; + start = mathRound(cumulative * circ * precision) / precision; + if (!ignoreHiddenPoint || point.visible) { + cumulative += fraction; + } + end = mathRound(cumulative * circ * precision) / precision; + + // set the shape + point.shapeType = 'arc'; + point.shapeArgs = { + x: positions[0], + y: positions[1], + r: positions[2] / 2, + innerR: positions[3] / 2, + start: start, + end: end + }; + + // center for the sliced out slice + angle = (end + start) / 2; + point.slicedTranslation = map([ + mathCos(angle) * slicedOffset + chart.plotLeft, + mathSin(angle) * slicedOffset + chart.plotTop + ], mathRound); + + // set the anchor point for tooltips + radiusX = mathCos(angle) * positions[2] / 2; + radiusY = mathSin(angle) * positions[2] / 2; + point.tooltipPos = [ + positions[0] + radiusX * 0.7, + positions[1] + radiusY * 0.7 + ]; + + // set the anchor point for data labels + point.labelPos = [ + positions[0] + radiusX + mathCos(angle) * labelDistance, // first break of connector + positions[1] + radiusY + mathSin(angle) * labelDistance, // a/a + positions[0] + radiusX + mathCos(angle) * connectorOffset, // second break, right outside pie + positions[1] + radiusY + mathSin(angle) * connectorOffset, // a/a + positions[0] + radiusX, // landing point for connector + positions[1] + radiusY, // a/a + labelDistance < 0 ? // alignment + 'center' : + angle < circ / 4 ? 'left' : 'right', // alignment + angle // center angle + ]; + + // API properties + point.percentage = fraction * 100; + point.total = total; + + }); + + + this.setTooltipPoints(); + }, + + /** + * Render the slices + */ + render: function () { + var series = this; + + // cache attributes for shapes + series.getAttribs(); + + this.drawPoints(); + + // draw the mouse tracking area + if (series.options.enableMouseTracking !== false) { + series.drawTracker(); + } + + this.drawDataLabels(); + + if (series.options.animation && series.animate) { + series.animate(); + } + + // (See #322) series.isDirty = series.isDirtyData = false; // means data is in accordance with what you see + series.isDirty = false; // means data is in accordance with what you see + }, + + /** + * Draw the data points + */ + drawPoints: function () { + var series = this, + chart = series.chart, + renderer = chart.renderer, + groupTranslation, + //center, + graphic, + group, + shadow = series.options.shadow, + shadowGroup, + shapeArgs; + + // draw the slices + each(series.points, function (point) { + graphic = point.graphic; + shapeArgs = point.shapeArgs; + group = point.group; + shadowGroup = point.shadowGroup; + + // put the shadow behind all points + if (shadow && !shadowGroup) { + shadowGroup = point.shadowGroup = renderer.g('shadow') + .attr({ zIndex: 4 }) + .add(); + } + + // create the group the first time + if (!group) { + group = point.group = renderer.g('point') + .attr({ zIndex: 5 }) + .add(); + } + + // if the point is sliced, use special translation, else use plot area traslation + groupTranslation = point.sliced ? point.slicedTranslation : [chart.plotLeft, chart.plotTop]; + group.translate(groupTranslation[0], groupTranslation[1]); + if (shadowGroup) { + shadowGroup.translate(groupTranslation[0], groupTranslation[1]); + } + + // draw the slice + if (graphic) { + graphic.animate(shapeArgs); + } else { + point.graphic = graphic = renderer.arc(shapeArgs) + .setRadialReference(series.center) + .attr(extend( + point.pointAttr[NORMAL_STATE], + { 'stroke-linejoin': 'round' } + )) + .add(point.group) + .shadow(shadow, shadowGroup); + + } + + // detect point specific visibility + if (point.visible === false) { + point.setVisible(false); + } + + }); + + }, + + /** + * Override the base drawDataLabels method by pie specific functionality + */ + drawDataLabels: function () { + var series = this, + data = series.data, + point, + chart = series.chart, + options = series.options.dataLabels, + connectorPadding = pick(options.connectorPadding, 10), + connectorWidth = pick(options.connectorWidth, 1), + connector, + connectorPath, + softConnector = pick(options.softConnector, true), + distanceOption = options.distance, + seriesCenter = series.center, + radius = seriesCenter[2] / 2, + centerY = seriesCenter[1], + outside = distanceOption > 0, + dataLabel, + labelPos, + labelHeight, + halves = [// divide the points into right and left halves for anti collision + [], // right + [] // left + ], + x, + y, + visibility, + rankArr, + sort, + i = 2, + j; + + // get out if not enabled + if (!options.enabled && !series._hasPointLabels) { + return; + } + + // run parent method + Series.prototype.drawDataLabels.apply(series); + + // arrange points for detection collision + each(data, function (point) { + if (point.dataLabel) { // it may have been cancelled in the base method (#407) + halves[ + point.labelPos[7] < mathPI / 2 ? 0 : 1 + ].push(point); + } + }); + halves[1].reverse(); + + // define the sorting algorithm + sort = function (a, b) { + return b.y - a.y; + }; + + // assume equal label heights + labelHeight = halves[0][0] && halves[0][0].dataLabel && (halves[0][0].dataLabel.getBBox().height || 21); // 21 is for #968 + + /* Loop over the points in each half, starting from the top and bottom + * of the pie to detect overlapping labels. + */ + while (i--) { + + var slots = [], + slotsLength, + usedSlots = [], + points = halves[i], + pos, + length = points.length, + slotIndex; + + // Only do anti-collision when we are outside the pie and have connectors (#856) + if (distanceOption > 0) { + + // build the slots + for (pos = centerY - radius - distanceOption; pos <= centerY + radius + distanceOption; pos += labelHeight) { + slots.push(pos); + // visualize the slot + /* + var slotX = series.getX(pos, i) + chart.plotLeft - (i ? 100 : 0), + slotY = pos + chart.plotTop; + if (!isNaN(slotX)) { + chart.renderer.rect(slotX, slotY - 7, 100, labelHeight) + .attr({ + 'stroke-width': 1, + stroke: 'silver' + }) + .add(); + chart.renderer.text('Slot '+ (slots.length - 1), slotX, slotY + 4) + .attr({ + fill: 'silver' + }).add(); + } + // */ + } + slotsLength = slots.length; + + // if there are more values than available slots, remove lowest values + if (length > slotsLength) { + // create an array for sorting and ranking the points within each quarter + rankArr = [].concat(points); + rankArr.sort(sort); + j = length; + while (j--) { + rankArr[j].rank = j; + } + j = length; + while (j--) { + if (points[j].rank >= slotsLength) { + points.splice(j, 1); + } + } + length = points.length; + } + + // The label goes to the nearest open slot, but not closer to the edge than + // the label's index. + for (j = 0; j < length; j++) { + + point = points[j]; + labelPos = point.labelPos; + + var closest = 9999, + distance, + slotI; + + // find the closest slot index + for (slotI = 0; slotI < slotsLength; slotI++) { + distance = mathAbs(slots[slotI] - labelPos[1]); + if (distance < closest) { + closest = distance; + slotIndex = slotI; + } + } + + // if that slot index is closer to the edges of the slots, move it + // to the closest appropriate slot + if (slotIndex < j && slots[j] !== null) { // cluster at the top + slotIndex = j; + } else if (slotsLength < length - j + slotIndex && slots[j] !== null) { // cluster at the bottom + slotIndex = slotsLength - length + j; + while (slots[slotIndex] === null) { // make sure it is not taken + slotIndex++; + } + } else { + // Slot is taken, find next free slot below. In the next run, the next slice will find the + // slot above these, because it is the closest one + while (slots[slotIndex] === null) { // make sure it is not taken + slotIndex++; + } + } + + usedSlots.push({ i: slotIndex, y: slots[slotIndex] }); + slots[slotIndex] = null; // mark as taken + } + // sort them in order to fill in from the top + usedSlots.sort(sort); + } + + // now the used slots are sorted, fill them up sequentially + for (j = 0; j < length; j++) { + + var slot, naturalY; + + point = points[j]; + labelPos = point.labelPos; + dataLabel = point.dataLabel; + visibility = point.visible === false ? HIDDEN : VISIBLE; + naturalY = labelPos[1]; + + if (distanceOption > 0) { + slot = usedSlots.pop(); + slotIndex = slot.i; + + // if the slot next to currrent slot is free, the y value is allowed + // to fall back to the natural position + y = slot.y; + if ((naturalY > y && slots[slotIndex + 1] !== null) || + (naturalY < y && slots[slotIndex - 1] !== null)) { + y = naturalY; + } + + } else { + y = naturalY; + } + + // get the x - use the natural x position for first and last slot, to prevent the top + // and botton slice connectors from touching each other on either side + x = options.justify ? + seriesCenter[0] + (i ? -1 : 1) * (radius + distanceOption) : + series.getX(slotIndex === 0 || slotIndex === slots.length - 1 ? naturalY : y, i); + + // move or place the data label + dataLabel + .attr({ + visibility: visibility, + align: labelPos[6] + })[dataLabel.moved ? 'animate' : 'attr']({ + x: x + options.x + + ({ left: connectorPadding, right: -connectorPadding }[labelPos[6]] || 0), + y: y + options.y + }); + dataLabel.moved = true; + + // draw the connector + if (outside && connectorWidth) { + connector = point.connector; + + connectorPath = softConnector ? [ + M, + x + (labelPos[6] === 'left' ? 5 : -5), y, // end of the string at the label + 'C', + x, y, // first break, next to the label + 2 * labelPos[2] - labelPos[4], 2 * labelPos[3] - labelPos[5], + labelPos[2], labelPos[3], // second break + L, + labelPos[4], labelPos[5] // base + ] : [ + M, + x + (labelPos[6] === 'left' ? 5 : -5), y, // end of the string at the label + L, + labelPos[2], labelPos[3], // second break + L, + labelPos[4], labelPos[5] // base + ]; + + if (connector) { + connector.animate({ d: connectorPath }); + connector.attr('visibility', visibility); + + } else { + point.connector = connector = series.chart.renderer.path(connectorPath).attr({ + 'stroke-width': connectorWidth, + stroke: options.connectorColor || point.color || '#606060', + visibility: visibility, + zIndex: 3 + }) + .translate(chart.plotLeft, chart.plotTop) + .add(); + } + } + } + } + }, + + /** + * Draw point specific tracker objects. Inherit directly from column series. + */ + drawTracker: ColumnSeries.prototype.drawTracker, + + /** + * Use a simple symbol from column prototype + */ + drawLegendSymbol: AreaSeries.prototype.drawLegendSymbol, + + /** + * Pies don't have point marker symbols + */ + getSymbol: function () {} + +}; +PieSeries = extendClass(Series, PieSeries); +seriesTypes.pie = PieSeries; + + +// global variables +extend(Highcharts, { + + // Constructors + Axis: Axis, + CanVGRenderer: CanVGRenderer, + Chart: Chart, + Color: Color, + Legend: Legend, + MouseTracker: MouseTracker, + Point: Point, + Tick: Tick, + Tooltip: Tooltip, + Renderer: Renderer, + Series: Series, + SVGRenderer: SVGRenderer, + VMLRenderer: VMLRenderer, + + // Various + dateFormat: dateFormat, + pathAnim: pathAnim, + getOptions: getOptions, + hasBidiBug: hasBidiBug, + numberFormat: numberFormat, + seriesTypes: seriesTypes, + setOptions: setOptions, + addEvent: addEvent, + removeEvent: removeEvent, + createElement: createElement, + discardElement: discardElement, + css: css, + each: each, + extend: extend, + map: map, + merge: merge, + pick: pick, + splat: splat, + extendClass: extendClass, + pInt: pInt, + wrap: wrap, + svg: hasSVG, + canvas: useCanVG, + vml: !hasSVG && !useCanVG, + product: 'Highcharts', + version: '2.3.2' +}); +}()); diff --git a/IPSLibrary/webfront/IPSHighcharts/Highcharts/js/highstock.js b/IPSLibrary/webfront/IPSHighcharts/Highcharts/js/highstock.js new file mode 100644 index 0000000..6d757d7 --- /dev/null +++ b/IPSLibrary/webfront/IPSHighcharts/Highcharts/js/highstock.js @@ -0,0 +1,310 @@ +/* + Highstock JS v1.2.5 (2012-12-19) + + (c) 2009-2012 Torstein Hønsi + + License: www.highcharts.com/license +*/ +(function(){function y(a,b){var c;a||(a={});for(c in b)a[c]=b[c];return a}function ha(){for(var a=0,b=arguments,c=b.length,d={};a-1?b.split(".")[1].length:0):a=isNaN(b=U(b))?2:b;var b=a,c=c===void 0?e.decimalPoint:c,d=d===void 0?e.thousandsSep:d,e=f<0?"-":"",a=String(A(f=U(+f||0).toFixed(b))),g=a.length>3?a.length%3:0;return e+(g?a.substr(0,g)+d:"")+ +a.substr(g).replace(/(\d{3})(?=\d)/g,"$1"+d)+(b?c+U(f-a).toFixed(b).slice(2):"")}function Da(a,b){return Array((b||2)+1-String(a).length).join(0)+a}function tb(a,b,c){var d=a[b];a[b]=function(){var a=Array.prototype.slice.call(arguments);a.unshift(d);return c.apply(this,a)}}function ub(a,b,c,d){var e,c=n(c,1);e=a/c;b||(b=[1,2,2.5,5,10],d&&d.allowDecimals===!1&&(c===1?b=[1,2,5,10]:c<=0.1&&(b=[1/c])));for(d=0;d= +G[Xa]&&(i.setMilliseconds(0),i.setSeconds(j>=G[Ra]?0:k*W(i.getSeconds()/k)));if(j>=G[Ra])i[Kb](j>=G[ra]?0:k*W(i[wb]()/k));if(j>=G[ra])i[Lb](j>=G[da]?0:k*W(i[xb]()/k));if(j>=G[da])i[yb](j>=G[Fa]?1:k*W(i[Ga]()/k));j>=G[Fa]&&(i[Mb](j>=G[ma]?0:k*W(i[gb]()/k)),h=i[hb]());j>=G[ma]&&(h-=h%k,i[Nb](h));if(j===G[Ea])i[yb](i[Ga]()-i[zb]()+n(d,1));b=1;h=i[hb]();for(var d=i.getTime(),l=i[gb](),m=i[Ga](),i=g?0:(864E5+i.getTimezoneOffset()*6E4)%864E5;dc&&(c=a[b]);return c} +function ta(a,b){for(var c in a)a[c]&&a[c]!==b&&a[c].destroy&&a[c].destroy(),delete a[c]}function Sa(a){jb||(jb=X(na));a&&jb.appendChild(a);jb.innerHTML=""}function Za(a,b){var c="Highcharts error #"+a+": www.highcharts.com/errors/"+a;if(b)throw c;else S.console&&console.log(c)}function la(a){return parseFloat(a.toPrecision(14))}function Ia(a,b){$a=n(a,b.animation)}function Qb(){var a=P.global.useUTC,b=a?"getUTC":"get",c=a?"setUTC":"set";ib=a?Date.UTC:function(a,b,c,g,h,i){return(new Date(a,b,n(c, +1),n(g,0),n(h,0),n(i,0))).getTime()};wb=b+"Minutes";xb=b+"Hours";zb=b+"Day";Ga=b+"Date";gb=b+"Month";hb=b+"FullYear";Kb=c+"Minutes";Lb=c+"Hours";yb=c+"Date";Mb=c+"Month";Nb=c+"FullYear"}function Ja(){}function ab(a,b,c){this.axis=a;this.pos=b;this.type=c||"";this.isNew=!0;c||this.addLabel()}function Ab(a,b){this.axis=a;if(b)this.options=b,this.id=b.id;return this}function Rb(a,b,c,d,e,f){var g=a.chart.inverted;this.axis=a;this.isNegative=c;this.options=b;this.x=d;this.stack=e;this.percent=f==="percent"; +this.alignOptions={align:b.align||(g?c?"left":"right":"center"),verticalAlign:b.verticalAlign||(g?"middle":c?"bottom":"top"),y:n(b.y,g?4:c?14:-6),x:n(b.x,g?c?-6:6:0)};this.textAlign=b.textAlign||(g?c?"right":"left":"center")}function Ta(){this.init.apply(this,arguments)}function Bb(a,b){var c=b.borderWidth,d=b.style,e=A(d.padding);this.chart=a;this.options=b;this.crosshairs=[];this.now={x:0,y:0};this.isHidden=!0;this.label=a.renderer.label("",0,0,b.shape,null,null,b.useHTML,null,"tooltip").attr({padding:e, +fill:b.backgroundColor,"stroke-width":c,r:b.borderRadius,zIndex:8}).css(d).css({padding:0}).hide().add();aa||this.label.shadow(b.shadow);this.shared=b.shared}function Cb(a,b){var c=aa?"":b.chart.zoomType;this.zoomX=/x/.test(c);this.zoomY=/y/.test(c);this.options=b;this.chart=a;this.init(a,b.tooltip)}function Db(a){this.init(a)}function bb(){this.init.apply(this,arguments)}function Sb(a){var b=a.options,c=b.navigator,d=c.enabled,b=b.scrollbar,e=b.enabled,f=d?c.height:0,g=e?b.height:0,h=c.baseSeries; +this.baseSeries=a.series[h]||typeof h==="string"&&a.get(h)||a.series[0];this.handles=[];this.scrollbarButtons=[];this.elementsToDestroy=[];this.chart=a;this.height=f;this.scrollbarHeight=g;this.scrollbarEnabled=e;this.navigatorEnabled=d;this.navigatorOptions=c;this.scrollbarOptions=b;this.outlineHeight=f+g;this.init()}function Tb(a){this.init(a)}var v,I=document,S=window,L=Math,x=L.round,W=L.floor,Ka=L.ceil,w=L.max,K=L.min,U=L.abs,ba=L.cos,fa=L.sin,La=L.PI,kb=La*2/360,ua=navigator.userAgent,Ub=S.opera, +Pa=/msie/i.test(ua)&&!Ub,cb=I.documentMode===8,lb=/AppleWebKit/.test(ua),mb=/Firefox/.test(ua),nb=/(Mobile|Android|Windows Phone)/.test(ua),va="http://www.w3.org/2000/svg",ja=!!I.createElementNS&&!!I.createElementNS(va,"svg").createSVGRect,bc=mb&&parseInt(ua.split("Firefox/")[1],10)<4,aa=!ja&&!Pa&&!!I.createElement("canvas").getContext,Ua,wa=I.documentElement.ontouchstart!==v,Vb={},Eb=0,jb,P,xa,$a,Fb,G,db=function(){},Va=[],na="div",Y="none",Gb="rgba(192,192,192,"+(ja?1.0E-4:0.002)+")",fb="millisecond", +Xa="second",Ra="minute",ra="hour",da="day",Ea="week",Fa="month",ma="year",Hb="stroke-width",ib,wb,xb,zb,Ga,gb,hb,Kb,Lb,yb,Mb,Nb,R={};S.Highcharts={};xa=function(a,b,c){if(!s(b)||isNaN(b))return"Invalid date";var a=n(a,"%Y-%m-%d %H:%M:%S"),d=new Date(b),e,f=d[xb](),g=d[zb](),h=d[Ga](),i=d[gb](),j=d[hb](),k=P.lang,l=k.weekdays,b={a:l[g].substr(0,3),A:l[g],d:Da(h),e:h,b:k.shortMonths[i],B:k.months[i],m:Da(i+1),y:j.toString().substr(2,2),Y:j,H:Da(f),I:Da(f%12||12),l:f%12||12,M:Da(d[wb]()),p:f<12?"AM": +"PM",P:f<12?"am":"pm",S:Da(d.getSeconds()),L:Da(x(b%1E3),3)};for(e in b)for(;a.indexOf("%"+e)!==-1;)a=a.replace("%"+e,b[e]);return c?a.substr(0,1).toUpperCase()+a.substr(1):a};Ob.prototype={wrapColor:function(a){if(this.color>=a)this.color=0},wrapSymbol:function(a){if(this.symbol>=a)this.symbol=0}};G=ha(fb,1,Xa,1E3,Ra,6E4,ra,36E5,da,864E5,Ea,6048E5,Fa,26784E5,ma,31556952E3);Fb={init:function(a,b,c){var b=b||"",d=a.shift,e=b.indexOf("C")>-1,f=e?7:3,g,b=b.split(" "),c=[].concat(c),h,i,j=function(a){for(g= +a.length;g--;)a[g]==="M"&&a.splice(g+1,0,a[g+1],a[g+2],a[g+1],a[g+2])};e&&(j(b),j(c));a.isArea&&(h=b.splice(b.length-6,6),i=c.splice(c.length-6,6));if(d<=c.length/f)for(;d--;)c=[].concat(c).splice(0,f).concat(c);a.shift=0;if(b.length)for(a=c.length;b.length{point.key}
',pointFormat:'{series.name}: {point.y}
', +shadow:!0,shared:aa,snap:nb?25:10,style:{color:"#333333",fontSize:"12px",padding:"5px",whiteSpace:"nowrap"}},credits:{enabled:!0,text:"Highcharts.com",href:"http://www.highcharts.com",position:{align:"right",x:-10,verticalAlign:"bottom",y:-5},style:{cursor:"pointer",color:"#909090",fontSize:"10px"}}};var Q=P.plotOptions,N=Q.line;Qb();var ya=function(a){var b=[],c;(function(a){(c=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]?(?:\.[0-9]+)?)\s*\)/.exec(a))?b=[A(c[1]),A(c[2]), +A(c[3]),parseFloat(c[4],10)]:(c=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(a))&&(b=[A(c[1],16),A(c[2],16),A(c[3],16),1])})(a);return{get:function(c){return b&&!isNaN(b[0])?c==="rgb"?"rgb("+b[0]+","+b[1]+","+b[2]+")":c==="a"?b[3]:"rgba("+b.join(",")+")":a},brighten:function(a){if(Ba(a)&&a!==0){var c;for(c=0;c<3;c++)b[c]+=A(a*255),b[c]<0&&(b[c]=0),b[c]>255&&(b[c]=255)}return this},setOpacity:function(a){b[3]=a;return this}}};Ja.prototype={init:function(a,b){this.element=b==="span"?X(b): +I.createElementNS(va,b);this.renderer=a;this.attrSetters={}},animate:function(a,b,c){b=n(b,$a,!0);pb(this);if(b){b=z(b);if(c)b.complete=c;Ib(this,a,b)}else this.attr(a),c&&c()},attr:function(a,b){var c,d,e,f,g=this.element,h=g.nodeName.toLowerCase(),i=this.renderer,j,k=this.attrSetters,l=this.shadows,m,o,p=this;pa(a)&&s(b)&&(c=a,a={},a[c]=b);if(pa(a))c=a,h==="circle"?c={x:"cx",y:"cy"}[c]||c:c==="strokeWidth"&&(c="stroke-width"),p=F(g,c)||this[c]||0,c!=="d"&&c!=="visibility"&&(p=parseFloat(p));else for(c in a)if(j= +!1,d=a[c],e=k[c]&&k[c].call(this,d,c),e!==!1){e!==v&&(d=e);if(c==="d")d&&d.join&&(d=d.join(" ")),/(NaN| {2}|^$)/.test(d)&&(d="M 0 0");else if(c==="x"&&h==="text"){for(e=0;em&&/[ \-]/.test(b.textContent||b.innerText))H(b,{width:m+"px",display:"block",whiteSpace:"normal"}), +k=m;m=a.fontMetrics(b.style.fontSize).b;r=p<0&&-k;ga=o<0&&-l;t=p*o<0;r+=o*m*(t?1-h:h);ga-=p*m*(j?t?h:1-h:1);i&&(r-=k*h*(p<0?-1:1),j&&(ga-=l*h*(o<0?-1:1)),H(b,{textAlign:g}));this.xCorr=r;this.yCorr=ga}H(b,{left:e+r+"px",top:f+ga+"px"});if(lb)l=b.offsetHeight;this.cTT=M}}else this.alignOnAdd=!0},updateTransform:function(){var a=this.translateX||0,b=this.translateY||0,c=this.inverted,d=this.rotation,e=[];c&&(a+=this.attr("width"),b+=this.attr("height"));(a||b)&&e.push("translate("+a+","+b+")");c?e.push("rotate(90) scale(-1,1)"): +d&&e.push("rotate("+d+" "+(this.x||0)+" "+(this.y||0)+")");e.length&&F(this.element,"transform",e.join(" "))},toFront:function(){var a=this.element;a.parentNode.appendChild(a);return this},align:function(a,b,c){a?(this.alignOptions=a,this.alignByTranslate=b,c||this.renderer.alignedObjects.push(this)):(a=this.alignOptions,b=this.alignByTranslate);var c=n(c,this.renderer),d=a.align,e=a.verticalAlign,f=(c.x||0)+(a.x||0),g=(c.y||0)+(a.y||0),h={};if(d==="right"||d==="center")f+=(c.width-(a.width||0))/ +{right:1,center:2}[d];h[b?"translateX":"x"]=x(f);if(e==="bottom"||e==="middle")g+=(c.height-(a.height||0))/({bottom:1,middle:2}[e]||1);h[b?"translateY":"y"]=x(g);this[this.placed?"animate":"attr"](h);this.placed=!0;this.alignAttr=h;return this},getBBox:function(){var a=this.bBox,b=this.renderer,c,d=this.rotation;c=this.element;var e=this.styles,f=d*kb;if(!a){if(c.namespaceURI===va||b.forExport){try{a=c.getBBox?y({},c.getBBox()):{width:c.offsetWidth,height:c.offsetHeight}}catch(g){}if(!a||a.width< +0)a={width:0,height:0}}else a=this.htmlGetBBox();if(b.isSVG){b=a.width;c=a.height;if(Pa&&e&&e.fontSize==="11px"&&c===22.700000762939453)a.height=c=14;if(d)a.width=U(c*fa(f))+U(b*ba(f)),a.height=U(c*ba(f))+U(b*fa(f))}this.bBox=a}return a},show:function(){return this.attr({visibility:"visible"})},hide:function(){return this.attr({visibility:"hidden"})},add:function(a){var b=this.renderer,c=a||b,d=c.element||b.box,e=d.childNodes,f=this.element,g=F(f,"zIndex"),h;if(a)this.parentGroup=a;this.parentInverted= +a&&a.inverted;this.textStr!==void 0&&b.buildText(this);if(g)c.handleZ=!0,g=A(g);if(c.handleZ)for(c=0;cg||!s(g)&&s(b))){d.insertBefore(f,a);h=!0;break}h||d.appendChild(f);this.added=!0;J(this,"add");return this},safeRemoveChild:function(a){var b=a.parentNode;b&&b.removeChild(a)},destroy:function(){var a=this,b=a.element||{},c=a.shadows,d,e;b.onclick=b.onmouseout=b.onmouseover=b.onmousemove=null;pb(a);if(a.clipPath)a.clipPath=a.clipPath.destroy(); +if(a.stops){for(e=0;e/g,'').replace(/<(i|em)>/g,'').replace(//g,"").split(//g),d=b.childNodes,e=/style="([^"]+)"/,f=/href="([^"]+)"/,g=F(b,"x"),h=a.styles,i=h&&h.width&&A(h.width),j=h&&h.lineHeight,k,h=d.length,l=[];h--;)b.removeChild(d[h]);i&&!a.added&&this.box.appendChild(b);c[c.length-1]===""&&c.pop();q(c,function(c,d){var h,t=0,r,c=c.replace(//g,"|||");h=c.split("|||");q(h,function(c){if(c!==""||h.length===1){var m={},n=I.createElementNS(va,"tspan"),q;e.test(c)&& +(q=c.match(e)[1].replace(/(;| |^)color([ :])/,"$1fill$2"),F(n,"style",q));f.test(c)&&(F(n,"onclick",'location.href="'+c.match(f)[1]+'"'),H(n,{cursor:"pointer"}));c=(c.replace(/<(.|\n)*?>/g,"")||" ").replace(/</g,"<").replace(/>/g,">");n.appendChild(I.createTextNode(c));t?m.dx=3:m.x=g;if(!t){if(d){!ja&&a.renderer.forExport&&H(n,{display:"block"});r=S.getComputedStyle&&A(S.getComputedStyle(k,null).getPropertyValue("line-height"));if(!r||isNaN(r)){var D;if(!(D=j))if(!(D=k.offsetHeight))l[d]=b.getBBox? +b.getBBox().height:a.renderer.fontMetrics(b.style.fontSize).h,D=x(l[d]-(l[d-1]||0))||18;r=D}F(n,"dy",r)}k=n}F(n,m);b.appendChild(n);t++;if(i)for(var c=c.replace(/([^\^])-/g,"$1- ").split(" "),B=[];c.length||B.length;)delete a.bBox,D=a.getBBox().width,m=D>i,!m||c.length===1?(c=B,B=[],c.length&&(n=I.createElementNS(va,"tspan"),F(n,{dy:j||16,x:g}),q&&F(n,"style",q),b.appendChild(n),D>i&&(i=D))):(n.removeChild(n.firstChild),B.unshift(c.pop())),c.length&&n.appendChild(I.createTextNode(c.join(" ").replace(/- /g, +"-")))}})})},button:function(a,b,c,d,e,f,g){var h=this.label(a,b,c),i=0,j,k,l,m,o,a={x1:0,y1:0,x2:0,y2:1},e=z(ha(Hb,1,"stroke","#999","fill",ha("linearGradient",a,"stops",[[0,"#FFF"],[1,"#DDD"]]),"r",3,"padding",3,"style",ha("color","black")),e);l=e.style;delete e.style;f=z(e,ha("stroke","#68A","fill",ha("linearGradient",a,"stops",[[0,"#FFF"],[1,"#ACF"]])),f);m=f.style;delete f.style;g=z(e,ha("stroke","#68A","fill",ha("linearGradient",a,"stops",[[0,"#9BD"],[1,"#CDF"]])),g);o=g.style;delete g.style; +C(h.element,"mouseenter",function(){h.attr(f).css(m)});C(h.element,"mouseleave",function(){j=[e,f,g][i];k=[l,m,o][i];h.attr(j).css(k)});h.setState=function(a){(i=a)?a===2&&h.attr(g).css(o):h.attr(e).css(l)};return h.on("click",function(){d.call(h)}).attr(e).css(y({cursor:"default"},l))},crispLine:function(a,b){a[1]===a[4]&&(a[1]=a[4]=x(a[1])-b%2/2);a[2]===a[5]&&(a[2]=a[5]=x(a[2])+b%2/2);return a},path:function(a){var b={fill:Y};Wa(a)?b.d=a:ea(a)&&y(b,a);return this.createElement("path").attr(b)}, +circle:function(a,b,c){a=ea(a)?a:{x:a,y:b,r:c};return this.createElement("circle").attr(a)},arc:function(a,b,c,d,e,f){if(ea(a))b=a.y,c=a.r,d=a.innerR,e=a.start,f=a.end,a=a.x;return this.symbol("arc",a||0,b||0,c||0,c||0,{innerR:d||0,start:e||0,end:f||0})},rect:function(a,b,c,d,e,f){e=ea(a)?a.r:e;e=this.createElement("rect").attr({rx:e,ry:e,fill:Y});return e.attr(ea(a)?a:e.crisp(f,a,b,w(c,0),w(d,0)))},setSize:function(a,b,c){var d=this.alignedObjects,e=d.length;this.width=a;this.height=b;for(this.boxWrapper[n(c, +!0)?"animate":"attr"]({width:a,height:b});e--;)d[e].align()},g:function(a){var b=this.createElement("g");return s(a)?b.attr({"class":"highcharts-"+a}):b},image:function(a,b,c,d,e){var f={preserveAspectRatio:Y};arguments.length>1&&y(f,{x:b,y:c,width:d,height:e});f=this.createElement("image").attr(f);f.element.setAttributeNS?f.element.setAttributeNS("http://www.w3.org/1999/xlink","href",a):f.element.setAttribute("hc-svg-href",a);return f},symbol:function(a,b,c,d,e,f){var g,h=this.symbols[a],h=h&&h(x(b), +x(c),d,e,f),i=/^url\((.*?)\)$/,j,k;h?(g=this.path(h),y(g,{symbolName:a,x:b,y:c,width:d,height:e}),f&&y(g,f)):i.test(a)&&(k=function(a,b){a.element&&(a.attr({width:b[0],height:b[1]}),a.alignByTranslate||a.translate(x((d-b[0])/2),x((e-b[1])/2)))},j=a.match(i)[1],a=Vb[j],g=this.image(j).attr({x:b,y:c}),a?k(g,a):(g.attr({width:0,height:0}),X("img",{onload:function(){k(g,Vb[j]=[this.width,this.height])},src:j})));return g},symbols:{circle:function(a,b,c,d){var e=0.166*c;return["M",a+c/2,b,"C",a+c+e,b, +a+c+e,b+d,a+c/2,b+d,"C",a-e,b+d,a-e,b,a+c/2,b,"Z"]},square:function(a,b,c,d){return["M",a,b,"L",a+c,b,a+c,b+d,a,b+d,"Z"]},triangle:function(a,b,c,d){return["M",a+c/2,b,"L",a+c,b+d,a,b+d,"Z"]},"triangle-down":function(a,b,c,d){return["M",a,b,"L",a+c,b,a+c/2,b+d,"Z"]},diamond:function(a,b,c,d){return["M",a+c/2,b,"L",a+c,b+d/2,a+c/2,b+d,a,b+d/2,"Z"]},arc:function(a,b,c,d,e){var f=e.start,c=e.r||c||d,g=e.end-1.0E-6,d=e.innerR,h=e.open,i=ba(f),j=fa(f),k=ba(g),g=fa(g),e=e.end-f');if(b)c=b===na||b==="span"||b==="img"?c.join(""):a.prepVML(c),this.element=X(c);this.renderer=a;this.attrSetters={}},add:function(a){var b=this.renderer,c=this.element,d=b.box,d=a?a.element||a:d;a&&a.inverted&&b.invertChild(c,d);d.appendChild(c);this.added=!0;this.alignOnAdd&&!this.deferUpdateTransform&&this.updateTransform();J(this,"add");return this}, +updateTransform:Ja.prototype.htmlUpdateTransform,attr:function(a,b){var c,d,e,f=this.element||{},g=f.style,h=f.nodeName,i=this.renderer,j=this.symbolName,k,l=this.shadows,m,o=this.attrSetters,p=this;pa(a)&&s(b)&&(c=a,a={},a[c]=b);if(pa(a))c=a,p=c==="strokeWidth"||c==="stroke-width"?this.strokeweight:this[c];else for(c in a)if(d=a[c],m=!1,e=o[c]&&o[c].call(this,d,c),e!==!1&&d!==null){e!==v&&(d=e);if(j&&/^(x|y|r|start|end|width|height|innerR|anchorX|anchorY)/.test(c))k||(this.symbolAttr(a),k=!0),m= +!0;else if(c==="d"){d=d||[];this.d=d.join(" ");e=d.length;for(m=[];e--;)m[e]=Ba(d[e])?x(d[e]*10)-5:d[e]==="Z"?"x":d[e];d=m.join(" ")||"x";f.path=d;if(l)for(e=l.length;e--;)l[e].path=l[e].cutOff?this.cutOffPath(d,l[e].cutOff):d;m=!0}else if(c==="visibility"){if(l)for(e=l.length;e--;)l[e].style[c]=d;h==="DIV"&&(d=d==="hidden"?"-999em":0,c="top");g[c]=d;m=!0}else if(c==="zIndex")d&&(g[c]=d),m=!0;else if(c==="width"||c==="height")d=w(0,d),this[c]=d,this.updateClipping?(this[c]=d,this.updateClipping()): +g[c]=d,m=!0;else if(c==="x"||c==="y")this[c]=d,g[{x:"left",y:"top"}[c]]=d;else if(c==="class")f.className=d;else if(c==="stroke")d=i.color(d,f,c),c="strokecolor";else if(c==="stroke-width"||c==="strokeWidth")f.stroked=d?!0:!1,c="strokeweight",this[c]=d,Ba(d)&&(d+="px");else if(c==="dashstyle")(f.getElementsByTagName("stroke")[0]||X(i.prepVML([""]),null,null,f))[c]=d||"solid",this.dashstyle=d,m=!0;else if(c==="fill")if(h==="SPAN")g.color=d;else{if(h!=="IMG")f.filled=d!==Y?!0:!1,d=i.color(d, +f,c,this),c="fillcolor"}else if(h==="shape"&&c==="rotation")this[c]=d,f.style.left=-x(fa(d*kb)+1)+"px",f.style.top=x(ba(d*kb))+"px";else if(c==="translateX"||c==="translateY"||c==="rotation")this[c]=d,this.updateTransform(),m=!0;else if(c==="text")this.bBox=null,f.innerHTML=d,m=!0;m||(cb?f[c]=d:F(f,c,d))}return p},clip:function(a){var b=this,c,d=b.element,e=d.parentNode;a?(c=a.members,Ca(c,b),c.push(b),b.destroyClip=function(){Ca(c,b)},e&&e.className==="highcharts-tracker"&&!cb&&H(d,{visibility:"hidden"}), +a=a.getCSS(b)):(b.destroyClip&&b.destroyClip(),a={clip:cb?"inherit":"rect(auto)"});return b.css(a)},css:Ja.prototype.htmlCss,safeRemoveChild:function(a){a.parentNode&&Sa(a)},destroy:function(){this.destroyClip&&this.destroyClip();return Ja.prototype.destroy.apply(this)},empty:function(){for(var a=this.element.childNodes,b=a.length,c;b--;)c=a[b],c.parentNode.removeChild(c)},on:function(a,b){this.element["on"+a]=function(){var a=S.event;a.target=a.srcElement;b(a)};return this},cutOffPath:function(a, +b){var c,a=a.split(/[ ,]/);c=a.length;if(c===9||c===11)a[c-4]=a[c-2]=A(a[c-2])-10*b;return a.join(" ")},shadow:function(a,b,c){var d=[],e,f=this.element,g=this.renderer,h,i=f.style,j,k=f.path,l,m,o,p;k&&typeof k.value!=="string"&&(k="x");m=k;if(a){o=n(a.width,3);p=(a.opacity||0.15)/o;for(e=1;e<=3;e++){l=o*2+1-2*e;c&&(m=this.cutOffPath(k.value,l+0.5));j=[''];h=X(g.prepVML(j),null, +{left:A(i.left)+n(a.offsetX,1),top:A(i.top)+n(a.offsetY,1)});if(c)h.cutOff=l+1;j=[''];X(g.prepVML(j),null,null,h);b?b.element.appendChild(h):f.parentNode.insertBefore(h,f);d.push(h)}this.shadows=d}return this}},ca=$(Ja,ca),ca={Element:ca,isIE8:ua.indexOf("MSIE 8.0")>-1,init:function(a,b,c){var d,e;this.alignedObjects=[];d=this.createElement(na);e=d.element;e.style.position="relative";a.appendChild(d.element);this.box=e;this.boxWrapper=d;this.setSize(b, +c,!1);if(!I.namespaces.hcv)I.namespaces.add("hcv","urn:schemas-microsoft-com:vml"),I.createStyleSheet().cssText="hcv\\:fill, hcv\\:path, hcv\\:shape, hcv\\:stroke{ behavior:url(#default#VML); display: inline-block; } "},isHidden:function(){return!this.box.offsetWidth},clipRect:function(a,b,c,d){var e=this.createElement(),f=ea(a);return y(e,{members:[],left:f?a.x:a,top:f?a.y:b,width:f?a.width:c,height:f?a.height:d,getCSS:function(a){var b=a.inverted,c=this.top,d=this.left,e=d+this.width,f=c+this.height, +c={clip:"rect("+x(b?d:c)+"px,"+x(b?f:e)+"px,"+x(b?e:f)+"px,"+x(b?c:d)+"px)"};!b&&cb&&a.element.nodeName!=="IMG"&&y(c,{width:e+"px",height:f+"px"});return c},updateClipping:function(){q(e.members,function(a){a.css(e.getCSS(a))})}})},color:function(a,b,c,d){var e=this,f,g=/^rgba/,h,i,j=Y;a&&a.linearGradient?i="gradient":a&&a.radialGradient&&(i="pattern");if(i){var k,l,m=a.linearGradient||a.radialGradient,o,p,t,r,n,M="",a=a.stops,u,v=[],D=function(){h=[''];X(e.prepVML(h),null,null,b)};o=a[0];u=a[a.length-1];o[0]>0&&a.unshift([0,o[1]]);u[0]<1&&a.push([1,u[1]]);q(a,function(a,b){g.test(a[1])?(f=ya(a[1]),k=f.get("rgb"),l=f.get("a")):(k=a[1],l=1);v.push(a[0]*100+"% "+k);b?(t=l,r=k):(p=l,n=k)});if(c==="fill")if(i==="gradient")c=m.x1||m[0]||0,a=m.y1||m[1]||0,o=m.x2||m[2]||0,m=m.y2||m[3]||0,M='angle="'+(90-L.atan((m-a)/(o-c))*180/La)+'"',D();else{var j=m.r,B=j*2,Z=j*2,s=m.cx,w=m.cy,x=b.radialReference, +z,j=function(){x&&(z=d.getBBox(),s+=(x[0]-z.x)/z.width-0.5,w+=(x[1]-z.y)/z.height-0.5,B*=x[2]/z.width,Z*=x[2]/z.height);M='src="'+P.global.VMLRadialGradientURL+'" size="'+B+","+Z+'" origin="0.5,0.5" position="'+s+","+w+'" color2="'+n+'" ';D()};d.added?j():C(d,"add",j);j=r}else j=k}else if(g.test(a)&&b.tagName!=="IMG")f=ya(a),h=["<",c,' opacity="',f.get("a"),'"/>'],X(this.prepVML(h),null,null,b),j=f.get("rgb");else{j=b.getElementsByTagName(c);if(j.length)j[0].opacity=1;j=a}return j},prepVML:function(a){var b= +this.isIE8,a=a.join("");b?(a=a.replace("/>",' xmlns="urn:schemas-microsoft-com:vml" />'),a=a.indexOf('style="')===-1?a.replace("/>",' style="display:inline-block;behavior:url(#default#VML);" />'):a.replace('style="','style="display:inline-block;behavior:url(#default#VML);')):a=a.replace("<","1&&f.attr({x:b,y:c,width:d,height:e});return f},rect:function(a,b,c,d,e,f){if(ea(a))b=a.y,c=a.width,d=a.height,f=a.strokeWidth,a=a.x;var g=this.symbol("rect");g.r=e;return g.attr(g.crisp(f,a,b,w(c,0),w(d,0)))},invertChild:function(a,b){var c=b.style;H(a,{flip:"x", +left:A(c.width)-1,top:A(c.height)-1,rotation:-90})},symbols:{arc:function(a,b,c,d,e){var f=e.start,g=e.end,h=e.r||c||d,c=ba(f),d=fa(f),i=ba(g),j=fa(g),k=e.innerR,l=0.08/h,m=k&&0.1/k||0;if(g-f===0)return["x"];else 2*La-g+fj&&(c=!1)):h+k>m&&(h=m-k,d&&h+l0&&b.height>0){f=z({align:c&&k&&"center",x:c?!k&&4:10,verticalAlign:!c&&k&&"middle",y:c?k?16:10:k?6:-4,rotation:c&&!k&&90},f);if(!g)a.label=g=u.text(f.text,0,0).attr({align:f.textAlign||f.align,rotation:f.rotation,zIndex:q}).css(f.style).add();b=[p[1],p[4],n(p[6],p[1])];p=[p[2],p[5],n(p[7],p[2])];c=Ha(b);k=Ha(p);g.align(f,!1,{x:c,y:k,width:sa(b)-c,height:sa(p)-k});g.show()}else g&&g.hide();return a},destroy:function(){Ca(this.axis.plotLinesAndBands, +this);ta(this,this.axis)}};Rb.prototype={destroy:function(){ta(this,this.axis)},setTotal:function(a){this.cum=this.total=a},render:function(a){var b=this.options.formatter.call(this);this.label?this.label.attr({text:b,visibility:"hidden"}):this.label=this.axis.chart.renderer.text(b,0,0).css(this.options.style).attr({align:this.textAlign,rotation:this.options.rotation,visibility:"hidden"}).add(a)},setOffset:function(a,b){var c=this.axis,d=c.chart,e=d.inverted,f=this.isNegative,g=c.translate(this.percent? +100:this.total,0,0,0,1),c=c.translate(0),c=U(g-c),h=d.xAxis[0].translate(this.x)+a,i=d.plotHeight,f={x:e?f?g:g-c:h,y:e?i-h-b:f?i-g-c:i-g,width:e?c:b,height:e?b:c};if(e=this.label)e.align(this.alignOptions,null,f),f=e.alignAttr,e.attr({visibility:this.options.crop===!1||d.isInsidePlot(f.x,f.y)?ja?"inherit":"visible":"hidden"})}};Ta.prototype={defaultOptions:{dateTimeLabelFormats:{millisecond:"%H:%M:%S.%L",second:"%H:%M:%S",minute:"%H:%M",hour:"%H:%M",day:"%e. %b",week:"%e. %b",month:"%b '%y",year:"%Y"}, +endOnTick:!1,gridLineColor:"#C0C0C0",labels:E,lineColor:"#C0D0E0",lineWidth:1,minPadding:0.01,maxPadding:0.01,minorGridLineColor:"#E0E0E0",minorGridLineWidth:1,minorTickColor:"#A0A0A0",minorTickLength:2,minorTickPosition:"outside",startOfWeek:1,startOnTick:!1,tickColor:"#C0D0E0",tickLength:5,tickmarkPlacement:"between",tickPixelInterval:100,tickPosition:"outside",tickWidth:1,title:{align:"middle",style:{color:"#6D869F",fontWeight:"bold"}},type:"linear"},defaultYAxisOptions:{endOnTick:!0,gridLineWidth:1, +tickPixelInterval:72,showLastLabel:!0,labels:{align:"right",x:-8,y:3},lineWidth:0,maxPadding:0.05,minPadding:0.05,startOnTick:!0,tickWidth:0,title:{rotation:270,text:"Y-values"},stackLabels:{enabled:!1,formatter:function(){return this.total},style:E.style}},defaultLeftAxisOptions:{labels:{align:"right",x:-8,y:null},title:{rotation:270}},defaultRightAxisOptions:{labels:{align:"left",x:8,y:null},title:{rotation:90}},defaultBottomAxisOptions:{labels:{align:"center",x:0,y:14},title:{rotation:0}},defaultTopAxisOptions:{labels:{align:"center", +x:0,y:-5},title:{rotation:0}},init:function(a,b){var c=b.isX;this.horiz=a.inverted?!c:c;this.xOrY=(this.isXAxis=c)?"x":"y";this.opposite=b.opposite;this.side=this.horiz?this.opposite?0:2:this.opposite?1:3;this.setOptions(b);var d=this.options,e=d.type,f=e==="datetime";this.labelFormatter=d.labels.formatter||this.defaultLabelFormatter;this.staggerLines=this.horiz&&d.labels.staggerLines;this.userOptions=b;this.minPixelPadding=0;this.chart=a;this.reversed=d.reversed;this.categories=d.categories;this.isLog= +e==="logarithmic";this.isLinked=s(d.linkedTo);this.isDatetimeAxis=f;this.tickmarkOffset=d.categories&&d.tickmarkPlacement==="between"?0.5:0;this.ticks={};this.minorTicks={};this.plotLinesAndBands=[];this.alternateBands={};this.len=0;this.minRange=this.userMinRange=d.minRange||d.maxZoom;this.range=d.range;this.offset=d.offset||0;this.stacks={};this.min=this.max=null;var g,d=this.options.events;a.axes.push(this);a[c?"xAxis":"yAxis"].push(this);this.series=[];if(a.inverted&&c&&this.reversed===v)this.reversed= +!0;this.removePlotLine=this.removePlotBand=this.removePlotBandOrLine;this.addPlotLine=this.addPlotBand=this.addPlotBandOrLine;for(g in d)C(this,g,d[g]);if(this.isLog)this.val2lin=qa,this.lin2val=ia},setOptions:function(a){this.options=z(this.defaultOptions,this.isXAxis?{}:this.defaultYAxisOptions,[this.defaultTopAxisOptions,this.defaultRightAxisOptions,this.defaultBottomAxisOptions,this.defaultLeftAxisOptions][this.side],z(P[this.isXAxis?"xAxis":"yAxis"],a))},defaultLabelFormatter:function(){var a= +this.axis,b=this.value,c=this.dateTimeLabelFormat,d=P.lang.numericSymbols,e=d&&d.length,f,g=a.isLog?b:a.tickInterval;if(a.categories)f=b;else if(c)f=xa(c,b);else if(e&&g>=1E3)for(;e--&&f===v;)a=Math.pow(1E3,e+1),g>=a&&d[e]!==null&&(f=Qa(b/a,-1)+d[e]);f===v&&(f=b>=1E3?Qa(b,0):Qa(b,-1));return f},getSeriesExtremes:function(){var a=this,b=a.chart,c=a.stacks,d=[],e=[],f;a.hasVisibleSeries=!1;a.dataMin=a.dataMax=null;q(a.series,function(g){if(g.visible||!b.options.chart.ignoreHiddenSeries){var h=g.options, +i,j,k,l,m,o,p,t,r,q=h.threshold,M,u=[],x=0;a.hasVisibleSeries=!0;if(a.isLog&&q<=0)q=h.threshold=null;if(a.isXAxis){if(h=g.xData,h.length)a.dataMin=K(n(a.dataMin,h[0]),Ha(h)),a.dataMax=w(n(a.dataMax,h[0]),sa(h))}else{var D,B,Z,z=g.cropped,y=g.xAxis.getExtremes(),eb=!!g.modifyValue;i=h.stacking;a.usePercentage=i==="percent";if(i)m=h.stack,l=g.type+n(m,""),o="-"+l,g.stackKey=l,j=d[l]||[],d[l]=j,k=e[o]||[],e[o]=k;if(a.usePercentage)a.dataMin=0,a.dataMax=99;h=g.processedXData;p=g.processedYData;M=p.length; +for(f=0;f=y.min&&(h[f-1]||t)<=y.max))if(t=r.length)for(;t--;)r[t]!==null&&(u[x++]=r[t]);else u[x++]=r;if(!a.usePercentage&&u.length)a.dataMin=K(n(a.dataMin,u[0]),Ha(u)),a.dataMax=w(n(a.dataMax,u[0]),sa(u));if(s(q))if(a.dataMin>=q)a.dataMin=q,a.ignoreMinPadding= +!0;else if(a.dataMaxe+this.width)l=!0}else if(c=e,h=k-this.right,gf+this.height)l=!0;return l?null:d.renderer.crispLine(["M",c,g,"L",h,i],b||0)},getPlotBandPath:function(a,b){var c=this.getPlotLinePath(b),d=this.getPlotLinePath(a);d&&c?d.push(c[4],c[5],c[1],c[2]):d=null;return d},getLinearTickPositions:function(a, +b,c){for(var d,b=la(W(b/a)*a),c=la(Ka(c/a)*a),e=[];b<=c;){e.push(b);b=la(b+a);if(b===d)break;d=b}return e},getLogTickPositions:function(a,b,c,d){var e=this.options,f=this.len,g=[];if(!d)this._minorAutoInterval=null;if(a>=0.5)a=x(a),g=this.getLinearTickPositions(a,b,c);else if(a>=0.08)for(var f=W(b),h,i,j,k,l,e=a>0.3?[1,2,4]:a>0.15?[1,2,4,6,8]:[1,2,3,4,5,6,7,8,9];fb&&g.push(k),k>c&&(l=!0),k=j}else if(b=ia(b),c=ia(c),a=e[d?"minorTickInterval": +"tickInterval"],a=n(a==="auto"?null:a,this._minorAutoInterval,(c-b)*(e.tickPixelInterval/(d?5:1))/((d?f/this.tickPositions.length:f)||1)),a=ub(a,null,L.pow(10,W(L.log(a)/L.LN10))),g=Ma(this.getLinearTickPositions(a,b,c),qa),!d)this._minorAutoInterval=a/5;if(!d)this.tickInterval=a;return g},getMinorTickPositions:function(){var a=this.options,b=this.tickPositions,c=this.minorTickInterval,d=[],e;if(this.isLog){e=b.length;for(a=1;a=this.minRange,f,g,h,i,j;if(this.isXAxis&&this.minRange===v&&!this.isLog)s(a.min)||s(a.max)?this.minRange=null:(q(this.series,function(a){i=a.xData;for(g=j=a.xIncrement?1:i.length-1;g>0;g--)if(h=i[g]-i[g-1],f===v||h0||!b.ignoreMaxPadding))b.max+=c*j}b.tickInterval=b.min===b.max||b.min===void 0||b.max===void 0?1:h&&!l&&o===b.linkedParent.options.tickPixelInterval?b.linkedParent.tickInterval:n(l,p?1:(b.max-b.min)*o/(b.len||1));g&&!a&&q(b.series,function(a){a.processData(b.min!==b.oldMin||b.max!==b.oldMax)});b.setAxisTranslation(a); +b.beforeSetTickPositions&&b.beforeSetTickPositions();if(b.postProcessTickInterval)b.tickInterval=b.postProcessTickInterval(b.tickInterval);if(!l&&b.tickIntervale&&i.shift(),d.endOnTick?b.max=f:b.max+hb[d]&&this.options.alignTicks!==!1)b[d]=c.length;a.maxTicks=b},adjustTickAmount:function(){var a=this.xOrY,b=this.tickPositions,c=this.chart.maxTicks;if(c&&c[a]&&!this.isDatetimeAxis&&!this.categories&&!this.isLinked&&this.options.alignTicks!==!1){var d=this.tickAmount,e=b.length;this.tickAmount=a=c[a];if(ea||a===null?a=c:b=a.min&&b<=a.max)j[b]||(j[b]=new ab(a,b)),n&&j[b].isNew&&j[b].render(c,!0),j[b].isActive=!0,j[b].render(c)}),o&&q(g,function(b,c){if(c%2===0&&b1||U(b-f.y)>1))clearTimeout(this.tooltipTimeout),this.tooltipTimeout=setTimeout(function(){e&&e.move(a,b,c,d)},32)},hide:function(){if(!this.isHidden){var a=this.chart.hoverPoints;this.label.hide();a&&q(a,function(a){a.setState()});this.chart.hoverPoints=null;this.isHidden=!0}},hideCrosshairs:function(){q(this.crosshairs, +function(a){a&&a.hide()})},getAnchor:function(a,b){var c,d=this.chart,e=d.inverted,f=0,g=0,h,a=ka(a);c=a[0].tooltipPos;c||(q(a,function(a){h=a.series.yAxis;f+=a.plotX;g+=(a.plotLow?(a.plotLow+a.plotHigh)/2:a.plotY)+(!e&&h?h.top-d.plotTop:0)}),f/=a.length,g/=a.length,c=[e?d.plotWidth-g:f,this.shared&&!e&&a.length>1&&b?b.chartY-d.plotTop:e?d.plotHeight-f:g]);return Ma(c,x)},getPosition:function(a,b,c){var d=this.chart,e=d.plotLeft,f=d.plotTop,g=d.plotWidth,h=d.plotHeight,i=n(this.options.distance,12), +j=c.plotX,c=c.plotY,d=j+e+(d.inverted?i:-a-i),k=c-b+f+15,l;d<7&&(d=e+w(j,0)+i);d+a>e+g&&(d-=d+a-(e+g),k=c-b+f-i,l=!0);k=k&&c<=k+b&&(k=c+f+i));k+b>f+h&&(k=w(f,f+h-b-i));return{x:d,y:k}},refresh:function(a,b){function c(){var a=this.points||ka(this),b=a[0].series,c;c=[b.tooltipHeaderFormatter(a[0].key)];q(a,function(a){b=a.series;c.push(b.tooltipFormatter&&b.tooltipFormatter(a)||a.point.tooltipFormatter(b.tooltipOptions.pointFormat))});c.push(f.footerFormat||"");return c.join("")} +var d=this.chart,e=this.label,f=this.options,g,h,i,j={},k,l=[];k=f.formatter||c;var j=d.hoverPoints,m,o=f.crosshairs;i=this.shared;h=this.getAnchor(a,b);g=h[0];h=h[1];i&&(!a.series||!a.series.noSharedTooltip)?(d.hoverPoints=a,j&&q(j,function(a){a.setState()}),q(a,function(a){a.setState("hover");l.push(a.getLabelConfig())}),j={x:a[0].category,y:a[0].y},j.points=l,a=a[0]):j=a.getLabelConfig();k=k.call(j);j=a.series;i=i||!j.isCartesian||j.tooltipOutsidePlot||d.isInsidePlot(g,h);k===!1||!i?this.hide(): +(this.isHidden&&e.show(),e.attr({text:k}),m=f.borderColor||a.color||j.color||"#606060",e.attr({stroke:m}),e=(f.positioner||this.getPosition).call(this,e.width,e.height,{plotX:g,plotY:h}),this.move(x(e.x),x(e.y),g+d.plotLeft,h+d.plotTop),this.isHidden=!1);if(o){o=ka(o);for(e=o.length;e--;)if(i=a.series[e?"yAxis":"xAxis"],o[e]&&i)if(i=i.getPlotLinePath(e?n(a.stackY,a.y):a.x,1),this.crosshairs[e])this.crosshairs[e].attr({d:i,visibility:"visible"});else{j={"stroke-width":o[e].width||1,stroke:o[e].color|| +"#C0C0C0",zIndex:o[e].zIndex||2};if(o[e].dashStyle)j.dashstyle=o[e].dashStyle;this.crosshairs[e]=d.renderer.path(i).attr(j).add()}}J(d,"tooltipRefresh",{text:k,x:g+d.plotLeft,y:h+d.plotTop,borderColor:m})}};Cb.prototype={normalizeMouseEvent:function(a){var b,c,d,a=a||S.event;if(!a.target)a.target=a.srcElement;a=Xb(a);d=a.touches?a.touches.item(0):a;this.chartPosition=b=ec(this.chart.container);d.pageX===v?(c=a.x,b=a.y):(c=d.pageX-b.left,b=d.pageY-b.top);return y(a,{chartX:x(c),chartY:x(b)})},getMouseCoordinates:function(a){var b= +{xAxis:[],yAxis:[]},c=this.chart;q(c.axes,function(d){var e=d.isXAxis;b[e?"xAxis":"yAxis"].push({axis:d,value:d.translate(((c.inverted?!e:e)?a.chartX-c.plotLeft:d.top+d.len-a.chartY)-d.minPixelPadding,!0)})});return b},getIndex:function(a){var b=this.chart;return b.inverted?b.plotHeight+b.plotTop-a.chartY:a.chartX-b.plotLeft},onmousemove:function(a){var b=this.chart,c=b.series,d=b.tooltip,e,f=b.hoverPoint,g=b.hoverSeries,h,i,j=b.chartWidth,k=this.getIndex(a);if(d&&this.options.tooltip.shared&&(!g|| +!g.noSharedTooltip)){e=[];h=c.length;for(i=0;ij&&e.splice(h,1);if(e.length&&e[0].plotX!==this.hoverX)d.refresh(e,a),this.hoverX=e[0].plotX}if(g&&g.tracker&&(b=g.tooltipPoints[k])&&b!==f)b.onMouseOver()},resetTracker:function(a){var b=this.chart, +c=b.hoverSeries,d=b.hoverPoint,e=b.tooltip,b=e&&e.shared?b.hoverPoints:d;(a=a&&e&&b)&&ka(b)[0].plotX===v&&(a=!1);if(a)e.refresh(b);else{if(d)d.onMouseOut();if(c)c.onMouseOut();e&&(e.hide(),e.hideCrosshairs());this.hoverX=null}},setDOMEvents:function(){function a(){if(b.selectionMarker){var f={xAxis:[],yAxis:[]},g=b.selectionMarker.getBBox(),h=g.x-c.plotLeft,l=g.y-c.plotTop,m;e&&(q(c.axes,function(a){if(a.options.zoomEnabled!==!1){var b=a.isXAxis,d=c.inverted?!b:b,e=a.translate(d?h:c.plotHeight-l- +g.height,!0,0,0,1),d=a.translate((d?h+g.width:c.plotHeight-l)-2*a.minPixelPadding,!0,0,0,1);!isNaN(e)&&!isNaN(d)&&(f[b?"xAxis":"yAxis"].push({axis:a,min:K(e,d),max:w(e,d)}),m=!0)}}),m&&J(c,"selection",f,function(a){c.zoom(a)}));b.selectionMarker=b.selectionMarker.destroy()}if(c)H(d,{cursor:"auto"}),c.cancelClick=e,c.mouseIsDown=e=!1;O(I,"mouseup",a);wa&&O(I,"touchend",a)}var b=this,c=b.chart,d=c.container,e,f=b.zoomX&&!c.inverted||b.zoomY&&c.inverted,g=b.zoomY&&!c.inverted||b.zoomX&&c.inverted;b.hideTooltipOnMouseMove= +function(a){a=Xb(a);b.chartPosition&&c.hoverSeries&&c.hoverSeries.isCartesian&&!c.isInsidePlot(a.pageX-b.chartPosition.left-c.plotLeft,a.pageY-b.chartPosition.top-c.plotTop)&&b.resetTracker()};b.hideTooltipOnMouseLeave=function(){b.resetTracker();b.chartPosition=null};d.onmousedown=function(d){d=b.normalizeMouseEvent(d);d.type.indexOf("touch")===-1&&d.preventDefault&&d.preventDefault();c.mouseIsDown=!0;c.cancelClick=!1;c.mouseDownX=b.mouseDownX=d.chartX;b.mouseDownY=d.chartY;C(I,"mouseup",a);wa&& +C(I,"touchend",a)};var h=function(a){if(!a||!(a.touches&&a.touches.length>1)){var a=b.normalizeMouseEvent(a),d=a.type,h=a.chartX,l=a.chartY,m=!c.isInsidePlot(h-c.plotLeft,l-c.plotTop);if(d.indexOf("touch")===-1)a.returnValue=!1;d==="touchstart"&&(F(a.target,"isTracker")?c.runTrackerClick||a.preventDefault():!c.runChartClick&&!m&&a.preventDefault());if(m)hc.plotLeft+c.plotWidth&&(h=c.plotLeft+c.plotWidth),lc.plotTop+c.plotHeight&&(l=c.plotTop+c.plotHeight); +if(c.mouseIsDown&&d!=="touchstart"&&(e=Math.sqrt(Math.pow(b.mouseDownX-h,2)+Math.pow(b.mouseDownY-l,2)),e>10)){d=c.isInsidePlot(b.mouseDownX-c.plotLeft,b.mouseDownY-c.plotTop);if(c.hasCartesianSeries&&(b.zoomX||b.zoomY)&&d&&!b.selectionMarker)b.selectionMarker=c.renderer.rect(c.plotLeft,c.plotTop,f?1:c.plotWidth,g?1:c.plotHeight,0).attr({fill:b.options.chart.selectionMarkerFill||"rgba(69,114,167,0.25)",zIndex:7}).add();if(b.selectionMarker&&f){var o=h-b.mouseDownX;b.selectionMarker.attr({width:U(o), +x:(o>0?0:o)+b.mouseDownX})}b.selectionMarker&&g&&(l-=b.mouseDownY,b.selectionMarker.attr({height:U(l),y:(l>0?0:l)+b.mouseDownY}));d&&!b.selectionMarker&&b.options.chart.panning&&c.pan(h)}if(!m)b.onmousemove(a);return m||!c.hasCartesianSeries}};if(!/Android 4\.0/.test(ua))d.onmousemove=h;C(d,"mouseleave",b.hideTooltipOnMouseLeave);wa||C(I,"mousemove",b.hideTooltipOnMouseMove);d.ontouchstart=function(a){if(b.zoomX||b.zoomY)d.onmousedown(a);h(a)};d.ontouchmove=h;d.ontouchend=function(){e&&b.resetTracker()}; +d.onclick=function(a){var d=c.hoverPoint,e,f,a=b.normalizeMouseEvent(a);a.cancelBubble=!0;if(!c.cancelClick)d&&(F(a.target,"isTracker")||F(a.target.parentNode,"isTracker"))?(e=d.plotX,f=d.plotY,y(d,{pageX:b.chartPosition.left+c.plotLeft+(c.inverted?c.plotWidth-f:e),pageY:b.chartPosition.top+c.plotTop+(c.inverted?c.plotHeight-e:f)}),J(d.series,"click",y(a,{point:d})),d.firePointEvent("click",a)):(y(a,b.getMouseCoordinates(a)),c.isInsidePlot(a.chartX-c.plotLeft,a.chartY-c.plotTop)&&J(c,"click",a))}}, +destroy:function(){var a=this.chart,b=a.container;if(a.trackerGroup)a.trackerGroup=a.trackerGroup.destroy();O(b,"mouseleave",this.hideTooltipOnMouseLeave);O(I,"mousemove",this.hideTooltipOnMouseMove);b.onclick=b.onmousedown=b.onmousemove=b.ontouchstart=b.ontouchend=b.ontouchmove=null;clearInterval(this.tooltipTimeout)},init:function(a,b){if(!a.trackerGroup)a.trackerGroup=a.renderer.g("tracker").attr({zIndex:9}).add();if(b.enabled)a.tooltip=new Bb(a,b);this.setDOMEvents()}};Db.prototype={init:function(a){var b= +this,c=b.options=a.options.legend;if(c.enabled){var d=c.itemStyle,e=n(c.padding,8),f=c.itemMarginTop||0;b.baseline=A(d.fontSize)+3+f;b.itemStyle=d;b.itemHiddenStyle=z(d,c.itemHiddenStyle);b.itemMarginTop=f;b.padding=e;b.initialItemX=e;b.initialItemY=e-5;b.maxItemWidth=0;b.chart=a;b.itemHeight=0;b.lastLineHeight=0;b.render();C(b.chart,"endResize",function(){b.positionCheckboxes()})}},colorizeItem:function(a,b){var c=this.options,d=a.legendItem,e=a.legendLine,f=a.legendSymbol,g=this.itemHiddenStyle.color, +c=b?c.itemStyle.color:g,h=b?a.color:g,g=a.options&&a.options.marker,i={stroke:h,fill:h},j;d&&d.css({fill:c});e&&e.attr({stroke:h});if(f){if(g)for(j in g=a.convertAttribs(g),g)d=g[j],d!==v&&(i[j]=d);f.attr(i)}},positionItem:function(a){var b=this.options,c=b.symbolPadding,b=!b.rtl,d=a._legendItemPos,e=d[0],d=d[1],f=a.checkbox;a.legendGroup&&a.legendGroup.translate(b?e:this.legendWidth-e-2*c-4,d);if(f)f.x=e,f.y=d},destroyItem:function(a){var b=a.checkbox;q(["legendItem","legendLine","legendSymbol", +"legendGroup"],function(b){a[b]&&a[b].destroy()});b&&Sa(a.checkbox)},destroy:function(){var a=this.group,b=this.box;if(b)this.box=b.destroy();if(a)this.group=a.destroy()},positionCheckboxes:function(a){var b=this.group.alignAttr,c,d=this.clipHeight||this.legendHeight;if(b)c=b.translateY,q(this.allItems,function(e){var f=e.checkbox,g;f&&(g=c+f.y+(a||0)+3,H(f,{left:b.translateX+e.legendItemWidth+f.x-20+"px",top:g+"px",display:g>c-6&&g(m||c.chartWidth-2*k-t))b.itemX=t,b.itemY+=p+b.lastLineHeight+o,b.lastLineHeight=0;b.maxItemWidth=w(b.maxItemWidth,e);b.lastItemY=p+b.itemY+o;b.lastLineHeight=w(g,b.lastLineHeight);a._legendItemPos=[b.itemX,b.itemY];f?b.itemX+=e:(b.itemY+=p+g+o,b.lastLineHeight=g);b.offsetWidth= +m||w(f?b.itemX-t:e,b.offsetWidth)},render:function(){var a=this,b=a.chart,c=b.renderer,d=a.group,e,f,g,h,i=a.box,j=a.options,k=a.padding,l=j.borderWidth,m=j.backgroundColor;a.itemX=a.initialItemX;a.itemY=a.initialItemY;a.offsetWidth=0;a.lastItemY=0;if(!d)a.group=d=c.g("legend").attr({zIndex:7}).add(),a.contentGroup=c.g().attr({zIndex:1}).add(d),a.scrollGroup=c.g().add(a.contentGroup),a.clipRect=c.clipRect(0,0,9999,b.chartHeight),a.contentGroup.clip(a.clipRect);e=[];q(b.series,function(a){var b=a.options; +b.showInLegend&&(e=e.concat(a.legendItems||(b.legendType==="point"?a.data:a)))});Pb(e,function(a,b){return(a.options&&a.options.legendIndex||0)-(b.options&&b.options.legendIndex||0)});j.reversed&&e.reverse();a.allItems=e;a.display=f=!!e.length;q(e,function(b){a.renderItem(b)});g=j.width||a.offsetWidth;h=a.lastItemY+a.lastLineHeight;h=a.handleOverflow(h);if(l||m){g+=k;h+=k;if(i){if(g>0&&h>0)i[i.isNew?"attr":"animate"](i.crisp(null,null,null,g,h)),i.isNew=!1}else a.box=i=c.rect(0,0,g,h,j.borderRadius, +l||0).attr({stroke:j.borderColor,"stroke-width":l||0,fill:m||Y}).add(d).shadow(j.shadow),i.isNew=!0;i[f?"show":"hide"]()}a.legendWidth=g;a.legendHeight=h;q(e,function(b){a.positionItem(b)});f&&d.align(y({width:g,height:h},j),!0,b.spacingBox);b.isResizing||this.positionCheckboxes()},handleOverflow:function(a){var b=this,c=this.chart,d=c.renderer,e=this.options,f=e.y,f=c.spacingBox.height+(e.verticalAlign==="top"?-f:f)-this.padding,g=e.maxHeight,h=this.clipRect,i=e.navigation,j=n(i.animation,!0),k= +i.arrowSize||12,l=this.nav;e.layout==="horizontal"&&(f/=2);g&&(f=K(f,g));if(a>f){this.clipHeight=c=f-20;this.pageCount=Ka(a/c);this.currentPage=n(this.currentPage,1);this.fullHeight=a;h.attr({height:c});if(!l)this.nav=l=d.g().attr({zIndex:1}).add(this.group),this.up=d.symbol("triangle",0,0,k,k).on("click",function(){b.scroll(-1,j)}).add(l),this.pager=d.text("",15,10).css(i.style).add(l),this.down=d.symbol("triangle-down",0,0,k,k).on("click",function(){b.scroll(1,j)}).add(l);b.scroll(0);a=f}else if(l)h.attr({height:c.chartHeight}), +l.hide(),this.scrollGroup.attr({translateY:1}),this.clipHeight=0;return a},scroll:function(a,b){var c=this.pageCount,d=this.currentPage+a,e=this.clipHeight,f=this.options.navigation,g=f.activeColor,h=f.inactiveColor,f=this.pager,i=this.padding;d>c&&(d=c);if(d>0)b!==v&&Ia(b,this.chart),this.nav.attr({translateX:i,translateY:e+7,visibility:"visible"}),this.up.attr({fill:d===1?h:g}).css({cursor:d===1?"default":"pointer"}),f.attr({text:d+"/"+this.pageCount}),this.down.attr({x:18+this.pager.getBBox().width, +fill:d===c?h:g}).css({cursor:d===c?"default":"pointer"}),e=-K(e*(d-1),this.fullHeight-e+i)+1,this.scrollGroup.animate({translateY:e}),f.attr({text:d+"/"+c}),this.currentPage=d,this.positionCheckboxes(e)}};bb.prototype={init:function(a,b){var c,d=a.series;a.series=null;c=z(P,a);c.series=a.series=d;var d=c.chart,e=d.margin,e=ea(e)?e:[e,e,e,e];this.optionsMarginTop=n(d.marginTop,e[0]);this.optionsMarginRight=n(d.marginRight,e[1]);this.optionsMarginBottom=n(d.marginBottom,e[2]);this.optionsMarginLeft= +n(d.marginLeft,e[3]);this.runChartClick=(e=d.events)&&!!e.click;this.callback=b;this.isResizing=0;this.options=c;this.axes=[];this.series=[];this.hasCartesianSeries=d.showAxes;var f;this.index=Va.length;Va.push(this);d.reflow!==!1&&C(this,"load",this.initReflow);if(e)for(f in e)C(this,f,e[f]);this.xAxis=[];this.yAxis=[];this.animation=aa?!1:n(d.animation,!0);this.pointCount=0;this.counters=new Ob;this.firstRender()},initSeries:function(a){var b=this.options.chart,b=new R[a.type||b.type||b.defaultSeriesType]; +b.init(this,a);return b},addSeries:function(a,b,c){var d,e=this;a&&(Ia(c,e),b=n(b,!0),J(e,"addSeries",{options:a},function(){d=e.initSeries(a);e.isDirtyLegend=!0;b&&e.redraw()}));return d},isInsidePlot:function(a,b,c){var d=c?b:a,a=c?a:b;return d>=0&&d<=this.plotWidth&&a>=0&&a<=this.plotHeight},adjustTickAmounts:function(){this.options.chart.alignTicks!==!1&&q(this.axes,function(a){a.adjustTickAmount()});this.maxTicks=null},redraw:function(a){var b=this.axes,c=this.series,d=this.tracker,e=this.legend, +f=this.isDirtyLegend,g,h=this.isDirtyBox,i=c.length,j=i,k=this.renderer,l=k.isHidden(),m=[];Ia(a,this);for(l&&this.cloneRenderTo();j--;)if(a=c[j],a.isDirty&&a.options.stacking){g=!0;break}if(g)for(j=i;j--;)if(a=c[j],a.options.stacking)a.isDirty=!0;q(c,function(a){a.isDirty&&a.options.legendType==="point"&&(f=!0)});if(f&&e.options.enabled)e.render(),this.isDirtyLegend=!1;if(this.hasCartesianSeries){if(!this.isResizing)this.maxTicks=null,q(b,function(a){a.setScale()});this.adjustTickAmounts();this.getMargins(); +q(b,function(a){if(a.isDirtyExtremes)a.isDirtyExtremes=!1,m.push(function(){J(a,"afterSetExtremes",a.getExtremes())});if(a.isDirty||h||g)a.redraw(),h=!0})}h&&this.drawChartBox();q(c,function(a){a.isDirty&&a.visible&&(!a.isCartesian||a.xAxis)&&a.redraw()});d&&d.resetTracker&&d.resetTracker(!0);k.draw();J(this,"redraw");l&&this.cloneRenderTo(!0);q(m,function(a){a.call()})},showLoading:function(a){var b=this.options,c=this.loadingDiv,d=b.loading;if(!c)this.loadingDiv=c=X(na,{className:"highcharts-loading"}, +y(d.style,{left:this.plotLeft+"px",top:this.plotTop+"px",width:this.plotWidth+"px",height:this.plotHeight+"px",zIndex:10,display:Y}),this.container),this.loadingSpan=X("span",null,d.labelStyle,c);this.loadingSpan.innerHTML=a||b.lang.loading;if(!this.loadingShown)H(c,{opacity:0,display:""}),Ib(c,{opacity:d.style.opacity},{duration:d.showDuration||0}),this.loadingShown=!0},hideLoading:function(){var a=this.options,b=this.loadingDiv;b&&Ib(b,{opacity:0},{duration:a.loading.hideDuration||100,complete:function(){H(b, +{display:Y})}});this.loadingShown=!1},get:function(a){var b=this.axes,c=this.series,d,e;for(d=0;dK(e.dataMin,e.min)&&c19?this.containerHeight:400))},cloneRenderTo:function(a){var b=this.renderToClone,c=this.container;a?b&&(this.renderTo.appendChild(c),Sa(b),delete this.renderToClone):(c&&this.renderTo.removeChild(c),this.renderToClone=b=this.renderTo.cloneNode(0),H(b,{position:"absolute",top:"-9999px",display:"block"}),I.body.appendChild(b),c&&b.appendChild(c))},getContainer:function(){var a,b=this.options.chart,c,d,e;this.renderTo=a=b.renderTo;e="highcharts-"+Eb++;if(pa(a))this.renderTo= +a=I.getElementById(a);a||Za(13,!0);c=A(F(a,"data-highcharts-chart"));!isNaN(c)&&Va[c]&&Va[c].destroy();F(a,"data-highcharts-chart",this.index);a.innerHTML="";a.offsetWidth||this.cloneRenderTo();this.getChartSize();c=this.chartWidth;d=this.chartHeight;this.container=a=X(na,{className:"highcharts-container"+(b.className?" "+b.className:""),id:e},y({position:"relative",overflow:"hidden",width:c+"px",height:d+"px",textAlign:"left",lineHeight:"normal",zIndex:0},b.style),this.renderToClone||a);this.renderer= +b.forExport?new oa(a,c,d,!0):new Ua(a,c,d);aa&&this.renderer.create(this,a,c,d)},getMargins:function(){var a=this.options.chart,b=a.spacingTop,c=a.spacingRight,d=a.spacingBottom,a=a.spacingLeft,e,f=this.legend,g=this.optionsMarginTop,h=this.optionsMarginLeft,i=this.optionsMarginRight,j=this.optionsMarginBottom,k=this.chartTitleOptions,l=this.chartSubtitleOptions,m=this.options.legend,o=n(m.margin,10),p=m.x,t=m.y,r=m.align,ga=m.verticalAlign;this.resetMargins();e=this.axisOffset;if((this.title||this.subtitle)&& +!s(this.optionsMarginTop))if(l=w(this.title&&!k.floating&&!k.verticalAlign&&k.y||0,this.subtitle&&!l.floating&&!l.verticalAlign&&l.y||0))this.plotTop=w(this.plotTop,l+n(k.margin,15)+b);if(f.display&&!m.floating)if(r==="right"){if(!s(i))this.marginRight=w(this.marginRight,f.legendWidth-p+o+c)}else if(r==="left"){if(!s(h))this.plotLeft=w(this.plotLeft,f.legendWidth+p+o+a)}else if(ga==="top"){if(!s(g))this.plotTop=w(this.plotTop,f.legendHeight+t+o+b)}else if(ga==="bottom"&&!s(j))this.marginBottom=w(this.marginBottom, +f.legendHeight-t+o+d);this.extraBottomMargin&&(this.marginBottom+=this.extraBottomMargin);this.extraTopMargin&&(this.plotTop+=this.extraTopMargin);this.hasCartesianSeries&&q(this.axes,function(a){a.getOffset()});s(h)||(this.plotLeft+=e[3]);s(g)||(this.plotTop+=e[0]);s(j)||(this.marginBottom+=e[2]);s(i)||(this.marginRight+=e[1]);this.setChartSize()},initReflow:function(){function a(a){var g=c.width||ob(d,"width"),h=c.height||ob(d,"height"),a=a?a.target:S;if(!b.hasUserSize&&g&&h&&(a===S||a===I)){if(g!== +b.containerWidth||h!==b.containerHeight)clearTimeout(e),b.reflowTimeout=e=setTimeout(function(){if(b.container)b.setSize(g,h,!1),b.hasUserSize=null},100);b.containerWidth=g;b.containerHeight=h}}var b=this,c=b.options.chart,d=b.renderTo,e;C(S,"resize",a);C(b,"destroy",function(){O(S,"resize",a)})},setSize:function(a,b,c){var d=this,e,f,g=d.resetZoomButton,h=d.title,i=d.subtitle,j;d.isResizing+=1;j=function(){d&&J(d,"endResize",null,function(){d.isResizing-=1})};Ia(c,d);d.oldChartHeight=d.chartHeight; +d.oldChartWidth=d.chartWidth;if(s(a))d.chartWidth=e=w(0,x(a)),d.hasUserSize=!!e;if(s(b))d.chartHeight=f=w(0,x(b));H(d.container,{width:e+"px",height:f+"px"});d.renderer.setSize(e,f,c);d.plotWidth=e-d.plotLeft-d.marginRight;d.plotHeight=f-d.plotTop-d.marginBottom;d.maxTicks=null;q(d.axes,function(a){a.isDirty=!0;a.setScale()});q(d.series,function(a){a.isDirty=!0});d.isDirtyLegend=!0;d.isDirtyBox=!0;d.getMargins();a=d.spacingBox;h&&h.align(null,null,a);i&&i.align(null,null,a);g&&g.align&&g.align(null, +null,d[g.alignTo]);d.redraw(c);d.oldChartHeight=null;J(d,"resize");$a===!1?j():setTimeout(j,$a&&$a.duration||500)},setChartSize:function(){var a=this.inverted,b=this.chartWidth,c=this.chartHeight,d=this.options.chart,e=d.spacingTop,f=d.spacingRight,g=d.spacingBottom,h=d.spacingLeft,i,j,k,l;this.plotLeft=i=x(this.plotLeft);this.plotTop=j=x(this.plotTop);this.plotWidth=k=w(0,x(b-i-this.marginRight));this.plotHeight=l=w(0,x(c-j-this.marginBottom));this.plotSizeX=a?l:k;this.plotSizeY=a?k:l;this.plotBorderWidth= +a=d.plotBorderWidth||0;this.spacingBox={x:h,y:e,width:b-h-f,height:c-e-g};this.plotBox={x:i,y:j,width:k,height:l};this.clipBox={x:a/2,y:a/2,width:this.plotSizeX-a,height:this.plotSizeY-a};q(this.axes,function(a){a.setAxisSize();a.setAxisTranslation()})},resetMargins:function(){var a=this.options.chart,b=a.spacingRight,c=a.spacingBottom,d=a.spacingLeft;this.plotTop=n(this.optionsMarginTop,a.spacingTop);this.marginRight=n(this.optionsMarginRight,b);this.marginBottom=n(this.optionsMarginBottom,c);this.plotLeft= +n(this.optionsMarginLeft,d);this.axisOffset=[0,0,0,0]},drawChartBox:function(){var a=this.options.chart,b=this.renderer,c=this.chartWidth,d=this.chartHeight,e=this.chartBackground,f=this.plotBackground,g=this.plotBorder,h=this.plotBGImage,i=a.borderWidth||0,j=a.backgroundColor,k=a.plotBackgroundColor,l=a.plotBackgroundImage,m=a.plotBorderWidth||0,o,p=this.plotLeft,t=this.plotTop,n=this.plotWidth,q=this.plotHeight,s=this.plotBox,u=this.clipRect,w=this.clipBox;o=i+(a.shadow?8:0);if(i||j)if(e)e.animate(e.crisp(null, +null,null,c-o,d-o));else{e={fill:j||Y};if(i)e.stroke=a.borderColor,e["stroke-width"]=i;this.chartBackground=b.rect(o/2,o/2,c-o,d-o,a.borderRadius,i).attr(e).add().shadow(a.shadow)}if(k)f?f.animate(s):this.plotBackground=b.rect(p,t,n,q,0).attr({fill:k}).add().shadow(a.plotShadow);if(l)h?h.animate(s):this.plotBGImage=b.image(l,p,t,n,q).add();u?u.animate({width:w.width,height:w.height}):this.clipRect=b.clipRect(w);if(m)g?g.animate(g.crisp(null,p,t,n,q)):this.plotBorder=b.rect(p,t,n,q,0,m).attr({stroke:a.plotBorderColor, +"stroke-width":m,zIndex:1}).add();this.isDirtyBox=!1},propFromSeries:function(){var a=this,b=a.options.chart,c,d=a.options.series,e,f;q(["inverted","angular","polar"],function(g){c=R[b.type||b.defaultSeriesType];f=a[g]||b[g]||c&&c.prototype[g];for(e=d&&d.length;!f&&e--;)(c=R[d[e].type])&&c.prototype[g]&&(f=!0);a[g]=f})},render:function(){var a=this,b=a.axes,c=a.renderer,d=a.options,e=d.labels,d=d.credits,f;a.setTitle();a.legend=new Db(a);q(b,function(a){a.setScale()});a.getMargins();a.maxTicks=null; +q(b,function(a){a.setTickPositions(!0);a.setMaxTicks()});a.adjustTickAmounts();a.getMargins();a.drawChartBox();a.hasCartesianSeries&&q(b,function(a){a.render()});if(!a.seriesGroup)a.seriesGroup=c.g("series-group").attr({zIndex:3}).add();q(a.series,function(a){a.translate();a.setTooltipPoints();a.render()});e.items&&q(e.items,function(b){var d=y(e.style,b.style),f=A(d.left)+a.plotLeft,j=A(d.top)+a.plotTop+12;delete d.left;delete d.top;c.text(b.html,f,j).attr({zIndex:2}).css(d).add()});if(d.enabled&& +!a.credits)f=d.href,a.credits=c.text(d.text,0,0).on("click",function(){if(f)location.href=f}).attr({align:d.position.align,zIndex:8}).css(d.style).add().align(d.position);a.hasRendered=!0},destroy:function(){var a=this,b=a.axes,c=a.series,d=a.container,e,f=d&&d.parentNode;J(a,"destroy");Va[a.index]=v;a.renderTo.removeAttribute("data-highcharts-chart");O(a);for(e=b.length;e--;)b[e]=b[e].destroy();for(e=c.length;e--;)c[e]=c[e].destroy();q("title,subtitle,chartBackground,plotBackground,plotBGImage,plotBorder,seriesGroup,clipRect,credits,tracker,scroller,rangeSelector,legend,resetZoomButton,tooltip,renderer".split(","), +function(b){var c=a[b];c&&c.destroy&&(a[b]=c.destroy())});if(d)d.innerHTML="",O(d),f&&Sa(d);for(e in a)delete a[e]},isReadyToRender:function(){var a=this;return!ja&&S==S.top&&I.readyState!=="complete"||aa&&!S.canvg?(aa?Zb.push(function(){a.firstRender()},a.options.global.canvasToolsURL):I.attachEvent("onreadystatechange",function(){I.detachEvent("onreadystatechange",a.firstRender);I.readyState==="complete"&&a.firstRender()}),!1):!0},firstRender:function(){var a=this,b=a.options,c=a.callback;if(a.isReadyToRender()){a.getContainer(); +J(a,"init");if(Highcharts.RangeSelector&&b.rangeSelector.enabled)a.rangeSelector=new Highcharts.RangeSelector(a);a.resetMargins();a.setChartSize();a.propFromSeries();a.getAxes();q(b.series||[],function(b){a.initSeries(b)});if(Highcharts.Scroller&&(b.navigator.enabled||b.scrollbar.enabled))a.scroller=new Highcharts.Scroller(a);a.tracker=new Cb(a,b);a.render();a.renderer.draw();c&&c.apply(a,[a]);q(a.callbacks,function(b){b.apply(a,[a])});a.cloneRenderTo(!0);J(a,"load")}}};bb.prototype.callbacks=[]; +var za=function(){};za.prototype={init:function(a,b,c){var d=a.chart.counters;this.series=a;this.applyOptions(b,c);this.pointAttr={};if(a.options.colorByPoint)b=a.chart.options.colors,this.color=this.color||b[d.color++],d.wrapColor(b.length);a.chart.pointCount++;return this},applyOptions:function(a,b){var c=this.series,d=typeof a;this.config=a;if(d==="number"||a===null)this.y=a;else if(typeof a[0]==="number")this.x=a[0],this.y=a[1];else if(d==="object"&&typeof a.length!=="number"){y(this,a);this.options= +a;if(a.dataLabels)c._hasPointLabels=!0;if(a.marker)c._hasPointMarkers=!0}else if(typeof a[0]==="string")this.name=a[0],this.y=a[1];if(this.x===v)this.x=b===v?c.autoIncrement():b},destroy:function(){var a=this.series.chart,b=a.hoverPoints,c;a.pointCount--;if(b&&(this.setState(),Ca(b,this),!b.length))a.hoverPoints=null;if(this===a.hoverPoint)this.onMouseOut();if(this.graphic||this.dataLabel)O(this),this.destroyElements();this.legendItem&&a.legend.destroyItem(this);for(c in this)this[c]=null},destroyElements:function(){for(var a= +"graphic,tracker,dataLabel,dataLabelUpper,group,connector,shadowGroup".split(","),b,c=6;c--;)b=a[c],this[b]&&(this[b]=this[b].destroy())},getLabelConfig:function(){return{x:this.category,y:this.y,key:this.name||this.category,series:this.series,point:this,percentage:this.percentage,total:this.total||this.stackTotal}},select:function(a,b){var c=this,d=c.series.chart,a=n(a,!c.selected);c.firePointEvent(a?"select":"unselect",{accumulate:b},function(){c.selected=a;c.setState(a&&"select");b||q(d.getSelectedPoints(), +function(a){if(a.selected&&a!==c)a.selected=!1,a.setState(""),a.firePointEvent("unselect")})})},onMouseOver:function(){var a=this.series,b=a.chart,c=b.tooltip,d=b.hoverPoint;if(d&&d!==this)d.onMouseOut();this.firePointEvent("mouseOver");c&&(!c.shared||a.noSharedTooltip)&&c.refresh(this);this.setState("hover");b.hoverPoint=this},onMouseOut:function(){var a=this.series.chart,b=a.hoverPoints;if(!b||dc(this,b)===-1)this.firePointEvent("mouseOut"),this.setState(),a.hoverPoint=null},tooltipFormatter:function(a){var b= +this.series,c=b.tooltipOptions,d=a.match(/\{(series|point)\.[a-zA-Z]+\}/g),e=/[{\.}]/,f,g,h,i,j={y:0,open:0,high:0,low:0,close:0,percentage:1,total:1};c.valuePrefix=c.valuePrefix||c.yPrefix;c.valueDecimals=n(c.valueDecimals,c.yDecimals);c.valueSuffix=c.valueSuffix||c.ySuffix;for(i in d)g=d[i],pa(g)&&g!==a&&(h=(" "+g).split(e),f={point:this,series:b}[h[1]],h=h[2],f===this&&j.hasOwnProperty(h)?(f=j[h]?h:"value",f=(c[f+"Prefix"]||"")+Qa(this[h],n(c[f+"Decimals"],-1))+(c[f+"Suffix"]||"")):f=f[h],a=a.replace(g, +f));return a},update:function(a,b,c){var d=this,e=d.series,f=d.graphic,g,h=e.data,i=h.length,j=e.chart,b=n(b,!0);d.firePointEvent("update",{options:a},function(){d.applyOptions(a);ea(a)&&(e.getAttribs(),f&&f.attr(d.pointAttr[e.state]));for(g=0;ga+1&&b.push(d.slice(a+1,g)),a=g):g===e-1&&b.push(d.slice(a+1,g+1))});this.segments=b},setOptions:function(a){var b=this.chart.options,c=b.plotOptions,d=c[this.type],e=a.data;a.data=null;c=z(d,c.series,a);c.data=a.data=e;this.tooltipOptions=z(b.tooltip,c.tooltip);d.marker===null&&delete c.marker;return c},getColor:function(){var a=this.options, +b=this.chart.options.colors,c=this.chart.counters;this.color=a.color||!a.colorByPoint&&b[c.color++]||"gray";c.wrapColor(b.length)},getSymbol:function(){var a=this.options.marker,b=this.chart,c=b.options.symbols,b=b.counters;this.symbol=a.symbol||c[b.symbol++];if(/^url/.test(this.symbol))a.radius=0;b.wrapSymbol(c.length)},drawLegendSymbol:function(a){var b=this.options,c=b.marker,d=a.options.symbolWidth,e=this.chart.renderer,f=this.legendGroup,a=a.baseline,g;if(b.lineWidth){g={"stroke-width":b.lineWidth}; +if(b.dashStyle)g.dashstyle=b.dashStyle;this.legendLine=e.path(["M",0,a-4,"L",d,a-4]).attr(g).add(f)}if(c&&c.enabled)b=c.radius,this.legendSymbol=e.symbol(this.symbol,d/2-b,a-4-b,2*b,2*b).add(f)},addPoint:function(a,b,c,d){var e=this.options,f=this.data,g=this.graph,h=this.area,i=this.chart,j=this.xData,k=this.yData,l=g&&g.shift||0,m=e.data,o=this.pointClass.prototype;Ia(d,i);if(g&&c)g.shift=l+1;if(h){if(c)h.shift=l+1;h.isArea=!0}b=n(b,!0);d={series:this};o.applyOptions.apply(d,[a]);j.push(d.x);k.push(o.toYData? +o.toYData.call(d):d.y);m.push(a);e.legendType==="point"&&this.generatePoints();c&&(f[0]&&f[0].remove?f[0].remove(!1):(f.shift(),j.shift(),k.shift(),m.shift()));this.getAttribs();this.isDirtyData=this.isDirty=!0;b&&i.redraw()},setData:function(a,b){var c=this.points,d=this.options,e=this.initialColor,f=this.chart,g=null,h=this.xAxis,i,j=this.pointClass.prototype;this.xIncrement=null;this.pointRange=h&&h.categories?1:d.pointRange;if(s(e))f.counters.color=e;var e=[],k=[],l=a?a.length:[],m=(i=this.pointArrayMap)&& +i.length;if(l>(d.turboThreshold||1E3)){for(i=0;g===null&&i1&&e[1]k||this.forceCrop))if(a=i.getExtremes(),i=a.min,k=a.max,b[d-1]k)b=[],c=[];else if(b[0]k){for(a=0;a=i){e=w(0,a-1);break}for(;ak){f=a+1;break}b=b.slice(e,f);c=c.slice(e,f);g=!0}for(a=b.length-1;a>0;a--)if(d=b[a]-b[a-1],d>0&&(h===v||d=0&&c<=d;)i[c++]=g}this.tooltipPoints=i}},tooltipHeaderFormatter:function(a){var b=this.tooltipOptions,c=b.xDateFormat,d=this.xAxis,e=d&&d.options.type==="datetime", +f;if(e&&!c)for(f in G)if(G[f]>=d.closestPointRange){c=b.dateTimeLabelFormats[f];break}return b.headerFormat.replace("{point.key}",e&&Ba(a)?xa(c,a):a).replace("{series.name}",this.name).replace("{series.color}",this.color)},onMouseOver:function(){var a=this.chart,b=a.hoverSeries;if(b&&b!==this)b.onMouseOut();this.options.events.mouseOver&&J(this,"mouseOver");this.setState("hover");a.hoverSeries=this},onMouseOut:function(){var a=this.options,b=this.chart,c=b.tooltip,d=b.hoverPoint;if(d)d.onMouseOut(); +this&&a.events.mouseOut&&J(this,"mouseOut");c&&!a.stickyTracking&&!c.shared&&c.hide();this.setState();b.hoverSeries=null},animate:function(a){var b=this,c=b.chart,d=c.renderer,e;e=b.options.animation;var f=c.clipBox,g=c.inverted,h;if(e&&!ea(e))e=Q[b.type].animation;h="_sharedClip"+e.duration+e.easing;if(a)a=c[h],e=c[h+"m"],a||(c[h]=a=d.clipRect(y(f,{width:0})),c[h+"m"]=e=d.clipRect(-99,g?-c.plotLeft:-c.plotTop,99,g?c.chartWidth:c.chartHeight)),b.group.clip(a),b.markerGroup.clip(e),b.sharedClipKey= +h;else{if(a=c[h])a.animate({width:c.plotSizeX},e),c[h+"m"].animate({width:c.plotSizeX+99},e);b.animate=null;b.animationTimeout=setTimeout(function(){b.afterAnimate()},e.duration)}},afterAnimate:function(){var a=this.chart,b=this.sharedClipKey,c=this.group,d=this.trackerGroup;c&&this.options.clip!==!1&&(c.clip(a.clipRect),d&&d.clip(a.clipRect),this.markerGroup.clip());setTimeout(function(){b&&a[b]&&(a[b]=a[b].destroy(),a[b+"m"]=a[b+"m"].destroy())},100)},drawPoints:function(){var a,b=this.points,c= +this.chart,d,e,f,g,h,i,j,k,l=this.options.marker,m,o=this.markerGroup;if(l.enabled||this._hasPointMarkers)for(f=b.length;f--;)if(g=b[f],d=g.plotX,e=g.plotY,k=g.graphic,i=g.marker||{},a=l.enabled&&i.enabled===v||i.enabled,m=c.isInsidePlot(d,e,c.inverted),a&&e!==v&&!isNaN(e))if(a=g.pointAttr[g.selected?"select":""],h=a.r,i=n(i.symbol,this.symbol),j=i.indexOf("url")===0,k)k.attr({visibility:m?ja?"inherit":"visible":"hidden"}).animate(y({x:d-h,y:e-h},k.symbolName?{width:2*h,height:2*h}:{}));else{if(m&& +(h>0||j))g.graphic=c.renderer.symbol(i,d-h,e-h,2*h,2*h).attr(a).add(o)}else if(k)g.graphic=k.destroy()},convertAttribs:function(a,b,c,d){var e=this.pointAttrToOptions,f,g,h={},a=a||{},b=b||{},c=c||{},d=d||{};for(f in e)g=e[f],h[f]=n(a[g],b[f],c[f],d[f]);return h},getAttribs:function(){var a=this,b=Q[a.type].marker?a.options.marker:a.options,c=b.states,d=c.hover,e,f=a.color,g={stroke:f,fill:f},h=a.points||[],i=[],j,k=a.pointAttrToOptions,l;a.options.marker?(d.radius=d.radius||b.radius+2,d.lineWidth= +d.lineWidth||b.lineWidth+1):d.color=d.color||ya(d.color||f).brighten(d.brightness).get();i[""]=a.convertAttribs(b,g);q(["hover","select"],function(b){i[b]=a.convertAttribs(c[b],i[""])});a.pointAttr=i;for(f=h.length;f--;){g=h[f];if((b=g.options&&g.options.marker||g.options)&&b.enabled===!1)b.radius=0;e=a.options.colorByPoint;if(g.options)for(l in k)s(b[k[l]])&&(e=!0);if(e){b=b||{};j=[];c=b.states||{};e=c.hover=c.hover||{};if(!a.options.marker)e.color=ya(e.color||g.color).brighten(e.brightness||d.brightness).get(); +j[""]=a.convertAttribs(y({color:g.color},b),i[""]);j.hover=a.convertAttribs(c.hover,i.hover,j[""]);j.select=a.convertAttribs(c.select,i.select,j[""])}else j=i;g.pointAttr=j}},destroy:function(){var a=this,b=a.chart,c=/AppleWebKit\/533/.test(ua),d,e,f=a.data||[],g,h,i;J(a,"destroy");O(a);q(["xAxis","yAxis"],function(b){if(i=a[b])Ca(i.series,a),i.isDirty=!0});a.legendItem&&a.chart.legend.destroyItem(a);for(e=f.length;e--;)(g=f[e])&&g.destroy&&g.destroy();a.points=null;clearTimeout(a.animationTimeout); +q("area,graph,dataLabelsGroup,group,markerGroup,tracker,trackerGroup".split(","),function(b){a[b]&&(d=c&&b==="group"?"hide":"destroy",a[b][d]())});if(b.hoverSeries===a)b.hoverSeries=null;Ca(b.series,a);for(h in a)delete a[h]},drawDataLabels:function(){var a=this,b=a.options.dataLabels,c=a.points,d,e,f,g;if(b.enabled||a._hasPointLabels)a.dlProcessOptions&&a.dlProcessOptions(b),g=a.plotGroup("dataLabelsGroup","data-labels",a.visible?"visible":"hidden",b.zIndex||6),e=b,q(c,function(c){var i,j=c.dataLabel, +k,l=!0;d=c.options&&c.options.dataLabels;i=e.enabled||d&&d.enabled;if(j&&!i)c.dataLabel=j.destroy();else if(i){i=b.rotation;b=z(e,d);f=b.formatter.call(c.getLabelConfig(),b);b.style.color=n(b.color,b.style.color,a.color,"black");if(j)j.attr({text:f}),l=!1;else if(s(f)){j={fill:b.backgroundColor,stroke:b.borderColor,"stroke-width":b.borderWidth,r:b.borderRadius||0,rotation:i,padding:b.padding,zIndex:1};for(k in j)j[k]===v&&delete j[k];j=c.dataLabel=a.chart.renderer[i?"text":"label"](f,0,-999,null, +null,null,b.useHTML).attr(j).css(b.style).add(g).shadow(b.shadow)}j&&a.alignDataLabel(c,j,b,null,l)}})},alignDataLabel:function(a,b,c,d,e){var f=this.chart,g=f.inverted,h=n(a.plotX,-999),a=n(a.plotY,-999),i=b.getBBox(),d=y({x:g?f.plotWidth-a:h,y:x(g?f.plotHeight-h:a),width:0,height:0},d);y(c,{width:i.width,height:i.height});c.rotation?(d={align:c.align,x:d.x+c.x+d.width/2,y:d.y+c.y+d.height/2},b[e?"attr":"animate"](d)):(b.align(c,null,d),d=b.alignAttr);b.attr({visibility:c.crop===!1||f.isInsidePlot(d.x, +d.y)||f.isInsidePlot(h,a,g)?f.renderer.isSVG?"inherit":"visible":"hidden"})},getSegmentPath:function(a){var b=this,c=[],d=b.options.step;q(a,function(e,f){var g=e.plotX,h=e.plotY,i;b.getPointSpline?c.push.apply(c,b.getPointSpline(a,e,f)):(c.push(f?"L":"M"),d&&f&&(i=a[f-1],d==="right"?c.push(i.plotX,h):d==="center"?c.push((i.plotX+g)/2,i.plotY,(i.plotX+g)/2,h):c.push(g,i.plotY)),c.push(e.plotX,e.plotY))});return c},getGraphPath:function(){var a=this,b=[],c,d=[];q(a.segments,function(e){c=a.getSegmentPath(e); +e.length>1?b=b.concat(c):d.push(e[0])});a.singlePoints=d;return a.graphPath=b},drawGraph:function(){var a=this.options,b=this.graph,c=this.group,d=a.lineColor||this.color,e=a.lineWidth,f=a.dashStyle,g=this.getGraphPath();if(b)pb(b),b.animate({d:g});else if(e){b={stroke:d,"stroke-width":e,zIndex:1};if(f)b.dashstyle=f;this.graph=this.chart.renderer.path(g).attr(b).add(c).shadow(a.shadow)}},invertGroups:function(){function a(){var a={width:b.yAxis.len,height:b.xAxis.len};q(["group","trackerGroup","markerGroup"], +function(c){b[c]&&b[c].attr(a).invert()})}var b=this,c=b.chart;C(c,"resize",a);C(b,"destroy",function(){O(c,"resize",a)});a();b.invertGroups=a},plotGroup:function(a,b,c,d,e){var f=this[a],g=this.chart,h=this.xAxis,i=this.yAxis;f||(this[a]=f=g.renderer.g(b).attr({visibility:c,zIndex:d||0.1}).add(e));f.translate(h?h.left:g.plotLeft,i?i.top:g.plotTop);return f},render:function(){var a=this.chart,b,c=this.options,d=c.animation&&!!this.animate,e=this.visible?"visible":"hidden",f=c.zIndex,g=this.hasRendered, +h=a.seriesGroup;b=this.plotGroup("group","series",e,f,h);this.markerGroup=this.plotGroup("markerGroup","markers",e,f,h);d&&this.animate(!0);this.getAttribs();b.inverted=a.inverted;this.drawGraph&&this.drawGraph();this.drawPoints();this.drawDataLabels();this.options.enableMouseTracking!==!1&&this.drawTracker();a.inverted&&this.invertGroups();c.clip!==!1&&!this.sharedClipKey&&!g&&(b.clip(a.clipRect),this.trackerGroup&&this.trackerGroup.clip(a.clipRect));d?this.animate():g||this.afterAnimate();this.isDirty= +this.isDirtyData=!1;this.hasRendered=!0},redraw:function(){var a=this.chart,b=this.isDirtyData,c=this.group;c&&(a.inverted&&c.attr({width:a.plotWidth,height:a.plotHeight}),c.animate({translateX:this.xAxis.left,translateY:this.yAxis.top}));this.translate();this.setTooltipPoints(!0);this.render();b&&J(this,"updatedData")},setState:function(a){var b=this.options,c=this.graph,d=b.states,b=b.lineWidth,a=a||"";if(this.state!==a)this.state=a,d[a]&&d[a].enabled===!1||(a&&(b=d[a].lineWidth||b+1),c&&!c.dashstyle&& +c.attr({"stroke-width":b},a?0:500))},setVisible:function(a,b){var c=this.chart,d=this.legendItem,e=this.group,f=this.tracker,g=this.dataLabelsGroup,h=this.markerGroup,i,j=this.points,k=c.options.chart.ignoreHiddenSeries;i=this.visible;i=(this.visible=a=a===v?!i:a)?"show":"hide";if(e)e[i]();if(h)h[i]();if(f)f[i]();else if(j)for(e=j.length;e--;)if(f=j[e],f.tracker)f.tracker[i]();if(c.hoverSeries===this)this.onMouseOut();if(g)g[i]();d&&c.legend.colorizeItem(this,a);this.isDirty=!0;this.options.stacking&& +q(c.series,function(a){if(a.options.stacking&&a.visible)a.isDirty=!0});if(k)c.isDirtyBox=!0;b!==!1&&c.redraw();J(this,i)},show:function(){this.setVisible(!0)},hide:function(){this.setVisible(!1)},select:function(a){this.selected=a=a===v?!this.selected:a;if(this.checkbox)this.checkbox.checked=a;J(this,a?"select":"unselect")},drawTracker:function(){var a=this,b=a.options,c=b.trackByArea,d=[].concat(c?a.areaPath:a.graphPath),e=d.length,f=a.chart,g=f.renderer,h=f.options.tooltip.snap,i=a.tracker,j=b.cursor, +j=j&&{cursor:j},k=a.singlePoints,l=this.isCartesian&&this.plotGroup("trackerGroup",null,"visible",b.zIndex||1,f.trackerGroup),m,o=function(){if(f.hoverSeries!==a)a.onMouseOver()},p=function(){if(!b.stickyTracking)a.onMouseOut()};if(e&&!c)for(m=e+1;m--;)d[m]==="M"&&d.splice(m+1,0,d[m+1]-h,d[m+2],"L"),(m&&d[m]==="M"||m===e)&&d.splice(m,0,"L",d[m-2]+h,d[m-1]);for(m=0;m=0;d--)da&&i>e?(i=w(a,e),k=2*e-i):ig&&k>e?(k=w(g,e),i=2*e-k):kD?g-D:y-(f<=y?D:0));c.barX=i;c.pointWidth=x;c.shapeType= +"rect";c.shapeArgs=f=b.renderer.Element.prototype.crisp.call(0,e,i,j,M,k);e%2&&(f.y-=1,f.height+=1);c.trackerArgs=U(k)<3&&z(c.shapeArgs,{height:6,y:j-3})})},getSymbol:db,drawLegendSymbol:E.prototype.drawLegendSymbol,drawGraph:db,drawPoints:function(){var a=this,b=a.options,c=a.chart.renderer,d;q(a.points,function(e){var f=e.plotY,g=e.graphic;if(f!==v&&!isNaN(f)&&e.y!==null)d=e.shapeArgs,g?(pb(g),g.animate(z(d))):e.graphic=c[e.shapeType](d).attr(e.pointAttr[e.selected?"select":""]).add(a.group).shadow(b.shadow, +null,b.stacking&&!b.borderRadius);else if(g)e.graphic=g.destroy()})},drawTracker:function(){for(var a=this,b=a.chart,c=b.renderer,d,e,f=+new Date,g=a.options,h=(d=g.cursor)&&{cursor:d},i=a.isCartesian&&a.plotGroup("trackerGroup",null,"visible",g.zIndex||1,b.trackerGroup),j,k,l=a.points,m,o=l.length,p=function(c){j=c.relatedTarget||c.fromElement;if(b.hoverSeries!==a&&F(j,"isTracker")!==f)a.onMouseOver();l[c.target._i].onMouseOver()},n=function(b){if(!g.stickyTracking&&(j=b.relatedTarget||b.toElement, +F(j,"isTracker")!==f))a.onMouseOut()};o--;)if(m=l[o],e=m.tracker,d=m.trackerArgs||m.shapeArgs,k=m.plotY,k=!a.isCartesian||k!==v&&!isNaN(k),delete d.strokeWidth,m.y!==null&&k){if(e)e.attr(d);else if(m.tracker=e=c[m.shapeType](d).attr({isTracker:f,fill:Gb,visibility:a.visible?"visible":"hidden"}).on("mouseover",p).on("mouseout",n).css(h).add(m.group||i),wa)e.on("touchstart",p);e.element._i=o}},alignDataLabel:function(a,b,c,d,e){var f=this.chart,g=f.inverted,h=a.below||a.plotY>n(this.translatedThreshold, +f.plotSizeY),i=this.options.stacking||c.inside;if(a.shapeArgs&&(d=z(a.shapeArgs),g&&(d={x:f.plotWidth-d.y-d.height,y:f.plotHeight-d.x-d.width,width:d.height,height:d.width}),!i))g?(d.x+=h?0:d.width,d.width=0):(d.y+=h?d.height:0,d.height=0);c.align=n(c.align,!g||i?"center":h?"right":"left");c.verticalAlign=n(c.verticalAlign,g||i?"middle":h?"top":"bottom");V.prototype.alignDataLabel.call(this,a,b,c,d,e)},animate:function(a){var b=this,c=b.points,d=b.options;if(!a)q(c,function(a){var c=a.graphic,a=a.shapeArgs, +g=b.yAxis,h=d.threshold;c&&(c.attr({height:0,y:s(h)?g.getThreshold(h):g.translate(g.getExtremes().min,0,1,0,1)}),c.animate({height:a.height,y:a.y},d.animation))}),b.animate=null},remove:function(){var a=this,b=a.chart;b.hasRendered&&q(b.series,function(b){if(b.type===a.type)b.isDirty=!0});V.prototype.remove.apply(a,arguments)}});R.column=ca;Q.bar=z(Q.column);Oa=$(ca,{type:"bar",inverted:!0});R.bar=Oa;Q.scatter=z(N,{lineWidth:0,states:{hover:{lineWidth:0}},tooltip:{headerFormat:'{series.name}
', +pointFormat:"x: {point.x}
y: {point.y}
"}});Oa=$(V,{type:"scatter",sorted:!1,requireSorting:!1,translate:function(){var a=this;V.prototype.translate.apply(a);q(a.points,function(b){b.shapeType="circle";b.shapeArgs={x:b.plotX,y:b.plotY,r:a.chart.options.tooltip.snap}})},drawTracker:function(){for(var a=this,b=a.options.cursor,b=b&&{cursor:b},c=a.points,d=c.length,e,f=a.markerGroup,g=function(b){a.onMouseOver();if(b.target._i!==v)c[b.target._i].onMouseOver()};d--;)if(e=c[d].graphic)e.element._i= +d;if(a._hasTracking)a._hasTracking=!0;else if(f.attr({isTracker:!0}).on("mouseover",g).on("mouseout",function(){if(!a.options.stickyTracking)a.onMouseOut()}).css(b),wa)f.on("touchstart",g)},setTooltipPoints:db});R.scatter=Oa;Q.pie=z(N,{borderColor:"#FFFFFF",borderWidth:1,center:["50%","50%"],colorByPoint:!0,dataLabels:{distance:30,enabled:!0,formatter:function(){return this.point.name}},legendType:"point",marker:null,size:"75%",showInLegend:!1,slicedOffset:10,states:{hover:{brightness:0.1,shadow:!1}}}); +N={type:"pie",isCartesian:!1,pointClass:$(za,{init:function(){za.prototype.init.apply(this,arguments);var a=this,b;y(a,{visible:a.visible!==!1,name:n(a.name,"Slice")});b=function(){a.slice()};C(a,"select",b);C(a,"unselect",b);return a},setVisible:function(a){var b=this.series,c=b.chart,d=this.tracker,e=this.dataLabel,f=this.connector,g=this.shadowGroup,h;h=(this.visible=a=a===v?!this.visible:a)?"show":"hide";this.group[h]();if(d)d[h]();if(e)e[h]();if(f)f[h]();if(g)g[h]();this.legendItem&&c.legend.colorizeItem(this, +a);if(!b.isDirty&&b.options.ignoreHiddenPoint)b.isDirty=!0,c.redraw()},slice:function(a,b,c){var d=this.series.chart,e=this.slicedTranslation;Ia(c,d);n(b,!0);a=this.sliced=s(a)?a:!this.sliced;a={translateX:a?e[0]:d.plotLeft,translateY:a?e[1]:d.plotTop};this.group.animate(a);this.shadowGroup&&this.shadowGroup.animate(a)}}),requireSorting:!1,pointAttrToOptions:{stroke:"borderColor","stroke-width":"borderWidth",fill:"color"},getColor:function(){this.initialColor=this.chart.counters.color},animate:function(){var a= +this,b=a.startAngleRad;q(a.points,function(c){var d=c.graphic,c=c.shapeArgs;d&&(d.attr({r:a.center[3]/2,start:b,end:b}),d.animate({r:c.r,start:c.start,end:c.end},a.options.animation))});a.animate=null},setData:function(a,b){V.prototype.setData.call(this,a,!1);this.processData();this.generatePoints();n(b,!0)&&this.chart.redraw()},getCenter:function(){var a=this.options,b=this.chart,c=b.plotWidth,d=b.plotHeight,a=a.center.concat([a.size,a.innerSize||0]),e=K(c,d),f;return Ma(a,function(a,b){return(f= +/%$/.test(a))?[c,d,e,e][b]*A(a)/100:a})},translate:function(){this.generatePoints();var a=0,b=0,c=this.options,d=c.slicedOffset,e=d+c.borderWidth,f,g=this.chart,h,i,j,k=this.startAngleRad=La/180*((c.startAngle||0)%360-90),l=this.points,m=2*La,o=c.dataLabels.distance,p=c.ignoreHiddenPoint,n,q=l.length,s;this.center=f=this.getCenter();this.getX=function(a,b){j=L.asin((a-f[1])/(f[2]/2+o));return f[0]+(b?-1:1)*ba(j)*(f[2]/2+o)};for(n=0;n0.75*m&&(j-=2*La);s.slicedTranslation=Ma([ba(j)*d+g.plotLeft,fa(j)*d+g.plotTop],x);h=ba(j)*f[2]/2;i=fa(j)*f[2]/2;s.tooltipPos=[f[0]+h*0.7,f[1]+i*0.7];s.half=j0,p=[[],[]],t,r,s,w=2,u,x=function(a,b){return b.y- +a.y},D=function(a,b){a.sort(function(a,c){return(c.angle-a.angle)*b})};if(d.enabled||this._hasPointLabels){V.prototype.drawDataLabels.apply(this);q(a,function(a){a.dataLabel&&p[a.half].push(a)});for(a=p[0][0]&&p[0][0].dataLabel&&(p[0][0].dataLabel.getBBox().height||21);w--;){var B=[],v=[],z=p[w],y=z.length,A;D(z,w-0.5);if(j>0){for(u=m-l-j;u<=m+l+j;u+=a)B.push(u);s=B.length;if(y>s){h=[].concat(z);h.sort(x);for(u=y;u--;)h[u].rank=u;for(u=y;u--;)z[u].rank>=s&&z.splice(u,1);y=z.length}for(u=0;u0){if(r=v.pop(),A=r.i,r=r.y,t>r&&B[A+1]!==null||t=c[1]||n===i;)if(j=c.shift(),k=d.apply(0,m),k!==v&&(g.push(j),h.push(k)),m[0]=[],m[1]=[],m[2]=[],m[3]=[],n===i)break;if(n===i)break;if(o){j=this.cropStart+n;j=e&&e[j]||this.pointClass.prototype.applyOptions.apply({series:this},[f[j]]);var q;for(k=0;kg/i||j&&c.forced){e=!0; +this.points=null;a=h.getExtremes();j=a.min;k=a.max;a=h.getGroupIntervalFactor&&h.getGroupIntervalFactor(j,k,d)||1;g=i*(k-j)/g*a;h=(h.getNonLinearTimeTicks||Ya)(vb(g,c.units||ac),j,k,null,d,this.closestPointRange);f=T.groupData.apply(this,[d,f,h,c.approximation]);d=f[0];f=f[1];if(c.smoothed){a=d.length-1;for(d[a]=k;a--&&a>0;)d[a]+=g/2;d[0]=j}this.currentDataGrouping=h.info;if(b.pointRange===null)this.pointRange=h.info.totalRange;this.closestPointRange=h.info.totalRange;this.processedXData=d;this.processedYData= +f}else this.currentDataGrouping=null,this.pointRange=l;this.hasGroupedData=e}};T.destroyGroupedData=function(){var a=this.groupedData;q(a||[],function(b,c){b&&(a[c]=b.destroy?b.destroy():null)});this.groupedData=null};T.generatePoints=function(){gc.apply(this);this.destroyGroupedData();this.groupedData=this.hasGroupedData?this.points:null};T.tooltipHeaderFormatter=function(a){var b=this.tooltipOptions,c=this.options.dataGrouping,d=b.xDateFormat,e,f=this.xAxis,g,h;if(f&&f.options.type==="datetime"&& +c&&Ba(a)){g=this.currentDataGrouping;c=c.dateTimeLabelFormats;if(g)f=c[g.unitName],g.count===1?d=f[0]:(d=f[1],e=f[2]);else if(!d)for(h in G)if(G[h]>=f.closestPointRange){d=c[h][0];break}d=xa(d,a);e&&(d+=xa(e,a+g.totalRange-1));a=b.headerFormat.replace("{point.key}",d)}else a=ic.apply(this,[a]);return a};T.destroy=function(){for(var a=this.groupedData||[],b=a.length;b--;)a[b]&&a[b].destroy();hc.apply(this)};tb(T,"setOptions",function(a,b){var c=a.call(this,b),d=this.type,e=this.chart.options.plotOptions; +if($b[d]){if(!Q[d].dataGrouping)Q[d].dataGrouping=z(jc,$b[d]);c.dataGrouping=z(Q[d].dataGrouping,e.series&&e.series.dataGrouping,e[d].dataGrouping,b.dataGrouping)}if(this.chart.options._stock)this.requireSorting=!0;return c});Q.ohlc=z(Q.column,{lineWidth:1,tooltip:{pointFormat:'{series.name}
Open: {point.open}
High: {point.high}
Low: {point.low}
Close: {point.close}
'},states:{hover:{lineWidth:3}},threshold:null});N=$(za, +{applyOptions:function(a){var b=this.series,c=b.pointArrayMap,d=0,e=0,f=c.length;if(typeof a==="object"&&typeof a.length!=="number")y(this,a),this.options=a;else if(a.length){if(a.length>f){if(typeof a[0]==="string")this.name=a[0];else if(typeof a[0]==="number")this.x=a[0];d++}for(;e',this.name|| +a.name,"
Open: ",this.open,"
High: ",this.high,"
Low: ",this.low,"
Close: ",this.close,"
"].join("")},toYData:function(){return[this.open,this.high,this.low,this.close]}});N=$(R.column,{type:"ohlc",pointArrayMap:["open","high","low","close"],pointValKey:"high",pointClass:N,pointAttrToOptions:{stroke:"color","stroke-width":"lineWidth"},upColorProp:"stroke",getAttribs:function(){R.column.prototype.getAttribs.apply(this,arguments);var a=this.options,b=a.states,c=a.upColor|| +this.color,a=z(this.pointAttr),d=this.upColorProp,e=this.points||[],f=e.length;a[""][d]=c;a.hover[d]=b.hover.upColor||c;a.select[d]=b.select.upColor||c;for(d=0;d0?e[d-1].close=j.min&&c.x<=j.max?c.plotY=i.lineTop-a.plotTop:c.shapeArgs={};if((e=b[d-1])&&e.plotX===c.plotX){if(e.stackIndex===v)e.stackIndex=0;c.stackIndex=e.stackIndex+1}})},drawPoints:function(){var a,b=this.points,c=this.chart.renderer,d,e,f=this.options,g=f.y,h=f.shape,i,j,k,l,m=f.lineWidth%2/2,o;for(k=b.length;k--;)if(l=b[k],d=l.plotX+m,j=l.stackIndex, +e=l.plotY,e!==v&&(e=l.plotY+g+m-(j!==v&&j*f.stackDistance)),i=j?v:l.plotX+m,o=j?v:l.plotY,j=l.graphic,a=l.tracker,e!==v)a=l.pointAttr[l.selected?"select":""],j?j.attr({x:d,y:e,r:a.r,anchorX:i,anchorY:o}):j=l.graphic=c.label(l.options.title||f.title||"A",d,e,h,i,o).css(z(f.style,l.style)).attr(a).attr({align:h==="flag"?"left":"center",width:f.width,height:f.height}).add(this.group).shadow(f.shadow),i=j.box,j=i.getBBox(),l.shapeArgs=y(j,{x:d-(h==="flag"?0:i.attr("width")/2),y:e});else if(j)l.graphic= +j.destroy(),a&&a.attr("y",-9999)},drawTracker:function(){R.column.prototype.drawTracker.apply(this);q(this.points,function(a){a.tracker&&C(a.tracker.element,"mouseover",function(){a.graphic.toFront()})})},tooltipFormatter:function(a){return a.point.text},animate:function(){}});sb.flag=function(a,b,c,d,e){var f=e&&e.anchorX||a,e=e&&e.anchorY||b;return["M",f,e,"L",a,b+d,a,b,a+c,b,a+c,b+d,a,b+d,"M",f,e,"Z"]};q(["circle","square"],function(a){sb[a+"pin"]=function(b,c,d,e,f){var g=f&&f.anchorX,f=f&&f.anchorY, +b=sb[a](b,c,d,e);g&&f&&b.push("M",g,c+e,"L",g,f);return b}});Ua===Na&&q(["flag","circlepin","squarepin"],function(a){Na.prototype.symbols[a]=sb[a]});N=ha("linearGradient",{x1:0,y1:0,x2:0,y2:1},"stops",[[0,"#FFF"],[1,"#CCC"]]);E=[].concat(ac);E[4]=[da,[1,2,3,4]];E[5]=[Ea,[1,2,3]];y(P,{navigator:{handles:{backgroundColor:"#FFF",borderColor:"#666"},height:40,margin:10,maskFill:"rgba(255, 255, 255, 0.75)",outlineColor:"#444",outlineWidth:1,series:{type:"areaspline",color:"#4572A7",compare:null,fillOpacity:0.4, +dataGrouping:{approximation:"average",groupPixelWidth:2,smoothed:!0,units:E},dataLabels:{enabled:!1},id:"highcharts-navigator-series",lineColor:"#4572A7",lineWidth:1,marker:{enabled:!1},pointRange:0,shadow:!1},xAxis:{tickWidth:0,lineWidth:0,gridLineWidth:1,tickPixelInterval:200,labels:{align:"left",x:3,y:-4}},yAxis:{gridLineWidth:0,startOnTick:!1,endOnTick:!1,minPadding:0.1,maxPadding:0.1,labels:{enabled:!1},title:{text:null},tickWidth:0}},scrollbar:{height:nb?20:14,barBackgroundColor:N,barBorderRadius:2, +barBorderWidth:1,barBorderColor:"#666",buttonArrowColor:"#666",buttonBackgroundColor:N,buttonBorderColor:"#666",buttonBorderRadius:2,buttonBorderWidth:1,minWidth:6,rifleColor:"#666",trackBackgroundColor:ha("linearGradient",{x1:0,y1:0,x2:0,y2:1},"stops",[[0,"#EEE"],[1,"#FFF"]]),trackBorderColor:"#CCC",trackBorderWidth:1}});Sb.prototype={getAxisTop:function(a){return this.navigatorOptions.top||a-this.height-this.scrollbarHeight-this.chart.options.chart.spacingBottom},drawHandle:function(a,b){var c= +this.chart.renderer,d=this.elementsToDestroy,e=this.handles,f=this.navigatorOptions.handles,f={fill:f.backgroundColor,stroke:f.borderColor,"stroke-width":1},g;this.rendered||(e[b]=c.g().css({cursor:"e-resize"}).attr({zIndex:4-b}).add(),g=c.rect(-4.5,0,9,16,3,1).attr(f).add(e[b]),d.push(g),g=c.path(["M",-1.5,4,"L",-1.5,12,"M",0.5,4,"L",0.5,12]).attr(f).add(e[b]),d.push(g));e[b].translate(this.scrollerLeft+this.scrollbarHeight+parseInt(a,10),this.top+this.height/2-8)},drawScrollbarButton:function(a){var b= +this.chart.renderer,c=this.elementsToDestroy,d=this.scrollbarButtons,e=this.scrollbarHeight,f=this.scrollbarOptions,g;this.rendered||(d[a]=b.g().add(this.scrollbarGroup),g=b.rect(-0.5,-0.5,e+1,e+1,f.buttonBorderRadius,f.buttonBorderWidth).attr({stroke:f.buttonBorderColor,"stroke-width":f.buttonBorderWidth,fill:f.buttonBackgroundColor}).add(d[a]),c.push(g),g=b.path(["M",e/2+(a?-1:1),e/2-3,"L",e/2+(a?-1:1),e/2+3,e/2+(a?2:-2),e/2]).attr({fill:f.buttonArrowColor}).add(d[a]),c.push(g));a&&d[a].attr({translateX:this.scrollerWidth- +e})},render:function(a,b,c,d){var e=this.chart,f=e.renderer,g,h,i,j,k=this.scrollbarGroup,l=this.scrollbar,m=this.xAxis,o=this.scrollbarTrack,p=this.scrollbarHeight,q=this.scrollbarEnabled,r=this.navigatorOptions,s=this.scrollbarOptions,v=s.minWidth,u=this.height,z=this.top,D=this.navigatorEnabled,B=r.outlineWidth,y=B/2,C=0,F=this.outlineHeight,I=s.barBorderRadius,G=s.barBorderWidth,E=z+y;if(!isNaN(a)){this.navigatorLeft=g=n(m.left,e.plotLeft+p);this.navigatorWidth=h=n(m.len,e.plotWidth-2*p);this.scrollerLeft= +i=g-p;this.scrollerWidth=j=j=h+2*p;if(m.getExtremes){var H=e.xAxis[0].getExtremes(),e=H.dataMin===null,J=m.getExtremes(),L=K(H.dataMin,J.dataMin),H=w(H.dataMax,J.dataMax);!e&&(L!==J.min||H!==J.max)&&m.setExtremes(L,H,!0,!1)}c=n(c,m.translate(a));d=n(d,m.translate(b));this.zoomedMax=a=K(A(w(c,d)),h);this.zoomedMin=d=this.fixedWidth?a-this.fixedWidth:w(A(K(c,d)),0);this.range=c=a-d;this.fixedWidth=null;if(!this.rendered){if(D)this.leftShade=f.rect().attr({fill:r.maskFill,zIndex:3}).add(),this.rightShade= +f.rect().attr({fill:r.maskFill,zIndex:3}).add(),this.outline=f.path().attr({"stroke-width":B,stroke:r.outlineColor,zIndex:3}).add();if(q)this.scrollbarGroup=k=f.g().add(),l=s.trackBorderWidth,this.scrollbarTrack=o=f.rect().attr({y:-l%2/2,fill:s.trackBackgroundColor,stroke:s.trackBorderColor,"stroke-width":l,r:s.trackBorderRadius||0,height:p}).add(k),this.scrollbar=l=f.rect().attr({y:-G%2/2,height:p,fill:s.barBackgroundColor,stroke:s.barBorderColor,"stroke-width":G,r:I}).add(k),this.scrollbarRifles= +f.path().attr({stroke:s.rifleColor,"stroke-width":1}).add(k)}D&&(this.leftShade.attr({x:g,y:z,width:d,height:u}),this.rightShade.attr({x:g+a,y:z,width:h-a,height:u}),this.outline.attr({d:["M",i,E,"L",g+d+y,E,g+d+y,E+F-p,"M",g+a-y,E+F-p,"L",g+a-y,E,i+j,E]}),this.drawHandle(d+y,0),this.drawHandle(a+y,1));q&&(this.drawScrollbarButton(0),this.drawScrollbarButton(1),k.translate(i,x(E+u)),o.attr({width:j}),f=p+d,g=c-G,g12?"visible":"hidden"}));this.scrollbarPad=C;this.rendered=!0}},addEvents:function(){var a=this.chart.container,b=this.mouseDownHandler,c=this.mouseMoveHandler,d=this.mouseUpHandler,e;e=[[a,"mousedown",b],[a,"mousemove",c],[document,"mouseup",d]];wa&&e.push([a,"touchstart",b],[a,"touchmove",c],[document,"touchend",d]);q(e,function(a){C.apply(null,a)});this._events=e},removeEvents:function(){q(this._events,function(a){O.apply(null, +a)});this._events=v;this.navigatorEnabled&&O(this.baseSeries,"updatedData",this.updatedDataHandler)},init:function(){var a=this,b=a.chart,c,d,e=a.scrollbarHeight,f=a.navigatorOptions,g=a.height,h=a.top,i,j,k,l=document.body.style,m,o=a.baseSeries,p;a.mouseDownHandler=function(d){var d=b.tracker.normalizeMouseEvent(d),e=a.zoomedMin,f=a.zoomedMax,h=a.top,i=a.scrollbarHeight,k=a.scrollerLeft,o=a.scrollerWidth,p=a.navigatorLeft,n=a.navigatorWidth,q=a.scrollbarPad,r=a.range,t=d.chartX,s=d.chartY,u=b.xAxis[0], +v=nb?10:7;if(s>h&&sp+e-q&&tk&&tk+o-i?e+K(10,r):tn&&(f=n-r),f!==e)){a.fixedWidth=r;if(!u.ordinalPositions)u.fixedRange=u.max-u.min;e=c.translate(f,!0);u.setExtremes(e,u.fixedRange?e+u.fixedRange: +c.translate(f+r,!0),!0,!1,{trigger:"navigator"})}d.type==="touchstart"&&d.preventDefault()};a.mouseMoveHandler=function(c){var d=a.scrollbarHeight,e=a.navigatorLeft,f=a.navigatorWidth,g=a.scrollerLeft,h=a.scrollerWidth,i=a.range;if(c.pageX!==0)c=b.tracker.normalizeMouseEvent(c),c=c.chartX,cg+h-d&&(c=g+h-d),a.grabbedLeft?(k=!0,a.render(0,0,c-e,a.otherHandlePos)):a.grabbedRight?(k=!0,a.render(0,0,a.otherHandlePos,c-e)):a.grabbedCenter&&(k=!0,cf+j-i&&(c=f+j-i),a.render(0,0,c-j,c-j+ +i))};a.mouseUpHandler=function(){var d=a.zoomedMin,e=a.zoomedMax;k&&b.xAxis[0].setExtremes(c.translate(d,!0),c.translate(e,!0),!0,!1,{trigger:"navigator"});a.grabbedLeft=a.grabbedRight=a.grabbedCenter=k=j=null;l.cursor=m||""};a.updatedDataHandler=function(){var c=o.xAxis,d=c.getExtremes(),e=d.min,f=d.max,g=d.dataMin,d=d.dataMax,h=f-e,j,k,l,m,n;j=i.xData;var q=!!c.setExtremes;k=f>=j[j.length-1];j=e<=g;if(!p)i.options.pointStart=o.xData[0],i.setData(o.options.data,!1),n=!0;j&&(m=g,l=m+h);k&&(l=d,j|| +(m=w(l-h,i.xData[0])));q&&(j||k)?c.setExtremes(m,l,!0,!1,{trigger:"updatedData"}):(n&&b.redraw(!1),a.render(w(e,g),K(f,d)))};var n=b.xAxis.length,q=b.yAxis.length,s=b.setSize;b.extraBottomMargin=a.outlineHeight+f.margin;a.top=h=a.getAxisTop(b.chartHeight);if(a.navigatorEnabled){var v=o?o.options:{},u=v.data,x=f.series;p=x.data;v.data=x.data=null;a.xAxis=c=new Ta(b,z({ordinal:o&&o.xAxis.options.ordinal},f.xAxis,{isX:!0,type:"datetime",index:n,height:g,top:h,offset:0,offsetLeft:e,offsetRight:-e,startOnTick:!1, +endOnTick:!1,minPadding:0,maxPadding:0,zoomEnabled:!1}));a.yAxis=d=new Ta(b,z(f.yAxis,{alignTicks:!1,height:g,top:h,offset:0,index:q,zoomEnabled:!1}));n=z(v,x,{threshold:null,clip:!1,enableMouseTracking:!1,group:"nav",padXAxis:!1,xAxis:n,yAxis:q,name:"Navigator",showInLegend:!1,isInternal:!0,visible:!0});v.data=u;x.data=p;n.data=p||u;i=b.initSeries(n);f.adaptToUpdatedData!==!1&&C(o,"updatedData",a.updatedDataHandler)}else a.xAxis=c={translate:function(a,c){var d=b.xAxis[0].getExtremes(),f=b.plotWidth- +2*e,g=d.dataMin,d=d.dataMax-g;return c?a*d/f+g:f*(a-g)/d}};a.series=i;b.setSize=function(e,f,g){a.top=h=a.getAxisTop(f);if(c&&d)c.options.top=d.options.top=h;s.call(b,e,f,g)};a.addEvents()},destroy:function(){this.removeEvents();q([this.xAxis,this.yAxis,this.leftShade,this.rightShade,this.outline,this.scrollbarTrack,this.scrollbarRifles,this.scrollbarGroup,this.scrollbar],function(a){a&&a.destroy&&a.destroy()});this.xAxis=this.yAxis=this.leftShade=this.rightShade=this.outline=this.scrollbarTrack= +this.scrollbarRifles=this.scrollbarGroup=this.scrollbar=null;q([this.scrollbarButtons,this.handles,this.elementsToDestroy],function(a){ta(a)})}};Highcharts.Scroller=Sb;tb(Ta.prototype,"zoom",function(a,b,c){var d=this.chart,e=d.options,f=e.chart.zoomType,g=e.navigator,e=e.rangeSelector,h;if(this.isXAxis&&(g&&g.enabled||e&&e.enabled))if(f==="x")d.resetZoomButton="blocked";else if(f==="y")h=!1;else if(f==="xy")d=this.previousZoom,s(b)?this.previousZoom=[this.min,this.max]:d&&(b=d[0],c=d[1],delete this.previousZoom); +return h!==v?h:a.call(this,b,c)});y(P,{rangeSelector:{buttonTheme:{width:28,height:16,padding:1,r:0,zIndex:7},inputPosition:{align:"right"},labelStyle:{color:"#666"}}});P.lang=z(P.lang,{rangeSelectorZoom:"Zoom",rangeSelectorFrom:"From",rangeSelectorTo:"To"});Tb.prototype={clickButton:function(a,b,c){var d=this,e=d.chart,f=d.buttons,g=e.xAxis[0],h=g&&g.getExtremes(),i=e.scroller&&e.scroller.xAxis,j=i&&i.getExtremes&&i.getExtremes(),i=j&&j.dataMin,j=j&&j.dataMax,k=h&&h.dataMin,l=h&&h.dataMax,i=(s(k)&& +s(i)?K:n)(k,i),j=(s(l)&&s(j)?w:n)(l,j),m,o=g&&K(h.max,j),h=new Date(o),l=b.type,k=b.count,p,q,r={millisecond:1,second:1E3,minute:6E4,hour:36E5,day:864E5,week:6048E5};if(!(i===null||j===null||a===d.selected))r[l]?(p=r[l]*k,m=w(o-p,i)):l==="month"?(h.setMonth(h.getMonth()-k),m=w(h.getTime(),i),p=2592E6*k):l==="ytd"?(h=new Date(j),q=h.getFullYear(),m=q=w(i||0,Date.UTC(q,0,1)),h=h.getTime(),o=K(j||h,h)):l==="year"?(h.setFullYear(h.getFullYear()-k),m=w(i,h.getTime()),p=31536E6*k):l==="all"&&g&&(m=i,o= +j),f[a]&&f[a].setState(2),g?setTimeout(function(){g.setExtremes(m,o,n(c,1),0,{trigger:"rangeSelectorButton",rangeSelectorButton:b});d.selected=a},1):(e=e.options.xAxis,e[0]=z(e[0],{range:p,min:q}),d.selected=a)},defaultButtons:[{type:"month",count:1,text:"1m"},{type:"month",count:3,text:"3m"},{type:"month",count:6,text:"6m"},{type:"ytd",text:"YTD"},{type:"year",count:1,text:"1y"},{type:"all",text:"All"}],init:function(a){var b=this,c=a.options.rangeSelector,d=c.buttons||[].concat(b.defaultButtons), +e=b.buttons=[],c=c.selected,f=b.blurInputs=function(){var a=b.minInput,c=b.maxInput;a&&a.blur();c&&c.blur()};b.chart=a;a.extraTopMargin=25;b.buttonOptions=d;C(a.container,"mousedown",f);C(a,"resize",f);c!==v&&d[c]&&this.clickButton(c,d[c],!1);C(a,"load",function(){C(a.xAxis[0],"afterSetExtremes",function(){if(this.fixedRange!==this.max-this.min)e[b.selected]&&!a.renderer.forExport&&e[b.selected].setState(0),b.selected=null;this.fixedRange=null})})},setInputValue:function(a,b){var c=this.chart.options.rangeSelector; +if(b)this[a+"Input"].HCTime=b;this[a+"Input"].value=xa(c.inputEditDateFormat||"%Y-%m-%d",this[a+"Input"].HCTime);this[a+"DateBox"].attr({text:xa(c.inputDateFormat||"%b %e, %Y",this[a+"Input"].HCTime)})},drawInput:function(a){var b=this,c=b.chart,d=c.options.chart.style,e=c.renderer,f=c.options.rangeSelector,g=b.div,h=a==="min",i,j,k,l=this.inputGroup;this[a+"Label"]=j=e.label(P.lang[h?"rangeSelectorFrom":"rangeSelectorTo"],this.inputGroup.offset).attr({padding:1}).css(z(d,f.labelStyle)).add(l);l.offset+= +j.width+5;this[a+"DateBox"]=k=e.label("",l.offset).attr({padding:1,width:90,height:16,stroke:"silver","stroke-width":1}).css(z({textAlign:"center"},d,f.inputStyle)).on("click",function(){b[a+"Input"].focus()}).add(l);l.offset+=k.width+(h?10:0);this[a+"Input"]=i=X("input",{name:a,className:"highcharts-range-selector",type:"text"},y({position:"absolute",border:"2px solid silver",top:"-9999em",textAlign:"center",fontSize:d.fontSize,fontFamily:d.fontFamily},f.inputStyle),g);i.onfocus=function(){H(this, +{left:l.translateX+k.x+"px",top:l.translateY+"px",width:k.width-2+"px",height:k.height-2+"px"})};i.onblur=function(){H(this,{top:"-9999em"});b.setInputValue(a)};i.onchange=function(){var a=i.value,d=Date.parse(a),e=c.xAxis[0].getExtremes();isNaN(d)&&(d=a.split("-"),d=Date.UTC(A(d[0]),A(d[1])-1,A(d[2])));if(!isNaN(d)&&(h&&d>=e.dataMin&&d<=b.maxInput.HCTime||!h&&d<=e.dataMax&&d>=b.minInput.HCTime))c.xAxis[0].setExtremes(h?d:e.min,h?e.max:d,v,v,{trigger:"rangeSelectorInput"})}},render:function(a,b){var c= +this,d=c.chart,e=d.renderer,f=d.container,g=d.options,h=g.exporting&&d.options.navigation.buttonOptions,i=g.rangeSelector,j=c.buttons,k=P.lang,l=c.div,l=c.inputGroup,m=i.buttonTheme,o=i.inputEnabled!==!1,n=m&&m.states,t=d.plotLeft,r;if(!c.rendered&&(c.zoomText=e.text(k.rangeSelectorZoom,t,d.plotTop-10).css(i.labelStyle).add(),r=t+c.zoomText.getBBox().width+5,q(c.buttonOptions,function(a,b){j[b]=e.button(a.text,r,d.plotTop-25,function(){c.clickButton(b,a);c.isActive=!0},m,n&&n.hover,n&&n.select).css({textAlign:"center"}).add(); +r+=j[b].width+(i.buttonSpacing||0);c.selected===b&&j[b].setState(2)}),o))c.div=l=X("div",null,{position:"relative",height:0,zIndex:1}),f.parentNode.insertBefore(l,f),c.inputGroup=l=e.g("input-group").add(),l.offset=0,c.drawInput("min"),c.drawInput("max");o&&(f=d.plotTop-35,l.align(y({y:f,width:l.offset,x:h&&f=e){this.compareValue=c[a];break}};za.prototype.tooltipFormatter=function(a){a=a.replace("{point.change}",(this.change>0?"+":"")+Qa(this.change,this.series.tooltipOptions.changeDecimals||2));return mc.apply(this,[a])};(function(){var a=T.init,b=T.getSegments;T.init=function(){var b,d;a.apply(this,arguments);b=this.chart;(d=this.xAxis)&& +d.options.ordinal&&C(this,"updatedData",function(){delete d.ordinalIndex});if(d&&d.options.ordinal&&!d.hasOrdinalExtension){d.hasOrdinalExtension=!0;d.beforeSetTickPositions=function(){var a,b=[],c=!1,e,j=this.getExtremes(),k=j.min,j=j.max,l;if(this.options.ordinal){q(this.series,function(c,d){if(c.visible!==!1&&c.takeOrdinalPosition!==!1&&(b=b.concat(c.processedXData),a=b.length,d&&a)){b.sort(function(a,b){return a-b});for(d=a-1;d--;)b[d]===b[d+1]&&b.splice(d,1)}});a=b.length;if(a>2){e=b[1]-b[0]; +for(l=a-1;l--&&!c;)b[l+1]-b[l]!==e&&(c=!0)}c?(this.ordinalPositions=b,c=d.val2lin(k,!0),e=d.val2lin(j,!0),this.ordinalSlope=j=(j-k)/(e-c),this.ordinalOffset=k-c*j):this.ordinalPositions=this.ordinalSlope=this.ordinalOffset=v}};d.val2lin=function(a,b){var c=this.ordinalPositions;if(c){var d=c.length,e,k;for(e=d;e--;)if(c[e]===a){k=e;break}for(e=d-1;e--;)if(a>c[e]||e===0){c=(a-c[e])/(c[e+1]-c[e]);k=e+c;break}return b?k:this.ordinalSlope*(k||0)+this.ordinalOffset}else return a};d.lin2val=function(a, +b){var c=this.ordinalPositions;if(c){var d=this.ordinalSlope,e=this.ordinalOffset,k=c.length-1,l,m;if(b)a<0?a=c[0]:a>k?a=c[k]:(k=W(a),m=a-k);else for(;k--;)if(l=d*k+e,a>=l){d=d*(k+1)+e;m=(a-l)/(d-l);break}return m!==v&&c[k]!==v?c[k]+(m?m*(c[k+1]-c[k]):0):a}else return a};d.getExtendedPositions=function(){var a=d.series[0].currentDataGrouping,e=d.ordinalIndex,h=a?a.count+a.unitName:"raw",i=d.getExtremes(),j,k;if(!e)e=d.ordinalIndex={};if(!e[h])j={series:[],getExtremes:function(){return{min:i.dataMin, +max:i.dataMax}},options:{ordinal:!0}},q(d.series,function(d){k={xAxis:j,xData:d.xData,chart:b,destroyGroupedData:db};k.options={dataGrouping:a?{enabled:!0,forced:!0,approximation:"open",units:[[a.unitName,[a.count]]]}:{enabled:!1}};d.processData.apply(k);j.series.push(k)}),d.beforeSetTickPositions.apply(j),e[h]=j.ordinalPositions;return e[h]};d.getGroupIntervalFactor=function(a,b,c){for(var d=0,e=c.length,k=[];dc;j[o]k*5||x)n=Ya(a,j[m],j[o],e),u=u.concat(n),m=o+1;if(x)break}a=n.info;if(l&&a.unitRange<=G[ra]){o=u.length-1;for(m=1;mc?a-1:a;for(y=void 0;l--;)m=o[l],c=y-m,y&&c1)o&&q(o,function(a){a.setState()}),i<0?(o=t,t=d.ordinalPositions?d:t):o=d.ordinalPositions?d:t,r=t.ordinalPositions,k>r[r.length-1]&&r.push(k),o=n.apply(o,[s.apply(o,[l,!0])+i,!0]),i=n.apply(t,[s.apply(t,[m,!0])+i,!0]),o>K(j.dataMin,l)&&ia.xAxis.closestPointRange*e&&d.splice(g+1,0,b.splice(h+1,b.length-h))})}})();y(Highcharts,{Axis:Ta,CanVGRenderer:rb,Chart:bb,Color:ya,Legend:Db,MouseTracker:Cb,Point:za,Tick:ab,Tooltip:Bb,Renderer:Ua,Series:V,SVGRenderer:oa,VMLRenderer:Na,arrayMin:Ha,arrayMax:sa,charts:Va,dateFormat:xa,pathAnim:Fb,getOptions:function(){return P}, +hasBidiBug:bc,isTouchDevice:nb,numberFormat:Qa,seriesTypes:R,setOptions:function(a){P=z(P,a);Qb();return P},addEvent:C,removeEvent:O,createElement:X,discardElement:Sa,css:H,each:q,extend:y,map:Ma,merge:z,pick:n,splat:ka,extendClass:$,pInt:A,wrap:tb,svg:ja,canvas:aa,vml:!ja&&!aa,product:"Highstock",version:"1.2.5"})})(); diff --git a/IPSLibrary/webfront/IPSHighcharts/Highcharts/js/highstock.src.js b/IPSLibrary/webfront/IPSHighcharts/Highcharts/js/highstock.src.js new file mode 100644 index 0000000..6e023bc --- /dev/null +++ b/IPSLibrary/webfront/IPSHighcharts/Highcharts/js/highstock.src.js @@ -0,0 +1,18807 @@ +// ==ClosureCompiler== +// @compilation_level SIMPLE_OPTIMIZATIONS + +/** + * @license Highstock JS v1.2.5 (2012-12-19) + * + * (c) 2009-2012 Torstein Hønsi + * + * License: www.highcharts.com/license + */ + +// JSLint options: +/*global Highcharts, document, window, navigator, setInterval, clearInterval, clearTimeout, setTimeout, location, jQuery, $, console */ + +(function () { +// encapsulated variables +var UNDEFINED, + doc = document, + win = window, + math = Math, + mathRound = math.round, + mathFloor = math.floor, + mathCeil = math.ceil, + mathMax = math.max, + mathMin = math.min, + mathAbs = math.abs, + mathCos = math.cos, + mathSin = math.sin, + mathPI = math.PI, + deg2rad = mathPI * 2 / 360, + + + // some variables + userAgent = navigator.userAgent, + isOpera = win.opera, + isIE = /msie/i.test(userAgent) && !isOpera, + docMode8 = doc.documentMode === 8, + isWebKit = /AppleWebKit/.test(userAgent), + isFirefox = /Firefox/.test(userAgent), + isTouchDevice = /(Mobile|Android|Windows Phone)/.test(userAgent), + SVG_NS = 'http://www.w3.org/2000/svg', + hasSVG = !!doc.createElementNS && !!doc.createElementNS(SVG_NS, 'svg').createSVGRect, + hasBidiBug = isFirefox && parseInt(userAgent.split('Firefox/')[1], 10) < 4, // issue #38 + useCanVG = !hasSVG && !isIE && !!doc.createElement('canvas').getContext, + Renderer, + hasTouch = doc.documentElement.ontouchstart !== UNDEFINED, + symbolSizes = {}, + idCounter = 0, + garbageBin, + defaultOptions, + dateFormat, // function + globalAnimation, + pathAnim, + timeUnits, + noop = function () {}, + charts = [], + + // some constants for frequently used strings + DIV = 'div', + ABSOLUTE = 'absolute', + RELATIVE = 'relative', + HIDDEN = 'hidden', + PREFIX = 'highcharts-', + VISIBLE = 'visible', + PX = 'px', + NONE = 'none', + M = 'M', + L = 'L', + /* + * Empirical lowest possible opacities for TRACKER_FILL + * IE6: 0.002 + * IE7: 0.002 + * IE8: 0.002 + * IE9: 0.00000000001 (unlimited) + * IE10: 0.0001 (exporting only) + * FF: 0.00000000001 (unlimited) + * Chrome: 0.000001 + * Safari: 0.000001 + * Opera: 0.00000000001 (unlimited) + */ + TRACKER_FILL = 'rgba(192,192,192,' + (hasSVG ? 0.0001 : 0.002) + ')', // invisible but clickable + //TRACKER_FILL = 'rgba(192,192,192,0.5)', + NORMAL_STATE = '', + HOVER_STATE = 'hover', + SELECT_STATE = 'select', + MILLISECOND = 'millisecond', + SECOND = 'second', + MINUTE = 'minute', + HOUR = 'hour', + DAY = 'day', + WEEK = 'week', + MONTH = 'month', + YEAR = 'year', + + // constants for attributes + FILL = 'fill', + LINEAR_GRADIENT = 'linearGradient', + STOPS = 'stops', + STROKE = 'stroke', + STROKE_WIDTH = 'stroke-width', + + // time methods, changed based on whether or not UTC is used + makeTime, + getMinutes, + getHours, + getDay, + getDate, + getMonth, + getFullYear, + setMinutes, + setHours, + setDate, + setMonth, + setFullYear, + + + // lookup over the types and the associated classes + seriesTypes = {}; + +// The Highcharts namespace +win.Highcharts = {}; + +/** + * Extend an object with the members of another + * @param {Object} a The object to be extended + * @param {Object} b The object to add to the first one + */ +function extend(a, b) { + var n; + if (!a) { + a = {}; + } + for (n in b) { + a[n] = b[n]; + } + return a; +} + +/** + * Take an array and turn into a hash with even number arguments as keys and odd numbers as + * values. Allows creating constants for commonly used style properties, attributes etc. + * Avoid it in performance critical situations like looping + */ +function hash() { + var i = 0, + args = arguments, + length = args.length, + obj = {}; + for (; i < length; i++) { + obj[args[i++]] = args[i]; + } + return obj; +} + +/** + * Shortcut for parseInt + * @param {Object} s + * @param {Number} mag Magnitude + */ +function pInt(s, mag) { + return parseInt(s, mag || 10); +} + +/** + * Check for string + * @param {Object} s + */ +function isString(s) { + return typeof s === 'string'; +} + +/** + * Check for object + * @param {Object} obj + */ +function isObject(obj) { + return typeof obj === 'object'; +} + +/** + * Check for array + * @param {Object} obj + */ +function isArray(obj) { + return Object.prototype.toString.call(obj) === '[object Array]'; +} + +/** + * Check for number + * @param {Object} n + */ +function isNumber(n) { + return typeof n === 'number'; +} + +function log2lin(num) { + return math.log(num) / math.LN10; +} +function lin2log(num) { + return math.pow(10, num); +} + +/** + * Remove last occurence of an item from an array + * @param {Array} arr + * @param {Mixed} item + */ +function erase(arr, item) { + var i = arr.length; + while (i--) { + if (arr[i] === item) { + arr.splice(i, 1); + break; + } + } + //return arr; +} + +/** + * Returns true if the object is not null or undefined. Like MooTools' $.defined. + * @param {Object} obj + */ +function defined(obj) { + return obj !== UNDEFINED && obj !== null; +} + +/** + * Set or get an attribute or an object of attributes. Can't use jQuery attr because + * it attempts to set expando properties on the SVG element, which is not allowed. + * + * @param {Object} elem The DOM element to receive the attribute(s) + * @param {String|Object} prop The property or an abject of key-value pairs + * @param {String} value The value if a single property is set + */ +function attr(elem, prop, value) { + var key, + setAttribute = 'setAttribute', + ret; + + // if the prop is a string + if (isString(prop)) { + // set the value + if (defined(value)) { + + elem[setAttribute](prop, value); + + // get the value + } else if (elem && elem.getAttribute) { // elem not defined when printing pie demo... + ret = elem.getAttribute(prop); + } + + // else if prop is defined, it is a hash of key/value pairs + } else if (defined(prop) && isObject(prop)) { + for (key in prop) { + elem[setAttribute](key, prop[key]); + } + } + return ret; +} +/** + * Check if an element is an array, and if not, make it into an array. Like + * MooTools' $.splat. + */ +function splat(obj) { + return isArray(obj) ? obj : [obj]; +} + + +/** + * Return the first value that is defined. Like MooTools' $.pick. + */ +function pick() { + var args = arguments, + i, + arg, + length = args.length; + for (i = 0; i < length; i++) { + arg = args[i]; + if (typeof arg !== 'undefined' && arg !== null) { + return arg; + } + } +} + +/** + * Set CSS on a given element + * @param {Object} el + * @param {Object} styles Style object with camel case property names + */ +function css(el, styles) { + if (isIE) { + if (styles && styles.opacity !== UNDEFINED) { + styles.filter = 'alpha(opacity=' + (styles.opacity * 100) + ')'; + } + } + extend(el.style, styles); +} + +/** + * Utility function to create element with attributes and styles + * @param {Object} tag + * @param {Object} attribs + * @param {Object} styles + * @param {Object} parent + * @param {Object} nopad + */ +function createElement(tag, attribs, styles, parent, nopad) { + var el = doc.createElement(tag); + if (attribs) { + extend(el, attribs); + } + if (nopad) { + css(el, {padding: 0, border: NONE, margin: 0}); + } + if (styles) { + css(el, styles); + } + if (parent) { + parent.appendChild(el); + } + return el; +} + +/** + * Extend a prototyped class by new members + * @param {Object} parent + * @param {Object} members + */ +function extendClass(parent, members) { + var object = function () {}; + object.prototype = new parent(); + extend(object.prototype, members); + return object; +} + +/** + * How many decimals are there in a number + */ +function getDecimals(number) { + + number = (number || 0).toString(); + + return number.indexOf('.') > -1 ? + number.split('.')[1].length : + 0; +} + +/** + * Format a number and return a string based on input settings + * @param {Number} number The input number to format + * @param {Number} decimals The amount of decimals + * @param {String} decPoint The decimal point, defaults to the one given in the lang options + * @param {String} thousandsSep The thousands separator, defaults to the one given in the lang options + */ +function numberFormat(number, decimals, decPoint, thousandsSep) { + var lang = defaultOptions.lang, + // http://kevin.vanzonneveld.net/techblog/article/javascript_equivalent_for_phps_number_format/ + n = number, + c = decimals === -1 ? + getDecimals(number) : + (isNaN(decimals = mathAbs(decimals)) ? 2 : decimals), + d = decPoint === undefined ? lang.decimalPoint : decPoint, + t = thousandsSep === undefined ? lang.thousandsSep : thousandsSep, + s = n < 0 ? "-" : "", + i = String(pInt(n = mathAbs(+n || 0).toFixed(c))), + j = i.length > 3 ? i.length % 3 : 0; + + return s + (j ? i.substr(0, j) + t : "") + i.substr(j).replace(/(\d{3})(?=\d)/g, "$1" + t) + + (c ? d + mathAbs(n - i).toFixed(c).slice(2) : ""); +} + +/** + * Pad a string to a given length by adding 0 to the beginning + * @param {Number} number + * @param {Number} length + */ +function pad(number, length) { + // Create an array of the remaining length +1 and join it with 0's + return new Array((length || 2) + 1 - String(number).length).join(0) + number; +} + +/** + * Wrap a method with extended functionality, preserving the original function + * @param {Object} obj The context object that the method belongs to + * @param {String} method The name of the method to extend + * @param {Function} func A wrapper function callback. This function is called with the same arguments + * as the original function, except that the original function is unshifted and passed as the first + * argument. + */ +function wrap(obj, method, func) { + var proceed = obj[method]; + obj[method] = function () { + var args = Array.prototype.slice.call(arguments); + args.unshift(proceed); + return func.apply(this, args); + }; +} + +/** + * Based on http://www.php.net/manual/en/function.strftime.php + * @param {String} format + * @param {Number} timestamp + * @param {Boolean} capitalize + */ +dateFormat = function (format, timestamp, capitalize) { + if (!defined(timestamp) || isNaN(timestamp)) { + return 'Invalid date'; + } + format = pick(format, '%Y-%m-%d %H:%M:%S'); + + var date = new Date(timestamp), + key, // used in for constuct below + // get the basic time values + hours = date[getHours](), + day = date[getDay](), + dayOfMonth = date[getDate](), + month = date[getMonth](), + fullYear = date[getFullYear](), + lang = defaultOptions.lang, + langWeekdays = lang.weekdays, + /* // uncomment this and the 'W' format key below to enable week numbers + weekNumber = function () { + var clone = new Date(date.valueOf()), + day = clone[getDay]() == 0 ? 7 : clone[getDay](), + dayNumber; + clone.setDate(clone[getDate]() + 4 - day); + dayNumber = mathFloor((clone.getTime() - new Date(clone[getFullYear](), 0, 1, -6)) / 86400000); + return 1 + mathFloor(dayNumber / 7); + }, + */ + + // list all format keys + replacements = { + + // Day + 'a': langWeekdays[day].substr(0, 3), // Short weekday, like 'Mon' + 'A': langWeekdays[day], // Long weekday, like 'Monday' + 'd': pad(dayOfMonth), // Two digit day of the month, 01 to 31 + 'e': dayOfMonth, // Day of the month, 1 through 31 + + // Week (none implemented) + //'W': weekNumber(), + + // Month + 'b': lang.shortMonths[month], // Short month, like 'Jan' + 'B': lang.months[month], // Long month, like 'January' + 'm': pad(month + 1), // Two digit month number, 01 through 12 + + // Year + 'y': fullYear.toString().substr(2, 2), // Two digits year, like 09 for 2009 + 'Y': fullYear, // Four digits year, like 2009 + + // Time + 'H': pad(hours), // Two digits hours in 24h format, 00 through 23 + 'I': pad((hours % 12) || 12), // Two digits hours in 12h format, 00 through 11 + 'l': (hours % 12) || 12, // Hours in 12h format, 1 through 12 + 'M': pad(date[getMinutes]()), // Two digits minutes, 00 through 59 + 'p': hours < 12 ? 'AM' : 'PM', // Upper case AM or PM + 'P': hours < 12 ? 'am' : 'pm', // Lower case AM or PM + 'S': pad(date.getSeconds()), // Two digits seconds, 00 through 59 + 'L': pad(mathRound(timestamp % 1000), 3) // Milliseconds (naming from Ruby) + }; + + + // do the replaces + for (key in replacements) { + while (format.indexOf('%' + key) !== -1) { // regex would do it in one line, but this is faster + format = format.replace('%' + key, replacements[key]); + } + } + + // Optionally capitalize the string and return + return capitalize ? format.substr(0, 1).toUpperCase() + format.substr(1) : format; +}; + +/** + * Take an interval and normalize it to multiples of 1, 2, 2.5 and 5 + * @param {Number} interval + * @param {Array} multiples + * @param {Number} magnitude + * @param {Object} options + */ +function normalizeTickInterval(interval, multiples, magnitude, options) { + var normalized, i; + + // round to a tenfold of 1, 2, 2.5 or 5 + magnitude = pick(magnitude, 1); + normalized = interval / magnitude; + + // multiples for a linear scale + if (!multiples) { + multiples = [1, 2, 2.5, 5, 10]; + + // the allowDecimals option + if (options && options.allowDecimals === false) { + if (magnitude === 1) { + multiples = [1, 2, 5, 10]; + } else if (magnitude <= 0.1) { + multiples = [1 / magnitude]; + } + } + } + + // normalize the interval to the nearest multiple + for (i = 0; i < multiples.length; i++) { + interval = multiples[i]; + if (normalized <= (multiples[i] + (multiples[i + 1] || multiples[i])) / 2) { + break; + } + } + + // multiply back to the correct magnitude + interval *= magnitude; + + return interval; +} + +/** + * Get a normalized tick interval for dates. Returns a configuration object with + * unit range (interval), count and name. Used to prepare data for getTimeTicks. + * Previously this logic was part of getTimeTicks, but as getTimeTicks now runs + * of segments in stock charts, the normalizing logic was extracted in order to + * prevent it for running over again for each segment having the same interval. + * #662, #697. + */ +function normalizeTimeTickInterval(tickInterval, unitsOption) { + var units = unitsOption || [[ + MILLISECOND, // unit name + [1, 2, 5, 10, 20, 25, 50, 100, 200, 500] // allowed multiples + ], [ + SECOND, + [1, 2, 5, 10, 15, 30] + ], [ + MINUTE, + [1, 2, 5, 10, 15, 30] + ], [ + HOUR, + [1, 2, 3, 4, 6, 8, 12] + ], [ + DAY, + [1, 2] + ], [ + WEEK, + [1, 2] + ], [ + MONTH, + [1, 2, 3, 4, 6] + ], [ + YEAR, + null + ]], + unit = units[units.length - 1], // default unit is years + interval = timeUnits[unit[0]], + multiples = unit[1], + count, + i; + + // loop through the units to find the one that best fits the tickInterval + for (i = 0; i < units.length; i++) { + unit = units[i]; + interval = timeUnits[unit[0]]; + multiples = unit[1]; + + + if (units[i + 1]) { + // lessThan is in the middle between the highest multiple and the next unit. + var lessThan = (interval * multiples[multiples.length - 1] + + timeUnits[units[i + 1][0]]) / 2; + + // break and keep the current unit + if (tickInterval <= lessThan) { + break; + } + } + } + + // prevent 2.5 years intervals, though 25, 250 etc. are allowed + if (interval === timeUnits[YEAR] && tickInterval < 5 * interval) { + multiples = [1, 2, 5]; + } + + // prevent 2.5 years intervals, though 25, 250 etc. are allowed + if (interval === timeUnits[YEAR] && tickInterval < 5 * interval) { + multiples = [1, 2, 5]; + } + + // get the count + count = normalizeTickInterval(tickInterval / interval, multiples); + + return { + unitRange: interval, + count: count, + unitName: unit[0] + }; +} + +/** + * Set the tick positions to a time unit that makes sense, for example + * on the first of each month or on every Monday. Return an array + * with the time positions. Used in datetime axes as well as for grouping + * data on a datetime axis. + * + * @param {Object} normalizedInterval The interval in axis values (ms) and the count + * @param {Number} min The minimum in axis values + * @param {Number} max The maximum in axis values + * @param {Number} startOfWeek + */ +function getTimeTicks(normalizedInterval, min, max, startOfWeek) { + var tickPositions = [], + i, + higherRanks = {}, + useUTC = defaultOptions.global.useUTC, + minYear, // used in months and years as a basis for Date.UTC() + minDate = new Date(min), + interval = normalizedInterval.unitRange, + count = normalizedInterval.count; + + if (defined(min)) { // #1300 + if (interval >= timeUnits[SECOND]) { // second + minDate.setMilliseconds(0); + minDate.setSeconds(interval >= timeUnits[MINUTE] ? 0 : + count * mathFloor(minDate.getSeconds() / count)); + } + + if (interval >= timeUnits[MINUTE]) { // minute + minDate[setMinutes](interval >= timeUnits[HOUR] ? 0 : + count * mathFloor(minDate[getMinutes]() / count)); + } + + if (interval >= timeUnits[HOUR]) { // hour + minDate[setHours](interval >= timeUnits[DAY] ? 0 : + count * mathFloor(minDate[getHours]() / count)); + } + + if (interval >= timeUnits[DAY]) { // day + minDate[setDate](interval >= timeUnits[MONTH] ? 1 : + count * mathFloor(minDate[getDate]() / count)); + } + + if (interval >= timeUnits[MONTH]) { // month + minDate[setMonth](interval >= timeUnits[YEAR] ? 0 : + count * mathFloor(minDate[getMonth]() / count)); + minYear = minDate[getFullYear](); + } + + if (interval >= timeUnits[YEAR]) { // year + minYear -= minYear % count; + minDate[setFullYear](minYear); + } + + // week is a special case that runs outside the hierarchy + if (interval === timeUnits[WEEK]) { + // get start of current week, independent of count + minDate[setDate](minDate[getDate]() - minDate[getDay]() + + pick(startOfWeek, 1)); + } + + + // get tick positions + i = 1; + minYear = minDate[getFullYear](); + var time = minDate.getTime(), + minMonth = minDate[getMonth](), + minDateDate = minDate[getDate](), + timezoneOffset = useUTC ? + 0 : + (24 * 3600 * 1000 + minDate.getTimezoneOffset() * 60 * 1000) % (24 * 3600 * 1000); // #950 + + // iterate and add tick positions at appropriate values + while (time < max) { + tickPositions.push(time); + + // if the interval is years, use Date.UTC to increase years + if (interval === timeUnits[YEAR]) { + time = makeTime(minYear + i * count, 0); + + // if the interval is months, use Date.UTC to increase months + } else if (interval === timeUnits[MONTH]) { + time = makeTime(minYear, minMonth + i * count); + + // if we're using global time, the interval is not fixed as it jumps + // one hour at the DST crossover + } else if (!useUTC && (interval === timeUnits[DAY] || interval === timeUnits[WEEK])) { + time = makeTime(minYear, minMonth, minDateDate + + i * count * (interval === timeUnits[DAY] ? 1 : 7)); + + // else, the interval is fixed and we use simple addition + } else { + time += interval * count; + + // mark new days if the time is dividable by day + if (interval <= timeUnits[HOUR] && time % timeUnits[DAY] === timezoneOffset) { + higherRanks[time] = DAY; + } + } + + i++; + } + + // push the last time + tickPositions.push(time); + } + + // record information on the chosen unit - for dynamic label formatter + tickPositions.info = extend(normalizedInterval, { + higherRanks: higherRanks, + totalRange: interval * count + }); + + return tickPositions; +} + +/** + * Helper class that contains variuos counters that are local to the chart. + */ +function ChartCounters() { + this.color = 0; + this.symbol = 0; +} + +ChartCounters.prototype = { + /** + * Wraps the color counter if it reaches the specified length. + */ + wrapColor: function (length) { + if (this.color >= length) { + this.color = 0; + } + }, + + /** + * Wraps the symbol counter if it reaches the specified length. + */ + wrapSymbol: function (length) { + if (this.symbol >= length) { + this.symbol = 0; + } + } +}; + + +/** + * Utility method that sorts an object array and keeping the order of equal items. + * ECMA script standard does not specify the behaviour when items are equal. + */ +function stableSort(arr, sortFunction) { + var length = arr.length, + sortValue, + i; + + // Add index to each item + for (i = 0; i < length; i++) { + arr[i].ss_i = i; // stable sort index + } + + arr.sort(function (a, b) { + sortValue = sortFunction(a, b); + return sortValue === 0 ? a.ss_i - b.ss_i : sortValue; + }); + + // Remove index from items + for (i = 0; i < length; i++) { + delete arr[i].ss_i; // stable sort index + } +} + +/** + * Non-recursive method to find the lowest member of an array. Math.min raises a maximum + * call stack size exceeded error in Chrome when trying to apply more than 150.000 points. This + * method is slightly slower, but safe. + */ +function arrayMin(data) { + var i = data.length, + min = data[0]; + + while (i--) { + if (data[i] < min) { + min = data[i]; + } + } + return min; +} + +/** + * Non-recursive method to find the lowest member of an array. Math.min raises a maximum + * call stack size exceeded error in Chrome when trying to apply more than 150.000 points. This + * method is slightly slower, but safe. + */ +function arrayMax(data) { + var i = data.length, + max = data[0]; + + while (i--) { + if (data[i] > max) { + max = data[i]; + } + } + return max; +} + +/** + * Utility method that destroys any SVGElement or VMLElement that are properties on the given object. + * It loops all properties and invokes destroy if there is a destroy method. The property is + * then delete'ed. + * @param {Object} The object to destroy properties on + * @param {Object} Exception, do not destroy this property, only delete it. + */ +function destroyObjectProperties(obj, except) { + var n; + for (n in obj) { + // If the object is non-null and destroy is defined + if (obj[n] && obj[n] !== except && obj[n].destroy) { + // Invoke the destroy + obj[n].destroy(); + } + + // Delete the property from the object. + delete obj[n]; + } +} + + +/** + * Discard an element by moving it to the bin and delete + * @param {Object} The HTML node to discard + */ +function discardElement(element) { + // create a garbage bin element, not part of the DOM + if (!garbageBin) { + garbageBin = createElement(DIV); + } + + // move the node and empty bin + if (element) { + garbageBin.appendChild(element); + } + garbageBin.innerHTML = ''; +} + +/** + * Provide error messages for debugging, with links to online explanation + */ +function error(code, stop) { + var msg = 'Highcharts error #' + code + ': www.highcharts.com/errors/' + code; + if (stop) { + throw msg; + } else if (win.console) { + console.log(msg); + } +} + +/** + * Fix JS round off float errors + * @param {Number} num + */ +function correctFloat(num) { + return parseFloat( + num.toPrecision(14) + ); +} + +/** + * Set the global animation to either a given value, or fall back to the + * given chart's animation option + * @param {Object} animation + * @param {Object} chart + */ +function setAnimation(animation, chart) { + globalAnimation = pick(animation, chart.animation); +} + +/** + * The time unit lookup + */ +/*jslint white: true*/ +timeUnits = hash( + MILLISECOND, 1, + SECOND, 1000, + MINUTE, 60000, + HOUR, 3600000, + DAY, 24 * 3600000, + WEEK, 7 * 24 * 3600000, + MONTH, 31 * 24 * 3600000, + YEAR, 31556952000 +); +/*jslint white: false*/ +/** + * Path interpolation algorithm used across adapters + */ +pathAnim = { + /** + * Prepare start and end values so that the path can be animated one to one + */ + init: function (elem, fromD, toD) { + fromD = fromD || ''; + var shift = elem.shift, + bezier = fromD.indexOf('C') > -1, + numParams = bezier ? 7 : 3, + endLength, + slice, + i, + start = fromD.split(' '), + end = [].concat(toD), // copy + startBaseLine, + endBaseLine, + sixify = function (arr) { // in splines make move points have six parameters like bezier curves + i = arr.length; + while (i--) { + if (arr[i] === M) { + arr.splice(i + 1, 0, arr[i + 1], arr[i + 2], arr[i + 1], arr[i + 2]); + } + } + }; + + if (bezier) { + sixify(start); + sixify(end); + } + + // pull out the base lines before padding + if (elem.isArea) { + startBaseLine = start.splice(start.length - 6, 6); + endBaseLine = end.splice(end.length - 6, 6); + } + + // if shifting points, prepend a dummy point to the end path + if (shift <= end.length / numParams) { + while (shift--) { + end = [].concat(end).splice(0, numParams).concat(end); + } + } + elem.shift = 0; // reset for following animations + + // copy and append last point until the length matches the end length + if (start.length) { + endLength = end.length; + while (start.length < endLength) { + + //bezier && sixify(start); + slice = [].concat(start).splice(start.length - numParams, numParams); + if (bezier) { // disable first control point + slice[numParams - 6] = slice[numParams - 2]; + slice[numParams - 5] = slice[numParams - 1]; + } + start = start.concat(slice); + } + } + + if (startBaseLine) { // append the base lines for areas + start = start.concat(startBaseLine); + end = end.concat(endBaseLine); + } + return [start, end]; + }, + + /** + * Interpolate each value of the path and return the array + */ + step: function (start, end, pos, complete) { + var ret = [], + i = start.length, + startVal; + + if (pos === 1) { // land on the final path without adjustment points appended in the ends + ret = complete; + + } else if (i === end.length && pos < 1) { + while (i--) { + startVal = parseFloat(start[i]); + ret[i] = + isNaN(startVal) ? // a letter instruction like M or L + start[i] : + pos * (parseFloat(end[i] - startVal)) + startVal; + + } + } else { // if animation is finished or length not matching, land on right value + ret = end; + } + return ret; + } +}; + +(function ($) { + /** + * The default HighchartsAdapter for jQuery + */ + win.HighchartsAdapter = win.HighchartsAdapter || ($ && { + + /** + * Initialize the adapter by applying some extensions to jQuery + */ + init: function (pathAnim) { + + // extend the animate function to allow SVG animations + var Fx = $.fx, + Step = Fx.step, + dSetter, + Tween = $.Tween, + propHooks = Tween && Tween.propHooks; + + /*jslint unparam: true*//* allow unused param x in this function */ + $.extend($.easing, { + easeOutQuad: function (x, t, b, c, d) { + return -c * (t /= d) * (t - 2) + b; + } + }); + /*jslint unparam: false*/ + + + // extend some methods to check for elem.attr, which means it is a Highcharts SVG object + $.each(['cur', '_default', 'width', 'height'], function (i, fn) { + var obj = Step, + base, + elem; + + // Handle different parent objects + if (fn === 'cur') { + obj = Fx.prototype; // 'cur', the getter, relates to Fx.prototype + + } else if (fn === '_default' && Tween) { // jQuery 1.8 model + obj = propHooks[fn]; + fn = 'set'; + } + + // Overwrite the method + base = obj[fn]; + if (base) { // step.width and step.height don't exist in jQuery < 1.7 + + // create the extended function replacement + obj[fn] = function (fx) { + + // Fx.prototype.cur does not use fx argument + fx = i ? fx : this; + + // shortcut + elem = fx.elem; + + // Fx.prototype.cur returns the current value. The other ones are setters + // and returning a value has no effect. + return elem.attr ? // is SVG element wrapper + elem.attr(fx.prop, fn === 'cur' ? UNDEFINED : fx.now) : // apply the SVG wrapper's method + base.apply(this, arguments); // use jQuery's built-in method + }; + } + }); + + + // Define the setter function for d (path definitions) + dSetter = function (fx) { + var elem = fx.elem, + ends; + + // Normally start and end should be set in state == 0, but sometimes, + // for reasons unknown, this doesn't happen. Perhaps state == 0 is skipped + // in these cases + if (!fx.started) { + ends = pathAnim.init(elem, elem.d, elem.toD); + fx.start = ends[0]; + fx.end = ends[1]; + fx.started = true; + } + + + // interpolate each value of the path + elem.attr('d', pathAnim.step(fx.start, fx.end, fx.pos, elem.toD)); + }; + + // jQuery 1.8 style + if (Tween) { + propHooks.d = { + set: dSetter + }; + // pre 1.8 + } else { + // animate paths + Step.d = dSetter; + } + + /** + * Utility for iterating over an array. Parameters are reversed compared to jQuery. + * @param {Array} arr + * @param {Function} fn + */ + this.each = Array.prototype.forEach ? + function (arr, fn) { // modern browsers + return Array.prototype.forEach.call(arr, fn); + + } : + function (arr, fn) { // legacy + var i = 0, + len = arr.length; + for (; i < len; i++) { + if (fn.call(arr[i], arr[i], i, arr) === false) { + return i; + } + } + }; + + // Register Highcharts as a jQuery plugin + // TODO: MooTools and prototype as well? + // TODO: StockChart + /*$.fn.highcharts = function(options, callback) { + options.chart = merge(options.chart, { renderTo: this[0] }); + this.chart = new Chart(options, callback); + return this; + };*/ + }, + + /** + * Downloads a script and executes a callback when done. + * @param {String} scriptLocation + * @param {Function} callback + */ + getScript: $.getScript, + + /** + * Return the index of an item in an array, or -1 if not found + */ + inArray: $.inArray, + + /** + * A direct link to jQuery methods. MooTools and Prototype adapters must be implemented for each case of method. + * @param {Object} elem The HTML element + * @param {String} method Which method to run on the wrapped element + */ + adapterRun: function (elem, method) { + return $(elem)[method](); + }, + + /** + * Filter an array + */ + grep: $.grep, + + /** + * Map an array + * @param {Array} arr + * @param {Function} fn + */ + map: function (arr, fn) { + //return jQuery.map(arr, fn); + var results = [], + i = 0, + len = arr.length; + for (; i < len; i++) { + results[i] = fn.call(arr[i], arr[i], i, arr); + } + return results; + + }, + + /** + * Deep merge two objects and return a third object + */ + merge: function () { + var args = arguments; + return $.extend(true, null, args[0], args[1], args[2], args[3]); + }, + + /** + * Get the position of an element relative to the top left of the page + */ + offset: function (el) { + return $(el).offset(); + }, + + /** + * Add an event listener + * @param {Object} el A HTML element or custom object + * @param {String} event The event type + * @param {Function} fn The event handler + */ + addEvent: function (el, event, fn) { + $(el).bind(event, fn); + }, + + /** + * Remove event added with addEvent + * @param {Object} el The object + * @param {String} eventType The event type. Leave blank to remove all events. + * @param {Function} handler The function to remove + */ + removeEvent: function (el, eventType, handler) { + // workaround for jQuery issue with unbinding custom events: + // http://forum.jQuery.com/topic/javascript-error-when-unbinding-a-custom-event-using-jQuery-1-4-2 + var func = doc.removeEventListener ? 'removeEventListener' : 'detachEvent'; + if (doc[func] && !el[func]) { + el[func] = function () {}; + } + + $(el).unbind(eventType, handler); + }, + + /** + * Fire an event on a custom object + * @param {Object} el + * @param {String} type + * @param {Object} eventArguments + * @param {Function} defaultFunction + */ + fireEvent: function (el, type, eventArguments, defaultFunction) { + var event = $.Event(type), + detachedType = 'detached' + type, + defaultPrevented; + + // Remove warnings in Chrome when accessing layerX and layerY. Although Highcharts + // never uses these properties, Chrome includes them in the default click event and + // raises the warning when they are copied over in the extend statement below. + // + // To avoid problems in IE (see #1010) where we cannot delete the properties and avoid + // testing if they are there (warning in chrome) the only option is to test if running IE. + if (!isIE && eventArguments) { + delete eventArguments.layerX; + delete eventArguments.layerY; + } + + extend(event, eventArguments); + + // Prevent jQuery from triggering the object method that is named the + // same as the event. For example, if the event is 'select', jQuery + // attempts calling el.select and it goes into a loop. + if (el[type]) { + el[detachedType] = el[type]; + el[type] = null; + } + + // Wrap preventDefault and stopPropagation in try/catch blocks in + // order to prevent JS errors when cancelling events on non-DOM + // objects. #615. + /*jslint unparam: true*/ + $.each(['preventDefault', 'stopPropagation'], function (i, fn) { + var base = event[fn]; + event[fn] = function () { + try { + base.call(event); + } catch (e) { + if (fn === 'preventDefault') { + defaultPrevented = true; + } + } + }; + }); + /*jslint unparam: false*/ + + // trigger it + $(el).trigger(event); + + // attach the method + if (el[detachedType]) { + el[type] = el[detachedType]; + el[detachedType] = null; + } + + if (defaultFunction && !event.isDefaultPrevented() && !defaultPrevented) { + defaultFunction(event); + } + }, + + /** + * Extension method needed for MooTools + */ + washMouseEvent: function (e) { + var ret = e.originalEvent || e; + + // computed by jQuery, needed by IE8 + if (ret.pageX === UNDEFINED) { // #1236 + ret.pageX = e.pageX; + ret.pageY = e.pageY; + } + + return ret; + }, + + /** + * Animate a HTML element or SVG element wrapper + * @param {Object} el + * @param {Object} params + * @param {Object} options jQuery-like animation options: duration, easing, callback + */ + animate: function (el, params, options) { + var $el = $(el); + if (params.d) { + el.toD = params.d; // keep the array form for paths, used in $.fx.step.d + params.d = 1; // because in jQuery, animating to an array has a different meaning + } + + $el.stop(); + $el.animate(params, options); + + }, + /** + * Stop running animation + */ + stop: function (el) { + $(el).stop(); + } + }); +}(win.jQuery)); + + +// check for a custom HighchartsAdapter defined prior to this file +var globalAdapter = win.HighchartsAdapter, + adapter = globalAdapter || {}; + +// Initialize the adapter +if (globalAdapter) { + globalAdapter.init.call(globalAdapter, pathAnim); +} + + + // Utility functions. If the HighchartsAdapter is not defined, adapter is an empty object + // and all the utility functions will be null. In that case they are populated by the + // default adapters below. +var adapterRun = adapter.adapterRun, + getScript = adapter.getScript, + inArray = adapter.inArray, + each = adapter.each, + grep = adapter.grep, + offset = adapter.offset, + map = adapter.map, + merge = adapter.merge, + addEvent = adapter.addEvent, + removeEvent = adapter.removeEvent, + fireEvent = adapter.fireEvent, + washMouseEvent = adapter.washMouseEvent, + animate = adapter.animate, + stop = adapter.stop; + + + +/* **************************************************************************** + * Handle the options * + *****************************************************************************/ +var + +defaultLabelOptions = { + enabled: true, + // rotation: 0, + align: 'center', + x: 0, + y: 15, + /*formatter: function () { + return this.value; + },*/ + style: { + color: '#666', + fontSize: '11px', + lineHeight: '14px' + } +}; + +defaultOptions = { + colors: ['#4572A7', '#AA4643', '#89A54E', '#80699B', '#3D96AE', + '#DB843D', '#92A8CD', '#A47D7C', '#B5CA92'], + symbols: ['circle', 'diamond', 'square', 'triangle', 'triangle-down'], + lang: { + loading: 'Loading...', + months: ['January', 'February', 'March', 'April', 'May', 'June', 'July', + 'August', 'September', 'October', 'November', 'December'], + shortMonths: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'], + weekdays: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'], + decimalPoint: '.', + numericSymbols: ['k', 'M', 'G', 'T', 'P', 'E'], // SI prefixes used in axis labels + resetZoom: 'Reset zoom', + resetZoomTitle: 'Reset zoom level 1:1', + thousandsSep: ',' + }, + global: { + useUTC: true, + canvasToolsURL: 'http://code.highcharts.com/stock/1.2.5/modules/canvas-tools.js', + VMLRadialGradientURL: 'http://code.highcharts.com/stock/1.2.5/gfx/vml-radial-gradient.png' + }, + chart: { + //animation: true, + //alignTicks: false, + //reflow: true, + //className: null, + //events: { load, selection }, + //margin: [null], + //marginTop: null, + //marginRight: null, + //marginBottom: null, + //marginLeft: null, + borderColor: '#4572A7', + //borderWidth: 0, + borderRadius: 5, + defaultSeriesType: 'line', + ignoreHiddenSeries: true, + //inverted: false, + //shadow: false, + spacingTop: 10, + spacingRight: 10, + spacingBottom: 15, + spacingLeft: 10, + style: { + fontFamily: '"Lucida Grande", "Lucida Sans Unicode", Verdana, Arial, Helvetica, sans-serif', // default font + fontSize: '12px' + }, + backgroundColor: '#FFFFFF', + //plotBackgroundColor: null, + plotBorderColor: '#C0C0C0', + //plotBorderWidth: 0, + //plotShadow: false, + //zoomType: '' + resetZoomButton: { + theme: { + zIndex: 20 + }, + position: { + align: 'right', + x: -10, + //verticalAlign: 'top', + y: 10 + } + // relativeTo: 'plot' + } + }, + title: { + text: 'Chart title', + align: 'center', + // floating: false, + // margin: 15, + // x: 0, + // verticalAlign: 'top', + y: 15, + style: { + color: '#3E576F', + fontSize: '16px' + } + + }, + subtitle: { + text: '', + align: 'center', + // floating: false + // x: 0, + // verticalAlign: 'top', + y: 30, + style: { + color: '#6D869F' + } + }, + + plotOptions: { + line: { // base series options + allowPointSelect: false, + showCheckbox: false, + animation: { + duration: 1000 + }, + //connectNulls: false, + //cursor: 'default', + //clip: true, + //dashStyle: null, + //enableMouseTracking: true, + events: {}, + //legendIndex: 0, + lineWidth: 2, + shadow: true, + // stacking: null, + marker: { + enabled: true, + //symbol: null, + lineWidth: 0, + radius: 4, + lineColor: '#FFFFFF', + //fillColor: null, + states: { // states for a single point + hover: { + enabled: true + //radius: base + 2 + }, + select: { + fillColor: '#FFFFFF', + lineColor: '#000000', + lineWidth: 2 + } + } + }, + point: { + events: {} + }, + dataLabels: merge(defaultLabelOptions, { + enabled: false, + formatter: function () { + return this.y; + }, + verticalAlign: 'bottom', // above singular point + y: 0 + // backgroundColor: undefined, + // borderColor: undefined, + // borderRadius: undefined, + // borderWidth: undefined, + // padding: 3, + // shadow: false + }), + cropThreshold: 300, // draw points outside the plot area when the number of points is less than this + pointRange: 0, + //pointStart: 0, + //pointInterval: 1, + showInLegend: true, + states: { // states for the entire series + hover: { + //enabled: false, + //lineWidth: base + 1, + marker: { + // lineWidth: base + 1, + // radius: base + 1 + } + }, + select: { + marker: {} + } + }, + stickyTracking: true + //tooltip: { + //pointFormat: '{series.name}: {point.y}' + //valueDecimals: null, + //xDateFormat: '%A, %b %e, %Y', + //valuePrefix: '', + //ySuffix: '' + //} + // turboThreshold: 1000 + // zIndex: null + } + }, + labels: { + //items: [], + style: { + //font: defaultFont, + position: ABSOLUTE, + color: '#3E576F' + } + }, + legend: { + enabled: true, + align: 'center', + //floating: false, + layout: 'horizontal', + labelFormatter: function () { + return this.name; + }, + borderWidth: 1, + borderColor: '#909090', + borderRadius: 5, + navigation: { + // animation: true, + activeColor: '#3E576F', + // arrowSize: 12 + inactiveColor: '#CCC' + // style: {} // text styles + }, + // margin: 10, + // reversed: false, + shadow: false, + // backgroundColor: null, + /*style: { + padding: '5px' + },*/ + itemStyle: { + cursor: 'pointer', + color: '#3E576F', + fontSize: '12px' + }, + itemHoverStyle: { + //cursor: 'pointer', removed as of #601 + color: '#000' + }, + itemHiddenStyle: { + color: '#CCC' + }, + itemCheckboxStyle: { + position: ABSOLUTE, + width: '13px', // for IE precision + height: '13px' + }, + // itemWidth: undefined, + symbolWidth: 16, + symbolPadding: 5, + verticalAlign: 'bottom', + // width: undefined, + x: 0, + y: 0 + }, + + loading: { + // hideDuration: 100, + labelStyle: { + fontWeight: 'bold', + position: RELATIVE, + top: '1em' + }, + // showDuration: 0, + style: { + position: ABSOLUTE, + backgroundColor: 'white', + opacity: 0.5, + textAlign: 'center' + } + }, + + tooltip: { + enabled: true, + //crosshairs: null, + backgroundColor: 'rgba(255, 255, 255, .85)', + borderWidth: 2, + borderRadius: 5, + dateTimeLabelFormats: { + millisecond: '%A, %b %e, %H:%M:%S.%L', + second: '%A, %b %e, %H:%M:%S', + minute: '%A, %b %e, %H:%M', + hour: '%A, %b %e, %H:%M', + day: '%A, %b %e, %Y', + week: 'Week from %A, %b %e, %Y', + month: '%B %Y', + year: '%Y' + }, + //formatter: defaultFormatter, + headerFormat: '{point.key}
', + pointFormat: '{series.name}: {point.y}
', + shadow: true, + shared: useCanVG, + snap: isTouchDevice ? 25 : 10, + style: { + color: '#333333', + fontSize: '12px', + padding: '5px', + whiteSpace: 'nowrap' + } + //xDateFormat: '%A, %b %e, %Y', + //valueDecimals: null, + //valuePrefix: '', + //valueSuffix: '' + }, + + credits: { + enabled: true, + text: 'Highcharts.com', + href: 'http://www.highcharts.com', + position: { + align: 'right', + x: -10, + verticalAlign: 'bottom', + y: -5 + }, + style: { + cursor: 'pointer', + color: '#909090', + fontSize: '10px' + } + } +}; + + + + +// Series defaults +var defaultPlotOptions = defaultOptions.plotOptions, + defaultSeriesOptions = defaultPlotOptions.line; + +// set the default time methods +setTimeMethods(); + + + +/** + * Set the time methods globally based on the useUTC option. Time method can be either + * local time or UTC (default). + */ +function setTimeMethods() { + var useUTC = defaultOptions.global.useUTC, + GET = useUTC ? 'getUTC' : 'get', + SET = useUTC ? 'setUTC' : 'set'; + + makeTime = useUTC ? Date.UTC : function (year, month, date, hours, minutes, seconds) { + return new Date( + year, + month, + pick(date, 1), + pick(hours, 0), + pick(minutes, 0), + pick(seconds, 0) + ).getTime(); + }; + getMinutes = GET + 'Minutes'; + getHours = GET + 'Hours'; + getDay = GET + 'Day'; + getDate = GET + 'Date'; + getMonth = GET + 'Month'; + getFullYear = GET + 'FullYear'; + setMinutes = SET + 'Minutes'; + setHours = SET + 'Hours'; + setDate = SET + 'Date'; + setMonth = SET + 'Month'; + setFullYear = SET + 'FullYear'; + +} + +/** + * Merge the default options with custom options and return the new options structure + * @param {Object} options The new custom options + */ +function setOptions(options) { + + // Pull out axis options and apply them to the respective default axis options + /*defaultXAxisOptions = merge(defaultXAxisOptions, options.xAxis); + defaultYAxisOptions = merge(defaultYAxisOptions, options.yAxis); + options.xAxis = options.yAxis = UNDEFINED;*/ + + // Merge in the default options + defaultOptions = merge(defaultOptions, options); + + // Apply UTC + setTimeMethods(); + + return defaultOptions; +} + +/** + * Get the updated default options. Merely exposing defaultOptions for outside modules + * isn't enough because the setOptions method creates a new object. + */ +function getOptions() { + return defaultOptions; +} + + + +/** + * Handle color operations. The object methods are chainable. + * @param {String} input The input color in either rbga or hex format + */ +var Color = function (input) { + // declare variables + var rgba = [], result; + + /** + * Parse the input color to rgba array + * @param {String} input + */ + function init(input) { + + // rgba + result = /rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]?(?:\.[0-9]+)?)\s*\)/.exec(input); + if (result) { + rgba = [pInt(result[1]), pInt(result[2]), pInt(result[3]), parseFloat(result[4], 10)]; + } else { // hex + result = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(input); + if (result) { + rgba = [pInt(result[1], 16), pInt(result[2], 16), pInt(result[3], 16), 1]; + } + } + + } + /** + * Return the color a specified format + * @param {String} format + */ + function get(format) { + var ret; + + // it's NaN if gradient colors on a column chart + if (rgba && !isNaN(rgba[0])) { + if (format === 'rgb') { + ret = 'rgb(' + rgba[0] + ',' + rgba[1] + ',' + rgba[2] + ')'; + } else if (format === 'a') { + ret = rgba[3]; + } else { + ret = 'rgba(' + rgba.join(',') + ')'; + } + } else { + ret = input; + } + return ret; + } + + /** + * Brighten the color + * @param {Number} alpha + */ + function brighten(alpha) { + if (isNumber(alpha) && alpha !== 0) { + var i; + for (i = 0; i < 3; i++) { + rgba[i] += pInt(alpha * 255); + + if (rgba[i] < 0) { + rgba[i] = 0; + } + if (rgba[i] > 255) { + rgba[i] = 255; + } + } + } + return this; + } + /** + * Set the color's opacity to a given alpha value + * @param {Number} alpha + */ + function setOpacity(alpha) { + rgba[3] = alpha; + return this; + } + + // initialize: parse the input + init(input); + + // public methods + return { + get: get, + brighten: brighten, + setOpacity: setOpacity + }; +}; + + +/** + * A wrapper object for SVG elements + */ +function SVGElement() {} + +SVGElement.prototype = { + /** + * Initialize the SVG renderer + * @param {Object} renderer + * @param {String} nodeName + */ + init: function (renderer, nodeName) { + var wrapper = this; + wrapper.element = nodeName === 'span' ? + createElement(nodeName) : + doc.createElementNS(SVG_NS, nodeName); + wrapper.renderer = renderer; + /** + * A collection of attribute setters. These methods, if defined, are called right before a certain + * attribute is set on an element wrapper. Returning false prevents the default attribute + * setter to run. Returning a value causes the default setter to set that value. Used in + * Renderer.label. + */ + wrapper.attrSetters = {}; + }, + /** + * Animate a given attribute + * @param {Object} params + * @param {Number} options The same options as in jQuery animation + * @param {Function} complete Function to perform at the end of animation + */ + animate: function (params, options, complete) { + var animOptions = pick(options, globalAnimation, true); + stop(this); // stop regardless of animation actually running, or reverting to .attr (#607) + if (animOptions) { + animOptions = merge(animOptions); + if (complete) { // allows using a callback with the global animation without overwriting it + animOptions.complete = complete; + } + animate(this, params, animOptions); + } else { + this.attr(params); + if (complete) { + complete(); + } + } + }, + /** + * Set or get a given attribute + * @param {Object|String} hash + * @param {Mixed|Undefined} val + */ + attr: function (hash, val) { + var wrapper = this, + key, + value, + result, + i, + child, + element = wrapper.element, + nodeName = element.nodeName.toLowerCase(), // Android2 requires lower for "text" + renderer = wrapper.renderer, + skipAttr, + titleNode, + attrSetters = wrapper.attrSetters, + shadows = wrapper.shadows, + hasSetSymbolSize, + doTransform, + ret = wrapper; + + // single key-value pair + if (isString(hash) && defined(val)) { + key = hash; + hash = {}; + hash[key] = val; + } + + // used as a getter: first argument is a string, second is undefined + if (isString(hash)) { + key = hash; + if (nodeName === 'circle') { + key = { x: 'cx', y: 'cy' }[key] || key; + } else if (key === 'strokeWidth') { + key = 'stroke-width'; + } + ret = attr(element, key) || wrapper[key] || 0; + + if (key !== 'd' && key !== 'visibility') { // 'd' is string in animation step + ret = parseFloat(ret); + } + + // setter + } else { + + for (key in hash) { + skipAttr = false; // reset + value = hash[key]; + + // check for a specific attribute setter + result = attrSetters[key] && attrSetters[key].call(wrapper, value, key); + + if (result !== false) { + if (result !== UNDEFINED) { + value = result; // the attribute setter has returned a new value to set + } + + // paths + if (key === 'd') { + if (value && value.join) { // join path + value = value.join(' '); + } + if (/(NaN| {2}|^$)/.test(value)) { + value = 'M 0 0'; + } + //wrapper.d = value; // shortcut for animations + + // update child tspans x values + } else if (key === 'x' && nodeName === 'text') { + for (i = 0; i < element.childNodes.length; i++) { + child = element.childNodes[i]; + // if the x values are equal, the tspan represents a linebreak + if (attr(child, 'x') === attr(element, 'x')) { + //child.setAttribute('x', value); + attr(child, 'x', value); + } + } + + if (wrapper.rotation) { + attr(element, 'transform', 'rotate(' + wrapper.rotation + ' ' + value + ' ' + + pInt(hash.y || attr(element, 'y')) + ')'); + } + + // apply gradients + } else if (key === 'fill') { + value = renderer.color(value, element, key); + + // circle x and y + } else if (nodeName === 'circle' && (key === 'x' || key === 'y')) { + key = { x: 'cx', y: 'cy' }[key] || key; + + // rectangle border radius + } else if (nodeName === 'rect' && key === 'r') { + attr(element, { + rx: value, + ry: value + }); + skipAttr = true; + + // translation and text rotation + } else if (key === 'translateX' || key === 'translateY' || key === 'rotation' || key === 'verticalAlign') { + doTransform = true; + skipAttr = true; + + // apply opacity as subnode (required by legacy WebKit and Batik) + } else if (key === 'stroke') { + value = renderer.color(value, element, key); + + // emulate VML's dashstyle implementation + } else if (key === 'dashstyle') { + key = 'stroke-dasharray'; + value = value && value.toLowerCase(); + if (value === 'solid') { + value = NONE; + } else if (value) { + value = value + .replace('shortdashdotdot', '3,1,1,1,1,1,') + .replace('shortdashdot', '3,1,1,1') + .replace('shortdot', '1,1,') + .replace('shortdash', '3,1,') + .replace('longdash', '8,3,') + .replace(/dot/g, '1,3,') + .replace('dash', '4,3,') + .replace(/,$/, '') + .split(','); // ending comma + + i = value.length; + while (i--) { + value[i] = pInt(value[i]) * hash['stroke-width']; + } + value = value.join(','); + } + + // special + } else if (key === 'isTracker') { + wrapper[key] = value; + + // IE9/MooTools combo: MooTools returns objects instead of numbers and IE9 Beta 2 + // is unable to cast them. Test again with final IE9. + } else if (key === 'width') { + value = pInt(value); + + // Text alignment + } else if (key === 'align') { + key = 'text-anchor'; + value = { left: 'start', center: 'middle', right: 'end' }[value]; + + // Title requires a subnode, #431 + } else if (key === 'title') { + titleNode = element.getElementsByTagName('title')[0]; + if (!titleNode) { + titleNode = doc.createElementNS(SVG_NS, 'title'); + element.appendChild(titleNode); + } + titleNode.textContent = value; + } + + // jQuery animate changes case + if (key === 'strokeWidth') { + key = 'stroke-width'; + } + + // Chrome/Win < 6 bug (http://code.google.com/p/chromium/issues/detail?id=15461), #1369 + if (key === 'stroke-width' && value === 0 && (isWebKit || renderer.forExport)) { + value = 0.000001; + } + + // symbols + if (wrapper.symbolName && /^(x|y|width|height|r|start|end|innerR|anchorX|anchorY)/.test(key)) { + + + if (!hasSetSymbolSize) { + wrapper.symbolAttr(hash); + hasSetSymbolSize = true; + } + skipAttr = true; + } + + // let the shadow follow the main element + if (shadows && /^(width|height|visibility|x|y|d|transform)$/.test(key)) { + i = shadows.length; + while (i--) { + attr( + shadows[i], + key, + key === 'height' ? + mathMax(value - (shadows[i].cutHeight || 0), 0) : + value + ); + } + } + + // validate heights + if ((key === 'width' || key === 'height') && nodeName === 'rect' && value < 0) { + value = 0; + } + + // Record for animation and quick access without polling the DOM + wrapper[key] = value; + + // Update transform + if (doTransform) { + wrapper.updateTransform(); + } + + + if (key === 'text') { + // Delete bBox memo when the text changes + if (value !== wrapper.textStr) { + delete wrapper.bBox; + } + wrapper.textStr = value; + if (wrapper.added) { + renderer.buildText(wrapper); + } + } else if (!skipAttr) { + attr(element, key, value); + } + + } + + } + + } + + return ret; + }, + + /** + * If one of the symbol size affecting parameters are changed, + * check all the others only once for each call to an element's + * .attr() method + * @param {Object} hash + */ + symbolAttr: function (hash) { + var wrapper = this; + + each(['x', 'y', 'r', 'start', 'end', 'width', 'height', 'innerR', 'anchorX', 'anchorY'], function (key) { + wrapper[key] = pick(hash[key], wrapper[key]); + }); + + wrapper.attr({ + d: wrapper.renderer.symbols[wrapper.symbolName](wrapper.x, wrapper.y, wrapper.width, wrapper.height, wrapper) + }); + }, + + /** + * Apply a clipping path to this object + * @param {String} id + */ + clip: function (clipRect) { + return this.attr('clip-path', clipRect ? 'url(' + this.renderer.url + '#' + clipRect.id + ')' : NONE); + }, + + /** + * Calculate the coordinates needed for drawing a rectangle crisply and return the + * calculated attributes + * @param {Number} strokeWidth + * @param {Number} x + * @param {Number} y + * @param {Number} width + * @param {Number} height + */ + crisp: function (strokeWidth, x, y, width, height) { + + var wrapper = this, + key, + attribs = {}, + values = {}, + normalizer; + + strokeWidth = strokeWidth || wrapper.strokeWidth || (wrapper.attr && wrapper.attr('stroke-width')) || 0; + normalizer = mathRound(strokeWidth) % 2 / 2; // mathRound because strokeWidth can sometimes have roundoff errors + + // normalize for crisp edges + values.x = mathFloor(x || wrapper.x || 0) + normalizer; + values.y = mathFloor(y || wrapper.y || 0) + normalizer; + values.width = mathFloor((width || wrapper.width || 0) - 2 * normalizer); + values.height = mathFloor((height || wrapper.height || 0) - 2 * normalizer); + values.strokeWidth = strokeWidth; + + for (key in values) { + if (wrapper[key] !== values[key]) { // only set attribute if changed + wrapper[key] = attribs[key] = values[key]; + } + } + + return attribs; + }, + + /** + * Set styles for the element + * @param {Object} styles + */ + css: function (styles) { + /*jslint unparam: true*//* allow unused param a in the regexp function below */ + var elemWrapper = this, + elem = elemWrapper.element, + textWidth = styles && styles.width && elem.nodeName.toLowerCase() === 'text', + n, + serializedCss = '', + hyphenate = function (a, b) { return '-' + b.toLowerCase(); }; + /*jslint unparam: false*/ + + // convert legacy + if (styles && styles.color) { + styles.fill = styles.color; + } + + // Merge the new styles with the old ones + styles = extend( + elemWrapper.styles, + styles + ); + + // store object + elemWrapper.styles = styles; + + + // Don't handle line wrap on canvas + if (useCanVG && textWidth) { + delete styles.width; + } + + // serialize and set style attribute + if (isIE && !hasSVG) { // legacy IE doesn't support setting style attribute + if (textWidth) { + delete styles.width; + } + css(elemWrapper.element, styles); + } else { + for (n in styles) { + serializedCss += n.replace(/([A-Z])/g, hyphenate) + ':' + styles[n] + ';'; + } + elemWrapper.attr({ + style: serializedCss + }); + } + + + // re-build text + if (textWidth && elemWrapper.added) { + elemWrapper.renderer.buildText(elemWrapper); + } + + return elemWrapper; + }, + + /** + * Add an event listener + * @param {String} eventType + * @param {Function} handler + */ + on: function (eventType, handler) { + // touch + if (hasTouch && eventType === 'click') { + this.element.ontouchstart = function (e) { + e.preventDefault(); + handler(); + }; + } + // simplest possible event model for internal use + this.element['on' + eventType] = handler; + return this; + }, + + /** + * Set the coordinates needed to draw a consistent radial gradient across + * pie slices regardless of positioning inside the chart. The format is + * [centerX, centerY, diameter] in pixels. + */ + setRadialReference: function (coordinates) { + this.element.radialReference = coordinates; + return this; + }, + + /** + * Move an object and its children by x and y values + * @param {Number} x + * @param {Number} y + */ + translate: function (x, y) { + return this.attr({ + translateX: x, + translateY: y + }); + }, + + /** + * Invert a group, rotate and flip + */ + invert: function () { + var wrapper = this; + wrapper.inverted = true; + wrapper.updateTransform(); + return wrapper; + }, + + /** + * Apply CSS to HTML elements. This is used in text within SVG rendering and + * by the VML renderer + */ + htmlCss: function (styles) { + var wrapper = this, + element = wrapper.element, + textWidth = styles && element.tagName === 'SPAN' && styles.width; + + if (textWidth) { + delete styles.width; + wrapper.textWidth = textWidth; + wrapper.updateTransform(); + } + + wrapper.styles = extend(wrapper.styles, styles); + css(wrapper.element, styles); + + return wrapper; + }, + + + + /** + * VML and useHTML method for calculating the bounding box based on offsets + * @param {Boolean} refresh Whether to force a fresh value from the DOM or to + * use the cached value + * + * @return {Object} A hash containing values for x, y, width and height + */ + + htmlGetBBox: function () { + var wrapper = this, + element = wrapper.element, + bBox = wrapper.bBox; + + // faking getBBox in exported SVG in legacy IE + if (!bBox) { + // faking getBBox in exported SVG in legacy IE (is this a duplicate of the fix for #1079?) + if (element.nodeName === 'text') { + element.style.position = ABSOLUTE; + } + + bBox = wrapper.bBox = { + x: element.offsetLeft, + y: element.offsetTop, + width: element.offsetWidth, + height: element.offsetHeight + }; + } + + return bBox; + }, + + /** + * VML override private method to update elements based on internal + * properties based on SVG transform + */ + htmlUpdateTransform: function () { + // aligning non added elements is expensive + if (!this.added) { + this.alignOnAdd = true; + return; + } + + var wrapper = this, + renderer = wrapper.renderer, + elem = wrapper.element, + translateX = wrapper.translateX || 0, + translateY = wrapper.translateY || 0, + x = wrapper.x || 0, + y = wrapper.y || 0, + align = wrapper.textAlign || 'left', + alignCorrection = { left: 0, center: 0.5, right: 1 }[align], + nonLeft = align && align !== 'left', + shadows = wrapper.shadows; + + // apply translate + if (translateX || translateY) { + css(elem, { + marginLeft: translateX, + marginTop: translateY + }); + if (shadows) { // used in labels/tooltip + each(shadows, function (shadow) { + css(shadow, { + marginLeft: translateX + 1, + marginTop: translateY + 1 + }); + }); + } + } + + // apply inversion + if (wrapper.inverted) { // wrapper is a group + each(elem.childNodes, function (child) { + renderer.invertChild(child, elem); + }); + } + + if (elem.tagName === 'SPAN') { + + var width, height, + rotation = wrapper.rotation, + baseline, + radians = 0, + costheta = 1, + sintheta = 0, + quad, + textWidth = pInt(wrapper.textWidth), + xCorr = wrapper.xCorr || 0, + yCorr = wrapper.yCorr || 0, + currentTextTransform = [rotation, align, elem.innerHTML, wrapper.textWidth].join(','), + rotationStyle = {}, + cssTransformKey; + + if (currentTextTransform !== wrapper.cTT) { // do the calculations and DOM access only if properties changed + + if (defined(rotation)) { + + if (renderer.isSVG) { // #916 + cssTransformKey = isIE ? '-ms-transform' : isWebKit ? '-webkit-transform' : isFirefox ? 'MozTransform' : isOpera ? '-o-transform' : ''; + rotationStyle[cssTransformKey] = rotationStyle.transform = 'rotate(' + rotation + 'deg)'; + + } else { + radians = rotation * deg2rad; // deg to rad + costheta = mathCos(radians); + sintheta = mathSin(radians); + + // Adjust for alignment and rotation. Rotation of useHTML content is not yet implemented + // but it can probably be implemented for Firefox 3.5+ on user request. FF3.5+ + // has support for CSS3 transform. The getBBox method also needs to be updated + // to compensate for the rotation, like it currently does for SVG. + // Test case: http://highcharts.com/tests/?file=text-rotation + rotationStyle.filter = rotation ? ['progid:DXImageTransform.Microsoft.Matrix(M11=', costheta, + ', M12=', -sintheta, ', M21=', sintheta, ', M22=', costheta, + ', sizingMethod=\'auto expand\')'].join('') : NONE; + } + css(elem, rotationStyle); + } + + width = pick(wrapper.elemWidth, elem.offsetWidth); + height = pick(wrapper.elemHeight, elem.offsetHeight); + + // update textWidth + if (width > textWidth && /[ \-]/.test(elem.textContent || elem.innerText)) { // #983, #1254 + css(elem, { + width: textWidth + PX, + display: 'block', + whiteSpace: 'normal' + }); + width = textWidth; + } + + // correct x and y + baseline = renderer.fontMetrics(elem.style.fontSize).b; + xCorr = costheta < 0 && -width; + yCorr = sintheta < 0 && -height; + + // correct for baseline and corners spilling out after rotation + quad = costheta * sintheta < 0; + xCorr += sintheta * baseline * (quad ? 1 - alignCorrection : alignCorrection); + yCorr -= costheta * baseline * (rotation ? (quad ? alignCorrection : 1 - alignCorrection) : 1); + + // correct for the length/height of the text + if (nonLeft) { + xCorr -= width * alignCorrection * (costheta < 0 ? -1 : 1); + if (rotation) { + yCorr -= height * alignCorrection * (sintheta < 0 ? -1 : 1); + } + css(elem, { + textAlign: align + }); + } + + // record correction + wrapper.xCorr = xCorr; + wrapper.yCorr = yCorr; + } + + // apply position with correction + css(elem, { + left: (x + xCorr) + PX, + top: (y + yCorr) + PX + }); + + // force reflow in webkit to apply the left and top on useHTML element (#1249) + if (isWebKit) { + height = elem.offsetHeight; // assigned to height for JSLint purpose + } + + // record current text transform + wrapper.cTT = currentTextTransform; + } + }, + + /** + * Private method to update the transform attribute based on internal + * properties + */ + updateTransform: function () { + var wrapper = this, + translateX = wrapper.translateX || 0, + translateY = wrapper.translateY || 0, + inverted = wrapper.inverted, + rotation = wrapper.rotation, + transform = []; + + // flipping affects translate as adjustment for flipping around the group's axis + if (inverted) { + translateX += wrapper.attr('width'); + translateY += wrapper.attr('height'); + } + + // apply translate + if (translateX || translateY) { + transform.push('translate(' + translateX + ',' + translateY + ')'); + } + + // apply rotation + if (inverted) { + transform.push('rotate(90) scale(-1,1)'); + } else if (rotation) { // text rotation + transform.push('rotate(' + rotation + ' ' + (wrapper.x || 0) + ' ' + (wrapper.y || 0) + ')'); + } + + if (transform.length) { + attr(wrapper.element, 'transform', transform.join(' ')); + } + }, + /** + * Bring the element to the front + */ + toFront: function () { + var element = this.element; + element.parentNode.appendChild(element); + return this; + }, + + + /** + * Break down alignment options like align, verticalAlign, x and y + * to x and y relative to the chart. + * + * @param {Object} alignOptions + * @param {Boolean} alignByTranslate + * @param {Object} box The box to align to, needs a width and height + * + */ + align: function (alignOptions, alignByTranslate, box) { + var elemWrapper = this; + + if (!alignOptions) { // called on resize + alignOptions = elemWrapper.alignOptions; + alignByTranslate = elemWrapper.alignByTranslate; + } else { // first call on instanciate + elemWrapper.alignOptions = alignOptions; + elemWrapper.alignByTranslate = alignByTranslate; + if (!box) { // boxes other than renderer handle this internally + elemWrapper.renderer.alignedObjects.push(elemWrapper); + } + } + + box = pick(box, elemWrapper.renderer); + + var align = alignOptions.align, + vAlign = alignOptions.verticalAlign, + x = (box.x || 0) + (alignOptions.x || 0), // default: left align + y = (box.y || 0) + (alignOptions.y || 0), // default: top align + attribs = {}; + + + // align + if (align === 'right' || align === 'center') { + x += (box.width - (alignOptions.width || 0)) / + { right: 1, center: 2 }[align]; + } + attribs[alignByTranslate ? 'translateX' : 'x'] = mathRound(x); + + + // vertical align + if (vAlign === 'bottom' || vAlign === 'middle') { + y += (box.height - (alignOptions.height || 0)) / + ({ bottom: 1, middle: 2 }[vAlign] || 1); + + } + attribs[alignByTranslate ? 'translateY' : 'y'] = mathRound(y); + + // animate only if already placed + elemWrapper[elemWrapper.placed ? 'animate' : 'attr'](attribs); + elemWrapper.placed = true; + elemWrapper.alignAttr = attribs; + + return elemWrapper; + }, + + /** + * Get the bounding box (width, height, x and y) for the element + */ + getBBox: function () { + var wrapper = this, + bBox = wrapper.bBox, + renderer = wrapper.renderer, + width, + height, + rotation = wrapper.rotation, + element = wrapper.element, + styles = wrapper.styles, + rad = rotation * deg2rad; + + if (!bBox) { + // SVG elements + if (element.namespaceURI === SVG_NS || renderer.forExport) { + try { // Fails in Firefox if the container has display: none. + + bBox = element.getBBox ? + // SVG: use extend because IE9 is not allowed to change width and height in case + // of rotation (below) + extend({}, element.getBBox()) : + // Canvas renderer and legacy IE in export mode + { + width: element.offsetWidth, + height: element.offsetHeight + }; + } catch (e) {} + + // If the bBox is not set, the try-catch block above failed. The other condition + // is for Opera that returns a width of -Infinity on hidden elements. + if (!bBox || bBox.width < 0) { + bBox = { width: 0, height: 0 }; + } + + + // VML Renderer or useHTML within SVG + } else { + + bBox = wrapper.htmlGetBBox(); + + } + + // True SVG elements as well as HTML elements in modern browsers using the .useHTML option + // need to compensated for rotation + if (renderer.isSVG) { + width = bBox.width; + height = bBox.height; + + // Workaround for wrong bounding box in IE9 and IE10 (#1101) + if (isIE && styles && styles.fontSize === '11px' && height === 22.700000762939453) { + bBox.height = height = 14; + } + + // Adjust for rotated text + if (rotation) { + bBox.width = mathAbs(height * mathSin(rad)) + mathAbs(width * mathCos(rad)); + bBox.height = mathAbs(height * mathCos(rad)) + mathAbs(width * mathSin(rad)); + } + } + + wrapper.bBox = bBox; + } + return bBox; + }, + + /** + * Show the element + */ + show: function () { + return this.attr({ visibility: VISIBLE }); + }, + + /** + * Hide the element + */ + hide: function () { + return this.attr({ visibility: HIDDEN }); + }, + + /** + * Add the element + * @param {Object|Undefined} parent Can be an element, an element wrapper or undefined + * to append the element to the renderer.box. + */ + add: function (parent) { + + var renderer = this.renderer, + parentWrapper = parent || renderer, + parentNode = parentWrapper.element || renderer.box, + childNodes = parentNode.childNodes, + element = this.element, + zIndex = attr(element, 'zIndex'), + otherElement, + otherZIndex, + i, + inserted; + + if (parent) { + this.parentGroup = parent; + } + + // mark as inverted + this.parentInverted = parent && parent.inverted; + + // build formatted text + if (this.textStr !== undefined) { + renderer.buildText(this); + } + + // mark the container as having z indexed children + if (zIndex) { + parentWrapper.handleZ = true; + zIndex = pInt(zIndex); + } + + // insert according to this and other elements' zIndex + if (parentWrapper.handleZ) { // this element or any of its siblings has a z index + for (i = 0; i < childNodes.length; i++) { + otherElement = childNodes[i]; + otherZIndex = attr(otherElement, 'zIndex'); + if (otherElement !== element && ( + // insert before the first element with a higher zIndex + pInt(otherZIndex) > zIndex || + // if no zIndex given, insert before the first element with a zIndex + (!defined(zIndex) && defined(otherZIndex)) + + )) { + parentNode.insertBefore(element, otherElement); + inserted = true; + break; + } + } + } + + // default: append at the end + if (!inserted) { + parentNode.appendChild(element); + } + + // mark as added + this.added = true; + + // fire an event for internal hooks + fireEvent(this, 'add'); + + return this; + }, + + /** + * Removes a child either by removeChild or move to garbageBin. + * Issue 490; in VML removeChild results in Orphaned nodes according to sIEve, discardElement does not. + */ + safeRemoveChild: function (element) { + var parentNode = element.parentNode; + if (parentNode) { + parentNode.removeChild(element); + } + }, + + /** + * Destroy the element and element wrapper + */ + destroy: function () { + var wrapper = this, + element = wrapper.element || {}, + shadows = wrapper.shadows, + key, + i; + + // remove events + element.onclick = element.onmouseout = element.onmouseover = element.onmousemove = null; + stop(wrapper); // stop running animations + + if (wrapper.clipPath) { + wrapper.clipPath = wrapper.clipPath.destroy(); + } + + // Destroy stops in case this is a gradient object + if (wrapper.stops) { + for (i = 0; i < wrapper.stops.length; i++) { + wrapper.stops[i] = wrapper.stops[i].destroy(); + } + wrapper.stops = null; + } + + // remove element + wrapper.safeRemoveChild(element); + + // destroy shadows + if (shadows) { + each(shadows, function (shadow) { + wrapper.safeRemoveChild(shadow); + }); + } + + // remove from alignObjects + erase(wrapper.renderer.alignedObjects, wrapper); + + for (key in wrapper) { + delete wrapper[key]; + } + + return null; + }, + + /** + * Empty a group element + */ + empty: function () { + var element = this.element, + childNodes = element.childNodes, + i = childNodes.length; + + while (i--) { + element.removeChild(childNodes[i]); + } + }, + + /** + * Add a shadow to the element. Must be done after the element is added to the DOM + * @param {Boolean|Object} shadowOptions + */ + shadow: function (shadowOptions, group, cutOff) { + var shadows = [], + i, + shadow, + element = this.element, + strokeWidth, + shadowWidth, + shadowElementOpacity, + + // compensate for inverted plot area + transform; + + + if (shadowOptions) { + shadowWidth = pick(shadowOptions.width, 3); + shadowElementOpacity = (shadowOptions.opacity || 0.15) / shadowWidth; + transform = this.parentInverted ? + '(-1,-1)' : + '(' + pick(shadowOptions.offsetX, 1) + ', ' + pick(shadowOptions.offsetY, 1) + ')'; + for (i = 1; i <= shadowWidth; i++) { + shadow = element.cloneNode(0); + strokeWidth = (shadowWidth * 2) + 1 - (2 * i); + attr(shadow, { + 'isShadow': 'true', + 'stroke': shadowOptions.color || 'black', + 'stroke-opacity': shadowElementOpacity * i, + 'stroke-width': strokeWidth, + 'transform': 'translate' + transform, + 'fill': NONE + }); + if (cutOff) { + attr(shadow, 'height', mathMax(attr(shadow, 'height') - strokeWidth, 0)); + shadow.cutHeight = strokeWidth; + } + + if (group) { + group.element.appendChild(shadow); + } else { + element.parentNode.insertBefore(shadow, element); + } + + shadows.push(shadow); + } + + this.shadows = shadows; + } + return this; + + } +}; + + +/** + * The default SVG renderer + */ +var SVGRenderer = function () { + this.init.apply(this, arguments); +}; +SVGRenderer.prototype = { + Element: SVGElement, + + /** + * Initialize the SVGRenderer + * @param {Object} container + * @param {Number} width + * @param {Number} height + * @param {Boolean} forExport + */ + init: function (container, width, height, forExport) { + var renderer = this, + loc = location, + boxWrapper; + + boxWrapper = renderer.createElement('svg') + .attr({ + xmlns: SVG_NS, + version: '1.1' + }); + container.appendChild(boxWrapper.element); + + // object properties + renderer.isSVG = true; + renderer.box = boxWrapper.element; + renderer.boxWrapper = boxWrapper; + renderer.alignedObjects = []; + + // Page url used for internal references. #24, #672, #1070 + renderer.url = (isFirefox || isWebKit) && doc.getElementsByTagName('base').length ? + loc.href + .replace(/#.*?$/, '') // remove the hash + .replace(/([\('\)])/g, '\\$1') // escape parantheses and quotes + .replace(/ /g, '%20') : // replace spaces (needed for Safari only) + ''; + + renderer.defs = this.createElement('defs').add(); + renderer.forExport = forExport; + renderer.gradients = {}; // Object where gradient SvgElements are stored + + renderer.setSize(width, height, false); + + + + // Issue 110 workaround: + // In Firefox, if a div is positioned by percentage, its pixel position may land + // between pixels. The container itself doesn't display this, but an SVG element + // inside this container will be drawn at subpixel precision. In order to draw + // sharp lines, this must be compensated for. This doesn't seem to work inside + // iframes though (like in jsFiddle). + var subPixelFix, rect; + if (isFirefox && container.getBoundingClientRect) { + renderer.subPixelFix = subPixelFix = function () { + css(container, { left: 0, top: 0 }); + rect = container.getBoundingClientRect(); + css(container, { + left: (mathCeil(rect.left) - rect.left) + PX, + top: (mathCeil(rect.top) - rect.top) + PX + }); + }; + + // run the fix now + subPixelFix(); + + // run it on resize + addEvent(win, 'resize', subPixelFix); + } + }, + + /** + * Detect whether the renderer is hidden. This happens when one of the parent elements + * has display: none. #608. + */ + isHidden: function () { + return !this.boxWrapper.getBBox().width; + }, + + /** + * Destroys the renderer and its allocated members. + */ + destroy: function () { + var renderer = this, + rendererDefs = renderer.defs; + renderer.box = null; + renderer.boxWrapper = renderer.boxWrapper.destroy(); + + // Call destroy on all gradient elements + destroyObjectProperties(renderer.gradients || {}); + renderer.gradients = null; + + // Defs are null in VMLRenderer + // Otherwise, destroy them here. + if (rendererDefs) { + renderer.defs = rendererDefs.destroy(); + } + + // Remove sub pixel fix handler + // We need to check that there is a handler, otherwise all functions that are registered for event 'resize' are removed + // See issue #982 + if (renderer.subPixelFix) { + removeEvent(win, 'resize', renderer.subPixelFix); + } + + renderer.alignedObjects = null; + + return null; + }, + + /** + * Create a wrapper for an SVG element + * @param {Object} nodeName + */ + createElement: function (nodeName) { + var wrapper = new this.Element(); + wrapper.init(this, nodeName); + return wrapper; + }, + + /** + * Dummy function for use in canvas renderer + */ + draw: function () {}, + + /** + * Parse a simple HTML string into SVG tspans + * + * @param {Object} textNode The parent text SVG node + */ + buildText: function (wrapper) { + var textNode = wrapper.element, + lines = pick(wrapper.textStr, '').toString() + .replace(/<(b|strong)>/g, '') + .replace(/<(i|em)>/g, '') + .replace(//g, '') + .split(//g), + childNodes = textNode.childNodes, + styleRegex = /style="([^"]+)"/, + hrefRegex = /href="([^"]+)"/, + parentX = attr(textNode, 'x'), + textStyles = wrapper.styles, + width = textStyles && textStyles.width && pInt(textStyles.width), + textLineHeight = textStyles && textStyles.lineHeight, + lastLine, + GET_COMPUTED_STYLE = 'getComputedStyle', + i = childNodes.length, + linePositions = []; + + // Needed in IE9 because it doesn't report tspan's offsetHeight (#893) + function getLineHeightByBBox(lineNo) { + linePositions[lineNo] = textNode.getBBox ? + textNode.getBBox().height : + wrapper.renderer.fontMetrics(textNode.style.fontSize).h; // #990 + return mathRound(linePositions[lineNo] - (linePositions[lineNo - 1] || 0)); + } + + // remove old text + while (i--) { + textNode.removeChild(childNodes[i]); + } + + if (width && !wrapper.added) { + this.box.appendChild(textNode); // attach it to the DOM to read offset width + } + + // remove empty line at end + if (lines[lines.length - 1] === '') { + lines.pop(); + } + + // build the lines + each(lines, function (line, lineNo) { + var spans, spanNo = 0, lineHeight; + + line = line.replace(//g, '|||'); + spans = line.split('|||'); + + each(spans, function (span) { + if (span !== '' || spans.length === 1) { + var attributes = {}, + tspan = doc.createElementNS(SVG_NS, 'tspan'), + spanStyle; // #390 + if (styleRegex.test(span)) { + spanStyle = span.match(styleRegex)[1].replace(/(;| |^)color([ :])/, '$1fill$2'); + attr(tspan, 'style', spanStyle); + } + if (hrefRegex.test(span)) { + attr(tspan, 'onclick', 'location.href=\"' + span.match(hrefRegex)[1] + '\"'); + css(tspan, { cursor: 'pointer' }); + } + + span = (span.replace(/<(.|\n)*?>/g, '') || ' ') + .replace(/</g, '<') + .replace(/>/g, '>'); + + // issue #38 workaround. + /*if (reverse) { + arr = []; + i = span.length; + while (i--) { + arr.push(span.charAt(i)); + } + span = arr.join(''); + }*/ + + // add the text node + tspan.appendChild(doc.createTextNode(span)); + + if (!spanNo) { // first span in a line, align it to the left + attributes.x = parentX; + } else { + // Firefox ignores spaces at the front or end of the tspan + attributes.dx = 3; // space + } + + // first span on subsequent line, add the line height + if (!spanNo) { + if (lineNo) { + + // allow getting the right offset height in exporting in IE + if (!hasSVG && wrapper.renderer.forExport) { + css(tspan, { display: 'block' }); + } + + // Webkit and opera sometimes return 'normal' as the line height. In that + // case, webkit uses offsetHeight, while Opera falls back to 18 + lineHeight = win[GET_COMPUTED_STYLE] && + pInt(win[GET_COMPUTED_STYLE](lastLine, null).getPropertyValue('line-height')); + + if (!lineHeight || isNaN(lineHeight)) { + lineHeight = textLineHeight || lastLine.offsetHeight || getLineHeightByBBox(lineNo) || 18; + } + attr(tspan, 'dy', lineHeight); + } + lastLine = tspan; // record for use in next line + } + + // add attributes + attr(tspan, attributes); + + // append it + textNode.appendChild(tspan); + + spanNo++; + + // check width and apply soft breaks + if (width) { + var words = span.replace(/([^\^])-/g, '$1- ').split(' '), // #1273 + tooLong, + actualWidth, + rest = []; + + while (words.length || rest.length) { + delete wrapper.bBox; // delete cache + actualWidth = wrapper.getBBox().width; + tooLong = actualWidth > width; + if (!tooLong || words.length === 1) { // new line needed + words = rest; + rest = []; + if (words.length) { + tspan = doc.createElementNS(SVG_NS, 'tspan'); + attr(tspan, { + dy: textLineHeight || 16, + x: parentX + }); + if (spanStyle) { // #390 + attr(tspan, 'style', spanStyle); + } + textNode.appendChild(tspan); + + if (actualWidth > width) { // a single word is pressing it out + width = actualWidth; + } + } + } else { // append to existing line tspan + tspan.removeChild(tspan.firstChild); + rest.unshift(words.pop()); + } + if (words.length) { + tspan.appendChild(doc.createTextNode(words.join(' ').replace(/- /g, '-'))); + } + } + } + } + }); + }); + }, + + /** + * Create a button with preset states + * @param {String} text + * @param {Number} x + * @param {Number} y + * @param {Function} callback + * @param {Object} normalState + * @param {Object} hoverState + * @param {Object} pressedState + */ + button: function (text, x, y, callback, normalState, hoverState, pressedState) { + var label = this.label(text, x, y), + curState = 0, + stateOptions, + stateStyle, + normalStyle, + hoverStyle, + pressedStyle, + STYLE = 'style', + verticalGradient = { x1: 0, y1: 0, x2: 0, y2: 1 }; + + // prepare the attributes + /*jslint white: true*/ + normalState = merge(hash( + STROKE_WIDTH, 1, + STROKE, '#999', + FILL, hash( + LINEAR_GRADIENT, verticalGradient, + STOPS, [ + [0, '#FFF'], + [1, '#DDD'] + ] + ), + 'r', 3, + 'padding', 3, + STYLE, hash( + 'color', 'black' + ) + ), normalState); + /*jslint white: false*/ + normalStyle = normalState[STYLE]; + delete normalState[STYLE]; + + /*jslint white: true*/ + hoverState = merge(normalState, hash( + STROKE, '#68A', + FILL, hash( + LINEAR_GRADIENT, verticalGradient, + STOPS, [ + [0, '#FFF'], + [1, '#ACF'] + ] + ) + ), hoverState); + /*jslint white: false*/ + hoverStyle = hoverState[STYLE]; + delete hoverState[STYLE]; + + /*jslint white: true*/ + pressedState = merge(normalState, hash( + STROKE, '#68A', + FILL, hash( + LINEAR_GRADIENT, verticalGradient, + STOPS, [ + [0, '#9BD'], + [1, '#CDF'] + ] + ) + ), pressedState); + /*jslint white: false*/ + pressedStyle = pressedState[STYLE]; + delete pressedState[STYLE]; + + // add the events + addEvent(label.element, 'mouseenter', function () { + label.attr(hoverState) + .css(hoverStyle); + }); + addEvent(label.element, 'mouseleave', function () { + stateOptions = [normalState, hoverState, pressedState][curState]; + stateStyle = [normalStyle, hoverStyle, pressedStyle][curState]; + label.attr(stateOptions) + .css(stateStyle); + }); + + label.setState = function (state) { + curState = state; + if (!state) { + label.attr(normalState) + .css(normalStyle); + } else if (state === 2) { + label.attr(pressedState) + .css(pressedStyle); + } + }; + + return label + .on('click', function () { + callback.call(label); + }) + .attr(normalState) + .css(extend({ cursor: 'default' }, normalStyle)); + }, + + /** + * Make a straight line crisper by not spilling out to neighbour pixels + * @param {Array} points + * @param {Number} width + */ + crispLine: function (points, width) { + // points format: [M, 0, 0, L, 100, 0] + // normalize to a crisp line + if (points[1] === points[4]) { + // Substract due to #1129. Now bottom and left axis gridlines behave the same. + points[1] = points[4] = mathRound(points[1]) - (width % 2 / 2); + } + if (points[2] === points[5]) { + points[2] = points[5] = mathRound(points[2]) + (width % 2 / 2); + } + return points; + }, + + + /** + * Draw a path + * @param {Array} path An SVG path in array form + */ + path: function (path) { + var attr = { + fill: NONE + }; + if (isArray(path)) { + attr.d = path; + } else if (isObject(path)) { // attributes + extend(attr, path); + } + return this.createElement('path').attr(attr); + }, + + /** + * Draw and return an SVG circle + * @param {Number} x The x position + * @param {Number} y The y position + * @param {Number} r The radius + */ + circle: function (x, y, r) { + var attr = isObject(x) ? + x : + { + x: x, + y: y, + r: r + }; + + return this.createElement('circle').attr(attr); + }, + + /** + * Draw and return an arc + * @param {Number} x X position + * @param {Number} y Y position + * @param {Number} r Radius + * @param {Number} innerR Inner radius like used in donut charts + * @param {Number} start Starting angle + * @param {Number} end Ending angle + */ + arc: function (x, y, r, innerR, start, end) { + // arcs are defined as symbols for the ability to set + // attributes in attr and animate + + if (isObject(x)) { + y = x.y; + r = x.r; + innerR = x.innerR; + start = x.start; + end = x.end; + x = x.x; + } + return this.symbol('arc', x || 0, y || 0, r || 0, r || 0, { + innerR: innerR || 0, + start: start || 0, + end: end || 0 + }); + }, + + /** + * Draw and return a rectangle + * @param {Number} x Left position + * @param {Number} y Top position + * @param {Number} width + * @param {Number} height + * @param {Number} r Border corner radius + * @param {Number} strokeWidth A stroke width can be supplied to allow crisp drawing + */ + rect: function (x, y, width, height, r, strokeWidth) { + + r = isObject(x) ? x.r : r; + + var wrapper = this.createElement('rect').attr({ + rx: r, + ry: r, + fill: NONE + }); + return wrapper.attr( + isObject(x) ? + x : + // do not crispify when an object is passed in (as in column charts) + wrapper.crisp(strokeWidth, x, y, mathMax(width, 0), mathMax(height, 0)) + ); + }, + + /** + * Resize the box and re-align all aligned elements + * @param {Object} width + * @param {Object} height + * @param {Boolean} animate + * + */ + setSize: function (width, height, animate) { + var renderer = this, + alignedObjects = renderer.alignedObjects, + i = alignedObjects.length; + + renderer.width = width; + renderer.height = height; + + renderer.boxWrapper[pick(animate, true) ? 'animate' : 'attr']({ + width: width, + height: height + }); + + while (i--) { + alignedObjects[i].align(); + } + }, + + /** + * Create a group + * @param {String} name The group will be given a class name of 'highcharts-{name}'. + * This can be used for styling and scripting. + */ + g: function (name) { + var elem = this.createElement('g'); + return defined(name) ? elem.attr({ 'class': PREFIX + name }) : elem; + }, + + /** + * Display an image + * @param {String} src + * @param {Number} x + * @param {Number} y + * @param {Number} width + * @param {Number} height + */ + image: function (src, x, y, width, height) { + var attribs = { + preserveAspectRatio: NONE + }, + elemWrapper; + + // optional properties + if (arguments.length > 1) { + extend(attribs, { + x: x, + y: y, + width: width, + height: height + }); + } + + elemWrapper = this.createElement('image').attr(attribs); + + // set the href in the xlink namespace + if (elemWrapper.element.setAttributeNS) { + elemWrapper.element.setAttributeNS('http://www.w3.org/1999/xlink', + 'href', src); + } else { + // could be exporting in IE + // using href throws "not supported" in ie7 and under, requries regex shim to fix later + elemWrapper.element.setAttribute('hc-svg-href', src); + } + + return elemWrapper; + }, + + /** + * Draw a symbol out of pre-defined shape paths from the namespace 'symbol' object. + * + * @param {Object} symbol + * @param {Object} x + * @param {Object} y + * @param {Object} radius + * @param {Object} options + */ + symbol: function (symbol, x, y, width, height, options) { + + var obj, + + // get the symbol definition function + symbolFn = this.symbols[symbol], + + // check if there's a path defined for this symbol + path = symbolFn && symbolFn( + mathRound(x), + mathRound(y), + width, + height, + options + ), + + imageElement, + imageRegex = /^url\((.*?)\)$/, + imageSrc, + imageSize, + centerImage; + + if (path) { + + obj = this.path(path); + // expando properties for use in animate and attr + extend(obj, { + symbolName: symbol, + x: x, + y: y, + width: width, + height: height + }); + if (options) { + extend(obj, options); + } + + + // image symbols + } else if (imageRegex.test(symbol)) { + + // On image load, set the size and position + centerImage = function (img, size) { + if (img.element) { // it may be destroyed in the meantime (#1390) + img.attr({ + width: size[0], + height: size[1] + }); + + if (!img.alignByTranslate) { // #185 + img.translate( + mathRound((width - size[0]) / 2), // #1378 + mathRound((height - size[1]) / 2) + ); + } + } + }; + + imageSrc = symbol.match(imageRegex)[1]; + imageSize = symbolSizes[imageSrc]; + + // Ireate the image synchronously, add attribs async + obj = this.image(imageSrc) + .attr({ + x: x, + y: y + }); + + if (imageSize) { + centerImage(obj, imageSize); + } else { + // Initialize image to be 0 size so export will still function if there's no cached sizes. + // + obj.attr({ width: 0, height: 0 }); + + // Create a dummy JavaScript image to get the width and height. Due to a bug in IE < 8, + // the created element must be assigned to a variable in order to load (#292). + imageElement = createElement('img', { + onload: function () { + centerImage(obj, symbolSizes[imageSrc] = [this.width, this.height]); + }, + src: imageSrc + }); + } + } + + return obj; + }, + + /** + * An extendable collection of functions for defining symbol paths. + */ + symbols: { + 'circle': function (x, y, w, h) { + var cpw = 0.166 * w; + return [ + M, x + w / 2, y, + 'C', x + w + cpw, y, x + w + cpw, y + h, x + w / 2, y + h, + 'C', x - cpw, y + h, x - cpw, y, x + w / 2, y, + 'Z' + ]; + }, + + 'square': function (x, y, w, h) { + return [ + M, x, y, + L, x + w, y, + x + w, y + h, + x, y + h, + 'Z' + ]; + }, + + 'triangle': function (x, y, w, h) { + return [ + M, x + w / 2, y, + L, x + w, y + h, + x, y + h, + 'Z' + ]; + }, + + 'triangle-down': function (x, y, w, h) { + return [ + M, x, y, + L, x + w, y, + x + w / 2, y + h, + 'Z' + ]; + }, + 'diamond': function (x, y, w, h) { + return [ + M, x + w / 2, y, + L, x + w, y + h / 2, + x + w / 2, y + h, + x, y + h / 2, + 'Z' + ]; + }, + 'arc': function (x, y, w, h, options) { + var start = options.start, + radius = options.r || w || h, + end = options.end - 0.000001, // to prevent cos and sin of start and end from becoming equal on 360 arcs + innerRadius = options.innerR, + open = options.open, + cosStart = mathCos(start), + sinStart = mathSin(start), + cosEnd = mathCos(end), + sinEnd = mathSin(end), + longArc = options.end - start < mathPI ? 0 : 1; + + return [ + M, + x + radius * cosStart, + y + radius * sinStart, + 'A', // arcTo + radius, // x radius + radius, // y radius + 0, // slanting + longArc, // long or short arc + 1, // clockwise + x + radius * cosEnd, + y + radius * sinEnd, + open ? M : L, + x + innerRadius * cosEnd, + y + innerRadius * sinEnd, + 'A', // arcTo + innerRadius, // x radius + innerRadius, // y radius + 0, // slanting + longArc, // long or short arc + 0, // clockwise + x + innerRadius * cosStart, + y + innerRadius * sinStart, + + open ? '' : 'Z' // close + ]; + } + }, + + /** + * Define a clipping rectangle + * @param {String} id + * @param {Number} x + * @param {Number} y + * @param {Number} width + * @param {Number} height + */ + clipRect: function (x, y, width, height) { + var wrapper, + id = PREFIX + idCounter++, + + clipPath = this.createElement('clipPath').attr({ + id: id + }).add(this.defs); + + wrapper = this.rect(x, y, width, height, 0).add(clipPath); + wrapper.id = id; + wrapper.clipPath = clipPath; + + return wrapper; + }, + + + /** + * Take a color and return it if it's a string, make it a gradient if it's a + * gradient configuration object. Prior to Highstock, an array was used to define + * a linear gradient with pixel positions relative to the SVG. In newer versions + * we change the coordinates to apply relative to the shape, using coordinates + * 0-1 within the shape. To preserve backwards compatibility, linearGradient + * in this definition is an object of x1, y1, x2 and y2. + * + * @param {Object} color The color or config object + */ + color: function (color, elem, prop) { + var renderer = this, + colorObject, + regexRgba = /^rgba/, + gradName, + gradAttr, + gradients, + gradientObject, + stops, + stopColor, + stopOpacity, + radialReference, + n, + id, + key = []; + + // Apply linear or radial gradients + if (color && color.linearGradient) { + gradName = 'linearGradient'; + } else if (color && color.radialGradient) { + gradName = 'radialGradient'; + } + + if (gradName) { + gradAttr = color[gradName]; + gradients = renderer.gradients; + stops = color.stops; + radialReference = elem.radialReference; + + // Keep < 2.2 kompatibility + if (isArray(gradAttr)) { + color[gradName] = gradAttr = { + x1: gradAttr[0], + y1: gradAttr[1], + x2: gradAttr[2], + y2: gradAttr[3], + gradientUnits: 'userSpaceOnUse' + }; + } + + // Correct the radial gradient for the radial reference system + if (gradName === 'radialGradient' && radialReference && !defined(gradAttr.gradientUnits)) { + extend(gradAttr, { + cx: (radialReference[0] - radialReference[2] / 2) + gradAttr.cx * radialReference[2], + cy: (radialReference[1] - radialReference[2] / 2) + gradAttr.cy * radialReference[2], + r: gradAttr.r * radialReference[2], + gradientUnits: 'userSpaceOnUse' + }); + } + + // Build the unique key to detect whether we need to create a new element (#1282) + for (n in gradAttr) { + if (n !== 'id') { + key.push(n, gradAttr[n]); + } + } + for (n in stops) { + key.push(stops[n]); + } + key = key.join(','); + + // Check if a gradient object with the same config object is created within this renderer + if (gradients[key]) { + id = gradients[key].id; + + } else { + + // Set the id and create the element + gradAttr.id = id = PREFIX + idCounter++; + gradients[key] = gradientObject = renderer.createElement(gradName) + .attr(gradAttr) + .add(renderer.defs); + + + // The gradient needs to keep a list of stops to be able to destroy them + gradientObject.stops = []; + each(stops, function (stop) { + var stopObject; + if (regexRgba.test(stop[1])) { + colorObject = Color(stop[1]); + stopColor = colorObject.get('rgb'); + stopOpacity = colorObject.get('a'); + } else { + stopColor = stop[1]; + stopOpacity = 1; + } + stopObject = renderer.createElement('stop').attr({ + offset: stop[0], + 'stop-color': stopColor, + 'stop-opacity': stopOpacity + }).add(gradientObject); + + // Add the stop element to the gradient + gradientObject.stops.push(stopObject); + }); + } + + // Return the reference to the gradient object + return 'url(' + renderer.url + '#' + id + ')'; + + // Webkit and Batik can't show rgba. + } else if (regexRgba.test(color)) { + colorObject = Color(color); + attr(elem, prop + '-opacity', colorObject.get('a')); + + return colorObject.get('rgb'); + + + } else { + // Remove the opacity attribute added above. Does not throw if the attribute is not there. + elem.removeAttribute(prop + '-opacity'); + + return color; + } + + }, + + + /** + * Add text to the SVG object + * @param {String} str + * @param {Number} x Left position + * @param {Number} y Top position + * @param {Boolean} useHTML Use HTML to render the text + */ + text: function (str, x, y, useHTML) { + + // declare variables + var renderer = this, + defaultChartStyle = defaultOptions.chart.style, + fakeSVG = useCanVG || (!hasSVG && renderer.forExport), + wrapper; + + if (useHTML && !renderer.forExport) { + return renderer.html(str, x, y); + } + + x = mathRound(pick(x, 0)); + y = mathRound(pick(y, 0)); + + wrapper = renderer.createElement('text') + .attr({ + x: x, + y: y, + text: str + }) + .css({ + fontFamily: defaultChartStyle.fontFamily, + fontSize: defaultChartStyle.fontSize + }); + + // Prevent wrapping from creating false offsetWidths in export in legacy IE (#1079, #1063) + if (fakeSVG) { + wrapper.css({ + position: ABSOLUTE + }); + } + + wrapper.x = x; + wrapper.y = y; + return wrapper; + }, + + + /** + * Create HTML text node. This is used by the VML renderer as well as the SVG + * renderer through the useHTML option. + * + * @param {String} str + * @param {Number} x + * @param {Number} y + */ + html: function (str, x, y) { + var defaultChartStyle = defaultOptions.chart.style, + wrapper = this.createElement('span'), + attrSetters = wrapper.attrSetters, + element = wrapper.element, + renderer = wrapper.renderer; + + // Text setter + attrSetters.text = function (value) { + if (value !== element.innerHTML) { + delete this.bBox; + } + element.innerHTML = value; + return false; + }; + + // Various setters which rely on update transform + attrSetters.x = attrSetters.y = attrSetters.align = function (value, key) { + if (key === 'align') { + key = 'textAlign'; // Do not overwrite the SVGElement.align method. Same as VML. + } + wrapper[key] = value; + wrapper.htmlUpdateTransform(); + return false; + }; + + // Set the default attributes + wrapper.attr({ + text: str, + x: mathRound(x), + y: mathRound(y) + }) + .css({ + position: ABSOLUTE, + whiteSpace: 'nowrap', + fontFamily: defaultChartStyle.fontFamily, + fontSize: defaultChartStyle.fontSize + }); + + // Use the HTML specific .css method + wrapper.css = wrapper.htmlCss; + + // This is specific for HTML within SVG + if (renderer.isSVG) { + wrapper.add = function (svgGroupWrapper) { + + var htmlGroup, + container = renderer.box.parentNode, + parentGroup, + parents = []; + + // Create a mock group to hold the HTML elements + if (svgGroupWrapper) { + htmlGroup = svgGroupWrapper.div; + if (!htmlGroup) { + + // Read the parent chain into an array and read from top down + parentGroup = svgGroupWrapper; + while (parentGroup) { + + parents.push(parentGroup); + + // Move up to the next parent group + parentGroup = parentGroup.parentGroup; + } + + // Ensure dynamically updating position when any parent is translated + each(parents.reverse(), function (parentGroup) { + var htmlGroupStyle; + + // Create a HTML div and append it to the parent div to emulate + // the SVG group structure + htmlGroup = parentGroup.div = parentGroup.div || createElement(DIV, { + className: attr(parentGroup.element, 'class') + }, { + position: ABSOLUTE, + left: (parentGroup.translateX || 0) + PX, + top: (parentGroup.translateY || 0) + PX + }, htmlGroup || container); // the top group is appended to container + + // Shortcut + htmlGroupStyle = htmlGroup.style; + + // Set listeners to update the HTML div's position whenever the SVG group + // position is changed + extend(parentGroup.attrSetters, { + translateX: function (value) { + htmlGroupStyle.left = value + PX; + }, + translateY: function (value) { + htmlGroupStyle.top = value + PX; + }, + visibility: function (value, key) { + htmlGroupStyle[key] = value; + } + }); + }); + + } + } else { + htmlGroup = container; + } + + htmlGroup.appendChild(element); + + // Shared with VML: + wrapper.added = true; + if (wrapper.alignOnAdd) { + wrapper.htmlUpdateTransform(); + } + + return wrapper; + }; + } + return wrapper; + }, + + /** + * Utility to return the baseline offset and total line height from the font size + */ + fontMetrics: function (fontSize) { + fontSize = pInt(fontSize || 11); + + // Empirical values found by comparing font size and bounding box height. + // Applies to the default font family. http://jsfiddle.net/highcharts/7xvn7/ + var lineHeight = fontSize < 24 ? fontSize + 4 : mathRound(fontSize * 1.2), + baseline = mathRound(lineHeight * 0.8); + + return { + h: lineHeight, + b: baseline + }; + }, + + /** + * Add a label, a text item that can hold a colored or gradient background + * as well as a border and shadow. + * @param {string} str + * @param {Number} x + * @param {Number} y + * @param {String} shape + * @param {Number} anchorX In case the shape has a pointer, like a flag, this is the + * coordinates it should be pinned to + * @param {Number} anchorY + * @param {Boolean} baseline Whether to position the label relative to the text baseline, + * like renderer.text, or to the upper border of the rectangle. + * @param {String} className Class name for the group + */ + label: function (str, x, y, shape, anchorX, anchorY, useHTML, baseline, className) { + + var renderer = this, + wrapper = renderer.g(className), + text = renderer.text('', 0, 0, useHTML) + .attr({ + zIndex: 1 + }), + //.add(wrapper), + box, + bBox, + alignFactor = 0, + padding = 3, + width, + height, + wrapperX, + wrapperY, + crispAdjust = 0, + deferredAttr = {}, + baselineOffset, + attrSetters = wrapper.attrSetters, + needsBox; + + /** + * This function runs after the label is added to the DOM (when the bounding box is + * available), and after the text of the label is updated to detect the new bounding + * box and reflect it in the border box. + */ + function updateBoxSize() { + var boxY, + style = text.element.style; + + bBox = (width === undefined || height === undefined || wrapper.styles.textAlign) && + text.getBBox(); + wrapper.width = (width || bBox.width || 0) + 2 * padding; + wrapper.height = (height || bBox.height || 0) + 2 * padding; + + // update the label-scoped y offset + baselineOffset = padding + renderer.fontMetrics(style && style.fontSize).b; + + if (needsBox) { + + // create the border box if it is not already present + if (!box) { + boxY = baseline ? -baselineOffset : 0; + + wrapper.box = box = shape ? + renderer.symbol(shape, -alignFactor * padding, boxY, wrapper.width, wrapper.height) : + renderer.rect(-alignFactor * padding, boxY, wrapper.width, wrapper.height, 0, deferredAttr[STROKE_WIDTH]); + box.add(wrapper); + } + + // apply the box attributes + box.attr(merge({ + width: wrapper.width, + height: wrapper.height + }, deferredAttr)); + deferredAttr = null; + } + } + + /** + * This function runs after setting text or padding, but only if padding is changed + */ + function updateTextPadding() { + var styles = wrapper.styles, + textAlign = styles && styles.textAlign, + x = padding * (1 - alignFactor), + y; + + // determin y based on the baseline + y = baseline ? 0 : baselineOffset; + + // compensate for alignment + if (defined(width) && (textAlign === 'center' || textAlign === 'right')) { + x += { center: 0.5, right: 1 }[textAlign] * (width - bBox.width); + } + + // update if anything changed + if (x !== text.x || y !== text.y) { + text.attr({ + x: x, + y: y + }); + } + + // record current values + text.x = x; + text.y = y; + } + + /** + * Set a box attribute, or defer it if the box is not yet created + * @param {Object} key + * @param {Object} value + */ + function boxAttr(key, value) { + if (box) { + box.attr(key, value); + } else { + deferredAttr[key] = value; + } + } + + function getSizeAfterAdd() { + text.add(wrapper); + wrapper.attr({ + text: str, // alignment is available now + x: x, + y: y + }); + + if (box && defined(anchorX)) { + wrapper.attr({ + anchorX: anchorX, + anchorY: anchorY + }); + } + } + + /** + * After the text element is added, get the desired size of the border box + * and add it before the text in the DOM. + */ + addEvent(wrapper, 'add', getSizeAfterAdd); + + /* + * Add specific attribute setters. + */ + + // only change local variables + attrSetters.width = function (value) { + width = value; + return false; + }; + attrSetters.height = function (value) { + height = value; + return false; + }; + attrSetters.padding = function (value) { + if (defined(value) && value !== padding) { + padding = value; + updateTextPadding(); + } + + return false; + }; + + // change local variable and set attribue as well + attrSetters.align = function (value) { + alignFactor = { left: 0, center: 0.5, right: 1 }[value]; + return false; // prevent setting text-anchor on the group + }; + + // apply these to the box and the text alike + attrSetters.text = function (value, key) { + text.attr(key, value); + updateBoxSize(); + updateTextPadding(); + return false; + }; + + // apply these to the box but not to the text + attrSetters[STROKE_WIDTH] = function (value, key) { + needsBox = true; + crispAdjust = value % 2 / 2; + boxAttr(key, value); + return false; + }; + attrSetters.stroke = attrSetters.fill = attrSetters.r = function (value, key) { + if (key === 'fill') { + needsBox = true; + } + boxAttr(key, value); + return false; + }; + attrSetters.anchorX = function (value, key) { + anchorX = value; + boxAttr(key, value + crispAdjust - wrapperX); + return false; + }; + attrSetters.anchorY = function (value, key) { + anchorY = value; + boxAttr(key, value - wrapperY); + return false; + }; + + // rename attributes + attrSetters.x = function (value) { + wrapper.x = value; // for animation getter + value -= alignFactor * ((width || bBox.width) + padding); + wrapperX = mathRound(value); + + wrapper.attr('translateX', wrapperX); + return false; + }; + attrSetters.y = function (value) { + wrapperY = wrapper.y = mathRound(value); + wrapper.attr('translateY', value); + return false; + }; + + // Redirect certain methods to either the box or the text + var baseCss = wrapper.css; + return extend(wrapper, { + /** + * Pick up some properties and apply them to the text instead of the wrapper + */ + css: function (styles) { + if (styles) { + var textStyles = {}; + styles = merge({}, styles); // create a copy to avoid altering the original object (#537) + each(['fontSize', 'fontWeight', 'fontFamily', 'color', 'lineHeight', 'width'], function (prop) { + if (styles[prop] !== UNDEFINED) { + textStyles[prop] = styles[prop]; + delete styles[prop]; + } + }); + text.css(textStyles); + } + return baseCss.call(wrapper, styles); + }, + /** + * Return the bounding box of the box, not the group + */ + getBBox: function () { + return { + width: bBox.width + 2 * padding, + height: bBox.height + 2 * padding, + x: bBox.x - padding, + y: bBox.y - padding + }; + }, + /** + * Apply the shadow to the box + */ + shadow: function (b) { + if (box) { + box.shadow(b); + } + return wrapper; + }, + /** + * Destroy and release memory. + */ + destroy: function () { + removeEvent(wrapper, 'add', getSizeAfterAdd); + + // Added by button implementation + removeEvent(wrapper.element, 'mouseenter'); + removeEvent(wrapper.element, 'mouseleave'); + + if (text) { + text = text.destroy(); + } + if (box) { + box = box.destroy(); + } + // Call base implementation to destroy the rest + SVGElement.prototype.destroy.call(wrapper); + + // Release local pointers (#1298) + wrapper = renderer = updateBoxSize = updateTextPadding = boxAttr = getSizeAfterAdd = null; + } + }); + } +}; // end SVGRenderer + + +// general renderer +Renderer = SVGRenderer; + + +/* **************************************************************************** + * * + * START OF INTERNET EXPLORER <= 8 SPECIFIC CODE * + * * + * For applications and websites that don't need IE support, like platform * + * targeted mobile apps and web apps, this code can be removed. * + * * + *****************************************************************************/ + +/** + * @constructor + */ +var VMLRenderer; +if (!hasSVG && !useCanVG) { + +/** + * The VML element wrapper. + */ +var VMLElement = { + + /** + * Initialize a new VML element wrapper. It builds the markup as a string + * to minimize DOM traffic. + * @param {Object} renderer + * @param {Object} nodeName + */ + init: function (renderer, nodeName) { + var wrapper = this, + markup = ['<', nodeName, ' filled="f" stroked="f"'], + style = ['position: ', ABSOLUTE, ';']; + + // divs and shapes need size + if (nodeName === 'shape' || nodeName === DIV) { + style.push('left:0;top:0;width:1px;height:1px;'); + } + if (docMode8) { + style.push('visibility: ', nodeName === DIV ? HIDDEN : VISIBLE); + } + + markup.push(' style="', style.join(''), '"/>'); + + // create element with default attributes and style + if (nodeName) { + markup = nodeName === DIV || nodeName === 'span' || nodeName === 'img' ? + markup.join('') + : renderer.prepVML(markup); + wrapper.element = createElement(markup); + } + + wrapper.renderer = renderer; + wrapper.attrSetters = {}; + }, + + /** + * Add the node to the given parent + * @param {Object} parent + */ + add: function (parent) { + var wrapper = this, + renderer = wrapper.renderer, + element = wrapper.element, + box = renderer.box, + inverted = parent && parent.inverted, + + // get the parent node + parentNode = parent ? + parent.element || parent : + box; + + + // if the parent group is inverted, apply inversion on all children + if (inverted) { // only on groups + renderer.invertChild(element, parentNode); + } + + // append it + parentNode.appendChild(element); + + // align text after adding to be able to read offset + wrapper.added = true; + if (wrapper.alignOnAdd && !wrapper.deferUpdateTransform) { + wrapper.updateTransform(); + } + + // fire an event for internal hooks + fireEvent(wrapper, 'add'); + + return wrapper; + }, + + /** + * VML always uses htmlUpdateTransform + */ + updateTransform: SVGElement.prototype.htmlUpdateTransform, + + /** + * Get or set attributes + */ + attr: function (hash, val) { + var wrapper = this, + key, + value, + i, + result, + element = wrapper.element || {}, + elemStyle = element.style, + nodeName = element.nodeName, + renderer = wrapper.renderer, + symbolName = wrapper.symbolName, + hasSetSymbolSize, + shadows = wrapper.shadows, + skipAttr, + attrSetters = wrapper.attrSetters, + ret = wrapper; + + // single key-value pair + if (isString(hash) && defined(val)) { + key = hash; + hash = {}; + hash[key] = val; + } + + // used as a getter, val is undefined + if (isString(hash)) { + key = hash; + if (key === 'strokeWidth' || key === 'stroke-width') { + ret = wrapper.strokeweight; + } else { + ret = wrapper[key]; + } + + // setter + } else { + for (key in hash) { + value = hash[key]; + skipAttr = false; + + // check for a specific attribute setter + result = attrSetters[key] && attrSetters[key].call(wrapper, value, key); + + if (result !== false && value !== null) { // #620 + + if (result !== UNDEFINED) { + value = result; // the attribute setter has returned a new value to set + } + + + // prepare paths + // symbols + if (symbolName && /^(x|y|r|start|end|width|height|innerR|anchorX|anchorY)/.test(key)) { + // if one of the symbol size affecting parameters are changed, + // check all the others only once for each call to an element's + // .attr() method + if (!hasSetSymbolSize) { + wrapper.symbolAttr(hash); + + hasSetSymbolSize = true; + } + skipAttr = true; + + } else if (key === 'd') { + value = value || []; + wrapper.d = value.join(' '); // used in getter for animation + + // convert paths + i = value.length; + var convertedPath = []; + while (i--) { + + // Multiply by 10 to allow subpixel precision. + // Substracting half a pixel seems to make the coordinates + // align with SVG, but this hasn't been tested thoroughly + if (isNumber(value[i])) { + convertedPath[i] = mathRound(value[i] * 10) - 5; + } else if (value[i] === 'Z') { // close the path + convertedPath[i] = 'x'; + } else { + convertedPath[i] = value[i]; + } + + } + value = convertedPath.join(' ') || 'x'; + element.path = value; + + // update shadows + if (shadows) { + i = shadows.length; + while (i--) { + shadows[i].path = shadows[i].cutOff ? this.cutOffPath(value, shadows[i].cutOff) : value; + } + } + skipAttr = true; + + // handle visibility + } else if (key === 'visibility') { + + // let the shadow follow the main element + if (shadows) { + i = shadows.length; + while (i--) { + shadows[i].style[key] = value; + } + } + + // Instead of toggling the visibility CSS property, move the div out of the viewport. + // This works around #61 and #586 + if (nodeName === 'DIV') { + value = value === HIDDEN ? '-999em' : 0; + key = 'top'; + } + + elemStyle[key] = value; + skipAttr = true; + + // directly mapped to css + } else if (key === 'zIndex') { + + if (value) { + elemStyle[key] = value; + } + skipAttr = true; + + // width and height + } else if (key === 'width' || key === 'height') { + + value = mathMax(0, value); // don't set width or height below zero (#311) + + this[key] = value; // used in getter + + // clipping rectangle special + if (wrapper.updateClipping) { + wrapper[key] = value; + wrapper.updateClipping(); + } else { + // normal + elemStyle[key] = value; + } + + skipAttr = true; + + // x and y + } else if (key === 'x' || key === 'y') { + wrapper[key] = value; // used in getter + elemStyle[{ x: 'left', y: 'top' }[key]] = value; + + // class name + } else if (key === 'class') { + // IE8 Standards mode has problems retrieving the className + element.className = value; + + // stroke + } else if (key === 'stroke') { + + value = renderer.color(value, element, key); + + key = 'strokecolor'; + + // stroke width + } else if (key === 'stroke-width' || key === 'strokeWidth') { + element.stroked = value ? true : false; + key = 'strokeweight'; + wrapper[key] = value; // used in getter, issue #113 + if (isNumber(value)) { + value += PX; + } + + // dashStyle + } else if (key === 'dashstyle') { + var strokeElem = element.getElementsByTagName('stroke')[0] || + createElement(renderer.prepVML(['']), null, null, element); + strokeElem[key] = value || 'solid'; + wrapper.dashstyle = value; /* because changing stroke-width will change the dash length + and cause an epileptic effect */ + skipAttr = true; + + // fill + } else if (key === 'fill') { + + if (nodeName === 'SPAN') { // text color + elemStyle.color = value; + } else if (nodeName !== 'IMG') { // #1336 + element.filled = value !== NONE ? true : false; + + value = renderer.color(value, element, key, wrapper); + + key = 'fillcolor'; + } + + // rotation on VML elements + } else if (nodeName === 'shape' && key === 'rotation') { + wrapper[key] = value; + // Correction for the 1x1 size of the shape container. Used in gauge needles. + element.style.left = -mathRound(mathSin(value * deg2rad) + 1) + PX; + element.style.top = mathRound(mathCos(value * deg2rad)) + PX; + + // translation for animation + } else if (key === 'translateX' || key === 'translateY' || key === 'rotation') { + wrapper[key] = value; + wrapper.updateTransform(); + + skipAttr = true; + + // text for rotated and non-rotated elements + } else if (key === 'text') { + this.bBox = null; + element.innerHTML = value; + skipAttr = true; + } + + if (!skipAttr) { + if (docMode8) { // IE8 setAttribute bug + element[key] = value; + } else { + attr(element, key, value); + } + } + + } + } + } + return ret; + }, + + /** + * Set the element's clipping to a predefined rectangle + * + * @param {String} id The id of the clip rectangle + */ + clip: function (clipRect) { + var wrapper = this, + clipMembers, + element = wrapper.element, + parentNode = element.parentNode, + cssRet; + + if (clipRect) { + clipMembers = clipRect.members; + erase(clipMembers, wrapper); // Ensure unique list of elements (#1258) + clipMembers.push(wrapper); + wrapper.destroyClip = function () { + erase(clipMembers, wrapper); + }; + // Issue #863 workaround - related to #140, #61, #74 + if (parentNode && parentNode.className === 'highcharts-tracker' && !docMode8) { + css(element, { visibility: HIDDEN }); + } + cssRet = clipRect.getCSS(wrapper); + + } else { + if (wrapper.destroyClip) { + wrapper.destroyClip(); + } + cssRet = { clip: docMode8 ? 'inherit' : 'rect(auto)' }; // #1214 + } + + return wrapper.css(cssRet); + + }, + + /** + * Set styles for the element + * @param {Object} styles + */ + css: SVGElement.prototype.htmlCss, + + /** + * Removes a child either by removeChild or move to garbageBin. + * Issue 490; in VML removeChild results in Orphaned nodes according to sIEve, discardElement does not. + */ + safeRemoveChild: function (element) { + // discardElement will detach the node from its parent before attaching it + // to the garbage bin. Therefore it is important that the node is attached and have parent. + if (element.parentNode) { + discardElement(element); + } + }, + + /** + * Extend element.destroy by removing it from the clip members array + */ + destroy: function () { + if (this.destroyClip) { + this.destroyClip(); + } + + return SVGElement.prototype.destroy.apply(this); + }, + + /** + * Remove all child nodes of a group, except the v:group element + */ + empty: function () { + var element = this.element, + childNodes = element.childNodes, + i = childNodes.length, + node; + + while (i--) { + node = childNodes[i]; + node.parentNode.removeChild(node); + } + }, + + /** + * Add an event listener. VML override for normalizing event parameters. + * @param {String} eventType + * @param {Function} handler + */ + on: function (eventType, handler) { + // simplest possible event model for internal use + this.element['on' + eventType] = function () { + var evt = win.event; + evt.target = evt.srcElement; + handler(evt); + }; + return this; + }, + + /** + * In stacked columns, cut off the shadows so that they don't overlap + */ + cutOffPath: function (path, length) { + + var len; + + path = path.split(/[ ,]/); + len = path.length; + + if (len === 9 || len === 11) { + path[len - 4] = path[len - 2] = pInt(path[len - 2]) - 10 * length; + } + return path.join(' '); + }, + + /** + * Apply a drop shadow by copying elements and giving them different strokes + * @param {Boolean|Object} shadowOptions + */ + shadow: function (shadowOptions, group, cutOff) { + var shadows = [], + i, + element = this.element, + renderer = this.renderer, + shadow, + elemStyle = element.style, + markup, + path = element.path, + strokeWidth, + modifiedPath, + shadowWidth, + shadowElementOpacity; + + // some times empty paths are not strings + if (path && typeof path.value !== 'string') { + path = 'x'; + } + modifiedPath = path; + + if (shadowOptions) { + shadowWidth = pick(shadowOptions.width, 3); + shadowElementOpacity = (shadowOptions.opacity || 0.15) / shadowWidth; + for (i = 1; i <= 3; i++) { + + strokeWidth = (shadowWidth * 2) + 1 - (2 * i); + + // Cut off shadows for stacked column items + if (cutOff) { + modifiedPath = this.cutOffPath(path.value, strokeWidth + 0.5); + } + + markup = ['']; + + shadow = createElement(renderer.prepVML(markup), + null, { + left: pInt(elemStyle.left) + pick(shadowOptions.offsetX, 1), + top: pInt(elemStyle.top) + pick(shadowOptions.offsetY, 1) + } + ); + if (cutOff) { + shadow.cutOff = strokeWidth + 1; + } + + // apply the opacity + markup = ['']; + createElement(renderer.prepVML(markup), null, null, shadow); + + + // insert it + if (group) { + group.element.appendChild(shadow); + } else { + element.parentNode.insertBefore(shadow, element); + } + + // record it + shadows.push(shadow); + + } + + this.shadows = shadows; + } + return this; + + } +}; +VMLElement = extendClass(SVGElement, VMLElement); + +/** + * The VML renderer + */ +var VMLRendererExtension = { // inherit SVGRenderer + + Element: VMLElement, + isIE8: userAgent.indexOf('MSIE 8.0') > -1, + + + /** + * Initialize the VMLRenderer + * @param {Object} container + * @param {Number} width + * @param {Number} height + */ + init: function (container, width, height) { + var renderer = this, + boxWrapper, + box; + + renderer.alignedObjects = []; + + boxWrapper = renderer.createElement(DIV); + box = boxWrapper.element; + box.style.position = RELATIVE; // for freeform drawing using renderer directly + container.appendChild(boxWrapper.element); + + + // generate the containing box + renderer.box = box; + renderer.boxWrapper = boxWrapper; + + + renderer.setSize(width, height, false); + + // The only way to make IE6 and IE7 print is to use a global namespace. However, + // with IE8 the only way to make the dynamic shapes visible in screen and print mode + // seems to be to add the xmlns attribute and the behaviour style inline. + if (!doc.namespaces.hcv) { + + doc.namespaces.add('hcv', 'urn:schemas-microsoft-com:vml'); + + // setup default css + doc.createStyleSheet().cssText = + 'hcv\\:fill, hcv\\:path, hcv\\:shape, hcv\\:stroke' + + '{ behavior:url(#default#VML); display: inline-block; } '; + + } + }, + + + /** + * Detect whether the renderer is hidden. This happens when one of the parent elements + * has display: none + */ + isHidden: function () { + return !this.box.offsetWidth; + }, + + /** + * Define a clipping rectangle. In VML it is accomplished by storing the values + * for setting the CSS style to all associated members. + * + * @param {Number} x + * @param {Number} y + * @param {Number} width + * @param {Number} height + */ + clipRect: function (x, y, width, height) { + + // create a dummy element + var clipRect = this.createElement(), + isObj = isObject(x); + + // mimic a rectangle with its style object for automatic updating in attr + return extend(clipRect, { + members: [], + left: isObj ? x.x : x, + top: isObj ? x.y : y, + width: isObj ? x.width : width, + height: isObj ? x.height : height, + getCSS: function (wrapper) { + var inverted = wrapper.inverted, + rect = this, + top = rect.top, + left = rect.left, + right = left + rect.width, + bottom = top + rect.height, + ret = { + clip: 'rect(' + + mathRound(inverted ? left : top) + 'px,' + + mathRound(inverted ? bottom : right) + 'px,' + + mathRound(inverted ? right : bottom) + 'px,' + + mathRound(inverted ? top : left) + 'px)' + }; + + // issue 74 workaround + if (!inverted && docMode8 && wrapper.element.nodeName !== 'IMG') { + extend(ret, { + width: right + PX, + height: bottom + PX + }); + } + + return ret; + }, + + // used in attr and animation to update the clipping of all members + updateClipping: function () { + each(clipRect.members, function (member) { + member.css(clipRect.getCSS(member)); + }); + } + }); + + }, + + + /** + * Take a color and return it if it's a string, make it a gradient if it's a + * gradient configuration object, and apply opacity. + * + * @param {Object} color The color or config object + */ + color: function (color, elem, prop, wrapper) { + var renderer = this, + colorObject, + regexRgba = /^rgba/, + markup, + fillType, + ret = NONE; + + // Check for linear or radial gradient + if (color && color.linearGradient) { + fillType = 'gradient'; + } else if (color && color.radialGradient) { + fillType = 'pattern'; + } + + + if (fillType) { + + var stopColor, + stopOpacity, + gradient = color.linearGradient || color.radialGradient, + x1, + y1, + x2, + y2, + opacity1, + opacity2, + color1, + color2, + fillAttr = '', + stops = color.stops, + firstStop, + lastStop, + colors = [], + addFillNode = function () { + // Add the fill subnode. When colors attribute is used, the meanings of opacity and o:opacity2 + // are reversed. + markup = ['']; + createElement(renderer.prepVML(markup), null, null, elem); + }; + + // Extend from 0 to 1 + firstStop = stops[0]; + lastStop = stops[stops.length - 1]; + if (firstStop[0] > 0) { + stops.unshift([ + 0, + firstStop[1] + ]); + } + if (lastStop[0] < 1) { + stops.push([ + 1, + lastStop[1] + ]); + } + + // Compute the stops + each(stops, function (stop, i) { + if (regexRgba.test(stop[1])) { + colorObject = Color(stop[1]); + stopColor = colorObject.get('rgb'); + stopOpacity = colorObject.get('a'); + } else { + stopColor = stop[1]; + stopOpacity = 1; + } + + // Build the color attribute + colors.push((stop[0] * 100) + '% ' + stopColor); + + // Only start and end opacities are allowed, so we use the first and the last + if (!i) { + opacity1 = stopOpacity; + color2 = stopColor; + } else { + opacity2 = stopOpacity; + color1 = stopColor; + } + }); + + // Apply the gradient to fills only. + if (prop === 'fill') { + + // Handle linear gradient angle + if (fillType === 'gradient') { + x1 = gradient.x1 || gradient[0] || 0; + y1 = gradient.y1 || gradient[1] || 0; + x2 = gradient.x2 || gradient[2] || 0; + y2 = gradient.y2 || gradient[3] || 0; + fillAttr = 'angle="' + (90 - math.atan( + (y2 - y1) / // y vector + (x2 - x1) // x vector + ) * 180 / mathPI) + '"'; + + addFillNode(); + + // Radial (circular) gradient + } else { + + var r = gradient.r, + sizex = r * 2, + sizey = r * 2, + cx = gradient.cx, + cy = gradient.cy, + radialReference = elem.radialReference, + bBox, + applyRadialGradient = function () { + if (radialReference) { + bBox = wrapper.getBBox(); + cx += (radialReference[0] - bBox.x) / bBox.width - 0.5; + cy += (radialReference[1] - bBox.y) / bBox.height - 0.5; + sizex *= radialReference[2] / bBox.width; + sizey *= radialReference[2] / bBox.height; + } + fillAttr = 'src="' + defaultOptions.global.VMLRadialGradientURL + '" ' + + 'size="' + sizex + ',' + sizey + '" ' + + 'origin="0.5,0.5" ' + + 'position="' + cx + ',' + cy + '" ' + + 'color2="' + color2 + '" '; + + addFillNode(); + }; + + // Apply radial gradient + if (wrapper.added) { + applyRadialGradient(); + } else { + // We need to know the bounding box to get the size and position right + addEvent(wrapper, 'add', applyRadialGradient); + } + + // The fill element's color attribute is broken in IE8 standards mode, so we + // need to set the parent shape's fillcolor attribute instead. + ret = color1; + } + + // Gradients are not supported for VML stroke, return the first color. #722. + } else { + ret = stopColor; + } + + // if the color is an rgba color, split it and add a fill node + // to hold the opacity component + } else if (regexRgba.test(color) && elem.tagName !== 'IMG') { + + colorObject = Color(color); + + markup = ['<', prop, ' opacity="', colorObject.get('a'), '"/>']; + createElement(this.prepVML(markup), null, null, elem); + + ret = colorObject.get('rgb'); + + + } else { + var strokeNodes = elem.getElementsByTagName(prop); + if (strokeNodes.length) { + strokeNodes[0].opacity = 1; + } + ret = color; + } + + return ret; + }, + + /** + * Take a VML string and prepare it for either IE8 or IE6/IE7. + * @param {Array} markup A string array of the VML markup to prepare + */ + prepVML: function (markup) { + var vmlStyle = 'display:inline-block;behavior:url(#default#VML);', + isIE8 = this.isIE8; + + markup = markup.join(''); + + if (isIE8) { // add xmlns and style inline + markup = markup.replace('/>', ' xmlns="urn:schemas-microsoft-com:vml" />'); + if (markup.indexOf('style="') === -1) { + markup = markup.replace('/>', ' style="' + vmlStyle + '" />'); + } else { + markup = markup.replace('style="', 'style="' + vmlStyle); + } + + } else { // add namespace + markup = markup.replace('<', ' 1) { + obj.attr({ + x: x, + y: y, + width: width, + height: height + }); + } + return obj; + }, + + /** + * VML uses a shape for rect to overcome bugs and rotation problems + */ + rect: function (x, y, width, height, r, strokeWidth) { + + if (isObject(x)) { + y = x.y; + width = x.width; + height = x.height; + strokeWidth = x.strokeWidth; + x = x.x; + } + var wrapper = this.symbol('rect'); + wrapper.r = r; + + return wrapper.attr(wrapper.crisp(strokeWidth, x, y, mathMax(width, 0), mathMax(height, 0))); + }, + + /** + * In the VML renderer, each child of an inverted div (group) is inverted + * @param {Object} element + * @param {Object} parentNode + */ + invertChild: function (element, parentNode) { + var parentStyle = parentNode.style; + css(element, { + flip: 'x', + left: pInt(parentStyle.width) - 1, + top: pInt(parentStyle.height) - 1, + rotation: -90 + }); + }, + + /** + * Symbol definitions that override the parent SVG renderer's symbols + * + */ + symbols: { + // VML specific arc function + arc: function (x, y, w, h, options) { + var start = options.start, + end = options.end, + radius = options.r || w || h, + cosStart = mathCos(start), + sinStart = mathSin(start), + cosEnd = mathCos(end), + sinEnd = mathSin(end), + innerRadius = options.innerR, + circleCorrection = 0.08 / radius, // #760 + innerCorrection = (innerRadius && 0.1 / innerRadius) || 0, + ret; + + if (end - start === 0) { // no angle, don't show it. + return ['x']; + + } else if (2 * mathPI - end + start < circleCorrection) { // full circle + // empirical correction found by trying out the limits for different radii + cosEnd = -circleCorrection; + } else if (end - start < innerCorrection) { // issue #186, another mysterious VML arc problem + cosEnd = mathCos(start + innerCorrection); + } + + ret = [ + 'wa', // clockwise arc to + x - radius, // left + y - radius, // top + x + radius, // right + y + radius, // bottom + x + radius * cosStart, // start x + y + radius * sinStart, // start y + x + radius * cosEnd, // end x + y + radius * sinEnd // end y + ]; + + if (options.open && !innerRadius) { + ret.push( + 'e', + M, + x,// - innerRadius, + y// - innerRadius + ); + } + + ret.push( + 'at', // anti clockwise arc to + x - innerRadius, // left + y - innerRadius, // top + x + innerRadius, // right + y + innerRadius, // bottom + x + innerRadius * cosEnd, // start x + y + innerRadius * sinEnd, // start y + x + innerRadius * cosStart, // end x + y + innerRadius * sinStart, // end y + 'x', // finish path + 'e' // close + ); + + return ret; + + }, + // Add circle symbol path. This performs significantly faster than v:oval. + circle: function (x, y, w, h) { + + return [ + 'wa', // clockwisearcto + x, // left + y, // top + x + w, // right + y + h, // bottom + x + w, // start x + y + h / 2, // start y + x + w, // end x + y + h / 2, // end y + //'x', // finish path + 'e' // close + ]; + }, + /** + * Add rectangle symbol path which eases rotation and omits arcsize problems + * compared to the built-in VML roundrect shape + * + * @param {Number} left Left position + * @param {Number} top Top position + * @param {Number} r Border radius + * @param {Object} options Width and height + */ + + rect: function (left, top, width, height, options) { + + var right = left + width, + bottom = top + height, + ret, + r; + + // No radius, return the more lightweight square + if (!defined(options) || !options.r) { + ret = SVGRenderer.prototype.symbols.square.apply(0, arguments); + + // Has radius add arcs for the corners + } else { + + r = mathMin(options.r, width, height); + ret = [ + M, + left + r, top, + + L, + right - r, top, + 'wa', + right - 2 * r, top, + right, top + 2 * r, + right - r, top, + right, top + r, + + L, + right, bottom - r, + 'wa', + right - 2 * r, bottom - 2 * r, + right, bottom, + right, bottom - r, + right - r, bottom, + + L, + left + r, bottom, + 'wa', + left, bottom - 2 * r, + left + 2 * r, bottom, + left + r, bottom, + left, bottom - r, + + L, + left, top + r, + 'wa', + left, top, + left + 2 * r, top + 2 * r, + left, top + r, + left + r, top, + + + 'x', + 'e' + ]; + } + return ret; + } + } +}; +VMLRenderer = function () { + this.init.apply(this, arguments); +}; +VMLRenderer.prototype = merge(SVGRenderer.prototype, VMLRendererExtension); + + // general renderer + Renderer = VMLRenderer; +} + +/* **************************************************************************** + * * + * END OF INTERNET EXPLORER <= 8 SPECIFIC CODE * + * * + *****************************************************************************/ +/* **************************************************************************** + * * + * START OF ANDROID < 3 SPECIFIC CODE. THIS CAN BE REMOVED IF YOU'RE NOT * + * TARGETING THAT SYSTEM. * + * * + *****************************************************************************/ +var CanVGRenderer, + CanVGController; + +if (useCanVG) { + /** + * The CanVGRenderer is empty from start to keep the source footprint small. + * When requested, the CanVGController downloads the rest of the source packaged + * together with the canvg library. + */ + CanVGRenderer = function () { + // Override the global SVG namespace to fake SVG/HTML that accepts CSS + SVG_NS = 'http://www.w3.org/1999/xhtml'; + }; + + /** + * Start with an empty symbols object. This is needed when exporting is used (exporting.src.js will add a few symbols), but + * the implementation from SvgRenderer will not be merged in until first render. + */ + CanVGRenderer.prototype.symbols = {}; + + /** + * Handles on demand download of canvg rendering support. + */ + CanVGController = (function () { + // List of renderering calls + var deferredRenderCalls = []; + + /** + * When downloaded, we are ready to draw deferred charts. + */ + function drawDeferred() { + var callLength = deferredRenderCalls.length, + callIndex; + + // Draw all pending render calls + for (callIndex = 0; callIndex < callLength; callIndex++) { + deferredRenderCalls[callIndex](); + } + // Clear the list + deferredRenderCalls = []; + } + + return { + push: function (func, scriptLocation) { + // Only get the script once + if (deferredRenderCalls.length === 0) { + getScript(scriptLocation, drawDeferred); + } + // Register render call + deferredRenderCalls.push(func); + } + }; + }()); +} // end CanVGRenderer + +/* **************************************************************************** + * * + * END OF ANDROID < 3 SPECIFIC CODE * + * * + *****************************************************************************/ + +/** + * General renderer + */ +Renderer = VMLRenderer || CanVGRenderer || SVGRenderer; +/** + * The Tick class + */ +function Tick(axis, pos, type) { + this.axis = axis; + this.pos = pos; + this.type = type || ''; + this.isNew = true; + + if (!type) { + this.addLabel(); + } +} + +Tick.prototype = { + /** + * Write the tick label + */ + addLabel: function () { + var tick = this, + axis = tick.axis, + options = axis.options, + chart = axis.chart, + horiz = axis.horiz, + categories = axis.categories, + pos = tick.pos, + labelOptions = options.labels, + str, + tickPositions = axis.tickPositions, + width = (categories && horiz && categories.length && + !labelOptions.step && !labelOptions.staggerLines && + !labelOptions.rotation && + chart.plotWidth / tickPositions.length) || + (!horiz && chart.plotWidth / 2), + isFirst = pos === tickPositions[0], + isLast = pos === tickPositions[tickPositions.length - 1], + css, + attr, + value = categories && defined(categories[pos]) ? categories[pos] : pos, + label = tick.label, + tickPositionInfo = tickPositions.info, + dateTimeLabelFormat; + + // Set the datetime label format. If a higher rank is set for this position, use that. If not, + // use the general format. + if (axis.isDatetimeAxis && tickPositionInfo) { + dateTimeLabelFormat = options.dateTimeLabelFormats[tickPositionInfo.higherRanks[pos] || tickPositionInfo.unitName]; + } + + // set properties for access in render method + tick.isFirst = isFirst; + tick.isLast = isLast; + + // get the string + str = axis.labelFormatter.call({ + axis: axis, + chart: chart, + isFirst: isFirst, + isLast: isLast, + dateTimeLabelFormat: dateTimeLabelFormat, + value: axis.isLog ? correctFloat(lin2log(value)) : value + }); + + // prepare CSS + css = width && { width: mathMax(1, mathRound(width - 2 * (labelOptions.padding || 10))) + PX }; + css = extend(css, labelOptions.style); + + // first call + if (!defined(label)) { + attr = { + align: labelOptions.align + }; + if (isNumber(labelOptions.rotation)) { + attr.rotation = labelOptions.rotation; + } + tick.label = + defined(str) && labelOptions.enabled ? + chart.renderer.text( + str, + 0, + 0, + labelOptions.useHTML + ) + .attr(attr) + // without position absolute, IE export sometimes is wrong + .css(css) + .add(axis.labelGroup) : + null; + + // update + } else if (label) { + label.attr({ + text: str + }) + .css(css); + } + }, + + /** + * Get the offset height or width of the label + */ + getLabelSize: function () { + var label = this.label, + axis = this.axis; + return label ? + ((this.labelBBox = label.getBBox()))[axis.horiz ? 'height' : 'width'] : + 0; + }, + + /** + * Find how far the labels extend to the right and left of the tick's x position. Used for anti-collision + * detection with overflow logic. + */ + getLabelSides: function () { + var bBox = this.labelBBox, // assume getLabelSize has run at this point + axis = this.axis, + options = axis.options, + labelOptions = options.labels, + width = bBox.width, + leftSide = width * { left: 0, center: 0.5, right: 1 }[labelOptions.align] - labelOptions.x; + + return [-leftSide, width - leftSide]; + }, + + /** + * Handle the label overflow by adjusting the labels to the left and right edge, or + * hide them if they collide into the neighbour label. + */ + handleOverflow: function (index, xy) { + var show = true, + axis = this.axis, + chart = axis.chart, + isFirst = this.isFirst, + isLast = this.isLast, + x = xy.x, + reversed = axis.reversed, + tickPositions = axis.tickPositions; + + if (isFirst || isLast) { + + var sides = this.getLabelSides(), + leftSide = sides[0], + rightSide = sides[1], + plotLeft = chart.plotLeft, + plotRight = plotLeft + axis.len, + neighbour = axis.ticks[tickPositions[index + (isFirst ? 1 : -1)]], + neighbourEdge = neighbour && neighbour.label.xy && neighbour.label.xy.x + neighbour.getLabelSides()[isFirst ? 0 : 1]; + + if ((isFirst && !reversed) || (isLast && reversed)) { + // Is the label spilling out to the left of the plot area? + if (x + leftSide < plotLeft) { + + // Align it to plot left + x = plotLeft - leftSide; + + // Hide it if it now overlaps the neighbour label + if (neighbour && x + rightSide > neighbourEdge) { + show = false; + } + } + + } else { + // Is the label spilling out to the right of the plot area? + if (x + rightSide > plotRight) { + + // Align it to plot right + x = plotRight - rightSide; + + // Hide it if it now overlaps the neighbour label + if (neighbour && x + leftSide < neighbourEdge) { + show = false; + } + + } + } + + // Set the modified x position of the label + xy.x = x; + } + return show; + }, + + /** + * Get the x and y position for ticks and labels + */ + getPosition: function (horiz, pos, tickmarkOffset, old) { + var axis = this.axis, + chart = axis.chart, + cHeight = (old && chart.oldChartHeight) || chart.chartHeight; + + return { + x: horiz ? + axis.translate(pos + tickmarkOffset, null, null, old) + axis.transB : + axis.left + axis.offset + (axis.opposite ? ((old && chart.oldChartWidth) || chart.chartWidth) - axis.right - axis.left : 0), + + y: horiz ? + cHeight - axis.bottom + axis.offset - (axis.opposite ? axis.height : 0) : + cHeight - axis.translate(pos + tickmarkOffset, null, null, old) - axis.transB + }; + + }, + + /** + * Get the x, y position of the tick label + */ + getLabelPosition: function (x, y, label, horiz, labelOptions, tickmarkOffset, index, step) { + var axis = this.axis, + transA = axis.transA, + reversed = axis.reversed, + staggerLines = axis.staggerLines; + + x = x + labelOptions.x - (tickmarkOffset && horiz ? + tickmarkOffset * transA * (reversed ? -1 : 1) : 0); + y = y + labelOptions.y - (tickmarkOffset && !horiz ? + tickmarkOffset * transA * (reversed ? 1 : -1) : 0); + + // Vertically centered + if (!defined(labelOptions.y)) { + y += pInt(label.styles.lineHeight) * 0.9 - label.getBBox().height / 2; + } + + // Correct for staggered labels + if (staggerLines) { + y += (index / (step || 1) % staggerLines) * 16; + } + + return { + x: x, + y: y + }; + }, + + /** + * Extendible method to return the path of the marker + */ + getMarkPath: function (x, y, tickLength, tickWidth, horiz, renderer) { + return renderer.crispLine([ + M, + x, + y, + L, + x + (horiz ? 0 : -tickLength), + y + (horiz ? tickLength : 0) + ], tickWidth); + }, + + /** + * Put everything in place + * + * @param index {Number} + * @param old {Boolean} Use old coordinates to prepare an animation into new position + */ + render: function (index, old) { + var tick = this, + axis = tick.axis, + options = axis.options, + chart = axis.chart, + renderer = chart.renderer, + horiz = axis.horiz, + type = tick.type, + label = tick.label, + pos = tick.pos, + labelOptions = options.labels, + gridLine = tick.gridLine, + gridPrefix = type ? type + 'Grid' : 'grid', + tickPrefix = type ? type + 'Tick' : 'tick', + gridLineWidth = options[gridPrefix + 'LineWidth'], + gridLineColor = options[gridPrefix + 'LineColor'], + dashStyle = options[gridPrefix + 'LineDashStyle'], + tickLength = options[tickPrefix + 'Length'], + tickWidth = options[tickPrefix + 'Width'] || 0, + tickColor = options[tickPrefix + 'Color'], + tickPosition = options[tickPrefix + 'Position'], + gridLinePath, + mark = tick.mark, + markPath, + step = labelOptions.step, + attribs, + show = true, + tickmarkOffset = axis.tickmarkOffset, + xy = tick.getPosition(horiz, pos, tickmarkOffset, old), + x = xy.x, + y = xy.y, + staggerLines = axis.staggerLines; + + // create the grid line + if (gridLineWidth) { + gridLinePath = axis.getPlotLinePath(pos + tickmarkOffset, gridLineWidth, old); + + if (gridLine === UNDEFINED) { + attribs = { + stroke: gridLineColor, + 'stroke-width': gridLineWidth + }; + if (dashStyle) { + attribs.dashstyle = dashStyle; + } + if (!type) { + attribs.zIndex = 1; + } + tick.gridLine = gridLine = + gridLineWidth ? + renderer.path(gridLinePath) + .attr(attribs).add(axis.gridGroup) : + null; + } + + // If the parameter 'old' is set, the current call will be followed + // by another call, therefore do not do any animations this time + if (!old && gridLine && gridLinePath) { + gridLine[tick.isNew ? 'attr' : 'animate']({ + d: gridLinePath + }); + } + } + + // create the tick mark + if (tickWidth && tickLength) { + + // negate the length + if (tickPosition === 'inside') { + tickLength = -tickLength; + } + if (axis.opposite) { + tickLength = -tickLength; + } + + markPath = tick.getMarkPath(x, y, tickLength, tickWidth, horiz, renderer); + + if (mark) { // updating + mark.animate({ + d: markPath + }); + } else { // first time + tick.mark = renderer.path( + markPath + ).attr({ + stroke: tickColor, + 'stroke-width': tickWidth + }).add(axis.axisGroup); + } + } + + // the label is created on init - now move it into place + if (label && !isNaN(x)) { + label.xy = xy = tick.getLabelPosition(x, y, label, horiz, labelOptions, tickmarkOffset, index, step); + + // apply show first and show last + if ((tick.isFirst && !pick(options.showFirstLabel, 1)) || + (tick.isLast && !pick(options.showLastLabel, 1))) { + show = false; + + // Handle label overflow and show or hide accordingly + } else if (!staggerLines && horiz && labelOptions.overflow === 'justify' && !tick.handleOverflow(index, xy)) { + show = false; + } + + // apply step + if (step && index % step) { + // show those indices dividable by step + show = false; + } + + // Set the new position, and show or hide + if (show) { + label[tick.isNew ? 'attr' : 'animate'](xy); + tick.isNew = false; + } else { + label.attr('y', -9999); // #1338 + } + } + }, + + /** + * Destructor for the tick prototype + */ + destroy: function () { + destroyObjectProperties(this, this.axis); + } +}; + +/** + * The object wrapper for plot lines and plot bands + * @param {Object} options + */ +function PlotLineOrBand(axis, options) { + this.axis = axis; + + if (options) { + this.options = options; + this.id = options.id; + } + + //plotLine.render() + return this; +} + +PlotLineOrBand.prototype = { + + /** + * Render the plot line or plot band. If it is already existing, + * move it. + */ + render: function () { + var plotLine = this, + axis = plotLine.axis, + horiz = axis.horiz, + halfPointRange = (axis.pointRange || 0) / 2, + options = plotLine.options, + optionsLabel = options.label, + label = plotLine.label, + width = options.width, + to = options.to, + from = options.from, + isBand = defined(from) && defined(to), + value = options.value, + dashStyle = options.dashStyle, + svgElem = plotLine.svgElem, + path = [], + addEvent, + eventType, + xs, + ys, + x, + y, + color = options.color, + zIndex = options.zIndex, + events = options.events, + attribs, + renderer = axis.chart.renderer; + + // logarithmic conversion + if (axis.isLog) { + from = log2lin(from); + to = log2lin(to); + value = log2lin(value); + } + + // plot line + if (width) { + path = axis.getPlotLinePath(value, width); + attribs = { + stroke: color, + 'stroke-width': width + }; + if (dashStyle) { + attribs.dashstyle = dashStyle; + } + } else if (isBand) { // plot band + + // keep within plot area + from = mathMax(from, axis.min - halfPointRange); + to = mathMin(to, axis.max + halfPointRange); + + path = axis.getPlotBandPath(from, to, options); + attribs = { + fill: color + }; + if (options.borderWidth) { + attribs.stroke = options.borderColor; + attribs['stroke-width'] = options.borderWidth; + } + } else { + return; + } + // zIndex + if (defined(zIndex)) { + attribs.zIndex = zIndex; + } + + // common for lines and bands + if (svgElem) { + if (path) { + svgElem.animate({ + d: path + }, null, svgElem.onGetPath); + } else { + svgElem.hide(); + svgElem.onGetPath = function () { + svgElem.show(); + }; + } + } else if (path && path.length) { + plotLine.svgElem = svgElem = renderer.path(path) + .attr(attribs).add(); + + // events + if (events) { + addEvent = function (eventType) { + svgElem.on(eventType, function (e) { + events[eventType].apply(plotLine, [e]); + }); + }; + for (eventType in events) { + addEvent(eventType); + } + } + } + + // the plot band/line label + if (optionsLabel && defined(optionsLabel.text) && path && path.length && axis.width > 0 && axis.height > 0) { + // apply defaults + optionsLabel = merge({ + align: horiz && isBand && 'center', + x: horiz ? !isBand && 4 : 10, + verticalAlign : !horiz && isBand && 'middle', + y: horiz ? isBand ? 16 : 10 : isBand ? 6 : -4, + rotation: horiz && !isBand && 90 + }, optionsLabel); + + // add the SVG element + if (!label) { + plotLine.label = label = renderer.text( + optionsLabel.text, + 0, + 0 + ) + .attr({ + align: optionsLabel.textAlign || optionsLabel.align, + rotation: optionsLabel.rotation, + zIndex: zIndex + }) + .css(optionsLabel.style) + .add(); + } + + // get the bounding box and align the label + xs = [path[1], path[4], pick(path[6], path[1])]; + ys = [path[2], path[5], pick(path[7], path[2])]; + x = arrayMin(xs); + y = arrayMin(ys); + + label.align(optionsLabel, false, { + x: x, + y: y, + width: arrayMax(xs) - x, + height: arrayMax(ys) - y + }); + label.show(); + + } else if (label) { // move out of sight + label.hide(); + } + + // chainable + return plotLine; + }, + + /** + * Remove the plot line or band + */ + destroy: function () { + var plotLine = this, + axis = plotLine.axis; + + // remove it from the lookup + erase(axis.plotLinesAndBands, plotLine); + + destroyObjectProperties(plotLine, this.axis); + } +}; +/** + * The class for stack items + */ +function StackItem(axis, options, isNegative, x, stackOption, stacking) { + + var inverted = axis.chart.inverted; + + this.axis = axis; + + // Tells if the stack is negative + this.isNegative = isNegative; + + // Save the options to be able to style the label + this.options = options; + + // Save the x value to be able to position the label later + this.x = x; + + // Save the stack option on the series configuration object, and whether to treat it as percent + this.stack = stackOption; + this.percent = stacking === 'percent'; + + // The align options and text align varies on whether the stack is negative and + // if the chart is inverted or not. + // First test the user supplied value, then use the dynamic. + this.alignOptions = { + align: options.align || (inverted ? (isNegative ? 'left' : 'right') : 'center'), + verticalAlign: options.verticalAlign || (inverted ? 'middle' : (isNegative ? 'bottom' : 'top')), + y: pick(options.y, inverted ? 4 : (isNegative ? 14 : -6)), + x: pick(options.x, inverted ? (isNegative ? -6 : 6) : 0) + }; + + this.textAlign = options.textAlign || (inverted ? (isNegative ? 'right' : 'left') : 'center'); +} + +StackItem.prototype = { + destroy: function () { + destroyObjectProperties(this, this.axis); + }, + + /** + * Sets the total of this stack. Should be called when a serie is hidden or shown + * since that will affect the total of other stacks. + */ + setTotal: function (total) { + this.total = total; + this.cum = total; + }, + + /** + * Renders the stack total label and adds it to the stack label group. + */ + render: function (group) { + var str = this.options.formatter.call(this); // format the text in the label + + // Change the text to reflect the new total and set visibility to hidden in case the serie is hidden + if (this.label) { + this.label.attr({text: str, visibility: HIDDEN}); + // Create new label + } else { + this.label = + this.axis.chart.renderer.text(str, 0, 0) // dummy positions, actual position updated with setOffset method in columnseries + .css(this.options.style) // apply style + .attr({ + align: this.textAlign, // fix the text-anchor + rotation: this.options.rotation, // rotation + visibility: HIDDEN // hidden until setOffset is called + }) + .add(group); // add to the labels-group + } + }, + + /** + * Sets the offset that the stack has from the x value and repositions the label. + */ + setOffset: function (xOffset, xWidth) { + var stackItem = this, + axis = stackItem.axis, + chart = axis.chart, + inverted = chart.inverted, + neg = this.isNegative, // special treatment is needed for negative stacks + y = axis.translate(this.percent ? 100 : this.total, 0, 0, 0, 1), // stack value translated mapped to chart coordinates + yZero = axis.translate(0), // stack origin + h = mathAbs(y - yZero), // stack height + x = chart.xAxis[0].translate(this.x) + xOffset, // stack x position + plotHeight = chart.plotHeight, + stackBox = { // this is the box for the complete stack + x: inverted ? (neg ? y : y - h) : x, + y: inverted ? plotHeight - x - xWidth : (neg ? (plotHeight - y - h) : plotHeight - y), + width: inverted ? h : xWidth, + height: inverted ? xWidth : h + }, + label = this.label, + alignAttr; + + if (label) { + label.align(this.alignOptions, null, stackBox); // align the label to the box + + // Set visibility (#678) + alignAttr = label.alignAttr; + label.attr({ + visibility: this.options.crop === false || chart.isInsidePlot(alignAttr.x, alignAttr.y) ? + (hasSVG ? 'inherit' : VISIBLE) : + HIDDEN + }); + } + } +}; +/** + * Create a new axis object + * @param {Object} chart + * @param {Object} options + */ +function Axis() { + this.init.apply(this, arguments); +} + +Axis.prototype = { + + /** + * Default options for the X axis - the Y axis has extended defaults + */ + defaultOptions: { + // allowDecimals: null, + // alternateGridColor: null, + // categories: [], + dateTimeLabelFormats: { + millisecond: '%H:%M:%S.%L', + second: '%H:%M:%S', + minute: '%H:%M', + hour: '%H:%M', + day: '%e. %b', + week: '%e. %b', + month: '%b \'%y', + year: '%Y' + }, + endOnTick: false, + gridLineColor: '#C0C0C0', + // gridLineDashStyle: 'solid', + // gridLineWidth: 0, + // reversed: false, + + labels: defaultLabelOptions, + // { step: null }, + lineColor: '#C0D0E0', + lineWidth: 1, + //linkedTo: null, + //max: undefined, + //min: undefined, + minPadding: 0.01, + maxPadding: 0.01, + //minRange: null, + minorGridLineColor: '#E0E0E0', + // minorGridLineDashStyle: null, + minorGridLineWidth: 1, + minorTickColor: '#A0A0A0', + //minorTickInterval: null, + minorTickLength: 2, + minorTickPosition: 'outside', // inside or outside + //minorTickWidth: 0, + //opposite: false, + //offset: 0, + //plotBands: [{ + // events: {}, + // zIndex: 1, + // labels: { align, x, verticalAlign, y, style, rotation, textAlign } + //}], + //plotLines: [{ + // events: {} + // dashStyle: {} + // zIndex: + // labels: { align, x, verticalAlign, y, style, rotation, textAlign } + //}], + //reversed: false, + // showFirstLabel: true, + // showLastLabel: true, + startOfWeek: 1, + startOnTick: false, + tickColor: '#C0D0E0', + //tickInterval: null, + tickLength: 5, + tickmarkPlacement: 'between', // on or between + tickPixelInterval: 100, + tickPosition: 'outside', + tickWidth: 1, + title: { + //text: null, + align: 'middle', // low, middle or high + //margin: 0 for horizontal, 10 for vertical axes, + //rotation: 0, + //side: 'outside', + style: { + color: '#6D869F', + //font: defaultFont.replace('normal', 'bold') + fontWeight: 'bold' + } + //x: 0, + //y: 0 + }, + type: 'linear' // linear, logarithmic or datetime + }, + + /** + * This options set extends the defaultOptions for Y axes + */ + defaultYAxisOptions: { + endOnTick: true, + gridLineWidth: 1, + tickPixelInterval: 72, + showLastLabel: true, + labels: { + align: 'right', + x: -8, + y: 3 + }, + lineWidth: 0, + maxPadding: 0.05, + minPadding: 0.05, + startOnTick: true, + tickWidth: 0, + title: { + rotation: 270, + text: 'Y-values' + }, + stackLabels: { + enabled: false, + //align: dynamic, + //y: dynamic, + //x: dynamic, + //verticalAlign: dynamic, + //textAlign: dynamic, + //rotation: 0, + formatter: function () { + return this.total; + }, + style: defaultLabelOptions.style + } + }, + + /** + * These options extend the defaultOptions for left axes + */ + defaultLeftAxisOptions: { + labels: { + align: 'right', + x: -8, + y: null + }, + title: { + rotation: 270 + } + }, + + /** + * These options extend the defaultOptions for right axes + */ + defaultRightAxisOptions: { + labels: { + align: 'left', + x: 8, + y: null + }, + title: { + rotation: 90 + } + }, + + /** + * These options extend the defaultOptions for bottom axes + */ + defaultBottomAxisOptions: { + labels: { + align: 'center', + x: 0, + y: 14 + // overflow: undefined, + // staggerLines: null + }, + title: { + rotation: 0 + } + }, + /** + * These options extend the defaultOptions for left axes + */ + defaultTopAxisOptions: { + labels: { + align: 'center', + x: 0, + y: -5 + // overflow: undefined + // staggerLines: null + }, + title: { + rotation: 0 + } + }, + + /** + * Initialize the axis + */ + init: function (chart, userOptions) { + + + var isXAxis = userOptions.isX, + axis = this; + + // Flag, is the axis horizontal + axis.horiz = chart.inverted ? !isXAxis : isXAxis; + + // Flag, isXAxis + axis.isXAxis = isXAxis; + axis.xOrY = isXAxis ? 'x' : 'y'; + + + axis.opposite = userOptions.opposite; // needed in setOptions + axis.side = axis.horiz ? + (axis.opposite ? 0 : 2) : // top : bottom + (axis.opposite ? 1 : 3); // right : left + + axis.setOptions(userOptions); + + + var options = this.options, + type = options.type, + isDatetimeAxis = type === 'datetime'; + + axis.labelFormatter = options.labels.formatter || axis.defaultLabelFormatter; // can be overwritten by dynamic format + + + // Flag, stagger lines or not + axis.staggerLines = axis.horiz && options.labels.staggerLines; + axis.userOptions = userOptions; + + //axis.axisTitleMargin = UNDEFINED,// = options.title.margin, + axis.minPixelPadding = 0; + //axis.ignoreMinPadding = UNDEFINED; // can be set to true by a column or bar series + //axis.ignoreMaxPadding = UNDEFINED; + + axis.chart = chart; + axis.reversed = options.reversed; + + // Initial categories + axis.categories = options.categories; + + // Elements + //axis.axisGroup = UNDEFINED; + //axis.gridGroup = UNDEFINED; + //axis.axisTitle = UNDEFINED; + //axis.axisLine = UNDEFINED; + + // Flag if type === logarithmic + axis.isLog = type === 'logarithmic'; + + // Flag, if axis is linked to another axis + axis.isLinked = defined(options.linkedTo); + // Linked axis. + //axis.linkedParent = UNDEFINED; + + // Flag if type === datetime + axis.isDatetimeAxis = isDatetimeAxis; + + // Flag if percentage mode + //axis.usePercentage = UNDEFINED; + + + // Tick positions + //axis.tickPositions = UNDEFINED; // array containing predefined positions + // Tick intervals + //axis.tickInterval = UNDEFINED; + //axis.minorTickInterval = UNDEFINED; + + axis.tickmarkOffset = (options.categories && options.tickmarkPlacement === 'between') ? 0.5 : 0; + + // Major ticks + axis.ticks = {}; + // Minor ticks + axis.minorTicks = {}; + //axis.tickAmount = UNDEFINED; + + // List of plotLines/Bands + axis.plotLinesAndBands = []; + + // Alternate bands + axis.alternateBands = {}; + + // Axis metrics + //axis.left = UNDEFINED; + //axis.top = UNDEFINED; + //axis.width = UNDEFINED; + //axis.height = UNDEFINED; + //axis.bottom = UNDEFINED; + //axis.right = UNDEFINED; + //axis.transA = UNDEFINED; + //axis.transB = UNDEFINED; + //axis.oldTransA = UNDEFINED; + axis.len = 0; + //axis.oldMin = UNDEFINED; + //axis.oldMax = UNDEFINED; + //axis.oldUserMin = UNDEFINED; + //axis.oldUserMax = UNDEFINED; + //axis.oldAxisLength = UNDEFINED; + axis.minRange = axis.userMinRange = options.minRange || options.maxZoom; + axis.range = options.range; + axis.offset = options.offset || 0; + + + // Dictionary for stacks + axis.stacks = {}; + + // Min and max in the data + //axis.dataMin = UNDEFINED, + //axis.dataMax = UNDEFINED, + + // The axis range + axis.max = null; + axis.min = null; + + // User set min and max + //axis.userMin = UNDEFINED, + //axis.userMax = UNDEFINED, + + // Run Axis + + var eventType, + events = axis.options.events; + + // Register + chart.axes.push(axis); + chart[isXAxis ? 'xAxis' : 'yAxis'].push(axis); + + axis.series = []; // populated by Series + + // inverted charts have reversed xAxes as default + if (chart.inverted && isXAxis && axis.reversed === UNDEFINED) { + axis.reversed = true; + } + + axis.removePlotBand = axis.removePlotBandOrLine; + axis.removePlotLine = axis.removePlotBandOrLine; + axis.addPlotBand = axis.addPlotBandOrLine; + axis.addPlotLine = axis.addPlotBandOrLine; + + + // register event listeners + for (eventType in events) { + addEvent(axis, eventType, events[eventType]); + } + + // extend logarithmic axis + if (axis.isLog) { + axis.val2lin = log2lin; + axis.lin2val = lin2log; + } + }, + + /** + * Merge and set options + */ + setOptions: function (userOptions) { + this.options = merge( + this.defaultOptions, + this.isXAxis ? {} : this.defaultYAxisOptions, + [this.defaultTopAxisOptions, this.defaultRightAxisOptions, + this.defaultBottomAxisOptions, this.defaultLeftAxisOptions][this.side], + merge( + defaultOptions[this.isXAxis ? 'xAxis' : 'yAxis'], // if set in setOptions (#1053) + userOptions + ) + ); + }, + + + /** + * The default label formatter. The context is a special config object for the label. + */ + defaultLabelFormatter: function () { + var axis = this.axis, + value = this.value, + categories = axis.categories, + dateTimeLabelFormat = this.dateTimeLabelFormat, + numericSymbols = defaultOptions.lang.numericSymbols, + i = numericSymbols && numericSymbols.length, + multi, + ret, + + // make sure the same symbol is added for all labels on a linear axis + numericSymbolDetector = axis.isLog ? value : axis.tickInterval; + + if (categories) { + ret = value; + + } else if (dateTimeLabelFormat) { // datetime axis + ret = dateFormat(dateTimeLabelFormat, value); + + } else if (i && numericSymbolDetector >= 1000) { + // Decide whether we should add a numeric symbol like k (thousands) or M (millions). + // If we are to enable this in tooltip or other places as well, we can move this + // logic to the numberFormatter and enable it by a parameter. + while (i-- && ret === UNDEFINED) { + multi = Math.pow(1000, i + 1); + if (numericSymbolDetector >= multi && numericSymbols[i] !== null) { + ret = numberFormat(value / multi, -1) + numericSymbols[i]; + } + } + } + + if (ret === UNDEFINED) { + if (value >= 1000) { // add thousands separators + ret = numberFormat(value, 0); + + } else { // small numbers + ret = numberFormat(value, -1); + } + } + + return ret; + }, + + /** + * Get the minimum and maximum for the series of each axis + */ + getSeriesExtremes: function () { + var axis = this, + chart = axis.chart, + stacks = axis.stacks, + posStack = [], + negStack = [], + i; + + axis.hasVisibleSeries = false; + + // reset dataMin and dataMax in case we're redrawing + axis.dataMin = axis.dataMax = null; + + // loop through this axis' series + each(axis.series, function (series) { + + if (series.visible || !chart.options.chart.ignoreHiddenSeries) { + + var seriesOptions = series.options, + stacking, + posPointStack, + negPointStack, + stackKey, + stackOption, + negKey, + xData, + yData, + x, + y, + threshold = seriesOptions.threshold, + yDataLength, + activeYData = [], + activeCounter = 0; + + axis.hasVisibleSeries = true; + + // Validate threshold in logarithmic axes + if (axis.isLog && threshold <= 0) { + threshold = seriesOptions.threshold = null; + } + + // Get dataMin and dataMax for X axes + if (axis.isXAxis) { + xData = series.xData; + if (xData.length) { + axis.dataMin = mathMin(pick(axis.dataMin, xData[0]), arrayMin(xData)); + axis.dataMax = mathMax(pick(axis.dataMax, xData[0]), arrayMax(xData)); + } + + // Get dataMin and dataMax for Y axes, as well as handle stacking and processed data + } else { + var isNegative, + pointStack, + key, + cropped = series.cropped, + xExtremes = series.xAxis.getExtremes(), + //findPointRange, + //pointRange, + j, + hasModifyValue = !!series.modifyValue; + + + // Handle stacking + stacking = seriesOptions.stacking; + axis.usePercentage = stacking === 'percent'; + + // create a stack for this particular series type + if (stacking) { + stackOption = seriesOptions.stack; + stackKey = series.type + pick(stackOption, ''); + negKey = '-' + stackKey; + series.stackKey = stackKey; // used in translate + + posPointStack = posStack[stackKey] || []; // contains the total values for each x + posStack[stackKey] = posPointStack; + + negPointStack = negStack[negKey] || []; + negStack[negKey] = negPointStack; + } + if (axis.usePercentage) { + axis.dataMin = 0; + axis.dataMax = 99; + } + + // processData can alter series.pointRange, so this goes after + //findPointRange = series.pointRange === null; + + xData = series.processedXData; + yData = series.processedYData; + yDataLength = yData.length; + + // loop over the non-null y values and read them into a local array + for (i = 0; i < yDataLength; i++) { + x = xData[i]; + y = yData[i]; + + // Read stacked values into a stack based on the x value, + // the sign of y and the stack key. Stacking is also handled for null values (#739) + if (stacking) { + isNegative = y < threshold; + pointStack = isNegative ? negPointStack : posPointStack; + key = isNegative ? negKey : stackKey; + + // Set the stack value and y for extremes + if (defined(pointStack[x])) { // we're adding to the stack + pointStack[x] = correctFloat(pointStack[x] + y); + y = [y, pointStack[x]]; // consider both the actual value and the stack (#1376) + + } else { // it's the first point in the stack + pointStack[x] = y; + } + + // add the series + if (!stacks[key]) { + stacks[key] = {}; + } + + // If the StackItem is there, just update the values, + // if not, create one first + if (!stacks[key][x]) { + stacks[key][x] = new StackItem(axis, axis.options.stackLabels, isNegative, x, stackOption, stacking); + } + stacks[key][x].setTotal(pointStack[x]); + } + + // Handle non null values + if (y !== null && y !== UNDEFINED) { + + // general hook, used for Highstock compare values feature + if (hasModifyValue) { + y = series.modifyValue(y); + } + + // for points within the visible range, including the first point outside the + // visible range, consider y extremes + if (cropped || ((xData[i + 1] || x) >= xExtremes.min && (xData[i - 1] || x) <= xExtremes.max)) { + + j = y.length; + if (j) { // array, like ohlc or range data + while (j--) { + if (y[j] !== null) { + activeYData[activeCounter++] = y[j]; + } + } + } else { + activeYData[activeCounter++] = y; + } + } + } + } + + // Get the dataMin and dataMax so far. If percentage is used, the min and max are + // always 0 and 100. If the length of activeYData is 0, continue with null values. + if (!axis.usePercentage && activeYData.length) { + axis.dataMin = mathMin(pick(axis.dataMin, activeYData[0]), arrayMin(activeYData)); + axis.dataMax = mathMax(pick(axis.dataMax, activeYData[0]), arrayMax(activeYData)); + } + + // Adjust to threshold + if (defined(threshold)) { + if (axis.dataMin >= threshold) { + axis.dataMin = threshold; + axis.ignoreMinPadding = true; + } else if (axis.dataMax < threshold) { + axis.dataMax = threshold; + axis.ignoreMaxPadding = true; + } + } + } + } + }); + + }, + + /** + * Translate from axis value to pixel position on the chart, or back + * + */ + translate: function (val, backwards, cvsCoord, old, handleLog, pointPlacementBetween) { + var axis = this, + axisLength = axis.len, + sign = 1, + cvsOffset = 0, + localA = old ? axis.oldTransA : axis.transA, + localMin = old ? axis.oldMin : axis.min, + returnValue, + postTranslate = axis.options.ordinal || (axis.isLog && handleLog); + + if (!localA) { + localA = axis.transA; + } + + if (cvsCoord) { + sign *= -1; // canvas coordinates inverts the value + cvsOffset = axisLength; + } + if (axis.reversed) { // reversed axis + sign *= -1; + cvsOffset -= sign * axisLength; + } + + if (backwards) { // reverse translation + if (axis.reversed) { + val = axisLength - val; + } + returnValue = val / localA + localMin; // from chart pixel to value + if (postTranslate) { // log and ordinal axes + returnValue = axis.lin2val(returnValue); + } + + } else { // normal translation, from axis value to pixel, relative to plot + if (postTranslate) { // log and ordinal axes + val = axis.val2lin(val); + } + + returnValue = sign * (val - localMin) * localA + cvsOffset + (sign * axis.minPixelPadding) + + (pointPlacementBetween ? localA * axis.pointRange / 2 : 0); + } + + return returnValue; + }, + + /** + * Create the path for a plot line that goes from the given value on + * this axis, across the plot to the opposite side + * @param {Number} value + * @param {Number} lineWidth Used for calculation crisp line + * @param {Number] old Use old coordinates (for resizing and rescaling) + */ + getPlotLinePath: function (value, lineWidth, old) { + var axis = this, + chart = axis.chart, + axisLeft = axis.left, + axisTop = axis.top, + x1, + y1, + x2, + y2, + translatedValue = axis.translate(value, null, null, old), + cHeight = (old && chart.oldChartHeight) || chart.chartHeight, + cWidth = (old && chart.oldChartWidth) || chart.chartWidth, + skip, + transB = axis.transB; + + x1 = x2 = mathRound(translatedValue + transB); + y1 = y2 = mathRound(cHeight - translatedValue - transB); + + if (isNaN(translatedValue)) { // no min or max + skip = true; + + } else if (axis.horiz) { + y1 = axisTop; + y2 = cHeight - axis.bottom; + if (x1 < axisLeft || x1 > axisLeft + axis.width) { + skip = true; + } + } else { + x1 = axisLeft; + x2 = cWidth - axis.right; + + if (y1 < axisTop || y1 > axisTop + axis.height) { + skip = true; + } + } + return skip ? + null : + chart.renderer.crispLine([M, x1, y1, L, x2, y2], lineWidth || 0); + }, + + /** + * Create the path for a plot band + */ + getPlotBandPath: function (from, to) { + + var toPath = this.getPlotLinePath(to), + path = this.getPlotLinePath(from); + + if (path && toPath) { + path.push( + toPath[4], + toPath[5], + toPath[1], + toPath[2] + ); + } else { // outside the axis area + path = null; + } + + return path; + }, + + /** + * Set the tick positions of a linear axis to round values like whole tens or every five. + */ + getLinearTickPositions: function (tickInterval, min, max) { + var pos, + lastPos, + roundedMin = correctFloat(mathFloor(min / tickInterval) * tickInterval), + roundedMax = correctFloat(mathCeil(max / tickInterval) * tickInterval), + tickPositions = []; + + // Populate the intermediate values + pos = roundedMin; + while (pos <= roundedMax) { + + // Place the tick on the rounded value + tickPositions.push(pos); + + // Always add the raw tickInterval, not the corrected one. + pos = correctFloat(pos + tickInterval); + + // If the interval is not big enough in the current min - max range to actually increase + // the loop variable, we need to break out to prevent endless loop. Issue #619 + if (pos === lastPos) { + break; + } + + // Record the last value + lastPos = pos; + } + return tickPositions; + }, + + /** + * Set the tick positions of a logarithmic axis + */ + getLogTickPositions: function (interval, min, max, minor) { + var axis = this, + options = axis.options, + axisLength = axis.len; + + // Since we use this method for both major and minor ticks, + // use a local variable and return the result + var positions = []; + + // Reset + if (!minor) { + axis._minorAutoInterval = null; + } + + // First case: All ticks fall on whole logarithms: 1, 10, 100 etc. + if (interval >= 0.5) { + interval = mathRound(interval); + positions = axis.getLinearTickPositions(interval, min, max); + + // Second case: We need intermediary ticks. For example + // 1, 2, 4, 6, 8, 10, 20, 40 etc. + } else if (interval >= 0.08) { + var roundedMin = mathFloor(min), + intermediate, + i, + j, + len, + pos, + lastPos, + break2; + + if (interval > 0.3) { + intermediate = [1, 2, 4]; + } else if (interval > 0.15) { // 0.2 equals five minor ticks per 1, 10, 100 etc + intermediate = [1, 2, 4, 6, 8]; + } else { // 0.1 equals ten minor ticks per 1, 10, 100 etc + intermediate = [1, 2, 3, 4, 5, 6, 7, 8, 9]; + } + + for (i = roundedMin; i < max + 1 && !break2; i++) { + len = intermediate.length; + for (j = 0; j < len && !break2; j++) { + pos = log2lin(lin2log(i) * intermediate[j]); + + if (pos > min) { + positions.push(lastPos); + } + + if (lastPos > max) { + break2 = true; + } + lastPos = pos; + } + } + + // Third case: We are so deep in between whole logarithmic values that + // we might as well handle the tick positions like a linear axis. For + // example 1.01, 1.02, 1.03, 1.04. + } else { + var realMin = lin2log(min), + realMax = lin2log(max), + tickIntervalOption = options[minor ? 'minorTickInterval' : 'tickInterval'], + filteredTickIntervalOption = tickIntervalOption === 'auto' ? null : tickIntervalOption, + tickPixelIntervalOption = options.tickPixelInterval / (minor ? 5 : 1), + totalPixelLength = minor ? axisLength / axis.tickPositions.length : axisLength; + + interval = pick( + filteredTickIntervalOption, + axis._minorAutoInterval, + (realMax - realMin) * tickPixelIntervalOption / (totalPixelLength || 1) + ); + + interval = normalizeTickInterval( + interval, + null, + math.pow(10, mathFloor(math.log(interval) / math.LN10)) + ); + + positions = map(axis.getLinearTickPositions( + interval, + realMin, + realMax + ), log2lin); + + if (!minor) { + axis._minorAutoInterval = interval / 5; + } + } + + // Set the axis-level tickInterval variable + if (!minor) { + axis.tickInterval = interval; + } + return positions; + }, + + /** + * Return the minor tick positions. For logarithmic axes, reuse the same logic + * as for major ticks. + */ + getMinorTickPositions: function () { + var axis = this, + options = axis.options, + tickPositions = axis.tickPositions, + minorTickInterval = axis.minorTickInterval; + + var minorTickPositions = [], + pos, + i, + len; + + if (axis.isLog) { + len = tickPositions.length; + for (i = 1; i < len; i++) { + minorTickPositions = minorTickPositions.concat( + axis.getLogTickPositions(minorTickInterval, tickPositions[i - 1], tickPositions[i], true) + ); + } + } else if (axis.isDatetimeAxis && options.minorTickInterval === 'auto') { // #1314 + minorTickPositions = minorTickPositions.concat( + getTimeTicks( + normalizeTimeTickInterval(minorTickInterval), + axis.min, + axis.max, + options.startOfWeek + ) + ); + } else { + for (pos = axis.min + (tickPositions[0] - axis.min) % minorTickInterval; pos <= axis.max; pos += minorTickInterval) { + minorTickPositions.push(pos); + } + } + return minorTickPositions; + }, + + /** + * Adjust the min and max for the minimum range. Keep in mind that the series data is + * not yet processed, so we don't have information on data cropping and grouping, or + * updated axis.pointRange or series.pointRange. The data can't be processed until + * we have finally established min and max. + */ + adjustForMinRange: function () { + var axis = this, + options = axis.options, + min = axis.min, + max = axis.max, + zoomOffset, + spaceAvailable = axis.dataMax - axis.dataMin >= axis.minRange, + closestDataRange, + i, + distance, + xData, + loopLength, + minArgs, + maxArgs; + + // Set the automatic minimum range based on the closest point distance + if (axis.isXAxis && axis.minRange === UNDEFINED && !axis.isLog) { + + if (defined(options.min) || defined(options.max)) { + axis.minRange = null; // don't do this again + + } else { + + // Find the closest distance between raw data points, as opposed to + // closestPointRange that applies to processed points (cropped and grouped) + each(axis.series, function (series) { + xData = series.xData; + loopLength = series.xIncrement ? 1 : xData.length - 1; + for (i = loopLength; i > 0; i--) { + distance = xData[i] - xData[i - 1]; + if (closestDataRange === UNDEFINED || distance < closestDataRange) { + closestDataRange = distance; + } + } + }); + axis.minRange = mathMin(closestDataRange * 5, axis.dataMax - axis.dataMin); + } + } + + // if minRange is exceeded, adjust + if (max - min < axis.minRange) { + var minRange = axis.minRange; + zoomOffset = (minRange - max + min) / 2; + + // if min and max options have been set, don't go beyond it + minArgs = [min - zoomOffset, pick(options.min, min - zoomOffset)]; + if (spaceAvailable) { // if space is available, stay within the data range + minArgs[2] = axis.dataMin; + } + min = arrayMax(minArgs); + + maxArgs = [min + minRange, pick(options.max, min + minRange)]; + if (spaceAvailable) { // if space is availabe, stay within the data range + maxArgs[2] = axis.dataMax; + } + + max = arrayMin(maxArgs); + + // now if the max is adjusted, adjust the min back + if (max - min < minRange) { + minArgs[0] = max - minRange; + minArgs[1] = pick(options.min, max - minRange); + min = arrayMax(minArgs); + } + } + + // Record modified extremes + axis.min = min; + axis.max = max; + }, + + /** + * Update translation information + */ + setAxisTranslation: function () { + var axis = this, + range = axis.max - axis.min, + pointRange = 0, + closestPointRange, + minPointOffset = 0, + pointRangePadding = 0, + linkedParent = axis.linkedParent, + transA = axis.transA; + + // adjust translation for padding + if (axis.isXAxis) { + if (linkedParent) { + minPointOffset = linkedParent.minPointOffset; + pointRangePadding = linkedParent.pointRangePadding; + + } else { + each(axis.series, function (series) { + var seriesPointRange = series.pointRange, + pointPlacement = series.options.pointPlacement, + seriesClosestPointRange = series.closestPointRange; + + pointRange = mathMax(pointRange, seriesPointRange); + + // minPointOffset is the value padding to the left of the axis in order to make + // room for points with a pointRange, typically columns. When the pointPlacement option + // is 'between' or 'on', this padding does not apply. + minPointOffset = mathMax( + minPointOffset, + pointPlacement ? 0 : seriesPointRange / 2 + ); + + // Determine the total padding needed to the length of the axis to make room for the + // pointRange. If the series' pointPlacement is 'on', no padding is added. + pointRangePadding = mathMax( + pointRangePadding, + pointPlacement === 'on' ? 0 : seriesPointRange + ); + + // Set the closestPointRange + if (!series.noSharedTooltip && defined(seriesClosestPointRange)) { + closestPointRange = defined(closestPointRange) ? + mathMin(closestPointRange, seriesClosestPointRange) : + seriesClosestPointRange; + } + }); + } + + // Record minPointOffset and pointRangePadding + axis.minPointOffset = minPointOffset; + axis.pointRangePadding = pointRangePadding; + + // pointRange means the width reserved for each point, like in a column chart + axis.pointRange = pointRange; + + // closestPointRange means the closest distance between points. In columns + // it is mostly equal to pointRange, but in lines pointRange is 0 while closestPointRange + // is some other value + axis.closestPointRange = closestPointRange; + } + + // secondary values + axis.oldTransA = transA; + //axis.translationSlope = axis.transA = transA = axis.len / ((range + (2 * minPointOffset)) || 1); + axis.translationSlope = axis.transA = transA = axis.len / ((range + pointRangePadding) || 1); + axis.transB = axis.horiz ? axis.left : axis.bottom; // translation addend + axis.minPixelPadding = transA * minPointOffset; + }, + + /** + * Set the tick positions to round values and optionally extend the extremes + * to the nearest tick + */ + setTickPositions: function (secondPass) { + var axis = this, + chart = axis.chart, + options = axis.options, + isLog = axis.isLog, + isDatetimeAxis = axis.isDatetimeAxis, + isXAxis = axis.isXAxis, + isLinked = axis.isLinked, + tickPositioner = axis.options.tickPositioner, + magnitude, + maxPadding = options.maxPadding, + minPadding = options.minPadding, + length, + linkedParentExtremes, + tickIntervalOption = options.tickInterval, + minTickIntervalOption = options.minTickInterval, + tickPixelIntervalOption = options.tickPixelInterval, + tickPositions, + categories = axis.categories; + + // linked axis gets the extremes from the parent axis + if (isLinked) { + axis.linkedParent = chart[isXAxis ? 'xAxis' : 'yAxis'][options.linkedTo]; + linkedParentExtremes = axis.linkedParent.getExtremes(); + axis.min = pick(linkedParentExtremes.min, linkedParentExtremes.dataMin); + axis.max = pick(linkedParentExtremes.max, linkedParentExtremes.dataMax); + if (options.type !== axis.linkedParent.options.type) { + error(11, 1); // Can't link axes of different type + } + } else { // initial min and max from the extreme data values + axis.min = pick(axis.userMin, options.min, axis.dataMin); + axis.max = pick(axis.userMax, options.max, axis.dataMax); + } + + if (isLog) { + if (!secondPass && mathMin(axis.min, pick(axis.dataMin, axis.min)) <= 0) { // #978 + error(10, 1); // Can't plot negative values on log axis + } + axis.min = correctFloat(log2lin(axis.min)); // correctFloat cures #934 + axis.max = correctFloat(log2lin(axis.max)); + } + + // handle zoomed range + if (axis.range) { + axis.userMin = axis.min = mathMax(axis.min, axis.max - axis.range); // #618 + axis.userMax = axis.max; + if (secondPass) { + axis.range = null; // don't use it when running setExtremes + } + } + + // adjust min and max for the minimum range + axis.adjustForMinRange(); + + // Pad the values to get clear of the chart's edges. To avoid tickInterval taking the padding + // into account, we do this after computing tick interval (#1337). + if (!categories && !axis.usePercentage && !isLinked && defined(axis.min) && defined(axis.max)) { + length = axis.max - axis.min; + if (length) { + if (!defined(options.min) && !defined(axis.userMin) && minPadding && (axis.dataMin < 0 || !axis.ignoreMinPadding)) { + axis.min -= length * minPadding; + } + if (!defined(options.max) && !defined(axis.userMax) && maxPadding && (axis.dataMax > 0 || !axis.ignoreMaxPadding)) { + axis.max += length * maxPadding; + } + } + } + + // get tickInterval + if (axis.min === axis.max || axis.min === undefined || axis.max === undefined) { + axis.tickInterval = 1; + } else if (isLinked && !tickIntervalOption && + tickPixelIntervalOption === axis.linkedParent.options.tickPixelInterval) { + axis.tickInterval = axis.linkedParent.tickInterval; + } else { + axis.tickInterval = pick( + tickIntervalOption, + categories ? // for categoried axis, 1 is default, for linear axis use tickPix + 1 : + (axis.max - axis.min) * tickPixelIntervalOption / (axis.len || 1) + ); + } + + // Now we're finished detecting min and max, crop and group series data. This + // is in turn needed in order to find tick positions in ordinal axes. + if (isXAxis && !secondPass) { + each(axis.series, function (series) { + series.processData(axis.min !== axis.oldMin || axis.max !== axis.oldMax); + }); + } + + // set the translation factor used in translate function + axis.setAxisTranslation(secondPass); + + // hook for ordinal axes and radial axes + if (axis.beforeSetTickPositions) { + axis.beforeSetTickPositions(); + } + + // hook for extensions, used in Highstock ordinal axes + if (axis.postProcessTickInterval) { + axis.tickInterval = axis.postProcessTickInterval(axis.tickInterval); + } + + // Before normalizing the tick interval, handle minimum tick interval. This applies only if tickInterval is not defined. + if (!tickIntervalOption && axis.tickInterval < minTickIntervalOption) { + axis.tickInterval = minTickIntervalOption; + } + + // for linear axes, get magnitude and normalize the interval + if (!isDatetimeAxis && !isLog) { // linear + magnitude = math.pow(10, mathFloor(math.log(axis.tickInterval) / math.LN10)); + if (!tickIntervalOption) { + axis.tickInterval = normalizeTickInterval(axis.tickInterval, null, magnitude, options); + } + } + + // get minorTickInterval + axis.minorTickInterval = options.minorTickInterval === 'auto' && axis.tickInterval ? + axis.tickInterval / 5 : options.minorTickInterval; + + // find the tick positions + axis.tickPositions = tickPositions = options.tickPositions || (tickPositioner && tickPositioner.apply(axis, [axis.min, axis.max])); + if (!tickPositions) { + if (isDatetimeAxis) { + tickPositions = (axis.getNonLinearTimeTicks || getTimeTicks)( + normalizeTimeTickInterval(axis.tickInterval, options.units), + axis.min, + axis.max, + options.startOfWeek, + axis.ordinalPositions, + axis.closestPointRange, + true + ); + } else if (isLog) { + tickPositions = axis.getLogTickPositions(axis.tickInterval, axis.min, axis.max); + } else { + tickPositions = axis.getLinearTickPositions(axis.tickInterval, axis.min, axis.max); + } + axis.tickPositions = tickPositions; + } + + if (!isLinked) { + + // reset min/max or remove extremes based on start/end on tick + var roundedMin = tickPositions[0], + roundedMax = tickPositions[tickPositions.length - 1], + minPointOffset = axis.minPointOffset || 0, + singlePad; + + if (options.startOnTick) { + axis.min = roundedMin; + } else if (axis.min - minPointOffset > roundedMin) { + tickPositions.shift(); + } + + if (options.endOnTick) { + axis.max = roundedMax; + } else if (axis.max + minPointOffset < roundedMax) { + tickPositions.pop(); + } + + // When there is only one point, or all points have the same value on this axis, then min + // and max are equal and tickPositions.length is 1. In this case, add some padding + // in order to center the point, but leave it with one tick. #1337. + if (tickPositions.length === 1) { + singlePad = 1e-9; // The lowest possible number to avoid extra padding on columns + axis.min -= singlePad; + axis.max += singlePad; + } + } + }, + + /** + * Set the max ticks of either the x and y axis collection + */ + setMaxTicks: function () { + + var chart = this.chart, + maxTicks = chart.maxTicks, + tickPositions = this.tickPositions, + xOrY = this.xOrY; + + if (!maxTicks) { // first call, or maxTicks have been reset after a zoom operation + maxTicks = { + x: 0, + y: 0 + }; + } + + if (!this.isLinked && !this.isDatetimeAxis && tickPositions.length > maxTicks[xOrY] && this.options.alignTicks !== false) { + maxTicks[xOrY] = tickPositions.length; + } + chart.maxTicks = maxTicks; + }, + + /** + * When using multiple axes, adjust the number of ticks to match the highest + * number of ticks in that group + */ + adjustTickAmount: function () { + var axis = this, + chart = axis.chart, + xOrY = axis.xOrY, + tickPositions = axis.tickPositions, + maxTicks = chart.maxTicks; + + if (maxTicks && maxTicks[xOrY] && !axis.isDatetimeAxis && !axis.categories && !axis.isLinked && axis.options.alignTicks !== false) { // only apply to linear scale + var oldTickAmount = axis.tickAmount, + calculatedTickAmount = tickPositions.length, + tickAmount; + + // set the axis-level tickAmount to use below + axis.tickAmount = tickAmount = maxTicks[xOrY]; + + if (calculatedTickAmount < tickAmount) { + while (tickPositions.length < tickAmount) { + tickPositions.push(correctFloat( + tickPositions[tickPositions.length - 1] + axis.tickInterval + )); + } + axis.transA *= (calculatedTickAmount - 1) / (tickAmount - 1); + axis.max = tickPositions[tickPositions.length - 1]; + + } + if (defined(oldTickAmount) && tickAmount !== oldTickAmount) { + axis.isDirty = true; + } + } + }, + + /** + * Set the scale based on data min and max, user set min and max or options + * + */ + setScale: function () { + var axis = this, + stacks = axis.stacks, + type, + i, + isDirtyData, + isDirtyAxisLength; + + axis.oldMin = axis.min; + axis.oldMax = axis.max; + axis.oldAxisLength = axis.len; + + // set the new axisLength + axis.setAxisSize(); + //axisLength = horiz ? axisWidth : axisHeight; + isDirtyAxisLength = axis.len !== axis.oldAxisLength; + + // is there new data? + each(axis.series, function (series) { + if (series.isDirtyData || series.isDirty || + series.xAxis.isDirty) { // when x axis is dirty, we need new data extremes for y as well + isDirtyData = true; + } + }); + + // do we really need to go through all this? + if (isDirtyAxisLength || isDirtyData || axis.isLinked || + axis.userMin !== axis.oldUserMin || axis.userMax !== axis.oldUserMax) { + + // get data extremes if needed + axis.getSeriesExtremes(); + + // get fixed positions based on tickInterval + axis.setTickPositions(); + + // record old values to decide whether a rescale is necessary later on (#540) + axis.oldUserMin = axis.userMin; + axis.oldUserMax = axis.userMax; + + // Mark as dirty if it is not already set to dirty and extremes have changed. #595. + if (!axis.isDirty) { + axis.isDirty = isDirtyAxisLength || axis.min !== axis.oldMin || axis.max !== axis.oldMax; + } + } + + + // reset stacks + if (!axis.isXAxis) { + for (type in stacks) { + for (i in stacks[type]) { + stacks[type][i].cum = stacks[type][i].total; + } + } + } + + // Set the maximum tick amount + axis.setMaxTicks(); + }, + + /** + * Set the extremes and optionally redraw + * @param {Number} newMin + * @param {Number} newMax + * @param {Boolean} redraw + * @param {Boolean|Object} animation Whether to apply animation, and optionally animation + * configuration + * @param {Object} eventArguments + * + */ + setExtremes: function (newMin, newMax, redraw, animation, eventArguments) { + var axis = this, + chart = axis.chart; + + redraw = pick(redraw, true); // defaults to true + + // Extend the arguments with min and max + eventArguments = extend(eventArguments, { + min: newMin, + max: newMax + }); + + // Fire the event + fireEvent(axis, 'setExtremes', eventArguments, function () { // the default event handler + + axis.userMin = newMin; + axis.userMax = newMax; + + // Mark for running afterSetExtremes + axis.isDirtyExtremes = true; + + // redraw + if (redraw) { + chart.redraw(animation); + } + }); + }, + + /** + * Overridable method for zooming chart. Pulled out in a separate method to allow overriding + * in stock charts. + */ + zoom: function (newMin, newMax) { + this.setExtremes(newMin, newMax, false, UNDEFINED, { trigger: 'zoom' }); + return true; + }, + + /** + * Update the axis metrics + */ + setAxisSize: function () { + var axis = this, + chart = axis.chart, + options = axis.options; + + var offsetLeft = options.offsetLeft || 0, + offsetRight = options.offsetRight || 0; + + // basic values + // expose to use in Series object and navigator + axis.left = pick(options.left, chart.plotLeft + offsetLeft); + axis.top = pick(options.top, chart.plotTop); + axis.width = pick(options.width, chart.plotWidth - offsetLeft + offsetRight); + axis.height = pick(options.height, chart.plotHeight); + axis.bottom = chart.chartHeight - axis.height - axis.top; + axis.right = chart.chartWidth - axis.width - axis.left; + axis.len = mathMax(axis.horiz ? axis.width : axis.height, 0); // mathMax fixes #905 + }, + + /** + * Get the actual axis extremes + */ + getExtremes: function () { + var axis = this, + isLog = axis.isLog; + + return { + min: isLog ? correctFloat(lin2log(axis.min)) : axis.min, + max: isLog ? correctFloat(lin2log(axis.max)) : axis.max, + dataMin: axis.dataMin, + dataMax: axis.dataMax, + userMin: axis.userMin, + userMax: axis.userMax + }; + }, + + /** + * Get the zero plane either based on zero or on the min or max value. + * Used in bar and area plots + */ + getThreshold: function (threshold) { + var axis = this, + isLog = axis.isLog; + + var realMin = isLog ? lin2log(axis.min) : axis.min, + realMax = isLog ? lin2log(axis.max) : axis.max; + + if (realMin > threshold || threshold === null) { + threshold = realMin; + } else if (realMax < threshold) { + threshold = realMax; + } + + return axis.translate(threshold, 0, 1, 0, 1); + }, + + /** + * Add a plot band or plot line after render time + * + * @param options {Object} The plotBand or plotLine configuration object + */ + addPlotBandOrLine: function (options) { + var obj = new PlotLineOrBand(this, options).render(); + this.plotLinesAndBands.push(obj); + return obj; + }, + + /** + * Render the tick labels to a preliminary position to get their sizes + */ + getOffset: function () { + var axis = this, + chart = axis.chart, + renderer = chart.renderer, + options = axis.options, + tickPositions = axis.tickPositions, + ticks = axis.ticks, + horiz = axis.horiz, + side = axis.side, + hasData, + showAxis, + titleOffset = 0, + titleOffsetOption, + titleMargin = 0, + axisTitleOptions = options.title, + labelOptions = options.labels, + labelOffset = 0, // reset + axisOffset = chart.axisOffset, + directionFactor = [-1, 1, 1, -1][side], + n; + + + // For reuse in Axis.render + axis.hasData = hasData = (axis.hasVisibleSeries || (defined(axis.min) && defined(axis.max) && !!tickPositions)); + axis.showAxis = showAxis = hasData || pick(options.showEmpty, true); + + + // Create the axisGroup and gridGroup elements on first iteration + if (!axis.axisGroup) { + axis.gridGroup = renderer.g('grid') + .attr({ zIndex: options.gridZIndex || 1 }) + .add(); + axis.axisGroup = renderer.g('axis') + .attr({ zIndex: options.zIndex || 2 }) + .add(); + axis.labelGroup = renderer.g('axis-labels') + .attr({ zIndex: labelOptions.zIndex || 7 }) + .add(); + } + + if (hasData || axis.isLinked) { + each(tickPositions, function (pos) { + if (!ticks[pos]) { + ticks[pos] = new Tick(axis, pos); + } else { + ticks[pos].addLabel(); // update labels depending on tick interval + } + + }); + + each(tickPositions, function (pos) { + // left side must be align: right and right side must have align: left for labels + if (side === 0 || side === 2 || { 1: 'left', 3: 'right' }[side] === labelOptions.align) { + + // get the highest offset + labelOffset = mathMax( + ticks[pos].getLabelSize(), + labelOffset + ); + } + + }); + + if (axis.staggerLines) { + labelOffset += (axis.staggerLines - 1) * 16; + } + + } else { // doesn't have data + for (n in ticks) { + ticks[n].destroy(); + delete ticks[n]; + } + } + + if (axisTitleOptions && axisTitleOptions.text) { + if (!axis.axisTitle) { + axis.axisTitle = renderer.text( + axisTitleOptions.text, + 0, + 0, + axisTitleOptions.useHTML + ) + .attr({ + zIndex: 7, + rotation: axisTitleOptions.rotation || 0, + align: + axisTitleOptions.textAlign || + { low: 'left', middle: 'center', high: 'right' }[axisTitleOptions.align] + }) + .css(axisTitleOptions.style) + .add(axis.axisGroup); + axis.axisTitle.isNew = true; + } + + if (showAxis) { + titleOffset = axis.axisTitle.getBBox()[horiz ? 'height' : 'width']; + titleMargin = pick(axisTitleOptions.margin, horiz ? 5 : 10); + titleOffsetOption = axisTitleOptions.offset; + } + + // hide or show the title depending on whether showEmpty is set + axis.axisTitle[showAxis ? 'show' : 'hide'](); + } + + // handle automatic or user set offset + axis.offset = directionFactor * pick(options.offset, axisOffset[side]); + + + axis.axisTitleMargin = + pick(titleOffsetOption, + labelOffset + titleMargin + + (side !== 2 && labelOffset && directionFactor * options.labels[horiz ? 'y' : 'x']) + ); + + axisOffset[side] = mathMax( + axisOffset[side], + axis.axisTitleMargin + titleOffset + directionFactor * axis.offset + ); + + }, + + /** + * Get the path for the axis line + */ + getLinePath: function (lineWidth) { + var chart = this.chart, + opposite = this.opposite, + offset = this.offset, + horiz = this.horiz, + lineLeft = this.left + (opposite ? this.width : 0) + offset, + lineTop = chart.chartHeight - this.bottom - (opposite ? this.height : 0) + offset; + + this.lineTop = lineTop; // used by flag series + + return chart.renderer.crispLine([ + M, + horiz ? + this.left : + lineLeft, + horiz ? + lineTop : + this.top, + L, + horiz ? + chart.chartWidth - this.right : + lineLeft, + horiz ? + lineTop : + chart.chartHeight - this.bottom + ], lineWidth); + }, + + /** + * Position the title + */ + getTitlePosition: function () { + // compute anchor points for each of the title align options + var horiz = this.horiz, + axisLeft = this.left, + axisTop = this.top, + axisLength = this.len, + axisTitleOptions = this.options.title, + margin = horiz ? axisLeft : axisTop, + opposite = this.opposite, + offset = this.offset, + fontSize = pInt(axisTitleOptions.style.fontSize || 12), + + // the position in the length direction of the axis + alongAxis = { + low: margin + (horiz ? 0 : axisLength), + middle: margin + axisLength / 2, + high: margin + (horiz ? axisLength : 0) + }[axisTitleOptions.align], + + // the position in the perpendicular direction of the axis + offAxis = (horiz ? axisTop + this.height : axisLeft) + + (horiz ? 1 : -1) * // horizontal axis reverses the margin + (opposite ? -1 : 1) * // so does opposite axes + this.axisTitleMargin + + (this.side === 2 ? fontSize : 0); + + return { + x: horiz ? + alongAxis : + offAxis + (opposite ? this.width : 0) + offset + + (axisTitleOptions.x || 0), // x + y: horiz ? + offAxis - (opposite ? this.height : 0) + offset : + alongAxis + (axisTitleOptions.y || 0) // y + }; + }, + + /** + * Render the axis + */ + render: function () { + var axis = this, + chart = axis.chart, + renderer = chart.renderer, + options = axis.options, + isLog = axis.isLog, + isLinked = axis.isLinked, + tickPositions = axis.tickPositions, + axisTitle = axis.axisTitle, + stacks = axis.stacks, + ticks = axis.ticks, + minorTicks = axis.minorTicks, + alternateBands = axis.alternateBands, + stackLabelOptions = options.stackLabels, + alternateGridColor = options.alternateGridColor, + tickmarkOffset = axis.tickmarkOffset, + lineWidth = options.lineWidth, + linePath, + hasRendered = chart.hasRendered, + slideInTicks = hasRendered && defined(axis.oldMin) && !isNaN(axis.oldMin), + hasData = axis.hasData, + showAxis = axis.showAxis, + from, + to; + + // If the series has data draw the ticks. Else only the line and title + if (hasData || isLinked) { + + // minor ticks + if (axis.minorTickInterval && !axis.categories) { + each(axis.getMinorTickPositions(), function (pos) { + if (!minorTicks[pos]) { + minorTicks[pos] = new Tick(axis, pos, 'minor'); + } + + // render new ticks in old position + if (slideInTicks && minorTicks[pos].isNew) { + minorTicks[pos].render(null, true); + } + + + minorTicks[pos].isActive = true; + minorTicks[pos].render(); + }); + } + + // Major ticks. Pull out the first item and render it last so that + // we can get the position of the neighbour label. #808. + if (tickPositions.length) { // #1300 + each(tickPositions.slice(1).concat([tickPositions[0]]), function (pos, i) { + + // Reorganize the indices + i = (i === tickPositions.length - 1) ? 0 : i + 1; + + // linked axes need an extra check to find out if + if (!isLinked || (pos >= axis.min && pos <= axis.max)) { + + if (!ticks[pos]) { + ticks[pos] = new Tick(axis, pos); + } + + // render new ticks in old position + if (slideInTicks && ticks[pos].isNew) { + ticks[pos].render(i, true); + } + + ticks[pos].isActive = true; + ticks[pos].render(i); + } + + }); + } + + // alternate grid color + if (alternateGridColor) { + each(tickPositions, function (pos, i) { + if (i % 2 === 0 && pos < axis.max) { + if (!alternateBands[pos]) { + alternateBands[pos] = new PlotLineOrBand(axis); + } + from = pos + tickmarkOffset; // #949 + to = tickPositions[i + 1] !== UNDEFINED ? tickPositions[i + 1] + tickmarkOffset : axis.max; + alternateBands[pos].options = { + from: isLog ? lin2log(from) : from, + to: isLog ? lin2log(to) : to, + color: alternateGridColor + }; + alternateBands[pos].render(); + alternateBands[pos].isActive = true; + } + }); + } + + // custom plot lines and bands + if (!axis._addedPlotLB) { // only first time + each((options.plotLines || []).concat(options.plotBands || []), function (plotLineOptions) { + //plotLinesAndBands.push(new PlotLineOrBand(plotLineOptions).render()); + axis.addPlotBandOrLine(plotLineOptions); + }); + axis._addedPlotLB = true; + } + + } // end if hasData + + // remove inactive ticks + each([ticks, minorTicks, alternateBands], function (coll) { + var pos; + for (pos in coll) { + if (!coll[pos].isActive) { + coll[pos].destroy(); + delete coll[pos]; + } else { + coll[pos].isActive = false; // reset + } + } + }); + + // Static items. As the axis group is cleared on subsequent calls + // to render, these items are added outside the group. + // axis line + if (lineWidth) { + linePath = axis.getLinePath(lineWidth); + if (!axis.axisLine) { + axis.axisLine = renderer.path(linePath) + .attr({ + stroke: options.lineColor, + 'stroke-width': lineWidth, + zIndex: 7 + }) + .add(axis.axisGroup); + } else { + axis.axisLine.animate({ d: linePath }); + } + + // show or hide the line depending on options.showEmpty + axis.axisLine[showAxis ? 'show' : 'hide'](); + } + + if (axisTitle && showAxis) { + + axisTitle[axisTitle.isNew ? 'attr' : 'animate']( + axis.getTitlePosition() + ); + axisTitle.isNew = false; + } + + // Stacked totals: + if (stackLabelOptions && stackLabelOptions.enabled) { + var stackKey, oneStack, stackCategory, + stackTotalGroup = axis.stackTotalGroup; + + // Create a separate group for the stack total labels + if (!stackTotalGroup) { + axis.stackTotalGroup = stackTotalGroup = + renderer.g('stack-labels') + .attr({ + visibility: VISIBLE, + zIndex: 6 + }) + .add(); + } + + // plotLeft/Top will change when y axis gets wider so we need to translate the + // stackTotalGroup at every render call. See bug #506 and #516 + stackTotalGroup.translate(chart.plotLeft, chart.plotTop); + + // Render each stack total + for (stackKey in stacks) { + oneStack = stacks[stackKey]; + for (stackCategory in oneStack) { + oneStack[stackCategory].render(stackTotalGroup); + } + } + } + // End stacked totals + + axis.isDirty = false; + }, + + /** + * Remove a plot band or plot line from the chart by id + * @param {Object} id + */ + removePlotBandOrLine: function (id) { + var plotLinesAndBands = this.plotLinesAndBands, + i = plotLinesAndBands.length; + while (i--) { + if (plotLinesAndBands[i].id === id) { + plotLinesAndBands[i].destroy(); + } + } + }, + + /** + * Update the axis title by options + */ + setTitle: function (newTitleOptions, redraw) { + var chart = this.chart, + options = this.options, + axisTitle = this.axisTitle; + + options.title = merge(options.title, newTitleOptions); + + this.axisTitle = axisTitle && axisTitle.destroy(); // #922 + this.isDirty = true; + + if (pick(redraw, true)) { + chart.redraw(); + } + }, + + /** + * Redraw the axis to reflect changes in the data or axis extremes + */ + redraw: function () { + var axis = this, + chart = axis.chart; + + // hide tooltip and hover states + if (chart.tracker.resetTracker) { + chart.tracker.resetTracker(true); + } + + // render the axis + axis.render(); + + // move plot lines and bands + each(axis.plotLinesAndBands, function (plotLine) { + plotLine.render(); + }); + + // mark associated series as dirty and ready for redraw + each(axis.series, function (series) { + series.isDirty = true; + }); + + }, + + /** + * Set new axis categories and optionally redraw + * @param {Array} newCategories + * @param {Boolean} doRedraw + */ + setCategories: function (newCategories, doRedraw) { + var axis = this, + chart = axis.chart; + + // set the categories + axis.categories = axis.userOptions.categories = newCategories; + + // force reindexing tooltips + each(axis.series, function (series) { + series.translate(); + series.setTooltipPoints(true); + }); + + + // optionally redraw + axis.isDirty = true; + + if (pick(doRedraw, true)) { + chart.redraw(); + } + }, + + /** + * Destroys an Axis instance. + */ + destroy: function () { + var axis = this, + stacks = axis.stacks, + stackKey; + + // Remove the events + removeEvent(axis); + + // Destroy each stack total + for (stackKey in stacks) { + destroyObjectProperties(stacks[stackKey]); + + stacks[stackKey] = null; + } + + // Destroy collections + each([axis.ticks, axis.minorTicks, axis.alternateBands, axis.plotLinesAndBands], function (coll) { + destroyObjectProperties(coll); + }); + + // Destroy local variables + each(['stackTotalGroup', 'axisLine', 'axisGroup', 'gridGroup', 'labelGroup', 'axisTitle'], function (prop) { + if (axis[prop]) { + axis[prop] = axis[prop].destroy(); + } + }); + } + + +}; // end Axis + +/** + * The tooltip object + * @param {Object} chart The chart instance + * @param {Object} options Tooltip options + */ +function Tooltip(chart, options) { + var borderWidth = options.borderWidth, + style = options.style, + padding = pInt(style.padding); + + // Save the chart and options + this.chart = chart; + this.options = options; + + // Keep track of the current series + //this.currentSeries = UNDEFINED; + + // List of crosshairs + this.crosshairs = []; + + // Current values of x and y when animating + this.now = { x: 0, y: 0 }; + + // The tooltip is initially hidden + this.isHidden = true; + + // create the label + this.label = chart.renderer.label('', 0, 0, options.shape, null, null, options.useHTML, null, 'tooltip') + .attr({ + padding: padding, + fill: options.backgroundColor, + 'stroke-width': borderWidth, + r: options.borderRadius, + zIndex: 8 + }) + .css(style) + .css({ padding: 0 }) // Remove it from VML, the padding is applied as an attribute instead (#1117) + .hide() + .add(); + + // When using canVG the shadow shows up as a gray circle + // even if the tooltip is hidden. + if (!useCanVG) { + this.label.shadow(options.shadow); + } + + // Public property for getting the shared state. + this.shared = options.shared; +} + +Tooltip.prototype = { + /** + * Destroy the tooltip and its elements. + */ + destroy: function () { + each(this.crosshairs, function (crosshair) { + if (crosshair) { + crosshair.destroy(); + } + }); + + // Destroy and clear local variables + if (this.label) { + this.label = this.label.destroy(); + } + }, + + /** + * Provide a soft movement for the tooltip + * + * @param {Number} x + * @param {Number} y + * @private + */ + move: function (x, y, anchorX, anchorY) { + var tooltip = this, + now = tooltip.now, + animate = tooltip.options.animation !== false && !tooltip.isHidden; + + // get intermediate values for animation + extend(now, { + x: animate ? (2 * now.x + x) / 3 : x, + y: animate ? (now.y + y) / 2 : y, + anchorX: animate ? (2 * now.anchorX + anchorX) / 3 : anchorX, + anchorY: animate ? (now.anchorY + anchorY) / 2 : anchorY + }); + + // move to the intermediate value + tooltip.label.attr(now); + + + // run on next tick of the mouse tracker + if (animate && (mathAbs(x - now.x) > 1 || mathAbs(y - now.y) > 1)) { + + // never allow two timeouts + clearTimeout(this.tooltipTimeout); + + // set the fixed interval ticking for the smooth tooltip + this.tooltipTimeout = setTimeout(function () { + // The interval function may still be running during destroy, so check that the chart is really there before calling. + if (tooltip) { + tooltip.move(x, y, anchorX, anchorY); + } + }, 32); + + } + }, + + /** + * Hide the tooltip + */ + hide: function () { + if (!this.isHidden) { + var hoverPoints = this.chart.hoverPoints; + + this.label.hide(); + + // hide previous hoverPoints and set new + if (hoverPoints) { + each(hoverPoints, function (point) { + point.setState(); + }); + } + + this.chart.hoverPoints = null; + this.isHidden = true; + } + }, + + /** + * Hide the crosshairs + */ + hideCrosshairs: function () { + each(this.crosshairs, function (crosshair) { + if (crosshair) { + crosshair.hide(); + } + }); + }, + + /** + * Extendable method to get the anchor position of the tooltip + * from a point or set of points + */ + getAnchor: function (points, mouseEvent) { + var ret, + chart = this.chart, + inverted = chart.inverted, + plotX = 0, + plotY = 0, + yAxis; + + points = splat(points); + + // Pie uses a special tooltipPos + ret = points[0].tooltipPos; + + // When shared, use the average position + if (!ret) { + each(points, function (point) { + yAxis = point.series.yAxis; + plotX += point.plotX; + plotY += (point.plotLow ? (point.plotLow + point.plotHigh) / 2 : point.plotY) + + (!inverted && yAxis ? yAxis.top - chart.plotTop : 0); // #1151 + }); + + plotX /= points.length; + plotY /= points.length; + + ret = [ + inverted ? chart.plotWidth - plotY : plotX, + this.shared && !inverted && points.length > 1 && mouseEvent ? + mouseEvent.chartY - chart.plotTop : // place shared tooltip next to the mouse (#424) + inverted ? chart.plotHeight - plotX : plotY + ]; + } + + return map(ret, mathRound); + }, + + /** + * Place the tooltip in a chart without spilling over + * and not covering the point it self. + */ + getPosition: function (boxWidth, boxHeight, point) { + + // Set up the variables + var chart = this.chart, + plotLeft = chart.plotLeft, + plotTop = chart.plotTop, + plotWidth = chart.plotWidth, + plotHeight = chart.plotHeight, + distance = pick(this.options.distance, 12), + pointX = point.plotX, + pointY = point.plotY, + x = pointX + plotLeft + (chart.inverted ? distance : -boxWidth - distance), + y = pointY - boxHeight + plotTop + 15, // 15 means the point is 15 pixels up from the bottom of the tooltip + alignedRight; + + // It is too far to the left, adjust it + if (x < 7) { + x = plotLeft + mathMax(pointX, 0) + distance; + } + + // Test to see if the tooltip is too far to the right, + // if it is, move it back to be inside and then up to not cover the point. + if ((x + boxWidth) > (plotLeft + plotWidth)) { + x -= (x + boxWidth) - (plotLeft + plotWidth); + y = pointY - boxHeight + plotTop - distance; + alignedRight = true; + } + + // If it is now above the plot area, align it to the top of the plot area + if (y < plotTop + 5) { + y = plotTop + 5; + + // If the tooltip is still covering the point, move it below instead + if (alignedRight && pointY >= y && pointY <= (y + boxHeight)) { + y = pointY + plotTop + distance; // below + } + } + + // Now if the tooltip is below the chart, move it up. It's better to cover the + // point than to disappear outside the chart. #834. + if (y + boxHeight > plotTop + plotHeight) { + y = mathMax(plotTop, plotTop + plotHeight - boxHeight - distance); // below + } + + return {x: x, y: y}; + }, + + /** + * Refresh the tooltip's text and position. + * @param {Object} point + */ + refresh: function (point, mouseEvent) { + var tooltip = this, + chart = tooltip.chart, + label = tooltip.label, + options = tooltip.options; + + /** + * In case no user defined formatter is given, this will be used + */ + function defaultFormatter() { + var pThis = this, + items = pThis.points || splat(pThis), + series = items[0].series, + s; + + // build the header + s = [series.tooltipHeaderFormatter(items[0].key)]; + + // build the values + each(items, function (item) { + series = item.series; + s.push((series.tooltipFormatter && series.tooltipFormatter(item)) || + item.point.tooltipFormatter(series.tooltipOptions.pointFormat)); + }); + + // footer + s.push(options.footerFormat || ''); + + return s.join(''); + } + + var x, + y, + show, + anchor, + textConfig = {}, + text, + pointConfig = [], + formatter = options.formatter || defaultFormatter, + hoverPoints = chart.hoverPoints, + placedTooltipPoint, + borderColor, + crosshairsOptions = options.crosshairs, + shared = tooltip.shared, + currentSeries; + + // get the reference point coordinates (pie charts use tooltipPos) + anchor = tooltip.getAnchor(point, mouseEvent); + x = anchor[0]; + y = anchor[1]; + + // shared tooltip, array is sent over + if (shared && !(point.series && point.series.noSharedTooltip)) { + + // hide previous hoverPoints and set new + + chart.hoverPoints = point; + if (hoverPoints) { + each(hoverPoints, function (point) { + point.setState(); + }); + } + + each(point, function (item) { + item.setState(HOVER_STATE); + + pointConfig.push(item.getLabelConfig()); + }); + + textConfig = { + x: point[0].category, + y: point[0].y + }; + textConfig.points = pointConfig; + point = point[0]; + + // single point tooltip + } else { + textConfig = point.getLabelConfig(); + } + text = formatter.call(textConfig); + + // register the current series + currentSeries = point.series; + + + // For line type series, hide tooltip if the point falls outside the plot + show = shared || !currentSeries.isCartesian || currentSeries.tooltipOutsidePlot || chart.isInsidePlot(x, y); + + // update the inner HTML + if (text === false || !show) { + this.hide(); + } else { + + // show it + if (tooltip.isHidden) { + label.show(); + } + + // update text + label.attr({ + text: text + }); + + // set the stroke color of the box + borderColor = options.borderColor || point.color || currentSeries.color || '#606060'; + label.attr({ + stroke: borderColor + }); + + placedTooltipPoint = (options.positioner || tooltip.getPosition).call( + tooltip, + label.width, + label.height, + { plotX: x, plotY: y } + ); + + // do the move + tooltip.move( + mathRound(placedTooltipPoint.x), + mathRound(placedTooltipPoint.y), + x + chart.plotLeft, + y + chart.plotTop + ); + + + tooltip.isHidden = false; + } + + // crosshairs + if (crosshairsOptions) { + crosshairsOptions = splat(crosshairsOptions); // [x, y] + + var path, + i = crosshairsOptions.length, + attribs, + axis; + + while (i--) { + axis = point.series[i ? 'yAxis' : 'xAxis']; + if (crosshairsOptions[i] && axis) { + + path = axis.getPlotLinePath( + i ? pick(point.stackY, point.y) : point.x, // #814 + 1 + ); + + if (tooltip.crosshairs[i]) { + tooltip.crosshairs[i].attr({ d: path, visibility: VISIBLE }); + } else { + attribs = { + 'stroke-width': crosshairsOptions[i].width || 1, + stroke: crosshairsOptions[i].color || '#C0C0C0', + zIndex: crosshairsOptions[i].zIndex || 2 + }; + if (crosshairsOptions[i].dashStyle) { + attribs.dashstyle = crosshairsOptions[i].dashStyle; + } + tooltip.crosshairs[i] = chart.renderer.path(path) + .attr(attribs) + .add(); + } + } + } + } + fireEvent(chart, 'tooltipRefresh', { + text: text, + x: x + chart.plotLeft, + y: y + chart.plotTop, + borderColor: borderColor + }); + } +}; +/** + * The mouse tracker object + * @param {Object} chart The Chart instance + * @param {Object} options The root options object + */ +function MouseTracker(chart, options) { + var zoomType = useCanVG ? '' : options.chart.zoomType; + + // Zoom status + this.zoomX = /x/.test(zoomType); + this.zoomY = /y/.test(zoomType); + + // Store reference to options + this.options = options; + + // Reference to the chart + this.chart = chart; + + // The interval id + //this.tooltipTimeout = UNDEFINED; + + // The cached x hover position + //this.hoverX = UNDEFINED; + + // The chart position + //this.chartPosition = UNDEFINED; + + // The selection marker element + //this.selectionMarker = UNDEFINED; + + // False or a value > 0 if a dragging operation + //this.mouseDownX = UNDEFINED; + //this.mouseDownY = UNDEFINED; + this.init(chart, options.tooltip); +} + +MouseTracker.prototype = { + /** + * Add crossbrowser support for chartX and chartY + * @param {Object} e The event object in standard browsers + */ + normalizeMouseEvent: function (e) { + var chartPosition, + chartX, + chartY, + ePos; + + // common IE normalizing + e = e || win.event; + if (!e.target) { + e.target = e.srcElement; + } + + // Framework specific normalizing (#1165) + e = washMouseEvent(e); + + // iOS + ePos = e.touches ? e.touches.item(0) : e; + + // get mouse position + this.chartPosition = chartPosition = offset(this.chart.container); + + // chartX and chartY + if (ePos.pageX === UNDEFINED) { // IE < 9. #886. + chartX = e.x; + chartY = e.y; + } else { + chartX = ePos.pageX - chartPosition.left; + chartY = ePos.pageY - chartPosition.top; + } + + return extend(e, { + chartX: mathRound(chartX), + chartY: mathRound(chartY) + }); + }, + + /** + * Get the click position in terms of axis values. + * + * @param {Object} e A mouse event + */ + getMouseCoordinates: function (e) { + var coordinates = { + xAxis: [], + yAxis: [] + }, + chart = this.chart; + + each(chart.axes, function (axis) { + var isXAxis = axis.isXAxis, + isHorizontal = chart.inverted ? !isXAxis : isXAxis; + + coordinates[isXAxis ? 'xAxis' : 'yAxis'].push({ + axis: axis, + value: axis.translate( + (isHorizontal ? + e.chartX - chart.plotLeft : + axis.top + axis.len - e.chartY) - axis.minPixelPadding, // #1051 + true + ) + }); + }); + return coordinates; + }, + + /** + * Return the index in the tooltipPoints array, corresponding to pixel position in + * the plot area. + */ + getIndex: function (e) { + var chart = this.chart; + return chart.inverted ? + chart.plotHeight + chart.plotTop - e.chartY : + e.chartX - chart.plotLeft; + }, + + /** + * With line type charts with a single tracker, get the point closest to the mouse + */ + onmousemove: function (e) { + var mouseTracker = this, + chart = mouseTracker.chart, + series = chart.series, + tooltip = chart.tooltip, + point, + points, + hoverPoint = chart.hoverPoint, + hoverSeries = chart.hoverSeries, + i, + j, + distance = chart.chartWidth, + index = mouseTracker.getIndex(e); + + // shared tooltip + if (tooltip && mouseTracker.options.tooltip.shared && !(hoverSeries && hoverSeries.noSharedTooltip)) { + points = []; + + // loop over all series and find the ones with points closest to the mouse + i = series.length; + for (j = 0; j < i; j++) { + if (series[j].visible && + series[j].options.enableMouseTracking !== false && + !series[j].noSharedTooltip && series[j].tooltipPoints && series[j].tooltipPoints.length) { + point = series[j].tooltipPoints[index]; + point._dist = mathAbs(index - point[series[j].xAxis.tooltipPosName || 'plotX']); + distance = mathMin(distance, point._dist); + points.push(point); + } + } + // remove furthest points + i = points.length; + while (i--) { + if (points[i]._dist > distance) { + points.splice(i, 1); + } + } + // refresh the tooltip if necessary + if (points.length && (points[0].plotX !== mouseTracker.hoverX)) { + tooltip.refresh(points, e); + mouseTracker.hoverX = points[0].plotX; + } + } + + // separate tooltip and general mouse events + if (hoverSeries && hoverSeries.tracker) { // only use for line-type series with common tracker + + // get the point + point = hoverSeries.tooltipPoints[index]; + + // a new point is hovered, refresh the tooltip + if (point && point !== hoverPoint) { + + // trigger the events + point.onMouseOver(); + + } + } + }, + + + + /** + * Reset the tracking by hiding the tooltip, the hover series state and the hover point + * + * @param allowMove {Boolean} Instead of destroying the tooltip altogether, allow moving it if possible + */ + resetTracker: function (allowMove) { + var mouseTracker = this, + chart = mouseTracker.chart, + hoverSeries = chart.hoverSeries, + hoverPoint = chart.hoverPoint, + tooltip = chart.tooltip, + tooltipPoints = tooltip && tooltip.shared ? chart.hoverPoints : hoverPoint; + + // Narrow in allowMove + allowMove = allowMove && tooltip && tooltipPoints; + + // Check if the points have moved outside the plot area, #1003 + if (allowMove && splat(tooltipPoints)[0].plotX === UNDEFINED) { + allowMove = false; + } + + // Just move the tooltip, #349 + if (allowMove) { + tooltip.refresh(tooltipPoints); + + // Full reset + } else { + + if (hoverPoint) { + hoverPoint.onMouseOut(); + } + + if (hoverSeries) { + hoverSeries.onMouseOut(); + } + + if (tooltip) { + tooltip.hide(); + tooltip.hideCrosshairs(); + } + + mouseTracker.hoverX = null; + + } + }, + + /** + * Set the JS events on the container element + */ + setDOMEvents: function () { + var lastWasOutsidePlot = true, + mouseTracker = this, + chart = mouseTracker.chart, + container = chart.container, + hasDragged, + zoomHor = (mouseTracker.zoomX && !chart.inverted) || (mouseTracker.zoomY && chart.inverted), + zoomVert = (mouseTracker.zoomY && !chart.inverted) || (mouseTracker.zoomX && chart.inverted); + + /** + * Mouse up or outside the plot area + */ + function drop() { + if (mouseTracker.selectionMarker) { + var selectionData = { + xAxis: [], + yAxis: [] + }, + selectionBox = mouseTracker.selectionMarker.getBBox(), + selectionLeft = selectionBox.x - chart.plotLeft, + selectionTop = selectionBox.y - chart.plotTop, + runZoom; + + // a selection has been made + if (hasDragged) { + + // record each axis' min and max + each(chart.axes, function (axis) { + if (axis.options.zoomEnabled !== false) { + var isXAxis = axis.isXAxis, + isHorizontal = chart.inverted ? !isXAxis : isXAxis, + selectionMin = axis.translate( + isHorizontal ? + selectionLeft : + chart.plotHeight - selectionTop - selectionBox.height, + true, + 0, + 0, + 1 + ), + selectionMax = axis.translate( + (isHorizontal ? + selectionLeft + selectionBox.width : + chart.plotHeight - selectionTop) - + 2 * axis.minPixelPadding, // #875 + true, + 0, + 0, + 1 + ); + + if (!isNaN(selectionMin) && !isNaN(selectionMax)) { // #859 + selectionData[isXAxis ? 'xAxis' : 'yAxis'].push({ + axis: axis, + min: mathMin(selectionMin, selectionMax), // for reversed axes, + max: mathMax(selectionMin, selectionMax) + }); + runZoom = true; + } + } + }); + if (runZoom) { + fireEvent(chart, 'selection', selectionData, function (args) { chart.zoom(args); }); + } + + } + mouseTracker.selectionMarker = mouseTracker.selectionMarker.destroy(); + } + + if (chart) { // it may be destroyed on mouse up - #877 + css(container, { cursor: 'auto' }); + chart.cancelClick = hasDragged; // #370 + chart.mouseIsDown = hasDragged = false; + } + + removeEvent(doc, 'mouseup', drop); + if (hasTouch) { + removeEvent(doc, 'touchend', drop); + } + } + + /** + * Special handler for mouse move that will hide the tooltip when the mouse leaves the plotarea. + */ + mouseTracker.hideTooltipOnMouseMove = function (e) { + + // Get e.pageX and e.pageY back in MooTools + e = washMouseEvent(e); + + // If we're outside, hide the tooltip + if (mouseTracker.chartPosition && chart.hoverSeries && chart.hoverSeries.isCartesian && + !chart.isInsidePlot(e.pageX - mouseTracker.chartPosition.left - chart.plotLeft, + e.pageY - mouseTracker.chartPosition.top - chart.plotTop)) { + mouseTracker.resetTracker(); + } + }; + + /** + * When mouse leaves the container, hide the tooltip. + */ + mouseTracker.hideTooltipOnMouseLeave = function () { + mouseTracker.resetTracker(); + mouseTracker.chartPosition = null; // also reset the chart position, used in #149 fix + }; + + + /* + * Record the starting position of a dragoperation + */ + container.onmousedown = function (e) { + e = mouseTracker.normalizeMouseEvent(e); + + // issue #295, dragging not always working in Firefox + if (e.type.indexOf('touch') === -1 && e.preventDefault) { + e.preventDefault(); + } + + // record the start position + chart.mouseIsDown = true; + chart.cancelClick = false; + chart.mouseDownX = mouseTracker.mouseDownX = e.chartX; + mouseTracker.mouseDownY = e.chartY; + + addEvent(doc, 'mouseup', drop); + if (hasTouch) { + addEvent(doc, 'touchend', drop); + } + }; + + // The mousemove, touchmove and touchstart event handler + var mouseMove = function (e) { + + // let the system handle multitouch operations like two finger scroll + // and pinching + if (e && e.touches && e.touches.length > 1) { + return; + } + + // normalize + e = mouseTracker.normalizeMouseEvent(e); + + var type = e.type, + chartX = e.chartX, + chartY = e.chartY, + isOutsidePlot = !chart.isInsidePlot(chartX - chart.plotLeft, chartY - chart.plotTop); + + + if (type.indexOf('touch') === -1) { // not for touch actions + e.returnValue = false; + } + + // on touch devices, only trigger click if a handler is defined + if (type === 'touchstart') { + if (attr(e.target, 'isTracker')) { + if (!chart.runTrackerClick) { + e.preventDefault(); + } + } else if (!chart.runChartClick && !isOutsidePlot) { + e.preventDefault(); + } + } + + // cancel on mouse outside + if (isOutsidePlot) { + + /*if (!lastWasOutsidePlot) { + // reset the tracker + resetTracker(); + }*/ + + // drop the selection if any and reset mouseIsDown and hasDragged + //drop(); + if (chartX < chart.plotLeft) { + chartX = chart.plotLeft; + } else if (chartX > chart.plotLeft + chart.plotWidth) { + chartX = chart.plotLeft + chart.plotWidth; + } + + if (chartY < chart.plotTop) { + chartY = chart.plotTop; + } else if (chartY > chart.plotTop + chart.plotHeight) { + chartY = chart.plotTop + chart.plotHeight; + } + } + + if (chart.mouseIsDown && type !== 'touchstart') { // make selection + + // determine if the mouse has moved more than 10px + hasDragged = Math.sqrt( + Math.pow(mouseTracker.mouseDownX - chartX, 2) + + Math.pow(mouseTracker.mouseDownY - chartY, 2) + ); + if (hasDragged > 10) { + var clickedInside = chart.isInsidePlot(mouseTracker.mouseDownX - chart.plotLeft, mouseTracker.mouseDownY - chart.plotTop); + + // make a selection + if (chart.hasCartesianSeries && (mouseTracker.zoomX || mouseTracker.zoomY) && clickedInside) { + if (!mouseTracker.selectionMarker) { + mouseTracker.selectionMarker = chart.renderer.rect( + chart.plotLeft, + chart.plotTop, + zoomHor ? 1 : chart.plotWidth, + zoomVert ? 1 : chart.plotHeight, + 0 + ) + .attr({ + fill: mouseTracker.options.chart.selectionMarkerFill || 'rgba(69,114,167,0.25)', + zIndex: 7 + }) + .add(); + } + } + + // adjust the width of the selection marker + if (mouseTracker.selectionMarker && zoomHor) { + var xSize = chartX - mouseTracker.mouseDownX; + mouseTracker.selectionMarker.attr({ + width: mathAbs(xSize), + x: (xSize > 0 ? 0 : xSize) + mouseTracker.mouseDownX + }); + } + // adjust the height of the selection marker + if (mouseTracker.selectionMarker && zoomVert) { + var ySize = chartY - mouseTracker.mouseDownY; + mouseTracker.selectionMarker.attr({ + height: mathAbs(ySize), + y: (ySize > 0 ? 0 : ySize) + mouseTracker.mouseDownY + }); + } + + // panning + if (clickedInside && !mouseTracker.selectionMarker && mouseTracker.options.chart.panning) { + chart.pan(chartX); + } + } + + } + + // Show the tooltip and run mouse over events (#977) + if (!isOutsidePlot) { + mouseTracker.onmousemove(e); + } + + lastWasOutsidePlot = isOutsidePlot; + + // when outside plot, allow touch-drag by returning true + return isOutsidePlot || !chart.hasCartesianSeries; + }; + + // When the mouse enters the container, run mouseMove + if (!/Android 4\.0/.test(userAgent)) { // This hurts. Best effort for #1385. + container.onmousemove = mouseMove; + } + + /* + * When the mouse leaves the container, hide the tracking (tooltip). + */ + addEvent(container, 'mouseleave', mouseTracker.hideTooltipOnMouseLeave); + + // issue #149 workaround + // The mouseleave event above does not always fire. Whenever the mouse is moving + // outside the plotarea, hide the tooltip + if (!hasTouch) { // #1385 + addEvent(doc, 'mousemove', mouseTracker.hideTooltipOnMouseMove); + } + + container.ontouchstart = function (e) { + // For touch devices, use touchmove to zoom + if (mouseTracker.zoomX || mouseTracker.zoomY) { + container.onmousedown(e); + } + // Show tooltip and prevent the lower mouse pseudo event + mouseMove(e); + }; + + /* + * Allow dragging the finger over the chart to read the values on touch + * devices + */ + container.ontouchmove = mouseMove; + + /* + * Allow dragging the finger over the chart to read the values on touch + * devices + */ + container.ontouchend = function () { + if (hasDragged) { + mouseTracker.resetTracker(); + } + }; + + + // MooTools 1.2.3 doesn't fire this in IE when using addEvent + container.onclick = function (e) { + var hoverPoint = chart.hoverPoint, + plotX, + plotY; + e = mouseTracker.normalizeMouseEvent(e); + + e.cancelBubble = true; // IE specific + + + if (!chart.cancelClick) { + // Detect clicks on trackers or tracker groups, #783 + if (hoverPoint && (attr(e.target, 'isTracker') || attr(e.target.parentNode, 'isTracker'))) { + plotX = hoverPoint.plotX; + plotY = hoverPoint.plotY; + + // add page position info + extend(hoverPoint, { + pageX: mouseTracker.chartPosition.left + chart.plotLeft + + (chart.inverted ? chart.plotWidth - plotY : plotX), + pageY: mouseTracker.chartPosition.top + chart.plotTop + + (chart.inverted ? chart.plotHeight - plotX : plotY) + }); + + // the series click event + fireEvent(hoverPoint.series, 'click', extend(e, { + point: hoverPoint + })); + + // the point click event + hoverPoint.firePointEvent('click', e); + + } else { + extend(e, mouseTracker.getMouseCoordinates(e)); + + // fire a click event in the chart + if (chart.isInsidePlot(e.chartX - chart.plotLeft, e.chartY - chart.plotTop)) { + fireEvent(chart, 'click', e); + } + } + + + } + }; + + }, + + /** + * Destroys the MouseTracker object and disconnects DOM events. + */ + destroy: function () { + var mouseTracker = this, + chart = mouseTracker.chart, + container = chart.container; + + // Destroy the tracker group element + if (chart.trackerGroup) { + chart.trackerGroup = chart.trackerGroup.destroy(); + } + + removeEvent(container, 'mouseleave', mouseTracker.hideTooltipOnMouseLeave); + removeEvent(doc, 'mousemove', mouseTracker.hideTooltipOnMouseMove); + container.onclick = container.onmousedown = container.onmousemove = container.ontouchstart = container.ontouchend = container.ontouchmove = null; + + // memory and CPU leak + clearInterval(this.tooltipTimeout); + }, + + // Run MouseTracker + init: function (chart, options) { + if (!chart.trackerGroup) { + chart.trackerGroup = chart.renderer.g('tracker') + .attr({ zIndex: 9 }) + .add(); + } + + if (options.enabled) { + chart.tooltip = new Tooltip(chart, options); + } + + this.setDOMEvents(); + } +}; +/** + * The overview of the chart's series + */ +function Legend(chart) { + + this.init(chart); +} + +Legend.prototype = { + + /** + * Initialize the legend + */ + init: function (chart) { + var legend = this, + options = legend.options = chart.options.legend; + + if (!options.enabled) { + return; + } + + var //style = options.style || {}, // deprecated + itemStyle = options.itemStyle, + padding = pick(options.padding, 8), + itemMarginTop = options.itemMarginTop || 0; + + legend.baseline = pInt(itemStyle.fontSize) + 3 + itemMarginTop; // used in Series prototype + legend.itemStyle = itemStyle; + legend.itemHiddenStyle = merge(itemStyle, options.itemHiddenStyle); + legend.itemMarginTop = itemMarginTop; + legend.padding = padding; + legend.initialItemX = padding; + legend.initialItemY = padding - 5; // 5 is the number of pixels above the text + legend.maxItemWidth = 0; + legend.chart = chart; + //legend.allItems = UNDEFINED; + //legend.legendWidth = UNDEFINED; + //legend.legendHeight = UNDEFINED; + //legend.offsetWidth = UNDEFINED; + legend.itemHeight = 0; + legend.lastLineHeight = 0; + //legend.itemX = UNDEFINED; + //legend.itemY = UNDEFINED; + //legend.lastItemY = UNDEFINED; + + // Elements + //legend.group = UNDEFINED; + //legend.box = UNDEFINED; + + // run legend + legend.render(); + + // move checkboxes + addEvent(legend.chart, 'endResize', function () { legend.positionCheckboxes(); }); + +/* // expose + return { + colorizeItem: colorizeItem, + destroyItem: destroyItem, + render: render, + destroy: destroy, + getLegendWidth: getLegendWidth, + getLegendHeight: getLegendHeight + };*/ + }, + + /** + * Set the colors for the legend item + * @param {Object} item A Series or Point instance + * @param {Object} visible Dimmed or colored + */ + colorizeItem: function (item, visible) { + var legend = this, + options = legend.options, + legendItem = item.legendItem, + legendLine = item.legendLine, + legendSymbol = item.legendSymbol, + hiddenColor = legend.itemHiddenStyle.color, + textColor = visible ? options.itemStyle.color : hiddenColor, + symbolColor = visible ? item.color : hiddenColor, + markerOptions = item.options && item.options.marker, + symbolAttr = { + stroke: symbolColor, + fill: symbolColor + }, + key, + val; + + + if (legendItem) { + legendItem.css({ fill: textColor }); + } + if (legendLine) { + legendLine.attr({ stroke: symbolColor }); + } + + if (legendSymbol) { + + // Apply marker options + if (markerOptions) { + markerOptions = item.convertAttribs(markerOptions); + for (key in markerOptions) { + val = markerOptions[key]; + if (val !== UNDEFINED) { + symbolAttr[key] = val; + } + } + } + + legendSymbol.attr(symbolAttr); + } + }, + + /** + * Position the legend item + * @param {Object} item A Series or Point instance + */ + positionItem: function (item) { + var legend = this, + options = legend.options, + symbolPadding = options.symbolPadding, + ltr = !options.rtl, + legendItemPos = item._legendItemPos, + itemX = legendItemPos[0], + itemY = legendItemPos[1], + checkbox = item.checkbox; + + if (item.legendGroup) { + item.legendGroup.translate( + ltr ? itemX : legend.legendWidth - itemX - 2 * symbolPadding - 4, + itemY + ); + } + + if (checkbox) { + checkbox.x = itemX; + checkbox.y = itemY; + } + }, + + /** + * Destroy a single legend item + * @param {Object} item The series or point + */ + destroyItem: function (item) { + var checkbox = item.checkbox; + + // destroy SVG elements + each(['legendItem', 'legendLine', 'legendSymbol', 'legendGroup'], function (key) { + if (item[key]) { + item[key].destroy(); + } + }); + + if (checkbox) { + discardElement(item.checkbox); + } + }, + + /** + * Destroys the legend. + */ + destroy: function () { + var legend = this, + legendGroup = legend.group, + box = legend.box; + + if (box) { + legend.box = box.destroy(); + } + + if (legendGroup) { + legend.group = legendGroup.destroy(); + } + }, + + /** + * Position the checkboxes after the width is determined + */ + positionCheckboxes: function (scrollOffset) { + var alignAttr = this.group.alignAttr, + translateY, + clipHeight = this.clipHeight || this.legendHeight; + + if (alignAttr) { + translateY = alignAttr.translateY; + each(this.allItems, function (item) { + var checkbox = item.checkbox, + top; + + if (checkbox) { + top = (translateY + checkbox.y + (scrollOffset || 0) + 3); + css(checkbox, { + left: (alignAttr.translateX + item.legendItemWidth + checkbox.x - 20) + PX, + top: top + PX, + display: top > translateY - 6 && top < translateY + clipHeight - 6 ? '' : NONE + }); + } + }); + } + }, + + /** + * Render a single specific legend item + * @param {Object} item A series or point + */ + renderItem: function (item) { + var legend = this, + chart = legend.chart, + renderer = chart.renderer, + options = legend.options, + horizontal = options.layout === 'horizontal', + symbolWidth = options.symbolWidth, + symbolPadding = options.symbolPadding, + itemStyle = legend.itemStyle, + itemHiddenStyle = legend.itemHiddenStyle, + padding = legend.padding, + ltr = !options.rtl, + itemHeight, + widthOption = options.width, + itemMarginBottom = options.itemMarginBottom || 0, + itemMarginTop = legend.itemMarginTop, + initialItemX = legend.initialItemX, + bBox, + itemWidth, + li = item.legendItem, + series = item.series || item, + itemOptions = series.options, + showCheckbox = itemOptions.showCheckbox, + useHTML = options.useHTML; + + if (!li) { // generate it once, later move it + + // Generate the group box + // A group to hold the symbol and text. Text is to be appended in Legend class. + item.legendGroup = renderer.g('legend-item') + .attr({ zIndex: 1 }) + .add(legend.scrollGroup); + + // Draw the legend symbol inside the group box + series.drawLegendSymbol(legend, item); + + // Generate the list item text and add it to the group + item.legendItem = li = renderer.text( + options.labelFormatter.call(item), + ltr ? symbolWidth + symbolPadding : -symbolPadding, + legend.baseline, + useHTML + ) + .css(merge(item.visible ? itemStyle : itemHiddenStyle)) // merge to prevent modifying original (#1021) + .attr({ + align: ltr ? 'left' : 'right', + zIndex: 2 + }) + .add(item.legendGroup); + + // Set the events on the item group, or in case of useHTML, the item itself (#1249) + (useHTML ? li : item.legendGroup).on('mouseover', function () { + item.setState(HOVER_STATE); + li.css(legend.options.itemHoverStyle); + }) + .on('mouseout', function () { + li.css(item.visible ? itemStyle : itemHiddenStyle); + item.setState(); + }) + .on('click', function (event) { + var strLegendItemClick = 'legendItemClick', + fnLegendItemClick = function () { + item.setVisible(); + }; + + // Pass over the click/touch event. #4. + event = { + browserEvent: event + }; + + // click the name or symbol + if (item.firePointEvent) { // point + item.firePointEvent(strLegendItemClick, event, fnLegendItemClick); + } else { + fireEvent(item, strLegendItemClick, event, fnLegendItemClick); + } + }); + + // Colorize the items + legend.colorizeItem(item, item.visible); + + // add the HTML checkbox on top + if (itemOptions && showCheckbox) { + item.checkbox = createElement('input', { + type: 'checkbox', + checked: item.selected, + defaultChecked: item.selected // required by IE7 + }, options.itemCheckboxStyle, chart.container); + + addEvent(item.checkbox, 'click', function (event) { + var target = event.target; + fireEvent(item, 'checkboxClick', { + checked: target.checked + }, + function () { + item.select(); + } + ); + }); + } + } + + // calculate the positions for the next line + bBox = li.getBBox(); + + itemWidth = item.legendItemWidth = + options.itemWidth || symbolWidth + symbolPadding + bBox.width + padding + + (showCheckbox ? 20 : 0); + legend.itemHeight = itemHeight = bBox.height; + + // if the item exceeds the width, start a new line + if (horizontal && legend.itemX - initialItemX + itemWidth > + (widthOption || (chart.chartWidth - 2 * padding - initialItemX))) { + legend.itemX = initialItemX; + legend.itemY += itemMarginTop + legend.lastLineHeight + itemMarginBottom; + legend.lastLineHeight = 0; // reset for next line + } + + // If the item exceeds the height, start a new column + /*if (!horizontal && legend.itemY + options.y + itemHeight > chart.chartHeight - spacingTop - spacingBottom) { + legend.itemY = legend.initialItemY; + legend.itemX += legend.maxItemWidth; + legend.maxItemWidth = 0; + }*/ + + // Set the edge positions + legend.maxItemWidth = mathMax(legend.maxItemWidth, itemWidth); + legend.lastItemY = itemMarginTop + legend.itemY + itemMarginBottom; + legend.lastLineHeight = mathMax(itemHeight, legend.lastLineHeight); // #915 + + // cache the position of the newly generated or reordered items + item._legendItemPos = [legend.itemX, legend.itemY]; + + // advance + if (horizontal) { + legend.itemX += itemWidth; + + } else { + legend.itemY += itemMarginTop + itemHeight + itemMarginBottom; + legend.lastLineHeight = itemHeight; + } + + // the width of the widest item + legend.offsetWidth = widthOption || mathMax( + horizontal ? legend.itemX - initialItemX : itemWidth, + legend.offsetWidth + ); + }, + + /** + * Render the legend. This method can be called both before and after + * chart.render. If called after, it will only rearrange items instead + * of creating new ones. + */ + render: function () { + var legend = this, + chart = legend.chart, + renderer = chart.renderer, + legendGroup = legend.group, + allItems, + display, + legendWidth, + legendHeight, + box = legend.box, + options = legend.options, + padding = legend.padding, + legendBorderWidth = options.borderWidth, + legendBackgroundColor = options.backgroundColor; + + legend.itemX = legend.initialItemX; + legend.itemY = legend.initialItemY; + legend.offsetWidth = 0; + legend.lastItemY = 0; + + if (!legendGroup) { + legend.group = legendGroup = renderer.g('legend') + // #414, #759. Trackers will be drawn above the legend, but we have + // to sacrifice that because tooltips need to be above the legend + // and trackers above tooltips + .attr({ zIndex: 7 }) + .add(); + legend.contentGroup = renderer.g() + .attr({ zIndex: 1 }) // above background + .add(legendGroup); + legend.scrollGroup = renderer.g() + .add(legend.contentGroup); + legend.clipRect = renderer.clipRect(0, 0, 9999, chart.chartHeight); + legend.contentGroup.clip(legend.clipRect); + } + + // add each series or point + allItems = []; + each(chart.series, function (serie) { + var seriesOptions = serie.options; + + if (!seriesOptions.showInLegend) { + return; + } + + // use points or series for the legend item depending on legendType + allItems = allItems.concat( + serie.legendItems || + (seriesOptions.legendType === 'point' ? + serie.data : + serie) + ); + }); + + // sort by legendIndex + stableSort(allItems, function (a, b) { + return ((a.options && a.options.legendIndex) || 0) - ((b.options && b.options.legendIndex) || 0); + }); + + // reversed legend + if (options.reversed) { + allItems.reverse(); + } + + legend.allItems = allItems; + legend.display = display = !!allItems.length; + + // render the items + each(allItems, function (item) { + legend.renderItem(item); + }); + + // Draw the border + legendWidth = options.width || legend.offsetWidth; + legendHeight = legend.lastItemY + legend.lastLineHeight; + + + legendHeight = legend.handleOverflow(legendHeight); + + if (legendBorderWidth || legendBackgroundColor) { + legendWidth += padding; + legendHeight += padding; + + if (!box) { + legend.box = box = renderer.rect( + 0, + 0, + legendWidth, + legendHeight, + options.borderRadius, + legendBorderWidth || 0 + ).attr({ + stroke: options.borderColor, + 'stroke-width': legendBorderWidth || 0, + fill: legendBackgroundColor || NONE + }) + .add(legendGroup) + .shadow(options.shadow); + box.isNew = true; + + } else if (legendWidth > 0 && legendHeight > 0) { + box[box.isNew ? 'attr' : 'animate']( + box.crisp(null, null, null, legendWidth, legendHeight) + ); + box.isNew = false; + } + + // hide the border if no items + box[display ? 'show' : 'hide'](); + } + + legend.legendWidth = legendWidth; + legend.legendHeight = legendHeight; + + // Now that the legend width and height are established, put the items in the + // final position + each(allItems, function (item) { + legend.positionItem(item); + }); + + // 1.x compatibility: positioning based on style + /*var props = ['left', 'right', 'top', 'bottom'], + prop, + i = 4; + while (i--) { + prop = props[i]; + if (options.style[prop] && options.style[prop] !== 'auto') { + options[i < 2 ? 'align' : 'verticalAlign'] = prop; + options[i < 2 ? 'x' : 'y'] = pInt(options.style[prop]) * (i % 2 ? -1 : 1); + } + }*/ + + if (display) { + legendGroup.align(extend({ + width: legendWidth, + height: legendHeight + }, options), true, chart.spacingBox); + } + + if (!chart.isResizing) { + this.positionCheckboxes(); + } + }, + + /** + * Set up the overflow handling by adding navigation with up and down arrows below the + * legend. + */ + handleOverflow: function (legendHeight) { + var legend = this, + chart = this.chart, + renderer = chart.renderer, + pageCount, + options = this.options, + optionsY = options.y, + alignTop = options.verticalAlign === 'top', + spaceHeight = chart.spacingBox.height + (alignTop ? -optionsY : optionsY) - this.padding, + maxHeight = options.maxHeight, + clipHeight, + clipRect = this.clipRect, + navOptions = options.navigation, + animation = pick(navOptions.animation, true), + arrowSize = navOptions.arrowSize || 12, + nav = this.nav; + + // Adjust the height + if (options.layout === 'horizontal') { + spaceHeight /= 2; + } + if (maxHeight) { + spaceHeight = mathMin(spaceHeight, maxHeight); + } + + // Reset the legend height and adjust the clipping rectangle + if (legendHeight > spaceHeight) { + + this.clipHeight = clipHeight = spaceHeight - 20; + this.pageCount = pageCount = mathCeil(legendHeight / clipHeight); + this.currentPage = pick(this.currentPage, 1); + this.fullHeight = legendHeight; + + clipRect.attr({ + height: clipHeight + }); + + // Add navigation elements + if (!nav) { + this.nav = nav = renderer.g().attr({ zIndex: 1 }).add(this.group); + this.up = renderer.symbol('triangle', 0, 0, arrowSize, arrowSize) + .on('click', function () { + legend.scroll(-1, animation); + }) + .add(nav); + this.pager = renderer.text('', 15, 10) + .css(navOptions.style) + .add(nav); + this.down = renderer.symbol('triangle-down', 0, 0, arrowSize, arrowSize) + .on('click', function () { + legend.scroll(1, animation); + }) + .add(nav); + } + + // Set initial position + legend.scroll(0); + + legendHeight = spaceHeight; + + } else if (nav) { + clipRect.attr({ + height: chart.chartHeight + }); + nav.hide(); + this.scrollGroup.attr({ + translateY: 1 + }); + this.clipHeight = 0; // #1379 + } + + return legendHeight; + }, + + /** + * Scroll the legend by a number of pages + * @param {Object} scrollBy + * @param {Object} animation + */ + scroll: function (scrollBy, animation) { + var pageCount = this.pageCount, + currentPage = this.currentPage + scrollBy, + clipHeight = this.clipHeight, + navOptions = this.options.navigation, + activeColor = navOptions.activeColor, + inactiveColor = navOptions.inactiveColor, + pager = this.pager, + padding = this.padding, + scrollOffset; + + // When resizing while looking at the last page + if (currentPage > pageCount) { + currentPage = pageCount; + } + + if (currentPage > 0) { + + if (animation !== UNDEFINED) { + setAnimation(animation, this.chart); + } + + this.nav.attr({ + translateX: padding, + translateY: clipHeight + 7, + visibility: VISIBLE + }); + this.up.attr({ + fill: currentPage === 1 ? inactiveColor : activeColor + }) + .css({ + cursor: currentPage === 1 ? 'default' : 'pointer' + }); + pager.attr({ + text: currentPage + '/' + this.pageCount + }); + this.down.attr({ + x: 18 + this.pager.getBBox().width, // adjust to text width + fill: currentPage === pageCount ? inactiveColor : activeColor + }) + .css({ + cursor: currentPage === pageCount ? 'default' : 'pointer' + }); + + scrollOffset = -mathMin(clipHeight * (currentPage - 1), this.fullHeight - clipHeight + padding) + 1; + this.scrollGroup.animate({ + translateY: scrollOffset + }); + pager.attr({ + text: currentPage + '/' + pageCount + }); + + + this.currentPage = currentPage; + this.positionCheckboxes(scrollOffset); + } + + } + +}; + + +/** + * The chart class + * @param {Object} options + * @param {Function} callback Function to run when the chart has loaded + */ +function Chart() { + this.init.apply(this, arguments); +} + +Chart.prototype = { + + /** + * Initialize the chart + */ + init: function (userOptions, callback) { + + // Handle regular options + var options, + seriesOptions = userOptions.series; // skip merging data points to increase performance + + userOptions.series = null; + options = merge(defaultOptions, userOptions); // do the merge + options.series = userOptions.series = seriesOptions; // set back the series data + + var optionsChart = options.chart, + optionsMargin = optionsChart.margin, + margin = isObject(optionsMargin) ? + optionsMargin : + [optionsMargin, optionsMargin, optionsMargin, optionsMargin]; + + this.optionsMarginTop = pick(optionsChart.marginTop, margin[0]); + this.optionsMarginRight = pick(optionsChart.marginRight, margin[1]); + this.optionsMarginBottom = pick(optionsChart.marginBottom, margin[2]); + this.optionsMarginLeft = pick(optionsChart.marginLeft, margin[3]); + + var chartEvents = optionsChart.events; + + this.runChartClick = chartEvents && !!chartEvents.click; + this.callback = callback; + this.isResizing = 0; + this.options = options; + //chartTitleOptions = UNDEFINED; + //chartSubtitleOptions = UNDEFINED; + + this.axes = []; + this.series = []; + this.hasCartesianSeries = optionsChart.showAxes; + //this.axisOffset = UNDEFINED; + //this.maxTicks = UNDEFINED; // handle the greatest amount of ticks on grouped axes + //this.inverted = UNDEFINED; + //this.loadingShown = UNDEFINED; + //this.container = UNDEFINED; + //this.chartWidth = UNDEFINED; + //this.chartHeight = UNDEFINED; + //this.marginRight = UNDEFINED; + //this.marginBottom = UNDEFINED; + //this.containerWidth = UNDEFINED; + //this.containerHeight = UNDEFINED; + //this.oldChartWidth = UNDEFINED; + //this.oldChartHeight = UNDEFINED; + + //this.renderTo = UNDEFINED; + //this.renderToClone = UNDEFINED; + //this.tracker = UNDEFINED; + + //this.spacingBox = UNDEFINED + + //this.legend = UNDEFINED; + + // Elements + //this.chartBackground = UNDEFINED; + //this.plotBackground = UNDEFINED; + //this.plotBGImage = UNDEFINED; + //this.plotBorder = UNDEFINED; + //this.loadingDiv = UNDEFINED; + //this.loadingSpan = UNDEFINED; + + var chart = this, + eventType; + + // Add the chart to the global lookup + chart.index = charts.length; + charts.push(chart); + + // Set up auto resize + if (optionsChart.reflow !== false) { + addEvent(chart, 'load', chart.initReflow); + } + + // Chart event handlers + if (chartEvents) { + for (eventType in chartEvents) { + addEvent(chart, eventType, chartEvents[eventType]); + } + } + + chart.xAxis = []; + chart.yAxis = []; + + // Expose methods and variables + chart.animation = useCanVG ? false : pick(optionsChart.animation, true); + chart.pointCount = 0; + chart.counters = new ChartCounters(); + + chart.firstRender(); + }, + + /** + * Initialize an individual series, called internally before render time + */ + initSeries: function (options) { + var chart = this, + optionsChart = chart.options.chart, + type = options.type || optionsChart.type || optionsChart.defaultSeriesType, + series = new seriesTypes[type](); + + series.init(this, options); + return series; + }, + + /** + * Add a series dynamically after time + * + * @param {Object} options The config options + * @param {Boolean} redraw Whether to redraw the chart after adding. Defaults to true. + * @param {Boolean|Object} animation Whether to apply animation, and optionally animation + * configuration + * + * @return {Object} series The newly created series object + */ + addSeries: function (options, redraw, animation) { + var series, + chart = this; + + if (options) { + setAnimation(animation, chart); + redraw = pick(redraw, true); // defaults to true + + fireEvent(chart, 'addSeries', { options: options }, function () { + series = chart.initSeries(options); + + chart.isDirtyLegend = true; // the series array is out of sync with the display + if (redraw) { + chart.redraw(); + } + }); + } + + return series; + }, + + /** + * Check whether a given point is within the plot area + * + * @param {Number} plotX Pixel x relative to the plot area + * @param {Number} plotY Pixel y relative to the plot area + * @param {Boolean} inverted Whether the chart is inverted + */ + isInsidePlot: function (plotX, plotY, inverted) { + var x = inverted ? plotY : plotX, + y = inverted ? plotX : plotY; + + return x >= 0 && + x <= this.plotWidth && + y >= 0 && + y <= this.plotHeight; + }, + + /** + * Adjust all axes tick amounts + */ + adjustTickAmounts: function () { + if (this.options.chart.alignTicks !== false) { + each(this.axes, function (axis) { + axis.adjustTickAmount(); + }); + } + this.maxTicks = null; + }, + + /** + * Redraw legend, axes or series based on updated data + * + * @param {Boolean|Object} animation Whether to apply animation, and optionally animation + * configuration + */ + redraw: function (animation) { + var chart = this, + axes = chart.axes, + series = chart.series, + tracker = chart.tracker, + legend = chart.legend, + redrawLegend = chart.isDirtyLegend, + hasStackedSeries, + isDirtyBox = chart.isDirtyBox, // todo: check if it has actually changed? + seriesLength = series.length, + i = seriesLength, + serie, + renderer = chart.renderer, + isHiddenChart = renderer.isHidden(), + afterRedraw = []; + + setAnimation(animation, chart); + + if (isHiddenChart) { + chart.cloneRenderTo(); + } + + // link stacked series + while (i--) { + serie = series[i]; + if (serie.isDirty && serie.options.stacking) { + hasStackedSeries = true; + break; + } + } + if (hasStackedSeries) { // mark others as dirty + i = seriesLength; + while (i--) { + serie = series[i]; + if (serie.options.stacking) { + serie.isDirty = true; + } + } + } + + // handle updated data in the series + each(series, function (serie) { + if (serie.isDirty) { // prepare the data so axis can read it + if (serie.options.legendType === 'point') { + redrawLegend = true; + } + } + }); + + // handle added or removed series + if (redrawLegend && legend.options.enabled) { // series or pie points are added or removed + // draw legend graphics + legend.render(); + + chart.isDirtyLegend = false; + } + + + if (chart.hasCartesianSeries) { + if (!chart.isResizing) { + + // reset maxTicks + chart.maxTicks = null; + + // set axes scales + each(axes, function (axis) { + axis.setScale(); + }); + } + chart.adjustTickAmounts(); + chart.getMargins(); + + // redraw axes + each(axes, function (axis) { + + // Fire 'afterSetExtremes' only if extremes are set + if (axis.isDirtyExtremes) { // #821 + axis.isDirtyExtremes = false; + afterRedraw.push(function () { // prevent a recursive call to chart.redraw() (#1119) + fireEvent(axis, 'afterSetExtremes', axis.getExtremes()); // #747, #751 + }); + } + + if (axis.isDirty || isDirtyBox || hasStackedSeries) { + axis.redraw(); + isDirtyBox = true; // #792 + } + }); + + + } + // the plot areas size has changed + if (isDirtyBox) { + chart.drawChartBox(); + } + + + + // redraw affected series + each(series, function (serie) { + if (serie.isDirty && serie.visible && + (!serie.isCartesian || serie.xAxis)) { // issue #153 + serie.redraw(); + } + }); + + // move tooltip or reset + if (tracker && tracker.resetTracker) { + tracker.resetTracker(true); + } + + // redraw if canvas + renderer.draw(); + + // fire the event + fireEvent(chart, 'redraw'); // jQuery breaks this when calling it from addEvent. Overwrites chart.redraw + + if (isHiddenChart) { + chart.cloneRenderTo(true); + } + + // Fire callbacks that are put on hold until after the redraw + each(afterRedraw, function (callback) { + callback.call(); + }); + }, + + + + /** + * Dim the chart and show a loading text or symbol + * @param {String} str An optional text to show in the loading label instead of the default one + */ + showLoading: function (str) { + var chart = this, + options = chart.options, + loadingDiv = chart.loadingDiv; + + var loadingOptions = options.loading; + + // create the layer at the first call + if (!loadingDiv) { + chart.loadingDiv = loadingDiv = createElement(DIV, { + className: PREFIX + 'loading' + }, extend(loadingOptions.style, { + left: chart.plotLeft + PX, + top: chart.plotTop + PX, + width: chart.plotWidth + PX, + height: chart.plotHeight + PX, + zIndex: 10, + display: NONE + }), chart.container); + + chart.loadingSpan = createElement( + 'span', + null, + loadingOptions.labelStyle, + loadingDiv + ); + + } + + // update text + chart.loadingSpan.innerHTML = str || options.lang.loading; + + // show it + if (!chart.loadingShown) { + css(loadingDiv, { opacity: 0, display: '' }); + animate(loadingDiv, { + opacity: loadingOptions.style.opacity + }, { + duration: loadingOptions.showDuration || 0 + }); + chart.loadingShown = true; + } + }, + + /** + * Hide the loading layer + */ + hideLoading: function () { + var options = this.options, + loadingDiv = this.loadingDiv; + + if (loadingDiv) { + animate(loadingDiv, { + opacity: 0 + }, { + duration: options.loading.hideDuration || 100, + complete: function () { + css(loadingDiv, { display: NONE }); + } + }); + } + this.loadingShown = false; + }, + + /** + * Get an axis, series or point object by id. + * @param id {String} The id as given in the configuration options + */ + get: function (id) { + var chart = this, + axes = chart.axes, + series = chart.series; + + var i, + j, + points; + + // search axes + for (i = 0; i < axes.length; i++) { + if (axes[i].options.id === id) { + return axes[i]; + } + } + + // search series + for (i = 0; i < series.length; i++) { + if (series[i].options.id === id) { + return series[i]; + } + } + + // search points + for (i = 0; i < series.length; i++) { + points = series[i].points || []; + for (j = 0; j < points.length; j++) { + if (points[j].id === id) { + return points[j]; + } + } + } + return null; + }, + + /** + * Create the Axis instances based on the config options + */ + getAxes: function () { + var chart = this, + options = this.options; + + var xAxisOptions = options.xAxis || {}, + yAxisOptions = options.yAxis || {}, + optionsArray, + axis; + + // make sure the options are arrays and add some members + xAxisOptions = splat(xAxisOptions); + each(xAxisOptions, function (axis, i) { + axis.index = i; + axis.isX = true; + }); + + yAxisOptions = splat(yAxisOptions); + each(yAxisOptions, function (axis, i) { + axis.index = i; + }); + + // concatenate all axis options into one array + optionsArray = xAxisOptions.concat(yAxisOptions); + + each(optionsArray, function (axisOptions) { + axis = new Axis(chart, axisOptions); + }); + + chart.adjustTickAmounts(); + }, + + + /** + * Get the currently selected points from all series + */ + getSelectedPoints: function () { + var points = []; + each(this.series, function (serie) { + points = points.concat(grep(serie.points, function (point) { + return point.selected; + })); + }); + return points; + }, + + /** + * Get the currently selected series + */ + getSelectedSeries: function () { + return grep(this.series, function (serie) { + return serie.selected; + }); + }, + + /** + * Display the zoom button + */ + showResetZoom: function () { + var chart = this, + lang = defaultOptions.lang, + btnOptions = chart.options.chart.resetZoomButton, + theme = btnOptions.theme, + states = theme.states, + alignTo = btnOptions.relativeTo === 'chart' ? null : 'plotBox'; + + this.resetZoomButton = chart.renderer.button(lang.resetZoom, null, null, function () { chart.zoomOut(); }, theme, states && states.hover) + .attr({ + align: btnOptions.position.align, + title: lang.resetZoomTitle + }) + .add() + .align(btnOptions.position, false, chart[alignTo]); + this.resetZoomButton.alignTo = alignTo; + + }, + + /** + * Zoom out to 1:1 + */ + zoomOut: function () { + var chart = this, + resetZoomButton = chart.resetZoomButton; + + fireEvent(chart, 'selection', { resetSelection: true }, function () { chart.zoom(); }); + if (resetZoomButton) { + chart.resetZoomButton = resetZoomButton.destroy(); + } + }, + + /** + * Zoom into a given portion of the chart given by axis coordinates + * @param {Object} event + */ + zoom: function (event) { + var chart = this, + hasZoomed; + + // if zoom is called with no arguments, reset the axes + if (!event || event.resetSelection) { + each(chart.axes, function (axis) { + hasZoomed = axis.zoom(); + }); + } else { // else, zoom in on all axes + each(event.xAxis.concat(event.yAxis), function (axisData) { + var axis = axisData.axis; + + // don't zoom more than minRange + if (chart.tracker[axis.isXAxis ? 'zoomX' : 'zoomY']) { + hasZoomed = axis.zoom(axisData.min, axisData.max); + } + }); + } + + // Show the Reset zoom button + if (!chart.resetZoomButton) { + chart.showResetZoom(); + } + + + // Redraw + if (hasZoomed) { + chart.redraw( + pick(chart.options.chart.animation, chart.pointCount < 100) // animation + ); + } + }, + + /** + * Pan the chart by dragging the mouse across the pane. This function is called + * on mouse move, and the distance to pan is computed from chartX compared to + * the first chartX position in the dragging operation. + */ + pan: function (chartX) { + var chart = this; + + var xAxis = chart.xAxis[0], + mouseDownX = chart.mouseDownX, + halfPointRange = xAxis.pointRange / 2, + extremes = xAxis.getExtremes(), + newMin = xAxis.translate(mouseDownX - chartX, true) + halfPointRange, + newMax = xAxis.translate(mouseDownX + chart.plotWidth - chartX, true) - halfPointRange, + hoverPoints = chart.hoverPoints; + + // remove active points for shared tooltip + if (hoverPoints) { + each(hoverPoints, function (point) { + point.setState(); + }); + } + + if (xAxis.series.length && newMin > mathMin(extremes.dataMin, extremes.min) && newMax < mathMax(extremes.dataMax, extremes.max)) { + xAxis.setExtremes(newMin, newMax, true, false, { trigger: 'pan' }); + } + + chart.mouseDownX = chartX; // set new reference for next run + css(chart.container, { cursor: 'move' }); + }, + + /** + * Show the title and subtitle of the chart + * + * @param titleOptions {Object} New title options + * @param subtitleOptions {Object} New subtitle options + * + */ + setTitle: function (titleOptions, subtitleOptions) { + var chart = this, + options = chart.options, + chartTitleOptions, + chartSubtitleOptions; + + chart.chartTitleOptions = chartTitleOptions = merge(options.title, titleOptions); + chart.chartSubtitleOptions = chartSubtitleOptions = merge(options.subtitle, subtitleOptions); + + // add title and subtitle + each([ + ['title', titleOptions, chartTitleOptions], + ['subtitle', subtitleOptions, chartSubtitleOptions] + ], function (arr) { + var name = arr[0], + title = chart[name], + titleOptions = arr[1], + chartTitleOptions = arr[2]; + + if (title && titleOptions) { + chart[name] = title = title.destroy(); // remove old + } + + if (chartTitleOptions && chartTitleOptions.text && !title) { + chart[name] = chart.renderer.text( + chartTitleOptions.text, + 0, + 0, + chartTitleOptions.useHTML + ) + .attr({ + align: chartTitleOptions.align, + 'class': PREFIX + name, + zIndex: chartTitleOptions.zIndex || 4 + }) + .css(chartTitleOptions.style) + .add() + .align(chartTitleOptions, false, chart.spacingBox); + } + }); + + }, + + /** + * Get chart width and height according to options and container size + */ + getChartSize: function () { + var chart = this, + optionsChart = chart.options.chart, + renderTo = chart.renderToClone || chart.renderTo; + + // get inner width and height from jQuery (#824) + chart.containerWidth = adapterRun(renderTo, 'width'); + chart.containerHeight = adapterRun(renderTo, 'height'); + + chart.chartWidth = mathMax(0, pick(optionsChart.width, chart.containerWidth, 600)); + chart.chartHeight = mathMax(0, pick(optionsChart.height, + // the offsetHeight of an empty container is 0 in standard browsers, but 19 in IE7: + chart.containerHeight > 19 ? chart.containerHeight : 400)); + }, + + /** + * Create a clone of the chart's renderTo div and place it outside the viewport to allow + * size computation on chart.render and chart.redraw + */ + cloneRenderTo: function (revert) { + var clone = this.renderToClone, + container = this.container; + + // Destroy the clone and bring the container back to the real renderTo div + if (revert) { + if (clone) { + this.renderTo.appendChild(container); + discardElement(clone); + delete this.renderToClone; + } + + // Set up the clone + } else { + if (container) { + this.renderTo.removeChild(container); // do not clone this + } + this.renderToClone = clone = this.renderTo.cloneNode(0); + css(clone, { + position: ABSOLUTE, + top: '-9999px', + display: 'block' // #833 + }); + doc.body.appendChild(clone); + if (container) { + clone.appendChild(container); + } + } + }, + + /** + * Get the containing element, determine the size and create the inner container + * div to hold the chart + */ + getContainer: function () { + var chart = this, + container, + optionsChart = chart.options.chart, + chartWidth, + chartHeight, + renderTo, + indexAttrName = 'data-highcharts-chart', + oldChartIndex, + containerId; + + chart.renderTo = renderTo = optionsChart.renderTo; + containerId = PREFIX + idCounter++; + + if (isString(renderTo)) { + chart.renderTo = renderTo = doc.getElementById(renderTo); + } + + // Display an error if the renderTo is wrong + if (!renderTo) { + error(13, true); + } + + // If the container already holds a chart, destroy it + oldChartIndex = pInt(attr(renderTo, indexAttrName)); + if (!isNaN(oldChartIndex) && charts[oldChartIndex]) { + charts[oldChartIndex].destroy(); + } + + // Make a reference to the chart from the div + attr(renderTo, indexAttrName, chart.index); + + // remove previous chart + renderTo.innerHTML = ''; + + // If the container doesn't have an offsetWidth, it has or is a child of a node + // that has display:none. We need to temporarily move it out to a visible + // state to determine the size, else the legend and tooltips won't render + // properly + if (!renderTo.offsetWidth) { + chart.cloneRenderTo(); + } + + // get the width and height + chart.getChartSize(); + chartWidth = chart.chartWidth; + chartHeight = chart.chartHeight; + + // create the inner container + chart.container = container = createElement(DIV, { + className: PREFIX + 'container' + + (optionsChart.className ? ' ' + optionsChart.className : ''), + id: containerId + }, extend({ + position: RELATIVE, + overflow: HIDDEN, // needed for context menu (avoid scrollbars) and + // content overflow in IE + width: chartWidth + PX, + height: chartHeight + PX, + textAlign: 'left', + lineHeight: 'normal', // #427 + zIndex: 0 // #1072 + }, optionsChart.style), + chart.renderToClone || renderTo + ); + + chart.renderer = + optionsChart.forExport ? // force SVG, used for SVG export + new SVGRenderer(container, chartWidth, chartHeight, true) : + new Renderer(container, chartWidth, chartHeight); + + if (useCanVG) { + // If we need canvg library, extend and configure the renderer + // to get the tracker for translating mouse events + chart.renderer.create(chart, container, chartWidth, chartHeight); + } + }, + + /** + * Calculate margins by rendering axis labels in a preliminary position. Title, + * subtitle and legend have already been rendered at this stage, but will be + * moved into their final positions + */ + getMargins: function () { + var chart = this, + optionsChart = chart.options.chart, + spacingTop = optionsChart.spacingTop, + spacingRight = optionsChart.spacingRight, + spacingBottom = optionsChart.spacingBottom, + spacingLeft = optionsChart.spacingLeft, + axisOffset, + legend = chart.legend, + optionsMarginTop = chart.optionsMarginTop, + optionsMarginLeft = chart.optionsMarginLeft, + optionsMarginRight = chart.optionsMarginRight, + optionsMarginBottom = chart.optionsMarginBottom, + chartTitleOptions = chart.chartTitleOptions, + chartSubtitleOptions = chart.chartSubtitleOptions, + legendOptions = chart.options.legend, + legendMargin = pick(legendOptions.margin, 10), + legendX = legendOptions.x, + legendY = legendOptions.y, + align = legendOptions.align, + verticalAlign = legendOptions.verticalAlign, + titleOffset; + + chart.resetMargins(); + axisOffset = chart.axisOffset; + + // adjust for title and subtitle + if ((chart.title || chart.subtitle) && !defined(chart.optionsMarginTop)) { + titleOffset = mathMax( + (chart.title && !chartTitleOptions.floating && !chartTitleOptions.verticalAlign && chartTitleOptions.y) || 0, + (chart.subtitle && !chartSubtitleOptions.floating && !chartSubtitleOptions.verticalAlign && chartSubtitleOptions.y) || 0 + ); + if (titleOffset) { + chart.plotTop = mathMax(chart.plotTop, titleOffset + pick(chartTitleOptions.margin, 15) + spacingTop); + } + } + // adjust for legend + if (legend.display && !legendOptions.floating) { + if (align === 'right') { // horizontal alignment handled first + if (!defined(optionsMarginRight)) { + chart.marginRight = mathMax( + chart.marginRight, + legend.legendWidth - legendX + legendMargin + spacingRight + ); + } + } else if (align === 'left') { + if (!defined(optionsMarginLeft)) { + chart.plotLeft = mathMax( + chart.plotLeft, + legend.legendWidth + legendX + legendMargin + spacingLeft + ); + } + + } else if (verticalAlign === 'top') { + if (!defined(optionsMarginTop)) { + chart.plotTop = mathMax( + chart.plotTop, + legend.legendHeight + legendY + legendMargin + spacingTop + ); + } + + } else if (verticalAlign === 'bottom') { + if (!defined(optionsMarginBottom)) { + chart.marginBottom = mathMax( + chart.marginBottom, + legend.legendHeight - legendY + legendMargin + spacingBottom + ); + } + } + } + + // adjust for scroller + if (chart.extraBottomMargin) { + chart.marginBottom += chart.extraBottomMargin; + } + if (chart.extraTopMargin) { + chart.plotTop += chart.extraTopMargin; + } + + // pre-render axes to get labels offset width + if (chart.hasCartesianSeries) { + each(chart.axes, function (axis) { + axis.getOffset(); + }); + } + + if (!defined(optionsMarginLeft)) { + chart.plotLeft += axisOffset[3]; + } + if (!defined(optionsMarginTop)) { + chart.plotTop += axisOffset[0]; + } + if (!defined(optionsMarginBottom)) { + chart.marginBottom += axisOffset[2]; + } + if (!defined(optionsMarginRight)) { + chart.marginRight += axisOffset[1]; + } + + chart.setChartSize(); + + }, + + /** + * Add the event handlers necessary for auto resizing + * + */ + initReflow: function () { + var chart = this, + optionsChart = chart.options.chart, + renderTo = chart.renderTo, + reflowTimeout; + + function reflow(e) { + var width = optionsChart.width || adapterRun(renderTo, 'width'), + height = optionsChart.height || adapterRun(renderTo, 'height'), + target = e ? e.target : win; // #805 - MooTools doesn't supply e + + // Width and height checks for display:none. Target is doc in IE8 and Opera, + // win in Firefox, Chrome and IE9. + if (!chart.hasUserSize && width && height && (target === win || target === doc)) { + + if (width !== chart.containerWidth || height !== chart.containerHeight) { + clearTimeout(reflowTimeout); + chart.reflowTimeout = reflowTimeout = setTimeout(function () { + if (chart.container) { // It may have been destroyed in the meantime (#1257) + chart.setSize(width, height, false); + chart.hasUserSize = null; + } + }, 100); + } + chart.containerWidth = width; + chart.containerHeight = height; + } + } + addEvent(win, 'resize', reflow); + addEvent(chart, 'destroy', function () { + removeEvent(win, 'resize', reflow); + }); + }, + + /** + * Resize the chart to a given width and height + * @param {Number} width + * @param {Number} height + * @param {Object|Boolean} animation + */ + setSize: function (width, height, animation) { + var chart = this, + chartWidth, + chartHeight, + spacingBox, + resetZoomButton = chart.resetZoomButton, + chartTitle = chart.title, + chartSubtitle = chart.subtitle, + fireEndResize; + + // Handle the isResizing counter + chart.isResizing += 1; + fireEndResize = function () { + if (chart) { + fireEvent(chart, 'endResize', null, function () { + chart.isResizing -= 1; + }); + } + }; + + // set the animation for the current process + setAnimation(animation, chart); + + chart.oldChartHeight = chart.chartHeight; + chart.oldChartWidth = chart.chartWidth; + if (defined(width)) { + chart.chartWidth = chartWidth = mathMax(0, mathRound(width)); + chart.hasUserSize = !!chartWidth; + } + if (defined(height)) { + chart.chartHeight = chartHeight = mathMax(0, mathRound(height)); + } + + css(chart.container, { + width: chartWidth + PX, + height: chartHeight + PX + }); + chart.renderer.setSize(chartWidth, chartHeight, animation); + + // update axis lengths for more correct tick intervals: + chart.plotWidth = chartWidth - chart.plotLeft - chart.marginRight; + chart.plotHeight = chartHeight - chart.plotTop - chart.marginBottom; + + // handle axes + chart.maxTicks = null; + each(chart.axes, function (axis) { + axis.isDirty = true; + axis.setScale(); + }); + + // make sure non-cartesian series are also handled + each(chart.series, function (serie) { + serie.isDirty = true; + }); + + chart.isDirtyLegend = true; // force legend redraw + chart.isDirtyBox = true; // force redraw of plot and chart border + + chart.getMargins(); + + // move titles + spacingBox = chart.spacingBox; + if (chartTitle) { + chartTitle.align(null, null, spacingBox); + } + if (chartSubtitle) { + chartSubtitle.align(null, null, spacingBox); + } + + // Move resize button (#1115) + if (resetZoomButton && resetZoomButton.align) { + resetZoomButton.align(null, null, chart[resetZoomButton.alignTo]); + } + + chart.redraw(animation); + + + chart.oldChartHeight = null; + fireEvent(chart, 'resize'); + + // fire endResize and set isResizing back + // If animation is disabled, fire without delay + if (globalAnimation === false) { + fireEndResize(); + } else { // else set a timeout with the animation duration + setTimeout(fireEndResize, (globalAnimation && globalAnimation.duration) || 500); + } + }, + + /** + * Set the public chart properties. This is done before and after the pre-render + * to determine margin sizes + */ + setChartSize: function () { + var chart = this, + inverted = chart.inverted, + chartWidth = chart.chartWidth, + chartHeight = chart.chartHeight, + optionsChart = chart.options.chart, + spacingTop = optionsChart.spacingTop, + spacingRight = optionsChart.spacingRight, + spacingBottom = optionsChart.spacingBottom, + spacingLeft = optionsChart.spacingLeft, + plotLeft, + plotTop, + plotWidth, + plotHeight, + plotBorderWidth; + + chart.plotLeft = plotLeft = mathRound(chart.plotLeft); + chart.plotTop = plotTop = mathRound(chart.plotTop); + chart.plotWidth = plotWidth = mathMax(0, mathRound(chartWidth - plotLeft - chart.marginRight)); + chart.plotHeight = plotHeight = mathMax(0, mathRound(chartHeight - plotTop - chart.marginBottom)); + + chart.plotSizeX = inverted ? plotHeight : plotWidth; + chart.plotSizeY = inverted ? plotWidth : plotHeight; + + chart.plotBorderWidth = plotBorderWidth = optionsChart.plotBorderWidth || 0; + + // Set boxes used for alignment + chart.spacingBox = { + x: spacingLeft, + y: spacingTop, + width: chartWidth - spacingLeft - spacingRight, + height: chartHeight - spacingTop - spacingBottom + }; + chart.plotBox = { + x: plotLeft, + y: plotTop, + width: plotWidth, + height: plotHeight + }; + chart.clipBox = { + x: plotBorderWidth / 2, + y: plotBorderWidth / 2, + width: chart.plotSizeX - plotBorderWidth, + height: chart.plotSizeY - plotBorderWidth + }; + + each(chart.axes, function (axis) { + axis.setAxisSize(); + axis.setAxisTranslation(); + }); + }, + + /** + * Initial margins before auto size margins are applied + */ + resetMargins: function () { + var chart = this, + optionsChart = chart.options.chart, + spacingTop = optionsChart.spacingTop, + spacingRight = optionsChart.spacingRight, + spacingBottom = optionsChart.spacingBottom, + spacingLeft = optionsChart.spacingLeft; + + chart.plotTop = pick(chart.optionsMarginTop, spacingTop); + chart.marginRight = pick(chart.optionsMarginRight, spacingRight); + chart.marginBottom = pick(chart.optionsMarginBottom, spacingBottom); + chart.plotLeft = pick(chart.optionsMarginLeft, spacingLeft); + chart.axisOffset = [0, 0, 0, 0]; // top, right, bottom, left + }, + + /** + * Draw the borders and backgrounds for chart and plot area + */ + drawChartBox: function () { + var chart = this, + optionsChart = chart.options.chart, + renderer = chart.renderer, + chartWidth = chart.chartWidth, + chartHeight = chart.chartHeight, + chartBackground = chart.chartBackground, + plotBackground = chart.plotBackground, + plotBorder = chart.plotBorder, + plotBGImage = chart.plotBGImage, + chartBorderWidth = optionsChart.borderWidth || 0, + chartBackgroundColor = optionsChart.backgroundColor, + plotBackgroundColor = optionsChart.plotBackgroundColor, + plotBackgroundImage = optionsChart.plotBackgroundImage, + plotBorderWidth = optionsChart.plotBorderWidth || 0, + mgn, + bgAttr, + plotLeft = chart.plotLeft, + plotTop = chart.plotTop, + plotWidth = chart.plotWidth, + plotHeight = chart.plotHeight, + plotBox = chart.plotBox, + clipRect = chart.clipRect, + clipBox = chart.clipBox; + + // Chart area + mgn = chartBorderWidth + (optionsChart.shadow ? 8 : 0); + + if (chartBorderWidth || chartBackgroundColor) { + if (!chartBackground) { + + bgAttr = { + fill: chartBackgroundColor || NONE + }; + if (chartBorderWidth) { // #980 + bgAttr.stroke = optionsChart.borderColor; + bgAttr['stroke-width'] = chartBorderWidth; + } + chart.chartBackground = renderer.rect(mgn / 2, mgn / 2, chartWidth - mgn, chartHeight - mgn, + optionsChart.borderRadius, chartBorderWidth) + .attr(bgAttr) + .add() + .shadow(optionsChart.shadow); + + } else { // resize + chartBackground.animate( + chartBackground.crisp(null, null, null, chartWidth - mgn, chartHeight - mgn) + ); + } + } + + + // Plot background + if (plotBackgroundColor) { + if (!plotBackground) { + chart.plotBackground = renderer.rect(plotLeft, plotTop, plotWidth, plotHeight, 0) + .attr({ + fill: plotBackgroundColor + }) + .add() + .shadow(optionsChart.plotShadow); + } else { + plotBackground.animate(plotBox); + } + } + if (plotBackgroundImage) { + if (!plotBGImage) { + chart.plotBGImage = renderer.image(plotBackgroundImage, plotLeft, plotTop, plotWidth, plotHeight) + .add(); + } else { + plotBGImage.animate(plotBox); + } + } + + // Plot clip + if (!clipRect) { + chart.clipRect = renderer.clipRect(clipBox); + } else { + clipRect.animate({ + width: clipBox.width, + height: clipBox.height + }); + } + + // Plot area border + if (plotBorderWidth) { + if (!plotBorder) { + chart.plotBorder = renderer.rect(plotLeft, plotTop, plotWidth, plotHeight, 0, plotBorderWidth) + .attr({ + stroke: optionsChart.plotBorderColor, + 'stroke-width': plotBorderWidth, + zIndex: 1 + }) + .add(); + } else { + plotBorder.animate( + plotBorder.crisp(null, plotLeft, plotTop, plotWidth, plotHeight) + ); + } + } + + // reset + chart.isDirtyBox = false; + }, + + /** + * Detect whether a certain chart property is needed based on inspecting its options + * and series. This mainly applies to the chart.invert property, and in extensions to + * the chart.angular and chart.polar properties. + */ + propFromSeries: function () { + var chart = this, + optionsChart = chart.options.chart, + klass, + seriesOptions = chart.options.series, + i, + value; + + + each(['inverted', 'angular', 'polar'], function (key) { + + // The default series type's class + klass = seriesTypes[optionsChart.type || optionsChart.defaultSeriesType]; + + // Get the value from available chart-wide properties + value = ( + chart[key] || // 1. it is set before + optionsChart[key] || // 2. it is set in the options + (klass && klass.prototype[key]) // 3. it's default series class requires it + ); + + // 4. Check if any the chart's series require it + i = seriesOptions && seriesOptions.length; + while (!value && i--) { + klass = seriesTypes[seriesOptions[i].type]; + if (klass && klass.prototype[key]) { + value = true; + } + } + + // Set the chart property + chart[key] = value; + }); + + }, + + /** + * Render all graphics for the chart + */ + render: function () { + var chart = this, + axes = chart.axes, + renderer = chart.renderer, + options = chart.options; + + var labels = options.labels, + credits = options.credits, + creditsHref; + + // Title + chart.setTitle(); + + + // Legend + chart.legend = new Legend(chart); + + // Get margins by pre-rendering axes + // set axes scales + each(axes, function (axis) { + axis.setScale(); + }); + chart.getMargins(); + + chart.maxTicks = null; // reset for second pass + each(axes, function (axis) { + axis.setTickPositions(true); // update to reflect the new margins + axis.setMaxTicks(); + }); + chart.adjustTickAmounts(); + chart.getMargins(); // second pass to check for new labels + + + // Draw the borders and backgrounds + chart.drawChartBox(); + + + // Axes + if (chart.hasCartesianSeries) { + each(axes, function (axis) { + axis.render(); + }); + } + + // The series + if (!chart.seriesGroup) { + chart.seriesGroup = renderer.g('series-group') + .attr({ zIndex: 3 }) + .add(); + } + each(chart.series, function (serie) { + serie.translate(); + serie.setTooltipPoints(); + serie.render(); + }); + + // Labels + if (labels.items) { + each(labels.items, function (label) { + var style = extend(labels.style, label.style), + x = pInt(style.left) + chart.plotLeft, + y = pInt(style.top) + chart.plotTop + 12; + + // delete to prevent rewriting in IE + delete style.left; + delete style.top; + + renderer.text( + label.html, + x, + y + ) + .attr({ zIndex: 2 }) + .css(style) + .add(); + + }); + } + + // Credits + if (credits.enabled && !chart.credits) { + creditsHref = credits.href; + chart.credits = renderer.text( + credits.text, + 0, + 0 + ) + .on('click', function () { + if (creditsHref) { + location.href = creditsHref; + } + }) + .attr({ + align: credits.position.align, + zIndex: 8 + }) + .css(credits.style) + .add() + .align(credits.position); + } + + // Set flag + chart.hasRendered = true; + + }, + + /** + * Clean up memory usage + */ + destroy: function () { + var chart = this, + axes = chart.axes, + series = chart.series, + container = chart.container, + i, + parentNode = container && container.parentNode; + + // fire the chart.destoy event + fireEvent(chart, 'destroy'); + + // Delete the chart from charts lookup array + charts[chart.index] = UNDEFINED; + chart.renderTo.removeAttribute('data-highcharts-chart'); + + // remove events + removeEvent(chart); + + // ==== Destroy collections: + // Destroy axes + i = axes.length; + while (i--) { + axes[i] = axes[i].destroy(); + } + + // Destroy each series + i = series.length; + while (i--) { + series[i] = series[i].destroy(); + } + + // ==== Destroy chart properties: + each(['title', 'subtitle', 'chartBackground', 'plotBackground', 'plotBGImage', + 'plotBorder', 'seriesGroup', 'clipRect', 'credits', 'tracker', 'scroller', + 'rangeSelector', 'legend', 'resetZoomButton', 'tooltip', 'renderer'], function (name) { + var prop = chart[name]; + + if (prop && prop.destroy) { + chart[name] = prop.destroy(); + } + }); + + // remove container and all SVG + if (container) { // can break in IE when destroyed before finished loading + container.innerHTML = ''; + removeEvent(container); + if (parentNode) { + discardElement(container); + } + + } + + // clean it all up + for (i in chart) { + delete chart[i]; + } + + }, + + + /** + * VML namespaces can't be added until after complete. Listening + * for Perini's doScroll hack is not enough. + */ + isReadyToRender: function () { + var chart = this; + + // Note: in spite of JSLint's complaints, win == win.top is required + /*jslint eqeq: true*/ + if ((!hasSVG && (win == win.top && doc.readyState !== 'complete')) || (useCanVG && !win.canvg)) { + /*jslint eqeq: false*/ + if (useCanVG) { + // Delay rendering until canvg library is downloaded and ready + CanVGController.push(function () { chart.firstRender(); }, chart.options.global.canvasToolsURL); + } else { + doc.attachEvent('onreadystatechange', function () { + doc.detachEvent('onreadystatechange', chart.firstRender); + if (doc.readyState === 'complete') { + chart.firstRender(); + } + }); + } + return false; + } + return true; + }, + + /** + * Prepare for first rendering after all data are loaded + */ + firstRender: function () { + var chart = this, + options = chart.options, + callback = chart.callback; + + // Check whether the chart is ready to render + if (!chart.isReadyToRender()) { + return; + } + + // Create the container + chart.getContainer(); + + // Run an early event after the container and renderer are established + fireEvent(chart, 'init'); + + // Initialize range selector for stock charts + if (Highcharts.RangeSelector && options.rangeSelector.enabled) { + chart.rangeSelector = new Highcharts.RangeSelector(chart); + } + + chart.resetMargins(); + chart.setChartSize(); + + // Set the common chart properties (mainly invert) from the given series + chart.propFromSeries(); + + // get axes + chart.getAxes(); + + // Initialize the series + each(options.series || [], function (serieOptions) { + chart.initSeries(serieOptions); + }); + + // Run an event where series and axes can be added + //fireEvent(chart, 'beforeRender'); + + // Initialize scroller for stock charts + if (Highcharts.Scroller && (options.navigator.enabled || options.scrollbar.enabled)) { + chart.scroller = new Highcharts.Scroller(chart); + } + + // depends on inverted and on margins being set + chart.tracker = new MouseTracker(chart, options); + + chart.render(); + + // add canvas + chart.renderer.draw(); + // run callbacks + if (callback) { + callback.apply(chart, [chart]); + } + each(chart.callbacks, function (fn) { + fn.apply(chart, [chart]); + }); + + + // If the chart was rendered outside the top container, put it back in + chart.cloneRenderTo(true); + + fireEvent(chart, 'load'); + + } +}; // end Chart + +// Hook for exporting module +Chart.prototype.callbacks = []; +/** + * The Point object and prototype. Inheritable and used as base for PiePoint + */ +var Point = function () {}; +Point.prototype = { + + /** + * Initialize the point + * @param {Object} series The series object containing this point + * @param {Object} options The data in either number, array or object format + */ + init: function (series, options, x) { + var point = this, + counters = series.chart.counters, + defaultColors; + point.series = series; + point.applyOptions(options, x); + point.pointAttr = {}; + + if (series.options.colorByPoint) { + defaultColors = series.chart.options.colors; + point.color = point.color || defaultColors[counters.color++]; + // loop back to zero + counters.wrapColor(defaultColors.length); + } + + series.chart.pointCount++; + return point; + }, + /** + * Apply the options containing the x and y data and possible some extra properties. + * This is called on point init or from point.update. + * + * @param {Object} options + */ + applyOptions: function (options, x) { + var point = this, + series = point.series, + optionsType = typeof options; + + point.config = options; + + // onedimensional array input + if (optionsType === 'number' || options === null) { + point.y = options; + } else if (typeof options[0] === 'number') { // two-dimentional array + point.x = options[0]; + point.y = options[1]; + } else if (optionsType === 'object' && typeof options.length !== 'number') { // object input + // copy options directly to point + extend(point, options); + point.options = options; + + // This is the fastest way to detect if there are individual point dataLabels that need + // to be considered in drawDataLabels. These can only occur in object configs. + if (options.dataLabels) { + series._hasPointLabels = true; + } + + // Same approach as above for markers + if (options.marker) { + series._hasPointMarkers = true; + } + } else if (typeof options[0] === 'string') { // categorized data with name in first position + point.name = options[0]; + point.y = options[1]; + } + + /* + * If no x is set by now, get auto incremented value. All points must have an + * x value, however the y value can be null to create a gap in the series + */ + // todo: skip this? It is only used in applyOptions, in translate it should not be used + if (point.x === UNDEFINED) { + point.x = x === UNDEFINED ? series.autoIncrement() : x; + } + + }, + + /** + * Destroy a point to clear memory. Its reference still stays in series.data. + */ + destroy: function () { + var point = this, + series = point.series, + chart = series.chart, + hoverPoints = chart.hoverPoints, + prop; + + chart.pointCount--; + + if (hoverPoints) { + point.setState(); + erase(hoverPoints, point); + if (!hoverPoints.length) { + chart.hoverPoints = null; + } + + } + if (point === chart.hoverPoint) { + point.onMouseOut(); + } + + // remove all events + if (point.graphic || point.dataLabel) { // removeEvent and destroyElements are performance expensive + removeEvent(point); + point.destroyElements(); + } + + if (point.legendItem) { // pies have legend items + chart.legend.destroyItem(point); + } + + for (prop in point) { + point[prop] = null; + } + + + }, + + /** + * Destroy SVG elements associated with the point + */ + destroyElements: function () { + var point = this, + props = ['graphic', 'tracker', 'dataLabel', 'dataLabelUpper', 'group', 'connector', 'shadowGroup'], + prop, + i = 6; + while (i--) { + prop = props[i]; + if (point[prop]) { + point[prop] = point[prop].destroy(); + } + } + }, + + /** + * Return the configuration hash needed for the data label and tooltip formatters + */ + getLabelConfig: function () { + var point = this; + return { + x: point.category, + y: point.y, + key: point.name || point.category, + series: point.series, + point: point, + percentage: point.percentage, + total: point.total || point.stackTotal + }; + }, + + /** + * Toggle the selection status of a point + * @param {Boolean} selected Whether to select or unselect the point. + * @param {Boolean} accumulate Whether to add to the previous selection. By default, + * this happens if the control key (Cmd on Mac) was pressed during clicking. + */ + select: function (selected, accumulate) { + var point = this, + series = point.series, + chart = series.chart; + + selected = pick(selected, !point.selected); + + // fire the event with the defalut handler + point.firePointEvent(selected ? 'select' : 'unselect', { accumulate: accumulate }, function () { + point.selected = selected; + point.setState(selected && SELECT_STATE); + + // unselect all other points unless Ctrl or Cmd + click + if (!accumulate) { + each(chart.getSelectedPoints(), function (loopPoint) { + if (loopPoint.selected && loopPoint !== point) { + loopPoint.selected = false; + loopPoint.setState(NORMAL_STATE); + loopPoint.firePointEvent('unselect'); + } + }); + } + }); + }, + + onMouseOver: function () { + var point = this, + series = point.series, + chart = series.chart, + tooltip = chart.tooltip, + hoverPoint = chart.hoverPoint; + + // set normal state to previous series + if (hoverPoint && hoverPoint !== point) { + hoverPoint.onMouseOut(); + } + + // trigger the event + point.firePointEvent('mouseOver'); + + // update the tooltip + if (tooltip && (!tooltip.shared || series.noSharedTooltip)) { + tooltip.refresh(point); + } + + // hover this + point.setState(HOVER_STATE); + chart.hoverPoint = point; + }, + + onMouseOut: function () { + var chart = this.series.chart, + hoverPoints = chart.hoverPoints; + + if (!hoverPoints || inArray(this, hoverPoints) === -1) { // #887 + this.firePointEvent('mouseOut'); + + this.setState(); + chart.hoverPoint = null; + } + }, + + /** + * Extendable method for formatting each point's tooltip line + * + * @return {String} A string to be concatenated in to the common tooltip text + */ + tooltipFormatter: function (pointFormat) { + var point = this, + series = point.series, + seriesTooltipOptions = series.tooltipOptions, + match = pointFormat.match(/\{(series|point)\.[a-zA-Z]+\}/g), + splitter = /[{\.}]/, + obj, + key, + replacement, + repOptionKey, + parts, + prop, + i, + cfg = { + y: 0, // 0: use 'value' for repOptionKey + open: 0, + high: 0, + low: 0, + close: 0, + percentage: 1, // 1: use the self name for repOptionKey + total: 1 + }; + + // Backwards compatibility to y naming in early Highstock + seriesTooltipOptions.valuePrefix = seriesTooltipOptions.valuePrefix || seriesTooltipOptions.yPrefix; + seriesTooltipOptions.valueDecimals = pick(seriesTooltipOptions.valueDecimals, seriesTooltipOptions.yDecimals); // #1248 + seriesTooltipOptions.valueSuffix = seriesTooltipOptions.valueSuffix || seriesTooltipOptions.ySuffix; + + // loop over the variables defined on the form {series.name}, {point.y} etc + for (i in match) { + key = match[i]; + if (isString(key) && key !== pointFormat) { // IE matches more than just the variables + + // Split it further into parts + parts = (' ' + key).split(splitter); // add empty string because IE and the rest handles it differently + obj = { 'point': point, 'series': series }[parts[1]]; + prop = parts[2]; + + // Add some preformatting + if (obj === point && cfg.hasOwnProperty(prop)) { + repOptionKey = cfg[prop] ? prop : 'value'; + replacement = (seriesTooltipOptions[repOptionKey + 'Prefix'] || '') + + numberFormat(point[prop], pick(seriesTooltipOptions[repOptionKey + 'Decimals'], -1)) + + (seriesTooltipOptions[repOptionKey + 'Suffix'] || ''); + + // Automatic replacement + } else { + replacement = obj[prop]; + } + + pointFormat = pointFormat.replace(key, replacement); + } + } + + return pointFormat; + }, + + /** + * Update the point with new options (typically x/y data) and optionally redraw the series. + * + * @param {Object} options Point options as defined in the series.data array + * @param {Boolean} redraw Whether to redraw the chart or wait for an explicit call + * @param {Boolean|Object} animation Whether to apply animation, and optionally animation + * configuration + * + */ + update: function (options, redraw, animation) { + var point = this, + series = point.series, + graphic = point.graphic, + i, + data = series.data, + dataLength = data.length, + chart = series.chart; + + redraw = pick(redraw, true); + + // fire the event with a default handler of doing the update + point.firePointEvent('update', { options: options }, function () { + + point.applyOptions(options); + + // update visuals + if (isObject(options)) { + series.getAttribs(); + if (graphic) { + graphic.attr(point.pointAttr[series.state]); + } + } + + // record changes in the parallel arrays + for (i = 0; i < dataLength; i++) { + if (data[i] === point) { + series.xData[i] = point.x; + series.yData[i] = point.toYData ? point.toYData() : point.y; + series.options.data[i] = options; + break; + } + } + + // redraw + series.isDirty = true; + series.isDirtyData = true; + if (redraw) { + chart.redraw(animation); + } + }); + }, + + /** + * Remove a point and optionally redraw the series and if necessary the axes + * @param {Boolean} redraw Whether to redraw the chart or wait for an explicit call + * @param {Boolean|Object} animation Whether to apply animation, and optionally animation + * configuration + */ + remove: function (redraw, animation) { + var point = this, + series = point.series, + chart = series.chart, + i, + data = series.data, + dataLength = data.length; + + setAnimation(animation, chart); + redraw = pick(redraw, true); + + // fire the event with a default handler of removing the point + point.firePointEvent('remove', null, function () { + + //erase(series.data, point); + + for (i = 0; i < dataLength; i++) { + if (data[i] === point) { + + // splice all the parallel arrays + data.splice(i, 1); + series.options.data.splice(i, 1); + series.xData.splice(i, 1); + series.yData.splice(i, 1); + break; + } + } + + point.destroy(); + + + // redraw + series.isDirty = true; + series.isDirtyData = true; + if (redraw) { + chart.redraw(); + } + }); + + + }, + + /** + * Fire an event on the Point object. Must not be renamed to fireEvent, as this + * causes a name clash in MooTools + * @param {String} eventType + * @param {Object} eventArgs Additional event arguments + * @param {Function} defaultFunction Default event handler + */ + firePointEvent: function (eventType, eventArgs, defaultFunction) { + var point = this, + series = this.series, + seriesOptions = series.options; + + // load event handlers on demand to save time on mouseover/out + if (seriesOptions.point.events[eventType] || (point.options && point.options.events && point.options.events[eventType])) { + this.importEvents(); + } + + // add default handler if in selection mode + if (eventType === 'click' && seriesOptions.allowPointSelect) { + defaultFunction = function (event) { + // Control key is for Windows, meta (= Cmd key) for Mac, Shift for Opera + point.select(null, event.ctrlKey || event.metaKey || event.shiftKey); + }; + } + + fireEvent(this, eventType, eventArgs, defaultFunction); + }, + /** + * Import events from the series' and point's options. Only do it on + * demand, to save processing time on hovering. + */ + importEvents: function () { + if (!this.hasImportedEvents) { + var point = this, + options = merge(point.series.options.point, point.options), + events = options.events, + eventType; + + point.events = events; + + for (eventType in events) { + addEvent(point, eventType, events[eventType]); + } + this.hasImportedEvents = true; + + } + }, + + /** + * Set the point's state + * @param {String} state + */ + setState: function (state) { + var point = this, + plotX = point.plotX, + plotY = point.plotY, + series = point.series, + stateOptions = series.options.states, + markerOptions = defaultPlotOptions[series.type].marker && series.options.marker, + normalDisabled = markerOptions && !markerOptions.enabled, + markerStateOptions = markerOptions && markerOptions.states[state], + stateDisabled = markerStateOptions && markerStateOptions.enabled === false, + stateMarkerGraphic = series.stateMarkerGraphic, + chart = series.chart, + radius, + pointAttr = point.pointAttr; + + state = state || NORMAL_STATE; // empty string + + if ( + // already has this state + state === point.state || + // selected points don't respond to hover + (point.selected && state !== SELECT_STATE) || + // series' state options is disabled + (stateOptions[state] && stateOptions[state].enabled === false) || + // point marker's state options is disabled + (state && (stateDisabled || (normalDisabled && !markerStateOptions.enabled))) + + ) { + return; + } + + // apply hover styles to the existing point + if (point.graphic) { + radius = markerOptions && point.graphic.symbolName && pointAttr[state].r; + point.graphic.attr(merge( + pointAttr[state], + radius ? { // new symbol attributes (#507, #612) + x: plotX - radius, + y: plotY - radius, + width: 2 * radius, + height: 2 * radius + } : {} + )); + } else { + // if a graphic is not applied to each point in the normal state, create a shared + // graphic for the hover state + if (state && markerStateOptions) { + radius = markerStateOptions.radius; + if (!stateMarkerGraphic) { // add + series.stateMarkerGraphic = stateMarkerGraphic = chart.renderer.symbol( + series.symbol, + plotX - radius, + plotY - radius, + 2 * radius, + 2 * radius + ) + .attr(pointAttr[state]) + .add(series.markerGroup); + + } else { // update + stateMarkerGraphic.attr({ // #1054 + x: plotX - radius, + y: plotY - radius + }); + } + } + + if (stateMarkerGraphic) { + stateMarkerGraphic[state && chart.isInsidePlot(plotX, plotY) ? 'show' : 'hide'](); + } + } + + point.state = state; + } +}; + +/** + * @classDescription The base function which all other series types inherit from. The data in the series is stored + * in various arrays. + * + * - First, series.options.data contains all the original config options for + * each point whether added by options or methods like series.addPoint. + * - Next, series.data contains those values converted to points, but in case the series data length + * exceeds the cropThreshold, or if the data is grouped, series.data doesn't contain all the points. It + * only contains the points that have been created on demand. + * - Then there's series.points that contains all currently visible point objects. In case of cropping, + * the cropped-away points are not part of this array. The series.points array starts at series.cropStart + * compared to series.data and series.options.data. If however the series data is grouped, these can't + * be correlated one to one. + * - series.xData and series.processedXData contain clean x values, equivalent to series.data and series.points. + * - series.yData and series.processedYData contain clean x values, equivalent to series.data and series.points. + * + * @param {Object} chart + * @param {Object} options + */ +var Series = function () {}; + +Series.prototype = { + + isCartesian: true, + type: 'line', + pointClass: Point, + sorted: true, // requires the data to be sorted + requireSorting: true, + pointAttrToOptions: { // mapping between SVG attributes and the corresponding options + stroke: 'lineColor', + 'stroke-width': 'lineWidth', + fill: 'fillColor', + r: 'radius' + }, + init: function (chart, options) { + var series = this, + eventType, + events; + + series.chart = chart; + series.options = options = series.setOptions(options); // merge with plotOptions + + // bind the axes + series.bindAxes(); + + // set some variables + extend(series, { + name: options.name, + state: NORMAL_STATE, + pointAttr: {}, + visible: options.visible !== false, // true by default + selected: options.selected === true // false by default + }); + + // special + if (useCanVG) { + options.animation = false; + } + + // register event listeners + events = options.events; + for (eventType in events) { + addEvent(series, eventType, events[eventType]); + } + if ( + (events && events.click) || + (options.point && options.point.events && options.point.events.click) || + options.allowPointSelect + ) { + chart.runTrackerClick = true; + } + + series.getColor(); + series.getSymbol(); + + // set the data + series.setData(options.data, false); + + // Mark cartesian + if (series.isCartesian) { + chart.hasCartesianSeries = true; + } + + // Register it in the chart + chart.series.push(series); + + // Sort series according to index option (#248, #1123) + stableSort(chart.series, function (a, b) { + return (a.options.index || 0) - (b.options.index || 0); + }); + each(chart.series, function (series, i) { + series.index = i; + series.name = series.name || 'Series ' + (i + 1); + }); + }, + + /** + * Set the xAxis and yAxis properties of cartesian series, and register the series + * in the axis.series array + */ + bindAxes: function () { + var series = this, + seriesOptions = series.options, + chart = series.chart, + axisOptions; + + if (series.isCartesian) { + + each(['xAxis', 'yAxis'], function (AXIS) { // repeat for xAxis and yAxis + + each(chart[AXIS], function (axis) { // loop through the chart's axis objects + + axisOptions = axis.options; + + // apply if the series xAxis or yAxis option mathches the number of the + // axis, or if undefined, use the first axis + if ((seriesOptions[AXIS] === axisOptions.index) || + (seriesOptions[AXIS] === UNDEFINED && axisOptions.index === 0)) { + + // register this series in the axis.series lookup + axis.series.push(series); + + // set this series.xAxis or series.yAxis reference + series[AXIS] = axis; + + // mark dirty for redraw + axis.isDirty = true; + } + }); + + }); + } + }, + + + /** + * Return an auto incremented x value based on the pointStart and pointInterval options. + * This is only used if an x value is not given for the point that calls autoIncrement. + */ + autoIncrement: function () { + var series = this, + options = series.options, + xIncrement = series.xIncrement; + + xIncrement = pick(xIncrement, options.pointStart, 0); + + series.pointInterval = pick(series.pointInterval, options.pointInterval, 1); + + series.xIncrement = xIncrement + series.pointInterval; + return xIncrement; + }, + + /** + * Divide the series data into segments divided by null values. + */ + getSegments: function () { + var series = this, + lastNull = -1, + segments = [], + i, + points = series.points, + pointsLength = points.length; + + if (pointsLength) { // no action required for [] + + // if connect nulls, just remove null points + if (series.options.connectNulls) { + i = pointsLength; + while (i--) { + if (points[i].y === null) { + points.splice(i, 1); + } + } + if (points.length) { + segments = [points]; + } + + // else, split on null points + } else { + each(points, function (point, i) { + if (point.y === null) { + if (i > lastNull + 1) { + segments.push(points.slice(lastNull + 1, i)); + } + lastNull = i; + } else if (i === pointsLength - 1) { // last value + segments.push(points.slice(lastNull + 1, i + 1)); + } + }); + } + } + + // register it + series.segments = segments; + }, + /** + * Set the series options by merging from the options tree + * @param {Object} itemOptions + */ + setOptions: function (itemOptions) { + var chart = this.chart, + chartOptions = chart.options, + plotOptions = chartOptions.plotOptions, + typeOptions = plotOptions[this.type], + data = itemOptions.data, + options; + + itemOptions.data = null; // remove from merge to prevent looping over the data set + + options = merge( + typeOptions, + plotOptions.series, + itemOptions + ); + + // Re-insert the data array to the options and the original config (#717) + options.data = itemOptions.data = data; + + // the tooltip options are merged between global and series specific options + this.tooltipOptions = merge(chartOptions.tooltip, options.tooltip); + + // Delte marker object if not allowed (#1125) + if (typeOptions.marker === null) { + delete options.marker; + } + + return options; + + }, + /** + * Get the series' color + */ + getColor: function () { + var options = this.options, + defaultColors = this.chart.options.colors, + counters = this.chart.counters; + this.color = options.color || + (!options.colorByPoint && defaultColors[counters.color++]) || 'gray'; + counters.wrapColor(defaultColors.length); + }, + /** + * Get the series' symbol + */ + getSymbol: function () { + var series = this, + seriesMarkerOption = series.options.marker, + chart = series.chart, + defaultSymbols = chart.options.symbols, + counters = chart.counters; + series.symbol = seriesMarkerOption.symbol || defaultSymbols[counters.symbol++]; + + // don't substract radius in image symbols (#604) + if (/^url/.test(series.symbol)) { + seriesMarkerOption.radius = 0; + } + counters.wrapSymbol(defaultSymbols.length); + }, + + /** + * Get the series' symbol in the legend. This method should be overridable to create custom + * symbols through Highcharts.seriesTypes[type].prototype.drawLegendSymbols. + * + * @param {Object} legend The legend object + */ + drawLegendSymbol: function (legend) { + + var options = this.options, + markerOptions = options.marker, + radius, + legendOptions = legend.options, + legendSymbol, + symbolWidth = legendOptions.symbolWidth, + renderer = this.chart.renderer, + legendItemGroup = this.legendGroup, + baseline = legend.baseline, + attr; + + // Draw the line + if (options.lineWidth) { + attr = { + 'stroke-width': options.lineWidth + }; + if (options.dashStyle) { + attr.dashstyle = options.dashStyle; + } + this.legendLine = renderer.path([ + M, + 0, + baseline - 4, + L, + symbolWidth, + baseline - 4 + ]) + .attr(attr) + .add(legendItemGroup); + } + + // Draw the marker + if (markerOptions && markerOptions.enabled) { + radius = markerOptions.radius; + this.legendSymbol = legendSymbol = renderer.symbol( + this.symbol, + (symbolWidth / 2) - radius, + baseline - 4 - radius, + 2 * radius, + 2 * radius + ) + .add(legendItemGroup); + } + }, + + /** + * Add a point dynamically after chart load time + * @param {Object} options Point options as given in series.data + * @param {Boolean} redraw Whether to redraw the chart or wait for an explicit call + * @param {Boolean} shift If shift is true, a point is shifted off the start + * of the series as one is appended to the end. + * @param {Boolean|Object} animation Whether to apply animation, and optionally animation + * configuration + */ + addPoint: function (options, redraw, shift, animation) { + var series = this, + seriesOptions = series.options, + data = series.data, + graph = series.graph, + area = series.area, + chart = series.chart, + xData = series.xData, + yData = series.yData, + currentShift = (graph && graph.shift) || 0, + dataOptions = seriesOptions.data, + point, + proto = series.pointClass.prototype; + + setAnimation(animation, chart); + + // Make graph animate sideways + if (graph && shift) { + graph.shift = currentShift + 1; + } + if (area) { + if (shift) { // #780 + area.shift = currentShift + 1; + } + area.isArea = true; // needed in animation, both with and without shift + } + + // Optional redraw, defaults to true + redraw = pick(redraw, true); + + // Get options and push the point to xData, yData and series.options. In series.generatePoints + // the Point instance will be created on demand and pushed to the series.data array. + point = { series: series }; + proto.applyOptions.apply(point, [options]); + xData.push(point.x); + yData.push(proto.toYData ? proto.toYData.call(point) : point.y); + dataOptions.push(options); + + // Generate points to be added to the legend (#1329) + if (seriesOptions.legendType === 'point') { + series.generatePoints(); + } + + // Shift the first point off the parallel arrays + // todo: consider series.removePoint(i) method + if (shift) { + if (data[0] && data[0].remove) { + data[0].remove(false); + } else { + data.shift(); + xData.shift(); + yData.shift(); + dataOptions.shift(); + } + } + series.getAttribs(); + + // redraw + series.isDirty = true; + series.isDirtyData = true; + if (redraw) { + chart.redraw(); + } + }, + + /** + * Replace the series data with a new set of data + * @param {Object} data + * @param {Object} redraw + */ + setData: function (data, redraw) { + var series = this, + oldData = series.points, + options = series.options, + initialColor = series.initialColor, + chart = series.chart, + firstPoint = null, + xAxis = series.xAxis, + i, + pointProto = series.pointClass.prototype; + + // reset properties + series.xIncrement = null; + series.pointRange = xAxis && xAxis.categories ? 1 : options.pointRange; + + if (defined(initialColor)) { // reset colors for pie + chart.counters.color = initialColor; + } + + // parallel arrays + var xData = [], + yData = [], + dataLength = data ? data.length : [], + turboThreshold = options.turboThreshold || 1000, + pt, + pointArrayMap = series.pointArrayMap, + valueCount = pointArrayMap && pointArrayMap.length; + + // In turbo mode, only one- or twodimensional arrays of numbers are allowed. The + // first value is tested, and we assume that all the rest are defined the same + // way. Although the 'for' loops are similar, they are repeated inside each + // if-else conditional for max performance. + if (dataLength > turboThreshold) { + + // find the first non-null point + i = 0; + while (firstPoint === null && i < dataLength) { + firstPoint = data[i]; + i++; + } + + + if (isNumber(firstPoint)) { // assume all points are numbers + var x = pick(options.pointStart, 0), + pointInterval = pick(options.pointInterval, 1); + + for (i = 0; i < dataLength; i++) { + xData[i] = x; + yData[i] = data[i]; + x += pointInterval; + } + series.xIncrement = x; + } else if (isArray(firstPoint)) { // assume all points are arrays + if (valueCount) { // [x, low, high] or [x, o, h, l, c] + for (i = 0; i < dataLength; i++) { + pt = data[i]; + xData[i] = pt[0]; + yData[i] = pt.slice(1, valueCount + 1); + } + } else { // [x, y] + for (i = 0; i < dataLength; i++) { + pt = data[i]; + xData[i] = pt[0]; + yData[i] = pt[1]; + } + } + } /* else { + error(12); // Highcharts expects configs to be numbers or arrays in turbo mode + }*/ + } else { + for (i = 0; i < dataLength; i++) { + pt = { series: series }; + pointProto.applyOptions.apply(pt, [data[i]]); + xData[i] = pt.x; + yData[i] = pointProto.toYData ? pointProto.toYData.call(pt) : pt.y; + } + } + + // Unsorted data is not supported by the line tooltip as well as data grouping and + // navigation in Stock charts (#725) + if (series.requireSorting && xData.length > 1 && xData[1] < xData[0]) { + error(15); + } + + // Forgetting to cast strings to numbers is a common caveat when handling CSV or JSON + if (isString(yData[0])) { + error(14, true); + } + + series.data = []; + series.options.data = data; + series.xData = xData; + series.yData = yData; + + // destroy old points + i = (oldData && oldData.length) || 0; + while (i--) { + if (oldData[i] && oldData[i].destroy) { + oldData[i].destroy(); + } + } + + // reset minRange (#878) + if (xAxis) { + xAxis.minRange = xAxis.userMinRange; + } + + // redraw + series.isDirty = series.isDirtyData = chart.isDirtyBox = true; + if (pick(redraw, true)) { + chart.redraw(false); + } + }, + + /** + * Remove a series and optionally redraw the chart + * + * @param {Boolean} redraw Whether to redraw the chart or wait for an explicit call + * @param {Boolean|Object} animation Whether to apply animation, and optionally animation + * configuration + */ + + remove: function (redraw, animation) { + var series = this, + chart = series.chart; + redraw = pick(redraw, true); + + if (!series.isRemoving) { /* prevent triggering native event in jQuery + (calling the remove function from the remove event) */ + series.isRemoving = true; + + // fire the event with a default handler of removing the point + fireEvent(series, 'remove', null, function () { + + + // destroy elements + series.destroy(); + + + // redraw + chart.isDirtyLegend = chart.isDirtyBox = true; + if (redraw) { + chart.redraw(animation); + } + }); + + } + series.isRemoving = false; + }, + + /** + * Process the data by cropping away unused data points if the series is longer + * than the crop threshold. This saves computing time for lage series. + */ + processData: function (force) { + var series = this, + processedXData = series.xData, // copied during slice operation below + processedYData = series.yData, + dataLength = processedXData.length, + cropStart = 0, + cropEnd = dataLength, + cropped, + distance, + closestPointRange, + xAxis = series.xAxis, + i, // loop variable + options = series.options, + cropThreshold = options.cropThreshold, + isCartesian = series.isCartesian; + + // If the series data or axes haven't changed, don't go through this. Return false to pass + // the message on to override methods like in data grouping. + if (isCartesian && !series.isDirty && !xAxis.isDirty && !series.yAxis.isDirty && !force) { + return false; + } + + // optionally filter out points outside the plot area + if (isCartesian && series.sorted && (!cropThreshold || dataLength > cropThreshold || series.forceCrop)) { + var extremes = xAxis.getExtremes(), + min = extremes.min, + max = extremes.max; + + // it's outside current extremes + if (processedXData[dataLength - 1] < min || processedXData[0] > max) { + processedXData = []; + processedYData = []; + + // only crop if it's actually spilling out + } else if (processedXData[0] < min || processedXData[dataLength - 1] > max) { + + // iterate up to find slice start + for (i = 0; i < dataLength; i++) { + if (processedXData[i] >= min) { + cropStart = mathMax(0, i - 1); + break; + } + } + // proceed to find slice end + for (; i < dataLength; i++) { + if (processedXData[i] > max) { + cropEnd = i + 1; + break; + } + + } + processedXData = processedXData.slice(cropStart, cropEnd); + processedYData = processedYData.slice(cropStart, cropEnd); + cropped = true; + } + } + + + // Find the closest distance between processed points + for (i = processedXData.length - 1; i > 0; i--) { + distance = processedXData[i] - processedXData[i - 1]; + if (distance > 0 && (closestPointRange === UNDEFINED || distance < closestPointRange)) { + closestPointRange = distance; + } + } + + // Record the properties + series.cropped = cropped; // undefined or true + series.cropStart = cropStart; + series.processedXData = processedXData; + series.processedYData = processedYData; + + if (options.pointRange === null) { // null means auto, as for columns, candlesticks and OHLC + series.pointRange = closestPointRange || 1; + } + series.closestPointRange = closestPointRange; + + }, + + /** + * Generate the data point after the data has been processed by cropping away + * unused points and optionally grouped in Highcharts Stock. + */ + generatePoints: function () { + var series = this, + options = series.options, + dataOptions = options.data, + data = series.data, + dataLength, + processedXData = series.processedXData, + processedYData = series.processedYData, + pointClass = series.pointClass, + processedDataLength = processedXData.length, + cropStart = series.cropStart || 0, + cursor, + hasGroupedData = series.hasGroupedData, + point, + points = [], + i; + + if (!data && !hasGroupedData) { + var arr = []; + arr.length = dataOptions.length; + data = series.data = arr; + } + + for (i = 0; i < processedDataLength; i++) { + cursor = cropStart + i; + if (!hasGroupedData) { + if (data[cursor]) { + point = data[cursor]; + } else if (dataOptions[cursor] !== UNDEFINED) { // #970 + data[cursor] = point = (new pointClass()).init(series, dataOptions[cursor], processedXData[i]); + } + points[i] = point; + } else { + // splat the y data in case of ohlc data array + points[i] = (new pointClass()).init(series, [processedXData[i]].concat(splat(processedYData[i]))); + } + } + + // Hide cropped-away points - this only runs when the number of points is above cropThreshold, or when + // swithching view from non-grouped data to grouped data (#637) + if (data && (processedDataLength !== (dataLength = data.length) || hasGroupedData)) { + for (i = 0; i < dataLength; i++) { + if (i === cropStart && !hasGroupedData) { // when has grouped data, clear all points + i += processedDataLength; + } + if (data[i]) { + data[i].destroyElements(); + data[i].plotX = UNDEFINED; // #1003 + } + } + } + + series.data = data; + series.points = points; + }, + + /** + * Translate data points from raw data values to chart specific positioning data + * needed later in drawPoints, drawGraph and drawTracker. + */ + translate: function () { + if (!this.processedXData) { // hidden series + this.processData(); + } + this.generatePoints(); + var series = this, + chart = series.chart, + options = series.options, + stacking = options.stacking, + xAxis = series.xAxis, + categories = xAxis.categories, + yAxis = series.yAxis, + points = series.points, + dataLength = points.length, + hasModifyValue = !!series.modifyValue, + isBottomSeries, + allStackSeries = yAxis.series, + i = allStackSeries.length, + placeBetween = options.pointPlacement === 'between'; + //nextSeriesDown; + + // Is it the last visible series? + while (i--) { + if (allStackSeries[i].visible) { + if (allStackSeries[i] === series) { // #809 + isBottomSeries = true; + } + break; + } + } + + // Translate each point + for (i = 0; i < dataLength; i++) { + var point = points[i], + xValue = point.x, + yValue = point.y, + yBottom = point.low, + stack = yAxis.stacks[(yValue < options.threshold ? '-' : '') + series.stackKey], + pointStack, + pointStackTotal; + + // get the plotX translation + //point.plotX = mathRound(xAxis.translate(xValue, 0, 0, 0, 1) * 10) / 10; // Math.round fixes #591 + point.plotX = xAxis.translate(xValue, 0, 0, 0, 1, placeBetween); // Math.round fixes #591 + + // calculate the bottom y value for stacked series + if (stacking && series.visible && stack && stack[xValue]) { + pointStack = stack[xValue]; + pointStackTotal = pointStack.total; + pointStack.cum = yBottom = pointStack.cum - yValue; // start from top + yValue = yBottom + yValue; + + if (isBottomSeries) { + yBottom = pick(options.threshold, yAxis.min); + } + + if (yAxis.isLog && yBottom <= 0) { // #1200, #1232 + yBottom = null; + } + + if (stacking === 'percent') { + yBottom = pointStackTotal ? yBottom * 100 / pointStackTotal : 0; + yValue = pointStackTotal ? yValue * 100 / pointStackTotal : 0; + } + + point.percentage = pointStackTotal ? point.y * 100 / pointStackTotal : 0; + point.total = point.stackTotal = pointStackTotal; + point.stackY = yValue; + } + + // Set translated yBottom or remove it + point.yBottom = defined(yBottom) ? + yAxis.translate(yBottom, 0, 1, 0, 1) : + null; + + // general hook, used for Highstock compare mode + if (hasModifyValue) { + yValue = series.modifyValue(yValue, point); + } + + // Set the the plotY value, reset it for redraws + point.plotY = (typeof yValue === 'number') ? + mathRound(yAxis.translate(yValue, 0, 1, 0, 1) * 10) / 10 : // Math.round fixes #591 + UNDEFINED; + + // set client related positions for mouse tracking + point.clientX = chart.inverted ? + chart.plotHeight - point.plotX : + point.plotX; // for mouse tracking + + // some API data + point.category = categories && categories[point.x] !== UNDEFINED ? + categories[point.x] : point.x; + + + } + + // now that we have the cropped data, build the segments + series.getSegments(); + }, + /** + * Memoize tooltip texts and positions + */ + setTooltipPoints: function (renew) { + var series = this, + points = [], + pointsLength, + low, + high, + xAxis = series.xAxis, + axisLength = xAxis ? (xAxis.tooltipLen || xAxis.len) : series.chart.plotSizeX, // tooltipLen and tooltipPosName used in polar + plotX = (xAxis && xAxis.tooltipPosName) || 'plotX', + point, + i, + tooltipPoints = []; // a lookup array for each pixel in the x dimension + + // don't waste resources if tracker is disabled + if (series.options.enableMouseTracking === false) { + return; + } + + // renew + if (renew) { + series.tooltipPoints = null; + } + + // concat segments to overcome null values + each(series.segments || series.points, function (segment) { + points = points.concat(segment); + }); + + // Reverse the points in case the X axis is reversed + if (xAxis && xAxis.reversed) { + points = points.reverse(); + } + + // Assign each pixel position to the nearest point + pointsLength = points.length; + for (i = 0; i < pointsLength; i++) { + point = points[i]; + // Set this range's low to the last range's high plus one + low = points[i - 1] ? high + 1 : 0; + // Now find the new high + high = points[i + 1] ? + mathMax(0, mathFloor((point[plotX] + (points[i + 1] ? points[i + 1][plotX] : axisLength)) / 2)) : + axisLength; + + while (low >= 0 && low <= high) { + tooltipPoints[low++] = point; + } + } + series.tooltipPoints = tooltipPoints; + }, + + /** + * Format the header of the tooltip + */ + tooltipHeaderFormatter: function (key) { + var series = this, + tooltipOptions = series.tooltipOptions, + xDateFormat = tooltipOptions.xDateFormat, + xAxis = series.xAxis, + isDateTime = xAxis && xAxis.options.type === 'datetime', + n; + + // Guess the best date format based on the closest point distance (#568) + if (isDateTime && !xDateFormat) { + for (n in timeUnits) { + if (timeUnits[n] >= xAxis.closestPointRange) { + xDateFormat = tooltipOptions.dateTimeLabelFormats[n]; + break; + } + } + } + + return tooltipOptions.headerFormat + .replace('{point.key}', isDateTime && isNumber(key) ? dateFormat(xDateFormat, key) : key) + .replace('{series.name}', series.name) + .replace('{series.color}', series.color); + }, + + /** + * Series mouse over handler + */ + onMouseOver: function () { + var series = this, + chart = series.chart, + hoverSeries = chart.hoverSeries; + + // set normal state to previous series + if (hoverSeries && hoverSeries !== series) { + hoverSeries.onMouseOut(); + } + + // trigger the event, but to save processing time, + // only if defined + if (series.options.events.mouseOver) { + fireEvent(series, 'mouseOver'); + } + + // hover this + series.setState(HOVER_STATE); + chart.hoverSeries = series; + }, + + /** + * Series mouse out handler + */ + onMouseOut: function () { + // trigger the event only if listeners exist + var series = this, + options = series.options, + chart = series.chart, + tooltip = chart.tooltip, + hoverPoint = chart.hoverPoint; + + // trigger mouse out on the point, which must be in this series + if (hoverPoint) { + hoverPoint.onMouseOut(); + } + + // fire the mouse out event + if (series && options.events.mouseOut) { + fireEvent(series, 'mouseOut'); + } + + + // hide the tooltip + if (tooltip && !options.stickyTracking && !tooltip.shared) { + tooltip.hide(); + } + + // set normal state + series.setState(); + chart.hoverSeries = null; + }, + + /** + * Animate in the series + */ + animate: function (init) { + var series = this, + chart = series.chart, + renderer = chart.renderer, + clipRect, + markerClipRect, + animation = series.options.animation, + clipBox = chart.clipBox, + inverted = chart.inverted, + sharedClipKey; + + // Animation option is set to true + if (animation && !isObject(animation)) { + animation = defaultPlotOptions[series.type].animation; + } + sharedClipKey = '_sharedClip' + animation.duration + animation.easing; + + // Initialize the animation. Set up the clipping rectangle. + if (init) { + + // If a clipping rectangle with the same properties is currently present in the chart, use that. + clipRect = chart[sharedClipKey]; + markerClipRect = chart[sharedClipKey + 'm']; + if (!clipRect) { + chart[sharedClipKey] = clipRect = renderer.clipRect( + extend(clipBox, { width: 0 }) + ); + + chart[sharedClipKey + 'm'] = markerClipRect = renderer.clipRect( + -99, // include the width of the first marker + inverted ? -chart.plotLeft : -chart.plotTop, + 99, + inverted ? chart.chartWidth : chart.chartHeight + ); + } + series.group.clip(clipRect); + series.markerGroup.clip(markerClipRect); + series.sharedClipKey = sharedClipKey; + + // Run the animation + } else { + clipRect = chart[sharedClipKey]; + if (clipRect) { + clipRect.animate({ + width: chart.plotSizeX + }, animation); + chart[sharedClipKey + 'm'].animate({ + width: chart.plotSizeX + 99 + }, animation); + } + + // Delete this function to allow it only once + series.animate = null; + + // Call the afterAnimate function on animation complete (but don't overwrite the animation.complete option + // which should be available to the user). + series.animationTimeout = setTimeout(function () { + series.afterAnimate(); + }, animation.duration); + } + }, + + /** + * This runs after animation to land on the final plot clipping + */ + afterAnimate: function () { + var chart = this.chart, + sharedClipKey = this.sharedClipKey, + group = this.group, + trackerGroup = this.trackerGroup; + + if (group && this.options.clip !== false) { + group.clip(chart.clipRect); + if (trackerGroup) { + trackerGroup.clip(chart.clipRect); // #484 + } + this.markerGroup.clip(); // no clip + } + + // Remove the shared clipping rectancgle when all series are shown + setTimeout(function () { + if (sharedClipKey && chart[sharedClipKey]) { + chart[sharedClipKey] = chart[sharedClipKey].destroy(); + chart[sharedClipKey + 'm'] = chart[sharedClipKey + 'm'].destroy(); + } + }, 100); + }, + + /** + * Draw the markers + */ + drawPoints: function () { + var series = this, + pointAttr, + points = series.points, + chart = series.chart, + plotX, + plotY, + i, + point, + radius, + symbol, + isImage, + graphic, + options = series.options, + seriesMarkerOptions = options.marker, + pointMarkerOptions, + enabled, + isInside, + markerGroup = series.markerGroup; + + if (seriesMarkerOptions.enabled || series._hasPointMarkers) { + + i = points.length; + while (i--) { + point = points[i]; + plotX = point.plotX; + plotY = point.plotY; + graphic = point.graphic; + pointMarkerOptions = point.marker || {}; + enabled = (seriesMarkerOptions.enabled && pointMarkerOptions.enabled === UNDEFINED) || pointMarkerOptions.enabled; + isInside = chart.isInsidePlot(plotX, plotY, chart.inverted); + + // only draw the point if y is defined + if (enabled && plotY !== UNDEFINED && !isNaN(plotY)) { + + // shortcuts + pointAttr = point.pointAttr[point.selected ? SELECT_STATE : NORMAL_STATE]; + radius = pointAttr.r; + symbol = pick(pointMarkerOptions.symbol, series.symbol); + isImage = symbol.indexOf('url') === 0; + + if (graphic) { // update + graphic + .attr({ // Since the marker group isn't clipped, each individual marker must be toggled + visibility: isInside ? (hasSVG ? 'inherit' : VISIBLE) : HIDDEN + }) + .animate(extend({ + x: plotX - radius, + y: plotY - radius + }, graphic.symbolName ? { // don't apply to image symbols #507 + width: 2 * radius, + height: 2 * radius + } : {})); + } else if (isInside && (radius > 0 || isImage)) { + point.graphic = graphic = chart.renderer.symbol( + symbol, + plotX - radius, + plotY - radius, + 2 * radius, + 2 * radius + ) + .attr(pointAttr) + .add(markerGroup); + } + + } else if (graphic) { + point.graphic = graphic.destroy(); // #1269 + } + } + } + + }, + + /** + * Convert state properties from API naming conventions to SVG attributes + * + * @param {Object} options API options object + * @param {Object} base1 SVG attribute object to inherit from + * @param {Object} base2 Second level SVG attribute object to inherit from + */ + convertAttribs: function (options, base1, base2, base3) { + var conversion = this.pointAttrToOptions, + attr, + option, + obj = {}; + + options = options || {}; + base1 = base1 || {}; + base2 = base2 || {}; + base3 = base3 || {}; + + for (attr in conversion) { + option = conversion[attr]; + obj[attr] = pick(options[option], base1[attr], base2[attr], base3[attr]); + } + return obj; + }, + + /** + * Get the state attributes. Each series type has its own set of attributes + * that are allowed to change on a point's state change. Series wide attributes are stored for + * all series, and additionally point specific attributes are stored for all + * points with individual marker options. If such options are not defined for the point, + * a reference to the series wide attributes is stored in point.pointAttr. + */ + getAttribs: function () { + var series = this, + normalOptions = defaultPlotOptions[series.type].marker ? series.options.marker : series.options, + stateOptions = normalOptions.states, + stateOptionsHover = stateOptions[HOVER_STATE], + pointStateOptionsHover, + seriesColor = series.color, + normalDefaults = { + stroke: seriesColor, + fill: seriesColor + }, + points = series.points || [], // #927 + i, + point, + seriesPointAttr = [], + pointAttr, + pointAttrToOptions = series.pointAttrToOptions, + hasPointSpecificOptions, + key; + + // series type specific modifications + if (series.options.marker) { // line, spline, area, areaspline, scatter + + // if no hover radius is given, default to normal radius + 2 + stateOptionsHover.radius = stateOptionsHover.radius || normalOptions.radius + 2; + stateOptionsHover.lineWidth = stateOptionsHover.lineWidth || normalOptions.lineWidth + 1; + + } else { // column, bar, pie + + // if no hover color is given, brighten the normal color + stateOptionsHover.color = stateOptionsHover.color || + Color(stateOptionsHover.color || seriesColor) + .brighten(stateOptionsHover.brightness).get(); + } + + // general point attributes for the series normal state + seriesPointAttr[NORMAL_STATE] = series.convertAttribs(normalOptions, normalDefaults); + + // HOVER_STATE and SELECT_STATE states inherit from normal state except the default radius + each([HOVER_STATE, SELECT_STATE], function (state) { + seriesPointAttr[state] = + series.convertAttribs(stateOptions[state], seriesPointAttr[NORMAL_STATE]); + }); + + // set it + series.pointAttr = seriesPointAttr; + + + // Generate the point-specific attribute collections if specific point + // options are given. If not, create a referance to the series wide point + // attributes + i = points.length; + while (i--) { + point = points[i]; + normalOptions = (point.options && point.options.marker) || point.options; + if (normalOptions && normalOptions.enabled === false) { + normalOptions.radius = 0; + } + hasPointSpecificOptions = series.options.colorByPoint; // #868 + + // check if the point has specific visual options + if (point.options) { + for (key in pointAttrToOptions) { + if (defined(normalOptions[pointAttrToOptions[key]])) { + hasPointSpecificOptions = true; + } + } + } + + + + // a specific marker config object is defined for the individual point: + // create it's own attribute collection + if (hasPointSpecificOptions) { + normalOptions = normalOptions || {}; + pointAttr = []; + stateOptions = normalOptions.states || {}; // reassign for individual point + pointStateOptionsHover = stateOptions[HOVER_STATE] = stateOptions[HOVER_STATE] || {}; + + // Handle colors for column and pies + if (!series.options.marker) { // column, bar, point + // if no hover color is given, brighten the normal color + pointStateOptionsHover.color = + Color(pointStateOptionsHover.color || point.color) + .brighten(pointStateOptionsHover.brightness || + stateOptionsHover.brightness).get(); + + } + + // normal point state inherits series wide normal state + pointAttr[NORMAL_STATE] = series.convertAttribs(extend({ + color: point.color // #868 + }, normalOptions), seriesPointAttr[NORMAL_STATE]); + + // inherit from point normal and series hover + pointAttr[HOVER_STATE] = series.convertAttribs( + stateOptions[HOVER_STATE], + seriesPointAttr[HOVER_STATE], + pointAttr[NORMAL_STATE] + ); + // inherit from point normal and series hover + pointAttr[SELECT_STATE] = series.convertAttribs( + stateOptions[SELECT_STATE], + seriesPointAttr[SELECT_STATE], + pointAttr[NORMAL_STATE] + ); + + + + // no marker config object is created: copy a reference to the series-wide + // attribute collection + } else { + pointAttr = seriesPointAttr; + } + + point.pointAttr = pointAttr; + + } + + }, + + + /** + * Clear DOM objects and free up memory + */ + destroy: function () { + var series = this, + chart = series.chart, + issue134 = /AppleWebKit\/533/.test(userAgent), + destroy, + i, + data = series.data || [], + point, + prop, + axis; + + // add event hook + fireEvent(series, 'destroy'); + + // remove all events + removeEvent(series); + + // erase from axes + each(['xAxis', 'yAxis'], function (AXIS) { + axis = series[AXIS]; + if (axis) { + erase(axis.series, series); + axis.isDirty = true; + } + }); + + // remove legend items + if (series.legendItem) { + series.chart.legend.destroyItem(series); + } + + // destroy all points with their elements + i = data.length; + while (i--) { + point = data[i]; + if (point && point.destroy) { + point.destroy(); + } + } + series.points = null; + + // Clear the animation timeout if we are destroying the series during initial animation + clearTimeout(series.animationTimeout); + + // destroy all SVGElements associated to the series + each(['area', 'graph', 'dataLabelsGroup', 'group', 'markerGroup', 'tracker', 'trackerGroup'], function (prop) { + if (series[prop]) { + + // issue 134 workaround + destroy = issue134 && prop === 'group' ? + 'hide' : + 'destroy'; + + series[prop][destroy](); + } + }); + + // remove from hoverSeries + if (chart.hoverSeries === series) { + chart.hoverSeries = null; + } + erase(chart.series, series); + + // clear all members + for (prop in series) { + delete series[prop]; + } + }, + + /** + * Draw the data labels + */ + drawDataLabels: function () { + + var series = this, + seriesOptions = series.options, + options = seriesOptions.dataLabels, + points = series.points, + pointOptions, + generalOptions, + str, + dataLabelsGroup; + + if (options.enabled || series._hasPointLabels) { + + // Process default alignment of data labels for columns + if (series.dlProcessOptions) { + series.dlProcessOptions(options); + } + + // Create a separate group for the data labels to avoid rotation + dataLabelsGroup = series.plotGroup( + 'dataLabelsGroup', + 'data-labels', + series.visible ? VISIBLE : HIDDEN, + options.zIndex || 6 + ); + + // Make the labels for each point + generalOptions = options; + each(points, function (point) { + + var enabled, + dataLabel = point.dataLabel, + attr, + name, + rotation, + isNew = true; + + // Determine if each data label is enabled + pointOptions = point.options && point.options.dataLabels; + enabled = generalOptions.enabled || (pointOptions && pointOptions.enabled); + + + // If the point is outside the plot area, destroy it. #678, #820 + if (dataLabel && !enabled) { + point.dataLabel = dataLabel.destroy(); + + // Individual labels are disabled if the are explicitly disabled + // in the point options, or if they fall outside the plot area. + } else if (enabled) { + + rotation = options.rotation; + + // Create individual options structure that can be extended without + // affecting others + options = merge(generalOptions, pointOptions); + + // Get the string + str = options.formatter.call(point.getLabelConfig(), options); + + // Determine the color + options.style.color = pick(options.color, options.style.color, series.color, 'black'); + + + // update existing label + if (dataLabel) { + // vertically centered + dataLabel + .attr({ + text: str + }); + isNew = false; + // create new label + } else if (defined(str)) { + attr = { + //align: align, + fill: options.backgroundColor, + stroke: options.borderColor, + 'stroke-width': options.borderWidth, + r: options.borderRadius || 0, + rotation: rotation, + padding: options.padding, + zIndex: 1 + }; + // Remove unused attributes (#947) + for (name in attr) { + if (attr[name] === UNDEFINED) { + delete attr[name]; + } + } + + dataLabel = point.dataLabel = series.chart.renderer[rotation ? 'text' : 'label']( // labels don't support rotation + str, + 0, + -999, + null, + null, + null, + options.useHTML + ) + .attr(attr) + .css(options.style) + .add(dataLabelsGroup) + .shadow(options.shadow); + + } + + // Now the data label is created and placed at 0,0, so we need to align it + if (dataLabel) { + series.alignDataLabel(point, dataLabel, options, null, isNew); + } + } + }); + } + }, + + /** + * Align each individual data label + */ + alignDataLabel: function (point, dataLabel, options, alignTo, isNew) { + var chart = this.chart, + inverted = chart.inverted, + plotX = pick(point.plotX, -999), + plotY = pick(point.plotY, -999), + bBox = dataLabel.getBBox(), + alignAttr; // the final position; + + // The alignment box is a singular point + alignTo = extend({ + x: inverted ? chart.plotWidth - plotY : plotX, + y: mathRound(inverted ? chart.plotHeight - plotX : plotY), + width: 0, + height: 0 + }, alignTo); + + // Add the text size for alignment calculation + extend(options, { + width: bBox.width, + height: bBox.height + }); + + // Allow a hook for changing alignment in the last moment, then do the alignment + if (options.rotation) { // Fancy box alignment isn't supported for rotated text + alignAttr = { + align: options.align, + x: alignTo.x + options.x + alignTo.width / 2, + y: alignTo.y + options.y + alignTo.height / 2 + }; + dataLabel[isNew ? 'attr' : 'animate'](alignAttr); + } else { + dataLabel.align(options, null, alignTo); + alignAttr = dataLabel.alignAttr; + } + + // Show or hide based on the final aligned position + dataLabel.attr({ + visibility: options.crop === false || chart.isInsidePlot(alignAttr.x, alignAttr.y) || chart.isInsidePlot(plotX, plotY, inverted) ? + (chart.renderer.isSVG ? 'inherit' : VISIBLE) : + HIDDEN + }); + + }, + + /** + * Return the graph path of a segment + */ + getSegmentPath: function (segment) { + var series = this, + segmentPath = [], + step = series.options.step; + + // build the segment line + each(segment, function (point, i) { + + var plotX = point.plotX, + plotY = point.plotY, + lastPoint; + + if (series.getPointSpline) { // generate the spline as defined in the SplineSeries object + segmentPath.push.apply(segmentPath, series.getPointSpline(segment, point, i)); + + } else { + + // moveTo or lineTo + segmentPath.push(i ? L : M); + + // step line? + if (step && i) { + lastPoint = segment[i - 1]; + if (step === 'right') { + segmentPath.push( + lastPoint.plotX, + plotY + ); + + } else if (step === 'center') { + segmentPath.push( + (lastPoint.plotX + plotX) / 2, + lastPoint.plotY, + (lastPoint.plotX + plotX) / 2, + plotY + ); + + } else { + segmentPath.push( + plotX, + lastPoint.plotY + ); + } + } + + // normal line to next point + segmentPath.push( + point.plotX, + point.plotY + ); + } + }); + + return segmentPath; + }, + + /** + * Get the graph path + */ + getGraphPath: function () { + var series = this, + graphPath = [], + segmentPath, + singlePoints = []; // used in drawTracker + + // Divide into segments and build graph and area paths + each(series.segments, function (segment) { + + segmentPath = series.getSegmentPath(segment); + + // add the segment to the graph, or a single point for tracking + if (segment.length > 1) { + graphPath = graphPath.concat(segmentPath); + } else { + singlePoints.push(segment[0]); + } + }); + + // Record it for use in drawGraph and drawTracker, and return graphPath + series.singlePoints = singlePoints; + series.graphPath = graphPath; + + return graphPath; + + }, + + /** + * Draw the actual graph + */ + drawGraph: function () { + var options = this.options, + graph = this.graph, + group = this.group, + color = options.lineColor || this.color, + lineWidth = options.lineWidth, + dashStyle = options.dashStyle, + attribs, + graphPath = this.getGraphPath(); + + + // draw the graph + if (graph) { + stop(graph); // cancel running animations, #459 + graph.animate({ d: graphPath }); + + } else { + if (lineWidth) { + attribs = { + stroke: color, + 'stroke-width': lineWidth, + zIndex: 1 // #1069 + }; + if (dashStyle) { + attribs.dashstyle = dashStyle; + } + + this.graph = this.chart.renderer.path(graphPath) + .attr(attribs).add(group).shadow(options.shadow); + } + } + }, + + /** + * Initialize and perform group inversion on series.group and series.trackerGroup + */ + invertGroups: function () { + var series = this, + chart = series.chart; + + // A fixed size is needed for inversion to work + function setInvert() { + var size = { + width: series.yAxis.len, + height: series.xAxis.len + }; + + each(['group', 'trackerGroup', 'markerGroup'], function (groupName) { + if (series[groupName]) { + series[groupName].attr(size).invert(); + } + }); + } + + addEvent(chart, 'resize', setInvert); // do it on resize + addEvent(series, 'destroy', function () { + removeEvent(chart, 'resize', setInvert); + }); + + // Do it now + setInvert(); // do it now + + // On subsequent render and redraw, just do setInvert without setting up events again + series.invertGroups = setInvert; + }, + + /** + * General abstraction for creating plot groups like series.group, series.trackerGroup, series.dataLabelsGroup and + * series.markerGroup. On subsequent calls, the group will only be adjusted to the updated plot size. + */ + plotGroup: function (prop, name, visibility, zIndex, parent) { + var group = this[prop], + chart = this.chart, + xAxis = this.xAxis, + yAxis = this.yAxis; + + // Generate it on first call + if (!group) { + this[prop] = group = chart.renderer.g(name) + .attr({ + visibility: visibility, + zIndex: zIndex || 0.1 // IE8 needs this + }) + .add(parent); + } + // Place it on first and subsequent (redraw) calls + group.translate( + xAxis ? xAxis.left : chart.plotLeft, + yAxis ? yAxis.top : chart.plotTop + ); + + return group; + + }, + + /** + * Render the graph and markers + */ + render: function () { + var series = this, + chart = series.chart, + group, + options = series.options, + animation = options.animation, + doAnimation = animation && !!series.animate, + visibility = series.visible ? VISIBLE : HIDDEN, + zIndex = options.zIndex, + hasRendered = series.hasRendered, + chartSeriesGroup = chart.seriesGroup; + + // the group + group = series.plotGroup( + 'group', + 'series', + visibility, + zIndex, + chartSeriesGroup + ); + + series.markerGroup = series.plotGroup( + 'markerGroup', + 'markers', + visibility, + zIndex, + chartSeriesGroup + ); + + // initiate the animation + if (doAnimation) { + series.animate(true); + } + + // cache attributes for shapes + series.getAttribs(); + + // SVGRenderer needs to know this before drawing elements (#1089) + group.inverted = chart.inverted; + + // draw the graph if any + if (series.drawGraph) { + series.drawGraph(); + } + + // draw the points + series.drawPoints(); + + // draw the data labels + series.drawDataLabels(); + + + // draw the mouse tracking area + if (series.options.enableMouseTracking !== false) { + series.drawTracker(); + } + + // Handle inverted series and tracker groups + if (chart.inverted) { + series.invertGroups(); + } + + // Initial clipping, must be defined after inverting groups for VML + if (options.clip !== false && !series.sharedClipKey && !hasRendered) { + group.clip(chart.clipRect); + if (this.trackerGroup) { + this.trackerGroup.clip(chart.clipRect); + } + } + + // Run the animation + if (doAnimation) { + series.animate(); + } else if (!hasRendered) { + series.afterAnimate(); + } + + series.isDirty = series.isDirtyData = false; // means data is in accordance with what you see + // (See #322) series.isDirty = series.isDirtyData = false; // means data is in accordance with what you see + series.hasRendered = true; + }, + + /** + * Redraw the series after an update in the axes. + */ + redraw: function () { + var series = this, + chart = series.chart, + wasDirtyData = series.isDirtyData, // cache it here as it is set to false in render, but used after + group = series.group; + + // reposition on resize + if (group) { + if (chart.inverted) { + group.attr({ + width: chart.plotWidth, + height: chart.plotHeight + }); + } + + group.animate({ + translateX: series.xAxis.left, + translateY: series.yAxis.top + }); + } + + series.translate(); + series.setTooltipPoints(true); + + series.render(); + if (wasDirtyData) { + fireEvent(series, 'updatedData'); + } + }, + + /** + * Set the state of the graph + */ + setState: function (state) { + var series = this, + options = series.options, + graph = series.graph, + stateOptions = options.states, + lineWidth = options.lineWidth; + + state = state || NORMAL_STATE; + + if (series.state !== state) { + series.state = state; + + if (stateOptions[state] && stateOptions[state].enabled === false) { + return; + } + + if (state) { + lineWidth = stateOptions[state].lineWidth || lineWidth + 1; + } + + if (graph && !graph.dashstyle) { // hover is turned off for dashed lines in VML + graph.attr({ // use attr because animate will cause any other animation on the graph to stop + 'stroke-width': lineWidth + }, state ? 0 : 500); + } + } + }, + + /** + * Set the visibility of the graph + * + * @param vis {Boolean} True to show the series, false to hide. If UNDEFINED, + * the visibility is toggled. + */ + setVisible: function (vis, redraw) { + var series = this, + chart = series.chart, + legendItem = series.legendItem, + seriesGroup = series.group, + seriesTracker = series.tracker, + dataLabelsGroup = series.dataLabelsGroup, + markerGroup = series.markerGroup, + showOrHide, + i, + points = series.points, + point, + ignoreHiddenSeries = chart.options.chart.ignoreHiddenSeries, + oldVisibility = series.visible; + + // if called without an argument, toggle visibility + series.visible = vis = vis === UNDEFINED ? !oldVisibility : vis; + showOrHide = vis ? 'show' : 'hide'; + + // show or hide series + if (seriesGroup) { // pies don't have one + seriesGroup[showOrHide](); + } + if (markerGroup) { + markerGroup[showOrHide](); + } + + // show or hide trackers + if (seriesTracker) { + seriesTracker[showOrHide](); + } else if (points) { + i = points.length; + while (i--) { + point = points[i]; + if (point.tracker) { + point.tracker[showOrHide](); + } + } + } + + // hide tooltip (#1361) + if (chart.hoverSeries === series) { + series.onMouseOut(); + } + + + if (dataLabelsGroup) { + dataLabelsGroup[showOrHide](); + } + + if (legendItem) { + chart.legend.colorizeItem(series, vis); + } + + + // rescale or adapt to resized chart + series.isDirty = true; + // in a stack, all other series are affected + if (series.options.stacking) { + each(chart.series, function (otherSeries) { + if (otherSeries.options.stacking && otherSeries.visible) { + otherSeries.isDirty = true; + } + }); + } + + if (ignoreHiddenSeries) { + chart.isDirtyBox = true; + } + if (redraw !== false) { + chart.redraw(); + } + + fireEvent(series, showOrHide); + }, + + /** + * Show the graph + */ + show: function () { + this.setVisible(true); + }, + + /** + * Hide the graph + */ + hide: function () { + this.setVisible(false); + }, + + + /** + * Set the selected state of the graph + * + * @param selected {Boolean} True to select the series, false to unselect. If + * UNDEFINED, the selection state is toggled. + */ + select: function (selected) { + var series = this; + // if called without an argument, toggle + series.selected = selected = (selected === UNDEFINED) ? !series.selected : selected; + + if (series.checkbox) { + series.checkbox.checked = selected; + } + + fireEvent(series, selected ? 'select' : 'unselect'); + }, + + /** + * Draw the tracker object that sits above all data labels and markers to + * track mouse events on the graph or points. For the line type charts + * the tracker uses the same graphPath, but with a greater stroke width + * for better control. + */ + drawTracker: function () { + var series = this, + options = series.options, + trackByArea = options.trackByArea, + trackerPath = [].concat(trackByArea ? series.areaPath : series.graphPath), + trackerPathLength = trackerPath.length, + chart = series.chart, + renderer = chart.renderer, + snap = chart.options.tooltip.snap, + tracker = series.tracker, + cursor = options.cursor, + css = cursor && { cursor: cursor }, + singlePoints = series.singlePoints, + trackerGroup = this.isCartesian && this.plotGroup('trackerGroup', null, VISIBLE, options.zIndex || 1, chart.trackerGroup), + singlePoint, + i, + onMouseOver = function () { + if (chart.hoverSeries !== series) { + series.onMouseOver(); + } + }, + onMouseOut = function () { + if (!options.stickyTracking) { + series.onMouseOut(); + } + }; + + // Extend end points. A better way would be to use round linecaps, + // but those are not clickable in VML. + if (trackerPathLength && !trackByArea) { + i = trackerPathLength + 1; + while (i--) { + if (trackerPath[i] === M) { // extend left side + trackerPath.splice(i + 1, 0, trackerPath[i + 1] - snap, trackerPath[i + 2], L); + } + if ((i && trackerPath[i] === M) || i === trackerPathLength) { // extend right side + trackerPath.splice(i, 0, L, trackerPath[i - 2] + snap, trackerPath[i - 1]); + } + } + } + + // handle single points + for (i = 0; i < singlePoints.length; i++) { + singlePoint = singlePoints[i]; + trackerPath.push(M, singlePoint.plotX - snap, singlePoint.plotY, + L, singlePoint.plotX + snap, singlePoint.plotY); + } + + + + // draw the tracker + if (tracker) { + tracker.attr({ d: trackerPath }); + + } else { // create + + series.tracker = tracker = renderer.path(trackerPath) + .attr({ + isTracker: true, + 'stroke-linejoin': 'round', // #1225 + visibility: series.visible ? VISIBLE : HIDDEN, + stroke: TRACKER_FILL, + fill: trackByArea ? TRACKER_FILL : NONE, + 'stroke-width' : options.lineWidth + (trackByArea ? 0 : 2 * snap) + }) + .on('mouseover', onMouseOver) + .on('mouseout', onMouseOut) + .css(css) + .add(trackerGroup); + + if (hasTouch) { + tracker.on('touchstart', onMouseOver); + } + } + + } + +}; // end Series prototype + + +/** + * LineSeries object + */ +var LineSeries = extendClass(Series); +seriesTypes.line = LineSeries; + +/** + * Set the default options for area + */ +defaultPlotOptions.area = merge(defaultSeriesOptions, { + threshold: 0 + // trackByArea: false, + // lineColor: null, // overrides color, but lets fillColor be unaltered + // fillOpacity: 0.75, + // fillColor: null +}); + +/** + * AreaSeries object + */ +var AreaSeries = extendClass(Series, { + type: 'area', + + /** + * Extend the base Series getSegmentPath method by adding the path for the area. + * This path is pushed to the series.areaPath property. + */ + getSegmentPath: function (segment) { + + var segmentPath = Series.prototype.getSegmentPath.call(this, segment), // call base method + areaSegmentPath = [].concat(segmentPath), // work on a copy for the area path + i, + options = this.options, + segLength = segmentPath.length; + + if (segLength === 3) { // for animation from 1 to two points + areaSegmentPath.push(L, segmentPath[1], segmentPath[2]); + } + if (options.stacking && !this.closedStacks) { + + // Follow stack back. Todo: implement areaspline. A general solution could be to + // reverse the entire graphPath of the previous series, though may be hard with + // splines and with series with different extremes + for (i = segment.length - 1; i >= 0; i--) { + + // step line? + if (i < segment.length - 1 && options.step) { + areaSegmentPath.push(segment[i + 1].plotX, segment[i].yBottom); + } + + areaSegmentPath.push(segment[i].plotX, segment[i].yBottom); + } + + } else { // follow zero line back + this.closeSegment(areaSegmentPath, segment); + } + this.areaPath = this.areaPath.concat(areaSegmentPath); + + return segmentPath; + }, + + /** + * Extendable method to close the segment path of an area. This is overridden in polar + * charts. + */ + closeSegment: function (path, segment) { + var translatedThreshold = this.yAxis.getThreshold(this.options.threshold); + path.push( + L, + segment[segment.length - 1].plotX, + translatedThreshold, + L, + segment[0].plotX, + translatedThreshold + ); + }, + + /** + * Draw the graph and the underlying area. This method calls the Series base + * function and adds the area. The areaPath is calculated in the getSegmentPath + * method called from Series.prototype.drawGraph. + */ + drawGraph: function () { + + // Define or reset areaPath + this.areaPath = []; + + // Call the base method + Series.prototype.drawGraph.apply(this); + + // Define local variables + var areaPath = this.areaPath, + options = this.options, + area = this.area; + + // Create or update the area + if (area) { // update + area.animate({ d: areaPath }); + + } else { // create + this.area = this.chart.renderer.path(areaPath) + .attr({ + fill: pick( + options.fillColor, + Color(this.color).setOpacity(options.fillOpacity || 0.75).get() + ), + zIndex: 0 // #1069 + }).add(this.group); + } + }, + + /** + * Get the series' symbol in the legend + * + * @param {Object} legend The legend object + * @param {Object} item The series (this) or point + */ + drawLegendSymbol: function (legend, item) { + + item.legendSymbol = this.chart.renderer.rect( + 0, + legend.baseline - 11, + legend.options.symbolWidth, + 12, + 2 + ).attr({ + zIndex: 3 + }).add(item.legendGroup); + + } +}); + +seriesTypes.area = AreaSeries;/** + * Set the default options for spline + */ +defaultPlotOptions.spline = merge(defaultSeriesOptions); + +/** + * SplineSeries object + */ +var SplineSeries = extendClass(Series, { + type: 'spline', + + /** + * Get the spline segment from a given point's previous neighbour to the given point + */ + getPointSpline: function (segment, point, i) { + var smoothing = 1.5, // 1 means control points midway between points, 2 means 1/3 from the point, 3 is 1/4 etc + denom = smoothing + 1, + plotX = point.plotX, + plotY = point.plotY, + lastPoint = segment[i - 1], + nextPoint = segment[i + 1], + leftContX, + leftContY, + rightContX, + rightContY, + ret; + + // find control points + if (lastPoint && nextPoint) { + + var lastX = lastPoint.plotX, + lastY = lastPoint.plotY, + nextX = nextPoint.plotX, + nextY = nextPoint.plotY, + correction; + + leftContX = (smoothing * plotX + lastX) / denom; + leftContY = (smoothing * plotY + lastY) / denom; + rightContX = (smoothing * plotX + nextX) / denom; + rightContY = (smoothing * plotY + nextY) / denom; + + // have the two control points make a straight line through main point + correction = ((rightContY - leftContY) * (rightContX - plotX)) / + (rightContX - leftContX) + plotY - rightContY; + + leftContY += correction; + rightContY += correction; + + // to prevent false extremes, check that control points are between + // neighbouring points' y values + if (leftContY > lastY && leftContY > plotY) { + leftContY = mathMax(lastY, plotY); + rightContY = 2 * plotY - leftContY; // mirror of left control point + } else if (leftContY < lastY && leftContY < plotY) { + leftContY = mathMin(lastY, plotY); + rightContY = 2 * plotY - leftContY; + } + if (rightContY > nextY && rightContY > plotY) { + rightContY = mathMax(nextY, plotY); + leftContY = 2 * plotY - rightContY; + } else if (rightContY < nextY && rightContY < plotY) { + rightContY = mathMin(nextY, plotY); + leftContY = 2 * plotY - rightContY; + } + + // record for drawing in next point + point.rightContX = rightContX; + point.rightContY = rightContY; + + } + + // Visualize control points for debugging + /* + if (leftContX) { + this.chart.renderer.circle(leftContX + this.chart.plotLeft, leftContY + this.chart.plotTop, 2) + .attr({ + stroke: 'red', + 'stroke-width': 1, + fill: 'none' + }) + .add(); + this.chart.renderer.path(['M', leftContX + this.chart.plotLeft, leftContY + this.chart.plotTop, + 'L', plotX + this.chart.plotLeft, plotY + this.chart.plotTop]) + .attr({ + stroke: 'red', + 'stroke-width': 1 + }) + .add(); + this.chart.renderer.circle(rightContX + this.chart.plotLeft, rightContY + this.chart.plotTop, 2) + .attr({ + stroke: 'green', + 'stroke-width': 1, + fill: 'none' + }) + .add(); + this.chart.renderer.path(['M', rightContX + this.chart.plotLeft, rightContY + this.chart.plotTop, + 'L', plotX + this.chart.plotLeft, plotY + this.chart.plotTop]) + .attr({ + stroke: 'green', + 'stroke-width': 1 + }) + .add(); + } + // */ + + // moveTo or lineTo + if (!i) { + ret = [M, plotX, plotY]; + } else { // curve from last point to this + ret = [ + 'C', + lastPoint.rightContX || lastPoint.plotX, + lastPoint.rightContY || lastPoint.plotY, + leftContX || plotX, + leftContY || plotY, + plotX, + plotY + ]; + lastPoint.rightContX = lastPoint.rightContY = null; // reset for updating series later + } + return ret; + } +}); +seriesTypes.spline = SplineSeries; + +/** + * Set the default options for areaspline + */ +defaultPlotOptions.areaspline = merge(defaultPlotOptions.area); + +/** + * AreaSplineSeries object + */ +var areaProto = AreaSeries.prototype, + AreaSplineSeries = extendClass(SplineSeries, { + type: 'areaspline', + closedStacks: true, // instead of following the previous graph back, follow the threshold back + + // Mix in methods from the area series + getSegmentPath: areaProto.getSegmentPath, + closeSegment: areaProto.closeSegment, + drawGraph: areaProto.drawGraph + }); +seriesTypes.areaspline = AreaSplineSeries; + +/** + * Set the default options for column + */ +defaultPlotOptions.column = merge(defaultSeriesOptions, { + borderColor: '#FFFFFF', + borderWidth: 1, + borderRadius: 0, + //colorByPoint: undefined, + groupPadding: 0.2, + //grouping: true, + marker: null, // point options are specified in the base options + pointPadding: 0.1, + //pointWidth: null, + minPointLength: 0, + cropThreshold: 50, // when there are more points, they will not animate out of the chart on xAxis.setExtremes + pointRange: null, // null means auto, meaning 1 in a categorized axis and least distance between points if not categories + states: { + hover: { + brightness: 0.1, + shadow: false + }, + select: { + color: '#C0C0C0', + borderColor: '#000000', + shadow: false + } + }, + dataLabels: { + align: null, // auto + verticalAlign: null, // auto + y: null + }, + threshold: 0 +}); + +/** + * ColumnSeries object + */ +var ColumnSeries = extendClass(Series, { + type: 'column', + tooltipOutsidePlot: true, + pointAttrToOptions: { // mapping between SVG attributes and the corresponding options + stroke: 'borderColor', + 'stroke-width': 'borderWidth', + fill: 'color', + r: 'borderRadius' + }, + + /** + * Initialize the series + */ + init: function () { + Series.prototype.init.apply(this, arguments); + + var series = this, + chart = series.chart; + + // if the series is added dynamically, force redraw of other + // series affected by a new column + if (chart.hasRendered) { + each(chart.series, function (otherSeries) { + if (otherSeries.type === series.type) { + otherSeries.isDirty = true; + } + }); + } + }, + + /** + * Translate each point to the plot area coordinate system and find shape positions + */ + translate: function () { + var series = this, + chart = series.chart, + options = series.options, + stacking = options.stacking, + borderWidth = options.borderWidth, + columnCount = 0, + xAxis = series.xAxis, + yAxis = series.yAxis, + reversedXAxis = xAxis.reversed, + stackGroups = {}, + stackKey, + columnIndex; + + Series.prototype.translate.apply(series); + + // Get the total number of column type series. + // This is called on every series. Consider moving this logic to a + // chart.orderStacks() function and call it on init, addSeries and removeSeries + if (options.grouping === false) { + columnCount = 1; + } else { + each(chart.series, function (otherSeries) { + var otherOptions = otherSeries.options; + if (otherSeries.type === series.type && otherSeries.visible && + series.options.group === otherOptions.group) { // used in Stock charts navigator series + if (otherOptions.stacking) { + stackKey = otherSeries.stackKey; + if (stackGroups[stackKey] === UNDEFINED) { + stackGroups[stackKey] = columnCount++; + } + columnIndex = stackGroups[stackKey]; + } else if (otherOptions.grouping !== false) { // #1162 + columnIndex = columnCount++; + } + otherSeries.columnIndex = columnIndex; + } + }); + } + + // calculate the width and position of each column based on + // the number of column series in the plot, the groupPadding + // and the pointPadding options + var points = series.points, + categoryWidth = mathAbs(xAxis.transA) * (xAxis.ordinalSlope || options.pointRange || xAxis.closestPointRange || 1), + groupPadding = categoryWidth * options.groupPadding, + groupWidth = categoryWidth - 2 * groupPadding, + pointOffsetWidth = groupWidth / columnCount, + optionPointWidth = options.pointWidth, + pointPadding = defined(optionPointWidth) ? (pointOffsetWidth - optionPointWidth) / 2 : + pointOffsetWidth * options.pointPadding, + pointWidth = pick(optionPointWidth, pointOffsetWidth - 2 * pointPadding), // exact point width, used in polar charts + barW = mathCeil(mathMax(pointWidth, 1 + 2 * borderWidth)), // rounded and postprocessed for border width + colIndex = (reversedXAxis ? + columnCount - (series.columnIndex || 0) : // #1251 + series.columnIndex) || 0, + pointXOffset = pointPadding + (groupPadding + colIndex * + pointOffsetWidth - (categoryWidth / 2)) * + (reversedXAxis ? -1 : 1), + threshold = options.threshold, + translatedThreshold = series.translatedThreshold = yAxis.getThreshold(threshold), + minPointLength = pick(options.minPointLength, 5); + + // record the new values + each(points, function (point) { + var plotY = mathMin(mathMax(-999, point.plotY), yAxis.len + 999), // Don't draw too far outside plot area (#1303) + yBottom = pick(point.yBottom, translatedThreshold), + barX = point.plotX + pointXOffset, + barY = mathCeil(mathMin(plotY, yBottom)), + barH = mathCeil(mathMax(plotY, yBottom) - barY), + stack = yAxis.stacks[(point.y < 0 ? '-' : '') + series.stackKey], + shapeArgs; + + // Record the offset'ed position and width of the bar to be able to align the stacking total correctly + if (stacking && series.visible && stack && stack[point.x]) { + stack[point.x].setOffset(pointXOffset, barW); + } + + // handle options.minPointLength + if (mathAbs(barH) < minPointLength) { + if (minPointLength) { + barH = minPointLength; + barY = + mathAbs(barY - translatedThreshold) > minPointLength ? // stacked + yBottom - minPointLength : // keep position + translatedThreshold - (plotY <= translatedThreshold ? minPointLength : 0); + } + } + + point.barX = barX; + point.pointWidth = pointWidth; + + // create shape type and shape args that are reused in drawPoints and drawTracker + point.shapeType = 'rect'; + point.shapeArgs = shapeArgs = chart.renderer.Element.prototype.crisp.call(0, borderWidth, barX, barY, barW, barH); + + if (borderWidth % 2) { // correct for shorting in crisp method, visible in stacked columns with 1px border + shapeArgs.y -= 1; + shapeArgs.height += 1; + } + + // make small columns responsive to mouse + point.trackerArgs = mathAbs(barH) < 3 && merge(point.shapeArgs, { + height: 6, + y: barY - 3 + }); + }); + + }, + + getSymbol: noop, + + /** + * Use a solid rectangle like the area series types + */ + drawLegendSymbol: AreaSeries.prototype.drawLegendSymbol, + + + /** + * Columns have no graph + */ + drawGraph: noop, + + /** + * Draw the columns. For bars, the series.group is rotated, so the same coordinates + * apply for columns and bars. This method is inherited by scatter series. + * + */ + drawPoints: function () { + var series = this, + options = series.options, + renderer = series.chart.renderer, + shapeArgs; + + + // draw the columns + each(series.points, function (point) { + var plotY = point.plotY, + graphic = point.graphic; + if (plotY !== UNDEFINED && !isNaN(plotY) && point.y !== null) { + shapeArgs = point.shapeArgs; + if (graphic) { // update + stop(graphic); + graphic.animate(merge(shapeArgs)); + + } else { + point.graphic = graphic = renderer[point.shapeType](shapeArgs) + .attr(point.pointAttr[point.selected ? SELECT_STATE : NORMAL_STATE]) + .add(series.group) + .shadow(options.shadow, null, options.stacking && !options.borderRadius); + } + + } else if (graphic) { + point.graphic = graphic.destroy(); // #1269 + } + }); + }, + /** + * Draw the individual tracker elements. + * This method is inherited by pie charts too. + */ + drawTracker: function () { + var series = this, + chart = series.chart, + renderer = chart.renderer, + shapeArgs, + tracker, + trackerLabel = +new Date(), + options = series.options, + cursor = options.cursor, + css = cursor && { cursor: cursor }, + trackerGroup = series.isCartesian && series.plotGroup('trackerGroup', null, VISIBLE, options.zIndex || 1, chart.trackerGroup), + rel, + plotY, + validPlotY, + points = series.points, + point, + i = points.length, + onMouseOver = function (event) { + rel = event.relatedTarget || event.fromElement; + if (chart.hoverSeries !== series && attr(rel, 'isTracker') !== trackerLabel) { + series.onMouseOver(); + } + points[event.target._i].onMouseOver(); + }, + onMouseOut = function (event) { + if (!options.stickyTracking) { + rel = event.relatedTarget || event.toElement; + if (attr(rel, 'isTracker') !== trackerLabel) { + series.onMouseOut(); + } + } + }; + + while (i--) { + point = points[i]; + tracker = point.tracker; + shapeArgs = point.trackerArgs || point.shapeArgs; + plotY = point.plotY; + validPlotY = !series.isCartesian || (plotY !== UNDEFINED && !isNaN(plotY)); + delete shapeArgs.strokeWidth; + if (point.y !== null && validPlotY) { + if (tracker) {// update + tracker.attr(shapeArgs); + + } else { + point.tracker = tracker = + renderer[point.shapeType](shapeArgs) + .attr({ + isTracker: trackerLabel, + fill: TRACKER_FILL, + visibility: series.visible ? VISIBLE : HIDDEN + }) + .on('mouseover', onMouseOver) + .on('mouseout', onMouseOut) + .css(css) + .add(point.group || trackerGroup); // pies have point group - see issue #118 + + if (hasTouch) { + tracker.on('touchstart', onMouseOver); + } + } + tracker.element._i = i; + } + } + }, + + /** + * Override the basic data label alignment by adjusting for the position of the column + */ + alignDataLabel: function (point, dataLabel, options, alignTo, isNew) { + var chart = this.chart, + inverted = chart.inverted, + below = point.below || (point.plotY > pick(this.translatedThreshold, chart.plotSizeY)), + inside = (this.options.stacking || options.inside); // draw it inside the box? + + // Align to the column itself, or the top of it + if (point.shapeArgs) { // Area range uses this method but not alignTo + alignTo = merge(point.shapeArgs); + if (inverted) { + alignTo = { + x: chart.plotWidth - alignTo.y - alignTo.height, + y: chart.plotHeight - alignTo.x - alignTo.width, + width: alignTo.height, + height: alignTo.width + }; + } + + // Compute the alignment box + if (!inside) { + if (inverted) { + alignTo.x += below ? 0 : alignTo.width; + alignTo.width = 0; + } else { + alignTo.y += below ? alignTo.height : 0; + alignTo.height = 0; + } + } + } + + // When alignment is undefined (typically columns and bars), display the individual + // point below or above the point depending on the threshold + options.align = pick( + options.align, + !inverted || inside ? 'center' : below ? 'right' : 'left' + ); + options.verticalAlign = pick( + options.verticalAlign, + inverted || inside ? 'middle' : below ? 'top' : 'bottom' + ); + + // Call the parent method + Series.prototype.alignDataLabel.call(this, point, dataLabel, options, alignTo, isNew); + }, + + + /** + * Animate the column heights one by one from zero + * @param {Boolean} init Whether to initialize the animation or run it + */ + animate: function (init) { + var series = this, + points = series.points, + options = series.options; + + if (!init) { // run the animation + /* + * Note: Ideally the animation should be initialized by calling + * series.group.hide(), and then calling series.group.show() + * after the animation was started. But this rendered the shadows + * invisible in IE8 standards mode. If the columns flicker on large + * datasets, this is the cause. + */ + + each(points, function (point) { + var graphic = point.graphic, + shapeArgs = point.shapeArgs, + yAxis = series.yAxis, + threshold = options.threshold; + + if (graphic) { + // start values + graphic.attr({ + height: 0, + y: defined(threshold) ? + yAxis.getThreshold(threshold) : + yAxis.translate(yAxis.getExtremes().min, 0, 1, 0, 1) + }); + + // animate + graphic.animate({ + height: shapeArgs.height, + y: shapeArgs.y + }, options.animation); + } + }); + + + // delete this function to allow it only once + series.animate = null; + } + + }, + + /** + * Remove this series from the chart + */ + remove: function () { + var series = this, + chart = series.chart; + + // column and bar series affects other series of the same type + // as they are either stacked or grouped + if (chart.hasRendered) { + each(chart.series, function (otherSeries) { + if (otherSeries.type === series.type) { + otherSeries.isDirty = true; + } + }); + } + + Series.prototype.remove.apply(series, arguments); + } +}); +seriesTypes.column = ColumnSeries; +/** + * Set the default options for bar + */ +defaultPlotOptions.bar = merge(defaultPlotOptions.column); +/** + * The Bar series class + */ +var BarSeries = extendClass(ColumnSeries, { + type: 'bar', + inverted: true +}); +seriesTypes.bar = BarSeries; + +/** + * Set the default options for scatter + */ +defaultPlotOptions.scatter = merge(defaultSeriesOptions, { + lineWidth: 0, + states: { + hover: { + lineWidth: 0 + } + }, + tooltip: { + headerFormat: '{series.name}
', + pointFormat: 'x: {point.x}
y: {point.y}
' + } +}); + +/** + * The scatter series class + */ +var ScatterSeries = extendClass(Series, { + type: 'scatter', + sorted: false, + requireSorting: false, + /** + * Extend the base Series' translate method by adding shape type and + * arguments for the point trackers + */ + translate: function () { + var series = this; + + Series.prototype.translate.apply(series); + + each(series.points, function (point) { + point.shapeType = 'circle'; + point.shapeArgs = { + x: point.plotX, + y: point.plotY, + r: series.chart.options.tooltip.snap + }; + }); + }, + + /** + * Add tracking event listener to the series group, so the point graphics + * themselves act as trackers + */ + drawTracker: function () { + var series = this, + cursor = series.options.cursor, + css = cursor && { cursor: cursor }, + points = series.points, + i = points.length, + graphic, + markerGroup = series.markerGroup, + onMouseOver = function (e) { + series.onMouseOver(); + if (e.target._i !== UNDEFINED) { // undefined on graph in scatterchart + points[e.target._i].onMouseOver(); + } + }, + onMouseOut = function () { + if (!series.options.stickyTracking) { + series.onMouseOut(); + } + }; + + // Set an expando property for the point index, used below + while (i--) { + graphic = points[i].graphic; + if (graphic) { // doesn't exist for null points + graphic.element._i = i; + } + } + + // Add the event listeners, we need to do this only once + if (!series._hasTracking) { + markerGroup + .attr({ + isTracker: true + }) + .on('mouseover', onMouseOver) + .on('mouseout', onMouseOut) + .css(css); + if (hasTouch) { + markerGroup.on('touchstart', onMouseOver); + } + + } else { + series._hasTracking = true; + } + }, + + setTooltipPoints: noop +}); +seriesTypes.scatter = ScatterSeries; + +/** + * Set the default options for pie + */ +defaultPlotOptions.pie = merge(defaultSeriesOptions, { + borderColor: '#FFFFFF', + borderWidth: 1, + center: ['50%', '50%'], + colorByPoint: true, // always true for pies + dataLabels: { + // align: null, + // connectorWidth: 1, + // connectorColor: point.color, + // connectorPadding: 5, + distance: 30, + enabled: true, + formatter: function () { + return this.point.name; + } + // softConnector: true, + //y: 0 + }, + //innerSize: 0, + legendType: 'point', + marker: null, // point options are specified in the base options + size: '75%', + showInLegend: false, + slicedOffset: 10, + states: { + hover: { + brightness: 0.1, + shadow: false + } + } +}); + +/** + * Extended point object for pies + */ +var PiePoint = extendClass(Point, { + /** + * Initiate the pie slice + */ + init: function () { + + Point.prototype.init.apply(this, arguments); + + var point = this, + toggleSlice; + + //visible: options.visible !== false, + extend(point, { + visible: point.visible !== false, + name: pick(point.name, 'Slice') + }); + + // add event listener for select + toggleSlice = function () { + point.slice(); + }; + addEvent(point, 'select', toggleSlice); + addEvent(point, 'unselect', toggleSlice); + + return point; + }, + + /** + * Toggle the visibility of the pie slice + * @param {Boolean} vis Whether to show the slice or not. If undefined, the + * visibility is toggled + */ + setVisible: function (vis) { + var point = this, + series = point.series, + chart = series.chart, + tracker = point.tracker, + dataLabel = point.dataLabel, + connector = point.connector, + shadowGroup = point.shadowGroup, + method; + + // if called without an argument, toggle visibility + point.visible = vis = vis === UNDEFINED ? !point.visible : vis; + + method = vis ? 'show' : 'hide'; + + point.group[method](); + if (tracker) { + tracker[method](); + } + if (dataLabel) { + dataLabel[method](); + } + if (connector) { + connector[method](); + } + if (shadowGroup) { + shadowGroup[method](); + } + if (point.legendItem) { + chart.legend.colorizeItem(point, vis); + } + + // Handle ignore hidden slices + if (!series.isDirty && series.options.ignoreHiddenPoint) { + series.isDirty = true; + chart.redraw(); + } + }, + + /** + * Set or toggle whether the slice is cut out from the pie + * @param {Boolean} sliced When undefined, the slice state is toggled + * @param {Boolean} redraw Whether to redraw the chart. True by default. + */ + slice: function (sliced, redraw, animation) { + var point = this, + series = point.series, + chart = series.chart, + slicedTranslation = point.slicedTranslation, + translation; + + setAnimation(animation, chart); + + // redraw is true by default + redraw = pick(redraw, true); + + // if called without an argument, toggle + sliced = point.sliced = defined(sliced) ? sliced : !point.sliced; + + translation = { + translateX: (sliced ? slicedTranslation[0] : chart.plotLeft), + translateY: (sliced ? slicedTranslation[1] : chart.plotTop) + }; + point.group.animate(translation); + if (point.shadowGroup) { + point.shadowGroup.animate(translation); + } + + } +}); + +/** + * The Pie series class + */ +var PieSeries = { + type: 'pie', + isCartesian: false, + pointClass: PiePoint, + requireSorting: false, + pointAttrToOptions: { // mapping between SVG attributes and the corresponding options + stroke: 'borderColor', + 'stroke-width': 'borderWidth', + fill: 'color' + }, + + /** + * Pies have one color each point + */ + getColor: function () { + // record first color for use in setData + this.initialColor = this.chart.counters.color; + }, + + /** + * Animate the pies in + */ + animate: function () { + var series = this, + points = series.points, + startAngleRad = series.startAngleRad; + + each(points, function (point) { + var graphic = point.graphic, + args = point.shapeArgs; + + if (graphic) { + // start values + graphic.attr({ + r: series.center[3] / 2, // animate from inner radius (#779) + start: startAngleRad, + end: startAngleRad + }); + + // animate + graphic.animate({ + r: args.r, + start: args.start, + end: args.end + }, series.options.animation); + } + }); + + // delete this function to allow it only once + series.animate = null; + + }, + + /** + * Extend the basic setData method by running processData and generatePoints immediately, + * in order to access the points from the legend. + */ + setData: function (data, redraw) { + Series.prototype.setData.call(this, data, false); + this.processData(); + this.generatePoints(); + if (pick(redraw, true)) { + this.chart.redraw(); + } + }, + + /** + * Get the center of the pie based on the size and center options relative to the + * plot area. Borrowed by the polar and gauge series types. + */ + getCenter: function () { + + var options = this.options, + chart = this.chart, + plotWidth = chart.plotWidth, + plotHeight = chart.plotHeight, + positions = options.center.concat([options.size, options.innerSize || 0]), + smallestSize = mathMin(plotWidth, plotHeight), + isPercent; + + return map(positions, function (length, i) { + + isPercent = /%$/.test(length); + return isPercent ? + // i == 0: centerX, relative to width + // i == 1: centerY, relative to height + // i == 2: size, relative to smallestSize + // i == 4: innerSize, relative to smallestSize + [plotWidth, plotHeight, smallestSize, smallestSize][i] * + pInt(length) / 100 : + length; + }); + }, + + /** + * Do translation for pie slices + */ + translate: function () { + this.generatePoints(); + + var total = 0, + series = this, + cumulative = 0, + precision = 1000, // issue #172 + options = series.options, + slicedOffset = options.slicedOffset, + connectorOffset = slicedOffset + options.borderWidth, + positions, + chart = series.chart, + start, + end, + angle, + startAngleRad = series.startAngleRad = mathPI / 180 * ((options.startAngle || 0) % 360 - 90), + points = series.points, + circ = 2 * mathPI, + fraction, + radiusX, // the x component of the radius vector for a given point + radiusY, + labelDistance = options.dataLabels.distance, + ignoreHiddenPoint = options.ignoreHiddenPoint, + i, + len = points.length, + point; + + // get positions - either an integer or a percentage string must be given + series.center = positions = series.getCenter(); + + // utility for getting the x value from a given y, used for anticollision logic in data labels + series.getX = function (y, left) { + + angle = math.asin((y - positions[1]) / (positions[2] / 2 + labelDistance)); + + return positions[0] + + (left ? -1 : 1) * + (mathCos(angle) * (positions[2] / 2 + labelDistance)); + }; + + // get the total sum + for (i = 0; i < len; i++) { + point = points[i]; + total += (ignoreHiddenPoint && !point.visible) ? 0 : point.y; + } + + // Calculate the geometry for each point + for (i = 0; i < len; i++) { + + point = points[i]; + + // set start and end angle + fraction = total ? point.y / total : 0; + start = mathRound((startAngleRad + (cumulative * circ)) * precision) / precision; + if (!ignoreHiddenPoint || point.visible) { + cumulative += fraction; + } + end = mathRound((startAngleRad + (cumulative * circ)) * precision) / precision; + + // set the shape + point.shapeType = 'arc'; + point.shapeArgs = { + x: positions[0], + y: positions[1], + r: positions[2] / 2, + innerR: positions[3] / 2, + start: start, + end: end + }; + + // center for the sliced out slice + angle = (end + start) / 2; + if (angle > 0.75 * circ) { + angle -= 2 * mathPI; + } + point.slicedTranslation = map([ + mathCos(angle) * slicedOffset + chart.plotLeft, + mathSin(angle) * slicedOffset + chart.plotTop + ], mathRound); + + // set the anchor point for tooltips + radiusX = mathCos(angle) * positions[2] / 2; + radiusY = mathSin(angle) * positions[2] / 2; + point.tooltipPos = [ + positions[0] + radiusX * 0.7, + positions[1] + radiusY * 0.7 + ]; + + point.half = angle < circ / 4 ? 0 : 1; + point.angle = angle; + + // set the anchor point for data labels + point.labelPos = [ + positions[0] + radiusX + mathCos(angle) * labelDistance, // first break of connector + positions[1] + radiusY + mathSin(angle) * labelDistance, // a/a + positions[0] + radiusX + mathCos(angle) * connectorOffset, // second break, right outside pie + positions[1] + radiusY + mathSin(angle) * connectorOffset, // a/a + positions[0] + radiusX, // landing point for connector + positions[1] + radiusY, // a/a + labelDistance < 0 ? // alignment + 'center' : + point.half ? 'right' : 'left', // alignment + angle // center angle + ]; + + // API properties + point.percentage = fraction * 100; + point.total = total; + + } + + + this.setTooltipPoints(); + }, + + /** + * Render the slices + */ + render: function () { + var series = this; + + // cache attributes for shapes + series.getAttribs(); + + this.drawPoints(); + + // draw the mouse tracking area + if (series.options.enableMouseTracking !== false) { + series.drawTracker(); + } + + this.drawDataLabels(); + + if (series.options.animation && series.animate) { + series.animate(); + } + + // (See #322) series.isDirty = series.isDirtyData = false; // means data is in accordance with what you see + series.isDirty = false; // means data is in accordance with what you see + }, + + /** + * Draw the data points + */ + drawPoints: function () { + var series = this, + chart = series.chart, + renderer = chart.renderer, + groupTranslation, + //center, + graphic, + group, + shadow = series.options.shadow, + shadowGroup, + shapeArgs; + + // draw the slices + each(series.points, function (point) { + graphic = point.graphic; + shapeArgs = point.shapeArgs; + group = point.group; + shadowGroup = point.shadowGroup; + + // put the shadow behind all points + if (shadow && !shadowGroup) { + shadowGroup = point.shadowGroup = renderer.g('shadow') + .attr({ zIndex: 4 }) + .add(); + } + + // create the group the first time + if (!group) { + group = point.group = renderer.g('point') + .attr({ zIndex: 5 }) + .add(); + } + + // if the point is sliced, use special translation, else use plot area traslation + groupTranslation = point.sliced ? point.slicedTranslation : [chart.plotLeft, chart.plotTop]; + group.translate(groupTranslation[0], groupTranslation[1]); + if (shadowGroup) { + shadowGroup.translate(groupTranslation[0], groupTranslation[1]); + } + + // draw the slice + if (graphic) { + graphic.animate(shapeArgs); + } else { + point.graphic = graphic = renderer.arc(shapeArgs) + .setRadialReference(series.center) + .attr(extend( + point.pointAttr[NORMAL_STATE], + { 'stroke-linejoin': 'round' } + )) + .add(point.group) + .shadow(shadow, shadowGroup); + + } + + // detect point specific visibility + if (point.visible === false) { + point.setVisible(false); + } + + }); + + }, + + /** + * Override the base drawDataLabels method by pie specific functionality + */ + drawDataLabels: function () { + var series = this, + data = series.data, + point, + chart = series.chart, + options = series.options.dataLabels, + connectorPadding = pick(options.connectorPadding, 10), + connectorWidth = pick(options.connectorWidth, 1), + connector, + connectorPath, + softConnector = pick(options.softConnector, true), + distanceOption = options.distance, + seriesCenter = series.center, + radius = seriesCenter[2] / 2, + centerY = seriesCenter[1], + outside = distanceOption > 0, + dataLabel, + labelPos, + labelHeight, + halves = [// divide the points into right and left halves for anti collision + [], // right + [] // left + ], + x, + y, + visibility, + rankArr, + i = 2, + j, + sort = function (a, b) { + return b.y - a.y; + }, + sortByAngle = function (points, sign) { + points.sort(function (a, b) { + return (b.angle - a.angle) * sign; + }); + }; + + // get out if not enabled + if (!options.enabled && !series._hasPointLabels) { + return; + } + + // run parent method + Series.prototype.drawDataLabels.apply(series); + + // arrange points for detection collision + each(data, function (point) { + if (point.dataLabel) { // it may have been cancelled in the base method (#407) + halves[point.half].push(point); + } + }); + + // assume equal label heights + labelHeight = halves[0][0] && halves[0][0].dataLabel && (halves[0][0].dataLabel.getBBox().height || 21); // 21 is for #968 + + /* Loop over the points in each half, starting from the top and bottom + * of the pie to detect overlapping labels. + */ + while (i--) { + + var slots = [], + slotsLength, + usedSlots = [], + points = halves[i], + pos, + length = points.length, + slotIndex; + + // Sort by angle + sortByAngle(points, i - 0.5); + + // Only do anti-collision when we are outside the pie and have connectors (#856) + if (distanceOption > 0) { + + // build the slots + for (pos = centerY - radius - distanceOption; pos <= centerY + radius + distanceOption; pos += labelHeight) { + slots.push(pos); + // visualize the slot + /* + var slotX = series.getX(pos, i) + chart.plotLeft - (i ? 100 : 0), + slotY = pos + chart.plotTop; + if (!isNaN(slotX)) { + chart.renderer.rect(slotX, slotY - 7, 100, labelHeight) + .attr({ + 'stroke-width': 1, + stroke: 'silver' + }) + .add(); + chart.renderer.text('Slot '+ (slots.length - 1), slotX, slotY + 4) + .attr({ + fill: 'silver' + }).add(); + } + // */ + } + slotsLength = slots.length; + + // if there are more values than available slots, remove lowest values + if (length > slotsLength) { + // create an array for sorting and ranking the points within each quarter + rankArr = [].concat(points); + rankArr.sort(sort); + j = length; + while (j--) { + rankArr[j].rank = j; + } + j = length; + while (j--) { + if (points[j].rank >= slotsLength) { + points.splice(j, 1); + } + } + length = points.length; + } + + // The label goes to the nearest open slot, but not closer to the edge than + // the label's index. + for (j = 0; j < length; j++) { + + point = points[j]; + labelPos = point.labelPos; + + var closest = 9999, + distance, + slotI; + + // find the closest slot index + for (slotI = 0; slotI < slotsLength; slotI++) { + distance = mathAbs(slots[slotI] - labelPos[1]); + if (distance < closest) { + closest = distance; + slotIndex = slotI; + } + } + + // if that slot index is closer to the edges of the slots, move it + // to the closest appropriate slot + if (slotIndex < j && slots[j] !== null) { // cluster at the top + slotIndex = j; + } else if (slotsLength < length - j + slotIndex && slots[j] !== null) { // cluster at the bottom + slotIndex = slotsLength - length + j; + while (slots[slotIndex] === null) { // make sure it is not taken + slotIndex++; + } + } else { + // Slot is taken, find next free slot below. In the next run, the next slice will find the + // slot above these, because it is the closest one + while (slots[slotIndex] === null) { // make sure it is not taken + slotIndex++; + } + } + + usedSlots.push({ i: slotIndex, y: slots[slotIndex] }); + slots[slotIndex] = null; // mark as taken + } + // sort them in order to fill in from the top + usedSlots.sort(sort); + } + + // now the used slots are sorted, fill them up sequentially + for (j = 0; j < length; j++) { + + var slot, naturalY; + + point = points[j]; + labelPos = point.labelPos; + dataLabel = point.dataLabel; + visibility = point.visible === false ? HIDDEN : VISIBLE; + naturalY = labelPos[1]; + + if (distanceOption > 0) { + slot = usedSlots.pop(); + slotIndex = slot.i; + + // if the slot next to currrent slot is free, the y value is allowed + // to fall back to the natural position + y = slot.y; + if ((naturalY > y && slots[slotIndex + 1] !== null) || + (naturalY < y && slots[slotIndex - 1] !== null)) { + y = naturalY; + } + + } else { + y = naturalY; + } + + // get the x - use the natural x position for first and last slot, to prevent the top + // and botton slice connectors from touching each other on either side + x = options.justify ? + seriesCenter[0] + (i ? -1 : 1) * (radius + distanceOption) : + series.getX(slotIndex === 0 || slotIndex === slots.length - 1 ? naturalY : y, i); + + // move or place the data label + dataLabel + .attr({ + visibility: visibility, + align: labelPos[6] + })[dataLabel.moved ? 'animate' : 'attr']({ + x: x + options.x + + ({ left: connectorPadding, right: -connectorPadding }[labelPos[6]] || 0), + y: y + options.y - 10 // 10 is for the baseline (label vs text) + }); + dataLabel.moved = true; + + // draw the connector + if (outside && connectorWidth) { + connector = point.connector; + + connectorPath = softConnector ? [ + M, + x + (labelPos[6] === 'left' ? 5 : -5), y, // end of the string at the label + 'C', + x, y, // first break, next to the label + 2 * labelPos[2] - labelPos[4], 2 * labelPos[3] - labelPos[5], + labelPos[2], labelPos[3], // second break + L, + labelPos[4], labelPos[5] // base + ] : [ + M, + x + (labelPos[6] === 'left' ? 5 : -5), y, // end of the string at the label + L, + labelPos[2], labelPos[3], // second break + L, + labelPos[4], labelPos[5] // base + ]; + + if (connector) { + connector.animate({ d: connectorPath }); + connector.attr('visibility', visibility); + + } else { + point.connector = connector = series.chart.renderer.path(connectorPath).attr({ + 'stroke-width': connectorWidth, + stroke: options.connectorColor || point.color || '#606060', + visibility: visibility, + zIndex: 3 + }) + .translate(chart.plotLeft, chart.plotTop) + .add(); + } + } + } + } + }, + + alignDataLabel: noop, + + /** + * Draw point specific tracker objects. Inherit directly from column series. + */ + drawTracker: ColumnSeries.prototype.drawTracker, + + /** + * Use a simple symbol from column prototype + */ + drawLegendSymbol: AreaSeries.prototype.drawLegendSymbol, + + /** + * Pies don't have point marker symbols + */ + getSymbol: function () {} + +}; +PieSeries = extendClass(Series, PieSeries); +seriesTypes.pie = PieSeries; + +/* **************************************************************************** + * Start data grouping module * + ******************************************************************************/ +/*jslint white:true */ +var DATA_GROUPING = 'dataGrouping', + seriesProto = Series.prototype, + baseProcessData = seriesProto.processData, + baseGeneratePoints = seriesProto.generatePoints, + baseDestroy = seriesProto.destroy, + baseTooltipHeaderFormatter = seriesProto.tooltipHeaderFormatter, + NUMBER = 'number', + + commonOptions = { + approximation: 'average', // average, open, high, low, close, sum + //enabled: null, // (true for stock charts, false for basic), + //forced: undefined, + groupPixelWidth: 2, + // the first one is the point or start value, the second is the start value if we're dealing with range, + // the third one is the end value if dealing with a range + dateTimeLabelFormats: hash( + MILLISECOND, ['%A, %b %e, %H:%M:%S.%L', '%A, %b %e, %H:%M:%S.%L', '-%H:%M:%S.%L'], + SECOND, ['%A, %b %e, %H:%M:%S', '%A, %b %e, %H:%M:%S', '-%H:%M:%S'], + MINUTE, ['%A, %b %e, %H:%M', '%A, %b %e, %H:%M', '-%H:%M'], + HOUR, ['%A, %b %e, %H:%M', '%A, %b %e, %H:%M', '-%H:%M'], + DAY, ['%A, %b %e, %Y', '%A, %b %e', '-%A, %b %e, %Y'], + WEEK, ['Week from %A, %b %e, %Y', '%A, %b %e', '-%A, %b %e, %Y'], + MONTH, ['%B %Y', '%B', '-%B %Y'], + YEAR, ['%Y', '%Y', '-%Y'] + ) + // smoothed = false, // enable this for navigator series only + }, + + specificOptions = { // extends common options + line: {}, + spline: {}, + area: {}, + areaspline: {}, + column: { + approximation: 'sum', + groupPixelWidth: 10 + }, + arearange: { + approximation: 'range' + }, + areasplinerange: { + approximation: 'range' + }, + columnrange: { + approximation: 'range', + groupPixelWidth: 10 + }, + candlestick: { + approximation: 'ohlc', + groupPixelWidth: 10 + }, + ohlc: { + approximation: 'ohlc', + groupPixelWidth: 5 + } + }, + + // units are defined in a separate array to allow complete overriding in case of a user option + defaultDataGroupingUnits = [[ + MILLISECOND, // unit name + [1, 2, 5, 10, 20, 25, 50, 100, 200, 500] // allowed multiples + ], [ + SECOND, + [1, 2, 5, 10, 15, 30] + ], [ + MINUTE, + [1, 2, 5, 10, 15, 30] + ], [ + HOUR, + [1, 2, 3, 4, 6, 8, 12] + ], [ + DAY, + [1] + ], [ + WEEK, + [1] + ], [ + MONTH, + [1, 3, 6] + ], [ + YEAR, + null + ] + ], + + + /** + * Define the available approximation types. The data grouping approximations takes an array + * or numbers as the first parameter. In case of ohlc, four arrays are sent in as four parameters. + * Each array consists only of numbers. In case null values belong to the group, the property + * .hasNulls will be set to true on the array. + */ + approximations = { + sum: function (arr) { + var len = arr.length, + ret; + + // 1. it consists of nulls exclusively + if (!len && arr.hasNulls) { + ret = null; + // 2. it has a length and real values + } else if (len) { + ret = 0; + while (len--) { + ret += arr[len]; + } + } + // 3. it has zero length, so just return undefined + // => doNothing() + + return ret; + }, + average: function (arr) { + var len = arr.length, + ret = approximations.sum(arr); + + // If we have a number, return it divided by the length. If not, return + // null or undefined based on what the sum method finds. + if (typeof ret === NUMBER && len) { + ret = ret / len; + } + + return ret; + }, + open: function (arr) { + return arr.length ? arr[0] : (arr.hasNulls ? null : UNDEFINED); + }, + high: function (arr) { + return arr.length ? arrayMax(arr) : (arr.hasNulls ? null : UNDEFINED); + }, + low: function (arr) { + return arr.length ? arrayMin(arr) : (arr.hasNulls ? null : UNDEFINED); + }, + close: function (arr) { + return arr.length ? arr[arr.length - 1] : (arr.hasNulls ? null : UNDEFINED); + }, + // ohlc and range are special cases where a multidimensional array is input and an array is output + ohlc: function (open, high, low, close) { + open = approximations.open(open); + high = approximations.high(high); + low = approximations.low(low); + close = approximations.close(close); + + if (typeof open === NUMBER || typeof high === NUMBER || typeof low === NUMBER || typeof close === NUMBER) { + return [open, high, low, close]; + } + // else, return is undefined + }, + range: function (low, high) { + low = approximations.low(low); + high = approximations.high(high); + + if (typeof low === NUMBER || typeof high === NUMBER) { + return [low, high]; + } + // else, return is undefined + } + }; + +/*jslint white:false */ + +/** + * Takes parallel arrays of x and y data and groups the data into intervals defined by groupPositions, a collection + * of starting x values for each group. + */ +seriesProto.groupData = function (xData, yData, groupPositions, approximation) { + var series = this, + data = series.data, + dataOptions = series.options.data, + groupedXData = [], + groupedYData = [], + dataLength = xData.length, + pointX, + pointY, + groupedY, + handleYData = !!yData, // when grouping the fake extended axis for panning, we don't need to consider y + values = [[], [], [], []], + approximationFn = typeof approximation === 'function' ? approximation : approximations[approximation], + pointArrayMap = series.pointArrayMap, + pointArrayMapLength = pointArrayMap && pointArrayMap.length, + i; + + for (i = 0; i <= dataLength; i++) { + + // when a new group is entered, summarize and initiate the previous group + while ((groupPositions[1] !== UNDEFINED && xData[i] >= groupPositions[1]) || + i === dataLength) { // get the last group + + // get group x and y + pointX = groupPositions.shift(); + groupedY = approximationFn.apply(0, values); + + // push the grouped data + if (groupedY !== UNDEFINED) { + groupedXData.push(pointX); + groupedYData.push(groupedY); + } + + // reset the aggregate arrays + values[0] = []; + values[1] = []; + values[2] = []; + values[3] = []; + + // don't loop beyond the last group + if (i === dataLength) { + break; + } + } + + // break out + if (i === dataLength) { + break; + } + + // for each raw data point, push it to an array that contains all values for this specific group + if (pointArrayMap) { + + var index = series.cropStart + i, + point = (data && data[index]) || series.pointClass.prototype.applyOptions.apply({ series: series }, [dataOptions[index]]), + j, + val; + + for (j = 0; j < pointArrayMapLength; j++) { + val = point[pointArrayMap[j]]; + if (typeof val === NUMBER) { + values[j].push(val); + } else if (val === null) { + values[j].hasNulls = true; + } + } + + } else { + pointY = handleYData ? yData[i] : null; + + if (typeof pointY === NUMBER) { + values[0].push(pointY); + } else if (pointY === null) { + values[0].hasNulls = true; + } + } + + } + return [groupedXData, groupedYData]; +}; + +/** + * Extend the basic processData method, that crops the data to the current zoom + * range, with data grouping logic. + */ +seriesProto.processData = function () { + var series = this, + chart = series.chart, + options = series.options, + dataGroupingOptions = options[DATA_GROUPING], + groupingEnabled = dataGroupingOptions && pick(dataGroupingOptions.enabled, chart.options._stock), + hasGroupedData; + + // run base method + series.forceCrop = groupingEnabled; // #334 + + // skip if processData returns false or if grouping is disabled (in that order) + if (baseProcessData.apply(series, arguments) === false || !groupingEnabled) { + return; + + } else { + series.destroyGroupedData(); + + } + var i, + processedXData = series.processedXData, + processedYData = series.processedYData, + plotSizeX = chart.plotSizeX, + xAxis = series.xAxis, + groupPixelWidth = pick(xAxis.groupPixelWidth, dataGroupingOptions.groupPixelWidth), + dataLength = processedXData.length, + chartSeries = chart.series, + nonGroupedPointRange = series.pointRange; + + // attempt to solve #334: if multiple series are compared on the same x axis, give them the same + // group pixel width + if (!xAxis.groupPixelWidth) { + i = chartSeries.length; + while (i--) { + if (chartSeries[i].xAxis === xAxis && chartSeries[i].options[DATA_GROUPING]) { + groupPixelWidth = mathMax(groupPixelWidth, chartSeries[i].options[DATA_GROUPING].groupPixelWidth); + } + } + xAxis.groupPixelWidth = groupPixelWidth; + + } + + // Execute grouping if the amount of points is greater than the limit defined in groupPixelWidth + if (dataLength > (plotSizeX / groupPixelWidth) || (dataLength && dataGroupingOptions.forced)) { + hasGroupedData = true; + + series.points = null; // force recreation of point instances in series.translate + + var extremes = xAxis.getExtremes(), + xMin = extremes.min, + xMax = extremes.max, + groupIntervalFactor = (xAxis.getGroupIntervalFactor && xAxis.getGroupIntervalFactor(xMin, xMax, processedXData)) || 1, + interval = (groupPixelWidth * (xMax - xMin) / plotSizeX) * groupIntervalFactor, + groupPositions = (xAxis.getNonLinearTimeTicks || getTimeTicks)( + normalizeTimeTickInterval(interval, dataGroupingOptions.units || defaultDataGroupingUnits), + xMin, + xMax, + null, + processedXData, + series.closestPointRange + ), + groupedXandY = seriesProto.groupData.apply(series, [processedXData, processedYData, groupPositions, dataGroupingOptions.approximation]), + groupedXData = groupedXandY[0], + groupedYData = groupedXandY[1]; + + // prevent the smoothed data to spill out left and right, and make + // sure data is not shifted to the left + if (dataGroupingOptions.smoothed) { + i = groupedXData.length - 1; + groupedXData[i] = xMax; + while (i-- && i > 0) { + groupedXData[i] += interval / 2; + } + groupedXData[0] = xMin; + } + + // record what data grouping values were used + series.currentDataGrouping = groupPositions.info; + if (options.pointRange === null) { // null means auto, as for columns, candlesticks and OHLC + series.pointRange = groupPositions.info.totalRange; + } + series.closestPointRange = groupPositions.info.totalRange; + + // set series props + series.processedXData = groupedXData; + series.processedYData = groupedYData; + } else { + series.currentDataGrouping = null; + series.pointRange = nonGroupedPointRange; + } + + series.hasGroupedData = hasGroupedData; +}; + +/** + * Destroy the grouped data points. #622, #740 + */ +seriesProto.destroyGroupedData = function () { + + var groupedData = this.groupedData; + + // clear previous groups + each(groupedData || [], function (point, i) { + if (point) { + groupedData[i] = point.destroy ? point.destroy() : null; + } + }); + this.groupedData = null; +}; + +/** + * Override the generatePoints method by adding a reference to grouped data + */ +seriesProto.generatePoints = function () { + + baseGeneratePoints.apply(this); + + // record grouped data in order to let it be destroyed the next time processData runs + this.destroyGroupedData(); // #622 + this.groupedData = this.hasGroupedData ? this.points : null; +}; + +/** + * Make the tooltip's header reflect the grouped range + */ +seriesProto.tooltipHeaderFormatter = function (key) { + var series = this, + options = series.options, + tooltipOptions = series.tooltipOptions, + dataGroupingOptions = options.dataGrouping, + xDateFormat = tooltipOptions.xDateFormat, + xDateFormatEnd, + xAxis = series.xAxis, + currentDataGrouping, + dateTimeLabelFormats, + labelFormats, + formattedKey, + n, + ret; + + // apply only to grouped series + if (xAxis && xAxis.options.type === 'datetime' && dataGroupingOptions && isNumber(key)) { + + // set variables + currentDataGrouping = series.currentDataGrouping; + dateTimeLabelFormats = dataGroupingOptions.dateTimeLabelFormats; + + // if we have grouped data, use the grouping information to get the right format + if (currentDataGrouping) { + labelFormats = dateTimeLabelFormats[currentDataGrouping.unitName]; + if (currentDataGrouping.count === 1) { + xDateFormat = labelFormats[0]; + } else { + xDateFormat = labelFormats[1]; + xDateFormatEnd = labelFormats[2]; + } + // if not grouped, and we don't have set the xDateFormat option, get the best fit, + // so if the least distance between points is one minute, show it, but if the + // least distance is one day, skip hours and minutes etc. + } else if (!xDateFormat) { + for (n in timeUnits) { + if (timeUnits[n] >= xAxis.closestPointRange) { + xDateFormat = dateTimeLabelFormats[n][0]; + break; + } + } + } + + // now format the key + formattedKey = dateFormat(xDateFormat, key); + if (xDateFormatEnd) { + formattedKey += dateFormat(xDateFormatEnd, key + currentDataGrouping.totalRange - 1); + } + + // return the replaced format + ret = tooltipOptions.headerFormat.replace('{point.key}', formattedKey); + + // else, fall back to the regular formatter + } else { + ret = baseTooltipHeaderFormatter.apply(series, [key]); + } + + return ret; +}; + +/** + * Extend the series destroyer + */ +seriesProto.destroy = function () { + var series = this, + groupedData = series.groupedData || [], + i = groupedData.length; + + while (i--) { + if (groupedData[i]) { + groupedData[i].destroy(); + } + } + baseDestroy.apply(series); +}; + + +// Handle default options for data grouping. This must be set at runtime because some series types are +// defined after this. +wrap(seriesProto, 'setOptions', function (proceed, itemOptions) { + + var options = proceed.call(this, itemOptions), + type = this.type, + plotOptions = this.chart.options.plotOptions; + + if (specificOptions[type]) { // #1284 + if (!defaultPlotOptions[type].dataGrouping) { + defaultPlotOptions[type].dataGrouping = merge(commonOptions, specificOptions[type]); + } + + options.dataGrouping = merge( + defaultPlotOptions[type].dataGrouping, + plotOptions.series && plotOptions.series.dataGrouping, // #1228 + plotOptions[type].dataGrouping, // Set by the StockChart constructor + itemOptions.dataGrouping + ); + } + + if (this.chart.options._stock) { + this.requireSorting = true; + } + + return options; +}); + + + +/* **************************************************************************** + * End data grouping module * + ******************************************************************************//* **************************************************************************** + * Start OHLC series code * + *****************************************************************************/ + +// 1 - Set default options +defaultPlotOptions.ohlc = merge(defaultPlotOptions.column, { + lineWidth: 1, + tooltip: { + pointFormat: '{series.name}
' + + 'Open: {point.open}
' + + 'High: {point.high}
' + + 'Low: {point.low}
' + + 'Close: {point.close}
' + }, + states: { + hover: { + lineWidth: 3 + } + }, + threshold: null + //upColor: undefined +}); + +// 2- Create the OHLCPoint object +var OHLCPoint = extendClass(Point, { + /** + * Apply the options containing the x and OHLC data and possible some extra properties. + * This is called on point init or from point.update. Extends base Point by adding + * multiple y-like values. + * + * @param {Object} options + */ + applyOptions: function (options) { + var point = this, + series = point.series, + pointArrayMap = series.pointArrayMap, + i = 0, + j = 0, + valueCount = pointArrayMap.length; + + + // object input + if (typeof options === 'object' && typeof options.length !== 'number') { + + // copy options directly to point + extend(point, options); + + point.options = options; + + } else if (options.length) { // array + // with leading x value + if (options.length > valueCount) { + if (typeof options[0] === 'string') { + point.name = options[0]; + } else if (typeof options[0] === 'number') { + point.x = options[0]; + } + i++; + } + while (j < valueCount) { + point[pointArrayMap[j++]] = options[i++]; + } + } + + point.y = point[series.pointValKey]; + + // If no x is set by now, get auto incremented value. All points must have an + // x value, however the y value can be null to create a gap in the series + if (point.x === UNDEFINED && series) { + point.x = series.autoIncrement(); + } + + return point; + }, + + /** + * A specific OHLC tooltip formatter + */ + tooltipFormatter: function () { + var point = this, + series = point.series; + + return ['', (point.name || series.name), '
', + 'Open: ', point.open, '
', + 'High: ', point.high, '
', + 'Low: ', point.low, '
', + 'Close: ', point.close, '
'].join(''); + + }, + + /** + * Return a plain array for speedy calculation + */ + toYData: function () { + return [this.open, this.high, this.low, this.close]; + } + +}); + +// 3 - Create the OHLCSeries object +var OHLCSeries = extendClass(seriesTypes.column, { + type: 'ohlc', + pointArrayMap: ['open', 'high', 'low', 'close'], // array point configs are mapped to this + pointValKey: 'high', + pointClass: OHLCPoint, + + pointAttrToOptions: { // mapping between SVG attributes and the corresponding options + stroke: 'color', + 'stroke-width': 'lineWidth' + }, + upColorProp: 'stroke', + + /** + * Postprocess mapping between options and SVG attributes + */ + getAttribs: function () { + seriesTypes.column.prototype.getAttribs.apply(this, arguments); + var series = this, + options = series.options, + stateOptions = options.states, + upColor = options.upColor || series.color, + seriesDownPointAttr = merge(series.pointAttr), + upColorProp = series.upColorProp, + points = series.points || [], + length = points.length, + isUpDay, + point, + i; + + seriesDownPointAttr[''][upColorProp] = upColor; + seriesDownPointAttr.hover[upColorProp] = stateOptions.hover.upColor || upColor; + seriesDownPointAttr.select[upColorProp] = stateOptions.select.upColor || upColor; + + for (i = 0; i < length; i++) { + point = points[i]; + isUpDay = i > 0 ? points[i - 1].close < point.close : point.open < point.close; + + if (isUpDay) { + point.pointAttr = seriesDownPointAttr; + } + } + }, + + /** + * Translate data points from raw values x and y to plotX and plotY + */ + translate: function () { + var series = this, + yAxis = series.yAxis; + + seriesTypes.column.prototype.translate.apply(series); + + // do the translation + each(series.points, function (point) { + // the graphics + if (point.open !== null) { + point.plotOpen = yAxis.translate(point.open, 0, 1, 0, 1); + } + if (point.close !== null) { + point.plotClose = yAxis.translate(point.close, 0, 1, 0, 1); + } + + }); + }, + + /** + * Draw the data points + */ + drawPoints: function () { + var series = this, + points = series.points, + chart = series.chart, + pointAttr, + plotOpen, + plotClose, + crispCorr, + halfWidth, + path, + graphic, + crispX; + + + each(points, function (point) { + if (point.plotY !== UNDEFINED) { + + graphic = point.graphic; + pointAttr = point.pointAttr[point.selected ? 'selected' : '']; + + // crisp vector coordinates + crispCorr = (pointAttr['stroke-width'] % 2) / 2; + crispX = mathRound(point.plotX) + crispCorr; + halfWidth = mathRound(point.shapeArgs.width / 2); + + // the vertical stem + path = [ + 'M', + crispX, mathRound(point.yBottom), + 'L', + crispX, mathRound(point.plotY) + ]; + + // open + if (point.open !== null) { + plotOpen = mathRound(point.plotOpen) + crispCorr; + path.push( + 'M', + crispX, + plotOpen, + 'L', + crispX - halfWidth, + plotOpen + ); + } + + // close + if (point.close !== null) { + plotClose = mathRound(point.plotClose) + crispCorr; + path.push( + 'M', + crispX, + plotClose, + 'L', + crispX + halfWidth, + plotClose + ); + } + + // create and/or update the graphic + if (graphic) { + graphic.animate({ d: path }); + } else { + point.graphic = chart.renderer.path(path) + .attr(pointAttr) + .add(series.group); + } + + } + + + }); + + }, + + /** + * Disable animation + */ + animate: null + + +}); +seriesTypes.ohlc = OHLCSeries; +/* **************************************************************************** + * End OHLC series code * + *****************************************************************************/ +/* **************************************************************************** + * Start Candlestick series code * + *****************************************************************************/ + +// 1 - set default options +defaultPlotOptions.candlestick = merge(defaultPlotOptions.column, { + lineColor: 'black', + lineWidth: 1, + states: { + hover: { + lineWidth: 2 + } + }, + tooltip: defaultPlotOptions.ohlc.tooltip, + threshold: null, + upColor: 'white' +}); + +// 2 - Create the CandlestickSeries object +var CandlestickSeries = extendClass(OHLCSeries, { + type: 'candlestick', + + /** + * One-to-one mapping from options to SVG attributes + */ + pointAttrToOptions: { // mapping between SVG attributes and the corresponding options + fill: 'color', + stroke: 'lineColor', + 'stroke-width': 'lineWidth' + }, + upColorProp: 'fill', + + /** + * Draw the data points + */ + drawPoints: function () { + var series = this, //state = series.state, + points = series.points, + chart = series.chart, + pointAttr, + plotOpen, + plotClose, + topBox, + bottomBox, + crispCorr, + crispX, + graphic, + path, + halfWidth; + + + each(points, function (point) { + + graphic = point.graphic; + if (point.plotY !== UNDEFINED) { + + pointAttr = point.pointAttr[point.selected ? 'selected' : '']; + + // crisp vector coordinates + crispCorr = (pointAttr['stroke-width'] % 2) / 2; + crispX = mathRound(point.plotX) + crispCorr; + plotOpen = mathRound(point.plotOpen) + crispCorr; + plotClose = mathRound(point.plotClose) + crispCorr; + topBox = math.min(plotOpen, plotClose); + bottomBox = math.max(plotOpen, plotClose); + halfWidth = mathRound(point.shapeArgs.width / 2); + + // create the path + path = [ + 'M', + crispX - halfWidth, bottomBox, + 'L', + crispX - halfWidth, topBox, + 'L', + crispX + halfWidth, topBox, + 'L', + crispX + halfWidth, bottomBox, + 'L', + crispX - halfWidth, bottomBox, + 'M', + crispX, bottomBox, + 'L', + crispX, mathRound(point.yBottom), + 'M', + crispX, topBox, + 'L', + crispX, mathRound(point.plotY), + 'Z' + ]; + + if (graphic) { + graphic.animate({ d: path }); + } else { + point.graphic = chart.renderer.path(path) + .attr(pointAttr) + .add(series.group); + } + + } + }); + + } + + +}); + +seriesTypes.candlestick = CandlestickSeries; + +/* **************************************************************************** + * End Candlestick series code * + *****************************************************************************/ +/* **************************************************************************** + * Start Flags series code * + *****************************************************************************/ + +var symbols = SVGRenderer.prototype.symbols; + +// 1 - set default options +defaultPlotOptions.flags = merge(defaultPlotOptions.column, { + dataGrouping: null, + fillColor: 'white', + lineWidth: 1, + pointRange: 0, // #673 + //radius: 2, + shape: 'flag', + stackDistance: 7, + states: { + hover: { + lineColor: 'black', + fillColor: '#FCFFC5' + } + }, + style: { + fontSize: '11px', + fontWeight: 'bold', + textAlign: 'center' + }, + threshold: null, + y: -30 +}); + +// 2 - Create the CandlestickSeries object +seriesTypes.flags = extendClass(seriesTypes.column, { + type: 'flags', + sorted: false, + noSharedTooltip: true, + takeOrdinalPosition: false, // #1074 + forceCrop: true, + /** + * Inherit the initialization from base Series + */ + init: Series.prototype.init, + + /** + * One-to-one mapping from options to SVG attributes + */ + pointAttrToOptions: { // mapping between SVG attributes and the corresponding options + fill: 'fillColor', + stroke: 'color', + 'stroke-width': 'lineWidth', + r: 'radius' + }, + + /** + * Extend the translate method by placing the point on the related series + */ + translate: function () { + + seriesTypes.column.prototype.translate.apply(this); + + var series = this, + options = series.options, + chart = series.chart, + points = series.points, + cursor = points.length - 1, + point, + lastPoint, + optionsOnSeries = options.onSeries, + onSeries = optionsOnSeries && chart.get(optionsOnSeries), + step = onSeries && onSeries.options.step, + onData = onSeries && onSeries.points, + i = onData && onData.length, + xAxis = series.xAxis, + xAxisExt = xAxis.getExtremes(), + leftPoint, + lastX, + rightPoint; + + // relate to a master series + if (onSeries && onSeries.visible && i) { + lastX = onData[i - 1].x; + + // sort the data points + points.sort(function (a, b) { + return (a.x - b.x); + }); + + while (i-- && points[cursor]) { + point = points[cursor]; + leftPoint = onData[i]; + + + if (leftPoint.x <= point.x && leftPoint.plotY !== UNDEFINED) { + + if (point.x <= lastX) { // #803 + + point.plotY = leftPoint.plotY; + + // interpolate between points, #666 + if (leftPoint.x < point.x && !step) { + rightPoint = onData[i + 1]; + if (rightPoint && rightPoint.plotY !== UNDEFINED) { + point.plotY += + ((point.x - leftPoint.x) / (rightPoint.x - leftPoint.x)) * // the distance ratio, between 0 and 1 + (rightPoint.plotY - leftPoint.plotY); // the y distance + } + } + } + cursor--; + i++; // check again for points in the same x position + if (cursor < 0) { + break; + } + } + } + } + + // Add plotY position and handle stacking + each(points, function (point, i) { + + // Undefined plotY means the point is either on axis, outside series range or hidden series. + // If the series is outside the range of the x axis it should fall through with + // an undefined plotY, but then we must remove the shapeArgs (#847). + if (point.plotY === UNDEFINED) { + if (point.x >= xAxisExt.min && point.x <= xAxisExt.max) { // we're inside xAxis range + point.plotY = xAxis.lineTop - chart.plotTop; + } else { + point.shapeArgs = {}; // 847 + } + } + // if multiple flags appear at the same x, order them into a stack + lastPoint = points[i - 1]; + if (lastPoint && lastPoint.plotX === point.plotX) { + if (lastPoint.stackIndex === UNDEFINED) { + lastPoint.stackIndex = 0; + } + point.stackIndex = lastPoint.stackIndex + 1; + } + + }); + + + }, + + /** + * Draw the markers + */ + drawPoints: function () { + var series = this, + pointAttr, + points = series.points, + chart = series.chart, + renderer = chart.renderer, + plotX, + plotY, + options = series.options, + optionsY = options.y, + shape = options.shape, + box, + bBox, + i, + point, + graphic, + tracker, + stackIndex, + crisp = (options.lineWidth % 2 / 2), + anchorX, + anchorY; + + i = points.length; + while (i--) { + point = points[i]; + plotX = point.plotX + crisp; + stackIndex = point.stackIndex; + plotY = point.plotY; + if (plotY !== UNDEFINED) { + plotY = point.plotY + optionsY + crisp - (stackIndex !== UNDEFINED && stackIndex * options.stackDistance); + } + anchorX = stackIndex ? UNDEFINED : point.plotX + crisp; // skip connectors for higher level stacked points + anchorY = stackIndex ? UNDEFINED : point.plotY; + + graphic = point.graphic; + tracker = point.tracker; + + // only draw the point if y is defined + if (plotY !== UNDEFINED) { + // shortcuts + pointAttr = point.pointAttr[point.selected ? 'select' : '']; + if (graphic) { // update + graphic.attr({ + x: plotX, + y: plotY, + r: pointAttr.r, + anchorX: anchorX, + anchorY: anchorY + }); + } else { + graphic = point.graphic = renderer.label( + point.options.title || options.title || 'A', + plotX, + plotY, + shape, + anchorX, + anchorY + ) + .css(merge(options.style, point.style)) + .attr(pointAttr) + .attr({ + align: shape === 'flag' ? 'left' : 'center', + width: options.width, + height: options.height + }) + .add(series.group) + .shadow(options.shadow); + + } + + // get the bounding box + box = graphic.box; + bBox = box.getBBox(); + + // set the shape arguments for the tracker element + point.shapeArgs = extend( + bBox, + { + x: plotX - (shape === 'flag' ? 0 : box.attr('width') / 2), // flags align left, else align center + y: plotY + } + ); + + } else if (graphic) { + point.graphic = graphic.destroy(); + if (tracker) { + tracker.attr('y', -9999); + } + } + + } + + }, + + /** + * Extend the column trackers with listeners to expand and contract stacks + */ + drawTracker: function () { + + seriesTypes.column.prototype.drawTracker.apply(this); + + // put each point in front on mouse over, this allows readability of vertically + // stacked elements as well as tight points on the x axis + each(this.points, function (point) { + if (point.tracker) { // #1046 + addEvent(point.tracker.element, 'mouseover', function () { + point.graphic.toFront(); + }); + } + }); + }, + + /** + * Override the regular tooltip formatter by returning the point text given + * in the options + */ + tooltipFormatter: function (item) { + return item.point.text; + }, + + /** + * Disable animation + */ + animate: function () {} + +}); + +// create the flag icon with anchor +symbols.flag = function (x, y, w, h, options) { + var anchorX = (options && options.anchorX) || x, + anchorY = (options && options.anchorY) || y; + + return [ + 'M', anchorX, anchorY, + 'L', x, y + h, + x, y, + x + w, y, + x + w, y + h, + x, y + h, + 'M', anchorX, anchorY, + 'Z' + ]; +}; + +// create the circlepin and squarepin icons with anchor +each(['circle', 'square'], function (shape) { + symbols[shape + 'pin'] = function (x, y, w, h, options) { + + var anchorX = options && options.anchorX, + anchorY = options && options.anchorY, + path = symbols[shape](x, y, w, h); + + if (anchorX && anchorY) { + path.push('M', anchorX, y + h, 'L', anchorX, anchorY); + } + + return path; + }; +}); + +// The symbol callbacks are generated on the SVGRenderer object in all browsers. Even +// VML browsers need this in order to generate shapes in export. Now share +// them with the VMLRenderer. +if (Renderer === VMLRenderer) { + each(['flag', 'circlepin', 'squarepin'], function (shape) { + VMLRenderer.prototype.symbols[shape] = symbols[shape]; + }); +} + +/* **************************************************************************** + * End Flags series code * + *****************************************************************************/ +/* **************************************************************************** + * Start Scroller code * + *****************************************************************************/ +/*jslint white:true */ +var buttonGradient = hash( + LINEAR_GRADIENT, { x1: 0, y1: 0, x2: 0, y2: 1 }, + STOPS, [ + [0, '#FFF'], + [1, '#CCC'] + ] + ), + units = [].concat(defaultDataGroupingUnits); // copy + +// add more resolution to units +units[4] = [DAY, [1, 2, 3, 4]]; // allow more days +units[5] = [WEEK, [1, 2, 3]]; // allow more weeks + +extend(defaultOptions, { + navigator: { + //enabled: true, + handles: { + backgroundColor: '#FFF', + borderColor: '#666' + }, + height: 40, + margin: 10, + maskFill: 'rgba(255, 255, 255, 0.75)', + outlineColor: '#444', + outlineWidth: 1, + series: { + type: 'areaspline', + color: '#4572A7', + compare: null, + fillOpacity: 0.4, + dataGrouping: { + approximation: 'average', + groupPixelWidth: 2, + smoothed: true, + units: units + }, + dataLabels: { + enabled: false + }, + id: PREFIX + 'navigator-series', + lineColor: '#4572A7', + lineWidth: 1, + marker: { + enabled: false + }, + pointRange: 0, + shadow: false + }, + //top: undefined, + xAxis: { + tickWidth: 0, + lineWidth: 0, + gridLineWidth: 1, + tickPixelInterval: 200, + labels: { + align: 'left', + x: 3, + y: -4 + } + }, + yAxis: { + gridLineWidth: 0, + startOnTick: false, + endOnTick: false, + minPadding: 0.1, + maxPadding: 0.1, + labels: { + enabled: false + }, + title: { + text: null + }, + tickWidth: 0 + } + }, + scrollbar: { + //enabled: true + height: isTouchDevice ? 20 : 14, + barBackgroundColor: buttonGradient, + barBorderRadius: 2, + barBorderWidth: 1, + barBorderColor: '#666', + buttonArrowColor: '#666', + buttonBackgroundColor: buttonGradient, + buttonBorderColor: '#666', + buttonBorderRadius: 2, + buttonBorderWidth: 1, + minWidth: 6, + rifleColor: '#666', + trackBackgroundColor: hash( + LINEAR_GRADIENT, { x1: 0, y1: 0, x2: 0, y2: 1 }, + STOPS, [ + [0, '#EEE'], + [1, '#FFF'] + ] + ), + trackBorderColor: '#CCC', + trackBorderWidth: 1 + // trackBorderRadius: 0 + } +}); +/*jslint white:false */ + +/** + * The Scroller class + * @param {Object} chart + */ +function Scroller(chart) { + var chartOptions = chart.options, + navigatorOptions = chartOptions.navigator, + navigatorEnabled = navigatorOptions.enabled, + scrollbarOptions = chartOptions.scrollbar, + scrollbarEnabled = scrollbarOptions.enabled, + height = navigatorEnabled ? navigatorOptions.height : 0, + scrollbarHeight = scrollbarEnabled ? scrollbarOptions.height : 0, + baseSeriesOption = navigatorOptions.baseSeries; + + this.baseSeries = chart.series[baseSeriesOption] || + (typeof baseSeriesOption === 'string' && chart.get(baseSeriesOption)) || + chart.series[0]; + + this.handles = []; + this.scrollbarButtons = []; + this.elementsToDestroy = []; // Array containing the elements to destroy when Scroller is destroyed + + this.chart = chart; + this.height = height; + this.scrollbarHeight = scrollbarHeight; + this.scrollbarEnabled = scrollbarEnabled; + this.navigatorEnabled = navigatorEnabled; + this.navigatorOptions = navigatorOptions; + this.scrollbarOptions = scrollbarOptions; + this.outlineHeight = height + scrollbarHeight; + + // Run scroller + this.init(); +} + +Scroller.prototype = { + /** + * Return the top of the navigation + */ + getAxisTop: function (chartHeight) { + return this.navigatorOptions.top || chartHeight - this.height - this.scrollbarHeight - this.chart.options.chart.spacingBottom; + }, + + /** + * Draw one of the handles on the side of the zoomed range in the navigator + * @param {Number} x The x center for the handle + * @param {Number} index 0 for left and 1 for right + */ + drawHandle: function (x, index) { + var scroller = this, + chart = scroller.chart, + renderer = chart.renderer, + elementsToDestroy = scroller.elementsToDestroy, + handles = scroller.handles, + handlesOptions = scroller.navigatorOptions.handles, + attr = { + fill: handlesOptions.backgroundColor, + stroke: handlesOptions.borderColor, + 'stroke-width': 1 + }, + tempElem; + + // create the elements + if (!scroller.rendered) { + // the group + handles[index] = renderer.g() + .css({ cursor: 'e-resize' }) + .attr({ zIndex: 4 - index }) // zIndex = 3 for right handle, 4 for left + .add(); + + // the rectangle + tempElem = renderer.rect(-4.5, 0, 9, 16, 3, 1) + .attr(attr) + .add(handles[index]); + elementsToDestroy.push(tempElem); + + // the rifles + tempElem = renderer.path([ + 'M', + -1.5, 4, + 'L', + -1.5, 12, + 'M', + 0.5, 4, + 'L', + 0.5, 12 + ]).attr(attr) + .add(handles[index]); + elementsToDestroy.push(tempElem); + } + + handles[index].translate(scroller.scrollerLeft + scroller.scrollbarHeight + parseInt(x, 10), scroller.top + scroller.height / 2 - 8); + }, + + /** + * Draw the scrollbar buttons with arrows + * @param {Number} index 0 is left, 1 is right + */ + drawScrollbarButton: function (index) { + var scroller = this, + chart = scroller.chart, + renderer = chart.renderer, + elementsToDestroy = scroller.elementsToDestroy, + scrollbarButtons = scroller.scrollbarButtons, + scrollbarHeight = scroller.scrollbarHeight, + scrollbarOptions = scroller.scrollbarOptions, + tempElem; + + if (!scroller.rendered) { + scrollbarButtons[index] = renderer.g().add(scroller.scrollbarGroup); + + tempElem = renderer.rect( + -0.5, + -0.5, + scrollbarHeight + 1, // +1 to compensate for crispifying in rect method + scrollbarHeight + 1, + scrollbarOptions.buttonBorderRadius, + scrollbarOptions.buttonBorderWidth + ).attr({ + stroke: scrollbarOptions.buttonBorderColor, + 'stroke-width': scrollbarOptions.buttonBorderWidth, + fill: scrollbarOptions.buttonBackgroundColor + }).add(scrollbarButtons[index]); + elementsToDestroy.push(tempElem); + + tempElem = renderer.path([ + 'M', + scrollbarHeight / 2 + (index ? -1 : 1), scrollbarHeight / 2 - 3, + 'L', + scrollbarHeight / 2 + (index ? -1 : 1), scrollbarHeight / 2 + 3, + scrollbarHeight / 2 + (index ? 2 : -2), scrollbarHeight / 2 + ]).attr({ + fill: scrollbarOptions.buttonArrowColor + }).add(scrollbarButtons[index]); + elementsToDestroy.push(tempElem); + } + + // adjust the right side button to the varying length of the scroll track + if (index) { + scrollbarButtons[index].attr({ + translateX: scroller.scrollerWidth - scrollbarHeight + }); + } + }, + + /** + * Render the navigator and scroll bar + * @param {Number} min X axis value minimum + * @param {Number} max X axis value maximum + * @param {Number} pxMin Pixel value minimum + * @param {Number} pxMax Pixel value maximum + */ + render: function (min, max, pxMin, pxMax) { + var scroller = this, + chart = scroller.chart, + renderer = chart.renderer, + navigatorLeft, + navigatorWidth, + scrollerLeft, + scrollerWidth, + scrollbarGroup = scroller.scrollbarGroup, + scrollbar = scroller.scrollbar, + xAxis = scroller.xAxis, + scrollbarTrack = scroller.scrollbarTrack, + scrollbarHeight = scroller.scrollbarHeight, + scrollbarEnabled = scroller.scrollbarEnabled, + navigatorOptions = scroller.navigatorOptions, + scrollbarOptions = scroller.scrollbarOptions, + scrollbarMinWidth = scrollbarOptions.minWidth, + height = scroller.height, + top = scroller.top, + navigatorEnabled = scroller.navigatorEnabled, + outlineWidth = navigatorOptions.outlineWidth, + halfOutline = outlineWidth / 2, + zoomedMin, + zoomedMax, + range, + scrX, + scrWidth, + scrollbarPad = 0, + outlineHeight = scroller.outlineHeight, + barBorderRadius = scrollbarOptions.barBorderRadius, + strokeWidth, + scrollbarStrokeWidth = scrollbarOptions.barBorderWidth, + centerBarX, + outlineTop = top + halfOutline; + + // don't render the navigator until we have data (#486) + if (isNaN(min)) { + return; + } + + scroller.navigatorLeft = navigatorLeft = pick( + xAxis.left, + chart.plotLeft + scrollbarHeight // in case of scrollbar only, without navigator + ); + scroller.navigatorWidth = navigatorWidth = pick(xAxis.len, chart.plotWidth - 2 * scrollbarHeight); + scroller.scrollerLeft = scrollerLeft = navigatorLeft - scrollbarHeight; + scroller.scrollerWidth = scrollerWidth = scrollerWidth = navigatorWidth + 2 * scrollbarHeight; + + // Set the scroller x axis extremes to reflect the total. The navigator extremes + // should always be the extremes of the union of all series in the chart as + // well as the navigator series. + if (xAxis.getExtremes) { + var baseExtremes = chart.xAxis[0].getExtremes(), // the base + noBase = baseExtremes.dataMin === null, + navExtremes = xAxis.getExtremes(), + newMin = mathMin(baseExtremes.dataMin, navExtremes.dataMin), + newMax = mathMax(baseExtremes.dataMax, navExtremes.dataMax); + + if (!noBase && (newMin !== navExtremes.min || newMax !== navExtremes.max)) { + xAxis.setExtremes(newMin, newMax, true, false); + } + } + + // get the pixel position of the handles + pxMin = pick(pxMin, xAxis.translate(min)); + pxMax = pick(pxMax, xAxis.translate(max)); + + // handles are allowed to cross, but never exceed the plot area + scroller.zoomedMax = zoomedMax = mathMin(pInt(mathMax(pxMin, pxMax)), navigatorWidth); + scroller.zoomedMin = zoomedMin = scroller.fixedWidth ? + zoomedMax - scroller.fixedWidth : + mathMax(pInt(mathMin(pxMin, pxMax)), 0); + scroller.range = range = zoomedMax - zoomedMin; + scroller.fixedWidth = null; + + // on first render, create all elements + if (!scroller.rendered) { + + if (navigatorEnabled) { + + scroller.leftShade = renderer.rect() + .attr({ + fill: navigatorOptions.maskFill, + zIndex: 3 + }).add(); + scroller.rightShade = renderer.rect() + .attr({ + fill: navigatorOptions.maskFill, + zIndex: 3 + }).add(); + scroller.outline = renderer.path() + .attr({ + 'stroke-width': outlineWidth, + stroke: navigatorOptions.outlineColor, + zIndex: 3 + }) + .add(); + } + + if (scrollbarEnabled) { + + // draw the scrollbar group + scroller.scrollbarGroup = scrollbarGroup = renderer.g().add(); + + // the scrollbar track + strokeWidth = scrollbarOptions.trackBorderWidth; + scroller.scrollbarTrack = scrollbarTrack = renderer.rect().attr({ + y: -strokeWidth % 2 / 2, + fill: scrollbarOptions.trackBackgroundColor, + stroke: scrollbarOptions.trackBorderColor, + 'stroke-width': strokeWidth, + r: scrollbarOptions.trackBorderRadius || 0, + height: scrollbarHeight + }).add(scrollbarGroup); + + // the scrollbar itself + scroller.scrollbar = scrollbar = renderer.rect() + .attr({ + y: -scrollbarStrokeWidth % 2 / 2, + height: scrollbarHeight, + fill: scrollbarOptions.barBackgroundColor, + stroke: scrollbarOptions.barBorderColor, + 'stroke-width': scrollbarStrokeWidth, + r: barBorderRadius + }) + .add(scrollbarGroup); + + scroller.scrollbarRifles = renderer.path() + .attr({ + stroke: scrollbarOptions.rifleColor, + 'stroke-width': 1 + }) + .add(scrollbarGroup); + } + } + + // place elements + if (navigatorEnabled) { + scroller.leftShade.attr({ + x: navigatorLeft, + y: top, + width: zoomedMin, + height: height + }); + scroller.rightShade.attr({ + x: navigatorLeft + zoomedMax, + y: top, + width: navigatorWidth - zoomedMax, + height: height + }); + scroller.outline.attr({ d: [ + M, + scrollerLeft, outlineTop, // left + L, + navigatorLeft + zoomedMin + halfOutline, outlineTop, // upper left of zoomed range + navigatorLeft + zoomedMin + halfOutline, outlineTop + outlineHeight - scrollbarHeight, // lower left of z.r. + M, + navigatorLeft + zoomedMax - halfOutline, outlineTop + outlineHeight - scrollbarHeight, // lower right of z.r. + L, + navigatorLeft + zoomedMax - halfOutline, outlineTop, // upper right of z.r. + scrollerLeft + scrollerWidth, outlineTop // right + ]}); + // draw handles + scroller.drawHandle(zoomedMin + halfOutline, 0); + scroller.drawHandle(zoomedMax + halfOutline, 1); + } + + // draw the scrollbar + if (scrollbarEnabled) { + + // draw the buttons + scroller.drawScrollbarButton(0); + scroller.drawScrollbarButton(1); + + scrollbarGroup.translate(scrollerLeft, mathRound(outlineTop + height)); + + scrollbarTrack.attr({ + width: scrollerWidth + }); + + // prevent the scrollbar from drawing to small (#1246) + scrX = scrollbarHeight + zoomedMin; + scrWidth = range - scrollbarStrokeWidth; + if (scrWidth < scrollbarMinWidth) { + scrollbarPad = (scrollbarMinWidth - scrWidth) / 2; + scrWidth = scrollbarMinWidth; + scrX -= scrollbarPad; + } + scrollbar.attr({ + x: mathFloor(scrX) + (scrollbarStrokeWidth % 2 / 2), + width: scrWidth + }); + + centerBarX = scrollbarHeight + zoomedMin + range / 2 - 0.5; + + scroller.scrollbarRifles.attr({ d: [ + M, + centerBarX - 3, scrollbarHeight / 4, + L, + centerBarX - 3, 2 * scrollbarHeight / 3, + M, + centerBarX, scrollbarHeight / 4, + L, + centerBarX, 2 * scrollbarHeight / 3, + M, + centerBarX + 3, scrollbarHeight / 4, + L, + centerBarX + 3, 2 * scrollbarHeight / 3 + ], + visibility: range > 12 ? VISIBLE : HIDDEN + }); + } + + scroller.scrollbarPad = scrollbarPad; + scroller.rendered = true; + }, + + /** + * Set up the mouse and touch events for the navigator and scrollbar + */ + addEvents: function () { + var container = this.chart.container, + mouseDownHandler = this.mouseDownHandler, + mouseMoveHandler = this.mouseMoveHandler, + mouseUpHandler = this.mouseUpHandler, + _events; + + // Mouse events + _events = [ + [container, 'mousedown', mouseDownHandler], + [container, 'mousemove', mouseMoveHandler], + [document, 'mouseup', mouseUpHandler] + ]; + + // Touch events + if (hasTouch) { + _events.push( + [container, 'touchstart', mouseDownHandler], + [container, 'touchmove', mouseMoveHandler], + [document, 'touchend', mouseUpHandler] + ); + } + + // Add them all + each(_events, function (args) { + addEvent.apply(null, args); + }); + this._events = _events; + }, + + /** + * Removes the event handlers attached previously with addEvents. + */ + removeEvents: function () { + + each(this._events, function (args) { + removeEvent.apply(null, args); + }); + this._events = UNDEFINED; + if (this.navigatorEnabled) { + removeEvent(this.baseSeries, 'updatedData', this.updatedDataHandler); + } + }, + + /** + * Initiate the Scroller object + */ + init: function () { + var scroller = this, + chart = scroller.chart, + xAxis, + yAxis, + scrollbarHeight = scroller.scrollbarHeight, + navigatorOptions = scroller.navigatorOptions, + height = scroller.height, + top = scroller.top, + navigatorSeries, + dragOffset, + hasDragged, + bodyStyle = document.body.style, + defaultBodyCursor, + baseSeries = scroller.baseSeries, + navigatorData; + + /** + * Event handler for the mouse down event. + */ + scroller.mouseDownHandler = function (e) { + e = chart.tracker.normalizeMouseEvent(e); + + var zoomedMin = scroller.zoomedMin, + zoomedMax = scroller.zoomedMax, + top = scroller.top, + scrollbarHeight = scroller.scrollbarHeight, + scrollerLeft = scroller.scrollerLeft, + scrollerWidth = scroller.scrollerWidth, + navigatorLeft = scroller.navigatorLeft, + navigatorWidth = scroller.navigatorWidth, + scrollbarPad = scroller.scrollbarPad, + range = scroller.range, + chartX = e.chartX, + chartY = e.chartY, + baseXAxis = chart.xAxis[0], + leftValue, + handleSensitivity = isTouchDevice ? 10 : 7, + left, + isOnNavigator; + + if (chartY > top && chartY < top + height + scrollbarHeight) { // we're vertically inside the navigator + isOnNavigator = !scroller.scrollbarEnabled || chartY < top + height; + + // grab the left handle + if (isOnNavigator && math.abs(chartX - zoomedMin - navigatorLeft) < handleSensitivity) { + scroller.grabbedLeft = true; + scroller.otherHandlePos = zoomedMax; + + // grab the right handle + } else if (isOnNavigator && math.abs(chartX - zoomedMax - navigatorLeft) < handleSensitivity) { + scroller.grabbedRight = true; + scroller.otherHandlePos = zoomedMin; + + // grab the zoomed range + } else if (chartX > navigatorLeft + zoomedMin - scrollbarPad && chartX < navigatorLeft + zoomedMax + scrollbarPad) { + scroller.grabbedCenter = chartX; + + // In SVG browsers, change the cursor. IE6 & 7 produce an error on changing the cursor, + // and IE8 isn't able to show it while dragging anyway. + if (chart.renderer.isSVG) { + defaultBodyCursor = bodyStyle.cursor; + bodyStyle.cursor = 'ew-resize'; + } + + dragOffset = chartX - zoomedMin; + + + // shift the range by clicking on shaded areas, scrollbar track or scrollbar buttons + } else if (chartX > scrollerLeft && chartX < scrollerLeft + scrollerWidth) { + + if (isOnNavigator) { // center around the clicked point + left = chartX - navigatorLeft - range / 2; + } else { // click on scrollbar + if (chartX < navigatorLeft) { // click left scrollbar button + left = zoomedMin - mathMin(10, range); + } else if (chartX > scrollerLeft + scrollerWidth - scrollbarHeight) { + left = zoomedMin + mathMin(10, range); + } else { + // click on scrollbar track, shift the scrollbar by one range + left = chartX < navigatorLeft + zoomedMin ? // on the left + zoomedMin - range : + zoomedMax; + } + } + if (left < 0) { + left = 0; + } else if (left + range > navigatorWidth) { + left = navigatorWidth - range; + } + if (left !== zoomedMin) { // it has actually moved + scroller.fixedWidth = range; // #1370 + if (!baseXAxis.ordinalPositions) { + baseXAxis.fixedRange = baseXAxis.max - baseXAxis.min; + } + leftValue = xAxis.translate(left, true); + baseXAxis.setExtremes( + leftValue, + baseXAxis.fixedRange ? leftValue + baseXAxis.fixedRange : xAxis.translate(left + range, true), + true, + false, + { trigger: 'navigator' } + ); + } + } + + } + // Prevent iPad from passing the handler on from touchstart to mousedown + if (e.type === 'touchstart') { + e.preventDefault(); + } + }; + + /** + * Event handler for the mouse move event. + */ + scroller.mouseMoveHandler = function (e) { + var scrollbarHeight = scroller.scrollbarHeight, + navigatorLeft = scroller.navigatorLeft, + navigatorWidth = scroller.navigatorWidth, + scrollerLeft = scroller.scrollerLeft, + scrollerWidth = scroller.scrollerWidth, + range = scroller.range, + chartX; + + // In iOS, a mousemove event with e.pageX === 0 is fired when holding the finger + // down in the center of the scrollbar. This should be ignored. + if (e.pageX !== 0) { + + e = chart.tracker.normalizeMouseEvent(e); + chartX = e.chartX; + + // validation for handle dragging + if (chartX < navigatorLeft) { + chartX = navigatorLeft; + } else if (chartX > scrollerLeft + scrollerWidth - scrollbarHeight) { + chartX = scrollerLeft + scrollerWidth - scrollbarHeight; + } + + // drag left handle + if (scroller.grabbedLeft) { + hasDragged = true; + scroller.render(0, 0, chartX - navigatorLeft, scroller.otherHandlePos); + + // drag right handle + } else if (scroller.grabbedRight) { + hasDragged = true; + scroller.render(0, 0, scroller.otherHandlePos, chartX - navigatorLeft); + + // drag scrollbar or open area in navigator + } else if (scroller.grabbedCenter) { + + hasDragged = true; + if (chartX < dragOffset) { // outside left + chartX = dragOffset; + } else if (chartX > navigatorWidth + dragOffset - range) { // outside right + chartX = navigatorWidth + dragOffset - range; + } + + scroller.render(0, 0, chartX - dragOffset, chartX - dragOffset + range); + } + } + }; + + /** + * Event handler for the mouse up event. + */ + scroller.mouseUpHandler = function () { + var zoomedMin = scroller.zoomedMin, + zoomedMax = scroller.zoomedMax; + + if (hasDragged) { + chart.xAxis[0].setExtremes( + xAxis.translate(zoomedMin, true), + xAxis.translate(zoomedMax, true), + true, + false, + { trigger: 'navigator' } + ); + } + scroller.grabbedLeft = scroller.grabbedRight = scroller.grabbedCenter = hasDragged = dragOffset = null; + + bodyStyle.cursor = defaultBodyCursor || ''; + + }; + + scroller.updatedDataHandler = function () { + var baseXAxis = baseSeries.xAxis, + baseExtremes = baseXAxis.getExtremes(), + baseMin = baseExtremes.min, + baseMax = baseExtremes.max, + baseDataMin = baseExtremes.dataMin, + baseDataMax = baseExtremes.dataMax, + range = baseMax - baseMin, + stickToMin, + stickToMax, + newMax, + newMin, + doRedraw, + navXData = navigatorSeries.xData, + hasSetExtremes = !!baseXAxis.setExtremes; + + // detect whether to move the range + stickToMax = baseMax >= navXData[navXData.length - 1]; + stickToMin = baseMin <= baseDataMin; + + // set the navigator series data to the new data of the base series + if (!navigatorData) { + navigatorSeries.options.pointStart = baseSeries.xData[0]; + navigatorSeries.setData(baseSeries.options.data, false); + doRedraw = true; + } + + // if the zoomed range is already at the min, move it to the right as new data + // comes in + if (stickToMin) { + newMin = baseDataMin; + newMax = newMin + range; + } + + // if the zoomed range is already at the max, move it to the right as new data + // comes in + if (stickToMax) { + newMax = baseDataMax; + if (!stickToMin) { // if stickToMin is true, the new min value is set above + newMin = mathMax(newMax - range, navigatorSeries.xData[0]); + } + } + + // update the extremes + if (hasSetExtremes && (stickToMin || stickToMax)) { + baseXAxis.setExtremes(newMin, newMax, true, false, { trigger: 'updatedData' }); + + // if it is not at any edge, just move the scroller window to reflect the new series data + } else { + if (doRedraw) { + chart.redraw(false); + } + + scroller.render( + mathMax(baseMin, baseDataMin), + mathMin(baseMax, baseDataMax) + ); + } + }; + + var xAxisIndex = chart.xAxis.length, + yAxisIndex = chart.yAxis.length, + baseChartSetSize = chart.setSize; + + // make room below the chart + chart.extraBottomMargin = scroller.outlineHeight + navigatorOptions.margin; + // get the top offset + scroller.top = top = scroller.getAxisTop(chart.chartHeight); + + if (scroller.navigatorEnabled) { + var baseOptions = baseSeries ? baseSeries.options : {}, + mergedNavSeriesOptions, + baseData = baseOptions.data, + navigatorSeriesOptions = navigatorOptions.series; + + // remove it to prevent merging one by one + navigatorData = navigatorSeriesOptions.data; + baseOptions.data = navigatorSeriesOptions.data = null; + + // an x axis is required for scrollbar also + scroller.xAxis = xAxis = new Axis(chart, merge({ + ordinal: baseSeries && baseSeries.xAxis.options.ordinal // inherit base xAxis' ordinal option + }, navigatorOptions.xAxis, { + isX: true, + type: 'datetime', + index: xAxisIndex, + height: height, + top: top, + offset: 0, + offsetLeft: scrollbarHeight, + offsetRight: -scrollbarHeight, + startOnTick: false, + endOnTick: false, + minPadding: 0, + maxPadding: 0, + zoomEnabled: false + })); + + scroller.yAxis = yAxis = new Axis(chart, merge(navigatorOptions.yAxis, { + alignTicks: false, + height: height, + top: top, + offset: 0, + index: yAxisIndex, + zoomEnabled: false + })); + + // dmerge the series options + mergedNavSeriesOptions = merge(baseOptions, navigatorSeriesOptions, { + threshold: null, + clip: false, + enableMouseTracking: false, + group: 'nav', // for columns + padXAxis: false, + xAxis: xAxisIndex, + yAxis: yAxisIndex, + name: 'Navigator', + showInLegend: false, + isInternal: true, + visible: true + }); + + // set the data back + baseOptions.data = baseData; + navigatorSeriesOptions.data = navigatorData; + mergedNavSeriesOptions.data = navigatorData || baseData; + + // add the series + navigatorSeries = chart.initSeries(mergedNavSeriesOptions); + + // Respond to updated data in the base series. + // Abort if lazy-loading data from the server. + if (navigatorOptions.adaptToUpdatedData !== false) { + addEvent(baseSeries, 'updatedData', scroller.updatedDataHandler); + } + + + // in case of scrollbar only, fake an x axis to get translation + } else { + scroller.xAxis = xAxis = { + translate: function (value, reverse) { + var ext = chart.xAxis[0].getExtremes(), + scrollTrackWidth = chart.plotWidth - 2 * scrollbarHeight, + dataMin = ext.dataMin, + valueRange = ext.dataMax - dataMin; + + return reverse ? + // from pixel to value + (value * valueRange / scrollTrackWidth) + dataMin : + // from value to pixel + scrollTrackWidth * (value - dataMin) / valueRange; + } + }; + } + + // Expose the navigator seris + scroller.series = navigatorSeries; + + // Override the chart.setSize method to adjust the xAxis and yAxis top option as well. + // This needs to be done prior to chart.resize + chart.setSize = function (width, height, animation) { + scroller.top = top = scroller.getAxisTop(height); + if (xAxis && yAxis) { // false if navigator is disabled (#904) + xAxis.options.top = yAxis.options.top = top; + } + + baseChartSetSize.call(chart, width, height, animation); + }; + + scroller.addEvents(); + }, + + /** + * Destroys allocated elements. + */ + destroy: function () { + var scroller = this; + + // Disconnect events added in addEvents + scroller.removeEvents(); + + // Destroy properties + each([scroller.xAxis, scroller.yAxis, scroller.leftShade, scroller.rightShade, scroller.outline, scroller.scrollbarTrack, scroller.scrollbarRifles, scroller.scrollbarGroup, scroller.scrollbar], function (prop) { + if (prop && prop.destroy) { + prop.destroy(); + } + }); + scroller.xAxis = scroller.yAxis = scroller.leftShade = scroller.rightShade = scroller.outline = scroller.scrollbarTrack = scroller.scrollbarRifles = scroller.scrollbarGroup = scroller.scrollbar = null; + + // Destroy elements in collection + each([scroller.scrollbarButtons, scroller.handles, scroller.elementsToDestroy], function (coll) { + destroyObjectProperties(coll); + }); + } +}; + +Highcharts.Scroller = Scroller; + +/** + * For Stock charts, override selection zooming with some special features because + * X axis zooming is already allowed by the Navigator and Range selector. + */ +wrap(Axis.prototype, 'zoom', function (proceed, newMin, newMax) { + var chart = this.chart, + chartOptions = chart.options, + zoomType = chartOptions.chart.zoomType, + previousZoom, + navigator = chartOptions.navigator, + rangeSelector = chartOptions.rangeSelector, + ret; + + if (this.isXAxis && ((navigator && navigator.enabled) || + (rangeSelector && rangeSelector.enabled))) { + + // For x only zooming, fool the chart.zoom method not to create the zoom button + // because the property already exists + if (zoomType === 'x') { + chart.resetZoomButton = 'blocked'; + + // For y only zooming, ignore the X axis completely + } else if (zoomType === 'y') { + ret = false; + + // For xy zooming, record the state of the zoom before zoom selection, then when + // the reset button is pressed, revert to this state + } else if (zoomType === 'xy') { + previousZoom = this.previousZoom; + if (defined(newMin)) { + this.previousZoom = [this.min, this.max]; + } else if (previousZoom) { + newMin = previousZoom[0]; + newMax = previousZoom[1]; + delete this.previousZoom; + } + } + + } + return ret !== UNDEFINED ? ret : proceed.call(this, newMin, newMax); +}); + + +/* **************************************************************************** + * End Scroller code * + *****************************************************************************/ +/* **************************************************************************** + * Start Range Selector code * + *****************************************************************************/ +extend(defaultOptions, { + rangeSelector: { + // enabled: true, + // buttons: {Object} + // buttonSpacing: 0, + buttonTheme: { + width: 28, + height: 16, + padding: 1, + r: 0, + zIndex: 7 // #484, #852 + // states: { + // hover: {}, + // select: {} + // } + }, + inputPosition: { + align: 'right' + }, + // inputDateFormat: '%b %e, %Y', + // inputEditDateFormat: '%Y-%m-%d', + // inputEnabled: true, + //inputStyle: {}, + labelStyle: { + color: '#666' + } + // selected: undefined + } +}); +defaultOptions.lang = merge(defaultOptions.lang, { + rangeSelectorZoom: 'Zoom', + rangeSelectorFrom: 'From', + rangeSelectorTo: 'To' +}); + +/** + * The object constructor for the range selector + * @param {Object} chart + */ +function RangeSelector(chart) { + + // Run RangeSelector + this.init(chart); +} + +RangeSelector.prototype = { + /** + * The method to run when one of the buttons in the range selectors is clicked + * @param {Number} i The index of the button + * @param {Object} rangeOptions + * @param {Boolean} redraw + */ + clickButton: function (i, rangeOptions, redraw) { + var rangeSelector = this, + chart = rangeSelector.chart, + buttons = rangeSelector.buttons, + baseAxis = chart.xAxis[0], + extremes = baseAxis && baseAxis.getExtremes(), + navAxis = chart.scroller && chart.scroller.xAxis, + navExtremes = navAxis && navAxis.getExtremes && navAxis.getExtremes(), + navDataMin = navExtremes && navExtremes.dataMin, + navDataMax = navExtremes && navExtremes.dataMax, + baseDataMin = extremes && extremes.dataMin, + baseDataMax = extremes && extremes.dataMax, + // if both are defined, get Math.min, else, pick the one that is defined + dataMin = ((defined(baseDataMin) && defined(navDataMin)) ? mathMin : pick)(baseDataMin, navDataMin), + dataMax = ((defined(baseDataMax) && defined(navDataMax)) ? mathMax : pick)(baseDataMax, navDataMax), + newMin, + newMax = baseAxis && mathMin(extremes.max, dataMax), + now, + date = new Date(newMax), + type = rangeOptions.type, + count = rangeOptions.count, + baseXAxisOptions, + range, + rangeMin, + year, + // these time intervals have a fixed number of milliseconds, as opposed + // to month, ytd and year + fixedTimes = { + millisecond: 1, + second: 1000, + minute: 60 * 1000, + hour: 3600 * 1000, + day: 24 * 3600 * 1000, + week: 7 * 24 * 3600 * 1000 + }; + + if (dataMin === null || dataMax === null || // chart has no data, base series is removed + i === rangeSelector.selected) { // same button is clicked twice + return; + } + + if (fixedTimes[type]) { + range = fixedTimes[type] * count; + newMin = mathMax(newMax - range, dataMin); + } else if (type === 'month') { + date.setMonth(date.getMonth() - count); + newMin = mathMax(date.getTime(), dataMin); + range = 30 * 24 * 3600 * 1000 * count; + } else if (type === 'ytd') { + now = new Date(dataMax); + year = now.getFullYear(); + newMin = rangeMin = mathMax(dataMin || 0, Date.UTC(year, 0, 1)); + now = now.getTime(); + newMax = mathMin(dataMax || now, now); + } else if (type === 'year') { + date.setFullYear(date.getFullYear() - count); + newMin = mathMax(dataMin, date.getTime()); + range = 365 * 24 * 3600 * 1000 * count; + } else if (type === 'all' && baseAxis) { + newMin = dataMin; + newMax = dataMax; + } + + // mark the button pressed + if (buttons[i]) { + buttons[i].setState(2); + } + + // update the chart + if (!baseAxis) { // axis not yet instanciated + baseXAxisOptions = chart.options.xAxis; + baseXAxisOptions[0] = merge( + baseXAxisOptions[0], + { + range: range, + min: rangeMin + } + ); + rangeSelector.selected = i; + } else { // existing axis object; after render time + setTimeout(function () { // make sure the visual state is set before the heavy process begins + baseAxis.setExtremes( + newMin, + newMax, + pick(redraw, 1), + 0, + { + trigger: 'rangeSelectorButton', + rangeSelectorButton: rangeOptions + } + ); + rangeSelector.selected = i; + }, 1); + } + }, + + /** + * The default buttons for pre-selecting time frames + */ + defaultButtons: [{ + type: 'month', + count: 1, + text: '1m' + }, { + type: 'month', + count: 3, + text: '3m' + }, { + type: 'month', + count: 6, + text: '6m' + }, { + type: 'ytd', + text: 'YTD' + }, { + type: 'year', + count: 1, + text: '1y' + }, { + type: 'all', + text: 'All' + }], + + /** + * Initialize the range selector + */ + init: function (chart) { + + var rangeSelector = this, + options = chart.options.rangeSelector, + buttonOptions = options.buttons || [].concat(rangeSelector.defaultButtons), + buttons = rangeSelector.buttons = [], + selectedOption = options.selected, + blurInputs = rangeSelector.blurInputs = function () { + var minInput = rangeSelector.minInput, + maxInput = rangeSelector.maxInput; + if (minInput) { + minInput.blur(); + } + if (maxInput) { + maxInput.blur(); + } + }; + + rangeSelector.chart = chart; + + chart.extraTopMargin = 25; + rangeSelector.buttonOptions = buttonOptions; + + addEvent(chart.container, 'mousedown', blurInputs); + addEvent(chart, 'resize', blurInputs); + + // zoomed range based on a pre-selected button index + if (selectedOption !== UNDEFINED && buttonOptions[selectedOption]) { + this.clickButton(selectedOption, buttonOptions[selectedOption], false); + } + + // normalize the pressed button whenever a new range is selected + addEvent(chart, 'load', function () { + addEvent(chart.xAxis[0], 'afterSetExtremes', function () { + if (this.fixedRange !== this.max - this.min) { + if (buttons[rangeSelector.selected] && !chart.renderer.forExport) { + buttons[rangeSelector.selected].setState(0); + } + rangeSelector.selected = null; + } + this.fixedRange = null; + }); + }); + }, + + /** + * Set the internal and displayed value of a HTML input for the dates + * @param {String} name + * @param {Number} time + */ + setInputValue: function (name, time) { + var options = this.chart.options.rangeSelector; + + if (time) { + this[name + 'Input'].HCTime = time; + } + + this[name + 'Input'].value = dateFormat(options.inputEditDateFormat || '%Y-%m-%d', this[name + 'Input'].HCTime); + this[name + 'DateBox'].attr({ text: dateFormat(options.inputDateFormat || '%b %e, %Y', this[name + 'Input'].HCTime) }); + }, + + /** + * Draw either the 'from' or the 'to' HTML input box of the range selector + * @param {Object} name + */ + drawInput: function (name) { + var rangeSelector = this, + chart = rangeSelector.chart, + chartStyle = chart.options.chart.style, + renderer = chart.renderer, + options = chart.options.rangeSelector, + lang = defaultOptions.lang, + div = rangeSelector.div, + isMin = name === 'min', + input, + label, + dateBox, + inputGroup = this.inputGroup; + + // Create the text label + this[name + 'Label'] = label = renderer.label(lang[isMin ? 'rangeSelectorFrom' : 'rangeSelectorTo'], this.inputGroup.offset) + .attr({ + padding: 1 + }) + .css(merge(chartStyle, options.labelStyle)) + .add(inputGroup); + inputGroup.offset += label.width + 5; + + // Create an SVG label that shows updated date ranges and and records click events that + // bring in the HTML input. + this[name + 'DateBox'] = dateBox = renderer.label('', inputGroup.offset) + .attr({ + padding: 1, + width: 90, + height: 16, + stroke: 'silver', + 'stroke-width': 1 + }) + .css(merge({ + textAlign: 'center' + }, chartStyle, options.inputStyle)) + .on('click', function () { + rangeSelector[name + 'Input'].focus(); + }) + .add(inputGroup); + inputGroup.offset += dateBox.width + (isMin ? 10 : 0); + + + // Create the HTML input element. This is placed off screen and moved on top of the label + // when activated. + this[name + 'Input'] = input = createElement('input', { + name: name, + className: PREFIX + 'range-selector', + type: 'text' + }, extend({ + position: ABSOLUTE, + border: '2px solid silver', + top: '-9999em', + textAlign: 'center', + fontSize: chartStyle.fontSize, + fontFamily: chartStyle.fontFamily + }, options.inputStyle), div); + + + input.onfocus = function () { + css(this, { + left: (inputGroup.translateX + dateBox.x) + PX, + top: inputGroup.translateY + PX, + width: (dateBox.width - 2) + PX, + height: (dateBox.height - 2) + PX + }); + }; + input.onblur = function () { + css(this, { + top: '-9999em' + }); + rangeSelector.setInputValue(name); + }; + + // handle changes in the input boxes + input.onchange = function () { + var inputValue = input.value, + value = Date.parse(inputValue), + extremes = chart.xAxis[0].getExtremes(); + + // if the value isn't parsed directly to a value by the browser's Date.parse method, + // like YYYY-MM-DD in IE, try parsing it a different way + if (isNaN(value)) { + value = inputValue.split('-'); + value = Date.UTC(pInt(value[0]), pInt(value[1]) - 1, pInt(value[2])); + } + + if (!isNaN(value) && + ((isMin && (value >= extremes.dataMin && value <= rangeSelector.maxInput.HCTime)) || + (!isMin && (value <= extremes.dataMax && value >= rangeSelector.minInput.HCTime))) + ) { + chart.xAxis[0].setExtremes( + isMin ? value : extremes.min, + isMin ? extremes.max : value, + UNDEFINED, + UNDEFINED, + { trigger: 'rangeSelectorInput' } + ); + } + }; + }, + + /** + * Render the range selector including the buttons and the inputs. The first time render + * is called, the elements are created and positioned. On subsequent calls, they are + * moved and updated. + * @param {Number} min X axis minimum + * @param {Number} max X axis maximum + */ + render: function (min, max) { + var rangeSelector = this, + chart = rangeSelector.chart, + renderer = chart.renderer, + container = chart.container, + chartOptions = chart.options, + navButtonOptions = chartOptions.exporting && chart.options.navigation.buttonOptions, + options = chartOptions.rangeSelector, + buttons = rangeSelector.buttons, + lang = defaultOptions.lang, + div = rangeSelector.div, + inputGroup = rangeSelector.inputGroup, + buttonTheme = options.buttonTheme, + inputEnabled = options.inputEnabled !== false, + states = buttonTheme && buttonTheme.states, + plotLeft = chart.plotLeft, + yAlign, + buttonLeft; + + // create the elements + if (!rangeSelector.rendered) { + rangeSelector.zoomText = renderer.text(lang.rangeSelectorZoom, plotLeft, chart.plotTop - 10) + .css(options.labelStyle) + .add(); + + // button starting position + buttonLeft = plotLeft + rangeSelector.zoomText.getBBox().width + 5; + + each(rangeSelector.buttonOptions, function (rangeOptions, i) { + buttons[i] = renderer.button( + rangeOptions.text, + buttonLeft, + chart.plotTop - 25, + function () { + rangeSelector.clickButton(i, rangeOptions); + rangeSelector.isActive = true; + }, + buttonTheme, + states && states.hover, + states && states.select + ) + .css({ + textAlign: 'center' + }) + .add(); + + // increase button position for the next button + buttonLeft += buttons[i].width + (options.buttonSpacing || 0); + + if (rangeSelector.selected === i) { + buttons[i].setState(2); + } + }); + + // first create a wrapper outside the container in order to make + // the inputs work and make export correct + if (inputEnabled) { + rangeSelector.div = div = createElement('div', null, { + position: 'relative', + height: 0, + zIndex: 1 // above container + }); + + container.parentNode.insertBefore(div, container); + + // Create the group to keep the inputs + rangeSelector.inputGroup = inputGroup = renderer.g('input-group') + .add(); + inputGroup.offset = 0; + + rangeSelector.drawInput('min'); + rangeSelector.drawInput('max'); + } + } + + if (inputEnabled) { + + // Update the alignment to the updated spacing box + yAlign = chart.plotTop - 35; + inputGroup.align(extend({ + y: yAlign, + width: inputGroup.offset, + // detect collision with the exporting buttons + x: navButtonOptions && (yAlign < navButtonOptions.y + navButtonOptions.height - chartOptions.chart.spacingTop) ? + -60 : 0 + }, options.inputPosition), true, chart.spacingBox); + + // Set or reset the input values + rangeSelector.setInputValue('min', min); + rangeSelector.setInputValue('max', max); + } + + rangeSelector.rendered = true; + }, + + /** + * Destroys allocated elements. + */ + destroy: function () { + var minInput = this.minInput, + maxInput = this.maxInput, + chart = this.chart, + blurInputs = this.blurInputs, + key; + + removeEvent(chart.container, 'mousedown', blurInputs); + removeEvent(chart, 'resize', blurInputs); + + // Destroy elements in collections + destroyObjectProperties(this.buttons); + + // Clear input element events + if (minInput) { + minInput.onfocus = minInput.onblur = minInput.onchange = null; + } + if (maxInput) { + maxInput.onfocus = maxInput.onblur = maxInput.onchange = null; + } + + // Destroy HTML and SVG elements + for (key in this) { + if (this[key] && key !== 'chart') { + if (this[key].destroy) { // SVGElement + this[key].destroy(); + } else if (this[key].nodeType) { // HTML element + discardElement(this[key]); + } + } + this[key] = null; + } + } +}; + +Highcharts.RangeSelector = RangeSelector; + +/* **************************************************************************** + * End Range Selector code * + *****************************************************************************/ + + + +Chart.prototype.callbacks.push(function (chart) { + var extremes, + scroller = chart.scroller, + rangeSelector = chart.rangeSelector; + + function renderScroller() { + extremes = chart.xAxis[0].getExtremes(); + scroller.render( + mathMax(extremes.min, extremes.dataMin), + mathMin(extremes.max, extremes.dataMax) + ); + } + + function renderRangeSelector() { + extremes = chart.xAxis[0].getExtremes(); + rangeSelector.render(extremes.min, extremes.max); + } + + function afterSetExtremesHandlerScroller(e) { + scroller.render(e.min, e.max); + } + + function afterSetExtremesHandlerRangeSelector(e) { + rangeSelector.render(e.min, e.max); + } + + function destroyEvents() { + if (scroller) { + removeEvent(chart, 'resize', renderScroller); + removeEvent(chart.xAxis[0], 'afterSetExtremes', afterSetExtremesHandlerScroller); + } + if (rangeSelector) { + removeEvent(chart, 'resize', renderRangeSelector); + removeEvent(chart.xAxis[0], 'afterSetExtremes', afterSetExtremesHandlerRangeSelector); + } + } + + // initiate the scroller + if (scroller) { + // redraw the scroller on setExtremes + addEvent(chart.xAxis[0], 'afterSetExtremes', afterSetExtremesHandlerScroller); + + // redraw the scroller chart resize + addEvent(chart, 'resize', renderScroller); + + // do it now + renderScroller(); + } + if (rangeSelector) { + // redraw the scroller on setExtremes + addEvent(chart.xAxis[0], 'afterSetExtremes', afterSetExtremesHandlerRangeSelector); + + // redraw the scroller chart resize + addEvent(chart, 'resize', renderRangeSelector); + + // do it now + renderRangeSelector(); + } + + // Remove resize/afterSetExtremes at chart destroy + addEvent(chart, 'destroy', destroyEvents); +}); +/** + * A wrapper for Chart with all the default values for a Stock chart + */ +Highcharts.StockChart = function (options, callback) { + var seriesOptions = options.series, // to increase performance, don't merge the data + opposite, + lineOptions = { + + marker: { + enabled: false, + states: { + hover: { + radius: 5 + } + } + }, + // gapSize: 0, + shadow: false, + states: { + hover: { + lineWidth: 2 + } + } + }, + columnOptions = { + shadow: false, + borderWidth: 0 + }; + + // apply X axis options to both single and multi y axes + options.xAxis = map(splat(options.xAxis || {}), function (xAxisOptions) { + return merge({ // defaults + minPadding: 0, + maxPadding: 0, + ordinal: true, + title: { + text: null + }, + labels: { + overflow: 'justify' + }, + showLastLabel: true + }, xAxisOptions, // user options + { // forced options + type: 'datetime', + categories: null + }); + }); + + // apply Y axis options to both single and multi y axes + options.yAxis = map(splat(options.yAxis || {}), function (yAxisOptions) { + opposite = yAxisOptions.opposite; + return merge({ // defaults + labels: { + align: opposite ? 'right' : 'left', + x: opposite ? -2 : 2, + y: -2 + }, + showLastLabel: false, + title: { + text: null + } + }, yAxisOptions // user options + ); + }); + + options.series = null; + + options = merge({ + chart: { + panning: true + }, + navigator: { + enabled: true + }, + scrollbar: { + enabled: true + }, + rangeSelector: { + enabled: true + }, + title: { + text: null + }, + tooltip: { + shared: true, + crosshairs: true + }, + legend: { + enabled: false + }, + + plotOptions: { + line: lineOptions, + spline: lineOptions, + area: lineOptions, + areaspline: lineOptions, + arearange: lineOptions, + areasplinerange: lineOptions, + column: columnOptions, + columnrange: columnOptions, + candlestick: columnOptions, + ohlc: columnOptions + } + + }, + options, // user's options + + { // forced options + _stock: true, // internal flag + chart: { + inverted: false + } + }); + + options.series = seriesOptions; + + + return new Chart(options, callback); +}; + + +/* **************************************************************************** + * Start value compare logic * + *****************************************************************************/ + +var seriesInit = seriesProto.init, + seriesProcessData = seriesProto.processData, + pointTooltipFormatter = Point.prototype.tooltipFormatter; + +/** + * Extend series.init by adding a method to modify the y value used for plotting + * on the y axis. This method is called both from the axis when finding dataMin + * and dataMax, and from the series.translate method. + */ +seriesProto.init = function () { + + // call base method + seriesInit.apply(this, arguments); + + // local variables + var series = this, + compare = series.options.compare; + + if (compare) { + series.modifyValue = function (value, point) { + var compareValue = this.compareValue; + + // get the modified value + value = compare === 'value' ? + value - compareValue : // compare value + value = 100 * (value / compareValue) - 100; // compare percent + + // record for tooltip etc. + if (point) { + point.change = value; + } + + return value; + }; + } +}; + +/** + * Extend series.processData by finding the first y value in the plot area, + * used for comparing the following values + */ +seriesProto.processData = function () { + var series = this; + + // call base method + seriesProcessData.apply(this, arguments); + + if (series.options.compare) { + + // local variables + var i = 0, + processedXData = series.processedXData, + processedYData = series.processedYData, + length = processedYData.length, + min = series.xAxis.getExtremes().min; + + // find the first value for comparison + for (; i < length; i++) { + if (typeof processedYData[i] === NUMBER && processedXData[i] >= min) { + series.compareValue = processedYData[i]; + break; + } + } + } +}; + +/** + * Extend the tooltip formatter by adding support for the point.change variable + * as well as the changeDecimals option + */ +Point.prototype.tooltipFormatter = function (pointFormat) { + var point = this; + + pointFormat = pointFormat.replace( + '{point.change}', + (point.change > 0 ? '+' : '') + numberFormat(point.change, point.series.tooltipOptions.changeDecimals || 2) + ); + + return pointTooltipFormatter.apply(this, [pointFormat]); +}; + +/* **************************************************************************** + * End value compare logic * + *****************************************************************************/ + +/* **************************************************************************** + * Start ordinal axis logic * + *****************************************************************************/ + +(function () { + var baseInit = seriesProto.init, + baseGetSegments = seriesProto.getSegments; + + seriesProto.init = function () { + var series = this, + chart, + xAxis; + + // call base method + baseInit.apply(series, arguments); + + // chart and xAxis are set in base init + chart = series.chart; + xAxis = series.xAxis; + + // Destroy the extended ordinal index on updated data + if (xAxis && xAxis.options.ordinal) { + addEvent(series, 'updatedData', function () { + delete xAxis.ordinalIndex; + }); + } + + /** + * Extend the ordinal axis object. If we rewrite the axis object to a prototype model, + * we should add these properties to the prototype instead. + */ + if (xAxis && xAxis.options.ordinal && !xAxis.hasOrdinalExtension) { + + xAxis.hasOrdinalExtension = true; + + /** + * Calculate the ordinal positions before tick positions are calculated. + * TODO: When we rewrite Axis to use a prototype model, this should be implemented + * as a method extension to avoid overhead in the core. + */ + xAxis.beforeSetTickPositions = function () { + var axis = this, + len, + ordinalPositions = [], + useOrdinal = false, + dist, + extremes = axis.getExtremes(), + min = extremes.min, + max = extremes.max, + minIndex, + maxIndex, + slope, + i; + + // apply the ordinal logic + if (axis.options.ordinal) { + + each(axis.series, function (series, i) { + + if (series.visible !== false && series.takeOrdinalPosition !== false) { + + // concatenate the processed X data into the existing positions, or the empty array + ordinalPositions = ordinalPositions.concat(series.processedXData); + len = ordinalPositions.length; + + // if we're dealing with more than one series, remove duplicates + if (i && len) { + + ordinalPositions.sort(function (a, b) { + return a - b; // without a custom function it is sorted as strings + }); + + i = len - 1; + while (i--) { + if (ordinalPositions[i] === ordinalPositions[i + 1]) { + ordinalPositions.splice(i, 1); + } + } + } + } + + }); + + // cache the length + len = ordinalPositions.length; + + // Check if we really need the overhead of mapping axis data against the ordinal positions. + // If the series consist of evenly spaced data any way, we don't need any ordinal logic. + if (len > 2) { // two points have equal distance by default + dist = ordinalPositions[1] - ordinalPositions[0]; + i = len - 1; + while (i-- && !useOrdinal) { + if (ordinalPositions[i + 1] - ordinalPositions[i] !== dist) { + useOrdinal = true; + } + } + } + + // Record the slope and offset to compute the linear values from the array index. + // Since the ordinal positions may exceed the current range, get the start and + // end positions within it (#719, #665b) + if (useOrdinal) { + + // Register + axis.ordinalPositions = ordinalPositions; + + // This relies on the ordinalPositions being set + minIndex = xAxis.val2lin(min, true); + maxIndex = xAxis.val2lin(max, true); + + // Set the slope and offset of the values compared to the indices in the ordinal positions + axis.ordinalSlope = slope = (max - min) / (maxIndex - minIndex); + axis.ordinalOffset = min - (minIndex * slope); + + } else { + axis.ordinalPositions = axis.ordinalSlope = axis.ordinalOffset = UNDEFINED; + } + } + }; + + /** + * Translate from a linear axis value to the corresponding ordinal axis position. If there + * are no gaps in the ordinal axis this will be the same. The translated value is the value + * that the point would have if the axis were linear, using the same min and max. + * + * @param Number val The axis value + * @param Boolean toIndex Whether to return the index in the ordinalPositions or the new value + */ + xAxis.val2lin = function (val, toIndex) { + + var axis = this, + ordinalPositions = axis.ordinalPositions; + + if (!ordinalPositions) { + return val; + + } else { + + var ordinalLength = ordinalPositions.length, + i, + distance, + ordinalIndex; + + // first look for an exact match in the ordinalpositions array + i = ordinalLength; + while (i--) { + if (ordinalPositions[i] === val) { + ordinalIndex = i; + break; + } + } + + // if that failed, find the intermediate position between the two nearest values + i = ordinalLength - 1; + while (i--) { + if (val > ordinalPositions[i] || i === 0) { // interpolate + distance = (val - ordinalPositions[i]) / (ordinalPositions[i + 1] - ordinalPositions[i]); // something between 0 and 1 + ordinalIndex = i + distance; + break; + } + } + return toIndex ? + ordinalIndex : + axis.ordinalSlope * (ordinalIndex || 0) + axis.ordinalOffset; + } + }; + + /** + * Translate from linear (internal) to axis value + * + * @param Number val The linear abstracted value + * @param Boolean fromIndex Translate from an index in the ordinal positions rather than a value + */ + xAxis.lin2val = function (val, fromIndex) { + var axis = this, + ordinalPositions = axis.ordinalPositions; + + if (!ordinalPositions) { // the visible range contains only equally spaced values + return val; + + } else { + + var ordinalSlope = axis.ordinalSlope, + ordinalOffset = axis.ordinalOffset, + i = ordinalPositions.length - 1, + linearEquivalentLeft, + linearEquivalentRight, + distance; + + + // Handle the case where we translate from the index directly, used only + // when panning an ordinal axis + if (fromIndex) { + + if (val < 0) { // out of range, in effect panning to the left + val = ordinalPositions[0]; + } else if (val > i) { // out of range, panning to the right + val = ordinalPositions[i]; + } else { // split it up + i = mathFloor(val); + distance = val - i; // the decimal + } + + // Loop down along the ordinal positions. When the linear equivalent of i matches + // an ordinal position, interpolate between the left and right values. + } else { + while (i--) { + linearEquivalentLeft = (ordinalSlope * i) + ordinalOffset; + if (val >= linearEquivalentLeft) { + linearEquivalentRight = (ordinalSlope * (i + 1)) + ordinalOffset; + distance = (val - linearEquivalentLeft) / (linearEquivalentRight - linearEquivalentLeft); // something between 0 and 1 + break; + } + } + } + + // If the index is within the range of the ordinal positions, return the associated + // or interpolated value. If not, just return the value + return distance !== UNDEFINED && ordinalPositions[i] !== UNDEFINED ? + ordinalPositions[i] + (distance ? distance * (ordinalPositions[i + 1] - ordinalPositions[i]) : 0) : + val; + } + }; + + /** + * Get the ordinal positions for the entire data set. This is necessary in chart panning + * because we need to find out what points or data groups are available outside the + * visible range. When a panning operation starts, if an index for the given grouping + * does not exists, it is created and cached. This index is deleted on updated data, so + * it will be regenerated the next time a panning operation starts. + */ + xAxis.getExtendedPositions = function () { + var grouping = xAxis.series[0].currentDataGrouping, + ordinalIndex = xAxis.ordinalIndex, + key = grouping ? grouping.count + grouping.unitName : 'raw', + extremes = xAxis.getExtremes(), + fakeAxis, + fakeSeries; + + // If this is the first time, or the ordinal index is deleted by updatedData, + // create it. + if (!ordinalIndex) { + ordinalIndex = xAxis.ordinalIndex = {}; + } + + + if (!ordinalIndex[key]) { + + // Create a fake axis object where the extended ordinal positions are emulated + fakeAxis = { + series: [], + getExtremes: function () { + return { + min: extremes.dataMin, + max: extremes.dataMax + }; + }, + options: { + ordinal: true + } + }; + + // Add the fake series to hold the full data, then apply processData to it + each(xAxis.series, function (series) { + fakeSeries = { + xAxis: fakeAxis, + xData: series.xData, + chart: chart, + destroyGroupedData: noop + }; + fakeSeries.options = { + dataGrouping : grouping ? { + enabled: true, + forced: true, + approximation: 'open', // doesn't matter which, use the fastest + units: [[grouping.unitName, [grouping.count]]] + } : { + enabled: false + } + }; + series.processData.apply(fakeSeries); + + fakeAxis.series.push(fakeSeries); + }); + + // Run beforeSetTickPositions to compute the ordinalPositions + xAxis.beforeSetTickPositions.apply(fakeAxis); + + // Cache it + ordinalIndex[key] = fakeAxis.ordinalPositions; + } + return ordinalIndex[key]; + }; + + /** + * Find the factor to estimate how wide the plot area would have been if ordinal + * gaps were included. This value is used to compute an imagined plot width in order + * to establish the data grouping interval. + * + * A real world case is the intraday-candlestick + * example. Without this logic, it would show the correct data grouping when viewing + * a range within each day, but once moving the range to include the gap between two + * days, the interval would include the cut-away night hours and the data grouping + * would be wrong. So the below method tries to compensate by identifying the most + * common point interval, in this case days. + * + * An opposite case is presented in issue #718. We have a long array of daily data, + * then one point is appended one hour after the last point. We expect the data grouping + * not to change. + * + * In the future, if we find cases where this estimation doesn't work optimally, we + * might need to add a second pass to the data grouping logic, where we do another run + * with a greater interval if the number of data groups is more than a certain fraction + * of the desired group count. + */ + xAxis.getGroupIntervalFactor = function (xMin, xMax, processedXData) { + var i = 0, + len = processedXData.length, + distances = [], + median; + + // Register all the distances in an array + for (; i < len - 1; i++) { + distances[i] = processedXData[i + 1] - processedXData[i]; + } + + // Sort them and find the median + distances.sort(function (a, b) { + return a - b; + }); + median = distances[mathFloor(len / 2)]; + + // Return the factor needed for data grouping + return (len * median) / (xMax - xMin); + }; + + /** + * Make the tick intervals closer because the ordinal gaps make the ticks spread out or cluster + */ + xAxis.postProcessTickInterval = function (tickInterval) { + // TODO: http://jsfiddle.net/highcharts/FQm4E/1/ + // This is a case where this algorithm doesn't work optimally. In this case, the + // tick labels are spread out per week, but all the gaps reside within weeks. So + // we have a situation where the labels are courser than the ordinal gaps, and + // thus the tick interval should not be altered + var ordinalSlope = this.ordinalSlope; + + return ordinalSlope ? + tickInterval / (ordinalSlope / xAxis.closestPointRange) : + tickInterval; + }; + + /** + * In an ordinal axis, there might be areas with dense consentrations of points, then large + * gaps between some. Creating equally distributed ticks over this entire range + * may lead to a huge number of ticks that will later be removed. So instead, break the + * positions up in segments, find the tick positions for each segment then concatenize them. + * This method is used from both data grouping logic and X axis tick position logic. + */ + xAxis.getNonLinearTimeTicks = function (normalizedInterval, min, max, startOfWeek, positions, closestDistance, findHigherRanks) { + + var start = 0, + end = 0, + segmentPositions, + higherRanks = {}, + hasCrossedHigherRank, + info, + posLength, + outsideMax, + groupPositions = [], + tickPixelIntervalOption = xAxis.options.tickPixelInterval; + + // The positions are not always defined, for example for ordinal positions when data + // has regular interval + if (!positions || min === UNDEFINED) { + return getTimeTicks(normalizedInterval, min, max, startOfWeek); + } + + // Analyze the positions array to split it into segments on gaps larger than 5 times + // the closest distance. The closest distance is already found at this point, so + // we reuse that instead of computing it again. + posLength = positions.length; + for (; end < posLength; end++) { + + outsideMax = end && positions[end - 1] > max; + + if (positions[end] < min) { // Set the last position before min + start = end; + } + + if (end === posLength - 1 || positions[end + 1] - positions[end] > closestDistance * 5 || outsideMax) { + + // For each segment, calculate the tick positions from the getTimeTicks utility + // function. The interval will be the same regardless of how long the segment is. + segmentPositions = getTimeTicks(normalizedInterval, positions[start], positions[end], startOfWeek); + + groupPositions = groupPositions.concat(segmentPositions); + + // Set start of next segment + start = end + 1; + } + + if (outsideMax) { + break; + } + } + + // Get the grouping info from the last of the segments. The info is the same for + // all segments. + info = segmentPositions.info; + + // Optionally identify ticks with higher rank, for example when the ticks + // have crossed midnight. + if (findHigherRanks && info.unitRange <= timeUnits[HOUR]) { + end = groupPositions.length - 1; + + // Compare points two by two + for (start = 1; start < end; start++) { + if (new Date(groupPositions[start])[getDate]() !== new Date(groupPositions[start - 1])[getDate]()) { + higherRanks[groupPositions[start]] = DAY; + hasCrossedHigherRank = true; + } + } + + // If the complete array has crossed midnight, we want to mark the first + // positions also as higher rank + if (hasCrossedHigherRank) { + higherRanks[groupPositions[0]] = DAY; + } + info.higherRanks = higherRanks; + } + + // Save the info + groupPositions.info = info; + + + + // Don't show ticks within a gap in the ordinal axis, where the space between + // two points is greater than a portion of the tick pixel interval + if (findHigherRanks && defined(tickPixelIntervalOption)) { // check for squashed ticks + + var length = groupPositions.length, + i = length, + itemToRemove, + translated, + translatedArr = [], + lastTranslated, + medianDistance, + distance, + distances = []; + + // Find median pixel distance in order to keep a reasonably even distance between + // ticks (#748) + while (i--) { + translated = xAxis.translate(groupPositions[i]); + if (lastTranslated) { + distances[i] = lastTranslated - translated; + } + translatedArr[i] = lastTranslated = translated; + } + distances.sort(); + medianDistance = distances[mathFloor(distances.length / 2)]; + if (medianDistance < tickPixelIntervalOption * 0.6) { + medianDistance = null; + } + + // Now loop over again and remove ticks where needed + i = groupPositions[length - 1] > max ? length - 1 : length; // #817 + lastTranslated = undefined; + while (i--) { + translated = translatedArr[i]; + distance = lastTranslated - translated; + + // Remove ticks that are closer than 0.6 times the pixel interval from the one to the right, + // but not if it is close to the median distance (#748). + if (lastTranslated && distance < tickPixelIntervalOption * 0.8 && + (medianDistance === null || distance < medianDistance * 0.8)) { + + // Is this a higher ranked position with a normal position to the right? + if (higherRanks[groupPositions[i]] && !higherRanks[groupPositions[i + 1]]) { + + // Yes: remove the lower ranked neighbour to the right + itemToRemove = i + 1; + lastTranslated = translated; // #709 + + } else { + + // No: remove this one + itemToRemove = i; + } + + groupPositions.splice(itemToRemove, 1); + + } else { + lastTranslated = translated; + } + } + } + + return groupPositions; + }; + + + /** + * Overrride the chart.pan method for ordinal axes. + */ + + var baseChartPan = chart.pan; + chart.pan = function (chartX) { + var xAxis = chart.xAxis[0], + runBase = false; + if (xAxis.options.ordinal && xAxis.series.length) { + + var mouseDownX = chart.mouseDownX, + extremes = xAxis.getExtremes(), + dataMax = extremes.dataMax, + min = extremes.min, + max = extremes.max, + newMin, + newMax, + hoverPoints = chart.hoverPoints, + closestPointRange = xAxis.closestPointRange, + pointPixelWidth = xAxis.translationSlope * (xAxis.ordinalSlope || closestPointRange), + movedUnits = (mouseDownX - chartX) / pointPixelWidth, // how many ordinal units did we move? + extendedAxis = { ordinalPositions: xAxis.getExtendedPositions() }, // get index of all the chart's points + ordinalPositions, + searchAxisLeft, + lin2val = xAxis.lin2val, + val2lin = xAxis.val2lin, + searchAxisRight; + + if (!extendedAxis.ordinalPositions) { // we have an ordinal axis, but the data is equally spaced + runBase = true; + + } else if (mathAbs(movedUnits) > 1) { + + // Remove active points for shared tooltip + if (hoverPoints) { + each(hoverPoints, function (point) { + point.setState(); + }); + } + + if (movedUnits < 0) { + searchAxisLeft = extendedAxis; + searchAxisRight = xAxis.ordinalPositions ? xAxis : extendedAxis; + } else { + searchAxisLeft = xAxis.ordinalPositions ? xAxis : extendedAxis; + searchAxisRight = extendedAxis; + } + + // In grouped data series, the last ordinal position represents the grouped data, which is + // to the left of the real data max. If we don't compensate for this, we will be allowed + // to pan grouped data series passed the right of the plot area. + ordinalPositions = searchAxisRight.ordinalPositions; + if (dataMax > ordinalPositions[ordinalPositions.length - 1]) { + ordinalPositions.push(dataMax); + } + + // Get the new min and max values by getting the ordinal index for the current extreme, + // then add the moved units and translate back to values. This happens on the + // extended ordinal positions if the new position is out of range, else it happens + // on the current x axis which is smaller and faster. + newMin = lin2val.apply(searchAxisLeft, [ + val2lin.apply(searchAxisLeft, [min, true]) + movedUnits, // the new index + true // translate from index + ]); + newMax = lin2val.apply(searchAxisRight, [ + val2lin.apply(searchAxisRight, [max, true]) + movedUnits, // the new index + true // translate from index + ]); + + // Apply it if it is within the available data range + if (newMin > mathMin(extremes.dataMin, min) && newMax < mathMax(dataMax, max)) { + xAxis.setExtremes(newMin, newMax, true, false, { trigger: 'pan' }); + } + + chart.mouseDownX = chartX; // set new reference for next run + css(chart.container, { cursor: 'move' }); + } + + } else { + runBase = true; + } + + // revert to the linear chart.pan version + if (runBase) { + baseChartPan.apply(chart, arguments); + } + }; + } + }; + + /** + * Extend getSegments by identifying gaps in the ordinal data so that we can draw a gap in the + * line or area + */ + seriesProto.getSegments = function () { + + var series = this, + segments, + gapSize = series.options.gapSize; + + // call base method + baseGetSegments.apply(series); + + if (gapSize) { + + // properties + segments = series.segments; + + // extension for ordinal breaks + each(segments, function (segment, no) { + var i = segment.length - 1; + while (i--) { + if (segment[i + 1].x - segment[i].x > series.xAxis.closestPointRange * gapSize) { + segments.splice( // insert after this one + no + 1, + 0, + segment.splice(i + 1, segment.length - i) + ); + } + } + }); + } + }; +}()); + +/* **************************************************************************** + * End ordinal axis logic * + *****************************************************************************/ +// global variables +extend(Highcharts, { + + // Constructors + Axis: Axis, + CanVGRenderer: CanVGRenderer, + Chart: Chart, + Color: Color, + Legend: Legend, + MouseTracker: MouseTracker, + Point: Point, + Tick: Tick, + Tooltip: Tooltip, + Renderer: Renderer, + Series: Series, + SVGRenderer: SVGRenderer, + VMLRenderer: VMLRenderer, + + // Various + arrayMin: arrayMin, + arrayMax: arrayMax, + charts: charts, + dateFormat: dateFormat, + pathAnim: pathAnim, + getOptions: getOptions, + hasBidiBug: hasBidiBug, + isTouchDevice: isTouchDevice, + numberFormat: numberFormat, + seriesTypes: seriesTypes, + setOptions: setOptions, + addEvent: addEvent, + removeEvent: removeEvent, + createElement: createElement, + discardElement: discardElement, + css: css, + each: each, + extend: extend, + map: map, + merge: merge, + pick: pick, + splat: splat, + extendClass: extendClass, + pInt: pInt, + wrap: wrap, + svg: hasSVG, + canvas: useCanVG, + vml: !hasSVG && !useCanVG, + product: 'Highstock', + version: '1.2.5' +}); +}()); diff --git a/IPSLibrary/webfront/IPSHighcharts/Highcharts/js/jquery.min.js b/IPSLibrary/webfront/IPSHighcharts/Highcharts/js/jquery.min.js new file mode 100644 index 0000000..93adea1 --- /dev/null +++ b/IPSLibrary/webfront/IPSHighcharts/Highcharts/js/jquery.min.js @@ -0,0 +1,4 @@ +/*! jQuery v1.7.2 jquery.com | jquery.org/license */ +(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cu(a){if(!cj[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ck||(ck=c.createElement("iframe"),ck.frameBorder=ck.width=ck.height=0),b.appendChild(ck);if(!cl||!ck.createElement)cl=(ck.contentWindow||ck.contentDocument).document,cl.write((f.support.boxModel?"":"")+""),cl.close();d=cl.createElement(a),cl.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ck)}cj[a]=e}return cj[a]}function ct(a,b){var c={};f.each(cp.concat.apply([],cp.slice(0,b)),function(){c[this]=a});return c}function cs(){cq=b}function cr(){setTimeout(cs,0);return cq=f.now()}function ci(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ch(){try{return new a.XMLHttpRequest}catch(b){}}function cb(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g0){if(c!=="border")for(;e=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?+d:j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.2",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){if(typeof c!="string"||!c)return null;var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c
a",d=p.getElementsByTagName("*"),e=p.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=p.getElementsByTagName("input")[0],b={leadingWhitespace:p.firstChild.nodeType===3,tbody:!p.getElementsByTagName("tbody").length,htmlSerialize:!!p.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:p.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,pixelMargin:!0},f.boxModel=b.boxModel=c.compatMode==="CSS1Compat",i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete p.test}catch(r){b.deleteExpando=!1}!p.addEventListener&&p.attachEvent&&p.fireEvent&&(p.attachEvent("onclick",function(){b.noCloneEvent=!1}),p.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),i.setAttribute("name","t"),p.appendChild(i),j=c.createDocumentFragment(),j.appendChild(p.lastChild),b.checkClone=j.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,j.removeChild(i),j.appendChild(p);if(p.attachEvent)for(n in{submit:1,change:1,focusin:1})m="on"+n,o=m in p,o||(p.setAttribute(m,"return;"),o=typeof p[m]=="function"),b[n+"Bubbles"]=o;j.removeChild(p),j=g=h=p=i=null,f(function(){var d,e,g,h,i,j,l,m,n,q,r,s,t,u=c.getElementsByTagName("body")[0];!u||(m=1,t="padding:0;margin:0;border:",r="position:absolute;top:0;left:0;width:1px;height:1px;",s=t+"0;visibility:hidden;",n="style='"+r+t+"5px solid #000;",q="
"+""+"
",d=c.createElement("div"),d.style.cssText=s+"width:0;height:0;position:static;top:0;margin-top:"+m+"px",u.insertBefore(d,u.firstChild),p=c.createElement("div"),d.appendChild(p),p.innerHTML="
t
",k=p.getElementsByTagName("td"),o=k[0].offsetHeight===0,k[0].style.display="",k[1].style.display="none",b.reliableHiddenOffsets=o&&k[0].offsetHeight===0,a.getComputedStyle&&(p.innerHTML="",l=c.createElement("div"),l.style.width="0",l.style.marginRight="0",p.style.width="2px",p.appendChild(l),b.reliableMarginRight=(parseInt((a.getComputedStyle(l,null)||{marginRight:0}).marginRight,10)||0)===0),typeof p.style.zoom!="undefined"&&(p.innerHTML="",p.style.width=p.style.padding="1px",p.style.border=0,p.style.overflow="hidden",p.style.display="inline",p.style.zoom=1,b.inlineBlockNeedsLayout=p.offsetWidth===3,p.style.display="block",p.style.overflow="visible",p.innerHTML="
",b.shrinkWrapBlocks=p.offsetWidth!==3),p.style.cssText=r+s,p.innerHTML=q,e=p.firstChild,g=e.firstChild,i=e.nextSibling.firstChild.firstChild,j={doesNotAddBorder:g.offsetTop!==5,doesAddBorderForTableAndCells:i.offsetTop===5},g.style.position="fixed",g.style.top="20px",j.fixedPosition=g.offsetTop===20||g.offsetTop===15,g.style.position=g.style.top="",e.style.overflow="hidden",e.style.position="relative",j.subtractsBorderForOverflowNotVisible=g.offsetTop===-5,j.doesNotIncludeMarginInBodyOffset=u.offsetTop!==m,a.getComputedStyle&&(p.style.marginTop="1%",b.pixelMargin=(a.getComputedStyle(p,null)||{marginTop:0}).marginTop!=="1%"),typeof d.style.zoom!="undefined"&&(d.style.zoom=1),u.removeChild(d),l=p=d=null,f.extend(b,j))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e1,null,!1)},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,b){a&&(b=(b||"fx")+"mark",f._data(a,b,(f._data(a,b)||0)+1))},_unmark:function(a,b,c){a!==!0&&(c=b,b=a,a=!1);if(b){c=c||"fx";var d=c+"mark",e=a?0:(f._data(b,d)||1)-1;e?f._data(b,d,e):(f.removeData(b,d,!0),n(b,c,"mark"))}},queue:function(a,b,c){var d;if(a){b=(b||"fx")+"queue",d=f._data(a,b),c&&(!d||f.isArray(c)?d=f._data(a,b,f.makeArray(c)):d.push(c));return d||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e={};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),f._data(a,b+".run",e),d.call(a,function(){f.dequeue(a,b)},e)),c.length||(f.removeData(a,b+"queue "+b+".run",!0),n(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){var d=2;typeof a!="string"&&(c=a,a="fx",d--);if(arguments.length1)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,f.prop,a,b,arguments.length>1)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(p);for(c=0,d=this.length;c-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.type]||f.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.type]||f.valHooks[g.nodeName.toLowerCase()];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h,i=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;i=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/(?:^|\s)hover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function( +a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")};f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler,g=p.selector),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;le&&j.push({elem:this,matches:d.slice(e)});for(k=0;k0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return bc[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));o.match.globalPOS=p;var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="

";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="
";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h0)for(h=g;h=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/]","i"),bd=/checked\s*(?:[^=]|=\s*.checked.)/i,be=/\/(java|ecma)script/i,bf=/^\s*",""],legend:[1,"
","
"],thead:[1,"","
"],tr:[2,"","
"],td:[3,"","
"],col:[2,"","
"],area:[1,"",""],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div
","
"]),f.fn.extend({text:function(a){return f.access(this,function(a){return a===b?f.text(this):this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f +.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){return f.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1>");try{for(;d1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||f.isXMLDoc(a)||!bc.test("<"+a.nodeName+">")?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g,h,i,j=[];b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);for(var k=0,l;(l=a[k])!=null;k++){typeof l=="number"&&(l+="");if(!l)continue;if(typeof l=="string")if(!_.test(l))l=b.createTextNode(l);else{l=l.replace(Y,"<$1>");var m=(Z.exec(l)||["",""])[1].toLowerCase(),n=bg[m]||bg._default,o=n[0],p=b.createElement("div"),q=bh.childNodes,r;b===c?bh.appendChild(p):U(b).appendChild(p),p.innerHTML=n[1]+l+n[2];while(o--)p=p.lastChild;if(!f.support.tbody){var s=$.test(l),t=m==="table"&&!s?p.firstChild&&p.firstChild.childNodes:n[1]===""&&!s?p.childNodes:[];for(i=t.length-1;i>=0;--i)f.nodeName(t[i],"tbody")&&!t[i].childNodes.length&&t[i].parentNode.removeChild(t[i])}!f.support.leadingWhitespace&&X.test(l)&&p.insertBefore(b.createTextNode(X.exec(l)[0]),p.firstChild),l=p.childNodes,p&&(p.parentNode.removeChild(p),q.length>0&&(r=q[q.length-1],r&&r.parentNode&&r.parentNode.removeChild(r)))}var u;if(!f.support.appendChecked)if(l[0]&&typeof (u=l.length)=="number")for(i=0;i1)},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=by(a,"opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=bu.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(by)return by(a,c)},swap:function(a,b,c){var d={},e,f;for(f in b)d[f]=a.style[f],a.style[f]=b[f];e=c.call(a);for(f in b)a.style[f]=d[f];return e}}),f.curCSS=f.css,c.defaultView&&c.defaultView.getComputedStyle&&(bz=function(a,b){var c,d,e,g,h=a.style;b=b.replace(br,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b))),!f.support.pixelMargin&&e&&bv.test(b)&&bt.test(c)&&(g=h.width,h.width=c,c=e.width,h.width=g);return c}),c.documentElement.currentStyle&&(bA=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f==null&&g&&(e=g[b])&&(f=e),bt.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),by=bz||bA,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth!==0?bB(a,b,d):f.swap(a,bw,function(){return bB(a,b,d)})},set:function(a,b){return bs.test(b)?b+"px":b}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bq.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bp,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bp.test(g)?g.replace(bp,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){return f.swap(a,{display:"inline-block"},function(){return b?by(a,"margin-right"):a.style.marginRight})}})}),f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)}),f.each({margin:"",padding:"",border:"Width"},function(a,b){f.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bx[d]+b]=e[d]||e[d-2]||e[0];return f}}});var bC=/%20/g,bD=/\[\]$/,bE=/\r?\n/g,bF=/#.*$/,bG=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bH=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bI=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bJ=/^(?:GET|HEAD)$/,bK=/^\/\//,bL=/\?/,bM=/)<[^<]*)*<\/script>/gi,bN=/^(?:select|textarea)/i,bO=/\s+/,bP=/([?&])_=[^&]*/,bQ=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bR=f.fn.load,bS={},bT={},bU,bV,bW=["*/"]+["*"];try{bU=e.href}catch(bX){bU=c.createElement("a"),bU.href="",bU=bU.href}bV=bQ.exec(bU.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bR)return bR.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("
").append(c.replace(bM,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bN.test(this.nodeName)||bH.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bE,"\r\n")}}):{name:b.name,value:c.replace(bE,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b$(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b$(a,b);return a},ajaxSettings:{url:bU,isLocal:bI.test(bV[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bW},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bY(bS),ajaxTransport:bY(bT),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?ca(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cb(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bG.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bF,"").replace(bK,bV[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bO),d.crossDomain==null&&(r=bQ.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bV[1]&&r[2]==bV[2]&&(r[3]||(r[1]==="http:"?80:443))==(bV[3]||(bV[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bZ(bS,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bJ.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bL.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bP,"$1_="+x);d.url=y+(y===d.url?(bL.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bW+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bZ(bT,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)b_(g,a[g],c,e);return d.join("&").replace(bC,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cc=f.now(),cd=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cc++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=typeof b.data=="string"&&/^application\/x\-www\-form\-urlencoded/.test(b.contentType);if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(cd.test(b.url)||e&&cd.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(cd,l),b.url===j&&(e&&(k=k.replace(cd,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var ce=a.ActiveXObject?function(){for(var a in cg)cg[a](0,1)}:!1,cf=0,cg;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ch()||ci()}:ch,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,ce&&delete cg[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n);try{m.text=h.responseText}catch(a){}try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cf,ce&&(cg||(cg={},f(a).unload(ce)),cg[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cj={},ck,cl,cm=/^(?:toggle|show|hide)$/,cn=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,co,cp=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cq;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(ct("show",3),a,b,c);for(var g=0,h=this.length;g=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);f.fn[a]=function(e){return f.access(this,function(a,e,g){var h=cy(a);if(g===b)return h?c in h?h[c]:f.support.boxModel&&h.document.documentElement[e]||h.document.body[e]:a[e];h?h.scrollTo(d?f(h).scrollLeft():g,d?g:f(h).scrollTop()):a[e]=g},a,e,arguments.length,null)}}),f.each({Height:"height",Width:"width"},function(a,c){var d="client"+a,e="scroll"+a,g="offset"+a;f.fn["inner"+a]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,c,"padding")):this[c]():null},f.fn["outer"+a]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,c,a?"margin":"border")):this[c]():null},f.fn[c]=function(a){return f.access(this,function(a,c,h){var i,j,k,l;if(f.isWindow(a)){i=a.document,j=i.documentElement[d];return f.support.boxModel&&j||i.body&&i.body[d]||j}if(a.nodeType===9){i=a.documentElement;if(i[d]>=i[e])return i[d];return Math.max(a.body[e],i[e],a.body[g],i[g])}if(h===b){k=f.css(a,c),l=parseFloat(k);return f.isNumeric(l)?l:k}f(a).css(c,h)},c,a,arguments.length,null)}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window); \ No newline at end of file diff --git a/IPSLibrary/webfront/IPSHighcharts/Highcharts/js/modules/canvas-tools.js b/IPSLibrary/webfront/IPSHighcharts/Highcharts/js/modules/canvas-tools.js new file mode 100644 index 0000000..0d8aa14 --- /dev/null +++ b/IPSLibrary/webfront/IPSHighcharts/Highcharts/js/modules/canvas-tools.js @@ -0,0 +1,133 @@ +/* + A class to parse color values + @author Stoyan Stefanov + @link http://www.phpied.com/rgb-color-parser-in-javascript/ + Use it if you like it + + canvg.js - Javascript SVG parser and renderer on Canvas + MIT Licensed + Gabe Lerner (gabelerner@gmail.com) + http://code.google.com/p/canvg/ + + Requires: rgbcolor.js - http://www.phpied.com/rgb-color-parser-in-javascript/ + + Highcharts JS v2.3.2 (2012-08-31) + CanVGRenderer Extension module + + (c) 2011-2012 Torstein Hønsi, Erik Olsson + + License: www.highcharts.com/license +*/ +function RGBColor(m){this.ok=!1;m.charAt(0)=="#"&&(m=m.substr(1,6));var m=m.replace(/ /g,""),m=m.toLowerCase(),a={aliceblue:"f0f8ff",antiquewhite:"faebd7",aqua:"00ffff",aquamarine:"7fffd4",azure:"f0ffff",beige:"f5f5dc",bisque:"ffe4c4",black:"000000",blanchedalmond:"ffebcd",blue:"0000ff",blueviolet:"8a2be2",brown:"a52a2a",burlywood:"deb887",cadetblue:"5f9ea0",chartreuse:"7fff00",chocolate:"d2691e",coral:"ff7f50",cornflowerblue:"6495ed",cornsilk:"fff8dc",crimson:"dc143c",cyan:"00ffff",darkblue:"00008b", +darkcyan:"008b8b",darkgoldenrod:"b8860b",darkgray:"a9a9a9",darkgreen:"006400",darkkhaki:"bdb76b",darkmagenta:"8b008b",darkolivegreen:"556b2f",darkorange:"ff8c00",darkorchid:"9932cc",darkred:"8b0000",darksalmon:"e9967a",darkseagreen:"8fbc8f",darkslateblue:"483d8b",darkslategray:"2f4f4f",darkturquoise:"00ced1",darkviolet:"9400d3",deeppink:"ff1493",deepskyblue:"00bfff",dimgray:"696969",dodgerblue:"1e90ff",feldspar:"d19275",firebrick:"b22222",floralwhite:"fffaf0",forestgreen:"228b22",fuchsia:"ff00ff", +gainsboro:"dcdcdc",ghostwhite:"f8f8ff",gold:"ffd700",goldenrod:"daa520",gray:"808080",green:"008000",greenyellow:"adff2f",honeydew:"f0fff0",hotpink:"ff69b4",indianred:"cd5c5c",indigo:"4b0082",ivory:"fffff0",khaki:"f0e68c",lavender:"e6e6fa",lavenderblush:"fff0f5",lawngreen:"7cfc00",lemonchiffon:"fffacd",lightblue:"add8e6",lightcoral:"f08080",lightcyan:"e0ffff",lightgoldenrodyellow:"fafad2",lightgrey:"d3d3d3",lightgreen:"90ee90",lightpink:"ffb6c1",lightsalmon:"ffa07a",lightseagreen:"20b2aa",lightskyblue:"87cefa", +lightslateblue:"8470ff",lightslategray:"778899",lightsteelblue:"b0c4de",lightyellow:"ffffe0",lime:"00ff00",limegreen:"32cd32",linen:"faf0e6",magenta:"ff00ff",maroon:"800000",mediumaquamarine:"66cdaa",mediumblue:"0000cd",mediumorchid:"ba55d3",mediumpurple:"9370d8",mediumseagreen:"3cb371",mediumslateblue:"7b68ee",mediumspringgreen:"00fa9a",mediumturquoise:"48d1cc",mediumvioletred:"c71585",midnightblue:"191970",mintcream:"f5fffa",mistyrose:"ffe4e1",moccasin:"ffe4b5",navajowhite:"ffdead",navy:"000080", +oldlace:"fdf5e6",olive:"808000",olivedrab:"6b8e23",orange:"ffa500",orangered:"ff4500",orchid:"da70d6",palegoldenrod:"eee8aa",palegreen:"98fb98",paleturquoise:"afeeee",palevioletred:"d87093",papayawhip:"ffefd5",peachpuff:"ffdab9",peru:"cd853f",pink:"ffc0cb",plum:"dda0dd",powderblue:"b0e0e6",purple:"800080",red:"ff0000",rosybrown:"bc8f8f",royalblue:"4169e1",saddlebrown:"8b4513",salmon:"fa8072",sandybrown:"f4a460",seagreen:"2e8b57",seashell:"fff5ee",sienna:"a0522d",silver:"c0c0c0",skyblue:"87ceeb",slateblue:"6a5acd", +slategray:"708090",snow:"fffafa",springgreen:"00ff7f",steelblue:"4682b4",tan:"d2b48c",teal:"008080",thistle:"d8bfd8",tomato:"ff6347",turquoise:"40e0d0",violet:"ee82ee",violetred:"d02090",wheat:"f5deb3",white:"ffffff",whitesmoke:"f5f5f5",yellow:"ffff00",yellowgreen:"9acd32"},c;for(c in a)m==c&&(m=a[c]);var d=[{re:/^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/,example:["rgb(123, 234, 45)","rgb(255,234,245)"],process:function(b){return[parseInt(b[1]),parseInt(b[2]),parseInt(b[3])]}},{re:/^(\w{2})(\w{2})(\w{2})$/, +example:["#00ff00","336699"],process:function(b){return[parseInt(b[1],16),parseInt(b[2],16),parseInt(b[3],16)]}},{re:/^(\w{1})(\w{1})(\w{1})$/,example:["#fb0","f0f"],process:function(b){return[parseInt(b[1]+b[1],16),parseInt(b[2]+b[2],16),parseInt(b[3]+b[3],16)]}}];for(c=0;c255?255:this.r;this.g=this.g<0||isNaN(this.g)?0: +this.g>255?255:this.g;this.b=this.b<0||isNaN(this.b)?0:this.b>255?255:this.b;this.toRGB=function(){return"rgb("+this.r+", "+this.g+", "+this.b+")"};this.toHex=function(){var b=this.r.toString(16),a=this.g.toString(16),d=this.b.toString(16);b.length==1&&(b="0"+b);a.length==1&&(a="0"+a);d.length==1&&(d="0"+d);return"#"+b+a+d};this.getHelpXML=function(){for(var b=[],k=0;k "+o.toRGB()+" -> "+o.toHex());l.appendChild(n);l.appendChild(q);c.appendChild(l)}catch(p){}return c}} +if(!window.console)window.console={},window.console.log=function(){},window.console.dir=function(){};if(!Array.prototype.indexOf)Array.prototype.indexOf=function(m){for(var a=0;a]*>/,""),d=new ActiveXObject("Microsoft.XMLDOM");d.async="false";d.loadXML(a);return d}};a.Property=function(c,d){this.name=c;this.value=d;this.hasValue=function(){return this.value!=null&&this.value!==""};this.numValue=function(){if(!this.hasValue())return 0;var b=parseFloat(this.value);(this.value+"").match(/%$/)&& +(b/=100);return b};this.valueOrDefault=function(b){return this.hasValue()?this.value:b};this.numValueOrDefault=function(b){return this.hasValue()?this.numValue():b};var b=this;this.Color={addOpacity:function(d){var c=b.value;if(d!=null&&d!=""){var f=new RGBColor(b.value);f.ok&&(c="rgba("+f.r+", "+f.g+", "+f.b+", "+d+")")}return new a.Property(b.name,c)}};this.Definition={getDefinition:function(){var d=b.value.replace(/^(url\()?#([^\)]+)\)?$/,"$2");return a.Definitions[d]},isUrl:function(){return b.value.indexOf("url(")== +0},getFillStyle:function(b){var d=this.getDefinition();return d!=null&&d.createGradient?d.createGradient(a.ctx,b):d!=null&&d.createPattern?d.createPattern(a.ctx,b):null}};this.Length={DPI:function(){return 96},EM:function(b){var d=12,c=new a.Property("fontSize",a.Font.Parse(a.ctx.font).fontSize);c.hasValue()&&(d=c.Length.toPixels(b));return d},toPixels:function(d){if(!b.hasValue())return 0;var c=b.value+"";return c.match(/em$/)?b.numValue()*this.EM(d):c.match(/ex$/)?b.numValue()*this.EM(d)/2:c.match(/px$/)? +b.numValue():c.match(/pt$/)?b.numValue()*1.25:c.match(/pc$/)?b.numValue()*15:c.match(/cm$/)?b.numValue()*this.DPI(d)/2.54:c.match(/mm$/)?b.numValue()*this.DPI(d)/25.4:c.match(/in$/)?b.numValue()*this.DPI(d):c.match(/%$/)?b.numValue()*a.ViewPort.ComputeSize(d):b.numValue()}};this.Time={toMilliseconds:function(){if(!b.hasValue())return 0;var a=b.value+"";if(a.match(/s$/))return b.numValue()*1E3;a.match(/ms$/);return b.numValue()}};this.Angle={toRadians:function(){if(!b.hasValue())return 0;var a=b.value+ +"";return a.match(/deg$/)?b.numValue()*(Math.PI/180):a.match(/grad$/)?b.numValue()*(Math.PI/200):a.match(/rad$/)?b.numValue():b.numValue()*(Math.PI/180)}}};a.Font=new function(){this.Styles=["normal","italic","oblique","inherit"];this.Variants=["normal","small-caps","inherit"];this.Weights="normal,bold,bolder,lighter,100,200,300,400,500,600,700,800,900,inherit".split(",");this.CreateFont=function(d,b,c,e,f,g){g=g!=null?this.Parse(g):this.CreateFont("","","","","",a.ctx.font);return{fontFamily:f|| +g.fontFamily,fontSize:e||g.fontSize,fontStyle:d||g.fontStyle,fontWeight:c||g.fontWeight,fontVariant:b||g.fontVariant,toString:function(){return[this.fontStyle,this.fontVariant,this.fontWeight,this.fontSize,this.fontFamily].join(" ")}}};var c=this;this.Parse=function(d){for(var b={},d=a.trim(a.compressSpaces(d||"")).split(" "),k=!1,e=!1,f=!1,g=!1,j="",h=0;hthis.x2)this.x2=b}if(a!=null){if(isNaN(this.y1)||isNaN(this.y2))this.y2=this.y1=a;if(athis.y2)this.y2=a}};this.addX=function(b){this.addPoint(b,null)};this.addY=function(b){this.addPoint(null,b)};this.addBoundingBox=function(b){this.addPoint(b.x1,b.y1);this.addPoint(b.x2,b.y2)};this.addQuadraticCurve=function(b,a,d,c,k,l){d=b+2/3*(d-b);c=a+2/3*(c- +a);this.addBezierCurve(b,a,d,d+1/3*(k-b),c,c+1/3*(l-a),k,l)};this.addBezierCurve=function(b,a,d,c,k,l,o,n){var q=[b,a],p=[d,c],t=[k,l],m=[o,n];this.addPoint(q[0],q[1]);this.addPoint(m[0],m[1]);for(i=0;i<=1;i++)b=function(b){return Math.pow(1-b,3)*q[i]+3*Math.pow(1-b,2)*b*p[i]+3*(1-b)*Math.pow(b,2)*t[i]+Math.pow(b,3)*m[i]},a=6*q[i]-12*p[i]+6*t[i],d=-3*q[i]+9*p[i]-9*t[i]+3*m[i],c=3*p[i]-3*q[i],d==0?a!=0&&(a=-c/a,0=this.tokens.length-1};this.isCommandOrEnd=function(){return this.isEnd()? +!0:this.tokens[this.i+1].match(/^[A-Za-z]$/)!=null};this.isRelativeCommand=function(){return this.command==this.command.toLowerCase()};this.getToken=function(){this.i+=1;return this.tokens[this.i]};this.getScalar=function(){return parseFloat(this.getToken())};this.nextCommand=function(){this.previousCommand=this.command;this.command=this.getToken()};this.getPoint=function(){return this.makeAbsolute(new a.Point(this.getScalar(),this.getScalar()))};this.getAsControlPoint=function(){var b=this.getPoint(); +return this.control=b};this.getAsCurrentPoint=function(){var b=this.getPoint();return this.current=b};this.getReflectedControlPoint=function(){return this.previousCommand.toLowerCase()!="c"&&this.previousCommand.toLowerCase()!="s"?this.current:new a.Point(2*this.current.x-this.control.x,2*this.current.y-this.control.y)};this.makeAbsolute=function(b){if(this.isRelativeCommand())b.x=this.current.x+b.x,b.y=this.current.y+b.y;return b};this.addMarker=function(b,a,d){d!=null&&this.angles.length>0&&this.angles[this.angles.length- +1]==null&&(this.angles[this.angles.length-1]=this.points[this.points.length-1].angleTo(d));this.addMarkerAngle(b,a==null?null:a.angleTo(b))};this.addMarkerAngle=function(b,a){this.points.push(b);this.angles.push(a)};this.getMarkerPoints=function(){return this.points};this.getMarkerAngles=function(){for(var b=0;b1&&(h*=Math.sqrt(q),l*=Math.sqrt(q));o=(o==j?-1:1)*Math.sqrt((Math.pow(h,2)*Math.pow(l,2)-Math.pow(h,2)*Math.pow(n.y,2)-Math.pow(l,2)*Math.pow(n.x,2))/(Math.pow(h,2)*Math.pow(n.y,2)+Math.pow(l,2)*Math.pow(n.x,2)));isNaN(o)&&(o=0);var p=new a.Point(o*h*n.y/l,o*-l*n.x/h),g=new a.Point((g.x+e.x)/2+Math.cos(f)* +p.x-Math.sin(f)*p.y,(g.y+e.y)/2+Math.sin(f)*p.x+Math.cos(f)*p.y),m=function(b,a){return(b[0]*a[0]+b[1]*a[1])/(Math.sqrt(Math.pow(b[0],2)+Math.pow(b[1],2))*Math.sqrt(Math.pow(a[0],2)+Math.pow(a[1],2)))},s=function(b,a){return(b[0]*a[1]=1&&(n=0);j==0&&n>0&&(n-=2*Math.PI);j==1&&n<0&&(n+=2*Math.PI);q=new a.Point(g.x-h*Math.cos((o+n)/ +2),g.y-l*Math.sin((o+n)/2));b.addMarkerAngle(q,(o+n)/2+(j==0?1:-1)*Math.PI/2);b.addMarkerAngle(e,n+(j==0?1:-1)*Math.PI/2);c.addPoint(e.x,e.y);d!=null&&(m=h>l?h:l,e=h>l?1:h/l,h=h>l?l/h:1,d.translate(g.x,g.y),d.rotate(f),d.scale(e,h),d.arc(0,0,m,o,o+n,1-j),d.scale(1/e,1/h),d.rotate(-f),d.translate(-g.x,-g.y))}break;case "Z":d!=null&&d.closePath(),b.current=b.start}return c};this.getMarkers=function(){for(var a=this.PathParser.getMarkerPoints(),b=this.PathParser.getMarkerAngles(),c=[],e=0;ethis.maxDuration)if(this.attribute("repeatCount").value=="indefinite")this.duration=0;else return this.attribute("fill").valueOrDefault("remove")=="remove"&&!this.removed?(this.removed=!0,this.getProperty().value=this.initialValue,!0):!1;this.duration+=a;a=!1;if(this.begin0&&b[c-1]!=" "&&c0&&b[c-1]!=" "&&(c==b.length-1||b[c+1]==" "))g="initial";typeof a.glyphs[e]!="undefined"&&(f=a.glyphs[e][g],f==null&&a.glyphs[e].type=="glyph"&&(f=a.glyphs[e]))}else f=a.glyphs[e];if(f==null)f=a.missingGlyph;return f};this.renderChildren=function(c){var b=this.parent.style("font-family").Definition.getDefinition();if(b!=null){var k=this.parent.style("font-size").numValueOrDefault(a.Font.Parse(a.ctx.font).fontSize), +e=this.parent.style("font-style").valueOrDefault(a.Font.Parse(a.ctx.font).fontStyle),f=this.getText();b.isRTL&&(f=f.split("").reverse().join(""));for(var g=a.ToNumberArray(this.parent.attribute("dx").value),j=0;j0?c.childNodes[0].nodeValue:c.text;this.getText=function(){return this.text}};a.Element.tspan.prototype=new a.Element.TextElementBase;a.Element.tref=function(c){this.base=a.Element.TextElementBase;this.base(c);this.getText=function(){var a=this.attribute("xlink:href").Definition.getDefinition();if(a!=null)return a.children[0].getText()}};a.Element.tref.prototype=new a.Element.TextElementBase; +a.Element.a=function(c){this.base=a.Element.TextElementBase;this.base(c);this.hasText=!0;for(var d=0;d1?c.childNodes[1].nodeValue: +""),c=c.replace(/(\/\*([^*]|[\r\n]|(\*+([^*\/]|[\r\n])))*\*+\/)|(^[\s]*\/\/.*)/gm,""),c=a.compressSpaces(c),c=c.split("}"),d=0;d0){l=g[j].indexOf("url");h=g[j].indexOf(")",l);l=g[j].substr(l+5,h-l-6);l=a.parseXml(a.ajax(l)).getElementsByTagName("font");for(h=0;h + * @link http://www.phpied.com/rgb-color-parser-in-javascript/ + * Use it if you like it + * + */ +function RGBColor(color_string) +{ + this.ok = false; + + // strip any leading # + if (color_string.charAt(0) == '#') { // remove # if any + color_string = color_string.substr(1,6); + } + + color_string = color_string.replace(/ /g,''); + color_string = color_string.toLowerCase(); + + // before getting into regexps, try simple matches + // and overwrite the input + var simple_colors = { + aliceblue: 'f0f8ff', + antiquewhite: 'faebd7', + aqua: '00ffff', + aquamarine: '7fffd4', + azure: 'f0ffff', + beige: 'f5f5dc', + bisque: 'ffe4c4', + black: '000000', + blanchedalmond: 'ffebcd', + blue: '0000ff', + blueviolet: '8a2be2', + brown: 'a52a2a', + burlywood: 'deb887', + cadetblue: '5f9ea0', + chartreuse: '7fff00', + chocolate: 'd2691e', + coral: 'ff7f50', + cornflowerblue: '6495ed', + cornsilk: 'fff8dc', + crimson: 'dc143c', + cyan: '00ffff', + darkblue: '00008b', + darkcyan: '008b8b', + darkgoldenrod: 'b8860b', + darkgray: 'a9a9a9', + darkgreen: '006400', + darkkhaki: 'bdb76b', + darkmagenta: '8b008b', + darkolivegreen: '556b2f', + darkorange: 'ff8c00', + darkorchid: '9932cc', + darkred: '8b0000', + darksalmon: 'e9967a', + darkseagreen: '8fbc8f', + darkslateblue: '483d8b', + darkslategray: '2f4f4f', + darkturquoise: '00ced1', + darkviolet: '9400d3', + deeppink: 'ff1493', + deepskyblue: '00bfff', + dimgray: '696969', + dodgerblue: '1e90ff', + feldspar: 'd19275', + firebrick: 'b22222', + floralwhite: 'fffaf0', + forestgreen: '228b22', + fuchsia: 'ff00ff', + gainsboro: 'dcdcdc', + ghostwhite: 'f8f8ff', + gold: 'ffd700', + goldenrod: 'daa520', + gray: '808080', + green: '008000', + greenyellow: 'adff2f', + honeydew: 'f0fff0', + hotpink: 'ff69b4', + indianred : 'cd5c5c', + indigo : '4b0082', + ivory: 'fffff0', + khaki: 'f0e68c', + lavender: 'e6e6fa', + lavenderblush: 'fff0f5', + lawngreen: '7cfc00', + lemonchiffon: 'fffacd', + lightblue: 'add8e6', + lightcoral: 'f08080', + lightcyan: 'e0ffff', + lightgoldenrodyellow: 'fafad2', + lightgrey: 'd3d3d3', + lightgreen: '90ee90', + lightpink: 'ffb6c1', + lightsalmon: 'ffa07a', + lightseagreen: '20b2aa', + lightskyblue: '87cefa', + lightslateblue: '8470ff', + lightslategray: '778899', + lightsteelblue: 'b0c4de', + lightyellow: 'ffffe0', + lime: '00ff00', + limegreen: '32cd32', + linen: 'faf0e6', + magenta: 'ff00ff', + maroon: '800000', + mediumaquamarine: '66cdaa', + mediumblue: '0000cd', + mediumorchid: 'ba55d3', + mediumpurple: '9370d8', + mediumseagreen: '3cb371', + mediumslateblue: '7b68ee', + mediumspringgreen: '00fa9a', + mediumturquoise: '48d1cc', + mediumvioletred: 'c71585', + midnightblue: '191970', + mintcream: 'f5fffa', + mistyrose: 'ffe4e1', + moccasin: 'ffe4b5', + navajowhite: 'ffdead', + navy: '000080', + oldlace: 'fdf5e6', + olive: '808000', + olivedrab: '6b8e23', + orange: 'ffa500', + orangered: 'ff4500', + orchid: 'da70d6', + palegoldenrod: 'eee8aa', + palegreen: '98fb98', + paleturquoise: 'afeeee', + palevioletred: 'd87093', + papayawhip: 'ffefd5', + peachpuff: 'ffdab9', + peru: 'cd853f', + pink: 'ffc0cb', + plum: 'dda0dd', + powderblue: 'b0e0e6', + purple: '800080', + red: 'ff0000', + rosybrown: 'bc8f8f', + royalblue: '4169e1', + saddlebrown: '8b4513', + salmon: 'fa8072', + sandybrown: 'f4a460', + seagreen: '2e8b57', + seashell: 'fff5ee', + sienna: 'a0522d', + silver: 'c0c0c0', + skyblue: '87ceeb', + slateblue: '6a5acd', + slategray: '708090', + snow: 'fffafa', + springgreen: '00ff7f', + steelblue: '4682b4', + tan: 'd2b48c', + teal: '008080', + thistle: 'd8bfd8', + tomato: 'ff6347', + turquoise: '40e0d0', + violet: 'ee82ee', + violetred: 'd02090', + wheat: 'f5deb3', + white: 'ffffff', + whitesmoke: 'f5f5f5', + yellow: 'ffff00', + yellowgreen: '9acd32' + }; + for (var key in simple_colors) { + if (color_string == key) { + color_string = simple_colors[key]; + } + } + // emd of simple type-in colors + + // array of color definition objects + var color_defs = [ + { + re: /^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/, + example: ['rgb(123, 234, 45)', 'rgb(255,234,245)'], + process: function (bits){ + return [ + parseInt(bits[1]), + parseInt(bits[2]), + parseInt(bits[3]) + ]; + } + }, + { + re: /^(\w{2})(\w{2})(\w{2})$/, + example: ['#00ff00', '336699'], + process: function (bits){ + return [ + parseInt(bits[1], 16), + parseInt(bits[2], 16), + parseInt(bits[3], 16) + ]; + } + }, + { + re: /^(\w{1})(\w{1})(\w{1})$/, + example: ['#fb0', 'f0f'], + process: function (bits){ + return [ + parseInt(bits[1] + bits[1], 16), + parseInt(bits[2] + bits[2], 16), + parseInt(bits[3] + bits[3], 16) + ]; + } + } + ]; + + // search through the definitions to find a match + for (var i = 0; i < color_defs.length; i++) { + var re = color_defs[i].re; + var processor = color_defs[i].process; + var bits = re.exec(color_string); + if (bits) { + channels = processor(bits); + this.r = channels[0]; + this.g = channels[1]; + this.b = channels[2]; + this.ok = true; + } + + } + + // validate/cleanup values + this.r = (this.r < 0 || isNaN(this.r)) ? 0 : ((this.r > 255) ? 255 : this.r); + this.g = (this.g < 0 || isNaN(this.g)) ? 0 : ((this.g > 255) ? 255 : this.g); + this.b = (this.b < 0 || isNaN(this.b)) ? 0 : ((this.b > 255) ? 255 : this.b); + + // some getters + this.toRGB = function () { + return 'rgb(' + this.r + ', ' + this.g + ', ' + this.b + ')'; + } + this.toHex = function () { + var r = this.r.toString(16); + var g = this.g.toString(16); + var b = this.b.toString(16); + if (r.length == 1) r = '0' + r; + if (g.length == 1) g = '0' + g; + if (b.length == 1) b = '0' + b; + return '#' + r + g + b; + } + + // help + this.getHelpXML = function () { + + var examples = new Array(); + // add regexps + for (var i = 0; i < color_defs.length; i++) { + var example = color_defs[i].example; + for (var j = 0; j < example.length; j++) { + examples[examples.length] = example[j]; + } + } + // add type-in colors + for (var sc in simple_colors) { + examples[examples.length] = sc; + } + + var xml = document.createElement('ul'); + xml.setAttribute('id', 'rgbcolor-examples'); + for (var i = 0; i < examples.length; i++) { + try { + var list_item = document.createElement('li'); + var list_color = new RGBColor(examples[i]); + var example_div = document.createElement('div'); + example_div.style.cssText = + 'margin: 3px; ' + + 'border: 1px solid black; ' + + 'background:' + list_color.toHex() + '; ' + + 'color:' + list_color.toHex() + ; + example_div.appendChild(document.createTextNode('test')); + var list_item_value = document.createTextNode( + ' ' + examples[i] + ' -> ' + list_color.toRGB() + ' -> ' + list_color.toHex() + ); + list_item.appendChild(example_div); + list_item.appendChild(list_item_value); + xml.appendChild(list_item); + + } catch(e){} + } + return xml; + + } + +} + +/** + * @license canvg.js - Javascript SVG parser and renderer on Canvas + * MIT Licensed + * Gabe Lerner (gabelerner@gmail.com) + * http://code.google.com/p/canvg/ + * + * Requires: rgbcolor.js - http://www.phpied.com/rgb-color-parser-in-javascript/ + * + */ +if(!window.console) { + window.console = {}; + window.console.log = function(str) {}; + window.console.dir = function(str) {}; +} + +if(!Array.prototype.indexOf){ + Array.prototype.indexOf = function(obj){ + for(var i=0; i ignore mouse events + // ignoreAnimation: true => ignore animations + // ignoreDimensions: true => does not try to resize canvas + // ignoreClear: true => does not clear canvas + // offsetX: int => draws at a x offset + // offsetY: int => draws at a y offset + // scaleWidth: int => scales horizontally to width + // scaleHeight: int => scales vertically to height + // renderCallback: function => will call the function after the first render is completed + // forceRedraw: function => will call the function on every frame, if it returns true, will redraw + this.canvg = function (target, s, opts) { + // no parameters + if (target == null && s == null && opts == null) { + var svgTags = document.getElementsByTagName('svg'); + for (var i=0; i]*>/, ''); + var xmlDoc = new ActiveXObject('Microsoft.XMLDOM'); + xmlDoc.async = 'false'; + xmlDoc.loadXML(xml); + return xmlDoc; + } + } + + svg.Property = function(name, value) { + this.name = name; + this.value = value; + + this.hasValue = function() { + return (this.value != null && this.value !== ''); + } + + // return the numerical value of the property + this.numValue = function() { + if (!this.hasValue()) return 0; + + var n = parseFloat(this.value); + if ((this.value + '').match(/%$/)) { + n = n / 100.0; + } + return n; + } + + this.valueOrDefault = function(def) { + if (this.hasValue()) return this.value; + return def; + } + + this.numValueOrDefault = function(def) { + if (this.hasValue()) return this.numValue(); + return def; + } + + /* EXTENSIONS */ + var that = this; + + // color extensions + this.Color = { + // augment the current color value with the opacity + addOpacity: function(opacity) { + var newValue = that.value; + if (opacity != null && opacity != '') { + var color = new RGBColor(that.value); + if (color.ok) { + newValue = 'rgba(' + color.r + ', ' + color.g + ', ' + color.b + ', ' + opacity + ')'; + } + } + return new svg.Property(that.name, newValue); + } + } + + // definition extensions + this.Definition = { + // get the definition from the definitions table + getDefinition: function() { + var name = that.value.replace(/^(url\()?#([^\)]+)\)?$/, '$2'); + return svg.Definitions[name]; + }, + + isUrl: function() { + return that.value.indexOf('url(') == 0 + }, + + getFillStyle: function(e) { + var def = this.getDefinition(); + + // gradient + if (def != null && def.createGradient) { + return def.createGradient(svg.ctx, e); + } + + // pattern + if (def != null && def.createPattern) { + return def.createPattern(svg.ctx, e); + } + + return null; + } + } + + // length extensions + this.Length = { + DPI: function(viewPort) { + return 96.0; // TODO: compute? + }, + + EM: function(viewPort) { + var em = 12; + + var fontSize = new svg.Property('fontSize', svg.Font.Parse(svg.ctx.font).fontSize); + if (fontSize.hasValue()) em = fontSize.Length.toPixels(viewPort); + + return em; + }, + + // get the length as pixels + toPixels: function(viewPort) { + if (!that.hasValue()) return 0; + var s = that.value+''; + if (s.match(/em$/)) return that.numValue() * this.EM(viewPort); + if (s.match(/ex$/)) return that.numValue() * this.EM(viewPort) / 2.0; + if (s.match(/px$/)) return that.numValue(); + if (s.match(/pt$/)) return that.numValue() * 1.25; + if (s.match(/pc$/)) return that.numValue() * 15; + if (s.match(/cm$/)) return that.numValue() * this.DPI(viewPort) / 2.54; + if (s.match(/mm$/)) return that.numValue() * this.DPI(viewPort) / 25.4; + if (s.match(/in$/)) return that.numValue() * this.DPI(viewPort); + if (s.match(/%$/)) return that.numValue() * svg.ViewPort.ComputeSize(viewPort); + return that.numValue(); + } + } + + // time extensions + this.Time = { + // get the time as milliseconds + toMilliseconds: function() { + if (!that.hasValue()) return 0; + var s = that.value+''; + if (s.match(/s$/)) return that.numValue() * 1000; + if (s.match(/ms$/)) return that.numValue(); + return that.numValue(); + } + } + + // angle extensions + this.Angle = { + // get the angle as radians + toRadians: function() { + if (!that.hasValue()) return 0; + var s = that.value+''; + if (s.match(/deg$/)) return that.numValue() * (Math.PI / 180.0); + if (s.match(/grad$/)) return that.numValue() * (Math.PI / 200.0); + if (s.match(/rad$/)) return that.numValue(); + return that.numValue() * (Math.PI / 180.0); + } + } + } + + // fonts + svg.Font = new (function() { + this.Styles = ['normal','italic','oblique','inherit']; + this.Variants = ['normal','small-caps','inherit']; + this.Weights = ['normal','bold','bolder','lighter','100','200','300','400','500','600','700','800','900','inherit']; + + this.CreateFont = function(fontStyle, fontVariant, fontWeight, fontSize, fontFamily, inherit) { + var f = inherit != null ? this.Parse(inherit) : this.CreateFont('', '', '', '', '', svg.ctx.font); + return { + fontFamily: fontFamily || f.fontFamily, + fontSize: fontSize || f.fontSize, + fontStyle: fontStyle || f.fontStyle, + fontWeight: fontWeight || f.fontWeight, + fontVariant: fontVariant || f.fontVariant, + toString: function () { return [this.fontStyle, this.fontVariant, this.fontWeight, this.fontSize, this.fontFamily].join(' ') } + } + } + + var that = this; + this.Parse = function(s) { + var f = {}; + var d = svg.trim(svg.compressSpaces(s || '')).split(' '); + var set = { fontSize: false, fontStyle: false, fontWeight: false, fontVariant: false } + var ff = ''; + for (var i=0; i this.x2) this.x2 = x; + } + + if (y != null) { + if (isNaN(this.y1) || isNaN(this.y2)) { + this.y1 = y; + this.y2 = y; + } + if (y < this.y1) this.y1 = y; + if (y > this.y2) this.y2 = y; + } + } + this.addX = function(x) { this.addPoint(x, null); } + this.addY = function(y) { this.addPoint(null, y); } + + this.addBoundingBox = function(bb) { + this.addPoint(bb.x1, bb.y1); + this.addPoint(bb.x2, bb.y2); + } + + this.addQuadraticCurve = function(p0x, p0y, p1x, p1y, p2x, p2y) { + var cp1x = p0x + 2/3 * (p1x - p0x); // CP1 = QP0 + 2/3 *(QP1-QP0) + var cp1y = p0y + 2/3 * (p1y - p0y); // CP1 = QP0 + 2/3 *(QP1-QP0) + var cp2x = cp1x + 1/3 * (p2x - p0x); // CP2 = CP1 + 1/3 *(QP2-QP0) + var cp2y = cp1y + 1/3 * (p2y - p0y); // CP2 = CP1 + 1/3 *(QP2-QP0) + this.addBezierCurve(p0x, p0y, cp1x, cp2x, cp1y, cp2y, p2x, p2y); + } + + this.addBezierCurve = function(p0x, p0y, p1x, p1y, p2x, p2y, p3x, p3y) { + // from http://blog.hackers-cafe.net/2009/06/how-to-calculate-bezier-curves-bounding.html + var p0 = [p0x, p0y], p1 = [p1x, p1y], p2 = [p2x, p2y], p3 = [p3x, p3y]; + this.addPoint(p0[0], p0[1]); + this.addPoint(p3[0], p3[1]); + + for (i=0; i<=1; i++) { + var f = function(t) { + return Math.pow(1-t, 3) * p0[i] + + 3 * Math.pow(1-t, 2) * t * p1[i] + + 3 * (1-t) * Math.pow(t, 2) * p2[i] + + Math.pow(t, 3) * p3[i]; + } + + var b = 6 * p0[i] - 12 * p1[i] + 6 * p2[i]; + var a = -3 * p0[i] + 9 * p1[i] - 9 * p2[i] + 3 * p3[i]; + var c = 3 * p1[i] - 3 * p0[i]; + + if (a == 0) { + if (b == 0) continue; + var t = -c / b; + if (0 < t && t < 1) { + if (i == 0) this.addX(f(t)); + if (i == 1) this.addY(f(t)); + } + continue; + } + + var b2ac = Math.pow(b, 2) - 4 * c * a; + if (b2ac < 0) continue; + var t1 = (-b + Math.sqrt(b2ac)) / (2 * a); + if (0 < t1 && t1 < 1) { + if (i == 0) this.addX(f(t1)); + if (i == 1) this.addY(f(t1)); + } + var t2 = (-b - Math.sqrt(b2ac)) / (2 * a); + if (0 < t2 && t2 < 1) { + if (i == 0) this.addX(f(t2)); + if (i == 1) this.addY(f(t2)); + } + } + } + + this.isPointInBox = function(x, y) { + return (this.x1 <= x && x <= this.x2 && this.y1 <= y && y <= this.y2); + } + + this.addPoint(x1, y1); + this.addPoint(x2, y2); + } + + // transforms + svg.Transform = function(v) { + var that = this; + this.Type = {} + + // translate + this.Type.translate = function(s) { + this.p = svg.CreatePoint(s); + this.apply = function(ctx) { + ctx.translate(this.p.x || 0.0, this.p.y || 0.0); + } + this.applyToPoint = function(p) { + p.applyTransform([1, 0, 0, 1, this.p.x || 0.0, this.p.y || 0.0]); + } + } + + // rotate + this.Type.rotate = function(s) { + var a = svg.ToNumberArray(s); + this.angle = new svg.Property('angle', a[0]); + this.cx = a[1] || 0; + this.cy = a[2] || 0; + this.apply = function(ctx) { + ctx.translate(this.cx, this.cy); + ctx.rotate(this.angle.Angle.toRadians()); + ctx.translate(-this.cx, -this.cy); + } + this.applyToPoint = function(p) { + var a = this.angle.Angle.toRadians(); + p.applyTransform([1, 0, 0, 1, this.p.x || 0.0, this.p.y || 0.0]); + p.applyTransform([Math.cos(a), Math.sin(a), -Math.sin(a), Math.cos(a), 0, 0]); + p.applyTransform([1, 0, 0, 1, -this.p.x || 0.0, -this.p.y || 0.0]); + } + } + + this.Type.scale = function(s) { + this.p = svg.CreatePoint(s); + this.apply = function(ctx) { + ctx.scale(this.p.x || 1.0, this.p.y || this.p.x || 1.0); + } + this.applyToPoint = function(p) { + p.applyTransform([this.p.x || 0.0, 0, 0, this.p.y || 0.0, 0, 0]); + } + } + + this.Type.matrix = function(s) { + this.m = svg.ToNumberArray(s); + this.apply = function(ctx) { + ctx.transform(this.m[0], this.m[1], this.m[2], this.m[3], this.m[4], this.m[5]); + } + this.applyToPoint = function(p) { + p.applyTransform(this.m); + } + } + + this.Type.SkewBase = function(s) { + this.base = that.Type.matrix; + this.base(s); + this.angle = new svg.Property('angle', s); + } + this.Type.SkewBase.prototype = new this.Type.matrix; + + this.Type.skewX = function(s) { + this.base = that.Type.SkewBase; + this.base(s); + this.m = [1, 0, Math.tan(this.angle.Angle.toRadians()), 1, 0, 0]; + } + this.Type.skewX.prototype = new this.Type.SkewBase; + + this.Type.skewY = function(s) { + this.base = that.Type.SkewBase; + this.base(s); + this.m = [1, Math.tan(this.angle.Angle.toRadians()), 0, 1, 0, 0]; + } + this.Type.skewY.prototype = new this.Type.SkewBase; + + this.transforms = []; + + this.apply = function(ctx) { + for (var i=0; i= this.tokens.length - 1; + } + + this.isCommandOrEnd = function() { + if (this.isEnd()) return true; + return this.tokens[this.i + 1].match(/^[A-Za-z]$/) != null; + } + + this.isRelativeCommand = function() { + return this.command == this.command.toLowerCase(); + } + + this.getToken = function() { + this.i = this.i + 1; + return this.tokens[this.i]; + } + + this.getScalar = function() { + return parseFloat(this.getToken()); + } + + this.nextCommand = function() { + this.previousCommand = this.command; + this.command = this.getToken(); + } + + this.getPoint = function() { + var p = new svg.Point(this.getScalar(), this.getScalar()); + return this.makeAbsolute(p); + } + + this.getAsControlPoint = function() { + var p = this.getPoint(); + this.control = p; + return p; + } + + this.getAsCurrentPoint = function() { + var p = this.getPoint(); + this.current = p; + return p; + } + + this.getReflectedControlPoint = function() { + if (this.previousCommand.toLowerCase() != 'c' && this.previousCommand.toLowerCase() != 's') { + return this.current; + } + + // reflect point + var p = new svg.Point(2 * this.current.x - this.control.x, 2 * this.current.y - this.control.y); + return p; + } + + this.makeAbsolute = function(p) { + if (this.isRelativeCommand()) { + p.x = this.current.x + p.x; + p.y = this.current.y + p.y; + } + return p; + } + + this.addMarker = function(p, from, priorTo) { + // if the last angle isn't filled in because we didn't have this point yet ... + if (priorTo != null && this.angles.length > 0 && this.angles[this.angles.length-1] == null) { + this.angles[this.angles.length-1] = this.points[this.points.length-1].angleTo(priorTo); + } + this.addMarkerAngle(p, from == null ? null : from.angleTo(p)); + } + + this.addMarkerAngle = function(p, a) { + this.points.push(p); + this.angles.push(a); + } + + this.getMarkerPoints = function() { return this.points; } + this.getMarkerAngles = function() { + for (var i=0; i 1) { + rx *= Math.sqrt(l); + ry *= Math.sqrt(l); + } + // cx', cy' + var s = (largeArcFlag == sweepFlag ? -1 : 1) * Math.sqrt( + ((Math.pow(rx,2)*Math.pow(ry,2))-(Math.pow(rx,2)*Math.pow(currp.y,2))-(Math.pow(ry,2)*Math.pow(currp.x,2))) / + (Math.pow(rx,2)*Math.pow(currp.y,2)+Math.pow(ry,2)*Math.pow(currp.x,2)) + ); + if (isNaN(s)) s = 0; + var cpp = new svg.Point(s * rx * currp.y / ry, s * -ry * currp.x / rx); + // cx, cy + var centp = new svg.Point( + (curr.x + cp.x) / 2.0 + Math.cos(xAxisRotation) * cpp.x - Math.sin(xAxisRotation) * cpp.y, + (curr.y + cp.y) / 2.0 + Math.sin(xAxisRotation) * cpp.x + Math.cos(xAxisRotation) * cpp.y + ); + // vector magnitude + var m = function(v) { return Math.sqrt(Math.pow(v[0],2) + Math.pow(v[1],2)); } + // ratio between two vectors + var r = function(u, v) { return (u[0]*v[0]+u[1]*v[1]) / (m(u)*m(v)) } + // angle between two vectors + var a = function(u, v) { return (u[0]*v[1] < u[1]*v[0] ? -1 : 1) * Math.acos(r(u,v)); } + // initial angle + var a1 = a([1,0], [(currp.x-cpp.x)/rx,(currp.y-cpp.y)/ry]); + // angle delta + var u = [(currp.x-cpp.x)/rx,(currp.y-cpp.y)/ry]; + var v = [(-currp.x-cpp.x)/rx,(-currp.y-cpp.y)/ry]; + var ad = a(u, v); + if (r(u,v) <= -1) ad = Math.PI; + if (r(u,v) >= 1) ad = 0; + + if (sweepFlag == 0 && ad > 0) ad = ad - 2 * Math.PI; + if (sweepFlag == 1 && ad < 0) ad = ad + 2 * Math.PI; + + // for markers + var halfWay = new svg.Point( + centp.x - rx * Math.cos((a1 + ad) / 2), + centp.y - ry * Math.sin((a1 + ad) / 2) + ); + pp.addMarkerAngle(halfWay, (a1 + ad) / 2 + (sweepFlag == 0 ? 1 : -1) * Math.PI / 2); + pp.addMarkerAngle(cp, ad + (sweepFlag == 0 ? 1 : -1) * Math.PI / 2); + + bb.addPoint(cp.x, cp.y); // TODO: this is too naive, make it better + if (ctx != null) { + var r = rx > ry ? rx : ry; + var sx = rx > ry ? 1 : rx / ry; + var sy = rx > ry ? ry / rx : 1; + + ctx.translate(centp.x, centp.y); + ctx.rotate(xAxisRotation); + ctx.scale(sx, sy); + ctx.arc(0, 0, r, a1, a1 + ad, 1 - sweepFlag); + ctx.scale(1/sx, 1/sy); + ctx.rotate(-xAxisRotation); + ctx.translate(-centp.x, -centp.y); + } + } + break; + case 'Z': + if (ctx != null) ctx.closePath(); + pp.current = pp.start; + } + } + + return bb; + } + + this.getMarkers = function() { + var points = this.PathParser.getMarkerPoints(); + var angles = this.PathParser.getMarkerAngles(); + + var markers = []; + for (var i=0; i this.maxDuration) { + // loop for indefinitely repeating animations + if (this.attribute('repeatCount').value == 'indefinite') { + this.duration = 0.0 + } + else if (this.attribute('fill').valueOrDefault('remove') == 'remove' && !this.removed) { + this.removed = true; + this.getProperty().value = this.initialValue; + return true; + } + else { + return false; // no updates made + } + } + this.duration = this.duration + delta; + + // if we're past the begin time + var updated = false; + if (this.begin < this.duration) { + var newValue = this.calcValue(); // tween + + if (this.attribute('type').hasValue()) { + // for transform, etc. + var type = this.attribute('type').value; + newValue = type + '(' + newValue + ')'; + } + + this.getProperty().value = newValue; + updated = true; + } + + return updated; + } + + // fraction of duration we've covered + this.progress = function() { + return ((this.duration - this.begin) / (this.maxDuration - this.begin)); + } + } + svg.Element.AnimateBase.prototype = new svg.Element.ElementBase; + + // animate element + svg.Element.animate = function(node) { + this.base = svg.Element.AnimateBase; + this.base(node); + + this.calcValue = function() { + var from = this.attribute('from').numValue(); + var to = this.attribute('to').numValue(); + + // tween value linearly + return from + (to - from) * this.progress(); + }; + } + svg.Element.animate.prototype = new svg.Element.AnimateBase; + + // animate color element + svg.Element.animateColor = function(node) { + this.base = svg.Element.AnimateBase; + this.base(node); + + this.calcValue = function() { + var from = new RGBColor(this.attribute('from').value); + var to = new RGBColor(this.attribute('to').value); + + if (from.ok && to.ok) { + // tween color linearly + var r = from.r + (to.r - from.r) * this.progress(); + var g = from.g + (to.g - from.g) * this.progress(); + var b = from.b + (to.b - from.b) * this.progress(); + return 'rgb('+parseInt(r,10)+','+parseInt(g,10)+','+parseInt(b,10)+')'; + } + return this.attribute('from').value; + }; + } + svg.Element.animateColor.prototype = new svg.Element.AnimateBase; + + // animate transform element + svg.Element.animateTransform = function(node) { + this.base = svg.Element.animate; + this.base(node); + } + svg.Element.animateTransform.prototype = new svg.Element.animate; + + // font element + svg.Element.font = function(node) { + this.base = svg.Element.ElementBase; + this.base(node); + + this.horizAdvX = this.attribute('horiz-adv-x').numValue(); + + this.isRTL = false; + this.isArabic = false; + this.fontFace = null; + this.missingGlyph = null; + this.glyphs = []; + for (var i=0; i0 && text[i-1]!=' ' && i0 && text[i-1]!=' ' && (i == text.length-1 || text[i+1]==' ')) arabicForm = 'initial'; + if (typeof(font.glyphs[c]) != 'undefined') { + glyph = font.glyphs[c][arabicForm]; + if (glyph == null && font.glyphs[c].type == 'glyph') glyph = font.glyphs[c]; + } + } + else { + glyph = font.glyphs[c]; + } + if (glyph == null) glyph = font.missingGlyph; + return glyph; + } + + this.renderChildren = function(ctx) { + var customFont = this.parent.style('font-family').Definition.getDefinition(); + if (customFont != null) { + var fontSize = this.parent.style('font-size').numValueOrDefault(svg.Font.Parse(svg.ctx.font).fontSize); + var fontStyle = this.parent.style('font-style').valueOrDefault(svg.Font.Parse(svg.ctx.font).fontStyle); + var text = this.getText(); + if (customFont.isRTL) text = text.split("").reverse().join(""); + + var dx = svg.ToNumberArray(this.parent.attribute('dx').value); + for (var i=0; i 0 ? node.childNodes[0].nodeValue : // element + node.text; + this.getText = function() { + return this.text; + } + } + svg.Element.tspan.prototype = new svg.Element.TextElementBase; + + // tref + svg.Element.tref = function(node) { + this.base = svg.Element.TextElementBase; + this.base(node); + + this.getText = function() { + var element = this.attribute('xlink:href').Definition.getDefinition(); + if (element != null) return element.children[0].getText(); + } + } + svg.Element.tref.prototype = new svg.Element.TextElementBase; + + // a element + svg.Element.a = function(node) { + this.base = svg.Element.TextElementBase; + this.base(node); + + this.hasText = true; + for (var i=0; i 1 ? node.childNodes[1].nodeValue : ''); + css = css.replace(/(\/\*([^*]|[\r\n]|(\*+([^*\/]|[\r\n])))*\*+\/)|(^[\s]*\/\/.*)/gm, ''); // remove comments + css = svg.compressSpaces(css); // replace whitespace + var cssDefs = css.split('}'); + for (var i=0; i 0) { + var urlStart = srcs[s].indexOf('url'); + var urlEnd = srcs[s].indexOf(')', urlStart); + var url = srcs[s].substr(urlStart + 5, urlEnd - urlStart - 6); + var doc = svg.parseXml(svg.ajax(url)); + var fonts = doc.getElementsByTagName('font'); + for (var f=0; f
+ +LogHandler()->GetLogFileContent($info); + $html = ''; + foreach ($logLines as $idx=>$line) { + $pos1 = strpos($line, '-'); + if ($pos1!==false) { + $pos2 = strpos($line, '-', $pos1+1); + $pos3 = $pos2+30; + + $app = substr($line, 0, $pos1); + $logtype = substr($line, $pos1+1, $pos2-$pos1-1); + $function = substr($line, $pos2+1, $pos3-$pos2-1); + $date = substr($line, $pos3+1, 22); + $msg = substr($line, $pos3+23); + } else { + $app = ''; + $logtype = ''; + $function = ''; + $date = ''; + $msg = ''; + } + + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + $html .= PHP_EOL; + } + echo $html; +?> +
AppTypeContextDate/TimeMessage
'.$app.'
'.$logtype.'
'.$function.'
'.$date.'
'.$msg.'
+ + + diff --git a/IPSLibrary/webfront/IPSModuleManagerGUI/IPSModuleManagerGUI_Logs.php b/IPSLibrary/webfront/IPSModuleManagerGUI/IPSModuleManagerGUI_Logs.php new file mode 100644 index 0000000..0f6259f --- /dev/null +++ b/IPSLibrary/webfront/IPSModuleManagerGUI/IPSModuleManagerGUI_Logs.php @@ -0,0 +1,69 @@ + + * + * Anzeige aller Log Files des IPSModuleManager's + * + */ + + /** @}*/ +?> + + + +LogHandler()->GetLogFileList(30); + $html = ''; + foreach ($files as $idx=>$fullfile) { + $file = basename($fullfile); + $data = str_replace('IPSModuleManager_', '', $file); + $data = str_replace('.log', '', $data); + $pos = strpos($data, '_'); + $pos = strpos($data, '_', $pos+1); + if ($pos===false) { + $module = ''; + $date = $data; + } else { + $module = substr($data, $pos+1); + $date = substr($data, 0, $pos); + } + $date = str_replace('_', ' ', $date); + $date = substr($date, 0, 13).':'.substr($date, 13, 2); + + $html .= ''; + $html .= ''; + $html .= ''; + $html .= PHP_EOL; + } + echo $html; +?> +
Datum/ZeitModulLogFile
'. + ''.$date.'
'.$module.'
'. + ''.$file.'
+ + + diff --git a/IPSLibrary/webfront/IPSModuleManagerGUI/IPSModuleManagerGUI_Module.php b/IPSLibrary/webfront/IPSModuleManagerGUI/IPSModuleManagerGUI_Module.php new file mode 100644 index 0000000..2c89716 --- /dev/null +++ b/IPSLibrary/webfront/IPSModuleManagerGUI/IPSModuleManagerGUI_Module.php @@ -0,0 +1,119 @@ + + * + * Anzeige aller verfügbaren IPSLibrary Module Updates + * + */ + + /** @}*/ +?> + +'.$module.'

'; + + $moduleManager = new IPSModuleManager(); + $modules = $moduleManager->GetInstalledModules(); + $infos = $moduleManager->GetModuleInfos($module); + $moduleInstalled = array_key_exists($module, $modules); + + // Common Section + $versionColor='white'; + $stateColor='white'; + if ($infos['CurrentVersion'] <> $infos['Version'] and $moduleInstalled) { + $versionColor='red'; + } + if ($infos['State']<>'OK' and $moduleInstalled) { + $stateColor='red'; + } + $html .= ''; + $html .= '' + .''; + $html .= '' + .''; + $html .= '' + .''; + $html .= '' + .''; + if ($moduleInstalled) { + $html .= '' + .''; + $html .= '' + .''; + } + $html .= '
Beschreibung
'.htmlentities($infos['Description'], ENT_COMPAT, 'ISO-8859-1').'
Modul Status
'.htmlentities($infos['State']).'
Verfügbare Version
'.htmlentities($infos['Version']).'
Repository
'.htmlentities($infos['Repository']).'
Aktuelle Version
'.htmlentities($infos['CurrentVersion']).'
Aktuelles Repository
'.htmlentities($infos['LastRepository']).'
'; + + // Update Section + $html .= '

'; + $properties = ''; + if ($processing) { + $properties = 'disabled'; + } + if (!$moduleInstalled) { + $html .= ''; + } else { + $html .= ''; + $html .= ''; + $html .= ''; + $html .= ''; + } + $html .= '

'; + + // Required Modules + $html .= '
Benötigte Module
'; + $modules = $moduleManager->VersionHandler()->GetRequiredModules($module); + $html .= ''; + foreach ($modules as $subModule=>$version) { + $html .= '' + .''; + } + $html .= '
'.$version.'
'; + + // Versions + $html .= '
Repository Versionen
'; + $modules = $moduleManager->VersionHandler()->GetRepositoryVersions($module); + $html .= ''; + foreach ($modules as $repository=>$version) { + $html .= '' + .''; + } + $html .= '
'.$repository.'
'.$version.'
'; + + // ChangeList + $html .= '
Liste der Änderungen
'; + $changes = $moduleManager->VersionHandler()->GetChangeList($module, false); + $html .= ''; + foreach ($changes as $version=>$change) { + $html .= '' + .''; + } + $html .= '
'.$version.'
'.htmlentities($change, ENT_COMPAT, 'ISO-8859-1').'
'; + + echo $html; +?> + + diff --git a/IPSLibrary/webfront/IPSModuleManagerGUI/IPSModuleManagerGUI_NewModule.php b/IPSLibrary/webfront/IPSModuleManagerGUI/IPSModuleManagerGUI_NewModule.php new file mode 100644 index 0000000..9c31f3d --- /dev/null +++ b/IPSLibrary/webfront/IPSModuleManagerGUI/IPSModuleManagerGUI_NewModule.php @@ -0,0 +1,77 @@ + + * + * Laden von Neuen Modulen der IPSLibrary + * + */ + + /** @}*/ +?> + + + +VersionHandler()->GetKnownModules(); + $installedModules = $moduleManager->VersionHandler()->GetInstalledModules(); + $html = ''; + foreach ($knownModules as $module=>$data) { + $infos = $moduleManager->GetModuleInfos($module); + + $html .= ' '; + $html .= GetTableData($module, '', 'Module', $module); + $html .= GetTableData($infos['Version']); + if (array_key_exists($module, $installedModules)) { + $html .= ''; + } elseif ($processing) { + $html .= ''; + } else { + $html .= ''; + } + $html .= GetTableData($infos['Description']); + $html .= ''.PHP_EOL; + } + echo $html; +?> +
ModulVersionLadenBeschreibung
+ + +'') { + $text = ''.$text.''; + } + $return = '
'.$text.'
'; + return $return; + } +?> + diff --git a/IPSLibrary/webfront/IPSModuleManagerGUI/IPSModuleManagerGUI_Overview.php b/IPSLibrary/webfront/IPSModuleManagerGUI/IPSModuleManagerGUI_Overview.php new file mode 100644 index 0000000..dae3a2d --- /dev/null +++ b/IPSLibrary/webfront/IPSModuleManagerGUI/IPSModuleManagerGUI_Overview.php @@ -0,0 +1,101 @@ + + * + * Anzeige aller installierten IPSLibrary Module + * + */ + + /** @}*/ +?> + + + +GetInstalledModules(); + $html = ''; + $updateButton = false; + foreach ($modules as $module=>$version) { + $moduleManager = new IPSModuleManager($module); + $infos = $moduleManager->GetModuleInfos(); + $infos['LastRepository'] = str_replace('https://raw.github.com/','...',$infos['LastRepository']); + $infos['AvailableVersion'] = ''; + $versionAttribute = ''; + $stateAttribute = ''; + if ($moduleManager->VersionHandler()->CompareVersionsNewer($infos['CurrentVersion'], $infos['Version'])) { + $infos['AvailableVersion'] = $infos['Version']; + $versionAttribute = 'color:red;'; + $updateButton = true; + } + if ($infos['State']<>'OK') { + $stateAttribute = 'color:red;'; + } + $html .= ' '; + $html .= GetTableData(null, null, $module, '', 'Module', $module); + $html .= GetTableData($infos, 'CurrentVersion'); + $html .= GetTableData($infos, 'AvailableVersion', '', $versionAttribute, 'Updates'); + $html .= GetTableData($infos, 'State', '', $stateAttribute); + //$html .= GetTableData($infos, 'LastRepository'); + //$html .= GetTableData($infos, 'Repository'); + $html .= GetTableData($infos, 'Description'); + $html .= ''.PHP_EOL; + } + echo $html; +?> +
ModulAktuelle
Version		Verfügbare
Version		StatusBeschreibung
+ + +0) { + echo ''; + } + echo ''; +?> + + +'') { + $text = ''.$text.''; + } + $return = '
'.$text.'
'; + return $return; + } +?> + diff --git a/IPSLibrary/webfront/IPSModuleManagerGUI/IPSModuleManagerGUI_Receiver.php b/IPSLibrary/webfront/IPSModuleManagerGUI/IPSModuleManagerGUI_Receiver.php new file mode 100644 index 0000000..cfca9d7 --- /dev/null +++ b/IPSLibrary/webfront/IPSModuleManagerGUI/IPSModuleManagerGUI_Receiver.php @@ -0,0 +1,95 @@ + + * + * Empfangs Script um Requests (JQuery) der HTML Seiten zu bearbeiten. + * + */ + + IPSUtils_Include ("IPSModuleManagerGUI.inc.php", "IPSLibrary::app::modules::IPSModuleManagerGUI"); + IPSUtils_Include ("IPSModuleManager.class.php", "IPSLibrary::install::IPSModuleManager"); + + $id = $_GET['id']; + $action = $_GET['action']; + $module = $_GET['module']; + $info = $_GET['info']; + + $moduleManager = new IPSModuleManager('', '', sys_get_temp_dir(), true); + $repository = ''; + if ($module<>'') { + $moduleInfos = $moduleManager->GetModuleInfos($module); + $repository = $moduleInfos['Repository']; + } + + switch ($action) { + case IPSMMG_ACTION_STOREANDINSTALL: + IPSModuleManagerGUI_StoreParameters($module, $_GET); + if (IPSModuleManagerGUI_GetLock($action, true)) { + IPSLogger_Inf(__file__, 'IPSModuleManagerGUI - Installation of Module '.$module); + $moduleManager = new IPSModuleManager($module); + $moduleManager->InstallModule(); + } + IPSModuleManagerGUI_SetPage(IPSMMG_ACTION_MODULE, $module); + break; + case IPSMMG_ACTION_STORE: + IPSModuleManagerGUI_StoreParameters($module, $_GET); + IPSModuleManagerGUI_SetPage(IPSMMG_ACTION_MODULE, $module); + break; + case 'Refresh': + break; + case 'SearchUpdates': + if (IPSModuleManagerGUI_GetLock($action, true)) { + $moduleManager = new IPSModuleManager('', '', sys_get_temp_dir(), true); + $moduleManager->VersionHandler()->BuildKnownModules(); + } + break; + case 'UpdateAll': + if (IPSModuleManagerGUI_GetLock($action, true)) { + IPSLogger_Inf(__file__, 'IPSModuleManagerGUI - Update of all Modules'); + $moduleManager = new IPSModuleManager(); + $moduleManager->UpdateAllModules(); + } + break; + case 'Update': + if (IPSModuleManagerGUI_GetLock($action, true)) { + IPSLogger_Inf(__file__, 'IPSModuleManagerGUI - Update of Module '.$module.' from Repository "'.$repository.'"'); + $moduleManager = new IPSModuleManager($module, $repository); + $moduleManager->UpdateModule(); + } + break; + case 'Install': + if (IPSModuleManagerGUI_GetLock($action, true)) { + IPSLogger_Inf(__file__, 'IPSModuleManagerGUI - Installation of Module '.$module); + $moduleManager = new IPSModuleManager($module); + $moduleManager->InstallModule(); + } + break; + case 'Load': + if (IPSModuleManagerGUI_GetLock($action, true)) { + IPSLogger_Inf(__file__, 'IPSModuleManagerGUI - Load Files of Module '.$module.' from Repository "'.$repository.'"'); + $moduleManager = new IPSModuleManager($module, $repository); + $moduleManager->LoadModule(); + } + IPSModuleManagerGUI_SetPage(IPSMMG_ACTION_MODULE, $module); + break; + case 'Delete': + if (IPSModuleManagerGUI_GetLock($action, true)) { + IPSLogger_Inf(__file__, 'IPSModuleManagerGUI - Delete of Module '.$module); + $moduleManager = new IPSModuleManager($module); + $moduleManager->DeleteModule(); + } + IPSModuleManagerGUI_SetPage(IPSMMG_ACTION_OVERVIEW, $module); + break; + default: + IPSModuleManagerGUI_SetPage($action, $module, $info); + } + IPSModuleManagerGUI_Refresh(); + + + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/webfront/IPSModuleManagerGUI/IPSModuleManagerGUI_Updates.php b/IPSLibrary/webfront/IPSModuleManagerGUI/IPSModuleManagerGUI_Updates.php new file mode 100644 index 0000000..b9ad54e --- /dev/null +++ b/IPSLibrary/webfront/IPSModuleManagerGUI/IPSModuleManagerGUI_Updates.php @@ -0,0 +1,97 @@ + + * + * Anzeige aller verfügbaren IPSLibrary Module Updates + * + */ + + /** @}*/ +?> + + + +VersionHandler()->GetKnownUpdates(); + $html = ''; + foreach ($modules as $idx=>$module) { + $moduleManager = new IPSModuleManager($module); + $infos = $moduleManager->GetModuleInfos(); + $changes = $moduleManager->VersionHandler()->GetChangeList($module); + $text = '
ModulAktuelle
Version		Neue
Version		UpdateÄnderungen
' + .''; + $text .= '' + .''; + foreach ($changes as $version=>$change) { + $text .= '' + .''; + } + $text .= '
Aktuelles Repository
'.$infos['LastRepository'].'
Neues Repository
'.$infos['Repository'].'
Version '.$version.'
'.htmlentities($change, ENT_COMPAT, 'ISO-8859-1').'
'; + $html .= ' '; + $html .= GetTableData($module, '', 'Module', $module); + $html .= GetTableData($infos['CurrentVersion']); + $html .= GetTableData($infos['Version']); + if (!$processing) { + $html .= ''; + } else { + $html .= ''; + } + $html .= '
'.$text.'
'; + $html .= ''.PHP_EOL; + } + echo $html; +?> + + + +0) { + echo ''; + } + echo ''; +?> + + +'') { + $text = ''.$text.''; + } + $return = '
'.$text.'
'; + return $return; + } +?> + diff --git a/IPSLibrary/webfront/IPSModuleManagerGUI/IPSModuleManagerGUI_Wizard.php b/IPSLibrary/webfront/IPSModuleManagerGUI/IPSModuleManagerGUI_Wizard.php new file mode 100644 index 0000000..7ea24a8 --- /dev/null +++ b/IPSLibrary/webfront/IPSModuleManagerGUI/IPSModuleManagerGUI_Wizard.php @@ -0,0 +1,145 @@ + + * + * Anzeige aller verfügbaren IPSLibrary Module Updates + * + */ + + /** @}*/ +?> + +Installation von Modul '.$module.'

'; + + $file = IPS_GetKernelDir().'scripts\\IPSLibrary\\install\\InitializationFiles\\'.$module.'.ini'; + $configUsr = parse_ini_file($file, true); + $file = IPS_GetKernelDir().'scripts\\IPSLibrary\\install\\InitializationFiles\\Default\\'.$module.'.ini'; + $configDef = parse_ini_file($file, true); + + $html2 = ''; + if (array_key_exists('WFC10', $configDef)) { + if (!array_key_exists('ID', $configDef['WFC10'])) { + $configDef['WFC10']['ID'] = GetWFCIdDefault(); + } + if (!array_key_exists('ID', $configUsr['WFC10'])) { + $configUsr['WFC10']['ID'] = GetWFCIdDefault(); + } + $html .= '

WebFront (10" Optimierung)

'; + $html .= ''; + $html .= ' '; + $html .= Get_TableRow($configUsr, $configDef, 'WFC10', 'Enabled', 'checkbox', 'WebFront Interface', 'Mit diesem Parameter kann gesteuert werden, ob eine WebFront Installation durchgeführt wird'); + $html .= Get_TableRow($configUsr, $configDef, 'WFC10', 'Path', 'text', 'Installation Pfad', 'Legt fest in welchem Pfad die Struktur für das WebFront Interface in IP-Symcon abgelegt wird'); + $html .= Get_TableRow($configUsr, $configDef, 'WFC10', 'ID', 'text', 'WebFront Konfigurator ID', 'ID des WebFront Konfigurator, der für die Installation des WebFront Interfaces verwendet werden soll'); + $html .= Get_TableRow($configUsr, $configDef, 'WFC10', 'TabPaneItem', 'text', 'TabPane ID', 'Bestimmt den internen Namen im WebFront Konfigurator'); + $html .= Get_TableRow($configUsr, $configDef, 'WFC10', 'TabPaneParent', 'text', 'TabPane Parent', 'Übergeordnetes Element im WebFront Konfigurator (normalerweise roottp)'); + $html .= Get_TableRow($configUsr, $configDef, 'WFC10', 'TabPaneName', 'text', 'TabPane Titel', 'Text, der für das Element in der obersten Navigations Leiste verwendet werden soll'); + $html .= Get_TableRow($configUsr, $configDef, 'WFC10', 'TabPaneIcon', 'text', 'TabPane Icon', 'Icon, das für das Element in der obersten Navigations Leiste verwendet werden soll'); + $html .= Get_TableRow($configUsr, $configDef, 'WFC10', 'TabPaneOrder', 'text', 'TabPane Order', 'Reihenfolge, die für das Element in der obersten Navigations Leiste verwendet werden soll'); + $html .= Get_TableRow($configUsr, $configDef, 'WFC10', 'TabPaneExclusive','checkbox', 'TabPane Exclusive', 'Element in der obersten Navigations Leiste steht dem Modul "exklusiv" zur Verfügung (ACHTUNG: Bei Aktivierung wird bei einer Neuinstallation der komplette Inhalt des Elementes gelöscht!)'); + + $html .= Get_TableRow($configUsr, $configDef, 'WFC10', 'TabItem', 'text', 'ID', 'Bestimmt den internen Namen im WebFront Konfigurator (die verwendete ID setzt sich aus der TabPane ID und dieser ID zusammen)'); + $html .= Get_TableRow($configUsr, $configDef, 'WFC10', 'TabName', 'text', 'Titel', 'Text, der für das Element in der unteren Navigations Leiste verwendet werden soll'); + $html .= Get_TableRow($configUsr, $configDef, 'WFC10', 'TabIcon', 'text', 'Icon', 'Icon, das für das Element in der unteren Navigations Leiste verwendet werden soll'); + $html .= Get_TableRow($configUsr, $configDef, 'WFC10', 'TabOrder', 'text', 'Order', 'Reihenfolge, die für das Element in der unteren Navigations Leiste verwendet werden soll'); + $html .= '
ParameterWertDefault WertBeschreibung
'; + } + + if (array_key_exists('Mobile', $configDef)) { + $html .= '

Mobile Interface

'; + $html .= ''; + $html .= ' '; + $html .= Get_TableRow($configUsr, $configDef, 'Mobile', 'Enabled', 'checkbox', 'Mobile Interface', 'Mit diesem Parameter kann gesteuert werden, ob eine WebFront Installation durchgeführt wird'); + $html .= Get_TableRow($configUsr, $configDef, 'Mobile', 'Path', 'text', 'Installation Pfad', 'Legt fest in welchem Pfad die Struktur für das Mobile Interface in IP-Symcon abgelegt wird'); + $html .= Get_TableRow($configUsr, $configDef, 'Mobile', 'PathOrder', 'text', 'Reihenfolge (Pfad', 'Reihenfolge, die für das Element in der übergeordneten Ebene im Mobile Interface verwendet werden soll'); + $html .= Get_TableRow($configUsr, $configDef, 'Mobile', 'PathIcon', 'text', 'Icon (Pfad)', 'Icon, das für das Element in der übergeordneten Ebene im Mobile Interface verwendet werden soll'); + $html .= Get_TableRow($configUsr, $configDef, 'Mobile', 'Name', 'text', 'Modul Titel', 'Text, der für das Modul im Mobile Interface verwendet werden soll'); + $html .= Get_TableRow($configUsr, $configDef, 'Mobile', 'Icon', 'text', 'Modul Icon', 'Icon, das für das Modul im Mobile Interface verwendet werden soll'); + $html .= Get_TableRow($configUsr, $configDef, 'Mobile', 'Order', 'text', 'Modul Reihenfolge', 'Reihenfolge, die für das Modul im Mobile Interface verwendet werden soll'); + $html .= '
ParameterWertDefault WertBeschreibung
'; + } + + + // Update Section + $html .= '

'; + $properties = ''; + if ($processing) { + $properties = 'disabled'; + } + $html .= ''; + $html .= ''; + $html .= '

'; + + + echo $html; + + + function Get_BooleanValue($value) { + if ($value=='false') { + return false; + } elseif ($value=='true') { + return true; + } else { + return (boolean)$value; + } + } + + function Get_TableRow($configUsr, $configDef, $section, $property, $type, $name, $description) { + $html = ''; + if (array_key_exists($property, $configDef[$section])) { + $valueUsr = ''; + $valueDef = ''; + if (array_key_exists($section, $configUsr) and array_key_exists($property, $configUsr[$section])) { $valueUsr .= $configUsr[$section][$property]; } + if (array_key_exists($property, $configDef[$section])) { $valueDef .= $configDef[$section][$property]; } + $valueUsr = htmlentities($valueUsr, ENT_COMPAT, 'ISO-8859-1'); + $valueDef = htmlentities($valueDef, ENT_COMPAT, 'ISO-8859-1'); + switch ($type) { + case 'checkbox': + $inputUsr = 'type="'.$type.'" value="Aktiv"'; + if (Get_BooleanValue($valueUsr)) { $inputUsr .= 'checked'; } + $inputDef = 'type="'.$type.'" readonly value="Aktiv"'; + if (Get_BooleanValue($valueDef)) { $inputDef .= 'checked'; } + break; + default; + $inputUsr = 'type="text" size="30" maxlength="30" value="'.$valueUsr.'"'; + $inputDef = 'type="text" size="30" maxlength="30" value="'.$valueDef.'" disabled'; + } + + $html = '' + .'
'.htmlentities($name, ENT_COMPAT, 'ISO-8859-1').'
' + .'
' + .'
' + .'
' + .'
' + .'
'.htmlentities($description, ENT_COMPAT, 'ISO-8859-1').'
' + .''; + } + return $html; + } + +?> + + diff --git a/IPSLibrary/webfront/IPSModuleManagerGUI/jquery.min.js b/IPSLibrary/webfront/IPSModuleManagerGUI/jquery.min.js new file mode 100644 index 0000000..b1ae21d --- /dev/null +++ b/IPSLibrary/webfront/IPSModuleManagerGUI/jquery.min.js @@ -0,0 +1,19 @@ +/* + * jQuery JavaScript Library v1.3.2 + * http://jquery.com/ + * + * Copyright (c) 2009 John Resig + * Dual licensed under the MIT and GPL licenses. + * http://docs.jquery.com/License + * + * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009) + * Revision: 6246 + */ +(function(){var l=this,g,y=l.jQuery,p=l.$,o=l.jQuery=l.$=function(E,F){return new o.fn.init(E,F)},D=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;o.fn=o.prototype={init:function(E,H){E=E||document;if(E.nodeType){this[0]=E;this.length=1;this.context=E;return this}if(typeof E==="string"){var G=D.exec(E);if(G&&(G[1]||!H)){if(G[1]){E=o.clean([G[1]],H)}else{var I=document.getElementById(G[3]);if(I&&I.id!=G[3]){return o().find(E)}var F=o(I||[]);F.context=document;F.selector=E;return F}}else{return o(H).find(E)}}else{if(o.isFunction(E)){return o(document).ready(E)}}if(E.selector&&E.context){this.selector=E.selector;this.context=E.context}return this.setArray(o.isArray(E)?E:o.makeArray(E))},selector:"",jquery:"1.3.2",size:function(){return this.length},get:function(E){return E===g?Array.prototype.slice.call(this):this[E]},pushStack:function(F,H,E){var G=o(F);G.prevObject=this;G.context=this.context;if(H==="find"){G.selector=this.selector+(this.selector?" ":"")+E}else{if(H){G.selector=this.selector+"."+H+"("+E+")"}}return G},setArray:function(E){this.length=0;Array.prototype.push.apply(this,E);return this},each:function(F,E){return o.each(this,F,E)},index:function(E){return o.inArray(E&&E.jquery?E[0]:E,this)},attr:function(F,H,G){var E=F;if(typeof F==="string"){if(H===g){return this[0]&&o[G||"attr"](this[0],F)}else{E={};E[F]=H}}return this.each(function(I){for(F in E){o.attr(G?this.style:this,F,o.prop(this,E[F],G,I,F))}})},css:function(E,F){if((E=="width"||E=="height")&&parseFloat(F)<0){F=g}return this.attr(E,F,"curCSS")},text:function(F){if(typeof F!=="object"&&F!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(F))}var E="";o.each(F||this,function(){o.each(this.childNodes,function(){if(this.nodeType!=8){E+=this.nodeType!=1?this.nodeValue:o.fn.text([this])}})});return E},wrapAll:function(E){if(this[0]){var F=o(E,this[0].ownerDocument).clone();if(this[0].parentNode){F.insertBefore(this[0])}F.map(function(){var G=this;while(G.firstChild){G=G.firstChild}return G}).append(this)}return this},wrapInner:function(E){return this.each(function(){o(this).contents().wrapAll(E)})},wrap:function(E){return this.each(function(){o(this).wrapAll(E)})},append:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.appendChild(E)}})},prepend:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.insertBefore(E,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this)})},after:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this.nextSibling)})},end:function(){return this.prevObject||o([])},push:[].push,sort:[].sort,splice:[].splice,find:function(E){if(this.length===1){var F=this.pushStack([],"find",E);F.length=0;o.find(E,this[0],F);return F}else{return this.pushStack(o.unique(o.map(this,function(G){return o.find(E,G)})),"find",E)}},clone:function(G){var E=this.map(function(){if(!o.support.noCloneEvent&&!o.isXMLDoc(this)){var I=this.outerHTML;if(!I){var J=this.ownerDocument.createElement("div");J.appendChild(this.cloneNode(true));I=J.innerHTML}return o.clean([I.replace(/ jQuery\d+="(?:\d+|null)"/g,"").replace(/^\s*/,"")])[0]}else{return this.cloneNode(true)}});if(G===true){var H=this.find("*").andSelf(),F=0;E.find("*").andSelf().each(function(){if(this.nodeName!==H[F].nodeName){return}var I=o.data(H[F],"events");for(var K in I){for(var J in I[K]){o.event.add(this,K,I[K][J],I[K][J].data)}}F++})}return E},filter:function(E){return this.pushStack(o.isFunction(E)&&o.grep(this,function(G,F){return E.call(G,F)})||o.multiFilter(E,o.grep(this,function(F){return F.nodeType===1})),"filter",E)},closest:function(E){var G=o.expr.match.POS.test(E)?o(E):null,F=0;return this.map(function(){var H=this;while(H&&H.ownerDocument){if(G?G.index(H)>-1:o(H).is(E)){o.data(H,"closest",F);return H}H=H.parentNode;F++}})},not:function(E){if(typeof E==="string"){if(f.test(E)){return this.pushStack(o.multiFilter(E,this,true),"not",E)}else{E=o.multiFilter(E,this)}}var F=E.length&&E[E.length-1]!==g&&!E.nodeType;return this.filter(function(){return F?o.inArray(this,E)<0:this!=E})},add:function(E){return this.pushStack(o.unique(o.merge(this.get(),typeof E==="string"?o(E):o.makeArray(E))))},is:function(E){return !!E&&o.multiFilter(E,this).length>0},hasClass:function(E){return !!E&&this.is("."+E)},val:function(K){if(K===g){var E=this[0];if(E){if(o.nodeName(E,"option")){return(E.attributes.value||{}).specified?E.value:E.text}if(o.nodeName(E,"select")){var I=E.selectedIndex,L=[],M=E.options,H=E.type=="select-one";if(I<0){return null}for(var F=H?I:0,J=H?I+1:M.length;F=0||o.inArray(this.name,K)>=0)}else{if(o.nodeName(this,"select")){var N=o.makeArray(K);o("option",this).each(function(){this.selected=(o.inArray(this.value,N)>=0||o.inArray(this.text,N)>=0)});if(!N.length){this.selectedIndex=-1}}else{this.value=K}}})},html:function(E){return E===g?(this[0]?this[0].innerHTML.replace(/ jQuery\d+="(?:\d+|null)"/g,""):null):this.empty().append(E)},replaceWith:function(E){return this.after(E).remove()},eq:function(E){return this.slice(E,+E+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(E){return this.pushStack(o.map(this,function(G,F){return E.call(G,F,G)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(J,M,L){if(this[0]){var I=(this[0].ownerDocument||this[0]).createDocumentFragment(),F=o.clean(J,(this[0].ownerDocument||this[0]),I),H=I.firstChild;if(H){for(var G=0,E=this.length;G1||G>0?I.cloneNode(true):I)}}if(F){o.each(F,z)}}return this;function K(N,O){return M&&o.nodeName(N,"table")&&o.nodeName(O,"tr")?(N.getElementsByTagName("tbody")[0]||N.appendChild(N.ownerDocument.createElement("tbody"))):N}}};o.fn.init.prototype=o.fn;function z(E,F){if(F.src){o.ajax({url:F.src,async:false,dataType:"script"})}else{o.globalEval(F.text||F.textContent||F.innerHTML||"")}if(F.parentNode){F.parentNode.removeChild(F)}}function e(){return +new Date}o.extend=o.fn.extend=function(){var J=arguments[0]||{},H=1,I=arguments.length,E=false,G;if(typeof J==="boolean"){E=J;J=arguments[1]||{};H=2}if(typeof J!=="object"&&!o.isFunction(J)){J={}}if(I==H){J=this;--H}for(;H-1}},swap:function(H,G,I){var E={};for(var F in G){E[F]=H.style[F];H.style[F]=G[F]}I.call(H);for(var F in G){H.style[F]=E[F]}},css:function(H,F,J,E){if(F=="width"||F=="height"){var L,G={position:"absolute",visibility:"hidden",display:"block"},K=F=="width"?["Left","Right"]:["Top","Bottom"];function I(){L=F=="width"?H.offsetWidth:H.offsetHeight;if(E==="border"){return}o.each(K,function(){if(!E){L-=parseFloat(o.curCSS(H,"padding"+this,true))||0}if(E==="margin"){L+=parseFloat(o.curCSS(H,"margin"+this,true))||0}else{L-=parseFloat(o.curCSS(H,"border"+this+"Width",true))||0}})}if(H.offsetWidth!==0){I()}else{o.swap(H,G,I)}return Math.max(0,Math.round(L))}return o.curCSS(H,F,J)},curCSS:function(I,F,G){var L,E=I.style;if(F=="opacity"&&!o.support.opacity){L=o.attr(E,"opacity");return L==""?"1":L}if(F.match(/float/i)){F=w}if(!G&&E&&E[F]){L=E[F]}else{if(q.getComputedStyle){if(F.match(/float/i)){F="float"}F=F.replace(/([A-Z])/g,"-$1").toLowerCase();var M=q.getComputedStyle(I,null);if(M){L=M.getPropertyValue(F)}if(F=="opacity"&&L==""){L="1"}}else{if(I.currentStyle){var J=F.replace(/\-(\w)/g,function(N,O){return O.toUpperCase()});L=I.currentStyle[F]||I.currentStyle[J];if(!/^\d+(px)?$/i.test(L)&&/^\d/.test(L)){var H=E.left,K=I.runtimeStyle.left;I.runtimeStyle.left=I.currentStyle.left;E.left=L||0;L=E.pixelLeft+"px";E.left=H;I.runtimeStyle.left=K}}}}return L},clean:function(F,K,I){K=K||document;if(typeof K.createElement==="undefined"){K=K.ownerDocument||K[0]&&K[0].ownerDocument||document}if(!I&&F.length===1&&typeof F[0]==="string"){var H=/^<(\w+)\s*\/?>$/.exec(F[0]);if(H){return[K.createElement(H[1])]}}var G=[],E=[],L=K.createElement("div");o.each(F,function(P,S){if(typeof S==="number"){S+=""}if(!S){return}if(typeof S==="string"){S=S.replace(/(<(\w+)[^>]*?)\/>/g,function(U,V,T){return T.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?U:V+">"});var O=S.replace(/^\s+/,"").substring(0,10).toLowerCase();var Q=!O.indexOf("",""]||!O.indexOf("",""]||O.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"","
"]||!O.indexOf("",""]||(!O.indexOf("",""]||!O.indexOf("",""]||!o.support.htmlSerialize&&[1,"div
","
"]||[0,"",""];L.innerHTML=Q[1]+S+Q[2];while(Q[0]--){L=L.lastChild}if(!o.support.tbody){var R=/"&&!R?L.childNodes:[];for(var M=N.length-1;M>=0;--M){if(o.nodeName(N[M],"tbody")&&!N[M].childNodes.length){N[M].parentNode.removeChild(N[M])}}}if(!o.support.leadingWhitespace&&/^\s/.test(S)){L.insertBefore(K.createTextNode(S.match(/^\s*/)[0]),L.firstChild)}S=o.makeArray(L.childNodes)}if(S.nodeType){G.push(S)}else{G=o.merge(G,S)}});if(I){for(var J=0;G[J];J++){if(o.nodeName(G[J],"script")&&(!G[J].type||G[J].type.toLowerCase()==="text/javascript")){E.push(G[J].parentNode?G[J].parentNode.removeChild(G[J]):G[J])}else{if(G[J].nodeType===1){G.splice.apply(G,[J+1,0].concat(o.makeArray(G[J].getElementsByTagName("script"))))}I.appendChild(G[J])}}return E}return G},attr:function(J,G,K){if(!J||J.nodeType==3||J.nodeType==8){return g}var H=!o.isXMLDoc(J),L=K!==g;G=H&&o.props[G]||G;if(J.tagName){var F=/href|src|style/.test(G);if(G=="selected"&&J.parentNode){J.parentNode.selectedIndex}if(G in J&&H&&!F){if(L){if(G=="type"&&o.nodeName(J,"input")&&J.parentNode){throw"type property can't be changed"}J[G]=K}if(o.nodeName(J,"form")&&J.getAttributeNode(G)){return J.getAttributeNode(G).nodeValue}if(G=="tabIndex"){var I=J.getAttributeNode("tabIndex");return I&&I.specified?I.value:J.nodeName.match(/(button|input|object|select|textarea)/i)?0:J.nodeName.match(/^(a|area)$/i)&&J.href?0:g}return J[G]}if(!o.support.style&&H&&G=="style"){return o.attr(J.style,"cssText",K)}if(L){J.setAttribute(G,""+K)}var E=!o.support.hrefNormalized&&H&&F?J.getAttribute(G,2):J.getAttribute(G);return E===null?g:E}if(!o.support.opacity&&G=="opacity"){if(L){J.zoom=1;J.filter=(J.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(K)+""=="NaN"?"":"alpha(opacity="+K*100+")")}return J.filter&&J.filter.indexOf("opacity=")>=0?(parseFloat(J.filter.match(/opacity=([^)]*)/)[1])/100)+"":""}G=G.replace(/-([a-z])/ig,function(M,N){return N.toUpperCase()});if(L){J[G]=K}return J[G]},trim:function(E){return(E||"").replace(/^\s+|\s+$/g,"")},makeArray:function(G){var E=[];if(G!=null){var F=G.length;if(F==null||typeof G==="string"||o.isFunction(G)||G.setInterval){E[0]=G}else{while(F){E[--F]=G[F]}}}return E},inArray:function(G,H){for(var E=0,F=H.length;E0?this.clone(true):this).get();o.fn[F].apply(o(L[K]),I);J=J.concat(I)}return this.pushStack(J,E,G)}});o.each({removeAttr:function(E){o.attr(this,E,"");if(this.nodeType==1){this.removeAttribute(E)}},addClass:function(E){o.className.add(this,E)},removeClass:function(E){o.className.remove(this,E)},toggleClass:function(F,E){if(typeof E!=="boolean"){E=!o.className.has(this,F)}o.className[E?"add":"remove"](this,F)},remove:function(E){if(!E||o.filter(E,[this]).length){o("*",this).add([this]).each(function(){o.event.remove(this);o.removeData(this)});if(this.parentNode){this.parentNode.removeChild(this)}}},empty:function(){o(this).children().remove();while(this.firstChild){this.removeChild(this.firstChild)}}},function(E,F){o.fn[E]=function(){return this.each(F,arguments)}});function j(E,F){return E[0]&&parseInt(o.curCSS(E[0],F,true),10)||0}var h="jQuery"+e(),v=0,A={};o.extend({cache:{},data:function(F,E,G){F=F==l?A:F;var H=F[h];if(!H){H=F[h]=++v}if(E&&!o.cache[H]){o.cache[H]={}}if(G!==g){o.cache[H][E]=G}return E?o.cache[H][E]:H},removeData:function(F,E){F=F==l?A:F;var H=F[h];if(E){if(o.cache[H]){delete o.cache[H][E];E="";for(E in o.cache[H]){break}if(!E){o.removeData(F)}}}else{try{delete F[h]}catch(G){if(F.removeAttribute){F.removeAttribute(h)}}delete o.cache[H]}},queue:function(F,E,H){if(F){E=(E||"fx")+"queue";var G=o.data(F,E);if(!G||o.isArray(H)){G=o.data(F,E,o.makeArray(H))}else{if(H){G.push(H)}}}return G},dequeue:function(H,G){var E=o.queue(H,G),F=E.shift();if(!G||G==="fx"){F=E[0]}if(F!==g){F.call(H)}}});o.fn.extend({data:function(E,G){var H=E.split(".");H[1]=H[1]?"."+H[1]:"";if(G===g){var F=this.triggerHandler("getData"+H[1]+"!",[H[0]]);if(F===g&&this.length){F=o.data(this[0],E)}return F===g&&H[1]?this.data(H[0]):F}else{return this.trigger("setData"+H[1]+"!",[H[0],G]).each(function(){o.data(this,E,G)})}},removeData:function(E){return this.each(function(){o.removeData(this,E)})},queue:function(E,F){if(typeof E!=="string"){F=E;E="fx"}if(F===g){return o.queue(this[0],E)}return this.each(function(){var G=o.queue(this,E,F);if(E=="fx"&&G.length==1){G[0].call(this)}})},dequeue:function(E){return this.each(function(){o.dequeue(this,E)})}}); +/* + * Sizzle CSS Selector Engine - v0.9.3 + * Copyright 2009, The Dojo Foundation + * Released under the MIT, BSD, and GPL Licenses. + * More information: http://sizzlejs.com/ + */ +(function(){var R=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,L=0,H=Object.prototype.toString;var F=function(Y,U,ab,ac){ab=ab||[];U=U||document;if(U.nodeType!==1&&U.nodeType!==9){return[]}if(!Y||typeof Y!=="string"){return ab}var Z=[],W,af,ai,T,ad,V,X=true;R.lastIndex=0;while((W=R.exec(Y))!==null){Z.push(W[1]);if(W[2]){V=RegExp.rightContext;break}}if(Z.length>1&&M.exec(Y)){if(Z.length===2&&I.relative[Z[0]]){af=J(Z[0]+Z[1],U)}else{af=I.relative[Z[0]]?[U]:F(Z.shift(),U);while(Z.length){Y=Z.shift();if(I.relative[Y]){Y+=Z.shift()}af=J(Y,af)}}}else{var ae=ac?{expr:Z.pop(),set:E(ac)}:F.find(Z.pop(),Z.length===1&&U.parentNode?U.parentNode:U,Q(U));af=F.filter(ae.expr,ae.set);if(Z.length>0){ai=E(af)}else{X=false}while(Z.length){var ah=Z.pop(),ag=ah;if(!I.relative[ah]){ah=""}else{ag=Z.pop()}if(ag==null){ag=U}I.relative[ah](ai,ag,Q(U))}}if(!ai){ai=af}if(!ai){throw"Syntax error, unrecognized expression: "+(ah||Y)}if(H.call(ai)==="[object Array]"){if(!X){ab.push.apply(ab,ai)}else{if(U.nodeType===1){for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&(ai[aa]===true||ai[aa].nodeType===1&&K(U,ai[aa]))){ab.push(af[aa])}}}else{for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&ai[aa].nodeType===1){ab.push(af[aa])}}}}}else{E(ai,ab)}if(V){F(V,U,ab,ac);if(G){hasDuplicate=false;ab.sort(G);if(hasDuplicate){for(var aa=1;aa":function(Z,U,aa){var X=typeof U==="string";if(X&&!/\W/.test(U)){U=aa?U:U.toUpperCase();for(var V=0,T=Z.length;V=0)){if(!V){T.push(Y)}}else{if(V){U[X]=false}}}}return false},ID:function(T){return T[1].replace(/\\/g,"")},TAG:function(U,T){for(var V=0;T[V]===false;V++){}return T[V]&&Q(T[V])?U[1]:U[1].toUpperCase()},CHILD:function(T){if(T[1]=="nth"){var U=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(T[2]=="even"&&"2n"||T[2]=="odd"&&"2n+1"||!/\D/.test(T[2])&&"0n+"+T[2]||T[2]);T[2]=(U[1]+(U[2]||1))-0;T[3]=U[3]-0}T[0]=L++;return T},ATTR:function(X,U,V,T,Y,Z){var W=X[1].replace(/\\/g,"");if(!Z&&I.attrMap[W]){X[1]=I.attrMap[W]}if(X[2]==="~="){X[4]=" "+X[4]+" "}return X},PSEUDO:function(X,U,V,T,Y){if(X[1]==="not"){if(X[3].match(R).length>1||/^\w/.test(X[3])){X[3]=F(X[3],null,null,U)}else{var W=F.filter(X[3],U,V,true^Y);if(!V){T.push.apply(T,W)}return false}}else{if(I.match.POS.test(X[0])||I.match.CHILD.test(X[0])){return true}}return X},POS:function(T){T.unshift(true);return T}},filters:{enabled:function(T){return T.disabled===false&&T.type!=="hidden"},disabled:function(T){return T.disabled===true},checked:function(T){return T.checked===true},selected:function(T){T.parentNode.selectedIndex;return T.selected===true},parent:function(T){return !!T.firstChild},empty:function(T){return !T.firstChild},has:function(V,U,T){return !!F(T[3],V).length},header:function(T){return/h\d/i.test(T.nodeName)},text:function(T){return"text"===T.type},radio:function(T){return"radio"===T.type},checkbox:function(T){return"checkbox"===T.type},file:function(T){return"file"===T.type},password:function(T){return"password"===T.type},submit:function(T){return"submit"===T.type},image:function(T){return"image"===T.type},reset:function(T){return"reset"===T.type},button:function(T){return"button"===T.type||T.nodeName.toUpperCase()==="BUTTON"},input:function(T){return/input|select|textarea|button/i.test(T.nodeName)}},setFilters:{first:function(U,T){return T===0},last:function(V,U,T,W){return U===W.length-1},even:function(U,T){return T%2===0},odd:function(U,T){return T%2===1},lt:function(V,U,T){return UT[3]-0},nth:function(V,U,T){return T[3]-0==U},eq:function(V,U,T){return T[3]-0==U}},filter:{PSEUDO:function(Z,V,W,aa){var U=V[1],X=I.filters[U];if(X){return X(Z,W,V,aa)}else{if(U==="contains"){return(Z.textContent||Z.innerText||"").indexOf(V[3])>=0}else{if(U==="not"){var Y=V[3];for(var W=0,T=Y.length;W=0)}}},ID:function(U,T){return U.nodeType===1&&U.getAttribute("id")===T},TAG:function(U,T){return(T==="*"&&U.nodeType===1)||U.nodeName===T},CLASS:function(U,T){return(" "+(U.className||U.getAttribute("class"))+" ").indexOf(T)>-1},ATTR:function(Y,W){var V=W[1],T=I.attrHandle[V]?I.attrHandle[V](Y):Y[V]!=null?Y[V]:Y.getAttribute(V),Z=T+"",X=W[2],U=W[4];return T==null?X==="!=":X==="="?Z===U:X==="*="?Z.indexOf(U)>=0:X==="~="?(" "+Z+" ").indexOf(U)>=0:!U?Z&&T!==false:X==="!="?Z!=U:X==="^="?Z.indexOf(U)===0:X==="$="?Z.substr(Z.length-U.length)===U:X==="|="?Z===U||Z.substr(0,U.length+1)===U+"-":false},POS:function(X,U,V,Y){var T=U[2],W=I.setFilters[T];if(W){return W(X,V,U,Y)}}}};var M=I.match.POS;for(var O in I.match){I.match[O]=RegExp(I.match[O].source+/(?![^\[]*\])(?![^\(]*\))/.source)}var E=function(U,T){U=Array.prototype.slice.call(U);if(T){T.push.apply(T,U);return T}return U};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(N){E=function(X,W){var U=W||[];if(H.call(X)==="[object Array]"){Array.prototype.push.apply(U,X)}else{if(typeof X.length==="number"){for(var V=0,T=X.length;V";var T=document.documentElement;T.insertBefore(U,T.firstChild);if(!!document.getElementById(V)){I.find.ID=function(X,Y,Z){if(typeof Y.getElementById!=="undefined"&&!Z){var W=Y.getElementById(X[1]);return W?W.id===X[1]||typeof W.getAttributeNode!=="undefined"&&W.getAttributeNode("id").nodeValue===X[1]?[W]:g:[]}};I.filter.ID=function(Y,W){var X=typeof Y.getAttributeNode!=="undefined"&&Y.getAttributeNode("id");return Y.nodeType===1&&X&&X.nodeValue===W}}T.removeChild(U)})();(function(){var T=document.createElement("div");T.appendChild(document.createComment(""));if(T.getElementsByTagName("*").length>0){I.find.TAG=function(U,Y){var X=Y.getElementsByTagName(U[1]);if(U[1]==="*"){var W=[];for(var V=0;X[V];V++){if(X[V].nodeType===1){W.push(X[V])}}X=W}return X}}T.innerHTML="";if(T.firstChild&&typeof T.firstChild.getAttribute!=="undefined"&&T.firstChild.getAttribute("href")!=="#"){I.attrHandle.href=function(U){return U.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var T=F,U=document.createElement("div");U.innerHTML="

";if(U.querySelectorAll&&U.querySelectorAll(".TEST").length===0){return}F=function(Y,X,V,W){X=X||document;if(!W&&X.nodeType===9&&!Q(X)){try{return E(X.querySelectorAll(Y),V)}catch(Z){}}return T(Y,X,V,W)};F.find=T.find;F.filter=T.filter;F.selectors=T.selectors;F.matches=T.matches})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){(function(){var T=document.createElement("div");T.innerHTML="
";if(T.getElementsByClassName("e").length===0){return}T.lastChild.className="e";if(T.getElementsByClassName("e").length===1){return}I.order.splice(1,0,"CLASS");I.find.CLASS=function(U,V,W){if(typeof V.getElementsByClassName!=="undefined"&&!W){return V.getElementsByClassName(U[1])}}})()}function P(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W0){X=T;break}}}T=T[U]}ad[W]=X}}}var K=document.compareDocumentPosition?function(U,T){return U.compareDocumentPosition(T)&16}:function(U,T){return U!==T&&(U.contains?U.contains(T):true)};var Q=function(T){return T.nodeType===9&&T.documentElement.nodeName!=="HTML"||!!T.ownerDocument&&Q(T.ownerDocument)};var J=function(T,aa){var W=[],X="",Y,V=aa.nodeType?[aa]:aa;while((Y=I.match.PSEUDO.exec(T))){X+=Y[0];T=T.replace(I.match.PSEUDO,"")}T=I.relative[T]?T+"*":T;for(var Z=0,U=V.length;Z0||T.offsetHeight>0};F.selectors.filters.animated=function(T){return o.grep(o.timers,function(U){return T===U.elem}).length};o.multiFilter=function(V,T,U){if(U){V=":not("+V+")"}return F.matches(V,T)};o.dir=function(V,U){var T=[],W=V[U];while(W&&W!=document){if(W.nodeType==1){T.push(W)}W=W[U]}return T};o.nth=function(X,T,V,W){T=T||1;var U=0;for(;X;X=X[V]){if(X.nodeType==1&&++U==T){break}}return X};o.sibling=function(V,U){var T=[];for(;V;V=V.nextSibling){if(V.nodeType==1&&V!=U){T.push(V)}}return T};return;l.Sizzle=F})();o.event={add:function(I,F,H,K){if(I.nodeType==3||I.nodeType==8){return}if(I.setInterval&&I!=l){I=l}if(!H.guid){H.guid=this.guid++}if(K!==g){var G=H;H=this.proxy(G);H.data=K}var E=o.data(I,"events")||o.data(I,"events",{}),J=o.data(I,"handle")||o.data(I,"handle",function(){return typeof o!=="undefined"&&!o.event.triggered?o.event.handle.apply(arguments.callee.elem,arguments):g});J.elem=I;o.each(F.split(/\s+/),function(M,N){var O=N.split(".");N=O.shift();H.type=O.slice().sort().join(".");var L=E[N];if(o.event.specialAll[N]){o.event.specialAll[N].setup.call(I,K,O)}if(!L){L=E[N]={};if(!o.event.special[N]||o.event.special[N].setup.call(I,K,O)===false){if(I.addEventListener){I.addEventListener(N,J,false)}else{if(I.attachEvent){I.attachEvent("on"+N,J)}}}}L[H.guid]=H;o.event.global[N]=true});I=null},guid:1,global:{},remove:function(K,H,J){if(K.nodeType==3||K.nodeType==8){return}var G=o.data(K,"events"),F,E;if(G){if(H===g||(typeof H==="string"&&H.charAt(0)==".")){for(var I in G){this.remove(K,I+(H||""))}}else{if(H.type){J=H.handler;H=H.type}o.each(H.split(/\s+/),function(M,O){var Q=O.split(".");O=Q.shift();var N=RegExp("(^|\\.)"+Q.slice().sort().join(".*\\.")+"(\\.|$)");if(G[O]){if(J){delete G[O][J.guid]}else{for(var P in G[O]){if(N.test(G[O][P].type)){delete G[O][P]}}}if(o.event.specialAll[O]){o.event.specialAll[O].teardown.call(K,Q)}for(F in G[O]){break}if(!F){if(!o.event.special[O]||o.event.special[O].teardown.call(K,Q)===false){if(K.removeEventListener){K.removeEventListener(O,o.data(K,"handle"),false)}else{if(K.detachEvent){K.detachEvent("on"+O,o.data(K,"handle"))}}}F=null;delete G[O]}}})}for(F in G){break}if(!F){var L=o.data(K,"handle");if(L){L.elem=null}o.removeData(K,"events");o.removeData(K,"handle")}}},trigger:function(I,K,H,E){var G=I.type||I;if(!E){I=typeof I==="object"?I[h]?I:o.extend(o.Event(G),I):o.Event(G);if(G.indexOf("!")>=0){I.type=G=G.slice(0,-1);I.exclusive=true}if(!H){I.stopPropagation();if(this.global[G]){o.each(o.cache,function(){if(this.events&&this.events[G]){o.event.trigger(I,K,this.handle.elem)}})}}if(!H||H.nodeType==3||H.nodeType==8){return g}I.result=g;I.target=H;K=o.makeArray(K);K.unshift(I)}I.currentTarget=H;var J=o.data(H,"handle");if(J){J.apply(H,K)}if((!H[G]||(o.nodeName(H,"a")&&G=="click"))&&H["on"+G]&&H["on"+G].apply(H,K)===false){I.result=false}if(!E&&H[G]&&!I.isDefaultPrevented()&&!(o.nodeName(H,"a")&&G=="click")){this.triggered=true;try{H[G]()}catch(L){}}this.triggered=false;if(!I.isPropagationStopped()){var F=H.parentNode||H.ownerDocument;if(F){o.event.trigger(I,K,F,true)}}},handle:function(K){var J,E;K=arguments[0]=o.event.fix(K||l.event);K.currentTarget=this;var L=K.type.split(".");K.type=L.shift();J=!L.length&&!K.exclusive;var I=RegExp("(^|\\.)"+L.slice().sort().join(".*\\.")+"(\\.|$)");E=(o.data(this,"events")||{})[K.type];for(var G in E){var H=E[G];if(J||I.test(H.type)){K.handler=H;K.data=H.data;var F=H.apply(this,arguments);if(F!==g){K.result=F;if(F===false){K.preventDefault();K.stopPropagation()}}if(K.isImmediatePropagationStopped()){break}}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(H){if(H[h]){return H}var F=H;H=o.Event(F);for(var G=this.props.length,J;G;){J=this.props[--G];H[J]=F[J]}if(!H.target){H.target=H.srcElement||document}if(H.target.nodeType==3){H.target=H.target.parentNode}if(!H.relatedTarget&&H.fromElement){H.relatedTarget=H.fromElement==H.target?H.toElement:H.fromElement}if(H.pageX==null&&H.clientX!=null){var I=document.documentElement,E=document.body;H.pageX=H.clientX+(I&&I.scrollLeft||E&&E.scrollLeft||0)-(I.clientLeft||0);H.pageY=H.clientY+(I&&I.scrollTop||E&&E.scrollTop||0)-(I.clientTop||0)}if(!H.which&&((H.charCode||H.charCode===0)?H.charCode:H.keyCode)){H.which=H.charCode||H.keyCode}if(!H.metaKey&&H.ctrlKey){H.metaKey=H.ctrlKey}if(!H.which&&H.button){H.which=(H.button&1?1:(H.button&2?3:(H.button&4?2:0)))}return H},proxy:function(F,E){E=E||function(){return F.apply(this,arguments)};E.guid=F.guid=F.guid||E.guid||this.guid++;return E},special:{ready:{setup:B,teardown:function(){}}},specialAll:{live:{setup:function(E,F){o.event.add(this,F[0],c)},teardown:function(G){if(G.length){var E=0,F=RegExp("(^|\\.)"+G[0]+"(\\.|$)");o.each((o.data(this,"events").live||{}),function(){if(F.test(this.type)){E++}});if(E<1){o.event.remove(this,G[0],c)}}}}}};o.Event=function(E){if(!this.preventDefault){return new o.Event(E)}if(E&&E.type){this.originalEvent=E;this.type=E.type}else{this.type=E}this.timeStamp=e();this[h]=true};function k(){return false}function u(){return true}o.Event.prototype={preventDefault:function(){this.isDefaultPrevented=u;var E=this.originalEvent;if(!E){return}if(E.preventDefault){E.preventDefault()}E.returnValue=false},stopPropagation:function(){this.isPropagationStopped=u;var E=this.originalEvent;if(!E){return}if(E.stopPropagation){E.stopPropagation()}E.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u;this.stopPropagation()},isDefaultPrevented:k,isPropagationStopped:k,isImmediatePropagationStopped:k};var a=function(F){var E=F.relatedTarget;while(E&&E!=this){try{E=E.parentNode}catch(G){E=this}}if(E!=this){F.type=F.data;o.event.handle.apply(this,arguments)}};o.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(F,E){o.event.special[E]={setup:function(){o.event.add(this,F,a,E)},teardown:function(){o.event.remove(this,F,a)}}});o.fn.extend({bind:function(F,G,E){return F=="unload"?this.one(F,G,E):this.each(function(){o.event.add(this,F,E||G,E&&G)})},one:function(G,H,F){var E=o.event.proxy(F||H,function(I){o(this).unbind(I,E);return(F||H).apply(this,arguments)});return this.each(function(){o.event.add(this,G,E,F&&H)})},unbind:function(F,E){return this.each(function(){o.event.remove(this,F,E)})},trigger:function(E,F){return this.each(function(){o.event.trigger(E,F,this)})},triggerHandler:function(E,G){if(this[0]){var F=o.Event(E);F.preventDefault();F.stopPropagation();o.event.trigger(F,G,this[0]);return F.result}},toggle:function(G){var E=arguments,F=1;while(F=0){var E=G.slice(I,G.length);G=G.slice(0,I)}var H="GET";if(J){if(o.isFunction(J)){K=J;J=null}else{if(typeof J==="object"){J=o.param(J);H="POST"}}}var F=this;o.ajax({url:G,type:H,dataType:"html",data:J,complete:function(M,L){if(L=="success"||L=="notmodified"){F.html(E?o("
").append(M.responseText.replace(//g,"")).find(E):M.responseText)}if(K){F.each(K,[M.responseText,L,M])}}});return this},serialize:function(){return o.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?o.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password|search/i.test(this.type))}).map(function(E,F){var G=o(this).val();return G==null?null:o.isArray(G)?o.map(G,function(I,H){return{name:F.name,value:I}}):{name:F.name,value:G}}).get()}});o.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(E,F){o.fn[F]=function(G){return this.bind(F,G)}});var r=e();o.extend({get:function(E,G,H,F){if(o.isFunction(G)){H=G;G=null}return o.ajax({type:"GET",url:E,data:G,success:H,dataType:F})},getScript:function(E,F){return o.get(E,null,F,"script")},getJSON:function(E,F,G){return o.get(E,F,G,"json")},post:function(E,G,H,F){if(o.isFunction(G)){H=G;G={}}return o.ajax({type:"POST",url:E,data:G,success:H,dataType:F})},ajaxSetup:function(E){o.extend(o.ajaxSettings,E)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return l.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(M){M=o.extend(true,M,o.extend(true,{},o.ajaxSettings,M));var W,F=/=\?(&|$)/g,R,V,G=M.type.toUpperCase();if(M.data&&M.processData&&typeof M.data!=="string"){M.data=o.param(M.data)}if(M.dataType=="jsonp"){if(G=="GET"){if(!M.url.match(F)){M.url+=(M.url.match(/\?/)?"&":"?")+(M.jsonp||"callback")+"=?"}}else{if(!M.data||!M.data.match(F)){M.data=(M.data?M.data+"&":"")+(M.jsonp||"callback")+"=?"}}M.dataType="json"}if(M.dataType=="json"&&(M.data&&M.data.match(F)||M.url.match(F))){W="jsonp"+r++;if(M.data){M.data=(M.data+"").replace(F,"="+W+"$1")}M.url=M.url.replace(F,"="+W+"$1");M.dataType="script";l[W]=function(X){V=X;I();L();l[W]=g;try{delete l[W]}catch(Y){}if(H){H.removeChild(T)}}}if(M.dataType=="script"&&M.cache==null){M.cache=false}if(M.cache===false&&G=="GET"){var E=e();var U=M.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+E+"$2");M.url=U+((U==M.url)?(M.url.match(/\?/)?"&":"?")+"_="+E:"")}if(M.data&&G=="GET"){M.url+=(M.url.match(/\?/)?"&":"?")+M.data;M.data=null}if(M.global&&!o.active++){o.event.trigger("ajaxStart")}var Q=/^(\w+:)?\/\/([^\/?#]+)/.exec(M.url);if(M.dataType=="script"&&G=="GET"&&Q&&(Q[1]&&Q[1]!=location.protocol||Q[2]!=location.host)){var H=document.getElementsByTagName("head")[0];var T=document.createElement("script");T.src=M.url;if(M.scriptCharset){T.charset=M.scriptCharset}if(!W){var O=false;T.onload=T.onreadystatechange=function(){if(!O&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){O=true;I();L();T.onload=T.onreadystatechange=null;H.removeChild(T)}}}H.appendChild(T);return g}var K=false;var J=M.xhr();if(M.username){J.open(G,M.url,M.async,M.username,M.password)}else{J.open(G,M.url,M.async)}try{if(M.data){J.setRequestHeader("Content-Type",M.contentType)}if(M.ifModified){J.setRequestHeader("If-Modified-Since",o.lastModified[M.url]||"Thu, 01 Jan 1970 00:00:00 GMT")}J.setRequestHeader("X-Requested-With","XMLHttpRequest");J.setRequestHeader("Accept",M.dataType&&M.accepts[M.dataType]?M.accepts[M.dataType]+", */*":M.accepts._default)}catch(S){}if(M.beforeSend&&M.beforeSend(J,M)===false){if(M.global&&!--o.active){o.event.trigger("ajaxStop")}J.abort();return false}if(M.global){o.event.trigger("ajaxSend",[J,M])}var N=function(X){if(J.readyState==0){if(P){clearInterval(P);P=null;if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}}else{if(!K&&J&&(J.readyState==4||X=="timeout")){K=true;if(P){clearInterval(P);P=null}R=X=="timeout"?"timeout":!o.httpSuccess(J)?"error":M.ifModified&&o.httpNotModified(J,M.url)?"notmodified":"success";if(R=="success"){try{V=o.httpData(J,M.dataType,M)}catch(Z){R="parsererror"}}if(R=="success"){var Y;try{Y=J.getResponseHeader("Last-Modified")}catch(Z){}if(M.ifModified&&Y){o.lastModified[M.url]=Y}if(!W){I()}}else{o.handleError(M,J,R)}L();if(X){J.abort()}if(M.async){J=null}}}};if(M.async){var P=setInterval(N,13);if(M.timeout>0){setTimeout(function(){if(J&&!K){N("timeout")}},M.timeout)}}try{J.send(M.data)}catch(S){o.handleError(M,J,null,S)}if(!M.async){N()}function I(){if(M.success){M.success(V,R)}if(M.global){o.event.trigger("ajaxSuccess",[J,M])}}function L(){if(M.complete){M.complete(J,R)}if(M.global){o.event.trigger("ajaxComplete",[J,M])}if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}return J},handleError:function(F,H,E,G){if(F.error){F.error(H,E,G)}if(F.global){o.event.trigger("ajaxError",[H,F,G])}},active:0,httpSuccess:function(F){try{return !F.status&&location.protocol=="file:"||(F.status>=200&&F.status<300)||F.status==304||F.status==1223}catch(E){}return false},httpNotModified:function(G,E){try{var H=G.getResponseHeader("Last-Modified");return G.status==304||H==o.lastModified[E]}catch(F){}return false},httpData:function(J,H,G){var F=J.getResponseHeader("content-type"),E=H=="xml"||!H&&F&&F.indexOf("xml")>=0,I=E?J.responseXML:J.responseText;if(E&&I.documentElement.tagName=="parsererror"){throw"parsererror"}if(G&&G.dataFilter){I=G.dataFilter(I,H)}if(typeof I==="string"){if(H=="script"){o.globalEval(I)}if(H=="json"){I=l["eval"]("("+I+")")}}return I},param:function(E){var G=[];function H(I,J){G[G.length]=encodeURIComponent(I)+"="+encodeURIComponent(J)}if(o.isArray(E)||E.jquery){o.each(E,function(){H(this.name,this.value)})}else{for(var F in E){if(o.isArray(E[F])){o.each(E[F],function(){H(F,this)})}else{H(F,o.isFunction(E[F])?E[F]():E[F])}}}return G.join("&").replace(/%20/g,"+")}});var m={},n,d=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];function t(F,E){var G={};o.each(d.concat.apply([],d.slice(0,E)),function(){G[this]=F});return G}o.fn.extend({show:function(J,L){if(J){return this.animate(t("show",3),J,L)}else{for(var H=0,F=this.length;H").appendTo("body");K=I.css("display");if(K==="none"){K="block"}I.remove();m[G]=K}o.data(this[H],"olddisplay",K)}}for(var H=0,F=this.length;H=0;H--){if(G[H].elem==this){if(E){G[H](true)}G.splice(H,1)}}});if(!E){this.dequeue()}return this}});o.each({slideDown:t("show",1),slideUp:t("hide",1),slideToggle:t("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(E,F){o.fn[E]=function(G,H){return this.animate(F,G,H)}});o.extend({speed:function(G,H,F){var E=typeof G==="object"?G:{complete:F||!F&&H||o.isFunction(G)&&G,duration:G,easing:F&&H||H&&!o.isFunction(H)&&H};E.duration=o.fx.off?0:typeof E.duration==="number"?E.duration:o.fx.speeds[E.duration]||o.fx.speeds._default;E.old=E.complete;E.complete=function(){if(E.queue!==false){o(this).dequeue()}if(o.isFunction(E.old)){E.old.call(this)}};return E},easing:{linear:function(G,H,E,F){return E+F*G},swing:function(G,H,E,F){return((-Math.cos(G*Math.PI)/2)+0.5)*F+E}},timers:[],fx:function(F,E,G){this.options=E;this.elem=F;this.prop=G;if(!E.orig){E.orig={}}}});o.fx.prototype={update:function(){if(this.options.step){this.options.step.call(this.elem,this.now,this)}(o.fx.step[this.prop]||o.fx.step._default)(this);if((this.prop=="height"||this.prop=="width")&&this.elem.style){this.elem.style.display="block"}},cur:function(F){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var E=parseFloat(o.css(this.elem,this.prop,F));return E&&E>-10000?E:parseFloat(o.curCSS(this.elem,this.prop))||0},custom:function(I,H,G){this.startTime=e();this.start=I;this.end=H;this.unit=G||this.unit||"px";this.now=this.start;this.pos=this.state=0;var E=this;function F(J){return E.step(J)}F.elem=this.elem;if(F()&&o.timers.push(F)&&!n){n=setInterval(function(){var K=o.timers;for(var J=0;J=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var E=true;for(var F in this.options.curAnim){if(this.options.curAnim[F]!==true){E=false}}if(E){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(o.css(this.elem,"display")=="none"){this.elem.style.display="block"}}if(this.options.hide){o(this.elem).hide()}if(this.options.hide||this.options.show){for(var I in this.options.curAnim){o.attr(this.elem.style,I,this.options.orig[I])}}this.options.complete.call(this.elem)}return false}else{var J=G-this.startTime;this.state=J/this.options.duration;this.pos=o.easing[this.options.easing||(o.easing.swing?"swing":"linear")](this.state,J,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update()}return true}};o.extend(o.fx,{speeds:{slow:600,fast:200,_default:400},step:{opacity:function(E){o.attr(E.elem.style,"opacity",E.now)},_default:function(E){if(E.elem.style&&E.elem.style[E.prop]!=null){E.elem.style[E.prop]=E.now+E.unit}else{E.elem[E.prop]=E.now}}}});if(document.documentElement.getBoundingClientRect){o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}var G=this[0].getBoundingClientRect(),J=this[0].ownerDocument,F=J.body,E=J.documentElement,L=E.clientTop||F.clientTop||0,K=E.clientLeft||F.clientLeft||0,I=G.top+(self.pageYOffset||o.boxModel&&E.scrollTop||F.scrollTop)-L,H=G.left+(self.pageXOffset||o.boxModel&&E.scrollLeft||F.scrollLeft)-K;return{top:I,left:H}}}else{o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}o.offset.initialized||o.offset.initialize();var J=this[0],G=J.offsetParent,F=J,O=J.ownerDocument,M,H=O.documentElement,K=O.body,L=O.defaultView,E=L.getComputedStyle(J,null),N=J.offsetTop,I=J.offsetLeft;while((J=J.parentNode)&&J!==K&&J!==H){M=L.getComputedStyle(J,null);N-=J.scrollTop,I-=J.scrollLeft;if(J===G){N+=J.offsetTop,I+=J.offsetLeft;if(o.offset.doesNotAddBorder&&!(o.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(J.tagName))){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}F=G,G=J.offsetParent}if(o.offset.subtractsBorderForOverflowNotVisible&&M.overflow!=="visible"){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}E=M}if(E.position==="relative"||E.position==="static"){N+=K.offsetTop,I+=K.offsetLeft}if(E.position==="fixed"){N+=Math.max(H.scrollTop,K.scrollTop),I+=Math.max(H.scrollLeft,K.scrollLeft)}return{top:N,left:I}}}o.offset={initialize:function(){if(this.initialized){return}var L=document.body,F=document.createElement("div"),H,G,N,I,M,E,J=L.style.marginTop,K='
';M={position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"};for(E in M){F.style[E]=M[E]}F.innerHTML=K;L.insertBefore(F,L.firstChild);H=F.firstChild,G=H.firstChild,I=H.nextSibling.firstChild.firstChild;this.doesNotAddBorder=(G.offsetTop!==5);this.doesAddBorderForTableAndCells=(I.offsetTop===5);H.style.overflow="hidden",H.style.position="relative";this.subtractsBorderForOverflowNotVisible=(G.offsetTop===-5);L.style.marginTop="1px";this.doesNotIncludeMarginInBodyOffset=(L.offsetTop===0);L.style.marginTop=J;L.removeChild(F);this.initialized=true},bodyOffset:function(E){o.offset.initialized||o.offset.initialize();var G=E.offsetTop,F=E.offsetLeft;if(o.offset.doesNotIncludeMarginInBodyOffset){G+=parseInt(o.curCSS(E,"marginTop",true),10)||0,F+=parseInt(o.curCSS(E,"marginLeft",true),10)||0}return{top:G,left:F}}};o.fn.extend({position:function(){var I=0,H=0,F;if(this[0]){var G=this.offsetParent(),J=this.offset(),E=/^body|html$/i.test(G[0].tagName)?{top:0,left:0}:G.offset();J.top-=j(this,"marginTop");J.left-=j(this,"marginLeft");E.top+=j(G,"borderTopWidth");E.left+=j(G,"borderLeftWidth");F={top:J.top-E.top,left:J.left-E.left}}return F},offsetParent:function(){var E=this[0].offsetParent||document.body;while(E&&(!/^body|html$/i.test(E.tagName)&&o.css(E,"position")=="static")){E=E.offsetParent}return o(E)}});o.each(["Left","Top"],function(F,E){var G="scroll"+E;o.fn[G]=function(H){if(!this[0]){return null}return H!==g?this.each(function(){this==l||this==document?l.scrollTo(!F?H:o(l).scrollLeft(),F?H:o(l).scrollTop()):this[G]=H}):this[0]==l||this[0]==document?self[F?"pageYOffset":"pageXOffset"]||o.boxModel&&document.documentElement[G]||document.body[G]:this[0][G]}});o.each(["Height","Width"],function(I,G){var E=I?"Left":"Top",H=I?"Right":"Bottom",F=G.toLowerCase();o.fn["inner"+G]=function(){return this[0]?o.css(this[0],F,false,"padding"):null};o.fn["outer"+G]=function(K){return this[0]?o.css(this[0],F,false,K?"margin":"border"):null};var J=G.toLowerCase();o.fn[J]=function(K){return this[0]==l?document.compatMode=="CSS1Compat"&&document.documentElement["client"+G]||document.body["client"+G]:this[0]==document?Math.max(document.documentElement["client"+G],document.body["scroll"+G],document.documentElement["scroll"+G],document.body["offset"+G],document.documentElement["offset"+G]):K===g?(this.length?o.css(this[0],J):null):this.css(J,typeof K==="string"?K:K+"px")}})})(); \ No newline at end of file diff --git a/IPSLibrary/webfront/IPSWeatherForcastAT/Weather.css b/IPSLibrary/webfront/IPSWeatherForcastAT/Weather.css index a910acf..907a6a0 100644 --- a/IPSLibrary/webfront/IPSWeatherForcastAT/Weather.css +++ b/IPSLibrary/webfront/IPSWeatherForcastAT/Weather.css @@ -1,4 +1,4 @@ -html, body{margin:0; padding:10px; height:100%; font:normal 14px verdana; color:#fff; overflow:hidden;} +html, body{margin:0; padding:10px; height:100%; font:normal 14px verdana; overflow:hidden;} body{-moz-user-select: none; -khtml-user-select: none; user-select: none;} #containerToday{position:absolute; left:10px; top:10px; width:42%; height:98%; border:1px solid #9ab3ca; float:left; } diff --git a/IPSLibrary/webfront/IPSWeatherForcastAT/Weather.php b/IPSLibrary/webfront/IPSWeatherForcastAT/Weather.php index fe491a9..039031f 100644 --- a/IPSLibrary/webfront/IPSWeatherForcastAT/Weather.php +++ b/IPSLibrary/webfront/IPSWeatherForcastAT/Weather.php @@ -43,12 +43,22 @@ '; + $mobile = preg_match("@ipod@i", $agent) || preg_match("@iphone@i",$agent); + if ($mobile) { + echo ''; } else { - echo ''; + echo ''; } + $background = ''; + $textcolor = 'color:#fff;'; + if (isset($_GET['foreground'])) { + $textcolor = 'color:#'.$_GET['foreground'].';'; + } + if (isset($_GET['background'])) { + $background = 'background:#'.$_GET['background'].';'; + if ($_GET['background'] == 'e4e4e4' and $textcolor='') $textcolor='color:#000000;'; + } + $style = 'style="'.$background.$textcolor.'"'; ?> - + > Aktuell:
\n"; - $TodayData .= IPSWeatherFAT_GetValue('TodayForecastShort')."
\n"; + $TodayData .= htmlentities(IPSWeatherFAT_GetValue('TodayForecastShort'), ENT_COMPAT, 'ISO-8859-1')."
\n"; $TodayData .= "Temperatur: ".IPSWeatherFAT_GetValue('TodayTempCurrent')." °C
\n"; $TodayData .= "Minimal: ".IPSWeatherFAT_GetValue('TodayTempMin')." °C
Maximal: ".IPSWeatherFAT_GetValue('TodayTempMax')." °C
"; $TodayData .= IPSWeatherFAT_GetValue('AirHumidity')."
"; - $TodayData .= IPSWeatherFAT_GetValue('Wind')."
"; + $TodayData .= htmlentities(IPSWeatherFAT_GetValue('Wind'), ENT_COMPAT, 'ISO-8859-1')."
"; $TodayData .= "Höhe: ".IPSWeatherFAT_GetValue('SeaLevel')."
\n"; $TodayData .= "LastRefresh: ".IPSWeatherFAT_GetValue('LastRefreshTime')."
\n"; $ForecastData1 = "".IPSWeatherFAT_GetValue('TomorrowDay')."
\n"; - $ForecastData1 .= IPSWeatherFAT_GetValue('TomorrowForecastShort')."
\n"; + $ForecastData1 .= htmlentities(IPSWeatherFAT_GetValue('TomorrowForecastShort'), ENT_COMPAT, 'ISO-8859-1')."
\n"; $ForecastData1 .= "min. ".IPSWeatherFAT_GetValue('TomorrowTempMin')." °C
max. ".IPSWeatherFAT_GetValue('TomorrowTempMax')." °C

"; $ForecastData2 = "".IPSWeatherFAT_GetValue('Tomorrow1Day')."
\n"; - $ForecastData2 .= IPSWeatherFAT_GetValue('Tomorrow1ForecastShort')."
\n"; - $ForecastData2 .= "min. ".IPSWeatherFAT_GetValue('Tomorrow1TempMin')." °C
max. ".IPSWeatherFAT_GetValue('Tomorrow1TempMax')." °C

"; - + if (IPSWeatherFAT_GetValue('Tomorrow1Day')<>'') { + $ForecastData2 .= htmlentities(IPSWeatherFAT_GetValue('Tomorrow1ForecastShort'), ENT_COMPAT, 'ISO-8859-1')."
\n"; + $ForecastData2 .= "min. ".IPSWeatherFAT_GetValue('Tomorrow1TempMin')." °C
max. ".IPSWeatherFAT_GetValue('Tomorrow1TempMax')." °C

"; + } $ForecastData3 = "".IPSWeatherFAT_GetValue('Tomorrow2Day')."
\n"; - $ForecastData3 .= IPSWeatherFAT_GetValue('Tomorrow2ForecastShort')."
\n"; - $ForecastData3 .= "min. ".IPSWeatherFAT_GetValue('Tomorrow2TempMin')." °C
max. ".IPSWeatherFAT_GetValue('Tomorrow2TempMax')." °C

"; + if (IPSWeatherFAT_GetValue('Tomorrow1Day')<>'') { + $ForecastData3 .= htmlentities(IPSWeatherFAT_GetValue('Tomorrow2ForecastShort'), ENT_COMPAT, 'ISO-8859-1')."
\n"; + $ForecastData3 .= "min. ".IPSWeatherFAT_GetValue('Tomorrow2TempMin')." °C
max. ".IPSWeatherFAT_GetValue('Tomorrow2TempMax')." °C

"; + } ?>
-
'.IPSWeatherFAT_GetValue('TodayForecastShort').'
';?>
+
'.htmlentities(IPSWeatherFAT_GetValue('TodayForecastShort')).'
';?>
@@ -111,13 +125,17 @@ function timedRefresh(timeoutPeriod) {
-
'.IPSWeatherFAT_GetValue('TomorrowForecastShort').'
';?>

-
'.IPSWeatherFAT_GetValue('Tomorrow1ForecastShort').'
';?>
-
'.IPSWeatherFAT_GetValue('Tomorrow2ForecastShort').'
';?>
-
-
+
'.htmlentities(IPSWeatherFAT_GetValue('TomorrowForecastShort')).'
';?>
+
'.htmlentities(IPSWeatherFAT_GetValue('Tomorrow1ForecastShort')).'
';?>
+
'.htmlentities(IPSWeatherFAT_GetValue('Tomorrow2ForecastShort')).'
';?>
= 1 or $mobile) { + echo '
'.IPSWeatherFAT_GetValue('TomorrowForecastLong').'
'; + } + if (IPSWEATHERFAT_COUNT_DETAILS >= 2 or $mobile) { + echo '
'.IPSWeatherFAT_GetValue('Tomorrow1ForecastLong').'
'; + } + if (IPSWEATHERFAT_COUNT_DETAILS >= 3 or $mobile) { echo '
'.IPSWeatherFAT_GetValue('Tomorrow2ForecastLong').'
'; } ?> diff --git a/IPSLibrary/webfront/NetPlayer/NetPlayer.css b/IPSLibrary/webfront/NetPlayer/NetPlayer.css index 767a05c..21e3813 100644 --- a/IPSLibrary/webfront/NetPlayer/NetPlayer.css +++ b/IPSLibrary/webfront/NetPlayer/NetPlayer.css @@ -1,26 +1,26 @@ -body {color:#fff;font-size:17px;font-family:arial,sans-serif;margin:0;padding:0;overflow:hidden} +body {font-size:17px;font-family:arial,sans-serif;margin:0;padding:0;overflow:hidden} -.containerPlayList{position:absolute; left:0px; right:566; top:0px; float:left; width=100%; border: 1px solid rgba(255,255,255,0.25); height:258px;overflow:auto;} -.containerCover{position:absolute; right:406px; top:0px; width:154px; float:left; border:1px solid rgba(255,255,255,0.25); height:258px;} -.containerControl{position:absolute; right:0px; width:400px; top:0px; float:left;height:258px; border: 1px solid rgba(255,255,255,0.25); background:rgba(0, 0, 0, 0.25);} +.containerPlayList{position:absolute; left:0px; right:566; top:0px; float:left; width=100%; border: 1px solid; height:258px;overflow:auto;} +.containerCover{position:absolute; right:406px; top:0px; width:154px; float:left; border:1px solid ; height:258px;} +.containerControl{position:absolute; right:0px; width:400px; top:0px; float:left;height:258px; border: 1px solid ; } -.containerRadioSelect{position:absolute; left:0px; right:306px; top:0px; float:left; height:180px; border: 1px solid rgba(255,255,255,0.25); background:rgba(0,0,0,0.25); overflow:auto;} -.containerRadioInfo{ position:absolute; right:0px; width:300px; top:0px; float:left; height:180px; border: 1px solid rgba(255,255,255,0.25); background:rgba(0,0,0,0.25);} +.containerRadioSelect{position:absolute; left:0px; right:306px; top:0px; float:left; height:180px; border: 1px solid ; overflow:auto;} +.containerRadioInfo{ position:absolute; right:0px; width:300px; top:0px; float:left; height:180px; border: 1px solid ; } -.containerSelection {position:absolute; right:0px; width:100%; top:0px; float:left; height:250px; border: 0px solid rgba(255,255,255,0.25);} +.containerSelection {position:absolute; right:0px; width:100%; top:0px; float:left; height:250px; border: 0px solid ;} .containerControlLine{position:relative; width:100%; margin:auto; text-align:center; float:left; } .containerControlLineBottom{ position:absolute; width:100%; margin:auto; bottom:3px; display:block; vertical-align:middle; text-align:center; float:left; } .containerControlLineTop{ position:absolute; width:100%; top:3px; display:block; vertical-align:middle; text-align:center; float:left; } .containerControlLineSeparator{ display:none;} -.containerControlButton{ display:inline-block; color:rgba(255,255,255,0.3); line-height:28px; border-width: 1px 0; border-style:solid; border-color:transparent; height:28px; float:left; padding: 0px 10px; margin: 3px 0 0 3px; +.containerControlButton{ display:inline-block; line-height:28px; border-width: 1px 0; border-style:solid; border-color:transparent; height:28px; float:left; padding: 0px 10px; margin: 3px 0 0 3px; background-color:rgba(255,255,255,0.1); background-image:url(../../img/bgCategoryElement.png); background-repeat: repeat;background-position:center top;} -.containerControlButtonSelected{ background-color:rgba(255,255,255,0.3); color:white; } -.containerControlButtonActive{ background-color:rgba(255,255,255,0.3); color:white; } -.containerControlDescr{display:inline-block; color:white; line-height:20px; border-width: 0 0 0 0; height:20px; width:100px; text-align:right; float:left; padding: 0 10px; margin: 3px 0 0 3px;} -.containerControlData{display:inline-block; color:white; line-height:20px; border-width: 0 0 0 0; height:20px; width:250px; text-align:left; float:left; padding: 0 10px; margin: 3px 0 0 3px; overflow:hidden} -.containerControlTrack{display:inline-block; color:white; border-width:0; text-align:left; float:left; padding:0; padding:0px 10px ; margin: 3px; overflow:hidden; font-size:14px;font-family:arial,sans-serif;} +.containerControlButtonSelected{ background-color:rgba(255,255,255,0.3); } +.containerControlButtonActive{ background-color:rgba(255,255,255,0.3); } +.containerControlDescr{display:inline-block; line-height:20px; border-width: 0 0 0 0; height:20px; width:100px; text-align:right; float:left; padding: 0 10px; margin: 3px 0 0 3px;} +.containerControlData{display:inline-block; line-height:20px; border-width: 0 0 0 0; height:20px; width:250px; text-align:left; float:left; padding: 0 10px; margin: 3px 0 0 3px; overflow:hidden} +.containerControlTrack{display:inline-block; border-width:0; text-align:left; float:left; padding:0; padding:0px 10px ; margin: 3px; overflow:hidden; font-size:14px;font-family:arial,sans-serif;} .containerControlTrackActive{font-size:16px;font-family:arial,sans-serif; background:rgba(255,255,255,0.3); width:100%;} .containerControlSelect{height:40px; width:200px; background-image:url(http://localhost:7001/img/bg.png)} .containerControlSelectInterpret{font:bold 14px verdana; height:18px; overflow:hidden;} diff --git a/IPSLibrary/webfront/NetPlayer/NetPlayer_MP3Selection.php b/IPSLibrary/webfront/NetPlayer/NetPlayer_MP3Selection.php index 2ad3c45..ba519e4 100644 --- a/IPSLibrary/webfront/NetPlayer/NetPlayer_MP3Selection.php +++ b/IPSLibrary/webfront/NetPlayer/NetPlayer_MP3Selection.php @@ -56,8 +56,8 @@
-
<<
-
>>
+
<<
+
>>
back
"") echo '
Root
'; diff --git a/IPSLibrary/webfront/NetPlayer/NetPlayer_MobileSelection.php b/IPSLibrary/webfront/NetPlayer/NetPlayer_MobileSelection.php index 68c87b1..2e076ac 100644 --- a/IPSLibrary/webfront/NetPlayer/NetPlayer_MobileSelection.php +++ b/IPSLibrary/webfront/NetPlayer/NetPlayer_MobileSelection.php @@ -60,8 +60,8 @@
-
<<
-
>>
+
<<
+
>>
back
"") echo '
Root
'; diff --git a/IPSLibrary/webfront/NetPlayer/NetPlayer_Sender.php b/IPSLibrary/webfront/NetPlayer/NetPlayer_Sender.php index cf7a18f..ab9fbf2 100644 --- a/IPSLibrary/webfront/NetPlayer/NetPlayer_Sender.php +++ b/IPSLibrary/webfront/NetPlayer/NetPlayer_Sender.php @@ -22,10 +22,31 @@ ?> + + + + + + +
+
+
+
+
+
+
+
+
Last
+
Play
+
Next
+
+
+
Pause
+
Stop
+
+
+
Interpret
+
+
+
+
Album
+
+
+
+
Titel
+
+
+
+
Titellänge
+
+
+
+
Aktuell
+
+
+
+
Musik Auswahl
+
Internet Radio
+
+
+ + + diff --git a/IPSLibrary/webfront/NetPlayer2/NetPlayer_MP3Selection.php b/IPSLibrary/webfront/NetPlayer2/NetPlayer_MP3Selection.php new file mode 100644 index 0000000..53d69b5 --- /dev/null +++ b/IPSLibrary/webfront/NetPlayer2/NetPlayer_MP3Selection.php @@ -0,0 +1,72 @@ + + * + * File kann in das WebFront eingebunden werden (zB per iFrame) und ermöglicht die Navigation durch + * Verzeichnisse mit MP3 Files. + * + */ + /** @}*/ +?> + + + + + + + + + + + + + + +
+
+ $directory) { + echo '
'; + echo '
'.convert($interpretList[$idx]).'
'; + echo '
'.convert($albumList[$idx]).'
'; + echo '
'; + } + ?> +
+ +
+ +
+
<<
+
>>
+
back
+ "") echo '
Root
'; + $categoryList = NetPlayer_GetCategoryList(); + foreach ($categoryList as $idx=>$category) { + echo '
'.str_replace('_','',$category).'
'; + } + ?> +
+
+ + diff --git a/IPSLibrary/webfront/NetPlayer2/NetPlayer_Mobile.php b/IPSLibrary/webfront/NetPlayer2/NetPlayer_Mobile.php new file mode 100644 index 0000000..ed47d08 --- /dev/null +++ b/IPSLibrary/webfront/NetPlayer2/NetPlayer_Mobile.php @@ -0,0 +1,37 @@ + + * + * File kann in das Mobil Frontend eingebunden werden (zB per iFrame) und ermöglicht das Steuern + * des Netplayers. + * + */ + + IPSUtils_Include ("NetPlayer.inc.php", "IPSLibrary::app::modules::NetPlayer2"); + + IPSLogger_Inf(__file__,'Load Mobile GUI ...'); + + $RemoteControlType = GetValue(NP_ID_CONTROLTYPE); + + switch($RemoteControlType) { + case 0: + include "NetPlayer_MobilePlayer.php"; + break; + case 1: + include "NetPlayer_MobileSelection.php"; + break; + case 2: + include "NetPlayer_MobileRadio.php"; + break; + default: + echo "Unknown RemoteControlType $RemoteControlType"; + } + + + /** @}*/ +?> diff --git a/IPSLibrary/webfront/NetPlayer2/NetPlayer_MobilePlayer.php b/IPSLibrary/webfront/NetPlayer2/NetPlayer_MobilePlayer.php new file mode 100644 index 0000000..8355682 --- /dev/null +++ b/IPSLibrary/webfront/NetPlayer2/NetPlayer_MobilePlayer.php @@ -0,0 +1,98 @@ + + * + * File kann in das WebFront eingebunden werden (zB per iFrame) und ermöglicht das Steuern + * des MP3 Players. + * + */ + /** @}*/ +?> + + + + + + + + + + + + + + +
+
+
Play
+
+
+
Last
+
+
+
Next
+
+
+
Pause
+
+
+
Stop
+
+
+
Interpret
+
+
+
+
Album
+
+
+
+
Titel
+
+
+
+
Titellänge
+
+
+
+
Aktuell
+
+
+ +
+ +
+
+
+
+
+
+
+
Musik Auswahl
+
+
+
Internet Radio
+
+
+
+
+
+
+ + + diff --git a/IPSLibrary/webfront/NetPlayer2/NetPlayer_MobileRadio.php b/IPSLibrary/webfront/NetPlayer2/NetPlayer_MobileRadio.php new file mode 100644 index 0000000..cd2464a --- /dev/null +++ b/IPSLibrary/webfront/NetPlayer2/NetPlayer_MobileRadio.php @@ -0,0 +1,83 @@ + + * + * File kann in das WebFront eingebunden werden (zB. per iFrame) und ermöglicht das Abspielen diverser + * Web Radios. + * + * Die Definition der Radio Sender mit zugehöriger URL wird im File NetPlayer_Configuration.ips.php vorgenommen. + * + */ + IPSUtils_Include ("NetPlayer.inc.php", "IPSLibrary::app::modules::NetPlayer2"); + + /** @}*/ +?> + + + + + + + + + + + + + + +
+
+
Play
+
+
+
Pause
+
+
+
Stop
+
+
+
Radio
+
+
+
+
Musik Player
+
+ +
+
+ +
+ + $radioURL) { + echo '
'; + if ($left) { + echo '
'.$radioName.'
'; + } else { + echo '
'.$radioName.'
'; + } + echo '
'; + $idx++; + $left = !$left; + } + ?> +
+
+ + + + diff --git a/IPSLibrary/webfront/NetPlayer2/NetPlayer_MobileSelection.php b/IPSLibrary/webfront/NetPlayer2/NetPlayer_MobileSelection.php new file mode 100644 index 0000000..c6ba508 --- /dev/null +++ b/IPSLibrary/webfront/NetPlayer2/NetPlayer_MobileSelection.php @@ -0,0 +1,76 @@ + + * + * File kann in das WebFront eingebunden werden (zB per iFrame) und ermöglicht die Navigation durch + * Verzeichnisse mit MP3 Files. + * + */ + /** @}*/ +?> + + + + + + + + + + + + + + + +
+
+ $directory) { + echo '
'; + echo '
'.convert($interpretList[$idx]).'
'; + echo '
'.convert($albumList[$idx]).'
'; + echo '
'; + } + ?> +
+ +
+ +
+
<<
+
>>
+
back
+ "") echo '
Root
'; + $categoryList = NetPlayer_GetCategoryList(); + foreach ($categoryList as $idx=>$category) { + echo '
'.str_replace('_','',$category).'
'; + } + ?> +
+
+ + diff --git a/IPSLibrary/webfront/NetPlayer2/NetPlayer_RadioControl.php b/IPSLibrary/webfront/NetPlayer2/NetPlayer_RadioControl.php new file mode 100644 index 0000000..12dcaa3 --- /dev/null +++ b/IPSLibrary/webfront/NetPlayer2/NetPlayer_RadioControl.php @@ -0,0 +1,71 @@ + + * + * File kann in das WebFront eingebunden werden (zB. per iFrame) und ermöglicht das Abspielen diverser + * Web Radios. + * + * Die Definition der Radio Sender mit zugehöriger URL wird im File NetPlayer_Configuration.ips.php vorgenommen. + * + */ + /** @}*/ +?> + + + + + + + + + + + + + + +
+
+ $radioURL) { + echo '
'.$radioName.'
'; + $idx++; + $left = !$left; + } + ?> +
+
+ +
+
+
Play
+
Stop
+
+
+
Pause
+
+
+
+
+
+
Musik Player
+
+
+ + + + diff --git a/IPSLibrary/webfront/NetPlayer2/NetPlayer_Receiver.php b/IPSLibrary/webfront/NetPlayer2/NetPlayer_Receiver.php new file mode 100644 index 0000000..62f416f --- /dev/null +++ b/IPSLibrary/webfront/NetPlayer2/NetPlayer_Receiver.php @@ -0,0 +1,95 @@ + + * + * Empfangs Script um Requests (JQuery) der HTML Seiten zu bearbeiten. + * Das Script wird durch die Java Script Funktionen im File NetPlayer_Sender.php getriggert. + * + */ + + $id = $_GET['id']; + IPSUtils_Include ("NetPlayer.inc.php", "IPSLibrary::app::modules::NetPlayer2"); + + if ($id<>"rc_mp_current" and $id<>"rc_mp_status" and $id<>"rc_mp_length" and $id<>"rc_mp_interpret" and $id<>"rc_mp_album" and $id<>"rc_mp_titel") { + IPSLogger_Trc(__file__, "RECEIVED Command '$id'"); + } + + // Player Control + if ($id=="rc_mp_play") { + NetPlayer_Power(true); + } else if ($id=="rc_mp_last") { + NetPlayer_Prev(); + } else if ($id=="rc_mp_next") { + NetPlayer_Next(); + } else if ($id=="rc_mp_pause") { + NetPlayer_Pause(); + } else if ($id=="rc_mp_stop") { + NetPlayer_Power(false); + + // Player State and Data + } else if ($id=="rc_mp_titel") { + $player = NetPlayer_GetIPSComponentPlayer(); + $titel = $player->GetTrackName(); + //$titel = NetPlayer_GetMediaPlayerValue("Titel"); + $Interpret = GetValue(NP_ID_CDINTERPRET); + $titel = str_replace(trim($Interpret, " "), "", $titel); + $titel = trim ($titel,"? -"); + $titel = trim ($titel," -"); + echo htmlentities(html_entity_decode($titel), ENT_COMPAT, 'ISO-8859-1'); + } else if ($id=="rc_mp_current") { + echo NetPlayer_GetIPSComponentPlayer()->GetTrackPosition(); + //echo NetPlayer_GetMediaPlayerValue('Titelposition'); + } else if ($id=="rc_mp_status") { + echo GetValue(NP_ID_CONTROL); + //echo NetPlayer_GetMediaPlayerValue('Status'); + } else if ($id=="rc_mp_length") { + echo NetPlayer_GetIPSComponentPlayer()->GetTrackLength(); + //echo NetPlayer_GetMediaPlayerValue('Titellänge'); + } else if ($id=="rc_mp_interpret") { + echo htmlentities(GetValue(NP_ID_CDINTERPRET), ENT_COMPAT, 'ISO-8859-1'); + } else if ($id=="rc_mp_album") { + echo htmlentities(GetValue(NP_ID_CDALBUM), ENT_COMPAT, 'ISO-8859-1'); + + // Mediaplayer Source + } else if ($id=="rc_mp_player") { + NetPlayer_SwitchToMP3Player(); + } else if ($id=="rc_mp_select") { + NetPlayer_SwitchToMP3Selection(); + } else if ($id=="rc_mp_radio") { + NetPlayer_SwitchToRadio(); + + // CD Selection - List CDs in MP3 Repository + } else if (substr($id,0,5)=="rc_cd") { + NetPlayer_PlayDirectory($_GET['cd_path']); + } else if ($id=="rc_mp_cdselectprev") { + NetPlayer_NavigateCDBack(NP_COUNT_CDHTML); + } else if ($id=="rc_mp_cdselectnext") { + NetPlayer_NavigateCDForward(NP_COUNT_CDHTML); + } else if (substr($id,0,6)=="rc_cat") { + NetPlayer_SetCategory($_GET['cd_cat']); + } else if ($id=="rc_mp_cdselectroot") { + NetPlayer_SetCategory(''); + } else if ($id=="rc_mp_cdselectback") { + NetPlayer_SwitchToMP3Player(false); + } else if (substr($id,0,11)=="rc_mp_track") { + NetPlayer_SetPlayListPosition((int)$_GET['track']); + + // Mediaplayer Set Webradio Station + } else if (substr($id,0,11)=="rc_mp_radio") { + NetPlayer_PlayRadio($_GET['radiourl'], $_GET['radiotitel']); + } else if ($id=="rc_mp_radioselectprev") { + NetPlayer_NavigateRadioBack(NP_COUNT_RADIOHTML); + } else if ($id=="rc_mp_radioselectnext") { + NetPlayer_NavigateRadioForward(NP_COUNT_RADIOHTML); + + } else { + IPSLogger_Err(__file__, "Received Unknown Netplayer ObjID=".$id); + } + ; + /** @}*/ +?> \ No newline at end of file diff --git a/IPSLibrary/webfront/NetPlayer2/NetPlayer_Sender.php b/IPSLibrary/webfront/NetPlayer2/NetPlayer_Sender.php new file mode 100644 index 0000000..dd0495c --- /dev/null +++ b/IPSLibrary/webfront/NetPlayer2/NetPlayer_Sender.php @@ -0,0 +1,101 @@ + + * + * Java Script Funktionen (JQuery) zum Senden und Empfangen. + * + * Dieses Script File wird von den diversen HTML Seiten per INCLUDE eingebunden und ermöglicht + * das Senden und Empfangen von Daten ohne die Seite neu Laden zu müssen. + * + * Auf der IPS Seite werden die Requests vom File NetPlayer_Receiver.php verarbeitet. + * + */ + IPSUtils_Include ("NetPlayer.inc.php", "IPSLibrary::app::modules::NetPlayer2"); + + $agent = $_SERVER['HTTP_USER_AGENT']; + $mobile = (preg_match("@ipod@i", $agent) || preg_match("@iphone@i",$agent)); + + ?> + + + + + + + diff --git a/IPSLibrary/webfront/NetPlayer2/NetPlayer_Utils.php b/IPSLibrary/webfront/NetPlayer2/NetPlayer_Utils.php new file mode 100644 index 0000000..9c7f6c4 --- /dev/null +++ b/IPSLibrary/webfront/NetPlayer2/NetPlayer_Utils.php @@ -0,0 +1,154 @@ + + * + * Diverse Funktionen um die Daten von MP3 Player und Radio zu aktualisieren + * + */ + IPSUtils_Include ("NetPlayer.inc.php", "IPSLibrary::app::modules::NetPlayer2"); +?> + + diff --git a/IPSLibrary/webfront/NetPlayer2/jquery.min.js b/IPSLibrary/webfront/NetPlayer2/jquery.min.js new file mode 100644 index 0000000..b1ae21d --- /dev/null +++ b/IPSLibrary/webfront/NetPlayer2/jquery.min.js @@ -0,0 +1,19 @@ +/* + * jQuery JavaScript Library v1.3.2 + * http://jquery.com/ + * + * Copyright (c) 2009 John Resig + * Dual licensed under the MIT and GPL licenses. + * http://docs.jquery.com/License + * + * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009) + * Revision: 6246 + */ +(function(){var l=this,g,y=l.jQuery,p=l.$,o=l.jQuery=l.$=function(E,F){return new o.fn.init(E,F)},D=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;o.fn=o.prototype={init:function(E,H){E=E||document;if(E.nodeType){this[0]=E;this.length=1;this.context=E;return this}if(typeof E==="string"){var G=D.exec(E);if(G&&(G[1]||!H)){if(G[1]){E=o.clean([G[1]],H)}else{var I=document.getElementById(G[3]);if(I&&I.id!=G[3]){return o().find(E)}var F=o(I||[]);F.context=document;F.selector=E;return F}}else{return o(H).find(E)}}else{if(o.isFunction(E)){return o(document).ready(E)}}if(E.selector&&E.context){this.selector=E.selector;this.context=E.context}return this.setArray(o.isArray(E)?E:o.makeArray(E))},selector:"",jquery:"1.3.2",size:function(){return this.length},get:function(E){return E===g?Array.prototype.slice.call(this):this[E]},pushStack:function(F,H,E){var G=o(F);G.prevObject=this;G.context=this.context;if(H==="find"){G.selector=this.selector+(this.selector?" ":"")+E}else{if(H){G.selector=this.selector+"."+H+"("+E+")"}}return G},setArray:function(E){this.length=0;Array.prototype.push.apply(this,E);return this},each:function(F,E){return o.each(this,F,E)},index:function(E){return o.inArray(E&&E.jquery?E[0]:E,this)},attr:function(F,H,G){var E=F;if(typeof F==="string"){if(H===g){return this[0]&&o[G||"attr"](this[0],F)}else{E={};E[F]=H}}return this.each(function(I){for(F in E){o.attr(G?this.style:this,F,o.prop(this,E[F],G,I,F))}})},css:function(E,F){if((E=="width"||E=="height")&&parseFloat(F)<0){F=g}return this.attr(E,F,"curCSS")},text:function(F){if(typeof F!=="object"&&F!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(F))}var E="";o.each(F||this,function(){o.each(this.childNodes,function(){if(this.nodeType!=8){E+=this.nodeType!=1?this.nodeValue:o.fn.text([this])}})});return E},wrapAll:function(E){if(this[0]){var F=o(E,this[0].ownerDocument).clone();if(this[0].parentNode){F.insertBefore(this[0])}F.map(function(){var G=this;while(G.firstChild){G=G.firstChild}return G}).append(this)}return this},wrapInner:function(E){return this.each(function(){o(this).contents().wrapAll(E)})},wrap:function(E){return this.each(function(){o(this).wrapAll(E)})},append:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.appendChild(E)}})},prepend:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.insertBefore(E,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this)})},after:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this.nextSibling)})},end:function(){return this.prevObject||o([])},push:[].push,sort:[].sort,splice:[].splice,find:function(E){if(this.length===1){var F=this.pushStack([],"find",E);F.length=0;o.find(E,this[0],F);return F}else{return this.pushStack(o.unique(o.map(this,function(G){return o.find(E,G)})),"find",E)}},clone:function(G){var E=this.map(function(){if(!o.support.noCloneEvent&&!o.isXMLDoc(this)){var I=this.outerHTML;if(!I){var J=this.ownerDocument.createElement("div");J.appendChild(this.cloneNode(true));I=J.innerHTML}return o.clean([I.replace(/ jQuery\d+="(?:\d+|null)"/g,"").replace(/^\s*/,"")])[0]}else{return this.cloneNode(true)}});if(G===true){var H=this.find("*").andSelf(),F=0;E.find("*").andSelf().each(function(){if(this.nodeName!==H[F].nodeName){return}var I=o.data(H[F],"events");for(var K in I){for(var J in I[K]){o.event.add(this,K,I[K][J],I[K][J].data)}}F++})}return E},filter:function(E){return this.pushStack(o.isFunction(E)&&o.grep(this,function(G,F){return E.call(G,F)})||o.multiFilter(E,o.grep(this,function(F){return F.nodeType===1})),"filter",E)},closest:function(E){var G=o.expr.match.POS.test(E)?o(E):null,F=0;return this.map(function(){var H=this;while(H&&H.ownerDocument){if(G?G.index(H)>-1:o(H).is(E)){o.data(H,"closest",F);return H}H=H.parentNode;F++}})},not:function(E){if(typeof E==="string"){if(f.test(E)){return this.pushStack(o.multiFilter(E,this,true),"not",E)}else{E=o.multiFilter(E,this)}}var F=E.length&&E[E.length-1]!==g&&!E.nodeType;return this.filter(function(){return F?o.inArray(this,E)<0:this!=E})},add:function(E){return this.pushStack(o.unique(o.merge(this.get(),typeof E==="string"?o(E):o.makeArray(E))))},is:function(E){return !!E&&o.multiFilter(E,this).length>0},hasClass:function(E){return !!E&&this.is("."+E)},val:function(K){if(K===g){var E=this[0];if(E){if(o.nodeName(E,"option")){return(E.attributes.value||{}).specified?E.value:E.text}if(o.nodeName(E,"select")){var I=E.selectedIndex,L=[],M=E.options,H=E.type=="select-one";if(I<0){return null}for(var F=H?I:0,J=H?I+1:M.length;F=0||o.inArray(this.name,K)>=0)}else{if(o.nodeName(this,"select")){var N=o.makeArray(K);o("option",this).each(function(){this.selected=(o.inArray(this.value,N)>=0||o.inArray(this.text,N)>=0)});if(!N.length){this.selectedIndex=-1}}else{this.value=K}}})},html:function(E){return E===g?(this[0]?this[0].innerHTML.replace(/ jQuery\d+="(?:\d+|null)"/g,""):null):this.empty().append(E)},replaceWith:function(E){return this.after(E).remove()},eq:function(E){return this.slice(E,+E+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(E){return this.pushStack(o.map(this,function(G,F){return E.call(G,F,G)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(J,M,L){if(this[0]){var I=(this[0].ownerDocument||this[0]).createDocumentFragment(),F=o.clean(J,(this[0].ownerDocument||this[0]),I),H=I.firstChild;if(H){for(var G=0,E=this.length;G1||G>0?I.cloneNode(true):I)}}if(F){o.each(F,z)}}return this;function K(N,O){return M&&o.nodeName(N,"table")&&o.nodeName(O,"tr")?(N.getElementsByTagName("tbody")[0]||N.appendChild(N.ownerDocument.createElement("tbody"))):N}}};o.fn.init.prototype=o.fn;function z(E,F){if(F.src){o.ajax({url:F.src,async:false,dataType:"script"})}else{o.globalEval(F.text||F.textContent||F.innerHTML||"")}if(F.parentNode){F.parentNode.removeChild(F)}}function e(){return +new Date}o.extend=o.fn.extend=function(){var J=arguments[0]||{},H=1,I=arguments.length,E=false,G;if(typeof J==="boolean"){E=J;J=arguments[1]||{};H=2}if(typeof J!=="object"&&!o.isFunction(J)){J={}}if(I==H){J=this;--H}for(;H-1}},swap:function(H,G,I){var E={};for(var F in G){E[F]=H.style[F];H.style[F]=G[F]}I.call(H);for(var F in G){H.style[F]=E[F]}},css:function(H,F,J,E){if(F=="width"||F=="height"){var L,G={position:"absolute",visibility:"hidden",display:"block"},K=F=="width"?["Left","Right"]:["Top","Bottom"];function I(){L=F=="width"?H.offsetWidth:H.offsetHeight;if(E==="border"){return}o.each(K,function(){if(!E){L-=parseFloat(o.curCSS(H,"padding"+this,true))||0}if(E==="margin"){L+=parseFloat(o.curCSS(H,"margin"+this,true))||0}else{L-=parseFloat(o.curCSS(H,"border"+this+"Width",true))||0}})}if(H.offsetWidth!==0){I()}else{o.swap(H,G,I)}return Math.max(0,Math.round(L))}return o.curCSS(H,F,J)},curCSS:function(I,F,G){var L,E=I.style;if(F=="opacity"&&!o.support.opacity){L=o.attr(E,"opacity");return L==""?"1":L}if(F.match(/float/i)){F=w}if(!G&&E&&E[F]){L=E[F]}else{if(q.getComputedStyle){if(F.match(/float/i)){F="float"}F=F.replace(/([A-Z])/g,"-$1").toLowerCase();var M=q.getComputedStyle(I,null);if(M){L=M.getPropertyValue(F)}if(F=="opacity"&&L==""){L="1"}}else{if(I.currentStyle){var J=F.replace(/\-(\w)/g,function(N,O){return O.toUpperCase()});L=I.currentStyle[F]||I.currentStyle[J];if(!/^\d+(px)?$/i.test(L)&&/^\d/.test(L)){var H=E.left,K=I.runtimeStyle.left;I.runtimeStyle.left=I.currentStyle.left;E.left=L||0;L=E.pixelLeft+"px";E.left=H;I.runtimeStyle.left=K}}}}return L},clean:function(F,K,I){K=K||document;if(typeof K.createElement==="undefined"){K=K.ownerDocument||K[0]&&K[0].ownerDocument||document}if(!I&&F.length===1&&typeof F[0]==="string"){var H=/^<(\w+)\s*\/?>$/.exec(F[0]);if(H){return[K.createElement(H[1])]}}var G=[],E=[],L=K.createElement("div");o.each(F,function(P,S){if(typeof S==="number"){S+=""}if(!S){return}if(typeof S==="string"){S=S.replace(/(<(\w+)[^>]*?)\/>/g,function(U,V,T){return T.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?U:V+">"});var O=S.replace(/^\s+/,"").substring(0,10).toLowerCase();var Q=!O.indexOf("",""]||!O.indexOf("",""]||O.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"","
"]||!O.indexOf("",""]||(!O.indexOf("",""]||!O.indexOf("",""]||!o.support.htmlSerialize&&[1,"div
","
"]||[0,"",""];L.innerHTML=Q[1]+S+Q[2];while(Q[0]--){L=L.lastChild}if(!o.support.tbody){var R=/"&&!R?L.childNodes:[];for(var M=N.length-1;M>=0;--M){if(o.nodeName(N[M],"tbody")&&!N[M].childNodes.length){N[M].parentNode.removeChild(N[M])}}}if(!o.support.leadingWhitespace&&/^\s/.test(S)){L.insertBefore(K.createTextNode(S.match(/^\s*/)[0]),L.firstChild)}S=o.makeArray(L.childNodes)}if(S.nodeType){G.push(S)}else{G=o.merge(G,S)}});if(I){for(var J=0;G[J];J++){if(o.nodeName(G[J],"script")&&(!G[J].type||G[J].type.toLowerCase()==="text/javascript")){E.push(G[J].parentNode?G[J].parentNode.removeChild(G[J]):G[J])}else{if(G[J].nodeType===1){G.splice.apply(G,[J+1,0].concat(o.makeArray(G[J].getElementsByTagName("script"))))}I.appendChild(G[J])}}return E}return G},attr:function(J,G,K){if(!J||J.nodeType==3||J.nodeType==8){return g}var H=!o.isXMLDoc(J),L=K!==g;G=H&&o.props[G]||G;if(J.tagName){var F=/href|src|style/.test(G);if(G=="selected"&&J.parentNode){J.parentNode.selectedIndex}if(G in J&&H&&!F){if(L){if(G=="type"&&o.nodeName(J,"input")&&J.parentNode){throw"type property can't be changed"}J[G]=K}if(o.nodeName(J,"form")&&J.getAttributeNode(G)){return J.getAttributeNode(G).nodeValue}if(G=="tabIndex"){var I=J.getAttributeNode("tabIndex");return I&&I.specified?I.value:J.nodeName.match(/(button|input|object|select|textarea)/i)?0:J.nodeName.match(/^(a|area)$/i)&&J.href?0:g}return J[G]}if(!o.support.style&&H&&G=="style"){return o.attr(J.style,"cssText",K)}if(L){J.setAttribute(G,""+K)}var E=!o.support.hrefNormalized&&H&&F?J.getAttribute(G,2):J.getAttribute(G);return E===null?g:E}if(!o.support.opacity&&G=="opacity"){if(L){J.zoom=1;J.filter=(J.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(K)+""=="NaN"?"":"alpha(opacity="+K*100+")")}return J.filter&&J.filter.indexOf("opacity=")>=0?(parseFloat(J.filter.match(/opacity=([^)]*)/)[1])/100)+"":""}G=G.replace(/-([a-z])/ig,function(M,N){return N.toUpperCase()});if(L){J[G]=K}return J[G]},trim:function(E){return(E||"").replace(/^\s+|\s+$/g,"")},makeArray:function(G){var E=[];if(G!=null){var F=G.length;if(F==null||typeof G==="string"||o.isFunction(G)||G.setInterval){E[0]=G}else{while(F){E[--F]=G[F]}}}return E},inArray:function(G,H){for(var E=0,F=H.length;E0?this.clone(true):this).get();o.fn[F].apply(o(L[K]),I);J=J.concat(I)}return this.pushStack(J,E,G)}});o.each({removeAttr:function(E){o.attr(this,E,"");if(this.nodeType==1){this.removeAttribute(E)}},addClass:function(E){o.className.add(this,E)},removeClass:function(E){o.className.remove(this,E)},toggleClass:function(F,E){if(typeof E!=="boolean"){E=!o.className.has(this,F)}o.className[E?"add":"remove"](this,F)},remove:function(E){if(!E||o.filter(E,[this]).length){o("*",this).add([this]).each(function(){o.event.remove(this);o.removeData(this)});if(this.parentNode){this.parentNode.removeChild(this)}}},empty:function(){o(this).children().remove();while(this.firstChild){this.removeChild(this.firstChild)}}},function(E,F){o.fn[E]=function(){return this.each(F,arguments)}});function j(E,F){return E[0]&&parseInt(o.curCSS(E[0],F,true),10)||0}var h="jQuery"+e(),v=0,A={};o.extend({cache:{},data:function(F,E,G){F=F==l?A:F;var H=F[h];if(!H){H=F[h]=++v}if(E&&!o.cache[H]){o.cache[H]={}}if(G!==g){o.cache[H][E]=G}return E?o.cache[H][E]:H},removeData:function(F,E){F=F==l?A:F;var H=F[h];if(E){if(o.cache[H]){delete o.cache[H][E];E="";for(E in o.cache[H]){break}if(!E){o.removeData(F)}}}else{try{delete F[h]}catch(G){if(F.removeAttribute){F.removeAttribute(h)}}delete o.cache[H]}},queue:function(F,E,H){if(F){E=(E||"fx")+"queue";var G=o.data(F,E);if(!G||o.isArray(H)){G=o.data(F,E,o.makeArray(H))}else{if(H){G.push(H)}}}return G},dequeue:function(H,G){var E=o.queue(H,G),F=E.shift();if(!G||G==="fx"){F=E[0]}if(F!==g){F.call(H)}}});o.fn.extend({data:function(E,G){var H=E.split(".");H[1]=H[1]?"."+H[1]:"";if(G===g){var F=this.triggerHandler("getData"+H[1]+"!",[H[0]]);if(F===g&&this.length){F=o.data(this[0],E)}return F===g&&H[1]?this.data(H[0]):F}else{return this.trigger("setData"+H[1]+"!",[H[0],G]).each(function(){o.data(this,E,G)})}},removeData:function(E){return this.each(function(){o.removeData(this,E)})},queue:function(E,F){if(typeof E!=="string"){F=E;E="fx"}if(F===g){return o.queue(this[0],E)}return this.each(function(){var G=o.queue(this,E,F);if(E=="fx"&&G.length==1){G[0].call(this)}})},dequeue:function(E){return this.each(function(){o.dequeue(this,E)})}}); +/* + * Sizzle CSS Selector Engine - v0.9.3 + * Copyright 2009, The Dojo Foundation + * Released under the MIT, BSD, and GPL Licenses. + * More information: http://sizzlejs.com/ + */ +(function(){var R=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,L=0,H=Object.prototype.toString;var F=function(Y,U,ab,ac){ab=ab||[];U=U||document;if(U.nodeType!==1&&U.nodeType!==9){return[]}if(!Y||typeof Y!=="string"){return ab}var Z=[],W,af,ai,T,ad,V,X=true;R.lastIndex=0;while((W=R.exec(Y))!==null){Z.push(W[1]);if(W[2]){V=RegExp.rightContext;break}}if(Z.length>1&&M.exec(Y)){if(Z.length===2&&I.relative[Z[0]]){af=J(Z[0]+Z[1],U)}else{af=I.relative[Z[0]]?[U]:F(Z.shift(),U);while(Z.length){Y=Z.shift();if(I.relative[Y]){Y+=Z.shift()}af=J(Y,af)}}}else{var ae=ac?{expr:Z.pop(),set:E(ac)}:F.find(Z.pop(),Z.length===1&&U.parentNode?U.parentNode:U,Q(U));af=F.filter(ae.expr,ae.set);if(Z.length>0){ai=E(af)}else{X=false}while(Z.length){var ah=Z.pop(),ag=ah;if(!I.relative[ah]){ah=""}else{ag=Z.pop()}if(ag==null){ag=U}I.relative[ah](ai,ag,Q(U))}}if(!ai){ai=af}if(!ai){throw"Syntax error, unrecognized expression: "+(ah||Y)}if(H.call(ai)==="[object Array]"){if(!X){ab.push.apply(ab,ai)}else{if(U.nodeType===1){for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&(ai[aa]===true||ai[aa].nodeType===1&&K(U,ai[aa]))){ab.push(af[aa])}}}else{for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&ai[aa].nodeType===1){ab.push(af[aa])}}}}}else{E(ai,ab)}if(V){F(V,U,ab,ac);if(G){hasDuplicate=false;ab.sort(G);if(hasDuplicate){for(var aa=1;aa":function(Z,U,aa){var X=typeof U==="string";if(X&&!/\W/.test(U)){U=aa?U:U.toUpperCase();for(var V=0,T=Z.length;V=0)){if(!V){T.push(Y)}}else{if(V){U[X]=false}}}}return false},ID:function(T){return T[1].replace(/\\/g,"")},TAG:function(U,T){for(var V=0;T[V]===false;V++){}return T[V]&&Q(T[V])?U[1]:U[1].toUpperCase()},CHILD:function(T){if(T[1]=="nth"){var U=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(T[2]=="even"&&"2n"||T[2]=="odd"&&"2n+1"||!/\D/.test(T[2])&&"0n+"+T[2]||T[2]);T[2]=(U[1]+(U[2]||1))-0;T[3]=U[3]-0}T[0]=L++;return T},ATTR:function(X,U,V,T,Y,Z){var W=X[1].replace(/\\/g,"");if(!Z&&I.attrMap[W]){X[1]=I.attrMap[W]}if(X[2]==="~="){X[4]=" "+X[4]+" "}return X},PSEUDO:function(X,U,V,T,Y){if(X[1]==="not"){if(X[3].match(R).length>1||/^\w/.test(X[3])){X[3]=F(X[3],null,null,U)}else{var W=F.filter(X[3],U,V,true^Y);if(!V){T.push.apply(T,W)}return false}}else{if(I.match.POS.test(X[0])||I.match.CHILD.test(X[0])){return true}}return X},POS:function(T){T.unshift(true);return T}},filters:{enabled:function(T){return T.disabled===false&&T.type!=="hidden"},disabled:function(T){return T.disabled===true},checked:function(T){return T.checked===true},selected:function(T){T.parentNode.selectedIndex;return T.selected===true},parent:function(T){return !!T.firstChild},empty:function(T){return !T.firstChild},has:function(V,U,T){return !!F(T[3],V).length},header:function(T){return/h\d/i.test(T.nodeName)},text:function(T){return"text"===T.type},radio:function(T){return"radio"===T.type},checkbox:function(T){return"checkbox"===T.type},file:function(T){return"file"===T.type},password:function(T){return"password"===T.type},submit:function(T){return"submit"===T.type},image:function(T){return"image"===T.type},reset:function(T){return"reset"===T.type},button:function(T){return"button"===T.type||T.nodeName.toUpperCase()==="BUTTON"},input:function(T){return/input|select|textarea|button/i.test(T.nodeName)}},setFilters:{first:function(U,T){return T===0},last:function(V,U,T,W){return U===W.length-1},even:function(U,T){return T%2===0},odd:function(U,T){return T%2===1},lt:function(V,U,T){return UT[3]-0},nth:function(V,U,T){return T[3]-0==U},eq:function(V,U,T){return T[3]-0==U}},filter:{PSEUDO:function(Z,V,W,aa){var U=V[1],X=I.filters[U];if(X){return X(Z,W,V,aa)}else{if(U==="contains"){return(Z.textContent||Z.innerText||"").indexOf(V[3])>=0}else{if(U==="not"){var Y=V[3];for(var W=0,T=Y.length;W=0)}}},ID:function(U,T){return U.nodeType===1&&U.getAttribute("id")===T},TAG:function(U,T){return(T==="*"&&U.nodeType===1)||U.nodeName===T},CLASS:function(U,T){return(" "+(U.className||U.getAttribute("class"))+" ").indexOf(T)>-1},ATTR:function(Y,W){var V=W[1],T=I.attrHandle[V]?I.attrHandle[V](Y):Y[V]!=null?Y[V]:Y.getAttribute(V),Z=T+"",X=W[2],U=W[4];return T==null?X==="!=":X==="="?Z===U:X==="*="?Z.indexOf(U)>=0:X==="~="?(" "+Z+" ").indexOf(U)>=0:!U?Z&&T!==false:X==="!="?Z!=U:X==="^="?Z.indexOf(U)===0:X==="$="?Z.substr(Z.length-U.length)===U:X==="|="?Z===U||Z.substr(0,U.length+1)===U+"-":false},POS:function(X,U,V,Y){var T=U[2],W=I.setFilters[T];if(W){return W(X,V,U,Y)}}}};var M=I.match.POS;for(var O in I.match){I.match[O]=RegExp(I.match[O].source+/(?![^\[]*\])(?![^\(]*\))/.source)}var E=function(U,T){U=Array.prototype.slice.call(U);if(T){T.push.apply(T,U);return T}return U};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(N){E=function(X,W){var U=W||[];if(H.call(X)==="[object Array]"){Array.prototype.push.apply(U,X)}else{if(typeof X.length==="number"){for(var V=0,T=X.length;V";var T=document.documentElement;T.insertBefore(U,T.firstChild);if(!!document.getElementById(V)){I.find.ID=function(X,Y,Z){if(typeof Y.getElementById!=="undefined"&&!Z){var W=Y.getElementById(X[1]);return W?W.id===X[1]||typeof W.getAttributeNode!=="undefined"&&W.getAttributeNode("id").nodeValue===X[1]?[W]:g:[]}};I.filter.ID=function(Y,W){var X=typeof Y.getAttributeNode!=="undefined"&&Y.getAttributeNode("id");return Y.nodeType===1&&X&&X.nodeValue===W}}T.removeChild(U)})();(function(){var T=document.createElement("div");T.appendChild(document.createComment(""));if(T.getElementsByTagName("*").length>0){I.find.TAG=function(U,Y){var X=Y.getElementsByTagName(U[1]);if(U[1]==="*"){var W=[];for(var V=0;X[V];V++){if(X[V].nodeType===1){W.push(X[V])}}X=W}return X}}T.innerHTML="";if(T.firstChild&&typeof T.firstChild.getAttribute!=="undefined"&&T.firstChild.getAttribute("href")!=="#"){I.attrHandle.href=function(U){return U.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var T=F,U=document.createElement("div");U.innerHTML="

";if(U.querySelectorAll&&U.querySelectorAll(".TEST").length===0){return}F=function(Y,X,V,W){X=X||document;if(!W&&X.nodeType===9&&!Q(X)){try{return E(X.querySelectorAll(Y),V)}catch(Z){}}return T(Y,X,V,W)};F.find=T.find;F.filter=T.filter;F.selectors=T.selectors;F.matches=T.matches})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){(function(){var T=document.createElement("div");T.innerHTML="
";if(T.getElementsByClassName("e").length===0){return}T.lastChild.className="e";if(T.getElementsByClassName("e").length===1){return}I.order.splice(1,0,"CLASS");I.find.CLASS=function(U,V,W){if(typeof V.getElementsByClassName!=="undefined"&&!W){return V.getElementsByClassName(U[1])}}})()}function P(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W0){X=T;break}}}T=T[U]}ad[W]=X}}}var K=document.compareDocumentPosition?function(U,T){return U.compareDocumentPosition(T)&16}:function(U,T){return U!==T&&(U.contains?U.contains(T):true)};var Q=function(T){return T.nodeType===9&&T.documentElement.nodeName!=="HTML"||!!T.ownerDocument&&Q(T.ownerDocument)};var J=function(T,aa){var W=[],X="",Y,V=aa.nodeType?[aa]:aa;while((Y=I.match.PSEUDO.exec(T))){X+=Y[0];T=T.replace(I.match.PSEUDO,"")}T=I.relative[T]?T+"*":T;for(var Z=0,U=V.length;Z0||T.offsetHeight>0};F.selectors.filters.animated=function(T){return o.grep(o.timers,function(U){return T===U.elem}).length};o.multiFilter=function(V,T,U){if(U){V=":not("+V+")"}return F.matches(V,T)};o.dir=function(V,U){var T=[],W=V[U];while(W&&W!=document){if(W.nodeType==1){T.push(W)}W=W[U]}return T};o.nth=function(X,T,V,W){T=T||1;var U=0;for(;X;X=X[V]){if(X.nodeType==1&&++U==T){break}}return X};o.sibling=function(V,U){var T=[];for(;V;V=V.nextSibling){if(V.nodeType==1&&V!=U){T.push(V)}}return T};return;l.Sizzle=F})();o.event={add:function(I,F,H,K){if(I.nodeType==3||I.nodeType==8){return}if(I.setInterval&&I!=l){I=l}if(!H.guid){H.guid=this.guid++}if(K!==g){var G=H;H=this.proxy(G);H.data=K}var E=o.data(I,"events")||o.data(I,"events",{}),J=o.data(I,"handle")||o.data(I,"handle",function(){return typeof o!=="undefined"&&!o.event.triggered?o.event.handle.apply(arguments.callee.elem,arguments):g});J.elem=I;o.each(F.split(/\s+/),function(M,N){var O=N.split(".");N=O.shift();H.type=O.slice().sort().join(".");var L=E[N];if(o.event.specialAll[N]){o.event.specialAll[N].setup.call(I,K,O)}if(!L){L=E[N]={};if(!o.event.special[N]||o.event.special[N].setup.call(I,K,O)===false){if(I.addEventListener){I.addEventListener(N,J,false)}else{if(I.attachEvent){I.attachEvent("on"+N,J)}}}}L[H.guid]=H;o.event.global[N]=true});I=null},guid:1,global:{},remove:function(K,H,J){if(K.nodeType==3||K.nodeType==8){return}var G=o.data(K,"events"),F,E;if(G){if(H===g||(typeof H==="string"&&H.charAt(0)==".")){for(var I in G){this.remove(K,I+(H||""))}}else{if(H.type){J=H.handler;H=H.type}o.each(H.split(/\s+/),function(M,O){var Q=O.split(".");O=Q.shift();var N=RegExp("(^|\\.)"+Q.slice().sort().join(".*\\.")+"(\\.|$)");if(G[O]){if(J){delete G[O][J.guid]}else{for(var P in G[O]){if(N.test(G[O][P].type)){delete G[O][P]}}}if(o.event.specialAll[O]){o.event.specialAll[O].teardown.call(K,Q)}for(F in G[O]){break}if(!F){if(!o.event.special[O]||o.event.special[O].teardown.call(K,Q)===false){if(K.removeEventListener){K.removeEventListener(O,o.data(K,"handle"),false)}else{if(K.detachEvent){K.detachEvent("on"+O,o.data(K,"handle"))}}}F=null;delete G[O]}}})}for(F in G){break}if(!F){var L=o.data(K,"handle");if(L){L.elem=null}o.removeData(K,"events");o.removeData(K,"handle")}}},trigger:function(I,K,H,E){var G=I.type||I;if(!E){I=typeof I==="object"?I[h]?I:o.extend(o.Event(G),I):o.Event(G);if(G.indexOf("!")>=0){I.type=G=G.slice(0,-1);I.exclusive=true}if(!H){I.stopPropagation();if(this.global[G]){o.each(o.cache,function(){if(this.events&&this.events[G]){o.event.trigger(I,K,this.handle.elem)}})}}if(!H||H.nodeType==3||H.nodeType==8){return g}I.result=g;I.target=H;K=o.makeArray(K);K.unshift(I)}I.currentTarget=H;var J=o.data(H,"handle");if(J){J.apply(H,K)}if((!H[G]||(o.nodeName(H,"a")&&G=="click"))&&H["on"+G]&&H["on"+G].apply(H,K)===false){I.result=false}if(!E&&H[G]&&!I.isDefaultPrevented()&&!(o.nodeName(H,"a")&&G=="click")){this.triggered=true;try{H[G]()}catch(L){}}this.triggered=false;if(!I.isPropagationStopped()){var F=H.parentNode||H.ownerDocument;if(F){o.event.trigger(I,K,F,true)}}},handle:function(K){var J,E;K=arguments[0]=o.event.fix(K||l.event);K.currentTarget=this;var L=K.type.split(".");K.type=L.shift();J=!L.length&&!K.exclusive;var I=RegExp("(^|\\.)"+L.slice().sort().join(".*\\.")+"(\\.|$)");E=(o.data(this,"events")||{})[K.type];for(var G in E){var H=E[G];if(J||I.test(H.type)){K.handler=H;K.data=H.data;var F=H.apply(this,arguments);if(F!==g){K.result=F;if(F===false){K.preventDefault();K.stopPropagation()}}if(K.isImmediatePropagationStopped()){break}}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(H){if(H[h]){return H}var F=H;H=o.Event(F);for(var G=this.props.length,J;G;){J=this.props[--G];H[J]=F[J]}if(!H.target){H.target=H.srcElement||document}if(H.target.nodeType==3){H.target=H.target.parentNode}if(!H.relatedTarget&&H.fromElement){H.relatedTarget=H.fromElement==H.target?H.toElement:H.fromElement}if(H.pageX==null&&H.clientX!=null){var I=document.documentElement,E=document.body;H.pageX=H.clientX+(I&&I.scrollLeft||E&&E.scrollLeft||0)-(I.clientLeft||0);H.pageY=H.clientY+(I&&I.scrollTop||E&&E.scrollTop||0)-(I.clientTop||0)}if(!H.which&&((H.charCode||H.charCode===0)?H.charCode:H.keyCode)){H.which=H.charCode||H.keyCode}if(!H.metaKey&&H.ctrlKey){H.metaKey=H.ctrlKey}if(!H.which&&H.button){H.which=(H.button&1?1:(H.button&2?3:(H.button&4?2:0)))}return H},proxy:function(F,E){E=E||function(){return F.apply(this,arguments)};E.guid=F.guid=F.guid||E.guid||this.guid++;return E},special:{ready:{setup:B,teardown:function(){}}},specialAll:{live:{setup:function(E,F){o.event.add(this,F[0],c)},teardown:function(G){if(G.length){var E=0,F=RegExp("(^|\\.)"+G[0]+"(\\.|$)");o.each((o.data(this,"events").live||{}),function(){if(F.test(this.type)){E++}});if(E<1){o.event.remove(this,G[0],c)}}}}}};o.Event=function(E){if(!this.preventDefault){return new o.Event(E)}if(E&&E.type){this.originalEvent=E;this.type=E.type}else{this.type=E}this.timeStamp=e();this[h]=true};function k(){return false}function u(){return true}o.Event.prototype={preventDefault:function(){this.isDefaultPrevented=u;var E=this.originalEvent;if(!E){return}if(E.preventDefault){E.preventDefault()}E.returnValue=false},stopPropagation:function(){this.isPropagationStopped=u;var E=this.originalEvent;if(!E){return}if(E.stopPropagation){E.stopPropagation()}E.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u;this.stopPropagation()},isDefaultPrevented:k,isPropagationStopped:k,isImmediatePropagationStopped:k};var a=function(F){var E=F.relatedTarget;while(E&&E!=this){try{E=E.parentNode}catch(G){E=this}}if(E!=this){F.type=F.data;o.event.handle.apply(this,arguments)}};o.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(F,E){o.event.special[E]={setup:function(){o.event.add(this,F,a,E)},teardown:function(){o.event.remove(this,F,a)}}});o.fn.extend({bind:function(F,G,E){return F=="unload"?this.one(F,G,E):this.each(function(){o.event.add(this,F,E||G,E&&G)})},one:function(G,H,F){var E=o.event.proxy(F||H,function(I){o(this).unbind(I,E);return(F||H).apply(this,arguments)});return this.each(function(){o.event.add(this,G,E,F&&H)})},unbind:function(F,E){return this.each(function(){o.event.remove(this,F,E)})},trigger:function(E,F){return this.each(function(){o.event.trigger(E,F,this)})},triggerHandler:function(E,G){if(this[0]){var F=o.Event(E);F.preventDefault();F.stopPropagation();o.event.trigger(F,G,this[0]);return F.result}},toggle:function(G){var E=arguments,F=1;while(F=0){var E=G.slice(I,G.length);G=G.slice(0,I)}var H="GET";if(J){if(o.isFunction(J)){K=J;J=null}else{if(typeof J==="object"){J=o.param(J);H="POST"}}}var F=this;o.ajax({url:G,type:H,dataType:"html",data:J,complete:function(M,L){if(L=="success"||L=="notmodified"){F.html(E?o("
").append(M.responseText.replace(//g,"")).find(E):M.responseText)}if(K){F.each(K,[M.responseText,L,M])}}});return this},serialize:function(){return o.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?o.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password|search/i.test(this.type))}).map(function(E,F){var G=o(this).val();return G==null?null:o.isArray(G)?o.map(G,function(I,H){return{name:F.name,value:I}}):{name:F.name,value:G}}).get()}});o.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(E,F){o.fn[F]=function(G){return this.bind(F,G)}});var r=e();o.extend({get:function(E,G,H,F){if(o.isFunction(G)){H=G;G=null}return o.ajax({type:"GET",url:E,data:G,success:H,dataType:F})},getScript:function(E,F){return o.get(E,null,F,"script")},getJSON:function(E,F,G){return o.get(E,F,G,"json")},post:function(E,G,H,F){if(o.isFunction(G)){H=G;G={}}return o.ajax({type:"POST",url:E,data:G,success:H,dataType:F})},ajaxSetup:function(E){o.extend(o.ajaxSettings,E)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return l.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(M){M=o.extend(true,M,o.extend(true,{},o.ajaxSettings,M));var W,F=/=\?(&|$)/g,R,V,G=M.type.toUpperCase();if(M.data&&M.processData&&typeof M.data!=="string"){M.data=o.param(M.data)}if(M.dataType=="jsonp"){if(G=="GET"){if(!M.url.match(F)){M.url+=(M.url.match(/\?/)?"&":"?")+(M.jsonp||"callback")+"=?"}}else{if(!M.data||!M.data.match(F)){M.data=(M.data?M.data+"&":"")+(M.jsonp||"callback")+"=?"}}M.dataType="json"}if(M.dataType=="json"&&(M.data&&M.data.match(F)||M.url.match(F))){W="jsonp"+r++;if(M.data){M.data=(M.data+"").replace(F,"="+W+"$1")}M.url=M.url.replace(F,"="+W+"$1");M.dataType="script";l[W]=function(X){V=X;I();L();l[W]=g;try{delete l[W]}catch(Y){}if(H){H.removeChild(T)}}}if(M.dataType=="script"&&M.cache==null){M.cache=false}if(M.cache===false&&G=="GET"){var E=e();var U=M.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+E+"$2");M.url=U+((U==M.url)?(M.url.match(/\?/)?"&":"?")+"_="+E:"")}if(M.data&&G=="GET"){M.url+=(M.url.match(/\?/)?"&":"?")+M.data;M.data=null}if(M.global&&!o.active++){o.event.trigger("ajaxStart")}var Q=/^(\w+:)?\/\/([^\/?#]+)/.exec(M.url);if(M.dataType=="script"&&G=="GET"&&Q&&(Q[1]&&Q[1]!=location.protocol||Q[2]!=location.host)){var H=document.getElementsByTagName("head")[0];var T=document.createElement("script");T.src=M.url;if(M.scriptCharset){T.charset=M.scriptCharset}if(!W){var O=false;T.onload=T.onreadystatechange=function(){if(!O&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){O=true;I();L();T.onload=T.onreadystatechange=null;H.removeChild(T)}}}H.appendChild(T);return g}var K=false;var J=M.xhr();if(M.username){J.open(G,M.url,M.async,M.username,M.password)}else{J.open(G,M.url,M.async)}try{if(M.data){J.setRequestHeader("Content-Type",M.contentType)}if(M.ifModified){J.setRequestHeader("If-Modified-Since",o.lastModified[M.url]||"Thu, 01 Jan 1970 00:00:00 GMT")}J.setRequestHeader("X-Requested-With","XMLHttpRequest");J.setRequestHeader("Accept",M.dataType&&M.accepts[M.dataType]?M.accepts[M.dataType]+", */*":M.accepts._default)}catch(S){}if(M.beforeSend&&M.beforeSend(J,M)===false){if(M.global&&!--o.active){o.event.trigger("ajaxStop")}J.abort();return false}if(M.global){o.event.trigger("ajaxSend",[J,M])}var N=function(X){if(J.readyState==0){if(P){clearInterval(P);P=null;if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}}else{if(!K&&J&&(J.readyState==4||X=="timeout")){K=true;if(P){clearInterval(P);P=null}R=X=="timeout"?"timeout":!o.httpSuccess(J)?"error":M.ifModified&&o.httpNotModified(J,M.url)?"notmodified":"success";if(R=="success"){try{V=o.httpData(J,M.dataType,M)}catch(Z){R="parsererror"}}if(R=="success"){var Y;try{Y=J.getResponseHeader("Last-Modified")}catch(Z){}if(M.ifModified&&Y){o.lastModified[M.url]=Y}if(!W){I()}}else{o.handleError(M,J,R)}L();if(X){J.abort()}if(M.async){J=null}}}};if(M.async){var P=setInterval(N,13);if(M.timeout>0){setTimeout(function(){if(J&&!K){N("timeout")}},M.timeout)}}try{J.send(M.data)}catch(S){o.handleError(M,J,null,S)}if(!M.async){N()}function I(){if(M.success){M.success(V,R)}if(M.global){o.event.trigger("ajaxSuccess",[J,M])}}function L(){if(M.complete){M.complete(J,R)}if(M.global){o.event.trigger("ajaxComplete",[J,M])}if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}return J},handleError:function(F,H,E,G){if(F.error){F.error(H,E,G)}if(F.global){o.event.trigger("ajaxError",[H,F,G])}},active:0,httpSuccess:function(F){try{return !F.status&&location.protocol=="file:"||(F.status>=200&&F.status<300)||F.status==304||F.status==1223}catch(E){}return false},httpNotModified:function(G,E){try{var H=G.getResponseHeader("Last-Modified");return G.status==304||H==o.lastModified[E]}catch(F){}return false},httpData:function(J,H,G){var F=J.getResponseHeader("content-type"),E=H=="xml"||!H&&F&&F.indexOf("xml")>=0,I=E?J.responseXML:J.responseText;if(E&&I.documentElement.tagName=="parsererror"){throw"parsererror"}if(G&&G.dataFilter){I=G.dataFilter(I,H)}if(typeof I==="string"){if(H=="script"){o.globalEval(I)}if(H=="json"){I=l["eval"]("("+I+")")}}return I},param:function(E){var G=[];function H(I,J){G[G.length]=encodeURIComponent(I)+"="+encodeURIComponent(J)}if(o.isArray(E)||E.jquery){o.each(E,function(){H(this.name,this.value)})}else{for(var F in E){if(o.isArray(E[F])){o.each(E[F],function(){H(F,this)})}else{H(F,o.isFunction(E[F])?E[F]():E[F])}}}return G.join("&").replace(/%20/g,"+")}});var m={},n,d=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];function t(F,E){var G={};o.each(d.concat.apply([],d.slice(0,E)),function(){G[this]=F});return G}o.fn.extend({show:function(J,L){if(J){return this.animate(t("show",3),J,L)}else{for(var H=0,F=this.length;H").appendTo("body");K=I.css("display");if(K==="none"){K="block"}I.remove();m[G]=K}o.data(this[H],"olddisplay",K)}}for(var H=0,F=this.length;H=0;H--){if(G[H].elem==this){if(E){G[H](true)}G.splice(H,1)}}});if(!E){this.dequeue()}return this}});o.each({slideDown:t("show",1),slideUp:t("hide",1),slideToggle:t("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(E,F){o.fn[E]=function(G,H){return this.animate(F,G,H)}});o.extend({speed:function(G,H,F){var E=typeof G==="object"?G:{complete:F||!F&&H||o.isFunction(G)&&G,duration:G,easing:F&&H||H&&!o.isFunction(H)&&H};E.duration=o.fx.off?0:typeof E.duration==="number"?E.duration:o.fx.speeds[E.duration]||o.fx.speeds._default;E.old=E.complete;E.complete=function(){if(E.queue!==false){o(this).dequeue()}if(o.isFunction(E.old)){E.old.call(this)}};return E},easing:{linear:function(G,H,E,F){return E+F*G},swing:function(G,H,E,F){return((-Math.cos(G*Math.PI)/2)+0.5)*F+E}},timers:[],fx:function(F,E,G){this.options=E;this.elem=F;this.prop=G;if(!E.orig){E.orig={}}}});o.fx.prototype={update:function(){if(this.options.step){this.options.step.call(this.elem,this.now,this)}(o.fx.step[this.prop]||o.fx.step._default)(this);if((this.prop=="height"||this.prop=="width")&&this.elem.style){this.elem.style.display="block"}},cur:function(F){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var E=parseFloat(o.css(this.elem,this.prop,F));return E&&E>-10000?E:parseFloat(o.curCSS(this.elem,this.prop))||0},custom:function(I,H,G){this.startTime=e();this.start=I;this.end=H;this.unit=G||this.unit||"px";this.now=this.start;this.pos=this.state=0;var E=this;function F(J){return E.step(J)}F.elem=this.elem;if(F()&&o.timers.push(F)&&!n){n=setInterval(function(){var K=o.timers;for(var J=0;J=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var E=true;for(var F in this.options.curAnim){if(this.options.curAnim[F]!==true){E=false}}if(E){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(o.css(this.elem,"display")=="none"){this.elem.style.display="block"}}if(this.options.hide){o(this.elem).hide()}if(this.options.hide||this.options.show){for(var I in this.options.curAnim){o.attr(this.elem.style,I,this.options.orig[I])}}this.options.complete.call(this.elem)}return false}else{var J=G-this.startTime;this.state=J/this.options.duration;this.pos=o.easing[this.options.easing||(o.easing.swing?"swing":"linear")](this.state,J,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update()}return true}};o.extend(o.fx,{speeds:{slow:600,fast:200,_default:400},step:{opacity:function(E){o.attr(E.elem.style,"opacity",E.now)},_default:function(E){if(E.elem.style&&E.elem.style[E.prop]!=null){E.elem.style[E.prop]=E.now+E.unit}else{E.elem[E.prop]=E.now}}}});if(document.documentElement.getBoundingClientRect){o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}var G=this[0].getBoundingClientRect(),J=this[0].ownerDocument,F=J.body,E=J.documentElement,L=E.clientTop||F.clientTop||0,K=E.clientLeft||F.clientLeft||0,I=G.top+(self.pageYOffset||o.boxModel&&E.scrollTop||F.scrollTop)-L,H=G.left+(self.pageXOffset||o.boxModel&&E.scrollLeft||F.scrollLeft)-K;return{top:I,left:H}}}else{o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}o.offset.initialized||o.offset.initialize();var J=this[0],G=J.offsetParent,F=J,O=J.ownerDocument,M,H=O.documentElement,K=O.body,L=O.defaultView,E=L.getComputedStyle(J,null),N=J.offsetTop,I=J.offsetLeft;while((J=J.parentNode)&&J!==K&&J!==H){M=L.getComputedStyle(J,null);N-=J.scrollTop,I-=J.scrollLeft;if(J===G){N+=J.offsetTop,I+=J.offsetLeft;if(o.offset.doesNotAddBorder&&!(o.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(J.tagName))){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}F=G,G=J.offsetParent}if(o.offset.subtractsBorderForOverflowNotVisible&&M.overflow!=="visible"){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}E=M}if(E.position==="relative"||E.position==="static"){N+=K.offsetTop,I+=K.offsetLeft}if(E.position==="fixed"){N+=Math.max(H.scrollTop,K.scrollTop),I+=Math.max(H.scrollLeft,K.scrollLeft)}return{top:N,left:I}}}o.offset={initialize:function(){if(this.initialized){return}var L=document.body,F=document.createElement("div"),H,G,N,I,M,E,J=L.style.marginTop,K='
';M={position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"};for(E in M){F.style[E]=M[E]}F.innerHTML=K;L.insertBefore(F,L.firstChild);H=F.firstChild,G=H.firstChild,I=H.nextSibling.firstChild.firstChild;this.doesNotAddBorder=(G.offsetTop!==5);this.doesAddBorderForTableAndCells=(I.offsetTop===5);H.style.overflow="hidden",H.style.position="relative";this.subtractsBorderForOverflowNotVisible=(G.offsetTop===-5);L.style.marginTop="1px";this.doesNotIncludeMarginInBodyOffset=(L.offsetTop===0);L.style.marginTop=J;L.removeChild(F);this.initialized=true},bodyOffset:function(E){o.offset.initialized||o.offset.initialize();var G=E.offsetTop,F=E.offsetLeft;if(o.offset.doesNotIncludeMarginInBodyOffset){G+=parseInt(o.curCSS(E,"marginTop",true),10)||0,F+=parseInt(o.curCSS(E,"marginLeft",true),10)||0}return{top:G,left:F}}};o.fn.extend({position:function(){var I=0,H=0,F;if(this[0]){var G=this.offsetParent(),J=this.offset(),E=/^body|html$/i.test(G[0].tagName)?{top:0,left:0}:G.offset();J.top-=j(this,"marginTop");J.left-=j(this,"marginLeft");E.top+=j(G,"borderTopWidth");E.left+=j(G,"borderLeftWidth");F={top:J.top-E.top,left:J.left-E.left}}return F},offsetParent:function(){var E=this[0].offsetParent||document.body;while(E&&(!/^body|html$/i.test(E.tagName)&&o.css(E,"position")=="static")){E=E.offsetParent}return o(E)}});o.each(["Left","Top"],function(F,E){var G="scroll"+E;o.fn[G]=function(H){if(!this[0]){return null}return H!==g?this.each(function(){this==l||this==document?l.scrollTo(!F?H:o(l).scrollLeft(),F?H:o(l).scrollTop()):this[G]=H}):this[0]==l||this[0]==document?self[F?"pageYOffset":"pageXOffset"]||o.boxModel&&document.documentElement[G]||document.body[G]:this[0][G]}});o.each(["Height","Width"],function(I,G){var E=I?"Left":"Top",H=I?"Right":"Bottom",F=G.toLowerCase();o.fn["inner"+G]=function(){return this[0]?o.css(this[0],F,false,"padding"):null};o.fn["outer"+G]=function(K){return this[0]?o.css(this[0],F,false,K?"margin":"border"):null};var J=G.toLowerCase();o.fn[J]=function(K){return this[0]==l?document.compatMode=="CSS1Compat"&&document.documentElement["client"+G]||document.body["client"+G]:this[0]==document?Math.max(document.documentElement["client"+G],document.body["scroll"+G],document.documentElement["scroll"+G],document.body["offset"+G],document.documentElement["offset"+G]):K===g?(this.length?o.css(this[0],J):null):this.css(J,typeof K==="string"?K:K+"px")}})})(); \ No newline at end of file diff --git a/IPSLibrary/webfront/NetPlayer2/mNetPlayer.css b/IPSLibrary/webfront/NetPlayer2/mNetPlayer.css new file mode 100644 index 0000000..81fc21f --- /dev/null +++ b/IPSLibrary/webfront/NetPlayer2/mNetPlayer.css @@ -0,0 +1,32 @@ +body {color:#fff;font-size:56px;font-family:arial,sans-serif;margin:0;padding:0;overflow:hidden} + +.containerPlayList{ width:100%; float:left; border: 0px solid rgba(255,255,255,0.25); overflow:auto;} +.containerCover{ width:100%; float:left; border: 0px solid rgba(255,255,255,0.25); } +.containerControl{ width:100%; float:left; border: 0px solid rgba(255,255,255,0.25); overflow:hidden; font-size:36px;} + +.containerRadioSelect{ width:100%; float:left; border: 0px solid rgba(255,255,255,0.25); overflow:hidden; font-size:36px;} +.containerRadioInfo{ width:100%; float:left; border: 0px solid rgba(255,255,255,0.25); overflow:hidden; font-size:36px;} +.containerSelection{ width:100%; float:left; border: 0px solid rgba(255,255,255,0.25); overflow:hidden; font-size:36px;} + +.containerControlLine{ display:table-row; position:relative; width:100%; vertical-align:middle; text-align:center; float:left; } +.containerControlLine100{ display:table-row; position:relative; width:100%; padding:0; margin:3px 0; border:0; float:left} +.containerControlLine50{ display:table-row; position:relative; width:50%; padding:0; margin:3px 0; border:0; float:left } +.containerControlLineBottom{ display:table-row; position:relative; width:100%; vertical-align:middle; text-align:center; float:left; } +.containerControlLineTop{ display:table-row; position:relative; width:100%; vertical-align:middle; text-align:center; float:left; } +.containerControlLineSeparator{ display:table-row; position:relative; width:100%; vertical-align:middle; text-align:center; float:left; margin:15px 0 15px 0; border-width:1px 0px; border-style:solid; border-color:#617285; border-color:white; } + +.containerControlButton{ display:table-cell; width:100%; + line-height:100px; height:100px; background-color:rgba(255,255,255,0.1); color:rgba(255,255,255,0.3); + position:relative; vertical-align:middle; text-align:center; + border-width: 0px; border-style:solid; border-color:transparent; float:left; + background-image:url(http://localhost:7001/img/bg.png); background-repeat:repeat; background-position:center top;} +.containerControlButtonSelected{ background-color:rgba(255,255,255,0.3); color:white; } +.containerControlButtonActive{ background-color:rgba(255,255,255,0.3); color:white; } +.containerControlDescr{display:inline-block; font-size:36px; color:white; line-height:60px; border-width: 0 0 0 0; height:60px; width:300px; text-align:right; float:left; padding: 0 10px; margin: 3px 0 0 3px;} +.containerControlData{display:inline-block; font-size:36px; color:white; line-height:60px; border-width: 0 0 0 0; height:60px; width:600px; text-align:left; float:left; padding: 0 10px; margin: 3px 0 0 3px; overflow:hidden} +.containerControlSelect{display:table-row; height:100px; width:100%; background-image:url(http://localhost:7001/img/bg.png)} +.containerControlTrack{display:inline-block; color:white; border-width:0; text-align:left; float:left; padding:0; padding:0px 10px ; margin: 3px; overflow:hidden; font-size:24px;font-family:arial,sans-serif;} +.containerControlTrackActive{font-size:28px;font-family:arial,sans-serif; background:rgba(255,255,255,0.3); width:100%;} +.containerControlSelectInterpret{font:bold 32px verdana; height:50px; line-height:50px; overflow:hidden;} +.containerControlSelectAlbum{font:normal 24px verdana; height:50px; line-height:50px; overflow:hidden;} + diff --git a/README b/README index 60b71c3..de4a33c 100644 --- a/README +++ b/README @@ -10,3 +10,14 @@ Find support and lots more on [www.ip-symcon.de] (http://www.ip-symcon.de/forum/ [GNU General Public License v3] (http://www.gnu.org/licenses/gpl.txt.) +## Important Note About Licensing for Highcharts + +Highcharts is licensed by Highsoft Solutions AS and can be obtained here: + +[http://www.highcharts.com/products/highcharts] (http://www.highcharts.com/products/highcharts). + +Highcharts is licensed for free for any personal or non-profit projects under the [Creative Commons Attribution-NonCommercial +3.0 License] (http://creativecommons.org/licenses/by-nc/3.0/). + +[See the license and pricing details directly on the Highcharts.com site for more details.] (http://www.highcharts.com/license) + diff --git a/tools/net/IPSTools/IPSTools.suo b/tools/net/IPSTools/IPSTools.suo index 56d672e..e747a0a 100644 Binary files a/tools/net/IPSTools/IPSTools.suo and b/tools/net/IPSTools/IPSTools.suo differ diff --git a/tools/net/IPSTools/IPSTools/IPSTools.cs b/tools/net/IPSTools/IPSTools/IPSTools.cs index 4cdb3d0..caa516a 100644 --- a/tools/net/IPSTools/IPSTools/IPSTools.cs +++ b/tools/net/IPSTools/IPSTools/IPSTools.cs @@ -37,7 +37,7 @@ public partial class IPSTools : Form public IPSTools() { InitializeComponent(); - tcpServer = new TcpServer((int)tcpPort.Value, this.Handle, this.notifyIcon); + tcpServer = new TcpServer((int)tcpPort.Value, this.Handle); tcpServer.AutoSendInterval = (int)autoSendInterval.Value; tcpServer.AutoSendIdle = autoSendIdle.Checked; if (checkBox_AutoStart.Checked) diff --git a/tools/net/IPSTools/IPSTools/bin/Debug/IPSToolLibrary.dll b/tools/net/IPSTools/IPSTools/bin/Debug/IPSToolLibrary.dll index 3954896..7b2a29e 100644 Binary files a/tools/net/IPSTools/IPSTools/bin/Debug/IPSToolLibrary.dll and b/tools/net/IPSTools/IPSTools/bin/Debug/IPSToolLibrary.dll differ diff --git a/tools/net/IPSTools/IPSTools/bin/Debug/IPSToolLibrary.pdb b/tools/net/IPSTools/IPSTools/bin/Debug/IPSToolLibrary.pdb index 873bfe3..ad6edaa 100644 Binary files a/tools/net/IPSTools/IPSTools/bin/Debug/IPSToolLibrary.pdb and b/tools/net/IPSTools/IPSTools/bin/Debug/IPSToolLibrary.pdb differ diff --git a/tools/net/IPSTools/IPSTools/bin/Debug/IPSTools.exe b/tools/net/IPSTools/IPSTools/bin/Debug/IPSTools.exe index ee91d88..84a9dd5 100644 Binary files a/tools/net/IPSTools/IPSTools/bin/Debug/IPSTools.exe and b/tools/net/IPSTools/IPSTools/bin/Debug/IPSTools.exe differ diff --git a/tools/net/IPSTools/IPSTools/bin/Debug/IPSTools.pdb b/tools/net/IPSTools/IPSTools/bin/Debug/IPSTools.pdb index 8855620..9212c11 100644 Binary files a/tools/net/IPSTools/IPSTools/bin/Debug/IPSTools.pdb and b/tools/net/IPSTools/IPSTools/bin/Debug/IPSTools.pdb differ diff --git a/tools/net/IPSTools/IPSTools/bin/Debug/ccmperf.log b/tools/net/IPSTools/IPSTools/bin/Debug/ccmperf.log new file mode 100644 index 0000000..31a50c9 --- /dev/null +++ b/tools/net/IPSTools/IPSTools/bin/Debug/ccmperf.log @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/tools/net/IPSTools/IPSTools/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/tools/net/IPSTools/IPSTools/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 5adc75c..075f1a8 100644 Binary files a/tools/net/IPSTools/IPSTools/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/tools/net/IPSTools/IPSTools/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/tools/net/IPSTools/IPSTools/obj/x86/Debug/GenerateResource.read.1.tlog b/tools/net/IPSTools/IPSTools/obj/x86/Debug/GenerateResource.read.1.tlog index 2758866..3524541 100644 Binary files a/tools/net/IPSTools/IPSTools/obj/x86/Debug/GenerateResource.read.1.tlog and b/tools/net/IPSTools/IPSTools/obj/x86/Debug/GenerateResource.read.1.tlog differ diff --git a/tools/net/IPSTools/IPSTools/obj/x86/Debug/GenerateResource.write.1.tlog b/tools/net/IPSTools/IPSTools/obj/x86/Debug/GenerateResource.write.1.tlog index 57fcdc4..1ffffc9 100644 Binary files a/tools/net/IPSTools/IPSTools/obj/x86/Debug/GenerateResource.write.1.tlog and b/tools/net/IPSTools/IPSTools/obj/x86/Debug/GenerateResource.write.1.tlog differ diff --git a/tools/net/IPSTools/IPSTools/obj/x86/Debug/IPSTools.csproj.FileListAbsolute.txt b/tools/net/IPSTools/IPSTools/obj/x86/Debug/IPSTools.csproj.FileListAbsolute.txt index dd73101..219481e 100644 --- a/tools/net/IPSTools/IPSTools/obj/x86/Debug/IPSTools.csproj.FileListAbsolute.txt +++ b/tools/net/IPSTools/IPSTools/obj/x86/Debug/IPSTools.csproj.FileListAbsolute.txt @@ -46,3 +46,15 @@ C:\ab\IPS\Projects.Net\_Development\IP-SymconTools\IPSTools\obj\x86\Debug\Browns C:\ab\IPS\Projects.Net\_Development\IP-SymconTools\IPSTools\obj\x86\Debug\IPSTool.Properties.Resources.resources C:\ab\IPS\Projects.Net\_Development\IP-SymconTools\IPSTools\obj\x86\Debug\GenerateResource.read.1.tlog C:\ab\IPS\Projects.Net\_Development\IP-SymconTools\IPSTools\obj\x86\Debug\GenerateResource.write.1.tlog +C:\ab\IPS\GIT\IPSLibrary\tools\net\IPSTools\IPSTools\bin\Debug\IPSTools.exe.config +C:\ab\IPS\GIT\IPSLibrary\tools\net\IPSTools\IPSTools\obj\x86\Debug\IPSTools.exe +C:\ab\IPS\GIT\IPSLibrary\tools\net\IPSTools\IPSTools\obj\x86\Debug\IPSTools.pdb +C:\ab\IPS\GIT\IPSLibrary\tools\net\IPSTools\IPSTools\obj\x86\Debug\ResolveAssemblyReference.cache +C:\ab\IPS\GIT\IPSLibrary\tools\net\IPSTools\IPSTools\obj\x86\Debug\BrownsonTool.IPSTools.resources +C:\ab\IPS\GIT\IPSLibrary\tools\net\IPSTools\IPSTools\obj\x86\Debug\IPSTool.Properties.Resources.resources +C:\ab\IPS\GIT\IPSLibrary\tools\net\IPSTools\IPSTools\obj\x86\Debug\GenerateResource.read.1.tlog +C:\ab\IPS\GIT\IPSLibrary\tools\net\IPSTools\IPSTools\obj\x86\Debug\GenerateResource.write.1.tlog +C:\ab\IPS\GIT\IPSLibrary\tools\net\IPSTools\IPSTools\bin\Debug\IPSTools.exe +C:\ab\IPS\GIT\IPSLibrary\tools\net\IPSTools\IPSTools\bin\Debug\IPSTools.pdb +C:\ab\IPS\GIT\IPSLibrary\tools\net\IPSTools\IPSTools\bin\Debug\IPSToolLibrary.dll +C:\ab\IPS\GIT\IPSLibrary\tools\net\IPSTools\IPSTools\bin\Debug\IPSToolLibrary.pdb diff --git a/tools/net/IPSTools/IPSTools/obj/x86/Debug/IPSTools.exe b/tools/net/IPSTools/IPSTools/obj/x86/Debug/IPSTools.exe index ee91d88..84a9dd5 100644 Binary files a/tools/net/IPSTools/IPSTools/obj/x86/Debug/IPSTools.exe and b/tools/net/IPSTools/IPSTools/obj/x86/Debug/IPSTools.exe differ diff --git a/tools/net/IPSTools/IPSTools/obj/x86/Debug/IPSTools.pdb b/tools/net/IPSTools/IPSTools/obj/x86/Debug/IPSTools.pdb index 8855620..9212c11 100644 Binary files a/tools/net/IPSTools/IPSTools/obj/x86/Debug/IPSTools.pdb and b/tools/net/IPSTools/IPSTools/obj/x86/Debug/IPSTools.pdb differ diff --git a/tools/net/IPSTools/IPSTools/obj/x86/Debug/ResolveAssemblyReference.cache b/tools/net/IPSTools/IPSTools/obj/x86/Debug/ResolveAssemblyReference.cache index ff0f775..3260c53 100644 Binary files a/tools/net/IPSTools/IPSTools/obj/x86/Debug/ResolveAssemblyReference.cache and b/tools/net/IPSTools/IPSTools/obj/x86/Debug/ResolveAssemblyReference.cache differ diff --git a/tools/net/IPSTools/IPSToolsLibrary/MonitorUtils.cs b/tools/net/IPSTools/IPSToolsLibrary/MonitorUtils.cs index a58e26a..cf1504e 100644 --- a/tools/net/IPSTools/IPSToolsLibrary/MonitorUtils.cs +++ b/tools/net/IPSTools/IPSToolsLibrary/MonitorUtils.cs @@ -1,21 +1,4 @@ -/** - * This file is part of the IPSLibrary. - * - * The IPSLibrary is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * The IPSLibrary is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with the IPSLibrary. If not, see http://www.gnu.org/licenses/gpl.txt. - */ - -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -39,6 +22,31 @@ class MonitorUtils [DllImport("user32.dll")] private static extern int ShowWindow(int hwnd, int command); + + + [DllImport("user32.dll")] + private static extern bool SystemParametersInfo(int uAction, int uParam, ref bool lpvParam, int flags); + + [DllImport("user32.dll")] + private static extern IntPtr OpenDesktop(string hDesktop, int Flags, bool Inherit, uint DesiredAccess); + + [DllImport("user32.dll")] + private static extern bool CloseDesktop(IntPtr hDesktop); + + [DllImport("user32.dll")] + private static extern bool EnumDesktopWindows(IntPtr hDesktop, EnumDesktopWindowsProc callback, IntPtr lParam); + + [DllImport("user32.dll")] + private static extern bool IsWindowVisible(IntPtr hWnd); + + [DllImport("user32.dll")] + private static extern IntPtr GetForegroundWindow(); + + [DllImport("user32.dll")] + private static extern int PostMessage(IntPtr hWnd, int wMsg, int wParam, int lParam); + + private delegate bool EnumDesktopWindowsProc(IntPtr hDesktop, IntPtr lParam); + private const int WM_SYSCOMMAND = 0x0112; private const int SC_SCREENSAVER = 0xF140; @@ -51,6 +59,12 @@ class MonitorUtils private const int TASKBAR_HIDE = 0; private const int TASKBAR_SHOW = 1; + private const int SPI_GETSCREENSAVERRUNNING = 114; + private const uint DESKTOP_WRITEOBJECTS = 0x0080; + private const uint DESKTOP_READOBJECTS = 0x0001; + private const int WM_CLOSE = 16; + + private IntPtr handle; public MonitorUtils(IntPtr gui) @@ -63,33 +77,42 @@ public void StartScreenSaver() SendMessage(GetDesktopWindow(), WM_SYSCOMMAND, SC_SCREENSAVER, 0); } - public void ScreenPowerOff() + public void StopScreenSaver() { - SendMessage(handle, WM_SYSCOMMAND, SC_MONITORPOWER, MONITOR_OFF); - } - - public void ScreenPowerOn() - { - SendMessage(handle, WM_SYSCOMMAND, SC_MONITORPOWER, MONITOR_ON); - } - - public void WindowsTaskBarVisible(bool isVisible) - { - //try - //{ - int hWnd = FindWindow("Shell_traywnd", ""); - if (isVisible) + bool isActive = false; + SystemParametersInfo(SPI_GETSCREENSAVERRUNNING, 0, ref isActive, 0); + if (isActive) + { + IntPtr hDesktop = OpenDesktop("Screen-saver", 0, false, DESKTOP_READOBJECTS | DESKTOP_WRITEOBJECTS); + if (hDesktop != IntPtr.Zero) { - ShowWindow(hWnd, TASKBAR_SHOW); + EnumDesktopWindows(hDesktop, new EnumDesktopWindowsProc(KillScreenSaverFunc), IntPtr.Zero); + CloseDesktop(hDesktop); + } else { - ShowWindow(hWnd, TASKBAR_HIDE); + PostMessage(GetForegroundWindow(), WM_CLOSE, 0, 0); + } - //} - //catch (Win32Exception ex) { } + } + } + private static bool KillScreenSaverFunc(IntPtr hWnd, IntPtr lParam) + { + if (IsWindowVisible(hWnd)) PostMessage(hWnd, WM_CLOSE, 0, 0); + return true; + } + + + public void ScreenPowerOff() + { + SendMessage(handle, WM_SYSCOMMAND, SC_MONITORPOWER, MONITOR_OFF); } + public void ScreenPowerOn() + { + SendMessage(handle, WM_SYSCOMMAND, SC_MONITORPOWER, MONITOR_ON); + } } } diff --git a/tools/net/IPSTools/IPSToolsLibrary/MouseUtils.cs b/tools/net/IPSTools/IPSToolsLibrary/MouseUtils.cs index a598f55..02d5fac 100644 --- a/tools/net/IPSTools/IPSToolsLibrary/MouseUtils.cs +++ b/tools/net/IPSTools/IPSToolsLibrary/MouseUtils.cs @@ -65,6 +65,11 @@ public static Point GetMousePosition() return Cursor.Position; } + public static void SetMousePosition(int x, int y) + { + Cursor.Position = new Point(x, y); + } + public int GetMouseIdleSince() { return mouseIdleSince; diff --git a/tools/net/IPSTools/IPSToolsLibrary/TcpServer.cs b/tools/net/IPSTools/IPSToolsLibrary/TcpServer.cs index 7d29c33..8ae9f5e 100644 --- a/tools/net/IPSTools/IPSToolsLibrary/TcpServer.cs +++ b/tools/net/IPSTools/IPSToolsLibrary/TcpServer.cs @@ -1,21 +1,4 @@ -/** - * This file is part of the IPSLibrary. - * - * The IPSLibrary is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * The IPSLibrary is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with the IPSLibrary. If not, see http://www.gnu.org/licenses/gpl.txt. - */ - -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -26,6 +9,7 @@ using System.Windows.Forms; using System.Diagnostics; + namespace IPSToolLibrary { @@ -41,7 +25,6 @@ public class TcpServer private int tcpPort; private IntPtr guiHandle; - private NotifyIcon notifyIcon; private System.Windows.Forms.Timer autoSendTimer; private int autoSendInterval; @@ -52,11 +35,10 @@ public int AutoSendInterval set { this.autoSendInterval = value; if (autoSendTimer != null) autoSendTimer.Interval = AutoSendInterval; } } - public TcpServer(int port, IntPtr guiHandle, NotifyIcon notifyIcon) + public TcpServer(int port, IntPtr guiHandle) { this.tcpPort = port; this.guiHandle = guiHandle; - this.notifyIcon = notifyIcon; this.clients = new List(); this.mouseUtils = new MouseUtils(); this.monitorUtils = new MonitorUtils(guiHandle); @@ -69,6 +51,9 @@ public TcpServer(int port, IntPtr guiHandle, NotifyIcon notifyIcon) autoSendTimer.Enabled = true; } + public TcpServer(IntPtr guiHandle) : this(0, guiHandle) { } + + public int GetPort() { return tcpPort; @@ -198,18 +183,18 @@ private void HandleClientComm(object client) case "GetMousePosition": outputString = string.Format("MousePosition;{0};{1}", MouseUtils.GetMousePosition().X.ToString(), MouseUtils.GetMousePosition().Y.ToString()); break; + case "SetMousePosition": + MouseUtils.SetMousePosition(int.Parse(inputParams[1]), int.Parse(inputParams[2])); + break; case "GetMouseIdleSince": outputString = string.Format("MouseIdleSince;{0}", mouseUtils.GetMouseIdleSince()); break; - case "CursorShow": - MouseUtils.SetCursorVisible(true); - break; - case "CursorHide": - MouseUtils.SetCursorVisible(false); - break; case "StartScreenSaver": monitorUtils.StartScreenSaver(); break; + case "StopScreenSaver": + monitorUtils.StopScreenSaver(); + break; case "ScreenPowerOff": monitorUtils.ScreenPowerOff(); break; @@ -247,15 +232,10 @@ private void HandleClientComm(object client) Process.Start(inputParams[1], inputParams[2]); outputString = string.Format("{0};{1};{2}", inputParams[0], inputParams[1], inputParams[2]); break; - case "NotifyInfo": - notifyIcon.ShowBalloonTip(int.Parse(inputParams[1]), inputParams[2], inputParams[3],ToolTipIcon.Info); - break; case "TaskBarHide": - //monitorUtils.WindowsTaskBarVisible(false); Taskbar.Hide(); break; case "TaskBarShow": - //monitorUtils.WindowsTaskBarVisible(true); Taskbar.Show(); break; default: diff --git a/tools/net/IPSTools/IPSToolsLibrary/bin/Debug/IPSToolLibrary.dll b/tools/net/IPSTools/IPSToolsLibrary/bin/Debug/IPSToolLibrary.dll index 3954896..7b2a29e 100644 Binary files a/tools/net/IPSTools/IPSToolsLibrary/bin/Debug/IPSToolLibrary.dll and b/tools/net/IPSTools/IPSToolsLibrary/bin/Debug/IPSToolLibrary.dll differ diff --git a/tools/net/IPSTools/IPSToolsLibrary/bin/Debug/IPSToolLibrary.pdb b/tools/net/IPSTools/IPSToolsLibrary/bin/Debug/IPSToolLibrary.pdb index 873bfe3..ad6edaa 100644 Binary files a/tools/net/IPSTools/IPSToolsLibrary/bin/Debug/IPSToolLibrary.pdb and b/tools/net/IPSTools/IPSToolsLibrary/bin/Debug/IPSToolLibrary.pdb differ diff --git a/tools/net/IPSTools/IPSToolsLibrary/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/tools/net/IPSTools/IPSToolsLibrary/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 479265f..09ae317 100644 Binary files a/tools/net/IPSTools/IPSToolsLibrary/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/tools/net/IPSTools/IPSToolsLibrary/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/tools/net/IPSTools/IPSToolsLibrary/obj/Debug/IPSToolLibrary.dll b/tools/net/IPSTools/IPSToolsLibrary/obj/Debug/IPSToolLibrary.dll index 3954896..7b2a29e 100644 Binary files a/tools/net/IPSTools/IPSToolsLibrary/obj/Debug/IPSToolLibrary.dll and b/tools/net/IPSTools/IPSToolsLibrary/obj/Debug/IPSToolLibrary.dll differ diff --git a/tools/net/IPSTools/IPSToolsLibrary/obj/Debug/IPSToolLibrary.pdb b/tools/net/IPSTools/IPSToolsLibrary/obj/Debug/IPSToolLibrary.pdb index 873bfe3..ad6edaa 100644 Binary files a/tools/net/IPSTools/IPSToolsLibrary/obj/Debug/IPSToolLibrary.pdb and b/tools/net/IPSTools/IPSToolsLibrary/obj/Debug/IPSToolLibrary.pdb differ diff --git a/tools/net/IPSTools/IPSToolsLibrary/obj/Debug/IPSToolsLibrary.csproj.FileListAbsolute.txt b/tools/net/IPSTools/IPSToolsLibrary/obj/Debug/IPSToolsLibrary.csproj.FileListAbsolute.txt index 9fbbaf6..bc6f4cc 100644 --- a/tools/net/IPSTools/IPSToolsLibrary/obj/Debug/IPSToolsLibrary.csproj.FileListAbsolute.txt +++ b/tools/net/IPSTools/IPSToolsLibrary/obj/Debug/IPSToolsLibrary.csproj.FileListAbsolute.txt @@ -18,3 +18,8 @@ C:\ab\IPS\Projects.Net\_Development\IP-SymconTools\IPSToolsLibrary\bin\Debug\IPS C:\ab\IPS\Projects.Net\_Development\IP-SymconTools\IPSToolsLibrary\obj\Debug\ResolveAssemblyReference.cache C:\ab\IPS\Projects.Net\_Development\IP-SymconTools\IPSToolsLibrary\obj\Debug\IPSToolLibrary.dll C:\ab\IPS\Projects.Net\_Development\IP-SymconTools\IPSToolsLibrary\obj\Debug\IPSToolLibrary.pdb +C:\ab\IPS\GIT\IPSLibrary\tools\net\IPSTools\IPSToolsLibrary\bin\Debug\IPSToolLibrary.dll +C:\ab\IPS\GIT\IPSLibrary\tools\net\IPSTools\IPSToolsLibrary\bin\Debug\IPSToolLibrary.pdb +C:\ab\IPS\GIT\IPSLibrary\tools\net\IPSTools\IPSToolsLibrary\obj\Debug\ResolveAssemblyReference.cache +C:\ab\IPS\GIT\IPSLibrary\tools\net\IPSTools\IPSToolsLibrary\obj\Debug\IPSToolLibrary.dll +C:\ab\IPS\GIT\IPSLibrary\tools\net\IPSTools\IPSToolsLibrary\obj\Debug\IPSToolLibrary.pdb