Lossless adaptive templates (#569)

* Initial commit

* Update src/ansys/motorcad/core/geometry.py

* Update src/ansys/motorcad/core/geometry.py

* Update src/ansys/motorcad/core/geometry.py

* Update formatting

* Update formatting 1

* Update formatting 2

* Fix failing set/get geometry region json tests

* Update linked regions to use names and fetch regions

* Add docstrings

* Fix to_json error

* Updated GeometryTrees to support new linked_regions

* Removed poorly structured test

* Changed linked_regions in Region to be fetched along with region, along with test fixes

* Make sure information is not lost when Regions are converted to JSON for sending and receiving to and from motorCAD

* Apply suggestion from @jgsdavies

* Apply suggestion from @jgsdavies

---------

Co-authored-by: matthewAnsys <[email protected]>
Co-authored-by: Matthew Jones <[email protected]>
Co-authored-by: Jack Davies <[email protected]>

Author: 3 people

src/ansys/motorcad/core/geometry.py

@@ -320,6 +320,8 @@ def _from_json(cls, json, motorcad_instance=None):
         if "lamination_type" in json:
             new_region._lamination_type = json["lamination_type"]
 
+        new_region._raw_region = json
+
         return new_region
 
     # method to convert python object to send to Motor-CAD
@@ -336,26 +338,41 @@ def _to_json(self):
         else:
             lamination_type = ""
 
-        region_dict = {
-            "name": self._name,
-            "name_base": self._base_name,
-            "material": self._material,
-            "colour": {"r": self._colour[0], "g": self._colour[1], "b": self._colour[2]},
-            "area": self._area,
-            "centroid": {"x": self._centroid.x, "y": self._centroid.y},
-            "region_coordinate": {"x": self._region_coordinate.x, "y": self._region_coordinate.y},
-            "duplications": self._duplications,
-            "entities": _convert_entities_to_json(self.entities),
-            "parent_name": self._parent_name,
-            "region_type": self._region_type.value,
-            "mesh_length": self.mesh_length,
-            "linked_regions": self.linked_region_names,
-            "on_boundary": False if len(self.linked_regions) == 0 else True,
-            "singular": self._singular,
-            "lamination_type": lamination_type,
+        try:
+            self._raw_region
+        except AttributeError:
+            self._raw_region = dict()
+        # Previous implementations had users only generally interact with the unique name,
+        # assigning it as the name attribute if possible. This behaviour is maintained for
+        # now, though it is a piece of information lost that future users may want control over
+
+        self._raw_region["name"] = self._name
+        if "name_unique" in self._raw_region:
+            self._raw_region["name_unique"] = self._name
+        self._raw_region["name_base"] = self._base_name
+        self._raw_region["material"] = self._material
+        self._raw_region["colour"] = {
+            "r": self._colour[0],
+            "g": self._colour[1],
+            "b": self._colour[2],
         }
-
-        return region_dict
+        self._raw_region["area"] = self._area
+        self._raw_region["centroid"] = {"x": self._centroid.x, "y": self._centroid.y}
+        self._raw_region["region_coordinate"] = {
+            "x": self._region_coordinate.x,
+            "y": self._region_coordinate.y,
+        }
+        self._raw_region["duplications"] = self._duplications
+        self._raw_region["entities"] = _convert_entities_to_json(self.entities)
+        self._raw_region["parent_name"] = self.parent_name
+        self._raw_region["region_type"] = self._region_type.value
+        self._raw_region["mesh_length"] = self.mesh_length
+        self._raw_region["linked_regions"] = self.linked_region_names
+        self._raw_region["on_boundary"] = False if len(self.linked_regions) == 0 else True
+        self._raw_region["singular"] = self._singular
+        self._raw_region["lamination_type"] = lamination_type
+
+        return self._raw_region
 
     @property
     def parent_name(self):