mirror
/
inkstitch
kopia lustrzana https://github.com/inkstitch/inkstitch
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

remove debug timing in frequently-run functions

pull/2346/head
Lex Neva 2023-05-29 21:45:31 -04:00 zatwierdzone przez Kaalleen
rodzic 1256505188
commit ec68c17a05
2 zmienionych plików z 3 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
lib/stitches/running_stitch.py
Wyświetl plik

@ -11,7 +11,6 @@ from copy import copy
import numpy as np import numpy as np
from shapely import geometry as shgeo from shapely import geometry as shgeo
from ..debug import debug
from ..utils import prng from ..utils import prng
from ..utils.geometry import Point from ..utils.geometry import Point
from ..utils.threading import check_stop_flag from ..utils.threading import check_stop_flag
@ -248,7 +247,6 @@ def path_to_curves(points: typing.List[Point], min_len: float):
return curves return curves
@debug.time
def running_stitch(points, stitch_length, tolerance): def running_stitch(points, stitch_length, tolerance):
# Turn a continuous path into a running stitch. # Turn a continuous path into a running stitch.
stitches = [points[0]] stitches = [points[0]]

10
lib/utils/smoothing.py
Wyświetl plik

@ -3,7 +3,6 @@ from scipy.interpolate import splprep, splev
from .geometry import Point, coordinate_list_to_point_list from .geometry import Point, coordinate_list_to_point_list
from ..stitches.running_stitch import running_stitch from ..stitches.running_stitch import running_stitch
from ..debug import debug
def _remove_duplicate_coordinates(coords_array): def _remove_duplicate_coordinates(coords_array):
@ -23,7 +22,6 @@ def _remove_duplicate_coordinates(coords_array):
return coords_array[keepers] return coords_array[keepers]
@debug.time
def smooth_path(path, smoothness=1.0): def smooth_path(path, smoothness=1.0):
"""Smooth a path of coordinates. """Smooth a path of coordinates.
@ -70,8 +68,7 @@ def smooth_path(path, smoothness=1.0):
# .T transposes the array (for some reason splprep expects # .T transposes the array (for some reason splprep expects
# [[x1, x2, ...], [y1, y2, ...]] # [[x1, x2, ...], [y1, y2, ...]]
with debug.time_this("splprep"): tck, fp, ier, msg = splprep(coords.T, s=s, k=3, nest=-1, full_output=1)
tck, fp, ier, msg = splprep(coords.T, s=s, k=3, nest=-1, full_output=1)
if ier > 0: if ier > 0:
debug.log(f"error {ier} smoothing path: {msg}") debug.log(f"error {ier} smoothing path: {msg}")
return path return path
@ -79,8 +76,7 @@ def smooth_path(path, smoothness=1.0):
# Evaluate the spline curve at many points along its length to produce the # Evaluate the spline curve at many points along its length to produce the
# smoothed point list. 2 * num_points seems to be a good number, but it # smoothed point list. 2 * num_points seems to be a good number, but it
# does produce a lot of points. # does produce a lot of points.
with debug.time_this("splev"): smoothed_x_values, smoothed_y_values = splev(np.linspace(0, 1, int(num_points * 2)), tck[0])
smoothed_x_values, smoothed_y_values = splev(np.linspace(0, 1, int(num_points * 2)), tck[0]) coords = np.array([smoothed_x_values, smoothed_y_values]).T
coords = np.array([smoothed_x_values, smoothed_y_values]).T
return [Point(x, y) for x, y in coords] return [Point(x, y) for x, y in coords]