Commit 54c342bb authored by Joel Collins's avatar Joel Collins
Browse files

Switch to picamerax

parent 0bff4bdb

docs/source/conf.py

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ class Mock(MagicMock): 
        return MagicMock()





mock_imports = ["picamera", "picamera.array", "picamera.mmalobj"]

mock_imports = ["picamerax", "picamerax.array", "picamerax.mmalobj"]



sys.modules.update((mod_name, Mock()) for mod_name in mock_imports)
@@ -224,7 +224,7 @@ epub_exclude_files = ["search.html"] 
# Example configuration for intersphinx: refer to the Python standard library.

intersphinx_mapping = {

    "openflexure_stage": ("https://openflexure-stage.readthedocs.io/en/latest/", None),

    "picamera": ("https://picamera.readthedocs.io/en/release-1.13/", None),

    "picamerax": ("https://picamerax.readthedocs.io/en/latest//", None),

    "marshmallow": ("https://marshmallow.readthedocs.io/en/stable/", None),

    "webargs": ("https://webargs.readthedocs.io/en/latest/", None),

}

docs/source/extensions/introduction.rst

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ Introduction 
Extensions allow functionality to be added to the OpenFlexure Microscope web API without having to modify the base code.

They have full access to the :py:class:`openflexure_microscope.Microscope` object, 

including direct access to any attached :py:class:`openflexure_microscope.camera.base.BaseCamera` and :py:class:`openflexure_stage.stage.OpenFlexureStage` objects.

This also allows access to the :py:class:`picamera.PiCamera` object.

This also allows access to the :py:class:`picamerax.PiCamera` object.



Extensions can either be loaded from a single Python file, or as a Python package installed to the environment being used.

openflexure_microscope/api/app.py

+1 −1
Original line number Diff line number Diff line
@@ -204,4 +204,4 @@ if __name__ == "__main__": 
    from labthings import Server

    logging.info("Starting OpenFlexure Microscope Server...")

    server = Server(app)

    server.run(host="::", port=5000, debug=False, zeroconf=True)
 
    server.run(host="0.0.0.0", port=5000, debug=False, zeroconf=True)

openflexure_microscope/api/default_extensions/picamera_autocalibrate/recalibrate_utils.py

+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ import numpy as np 
import time

import logging



from picamera import PiCamera

from picamera.array import PiRGBArray, PiBayerArray

from picamerax import PiCamera

from picamerax.array import PiRGBArray, PiBayerArray





def rgb_image(camera, resize=None, **kwargs):

openflexure_microscope/api/static/package-lock.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "openflexure-microscope-jsclient",

  "version": "2.3.0",

  "version": "2.4.0",

  "lockfileVersion": 1,

  "requires": true,

  "dependencies": {