supervisely 6.73.281__py3-none-any.whl → 6.73.282__py3-none-any.whl

supervisely/geometry/cuboid_2d.py

@@ -8,6 +8,13 @@ from typing import Dict, List, Optional, Union
 
 import numpy as np
 
+from supervisely.geometry.constants import (
+    CLASS_ID,
+    CREATED_AT,
+    ID,
+    LABELER_LOGIN,
+    UPDATED_AT,
+)
 from supervisely.geometry.geometry import Geometry
 from supervisely.geometry.graph import EDGES, GraphNodes, Node, _maybe_transform_colors
 from supervisely.geometry.point_location import PointLocation
@@ -36,19 +43,19 @@ CUBOID2D_EDGES_MAPPING = [
 
 class Cuboid2d(GraphNodes):
     """
-    GraphNodes geometry for a single :class:`Label<supervisely.annotation.label.Label>`. :class:`GraphNodes<GraphNodes>` class object is immutable.
+    Cuboid2d geometry for a single :class:`Label<supervisely.annotation.label.Label>`. :class:`Cuboid2d<Cuboid2d>` class object is immutable.
 
     :param nodes: Dict or List containing nodes of graph
     :type nodes: dict
-    :param sly_id: GraphNodes ID in Supervisely server.
+    :param sly_id: Cuboid2d ID in Supervisely server.
     :type sly_id: int, optional
-    :param class_id: ID of :class:`ObjClass<supervisely.annotation.obj_class.ObjClass>` to which GraphNodes belongs.
+    :param class_id: ID of :class:`ObjClass<supervisely.annotation.obj_class.ObjClass>` to which Cuboid2d belongs.
     :type class_id: int, optional
-    :param labeler_login: Login of the user who created GraphNodes.
+    :param labeler_login: Login of the user who created Cuboid2d.
     :type labeler_login: str, optional
-    :param updated_at: Date and Time when GraphNodes was modified last. Date Format: Year:Month:Day:Hour:Minute:Seconds. Example: '2021-01-22T19:37:50.158Z'.
+    :param updated_at: Date and Time when Cuboid2d was modified last. Date Format: Year:Month:Day:Hour:Minute:Seconds. Example: '2021-01-22T19:37:50.158Z'.
     :type updated_at: str, optional
-    :param created_at: Date and Time when GraphNodes was created. Date Format is the same as in "updated_at" parameter.
+    :param created_at: Date and Time when Cuboid2d was created. Date Format is the same as in "updated_at" parameter.
     :type created_at: str, optional
 
     :Usage example:
@@ -56,13 +63,13 @@ class Cuboid2d(GraphNodes):
      .. code-block:: python
 
         import supervisely as sly
-        from supervisely.geometry.graph import Node, GraphNodes
+        from supervisely.geometry.graph import Node, Cuboid2d
 
         vertex_1 = Node(sly.PointLocation(5, 5))
         vertex_2 = Node(sly.PointLocation(100, 100))
         vertex_3 = Node(sly.PointLocation(200, 250))
         nodes = {0: vertex_1, 1: vertex_2, 2: vertex_3}
-        figure = GraphNodes(nodes)
+        figure = Cuboid2d(nodes)
     """
 
     items_json_field = VERTICES
@@ -79,6 +86,9 @@ class Cuboid2d(GraphNodes):
         labeler_login: Optional[int] = None,
         updated_at: Optional[str] = None,
         created_at: Optional[str] = None,
+        position: Optional[Dict] = None,
+        rotation: Optional[Dict] = None,
+        dimensions: Optional[Dict] = None,
     ):
         super().__init__(
             nodes=nodes,
@@ -88,6 +98,9 @@ class Cuboid2d(GraphNodes):
             updated_at=updated_at,
             created_at=created_at,
         )
+        self._position = position
+        self._rotation = rotation
+        self._dimensions = dimensions
 
         if len(self._nodes) != 8:
             raise ValueError("Cuboid2d must have exactly 8 vertices")
@@ -98,10 +111,169 @@ class Cuboid2d(GraphNodes):
         Copy of Cuboid2d vertices.
 
         :return: Cuboid2d vertices
