Added an option to also flip lines to reverse command (#654)

CHANGELOG.md

@@ -6,7 +6,7 @@ Release date: UNRELEASED
 
 ### New features and improvements
 
-* ...
+* Added an option to the `reverse` command to also flip the line direction (#654)
 
 ### Bug fixes
 

justfile

@@ -10,6 +10,10 @@ update-deps:
 test:
   pytest
 
+lint:
+  mypy
+  ruff check vpype vpype_cli vpype_viewer tests
+
 # run previously failed tests
 test-failed:
   pytest --last-failed

pyproject.toml

@@ -37,9 +37,9 @@ python = ">=3.9, <3.12"
 cachetools = ">=4.2.2"
 click = ">=8.0.1,<8.2.0"
 multiprocess = ">=0.70.11"
-numpy = ">=1.20"
+numpy = ">=1.25"
 pnoise = ">=0.2.0"
-Shapely = {extras = ["vectorized"], version = ">=1.8.2"}
+Shapely = ">=1.8.2"
 scipy = ">=1.6"
 svgelements = ">=1.6.10"
 svgwrite = "~1.4"

tests/test_commands.py

@@ -80,6 +80,7 @@ class Command:
     Command("stat"),
     Command("snap 1"),
     Command("reverse"),
+    Command("reverse --flip"),
     Command("layout a4", keeps_page_size=False),
     Command("squiggles"),
     Command("text 'hello wold'"),

tests/test_model.py

@@ -152,6 +152,14 @@ def test_line_collection_reverse():
         assert np.all(lc[i] == np.array(line))
 
 
+def test_line_collection_flip_lines():
+    line_arr = [(0, 100j, 1000, 10), (5j, 3, 25j), (3 + 3j, 100, 10j)]
+    lc = LineCollection(line_arr)
+    lc.flip_lines()
+    for i, line in enumerate(line_arr):
+        assert np.all(lc[i] == np.array(line[::-1]))
+
+
 def test_line_collection_clone():
     metadata = {"line_width": 0.3}
     lc = LineCollection(([0, 1, 10 + 10j], [0, 10]), metadata=metadata)

tests/test_types.py

@@ -12,7 +12,7 @@ def test_float_type():
     @click.argument("arg", type=vpype_cli.FloatType())
     @vpype_cli.generator
     def cmd(arg: float) -> vp.LineCollection:
-        assert type(arg) is float
+        assert isinstance(arg, float)
         return vp.LineCollection()
 
     vpype_cli.execute("floatcmd 3.5")
@@ -25,7 +25,7 @@ def test_int_range_type():
     @click.argument("arg", type=vpype_cli.IntRangeType(min=10, max=14))
     @vpype_cli.generator
     def cmd(arg: int) -> vp.LineCollection:
-        assert type(arg) is int
+        assert isinstance(arg, int)
         assert 10 <= arg <= 14
         return vp.LineCollection()
 

vpype/model.py

@@ -239,6 +239,10 @@ def reverse(self) -> None:
         """Reverse order of the lines."""
         self._lines = list(reversed(self._lines))
 
+    def flip_lines(self) -> None:
+        """Flip the direction of all lines."""
+        self._lines = [np.flip(line) for line in self._lines]
+
     def __iter__(self):
         return self._lines.__iter__()
 

vpype_cli/operations.py

@@ -695,16 +695,22 @@ def snap(line_collection: vp.LineCollection, pitch: float) -> vp.LineCollection:
 
 
 @cli.command(group="Operations")
+@click.option("-f", "--flip", is_flag=True, help="Also flip the path direction.")
 @layer_processor
-def reverse(line_collection: vp.LineCollection) -> vp.LineCollection:
+def reverse(line_collection: vp.LineCollection, flip: bool) -> vp.LineCollection:
     """Reverse order of lines.
 
-    Reverse the order of lines within their respective layers. Individual lines are not
-    modified (in particular, their trajectory is not inverted). Only the order in which they
-    are drawn is reversed.
+    Reverse the order of lines within their respective layers. By default, individual lines are
+    not modified (in particular, their trajectory is not inverted). Only the order in which
+    they are drawn is reversed.
+
+    If -f/--flip is passed, the direction of each line is also reversed.
     """
 
     line_collection.reverse()
+    if flip:
+        line_collection.flip_lines()
+
     return line_collection