From 8c8c62ca33e9780e5c1ab70eee2eaa0fe83b52b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Weber?= Date: Mon, 24 Feb 2025 15:14:28 +0100 Subject: [PATCH] update instr --- README.md | 72 +++++++++++++------------- doc/PluginList.md | 72 +++++++++++++------------- src/pymodaq_plugin_manager/validate.py | 12 ++--- 3 files changed, 77 insertions(+), 79 deletions(-) diff --git a/README.md b/README.md index bf7754e..7ba9833 100644 --- a/README.md +++ b/README.md @@ -10,39 +10,39 @@ A plugin manager for PyMoDAQ, Modular Data Acquisition with Python. Give a list of available, installable or updatable plugins compatible with pymodaq # PyMoDAQ Plugins -| Repo Name | Version plugin | Instruments | -| ------------------------------------------------------------------------------------------------------------------ | -------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Alcatel | 1.1.0 | Viewer0D | -| Amplitude | 0.1.1 | Viewer0D | -| Arduino | 0.0.4 | Actuators | -| Basler | 0.1.1 | Viewer2D | -| Bnc | 0.0.6 | Actuators | -| Crystal_technology | 0.0.1 | Actuators | -| Femto | 0.1.0 | Viewer1D | -| Flim | 0.1.0 | ViewerND | -| Greateyes | 1.0.2 | Viewer2D | -| Hamamatsu | 0.3.0 | with pythonnet (Viewer1D).DCAM API with PyLabLib (Viewer2D) and Hamamatsu minispectrometers using .NET driver | -| Hinds | 0.0.3 | Actuators | -| Horiba | 2.0.0 | Viewer1D | -| Keithley | 1.2.0 | Viewer0D | -| Newport | 1.4.1 | Actuators | -| Nkt | 1.0.0 | Actuators | -| Oceaninsight | 1.1.1 | Viewer1D | -| Opencv | 0.0.2 | Viewer2D | -| Optosigma | 0.4.0 | Actuators | -| Physical_measurements | 0.1.1 | Viewer0DViewer1DViewer2D | -| Physik_instrumente | 1.2.0 | Actuators | -| Picoquant | 0.1.0 | Viewer1D | -| Piezoconcept | 1.1.0 | Actuators | -| Piezosystemjena | 0.1.0 | | -| Princeton_instruments | 0.1.0 | Viewer2D | -| Pylablib_camera | 1.0.1 | Viewer2D | -| Raspberry | 0.0.2 | Viewer2D | -| Redpitaya | 0.0.3 | Viewer1D | -| Signal_recovery | 0.1.0 | ActuatorsViewer0D | -| Smaract | 2.0.4 | Actuators | -| Srs | 0.0.2 | | -| Stellarnet | 2.0.1 | Viewer1D | -| Tango | 1.0.21 | | -| Uniblitz | 0.1.2 | Actuators | -| Zaber | 2.0.2 | Actuators | +| Repo Name | Version plugin | Instruments | +| ------------------------------------------------------------------------------------------------------------------ | -------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Alcatel | 1.1.0 | Viewer0D | +| Amplitude | 0.1.1 | Viewer0D | +| Arduino | 0.0.4 | Actuators | +| Basler | 0.1.1 | Viewer2D | +| Bnc | 0.0.6 | Actuators | +| Crystal_technology | 0.0.1 | Actuators | +| Femto | 0.1.0 | Viewer1D | +| Flim | 0.1.0 | ViewerND | +| Greateyes | 1.0.2 | Viewer2D | +| Hamamatsu | 0.3.0 | with pythonnet (Viewer1D).DCAM API with PyLabLib (Viewer2D) and Hamamatsu minispectrometers using .NET driver | +| Hinds | 0.0.3 | Actuators | +| Horiba | 2.0.0 | Viewer1D | +| Keithley | 1.2.0 | Viewer0D | +| Newport | 1.4.1 | Actuators | +| Nkt | 1.0.0 | Actuators | +| Oceaninsight | 1.1.1 | Viewer1D | +| Opencv | 0.0.2 | Viewer2D | +| Optosigma | 0.4.0 | Actuators | +| Physical_measurements | 0.1.1 | Viewer0DViewer1DViewer2D | +| Physik_instrumente | 1.2.0 | Actuators | +| Picoquant | 0.1.0 | Viewer1D | +| Piezoconcept | 1.1.0 | Actuators | +| Piezosystemjena | 0.1.0 | | +| Princeton_instruments | 0.1.0 | Viewer2D | +| Pylablib_camera | 1.0.1 | Viewer2D | +| Raspberry | 0.0.2 | Viewer2D | +| Redpitaya | 0.0.3 | Viewer1D | +| Signal_recovery | 0.1.0 | ActuatorsViewer0D | +| Smaract | 2.0.4 | Actuators | +| Srs | 0.0.2 | | +| Stellarnet | 2.0.1 | Viewer1D | +| Tango | 1.0.21 | | +| Uniblitz | 0.1.2 | Actuators | +| Zaber | 2.0.2 | Actuators | diff --git a/doc/PluginList.md b/doc/PluginList.md index 75982ee..df3f852 100644 --- a/doc/PluginList.md +++ b/doc/PluginList.md @@ -1,37 +1,37 @@ # PyMoDAQ Plugins -| Repo Name | Version plugin | Instruments | -| ------------------------------------------------------------------------------------------------------------------ | -------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Alcatel | 1.1.0 | Viewer0D | -| Amplitude | 0.1.1 | Viewer0D | -| Arduino | 0.0.4 | Actuators | -| Basler | 0.1.1 | Viewer2D | -| Bnc | 0.0.6 | Actuators | -| Crystal_technology | 0.0.1 | Actuators | -| Femto | 0.1.0 | Viewer1D | -| Flim | 0.1.0 | ViewerND | -| Greateyes | 1.0.2 | Viewer2D | -| Hamamatsu | 0.3.0 | with pythonnet (Viewer1D).DCAM API with PyLabLib (Viewer2D) and Hamamatsu minispectrometers using .NET driver | -| Hinds | 0.0.3 | Actuators | -| Horiba | 2.0.0 | Viewer1D | -| Keithley | 1.2.0 | Viewer0D | -| Newport | 1.4.1 | Actuators | -| Nkt | 1.0.0 | Actuators | -| Oceaninsight | 1.1.1 | Viewer1D | -| Opencv | 0.0.2 | Viewer2D | -| Optosigma | 0.4.0 | Actuators | -| Physical_measurements | 0.1.1 | Viewer0DViewer1DViewer2D | -| Physik_instrumente | 1.2.0 | Actuators | -| Picoquant | 0.1.0 | Viewer1D | -| Piezoconcept | 1.1.0 | Actuators | -| Piezosystemjena | 0.1.0 | | -| Princeton_instruments | 0.1.0 | Viewer2D | -| Pylablib_camera | 1.0.1 | Viewer2D | -| Raspberry | 0.0.2 | Viewer2D | -| Redpitaya | 0.0.3 | Viewer1D | -| Signal_recovery | 0.1.0 | ActuatorsViewer0D | -| Smaract | 2.0.4 | Actuators | -| Srs | 0.0.2 | | -| Stellarnet | 2.0.1 | Viewer1D | -| Tango | 1.0.21 | | -| Uniblitz | 0.1.2 | Actuators | -| Zaber | 2.0.2 | Actuators | +| Repo Name | Version plugin | Instruments | +| ------------------------------------------------------------------------------------------------------------------ | -------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Alcatel | 1.1.0 | Viewer0D | +| Amplitude | 0.1.1 | Viewer0D | +| Arduino | 0.0.4 | Actuators | +| Basler | 0.1.1 | Viewer2D | +| Bnc | 0.0.6 | Actuators | +| Crystal_technology | 0.0.1 | Actuators | +| Femto | 0.1.0 | Viewer1D | +| Flim | 0.1.0 | ViewerND | +| Greateyes | 1.0.2 | Viewer2D | +| Hamamatsu | 0.3.0 | with pythonnet (Viewer1D).DCAM API with PyLabLib (Viewer2D) and Hamamatsu minispectrometers using .NET driver | +| Hinds | 0.0.3 | Actuators | +| Horiba | 2.0.0 | Viewer1D | +| Keithley | 1.2.0 | Viewer0D | +| Newport | 1.4.1 | Actuators | +| Nkt | 1.0.0 | Actuators | +| Oceaninsight | 1.1.1 | Viewer1D | +| Opencv | 0.0.2 | Viewer2D | +| Optosigma | 0.4.0 | Actuators | +| Physical_measurements | 0.1.1 | Viewer0DViewer1DViewer2D | +| Physik_instrumente | 1.2.0 | Actuators | +| Picoquant | 0.1.0 | Viewer1D | +| Piezoconcept | 1.1.0 | Actuators | +| Piezosystemjena | 0.1.0 | | +| Princeton_instruments | 0.1.0 | Viewer2D | +| Pylablib_camera | 1.0.1 | Viewer2D | +| Raspberry | 0.0.2 | Viewer2D | +| Redpitaya | 0.0.3 | Viewer1D | +| Signal_recovery | 0.1.0 | ActuatorsViewer0D | +| Smaract | 2.0.4 | Actuators | +| Srs | 0.0.2 | | +| Stellarnet | 2.0.1 | Viewer1D | +| Tango | 1.0.21 | | +| Uniblitz | 0.1.2 | Actuators | +| Zaber | 2.0.2 | Actuators | diff --git a/src/pymodaq_plugin_manager/validate.py b/src/pymodaq_plugin_manager/validate.py index 0bb672a..545aff7 100644 --- a/src/pymodaq_plugin_manager/validate.py +++ b/src/pymodaq_plugin_manager/validate.py @@ -418,13 +418,11 @@ def write_plugin_doc(): for ind_line, line in enumerate(lines): if head in line: instrument_text.append(line.rstrip()) - with tag('ul'): - for subline in lines[ind_line+1:]: - if subline[0:4] == '* **': - with tag('li'): - instrument_text.append(subline[2:].rstrip()) - elif any([hd in subline for hd in header_inst[header_ind+1:]]): - break + for subline in lines[ind_line+1:]: + if subline[0:4] == '* **': + instrument_text.append(subline[2:].rstrip()) + elif any([hd in subline for hd in header_inst[header_ind+1:]]): + break if len(instrument_text) > 1: text(instrument_text[0]) for inst_txt in instrument_text[1:]: