Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/testing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.9", "3.10", "3.11"]
python-version: ["3.10", "3.11"]

steps:
- uses: actions/checkout@v3
Expand All @@ -20,13 +20,13 @@ jobs:
run: |
python -m pip install --upgrade pip
pip install flake8 pytest
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
pip install -e .
- name: Lint with flake8
run: |
# stop the build if there are Python syntax errors or undefined names
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
#- name: Test with pytest
# run: |
# pytest tests/tests
- name: Test with pytest
run: |
pytest tests/test_telops.py
1 change: 1 addition & 0 deletions LDAQ/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@
from . import dewesoft
from . import serial_communication
from . import simulator
from . import telops

3 changes: 3 additions & 0 deletions LDAQ/telops/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from .acquisition import TelopsCamera

_DOC_TelopsCamera = TelopsCamera.__doc__
375 changes: 375 additions & 0 deletions LDAQ/telops/acquisition.py

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ Key Features:

- FLIR Cameras

- Telops Cameras

- Simulated hardware

- 📊 **Advanced Data Visualization & Analysis**: LDAQ doesn’t just collect data; it helps you understand it. With built-in features like real-time signal visualization and Fast Fourier Transform (FFT) analysis, you can dive deep into your data for more insightful discoveries.
Expand Down Expand Up @@ -155,5 +157,5 @@ What else can I do with LDAQ?
- Apply functions to measured data in real-time visualization (see `visualization <https://ldaq.readthedocs.io/en/latest/visualization.html>`_).
- Add multiple acquisition and signal generation objects to ``LDAQ.Core`` (see `multiple sources <https://ldaq.readthedocs.io/en/latest/multiple_sources.html>`_).
- Define a NI Task in your program and use it with ``LDAQ`` (see `NI Task <https://ldaq.readthedocs.io/en/latest/ni_task.html>`_).
- Currently the package supports a limited set of devices from National Instruments, Digilent, FLIR, Basler and devices using serial communication (see `supported devices <https://ldaq.readthedocs.io/en/latest/supported_devices.html>`_).
- Currently the package supports a limited set of devices from National Instruments, Digilent, FLIR, Basler, Telops and devices using serial communication (see `supported devices <https://ldaq.readthedocs.io/en/latest/supported_devices.html>`_).
- Create your own acquisition class by overriding just few methods (see `custom acquisition <https://ldaq.readthedocs.io/en/latest/custom_acquisitions_and_generations.html>`_).
5 changes: 4 additions & 1 deletion docs/source/code.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Overview

This section provides comprehensive documentation for the LDAQ code, designed to facilitate data acquisition, generation, and visualization across a variety of hardware platforms. The documentation is organized into several key sections, each focusing on a specific aspect of the LDAQ system.

The "Acquisition" section introduces the base acquisition class along with hardware-specific acquisition classes, detailing the methods and properties associated with data acquisition from various devices. These devices range from simulated environments and serial communications to specific hardware integrations like National Instruments, Digilent, FLIR thermal cameras, and Basler cameras.
The "Acquisition" section introduces the base acquisition class along with hardware-specific acquisition classes, detailing the methods and properties associated with data acquisition from various devices. These devices range from simulated environments and serial communications to specific hardware integrations like National Instruments, Digilent, FLIR thermal cameras, Basler cameras, and Telops thermal cameras.

In the "Generation" section, the focus shifts to data generation. Here, the base generation class and various hardware-specific generation classes are documented, providing insights into how data can be generated and manipulated within the LDAQ framework.

Expand Down Expand Up @@ -48,6 +48,9 @@ Hardware-Specific Acqusition Classes
.. autoclass:: LDAQ.basler.BaslerCamera
:members:

.. autoclass:: LDAQ.telops.TelopsCamera
:members:

Generation
----------

Expand Down
6 changes: 6 additions & 0 deletions docs/source/supported_devices.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ Acqusition

- :class:`LDAQ.basler.BaslerCamera`: Based on pyPylon, any Basler Camera should work.

- :class:`LDAQ.telops.TelopsCamera`: Based on pyTelops (pure-Python GigE Vision, no vendor SDK), tested with Telops FAST M3k MWIR. Install the optional dependencies with ``pip install LDAQ[telops]`` (or install the underlying driver directly with ``pip install pyTelops``).

- :class:`LDAQ.simulator.SimulatedAcquisition`: Used to test the GUI without any hardware connected. Alternatively it can be used to track memory, CPU and disk usage.


Expand Down Expand Up @@ -41,5 +43,9 @@ Hardware-Specific Installation Instructions
:annotation:
:noindex:

.. autodata:: LDAQ.telops.TelopsCamera
:annotation:
:noindex:



328 changes: 328 additions & 0 deletions examples/013_acquisition_Telops_synchronized.ipynb

Large diffs are not rendered by default.

Loading