Merge pull request #1070 from ToFuProject/devel

Prepare 1.8.8

Author: Didou09

.github/workflows/test-complete-matrix.yml

@@ -15,9 +15,6 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest] 
         python-version: ['3.8', '3.9', '3.10', '3.11']
-        include:
-          - python-version: '3.7.11'
-            os: ubuntu-20.04
         exclude:
           - python-version: ['3.11']
             os: windows-latest
@@ -30,9 +27,12 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
+         curl -X PURGE https://pypi.org/simple/datastock/
+         curl -X PURGE https://pypi.org/simple/bsplines2d/
+         curl -X PURGE https://pypi.org/simple/spectrally/
          pip install --upgrade pip
          pip install flake8 pytest coverage wheel
-         pip install -r requirements.txt
+         pip install -r requirements.txt --no-cache
     - name: Lint with flake8
       run: |
         # stop the build if there are Python syntax errors or undefined names

requirements.txt

@@ -11,7 +11,7 @@ svg.path
 Polygon3
 
 ######## Requirements with Version Specifier ########
-datastock>=0.0.49
-bsplines2d>=0.0.21
+datastock>=0.0.54
+bsplines2d>=0.0.22
 spectrally>=0.0.9
 Cython>=0.26

setup.py

@@ -325,8 +325,8 @@ def get_version_tofu(path=_HERE):
         "svg.path",
         "Polygon3",
         "cython>=0.26",
-        "datastock>=0.0.49",
-        "bsplines2d>=0.0.21",
+        "datastock>=0.0.54",
+        "bsplines2d>=0.0.22",
         "spectrally>=0.0.9",
     ],
     python_requires=">=3.6",

tofu/data/_class02_Rays.py

@@ -11,9 +11,11 @@
 from . import _class02_touch as _touch
 from . import _class02_sample as _sample
 from . import _class02_tangency_radius as _tangency_radius
+from . import _class02_single_point_camera as _single_point_cam
 from . import _class2_plot as _plot
 from . import _class2_sinogram as _sinogram
 from . import _class02_save2stp as _save2stp
+from . import _class8_plot
 
 
 __all__ = ['Rays']
@@ -157,7 +159,12 @@ def get_rays_vect(
         key_cam=None,
         norm=None,
     ):
-        return _check._get_vect(coll=self, key=key, key_cam=key_cam, norm=norm)
+        return _check._get_vect(
+            coll=self,
+            key=key,
+            key_cam=key_cam,
+            norm=norm,
+        )
 
     # --------------
     # touch
@@ -363,10 +370,60 @@ def get_rays_intersect_radius(
             )
 
     # --------------
-    # plotting
+    # Single point camera
     # --------------
 
-    def plot_rays(
+    def add_single_point_camera2d(
+        self,
+        key=None,
+        cent=None,
+        nin=None,
+        e0=None,
+        e1=None,
+        angle0=None,
+        angle1=None,
+        config=None,
+        strict=None,
+        # optional naming
+        key_angle0=None,
+        key_angle1=None,
+        ref_angle0=None,
+        ref_angle1=None,
+        units_angles=None,
+    ):
+        """ Add a set of 2d rays from a single point
+
+        Rays are sampling a portion of sphere around cent
+        Portion is defined by 2 angles:
+            - alpha
+            - beta
+
+        """
+
+        return _single_point_cam.main(
+            coll=self,
+            key=key,
+            cent=cent,
+            nin=nin,
+            e0=e0,
+            e1=e1,
+            angle0=angle0,
+            angle1=angle1,
+            config=config,
+            strict=strict,
+            # optional naming
+            key_angle0=key_angle0,
+            key_angle1=key_angle1,
+            ref_angle0=ref_angle0,
+            ref_angle1=ref_angle1,
+            units_angles=units_angles,
+        )
+
+    # ------------------
+    # plotting - static
+    # ------------------
+
+    def plot_rays_static(
         self,
         key=None,
         proj=None,
@@ -407,6 +464,75 @@ def plot_rays(
             connect=connect,
         )
 
+    # ------------------
+    # plotting - interactive
+    # ------------------
+
+    def plot_rays(
+        self,
+        # keys
+        key=None,
+        keyZ=None,
+        # options
+        proj=None,
+        res=None,
+        # data plot
+        data=None,
+        units=None,
+        cmap=None,
+        vmin=None,
+        vmax=None,
+        alpha=None,
+        dx0=None,
+        dx1=None,
+        # config
+        plot_config=None,
+        plot_colorbar=None,
+        # figure
+        dax=None,
+        dmargin=None,
+        fs=None,
+        wintit=None,
+        # interactivity
+        color_dict=None,
+        nlos=None,
+        dinc=None,
+        connect=None,
+    ):
+
+        return _class8_plot._plot_diagnostic(
+            coll=self,
+            isray=True,
+            # keys
+            key=key,
+            keyZ=keyZ,
+            # options
+            proj=proj,
+            los_res=res,
+            # data plot
+            data=data,
+            units=units,
+            cmap=cmap,
+            vmin=vmin,
+            vmax=vmax,
+            alpha=alpha,
+            dx0=dx0,
+            dx1=dx1,
+            # config
+            plot_config=plot_config,
+            plot_colorbar=plot_colorbar,
+            # figure
+            dax=dax,
+            dmargin=dmargin,
+            fs=fs,
+            wintit=wintit,
+            # interactivity
+            color_dict=color_dict,
+            nlos=nlos,
+            dinc=dinc,
+            connect=connect,
+        )
+
     # --------------
     # sinogram
     # --------------