compas-nest 0.1.1.dev5__tar.gz → 0.1.1.dev7__tar.gz

{compas_nest-0.1.1.dev5 → compas_nest-0.1.1.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: compas_nest
-Version: 0.1.1.dev5
+Version: 0.1.1.dev7
 Summary: 2D irregular nesting (OpenNest) for COMPAS.
 Author-Email: Petras Vestartas <petrasvestartas@gmail.com>
 Classifier: License :: OSI Approved :: MIT License

{compas_nest-0.1.1.dev5 → compas_nest-0.1.1.dev7}/examples/06_pack_array.py

@@ -44,7 +44,7 @@ geo.add_part(
 )
 
 # 2. pack into an array: a fixed number of elements per row (5), wrapping to the next row
-result: nest_result = pack(geo, columns=5, gap_x=0.0, gap_y=0.0)
+result: nest_result = pack(geo, columns=5, gap_x=1.0, gap_y=1.0)
 
 # 3. view the grid layout (elements blue)
 viewer: Viewer = Viewer()

compas_nest-0.1.1.dev7/examples/08_text.py

@@ -0,0 +1,28 @@
+from pathlib import Path
+
+from compas.colors import Color
+from compas.data import json_dump
+from compas.geometry import Frame
+from compas_viewer import Viewer
+
+from compas_nest import text_to_polylines
+
+BLUE: Color = Color.from_hex("#0072B2")
+OUTPUT: Path = Path(__file__).parent.parent / "data" / "output" / "08_text.json"
+
+# 1. a frame to place/orient the text (origin = text origin, x-axis = reading direction)
+frame: Frame = Frame([0.0, 0.0, 0.0], [1.0, 0.0, 0.0], [0.0, 1.0, 0.0])
+
+# 2. render text to single-stroke polylines (OpenNest XML font) on that frame, 10-unit cap height
+strokes: list = text_to_polylines("compas_nest\n0 1 2 3 4 5 6 7 8 9", height=10.0, font="regular", frame=frame)
+
+# 3. view the frame and the stroke polylines (blue)
+viewer: Viewer = Viewer()
+viewer.scene.add(frame)
+for stroke in strokes:
+    viewer.scene.add(stroke, linecolor=BLUE, linewidth=2)
+viewer.show()
+
+# 4. save the polylines to JSON
+OUTPUT.parent.mkdir(parents=True, exist_ok=True)
+json_dump(strokes, OUTPUT)

{compas_nest-0.1.1.dev5 → compas_nest-0.1.1.dev7}/src/compas_nest/fonts/regular.xml

@@ -544,14 +544,11 @@
   </letter>
   <!-- DIGIT ZERO -->
   <letter code="48" start="0.1" end="0.6">
-    <path x="0.2650943396226" y="0.90283018867925">
-      <to x="0.2650943396226" y="0.09716981132075"/>
-      <to x="0.43490566037731" y="0.09716981132075"/>
-      <to x="0.43490566037731" y="0.90283018867925"/>
-      <to x="0.2650943396226" y="0.90283018867925"/>
-    </path>
-    <path x="0.15" y="0.00">
-      <to x="0.55" y="0.00" />
+    <path x="0.10" y="0.30">
+      <to x="0.55" y="0.30" b="-1.00" />
+      <to x="0.55" y="0.70" />
+      <to x="0.10" y="0.70" b="-1.00" />
+      <to x="0.10" y="0.30" />
     </path>
   </letter>
   <!-- DIGIT ONE -->
@@ -564,10 +561,10 @@
   </letter>
   <!-- DIGIT TWO -->
   <letter code="50" start="0.1" end="0.6">
-    <path x="0.55" y="0.05">
-      <to x="0.15" y="0.05" />
-      <to x="0.51891730682301" y="0.63825409294735" />
-      <to x="0.15000000000001" y="0.80" />
+    <path x="0.12" y="0.68">
+      <to x="0.54" y="0.68" b="1.00" />
+      <to x="0.10" y="0.06" />
+      <to x="0.56" y="0.06" />
     </path>
   </letter>
   <!-- DIGIT THREE -->
@@ -609,17 +606,12 @@
   </letter>
   <!-- DIGIT SIX -->
   <letter code="54" start="0.1" end="0.6">
-    <path x="0.15" y="0.55">
-      <to x="0.35" y="0.55" />
-      <to x="0.55" y="0.35" />
-      <to x="0.55" y="0.25" />
-      <to x="0.35" y="0.05"/>
-      <to x="0.15" y="0.25" />
-      <to x="0.15" y="0.55" />
-      <to x="0.45000000000001" y="0.95"  />
+    <path x="0.13" y="0.28">
+      <to x="0.57" y="0.28" b="-1.00" />
+      <to x="0.13" y="0.28" b="-1.00" />
     </path>
-    <path x="0.15" y="0.00">
-      <to x="0.55" y="0.00" />
+    <path x="0.52" y="0.86">
+      <to x="0.135" y="0.40" b="-0.50" />
     </path>
   </letter>
   <!-- DIGIT SEVEN -->
@@ -632,33 +624,23 @@
   </letter>
   <!-- DIGIT EIGHT -->
   <letter code="56" start="0.1" end="0.6">
-    <path x="0.2650943396" y="0.9028301887">
-      <to x="0.2650943396" y="0.5874993152" />
-      <to x="0.4349056604" y="0.4125006848" />
-      <to x="0.4349056604" y="0.0971698113" />
-      <to x="0.2650943396" y="0.0971698113" />
-      <to x="0.2650943396" y="0.4125006848"  />
-      <to x="0.4349056604" y="0.5874993152" />
-      <to x="0.4349056604" y="0.9028301887" />
-      <to x="0.2650943396" y="0.9028301887" />
+    <path x="0.11" y="0.30">
+      <to x="0.59" y="0.30" b="-1.00" />
+      <to x="0.11" y="0.30" b="-1.00" />
     </path>
-    <path x="0.15" y="0.00">
-      <to x="0.55" y="0.00" />
+    <path x="0.15" y="0.74">
+      <to x="0.55" y="0.74" b="-1.00" />
+      <to x="0.15" y="0.74" b="-1.00" />
     </path>
   </letter>
   <!-- DIGIT NINE -->
   <letter code="57" start="0.1" end="0.6">
-    <path x="0.55" y="0.45">
-      <to x="0.35" y="0.45" />
-      <to x="0.15" y="0.65"  />
-      <to x="0.15" y="0.75" />
-      <to x="0.35" y="0.95" />
-      <to x="0.55" y="0.75"  />
-      <to x="0.55" y="0.45" />
-      <to x="0.24999999999999" y="0.05"  />
+    <path x="0.13" y="0.72">
+      <to x="0.57" y="0.72" b="-1.00" />
+      <to x="0.13" y="0.72" b="-1.00" />
     </path>
-    <path x="0.15" y="0.00">
-      <to x="0.55" y="0.00" />
+    <path x="0.18" y="0.14">
+      <to x="0.565" y="0.60" b="-0.50" />
     </path>
   </letter>
   <!-- PLUS SIGN -->

{compas_nest-0.1.1.dev5 → compas_nest-0.1.1.dev7}/src/compas_nest/result.py

@@ -3,13 +3,14 @@
 import math
 import os
 
+from compas.data import Data
 from compas.data import json_dump
 from compas.geometry import Rotation
 from compas.geometry import Translation
 
 
-class nest_result:
-    """Placements produced by a nesting engine.
+class nest_result(Data):
+    """Placements produced by a nesting engine (a serializable COMPAS ``Data``).
 
     The placement contract (shared by both engines) is::
 
@@ -30,15 +31,37 @@ class nest_result:
         Number of sheets actually used.
     fitness : float, optional
         Solver fitness (NFP engine only).
+    name : str, optional
     """
 
-    def __init__(self, placements, geo, sheet_origins, n_sheets, fitness=None):
+    def __init__(self, placements, geo, sheet_origins, n_sheets, fitness=None, name=None):
+        super().__init__(name=name)
         self.placements = placements
         self.geo = geo
         self.sheet_origins = sheet_origins
         self.n_sheets = n_sheets
         self.fitness = fitness
 
+    @property
+    def __data__(self):
+        return {
+            "placements": [dict(p) for p in self.placements],
+            "geo": self.geo,
+            "sheet_origins": [[float(o[0]), float(o[1])] for o in self.sheet_origins],
+            "n_sheets": int(self.n_sheets),
+            "fitness": self.fitness,
+        }
+
+    @classmethod
+    def __from_data__(cls, data):
+        return cls(
+            data["placements"],
+            data["geo"],
+            [tuple(o) for o in data["sheet_origins"]],
+            data["n_sheets"],
+            data.get("fitness"),
+        )
+
     @property
     def placed(self):
         """list[dict] : Placements that landed on a sheet (``sheet_id >= 0``)."""

{compas_nest-0.1.1.dev5 → compas_nest-0.1.1.dev7}/src/compas_nest/text.py

@@ -90,9 +90,14 @@ def _font(name="regular"):
     return _FONTS[name]
 
 
-def text_to_polylines(text, height=1.0, font="regular", origin=(0.0, 0.0), spacing=H_SPACING):
+def text_to_polylines(text, height=1.0, font="regular", frame=None, spacing=H_SPACING):
     """Render ``text`` to a list of single-stroke :class:`compas.geometry.Polyline`.
 
+    The text is laid out on the XY plane with the first line's baseline-left at the origin, then
+    oriented/placed onto ``frame`` — so you can drop a label anywhere (e.g. on a nested sheet) with
+    any orientation. ``frame`` axes also scale: use a frame with unit axes to keep ``height`` as the
+    cap height.
+
     Parameters
     ----------
     text : str
@@ -101,23 +106,23 @@ def text_to_polylines(text, height=1.0, font="regular", origin=(0.0, 0.0), spaci
         Cap height (em) the glyphs are scaled to.
     font : str, optional
         Packaged font name: ``"regular"`` or ``"bold"``.
-    origin : tuple[float, float], optional
-        Lower-left start position of the first line.
+    frame : :class:`compas.geometry.Frame`, optional
+        Where to place/orient the text. Its origin is the text origin, its x-axis the reading
+        direction and y-axis "up". Defaults to the world XY frame.
     spacing : float, optional
         Extra gap between glyphs, in em.
 
     Returns
     -------
     list[:class:`compas.geometry.Polyline`]
-        One polyline per stroke, in the XY plane, scaled by ``height``.
+        One polyline per stroke.
     """
     glyphs = _font(font)
     fallback = glyphs.get("\0")
-    ox, oy = origin
     out = []
     for line_i, line in enumerate(text.split("\n")):
-        x = ox
-        y = oy - line_i * V_SPACING * height
+        x = 0.0
+        y = -line_i * V_SPACING * height
         for ch in line:
             glyph = glyphs.get(ch, fallback)
             if glyph is None:
@@ -127,4 +132,10 @@ def text_to_polylines(text, height=1.0, font="regular", origin=(0.0, 0.0), spaci
             for stroke in glyph["strokes"]:
                 out.append(Polyline([[x + px * height, y + py * height, 0.0] for (px, py) in stroke]))
             x += glyph["end"] * height + spacing * height
+
+    if frame is not None:
+        from compas.geometry import Transformation
+
+        matrix = Transformation.from_frame(frame)
+        out = [pl.transformed(matrix) for pl in out]
     return out

{compas_nest-0.1.1.dev5 → compas_nest-0.1.1.dev7}/tests/test_nesting.py

@@ -137,6 +137,23 @@ def test_text_to_polylines():
     assert max(len(pl.points) for pl in text_to_polylines("C", height=10.0)) > 3
 
 
+def test_result_serialization_roundtrip(geo, sheets):
+    result = opennest_collision(iterations=200, num_rotations=8, seed=1, verbose=False).solve(geo, sheets)
+    reloaded = json_loads(json_dumps(result))
+    assert type(reloaded).__name__ == "nest_result"
+    assert reloaded.n_sheets == result.n_sheets
+    assert len(reloaded.placed) == len(result.placed)
+    assert len(reloaded.placed_polylines()) == len(result.placed_polylines())  # geo survived too
+
+
+def test_text_frame_places_and_orients():
+    from compas.geometry import Frame
+
+    plain = text_to_polylines("A", height=10.0)
+    framed = text_to_polylines("A", height=10.0, frame=Frame([100, 0, 0], [1, 0, 0], [0, 1, 0]))
+    assert framed[0].points[0][0] > plain[0].points[0][0] + 90  # shifted to the frame origin
+
+
 def test_from_size_factory():
     sheets = nest_sheets.from_size(100, 50, count=2)
     assert len(sheets.sheets) == 2

compas_nest-0.1.1.dev5/examples/08_text.py

@@ -1,23 +0,0 @@
-from pathlib import Path
-
-from compas.colors import Color
-from compas.data import json_dump
-from compas_viewer import Viewer
-
-from compas_nest import text_to_polylines
-
-BLUE: Color = Color.from_hex("#0072B2")
-OUTPUT: Path = Path(__file__).parent.parent / "data" / "output" / "08_text.json"
-
-# 1. render text to single-stroke polylines (OpenNest XML font), 10-unit cap height
-strokes: list = text_to_polylines("compas_nest\n0 1 2", height=10.0, font="regular")
-
-# 2. view the stroke polylines (blue)
-viewer: Viewer = Viewer()
-for stroke in strokes:
-    viewer.scene.add(stroke, linecolor=BLUE, linewidth=2)
-viewer.show()
-
-# 3. save the polylines to JSON
-OUTPUT.parent.mkdir(parents=True, exist_ok=True)
-json_dump(strokes, OUTPUT)