Make Y Configuration the Default for 3RP (#116)

* change default to Y configuration

* change default in rp plot

Author: axtimhaus

Diff for: pyroll/core/profile/hookimpls.py

@@ -19,13 +19,13 @@ def width(self: Profile):
 @Profile.height
 def height_3fold(self: Profile):
     if "3fold" in self.classifiers:
-        return (self.cross_section.centroid.y - self.cross_section.bounds[1]) * 2
+        return (self.cross_section.bounds[3] - self.cross_section.centroid.y) * 2
 
 
 @Profile.width
 def width_3fold(self: Profile):
     if "3fold" in self.classifiers:
-        return (self.cross_section.bounds[3] - self.cross_section.centroid.y) * 2
+        return (self.cross_section.centroid.y - self.cross_section.bounds[1]) * 2
 
 
 @Profile.equivalent_height

Diff for: pyroll/core/roll_pass/hookimpls/helpers.py

@@ -17,7 +17,7 @@ def out_cross_section3(rp: ThreeRollPass, width: float) -> Polygon:
     poly = Polygon(np.concatenate([cl.coords for cl in rp.contour_lines]))
 
     for _ in range(3):
-        poly = clip_by_rect(poly, -math.inf, -math.inf, math.inf, width / 2)
+        poly = clip_by_rect(poly, -math.inf, -width / 2, math.inf, math.inf)
         poly = rotate(poly, angle=120, origin=(0, 0))
 
     return poly

Diff for: pyroll/core/roll_pass/hookimpls/profile.py

@@ -1,10 +1,5 @@
-import math
-
-import numpy as np
-from scipy.optimize import root_scalar, fixed_point
-from shapely.affinity import rotate
+from scipy.optimize import fixed_point
 from shapely.geometry import Polygon
-from shapely.ops import clip_by_rect
 
 from ..roll_pass import RollPass
 from ..three_roll_pass import ThreeRollPass
@@ -83,7 +78,7 @@ def cross_section(self: RollPass.OutProfile) -> Polygon:
 @ThreeRollPass.OutProfile.cross_section
 def cross_section3(self: ThreeRollPass.OutProfile) -> Polygon:
     cs = helpers.out_cross_section3(self.roll_pass, self.width)
-    if (cs.bounds[3] - cs.centroid.y) * 2.02 < self.width:
+    if (-cs.bounds[1] + cs.centroid.y) * 2.02 < self.width:
         raise ValueError(
             "Profile's width can not be larger than its contour lines."
             "May be caused by critical overfilling."

Diff for: pyroll/core/roll_pass/hookimpls/roll_pass.py

@@ -112,7 +112,7 @@ def height3(self):
         self.roll.groove.usable_width / 2,
         math.inf
     )
-    return -2 * usable_contour.bounds[1]
+    return 2 * usable_contour.bounds[3]
 
 
 @RollPass.volume

Diff for: pyroll/core/roll_pass/roll_pass.py

@@ -242,16 +242,19 @@ def plot(self, **kwargs):
         ax.grid(lw=0.5)
 
         def oriented(geom):
-            if isinstance(self.orientation, int) and self.orientation != 0:
-                return rotate(geom, self.orientation, (0, 0))
-            elif self.orientation == 0:
-                return geom
-            elif self.orientation.lower() in ["horizontal", "h", "antiy", "ay"]:
-                return geom
-            elif self.orientation.lower() in ["vertical", "v"]:
-                return rotate(geom, 90, (0, 0))
-            elif self.orientation.lower() in ["y"]:
-                return rotate(geom, 180, (0, 0))
+            orientation = self.orientation
+
+            if isinstance(orientation, str):
+                if orientation.lower() in ["horizontal", "h", "y"]:
+                    orientation = 0
+                elif orientation.lower() in ["vertical", "v"]:
+                    orientation = 90
+                elif orientation.lower() in ["antiy", "ay"]:
+                    orientation = 180
+
+            if orientation != 0:
+                return rotate(geom, orientation, (0, 0))
+            return geom
 
         artists = []
 

Diff for: pyroll/core/roll_pass/three_roll_pass.py

@@ -18,12 +18,12 @@ def contour_lines(self) -> List[LineString]:
             return self._contour_lines
 
         shift = self.roll.groove.usable_width / 2 / np.sqrt(3) + self.gap / np.sqrt(3)
-        lower = rotate(translate(self.roll.contour_line, yoff=shift), angle=180, origin=(0, 0))
-        lower = LineString(lower.coords[::-1])  # get back coordinate order
-        right = rotate(lower, angle=120, origin=(0, 0))
-        left = rotate(lower, angle=-120, origin=(0, 0))
+        upper = translate(self.roll.contour_line, yoff=shift)
+        upper = LineString(upper.coords[::-1])  # get back coordinate order
+        right = rotate(upper, angle=-120, origin=(0, 0))
+        left = rotate(upper, angle=120, origin=(0, 0))
 
-        self._contour_lines = [left, lower, right]
+        self._contour_lines = [right, upper, left]
         return self._contour_lines
 
     @property