camera-client 0.2.3__tar.gz → 0.2.5__tar.gz

{camera_client-0.2.3/camera_client.egg-info → camera_client-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: camera-client
-Version: 0.2.3
+Version: 0.2.5
 Summary: Python SDK for camera calibration and projection transformations - handle lens distortion, coordinate transformations, and 3D ray casting with symbolic expressions.
 Author-email: Alexander Abramov <extremal.ru@gmail.com>
 License: MIT
@@ -26,7 +26,6 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy>=1.20.0
 Requires-Dist: sympy>=1.10.0
-Dynamic: license-file
 
 # camera-client
 
@@ -316,6 +315,58 @@ Get the camera position (key-point) in world space.
 **Returns:**
 - `np.ndarray`: Shape (3,) array with [x, y, z] camera position
 
+---
+
+### `get_ctd_points_context(ctd_points)`
+
+Get scale context values for corrected (CTD) image points.
+
+**Parameters:**
+- `ctd_points` (np.ndarray): Shape (N, 2) array of [x, y] corrected coordinates
+
+**Returns:**
+- `dict`: Dictionary with keys:
+  - `wscale` (np.ndarray): Shape (N,) width scale values
+  - `hscale` (np.ndarray): Shape (N,) height scale values
+  - `vangle` (np.ndarray): Shape (N,) vertical angle values (radians)
+
+**Note:** Out-of-bounds points will have NaN values
+
+**Example:**
+```python
+ctd_points = np.array([[640, 480], [800, 600]])
+context = camera.get_ctd_points_context(ctd_points)
+print(context['wscale'])  # Width scale at each point
+print(context['hscale'])  # Height scale at each point
+print(context['vangle'])  # Vertical angle at each point
+```
+
+---
+
+### `get_src_points_context(src_points)`
+
+Get scale context values for source (distorted) image points.
+
+**Parameters:**
+- `src_points` (np.ndarray): Shape (N, 2) array of [x, y] source coordinates
+
+**Returns:**
+- `dict`: Dictionary with keys:
+  - `wscale` (np.ndarray): Shape (N,) width scale values
+  - `hscale` (np.ndarray): Shape (N,) height scale values
+  - `vangle` (np.ndarray): Shape (N,) vertical angle values (radians)
+
+**Note:** Internally converts source points to CTD coordinates first, then retrieves context
+
+**Example:**
+```python
+src_points = np.array([[640, 480], [800, 600]])
+context = camera.get_src_points_context(src_points)
+print(context['wscale'])  # Width scale at each point
+```
+
+---
+
 ## Calibration File Format
 
 The calibration file is a NumPy `.npz` archive containing:
@@ -344,7 +395,7 @@ The calibration file is a NumPy `.npz` archive containing:
 - `im_ctd_url`: URL or path to the corrected (undistorted) camera image
 - `im_width`: Width of the camera image in pixels
 - `im_height`: Height of the camera image in pixels
-- `ctd_geometry`: JSON object with geometry data in CTD coordinates (efov_polygons, counting_lines)
+- `ctd_geometry`: JSON object with geometry data in CTD coordinates (efov_polygon, counting_lines)
 
 ## Requirements
 

{camera_client-0.2.3 → camera_client-0.2.5}/README.md

@@ -286,6 +286,58 @@ Get the camera position (key-point) in world space.
 **Returns:**
 - `np.ndarray`: Shape (3,) array with [x, y, z] camera position
 
+---
+
+### `get_ctd_points_context(ctd_points)`
+
+Get scale context values for corrected (CTD) image points.
+
+**Parameters:**
+- `ctd_points` (np.ndarray): Shape (N, 2) array of [x, y] corrected coordinates
+
+**Returns:**
+- `dict`: Dictionary with keys:
+  - `wscale` (np.ndarray): Shape (N,) width scale values
+  - `hscale` (np.ndarray): Shape (N,) height scale values
+  - `vangle` (np.ndarray): Shape (N,) vertical angle values (radians)
+
+**Note:** Out-of-bounds points will have NaN values
+
+**Example:**
+```python
+ctd_points = np.array([[640, 480], [800, 600]])
+context = camera.get_ctd_points_context(ctd_points)
+print(context['wscale'])  # Width scale at each point
+print(context['hscale'])  # Height scale at each point
+print(context['vangle'])  # Vertical angle at each point
+```
+
+---
+
+### `get_src_points_context(src_points)`
+
+Get scale context values for source (distorted) image points.
+
+**Parameters:**
+- `src_points` (np.ndarray): Shape (N, 2) array of [x, y] source coordinates
+
+**Returns:**
+- `dict`: Dictionary with keys:
+  - `wscale` (np.ndarray): Shape (N,) width scale values
+  - `hscale` (np.ndarray): Shape (N,) height scale values
+  - `vangle` (np.ndarray): Shape (N,) vertical angle values (radians)
+
+**Note:** Internally converts source points to CTD coordinates first, then retrieves context
+
+**Example:**
+```python
+src_points = np.array([[640, 480], [800, 600]])
+context = camera.get_src_points_context(src_points)
+print(context['wscale'])  # Width scale at each point
+```
+
+---
+
 ## Calibration File Format
 
 The calibration file is a NumPy `.npz` archive containing:
@@ -314,7 +366,7 @@ The calibration file is a NumPy `.npz` archive containing:
 - `im_ctd_url`: URL or path to the corrected (undistorted) camera image
 - `im_width`: Width of the camera image in pixels
 - `im_height`: Height of the camera image in pixels
-- `ctd_geometry`: JSON object with geometry data in CTD coordinates (efov_polygons, counting_lines)
+- `ctd_geometry`: JSON object with geometry data in CTD coordinates (efov_polygon, counting_lines)
 
 ## Requirements
 

{camera_client-0.2.3 → camera_client-0.2.5}/camera_client/client.py

@@ -26,6 +26,7 @@ class CameraProjection:
                 - ctd2src: Corrected to source distortion map (H x W x 2)
                 - x_gnd, y_gnd, z_gnd: String expressions for ctd -> ground
                 - x_im, y_im: String expressions for ground -> ctd
+                - map_scale_h, map_scale_w, map_scale_vang: Scale context maps (H x W)
         """
         data = cam_archive_data
 
@@ -47,6 +48,11 @@ class CameraProjection:
         self.src2ctd_points_map = data["src2ctd"]
         self.ctd2src_points_map = data["ctd2src"]
 
+        # Store scale context maps
+        self.map_scale_h = data["map_scale_h"]
+        self.map_scale_w = data["map_scale_w"]
+        self.map_scale_vang = data["map_scale_vang"]
+
         self.im_size = self.src2ctd_points_map.shape[:2]
 
         # Compile transformation expressions for ctd -> gnd
@@ -294,6 +300,81 @@ class CameraProjection:
         ctd_points = self.src_to_ctd(points)
         return self.ctd_to_ray(ctd_points)
 
+    def get_ctd_points_context(self, ctd_points):
+        """
+        Get scale context values for corrected (CTD) image points.
+
+        Args:
+            ctd_points: (N, 2) array of corrected points [[x1, y1], [x2, y2], ...]
+
+        Returns:
+            Dictionary with keys:
+                - wscale: (N,) array of width scale values
+                - hscale: (N,) array of height scale values
+                - vangle: (N,) array of vertical angle values
+            Out-of-bounds points will have NaN values.
+        """
+        ctd_points = np.asarray(ctd_points, dtype=float)
+        if ctd_points.ndim != 2 or ctd_points.shape[1] != 2:
+            raise ValueError(f"Expected (N, 2) array, got shape {ctd_points.shape}")
+
+        N = len(ctd_points)
+        wscale = np.full(N, np.nan, dtype=float)
+        hscale = np.full(N, np.nan, dtype=float)
+        vangle = np.full(N, np.nan, dtype=float)
+
+        # Check for NaN input points
+        valid_input = ~np.isnan(ctd_points).any(axis=1)
+
+        if not valid_input.any():
+            return {"wscale": wscale, "hscale": hscale, "vangle": vangle}
+
+        # Round to integer coordinates
+        p_int = np.round(ctd_points[valid_input]).astype(int)
+
+        # Vectorized bounds checking
+        in_bounds = (
+            (p_int[:, 0] >= 0)
+            & (p_int[:, 0] < self.map_scale_w.shape[1])
+            & (p_int[:, 1] >= 0)
+            & (p_int[:, 1] < self.map_scale_w.shape[0])
+        )
+
+        # Create mask for points that are both valid input and in bounds
+        valid_indices = np.where(valid_input)[0]
+        final_valid_indices = valid_indices[in_bounds]
+        valid_p_int = p_int[in_bounds]
+
+        # Vectorized lookup using advanced indexing (y, x indexing)
+        wscale[final_valid_indices] = self.map_scale_w[
+            valid_p_int[:, 1], valid_p_int[:, 0]
+        ]
+        hscale[final_valid_indices] = self.map_scale_h[
+            valid_p_int[:, 1], valid_p_int[:, 0]
+        ]
+        vangle[final_valid_indices] = self.map_scale_vang[
+            valid_p_int[:, 1], valid_p_int[:, 0]
+        ]
+
+        return {"wscale": wscale, "hscale": hscale, "vangle": vangle}
+
+    def get_src_points_context(self, src_points):
+        """
+        Get scale context values for source (distorted) image points.
+
+        Args:
+            src_points: (N, 2) array of source points [[x1, y1], [x2, y2], ...]
+
+        Returns:
+            Dictionary with keys:
+                - wscale: (N,) array of width scale values
+                - hscale: (N,) array of height scale values
+                - vangle: (N,) array of vertical angle values
+            Out-of-bounds points will have NaN values.
+        """
+        ctd_points = self.src_to_ctd(src_points)
+        return self.get_ctd_points_context(ctd_points)
+
     @classmethod
     def load(cls, archive_path):
         """

{camera_client-0.2.3 → camera_client-0.2.5}/camera_client/loading.py

@@ -34,7 +34,7 @@ def read_npz_file(filename):
             - exp_key_point (sp.Expr): Sympy expression for keypoint coordinates
             - exp_im2ray (sp.Expr): Sympy expression for image to ray direction transformation
             - ctd_geometry (dict): JSON object containing geometry data in CTD coordinate system:
-                - efov_polygons: Polygons defining effective field of view in CTD coordinates
+                - efov_polygon: Polygon defining effective field of view in CTD coordinates
                 - counting_lines: Polylines for counting forward/backward track intersections
     """
     data = np.load(filename)

{camera_client-0.2.3 → camera_client-0.2.5/camera_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: camera-client
-Version: 0.2.3
+Version: 0.2.5
 Summary: Python SDK for camera calibration and projection transformations - handle lens distortion, coordinate transformations, and 3D ray casting with symbolic expressions.
 Author-email: Alexander Abramov <extremal.ru@gmail.com>
 License: MIT
@@ -26,7 +26,6 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: numpy>=1.20.0
 Requires-Dist: sympy>=1.10.0
-Dynamic: license-file
 
 # camera-client
 
@@ -316,6 +315,58 @@ Get the camera position (key-point) in world space.
 **Returns:**
 - `np.ndarray`: Shape (3,) array with [x, y, z] camera position
 
+---
+
+### `get_ctd_points_context(ctd_points)`
+
+Get scale context values for corrected (CTD) image points.
+
+**Parameters:**
+- `ctd_points` (np.ndarray): Shape (N, 2) array of [x, y] corrected coordinates
+
+**Returns:**
+- `dict`: Dictionary with keys:
+  - `wscale` (np.ndarray): Shape (N,) width scale values
+  - `hscale` (np.ndarray): Shape (N,) height scale values
+  - `vangle` (np.ndarray): Shape (N,) vertical angle values (radians)
+
+**Note:** Out-of-bounds points will have NaN values
+
+**Example:**
+```python
+ctd_points = np.array([[640, 480], [800, 600]])
+context = camera.get_ctd_points_context(ctd_points)
+print(context['wscale'])  # Width scale at each point
+print(context['hscale'])  # Height scale at each point
+print(context['vangle'])  # Vertical angle at each point
+```
+
+---
+
+### `get_src_points_context(src_points)`
+
+Get scale context values for source (distorted) image points.
+
+**Parameters:**
+- `src_points` (np.ndarray): Shape (N, 2) array of [x, y] source coordinates
+
+**Returns:**
+- `dict`: Dictionary with keys:
+  - `wscale` (np.ndarray): Shape (N,) width scale values
+  - `hscale` (np.ndarray): Shape (N,) height scale values
+  - `vangle` (np.ndarray): Shape (N,) vertical angle values (radians)
+
+**Note:** Internally converts source points to CTD coordinates first, then retrieves context
+
+**Example:**
+```python
+src_points = np.array([[640, 480], [800, 600]])
+context = camera.get_src_points_context(src_points)
+print(context['wscale'])  # Width scale at each point
+```
+
+---
+
 ## Calibration File Format
 
 The calibration file is a NumPy `.npz` archive containing:
@@ -344,7 +395,7 @@ The calibration file is a NumPy `.npz` archive containing:
 - `im_ctd_url`: URL or path to the corrected (undistorted) camera image
 - `im_width`: Width of the camera image in pixels
 - `im_height`: Height of the camera image in pixels
-- `ctd_geometry`: JSON object with geometry data in CTD coordinates (efov_polygons, counting_lines)
+- `ctd_geometry`: JSON object with geometry data in CTD coordinates (efov_polygon, counting_lines)
 
 ## Requirements
 

{camera_client-0.2.3 → camera_client-0.2.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "camera-client"
-version = "0.2.3"
+version = "0.2.5"
 description = "Python SDK for camera calibration and projection transformations - handle lens distortion, coordinate transformations, and 3D ray casting with symbolic expressions."
 readme = "README.md"
 requires-python = ">=3.7"