-        :rtype: :class:`dict`
+        :rtype: Optional[Dict]
         """
         return self.nodes
 
+    @property
+    def position(self) -> Optional[Dict]:
+        """
+        Copy of the position of the Cuboid2d.
+
+        :return: Position of the Cuboid2d
+        :rtype: Optional[Dict]
+        """
+        if isinstance(self._position, dict):
+            return self._position.copy()
+
+    @property
+    def rotation(self) -> Optional[Dict]:
+        """
+        Copy of the rotation of the Cuboid2d.
+
+        :return: Rotation of the Cuboid2d
+        :rtype: Optional[Dict]
+        """
+        if isinstance(self._rotation, dict):
+            return self._rotation.copy()
+
+    @property
+    def dimensions(self) -> Optional[Dict]:
+        """
+        Copy of the dimensions of the Cuboid2d.
+
+        :return: Dimensions of the Cuboid2d
+        :rtype: :class:`dict`
+        """
+        if isinstance(self._dimensions, dict):
+            return self._dimensions.copy()
+
+    @classmethod
+    def from_json(cls, data: Dict[str, Dict]) -> Cuboid2d:
+        """
+        Convert a json dict to Cuboid2d. Read more about `Supervisely format <https://docs.supervise.ly/data-organization/00_ann_format_navi>`_.
+
+        :param data: Cuboid2d in json format as a dict.
+        :type data: Dict[str, Dict]
+        :return: Cuboid2d object
+        :rtype: :class:`Cuboid2d<Cuboid2d>`
+        :Usage example:
+
+         .. code-block:: python
+
+            figure_json = {
+                "vertices": {
+                    "0": {
+                        "loc": [5, 5]
+                    },
+                    "1": {
+                        "loc": [100, 100]
+                    },
+                    "2": {
+                        "loc": [250, 200]
+                    },
+                    "position": {
+                        "x": 0.0657651107620552,
+                        "y": -0.05634319555373257,
+                        "z": 0.7267282757573887
+                    },
+                    "rotation": { "x": 0, "y": 0, "z": 0 },
+                    "dimensions": {
+                        "x": 0.1425456564648202,
+                        "y": 0.1,
+                        "z": 0.36738880874660756
+                    }
+                }
+            }
+            from supervisely.geometry.graph import Cuboid2d
+            figure = Cuboid2d.from_json(figure_json)
+        """
+        nodes = {
+            node_id: Node.from_json(node_json)
+            for node_id, node_json in data[cls.items_json_field].items()
+        }
+        labeler_login = data.get(LABELER_LOGIN, None)
+        updated_at = data.get(UPDATED_AT, None)
+        created_at = data.get(CREATED_AT, None)
+        sly_id = data.get(ID, None)
+        class_id = data.get(CLASS_ID, None)
+        position = data.get("position", None)
+        rotation = data.get("rotation", None)
+        dimensions = data.get("dimensions", None)
+        return cls(
+            nodes=nodes,
+            sly_id=sly_id,
+            class_id=class_id,
+            labeler_login=labeler_login,
+            updated_at=updated_at,
+            created_at=created_at,
+            position=position,
+            rotation=rotation,
+            dimensions=dimensions,
+        )
+
+    def to_json(self) -> Dict[str, Dict]:
+        """
+        Convert the Cuboid2d to list. Read more about `Supervisely format <https://docs.supervise.ly/data-organization/00_ann_format_navi>`_.
+
+        :return: Json format as a dict
+        :rtype: Dict[str, Dict]
+        :Usage example:
+
+         .. code-block:: python
+
+            import supervisely as sly
+            from supervisely.geometry.graph import Node, Cuboid2d
+
+            vertex_1 = Node(sly.PointLocation(5, 5))
+            vertex_2 = Node(sly.PointLocation(100, 100))
+            vertex_3 = Node(sly.PointLocation(200, 250))
+            nodes = {0: vertex_1, 1: vertex_2, 2: vertex_3}
+            figure = Cuboid2d(nodes)
+
+            figure_json = figure.to_json()
+            print(figure_json)
+            # Output: {
+            #    "nodes": {
+            #        "0": {
+            #            "loc": [5, 5]
+            #        },
+            #        "1": {
+            #            "loc": [100, 100]
+            #        },
+            #        "2": {
+            #            "loc": [250, 200]
+            #        }
+            #    },
+            #    "position": {
+            #         "x": 0.0657651107620552,
+            #         "y": -0.05634319555373257,
+            #         "z": 0.7267282757573887
+            #     },
+            #     "rotation": { "x": 0, "y": 0, "z": 0 },
+            #     "dimensions": {
+            #         "x": 0.1425456564648202,
+            #         "y": 0.1,
+            #         "z": 0.36738880874660756
+            #     }
+
+            # }
+        """
+        res = {
+            self.items_json_field: {
+                node_id: node.to_json() for node_id, node in self._nodes.items()
+            }
+        }
+        if self._position is not None:
+            res["position"] = self._position
+        if self._rotation is not None:
+            res["rotation"] = self._rotation
+        if self._dimensions is not None:
+            res["dimensions"] = self._dimensions
+
+        self._add_creation_info(res)
+        return res
+
     def validate(self, name: str, settings: Dict) -> None:
         """
         Checks the graph for correctness and compliance with the template
