v0.14.1

version 0.14.1

Author: thusser

.github/workflows/pypi.yml

@@ -0,0 +1,25 @@
+name: Publish package to PyPI
+on:
+  push:
+    tags:
+    - 'v*'
+jobs:
+  build-n-publish:
+    name: Build and publish package to PyPI
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python
+        uses: actions/setup-python@v1
+        with:
+          python-version: "3.7"
+      - name: Install poetry
+        run: |
+          curl -fsS -o get-poetry.py https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py
+          python get-poetry.py -y
+      - name: Publish
+        env:
+          PYPI_TOKEN: ${{ secrets.pypi_password }}
+        run: |
+          $HOME/.poetry/bin/poetry config pypi-token.pypi $PYPI_TOKEN
+          $HOME/.poetry/bin/poetry publish --build

README.md

@@ -24,4 +24,5 @@ Dependencies
 * **pyobs** for the core funcionality. It is not included in the *requirements.txt*, so needs to be installed 
   separately.
 * [Aravis](https://github.com/AravisProject/aravis) for accessing the camera.
+* [python-aravis](https://github.com/SintefManufacturing/python-aravis) as an easy-to-use interface.
 

pyobs_aravis/araviscamera.py

@@ -1,4 +1,5 @@
 import logging
+import threading
 import time
 from typing import Any, Dict, Optional, List
 
@@ -27,6 +28,7 @@ def __init__(self, device: str, settings: Optional[Dict[str, Any]] = None, **kwa
         self._device_name = device
         self._camera: Optional[aravis.Camera] = None
         self._settings: Dict[str, Any] = {} if settings is None else settings
+        self._camera_lock = threading.Lock()
 
         # thread
         if device is not None:
@@ -36,11 +38,25 @@ def __init__(self, device: str, settings: Optional[Dict[str, Any]] = None, **kwa
 
     def open(self) -> None:
         """Open module."""
+        BaseVideo.open(self)
+
         # list devices
         ids = aravis.get_device_ids()
         if self._device_name not in ids:
             raise ValueError('Could not find given device name in list of available cameras.')
 
+        # open camera
+        self.activate_camera()
+
+    def close(self) -> None:
+        """Close the module."""
+        BaseVideo.close(self)
+        with self._camera_lock:
+            self._close_camera()
+
+    def _open_camera(self) -> None:
+        """Open camera."""
+
         # open camera
         log.info('Connecting to camera %s...', self._device_name)
         self._camera = aravis.Camera(self._device_name)
@@ -51,32 +67,47 @@ def open(self) -> None:
             log.info(f'Setting value {key}={value}...')
             self._camera.set_feature(key, value)
 
-        # open base
-        BaseVideo.open(self)
-
-    def close(self) -> None:
-        """Close the module."""
-        BaseVideo.close(self)
+        # start acquisition
+        self._camera.start_acquisition_continuous(nb_buffers=5)
 
+    def _close_camera(self) -> None:
+        """Close camera."""
         # stop camera
         if self._camera is not None:
+            log.info('Closing camera...')
             self._camera.stop_acquisition()
             self._camera.shutdown()
+        self._camera = None
+
+    def _activate_camera(self) -> None:
+        """Can be overridden by derived class to implement inactivity sleep"""
+        with self._camera_lock:
+            self._open_camera()
+
+    def _deactivate_camera(self) -> None:
+        """Can be overridden by derived class to implement inactivity sleep"""
+        with self._camera_lock:
+            self._close_camera()
 
     def _capture(self) -> None:
-        # start acquisition
-        self._camera.start_acquisition_continuous(nb_buffers=5)
+        """Take new images in loop."""
 
         # loop until closing
         last = time.time()
         while not self.closing.is_set():
-            # read frame
-            frame = self._camera.pop_frame()
+            # no camera or not active?
+            if self._camera is None or not self.camera_active:
+                # wait a little
+                self.closing.wait(0.1)
+                continue
 
             # if time since last image is too short, wait a little
             if time.time() - last < self._interval:
                 self.closing.wait(0.01)
                 continue
+
+            # read frame
+            frame = self._camera.pop_frame()
             last = time.time()
 
             # process it
@@ -91,6 +122,7 @@ def set_exposure_time(self, exposure_time: float, **kwargs: Any) -> None:
         Raises:
             ValueError: If exposure time could not be set.
         """
+        self.activate_camera()
         self._camera.set_exposure_time(exposure_time * 1e6)
 
     def get_exposure_time(self, **kwargs: Any) -> float:
@@ -99,6 +131,7 @@ def get_exposure_time(self, **kwargs: Any) -> float:
         Returns:
             Exposure time in seconds.
         """
+        self.activate_camera()
         return self._camera.get_exposure_time() / 1e6
 
 

pyproject.toml

@@ -0,0 +1,17 @@
+[tool.poetry]
+name = "pyobs-aravis"
+version = "0.14.1"
+description = "pyobs module for Aravis cameras"
+authors = ["Tim-Oliver Husser <[email protected]>"]
+license = "MIT"
+
+[tool.poetry.dependencies]
+python = ">=3.7,<3.11"
+numpy = "^1.21"
+PyGObject = "^3.42"
+
+[tool.poetry.dev-dependencies]
+
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"