🚚 rename class names

bluemira/geometry/coordinates.py

@@ -39,7 +39,7 @@
 # =============================================================================
 # Pre-processing utilities
 # =============================================================================
-class RotationAxisType(Enum):
+class RotationAxis(Enum):
     """Enumeration of rotation axes."""
 
     X = auto()
@@ -629,22 +629,22 @@ def rotation_matrix(theta: float, axis: Union[str, np.ndarray] = "z") -> np.ndar
     The (active) rotation matrix about the axis for an angle theta
     """
     if isinstance(axis, str):
-        axis_str = RotationAxisType(axis)
+        axis_str = RotationAxis(axis)
         # I'm leaving all this in here, because it is easier to understand
         # what is going on, and that these are just "normal" rotation matrices
-        if axis_str is RotationAxisType.Z:
+        if axis_str is RotationAxis.Z:
             r_matrix = np.array([
                 [np.cos(theta), -np.sin(theta), 0],
                 [np.sin(theta), np.cos(theta), 0],
                 [0, 0, 1],
             ])
-        elif axis_str is RotationAxisType.Y:
+        elif axis_str is RotationAxis.Y:
             r_matrix = np.array([
                 [np.cos(theta), 0, np.sin(theta)],
                 [0, 1, 0],
                 [-np.sin(theta), 0, np.cos(theta)],
             ])
-        elif axis_str is RotationAxisType.X:
+        elif axis_str is RotationAxis.X:
             r_matrix = np.array([
                 [1, 0, 0],
                 [0, np.cos(theta), -np.sin(theta)],

bluemira/geometry/tools.py

@@ -67,7 +67,7 @@ def convert(apiobj: cadapi.apiShape, label: str = "") -> BluemiraGeo:
     return output
 
 
-class HullPlaneType(Enum):
+class HullPlane(Enum):
     """
     Enumeration of planes to perform a hull operation in.
     """
@@ -730,12 +730,12 @@ def convex_hull_wires_2d(
     if plane is None:
         raise KeyError("Invalid plane. Must be one of 'xz', 'xy', 'yz'.")
 
-    hull_plane = HullPlaneType(plane)
-    if hull_plane is HullPlaneType.XZ:
+    hull_plane = HullPlane(plane)
+    if hull_plane is HullPlane.XZ:
         plane_idxs = (0, 2)
-    elif hull_plane is HullPlaneType.XY:
+    elif hull_plane is HullPlane.XY:
         plane_idxs = (0, 1)
-    elif hull_plane is HullPlaneType.YZ:
+    elif hull_plane is HullPlane.YZ:
         plane_idxs = (1, 2)
     else:
         raise ValueError(f"Invalid plane: '{plane}'. Must be one of 'xz', 'xy', 'yz'.")