Merge pull request #13 from burrscurr/master

Implement calls for zooming and focusing

Author: Alano Terblanche

Pipfile

@@ -9,5 +9,8 @@ verify_ssl = true
 pillow = "*"
 pyyaml = "*"
 requests = "*"
+numpy = "*"
+opencv-python = "*"
+pysocks = "*"
 
 [requires]

Pipfile.lock

@@ -73,7 +73,7 @@ SET:
 - [ ] User -> Add User
 - [ ] User -> Manage User
 - [ ] Device -> HDD/SD Card
-- [ ] Zoom
-- [ ] Focus
+- [x] Zoom
+- [x] Focus
 - [ ] Image (Brightness, Contrass, Saturation, Hue, Sharp, Mirror, Rotate)
 - [ ] Advanced Image (Anti-flicker, Exposure, White Balance, DayNight, Backlight, LED light, 3D-NR)

README.md

@@ -1,4 +1,5 @@
-from api.recording import RecordingAPIMixin
+from .recording import RecordingAPIMixin
+from .zoom import ZoomAPIMixin
 from .device import DeviceAPIMixin
 from .display import DisplayAPIMixin
 from .network import NetworkAPIMixin
@@ -12,7 +13,8 @@ class APIHandler(SystemAPIMixin,
                  UserAPIMixin,
                  DeviceAPIMixin,
                  DisplayAPIMixin,
-                 RecordingAPIMixin):
+                 RecordingAPIMixin,
+                 ZoomAPIMixin):
     """
     The APIHandler class is the backend part of the API, the actual API calls
     are implemented in Mixins.

api/APIHandler.py

@@ -0,0 +1,56 @@
+class ZoomAPIMixin:
+    """
+    API for zooming and changing focus.
+    Note that the API does not allow zooming/focusing by absolute
+    values rather that changing focus/zoom for a given time.
+    """
+    def _start_operation(self, operation, speed):
+        data = [{"cmd": "PtzCtrl", "action": 0, "param": {"channel": 0, "op": operation, "speed": speed}}]
+        return self._execute_command('PtzCtrl', data)
+
+    def _stop_zooming_or_focusing(self):
+        """This command stops any ongoing zooming or focusing actions."""
+        data = [{"cmd": "PtzCtrl", "action": 0, "param": {"channel": 0, "op": "Stop"}}]
+        return self._execute_command('PtzCtrl', data)
+
+    def start_zooming_in(self, speed=60):
+        """
+        The camera zooms in until self.stop_zooming() is called.
+        :return: response json
+        """
+        return self._start_operation('ZoomInc', speed=speed)
+
+    def start_zooming_out(self, speed=60):
+        """
+        The camera zooms out until self.stop_zooming() is called.
+        :return: response json
+        """
+        return self._start_operation('ZoomDec', speed=speed)
+
+    def stop_zooming(self):
+        """
+        Stop zooming.
+        :return: response json
+        """
+        return self._stop_zooming_or_focusing()
+
+    def start_focusing_in(self, speed=32):
+        """
+        The camera focuses in until self.stop_focusing() is called.
+        :return: response json
+        """
+        return self._start_operation('FocusInc', speed=speed)
+
+    def start_focusing_out(self, speed=32):
+        """
+        The camera focuses out until self.stop_focusing() is called.
+        :return: response json
+        """
+        return self._start_operation('FocusDec', speed=speed)
+
+    def stop_focusing(self):
+        """
+        Stop focusing.
+        :return: response json
+        """
+        return self._stop_zooming_or_focusing()