@@ -184,7 +356,7 @@ class Cuboid2dTemplate(Cuboid2d, Geometry):
         """
         config = {VERTICES: {}, EDGES: []}
 
-        x = y = w = h = s = 1 # sample values only for config creation
+        x = y = w = h = s = 1  # sample values only for config creation
         base_vertices = [(x, y), (x + w, y), (x + w, y + h), (x, y + h)]
         shifted_vertices = [(vx + s, vy + s) for vx, vy in base_vertices]
         verices_coords = base_vertices + shifted_vertices

{supervisely-6.73.281.dist-info → supervisely-6.73.282.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: supervisely
-Version: 6.73.281
+Version: 6.73.282
 Summary: Supervisely Python SDK.
 Home-page: https://github.com/supervisely/supervisely
 Author: Supervisely

{supervisely-6.73.281.dist-info → supervisely-6.73.282.dist-info}/RECORD

@@ -674,7 +674,7 @@ supervisely/geometry/closed_surface_mesh.py,sha256=3ZplCm3Q2bhPcxNmtv2U1UfdezRkC
 supervisely/geometry/constants.py,sha256=TPYWGcr2GsbgEtKiZj1L_6wpmbaWU9Qjtlwjg136iVg,788
 supervisely/geometry/conversions.py,sha256=ZY6xWYFWaDA5KDJkcIBBP8LAmMfZwxMeVFfYUYEM6fw,1170
 supervisely/geometry/cuboid.py,sha256=oxsRoTKuwTNxH4Vp6khyvw1TCrBagSWNV5HmQKJZHt0,20693
-supervisely/geometry/cuboid_2d.py,sha256=tJoaqIAAl1ED-EMu1tEeuMvNi5CIE1rGE0RMLnpkpcg,7933
+supervisely/geometry/cuboid_2d.py,sha256=-oXeKiUS2gguQ4GyIZYp1cNPPhOLsGOFZl7uI71BfZM,13438
 supervisely/geometry/cuboid_3d.py,sha256=x472ZPHTZDIY5Dj8tKbLQG3BCukFPgSvPJlxfHdKi1w,4168
 supervisely/geometry/geometry.py,sha256=dbXnct8hrr7Wour6yCrtAef22KSJ2uYRm1F5GE10_MM,15287
 supervisely/geometry/graph.py,sha256=1_tX7FGmYkXuAx3P_w4zA4p8mRYnCN4iZ--2pMyxseI,24121
@@ -1070,9 +1070,9 @@ supervisely/worker_proto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 supervisely/worker_proto/worker_api_pb2.py,sha256=VQfi5JRBHs2pFCK1snec3JECgGnua3Xjqw_-b3aFxuM,59142
 supervisely/worker_proto/worker_api_pb2_grpc.py,sha256=3BwQXOaP9qpdi0Dt9EKG--Lm8KGN0C5AgmUfRv77_Jk,28940
 supervisely_lib/__init__.py,sha256=7-3QnN8Zf0wj8NCr2oJmqoQWMKKPKTECvjH9pd2S5vY,159
-supervisely-6.73.281.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-supervisely-6.73.281.dist-info/METADATA,sha256=24JmJE-D0v4zGZJO-XnHJ3yiFXVK69F_UwSGz0rItEQ,33573
-supervisely-6.73.281.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-supervisely-6.73.281.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
-supervisely-6.73.281.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
-supervisely-6.73.281.dist-info/RECORD,,
+supervisely-6.73.282.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+supervisely-6.73.282.dist-info/METADATA,sha256=qGp4_zjqrTMz3V40SpkZe9J1yy-1HCAPicbSc5vpeGo,33573
+supervisely-6.73.282.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+supervisely-6.73.282.dist-info/entry_points.txt,sha256=U96-5Hxrp2ApRjnCoUiUhWMqijqh8zLR03sEhWtAcms,102
+supervisely-6.73.282.dist-info/top_level.txt,sha256=kcFVwb7SXtfqZifrZaSE3owHExX4gcNYe7Q2uoby084,28
+supervisely-6.73.282.dist-info/RECORD,,