Skip to content

Commit

Permalink
Minor documentation and bug fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexShkarin committed Dec 2, 2021
1 parent f3175d0 commit 328eb1e
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
1 change: 1 addition & 0 deletions control.py
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,7 @@ def start_main_form(cam_name=None):
raise ValueError("unavailable camera {}".format(cam_name))
if ("css",cam_name) in settings:
settings.update(settings["css",cam_name])
app.setStyleSheet(color_theme.load_style(settings.get("interface/color_theme","dark")))
channel_accum=controller.sync_controller(channel_accumulator_thread)
channel_accum.cs.add_source("raw",src=preprocess_thread,tag="frames/new",sync=True,kind="raw")
channel_accum.cs.add_source("show",src=process_thread,tag="frames/new/show",sync=True,kind="show")
Expand Down
4 changes: 3 additions & 1 deletion docs/overview.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,14 @@ Cam-control is built using `pylablib <https://github.com/AlexShkarin/pyLabLib/>`

- Andor cameras: `Andor Solis <https://andor.oxinst.com/products/solis-software/>`__ or `Andor SKD <https://andor.oxinst.com/products/software-development-kit/>`__.
- Hamamatsu/DCAM cameras: Hamamatsu-supplied software such as Hokawo, or the freely available `DCAM API <https://dcam-api.com/downloads/>`__. Keep in mind, that you also need to install the drivers for the corresponding camera type (USB, Ethernet, IEEE 1394). These drivers are in the same installer, but need to be installed separately.
- Thorlabs cameras: freely available `ThorCam <https://www.thorlabs.com/software_pages/ViewSoftwarePage.cfm?Code=ThorCam>`__ software.
- Thorlabs uc480 cameras: freely available `ThorCam <https://www.thorlabs.com/software_pages/ViewSoftwarePage.cfm?Code=ThorCam>`__ software.
- IDS uEye cameras: freely available (upon registration) `IDS Software Suite <https://en.ids-imaging.com/ids-software-suite.html>`__.
- PCO cameras: freely available `pco.camware <https://www.pco.de/software/camera-control-software/pcocamware/>`__ software.
- IMAQdx cameras: all the necessary code is contained in the freely available `Vision Acquisition Software <https://www.ni.com/en-us/support/downloads/drivers/download.vision-acquisition-software.html>`__. However, the IMAQdx part of the software is proprietary, and needs to be purchased to use.
- IMAQ frame grabbers: freely available `Vision Acquisition Software <https://www.ni.com/en-us/support/downloads/drivers/download.vision-acquisition-software.html>`__. In addition, you would also need to specify the correct camera file, which describes the camera communication protocol details.
- Silicon Software frame grabbers: freely available (upon registration) `Silicon Software Runtime Environment <https://www.baslerweb.com/en/sales-support/downloads/software-downloads/#type=framegrabbersoftware;language=all;version=all;os=windows64bit>`__ (the newest version for 64-bit Windows is `5.7.0 <https://www.baslerweb.com/en/sales-support/downloads/software-downloads/complete-installation-for-windows-64bit-ver-5-7-0/>`__).
- PhotonFocus: on top of IMAQ or Silicon Software requirements, it needs freely available (upon registration) `PFInstaller <https://www.photonfocus.com/support/software/>`__ software.
- PICam cameras: freely available `PICam <https://www.princetoninstruments.com/products/software-family/pi-cam>`__ software.

.. note::

Expand Down
5 changes: 3 additions & 2 deletions docs/settings_file.rst
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ Camera-related parameters
In this section ``<camera name>`` stands for any camera name, e.g., ``ppimaq_0``. For example, ``cameras/<camera name>/params`` can become ``cameras/ppimaq_0/params``.

``css/<camera name>/<key>``
| Camera-specific parameter. Allows for any generic parameter (such as GUI parameters described above) to take different values for different cameras. For example, if there are two cameras named ``ppimaq_0`` and ``uc480_0`` defined in the file, then one can use ``css/ppimaq_0/saving/max_queue_ram`` to specify the saving buffer size for the first camera, and ``css/uc480_0/saving/max_queue_ram`` for the second one. Either of those can also be omitted, in which case the generic value (either specified or default) will be used instead.
| Camera-specific parameter. Allows for any generic parameter (such as GUI parameters described above) to take different values for different cameras. For example, if there are two cameras named ``ppimaq_0`` and ``uc480_0`` defined in the file, then one can use ``css/ppimaq_0/saving/max_queue_ram`` to specify the saving buffer size for the first camera, and ``css/uc480_0/saving/max_queue_ram`` for the second one. Either of those can also be omitted, in which case the generic value (either specified or default) will be used instead. Note that this option is not supported for ``select_camera``, ``cameras``, and ``dlls`` parameters (``css`` entries are ignored for those).
``select_camera``
| Default selected camera. If this parameter is set, then this camera is automatically selected even if several cameras are present (i.e., the camera select menu doesn't show up). In this case, the only way to start other cameras is by using ``--camera`` :ref:`command line argument <command_line>`.
Expand Down Expand Up @@ -150,7 +150,8 @@ Specific system parameters
- ``niimaq``: path to ``imaq.dll`` for NI IMAQ frame grabber interface. By default, search in ``System32`` folder, where it is placed after installing NI Vision Acquisition Software.
- ``niimaqdx``: path to ``niimaqdx.dll`` for NI IMAQdx frame grabber interface. By default, search in ``System32`` folder, where it is placed after installing NI Vision Acquisition Software.
- ``pco_sc2``: path to ``SC2_Cam.dll`` for PCO cameras. By default, search in the default location of pco.camware or pco.sdk.
- ``picam``; path to ``picam.dll`` for Princeton Instruments cameras. By default, search in the default location of Princeton Instruments PICam Runtime.
- ``pfcam``: path to ``pfcam.dll`` for PhotonFocus cameras. By default, search in PFRemote folder specified in the ``PATH`` environment variable.
- ``sisofgrab``: path to ``fglib5.dll`` for Silicon Software frame grabber interface. By default, search in Silicon Software Runtime Environment folder specified in the ``PATH`` environment variable.
- ``thorlabs_tlcam``: path to ``thorlabs_tsi_camera_sdk.dll`` and related DLLs for Thorlabs Scientific Cameras. By default, search in the default location of ThorCam.
- ``uc480``: path to ``uc480_64.dll`` and related DLLs for uc480 camera interface. By default, search in the default location of ThorCam.
- ``uc480``: path to ``uc480_64.dll`` and related DLLs for uc480 camera interface or ``ueye_api_64.dll`` and related DLLs for uEye camera interface. By default, search in the default location of ThorCam and IDS uEye.

0 comments on commit 328eb1e

Please sign in to comment.