Merge pull request #2202 from gdsfactory/add_bbox_to_bend

add optional function add_bbox to bend_euler and bend_circular
gdsfactory · Oct 20, 2023 · 2835046 · 2835046
2 parents e5ed4de + abd4174
commit 2835046
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 3 deletions.
diff --git a/gdsfactory/components/bend_circular.py b/gdsfactory/components/bend_circular.py
@@ -18,6 +18,7 @@ def bend_circular(
     width: float | None = None,
     cross_section: CrossSectionSpec = "xs_sc",
     add_pins: bool = True,
+    add_bbox: callable | None = None,
 ) -> Component:
     """Returns a radial arc.
 
@@ -29,6 +30,7 @@ def bend_circular(
         width: width to use. Defaults to cross_section.width.
         cross_section: spec (CrossSection, string or dict).
         add_pins: add pins to the component.
+        add_bbox: optional function to add bounding box to the component.
 
     .. code::
 
@@ -58,7 +60,10 @@ def bend_circular(
 
     top = None if int(angle) in {180, -180, -90} else 0
     bottom = 0 if int(angle) in {-90} else None
-    x.add_bbox(c, top=top, bottom=bottom)
+    if add_bbox:
+        add_bbox(c)
+    else:
+        x.add_bbox(c, top=top, bottom=bottom)
     if add_pins:
         x.add_pins(c)
     c.add_route_info(

diff --git a/gdsfactory/components/bend_euler.py b/gdsfactory/components/bend_euler.py
@@ -25,6 +25,7 @@ def bend_euler(
     direction: str = "ccw",
     cross_section: CrossSectionSpec = "xs_sc",
     add_pins: bool = True,
+    add_bbox: callable | None = None,
 ) -> Component:
     """Euler bend with changing bend radius.
 
@@ -50,6 +51,7 @@ def bend_euler(
         direction: cw (clock-wise) or ccw (counter clock-wise).
         cross_section: specification (CrossSection, string, CrossSectionFactory dict).
         add_pins: add pins to the component.
+        add_bbox: optional function to add bounding box to the component.
 
     .. code::
 
@@ -88,7 +90,10 @@ def bend_euler(
 
     top = None if int(angle) in {180, -180, -90} else 0
     bottom = 0 if int(angle) in {-90} else None
-    x.add_bbox(c, top=top, bottom=bottom)
+    if add_bbox:
+        add_bbox(c)
+    else:
+        x.add_bbox(c, top=top, bottom=bottom)
     if add_pins:
         x.add_pins(c)
     c.absorb(ref)

diff --git a/gdsfactory/components/straight.py b/gdsfactory/components/straight.py
@@ -44,7 +44,8 @@ def straight(
 
     if add_bbox:
         add_bbox(c)
-    x.add_bbox(c, right=0, left=0)
+    else:
+        x.add_bbox(c, right=0, left=0)
     if add_pins:
         x.add_pins(c)
     c.info["length"] = length

diff --git a/gdsfactory/samples/pdk/test_fab_c/test_settings_bend_euler_nc_.yml b/gdsfactory/samples/pdk/test_fab_c/test_settings_bend_euler_nc_.yml
@@ -63,6 +63,7 @@ settings:
       width_wide: null
   child: null
   default:
+    add_bbox: null
     add_pins: true
     angle: 90.0
     cross_section: xs_sc
@@ -74,6 +75,7 @@ settings:
     width: null
     with_arc_floorplan: true
   full:
+    add_bbox: null
     add_pins: true
     angle: 90.0
     cross_section:

diff --git a/test-data-regression/test_settings_add_trenches90_.yml b/test-data-regression/test_settings_add_trenches90_.yml
@@ -34,6 +34,7 @@ settings:
     changed: {}
     child: null
     default:
+      add_bbox: null
       add_pins: true
       angle: 90.0
       cross_section: xs_sc
@@ -45,6 +46,7 @@ settings:
       width: null
       with_arc_floorplan: true
     full:
+      add_bbox: null
       add_pins: true
       angle: 90.0
       cross_section: xs_sc

diff --git a/test-data-regression/test_settings_bend_circular180_.yml b/test-data-regression/test_settings_bend_circular180_.yml
@@ -29,6 +29,7 @@ settings:
     angle: 180
   child: null
   default:
+    add_bbox: null
     add_pins: true
     angle: 90.0
     cross_section: xs_sc
@@ -37,6 +38,7 @@ settings:
     radius: null
     width: null
   full:
+    add_bbox: null
     add_pins: true
     angle: 180
     cross_section: xs_sc

diff --git a/test-data-regression/test_settings_bend_circular_.yml b/test-data-regression/test_settings_bend_circular_.yml
@@ -28,6 +28,7 @@ settings:
   changed: {}
   child: null
   default:
+    add_bbox: null
     add_pins: true
     angle: 90.0
     cross_section: xs_sc
@@ -36,6 +37,7 @@ settings:
     radius: null
     width: null
   full:
+    add_bbox: null
     add_pins: true
     angle: 90.0
     cross_section: xs_sc

diff --git a/test-data-regression/test_settings_bend_euler180_.yml b/test-data-regression/test_settings_bend_euler180_.yml
@@ -29,6 +29,7 @@ settings:
     angle: 180
   child: null
   default:
+    add_bbox: null
     add_pins: true
     angle: 90.0
     cross_section: xs_sc
@@ -40,6 +41,7 @@ settings:
     width: null
     with_arc_floorplan: true
   full:
+    add_bbox: null
     add_pins: true
     angle: 180
     cross_section: xs_sc

diff --git a/test-data-regression/test_settings_bend_euler_.yml b/test-data-regression/test_settings_bend_euler_.yml
@@ -28,6 +28,7 @@ settings:
   changed: {}
   child: null
   default:
+    add_bbox: null
     add_pins: true
     angle: 90.0
     cross_section: xs_sc
@@ -39,6 +40,7 @@ settings:
     width: null
     with_arc_floorplan: true
   full:
+    add_bbox: null
     add_pins: true
     angle: 90.0
     cross_section: xs_sc

diff --git a/test-data-regression/test_settings_bend_euler_trenches_.yml b/test-data-regression/test_settings_bend_euler_trenches_.yml
@@ -34,6 +34,7 @@ settings:
     changed: {}
     child: null
     default:
+      add_bbox: null
       add_pins: true
       angle: 90.0
       cross_section: xs_sc
@@ -45,6 +46,7 @@ settings:
       width: null
       with_arc_floorplan: true
     full:
+      add_bbox: null
       add_pins: true
       angle: 90.0
       cross_section: xs_sc