Lint and format with ruff and black

Author: mfisher87

tests.py

@@ -1,13 +1,13 @@
-from viscm.gui import *
-from viscm.bezierbuilder import *
 import numpy as np
-import matplotlib as mpl
-from matplotlib.backends.qt_compat import QtGui, QtCore
-from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg as FigureCanvas
 
-cms = {"viscm/examples/sample_linear.jscm",
-         "viscm/examples/sample_diverging.jscm",
-         "viscm/examples/sample_diverging_continuous.jscm"}
+from viscm.bezierbuilder import json
+from viscm.gui import Colormap, viscm_editor
+
+cms = {
+    "viscm/examples/sample_linear.jscm",
+    "viscm/examples/sample_diverging.jscm",
+    "viscm/examples/sample_diverging_continuous.jscm",
+}
 
 
 def test_editor_loads_native():
@@ -16,8 +16,13 @@ def test_editor_loads_native():
             data = json.loads(f.read())
         cm = Colormap(None, "CatmulClark", "CAM02-UCS")
         cm.load(k)
-        viscm = viscm_editor(uniform_space=cm.uniform_space, cmtype=cm.cmtype, method=cm.method, **cm.params)
-        assert  viscm.name == data["name"]
+        viscm = viscm_editor(
+            uniform_space=cm.uniform_space,
+            cmtype=cm.cmtype,
+            method=cm.method,
+            **cm.params,
+        )
+        assert viscm.name == data["name"]
 
         extensions = data["extensions"]["https://matplotlib.org/viscm"]
         xp, yp, fixed = viscm.control_point_model.get_control_points()
@@ -26,7 +31,7 @@ def test_editor_loads_native():
         assert len(extensions["xp"]) == len(xp)
         assert len(extensions["yp"]) == len(yp)
         assert len(xp) == len(yp)
-        for i in range(len(xp)): 
+        for i in range(len(xp)):
             assert extensions["xp"][i] == xp[i]
             assert extensions["yp"][i] == yp[i]
         assert extensions["min_Jp"] == viscm.min_Jp
@@ -35,19 +40,34 @@ def test_editor_loads_native():
         assert extensions["cmtype"] == viscm.cmtype
 
         colors = data["colors"]
-        colors = [[int(c[i:i + 2], 16) / 256 for i in range(0, 6, 2)] for c in [colors[i:i + 6] for i in range(0, len(colors), 6)]]
+        colors = [
+            [int(c[i : i + 2], 16) / 256 for i in range(0, 6, 2)]
+            for c in [colors[i : i + 6] for i in range(0, len(colors), 6)]
+        ]
         editor_colors = viscm.cmap_model.get_sRGB(num=256)[0].tolist()
         for i in range(len(colors)):
             for z in range(3):
                 assert colors[i][z] == np.rint(editor_colors[i][z] / 256)
 
+
+# import matplotlib as mpl
+# from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg as FigureCanvas
+# from matplotlib.backends.qt_compat import QtCore, QtGui
+#
 # def test_editor_add_point():
 #     # Testing linear
-
+#
 #     fig = plt.figure()
 #     figure_canvas = FigureCanvas(fig)
-#     linear = viscm_editor(min_Jp=40, max_Jp=60, xp=[-10, 10], yp=[0,0], figure=fig, cmtype="linear")
-
+#     linear = viscm_editor(
+#         min_Jp=40,
+#         max_Jp=60,
+#         xp=[-10, 10],
+#         yp=[0,0],
+#         figure=fig,
+#         cmtype="linear",
+#     )
+#
 #     Jp, ap, bp = linear.cmap_model.get_Jpapbp(3)
 #     eJp, eap, ebp = [40, 50, 60], [-10, 0, 10], [0, 0, 0]
 #     for i in range(3):
@@ -61,12 +81,24 @@ def test_editor_loads_native():
 #     for i in range(3):
 #         for z in range(3):
 #             assert approxeq(rgb[i][z], ergb[i][z])
-    
+
 
 #     # Testing adding a point to linear
 #     linear.bezier_builder.mode = "add"
-#     qtEvent = QtGui.QMouseEvent(QtCore.QEvent.MouseButtonPress, QtCore.QPoint(), QtCore.Qt.LeftButton, QtCore.Qt.LeftButton, QtCore.Qt.ShiftModifier)
-#     event = mpl.backend_bases.MouseEvent("button_press_event", figure_canvas, 0, 10, guiEvent=qtEvent)
+#     qtEvent = QtGui.QMouseEvent(
+#         QtCore.QEvent.MouseButtonPress,
+#         QtCore.QPoint(),
+#         QtCore.Qt.LeftButton,
+#         QtCore.Qt.LeftButton,
+#         QtCore.Qt.ShiftModifier,
+#     )
+#     event = mpl.backend_bases.MouseEvent(
+#         "button_press_event",
+#         figure_canvas,
+#         0,
+#         10,
+#         guiEvent=qtEvent,
+#     )
 #     event.xdata = 0
 #     event.ydata = 10
 #     event.inaxes = linear.bezier_builder.ax
@@ -87,8 +119,20 @@ def test_editor_loads_native():
 
 #     # Removing a point from linear
 #     linear.bezier_builder.mode = "remove"
-#     qtEvent = QtGui.QMouseEvent(QtCore.QEvent.MouseButtonPress, QtCore.QPoint(), QtCore.Qt.LeftButton, QtCore.Qt.LeftButton, QtCore.Qt.ControlModifier)
-#     event = mpl.backend_bases.MouseEvent("button_press_event", figure_canvas, 0, 10, guiEvent=qtEvent)
+#     qtEvent = QtGui.QMouseEvent(
+#         QtCore.QEvent.MouseButtonPress,
+#         QtCore.QPoint(),
+#         QtCore.Qt.LeftButton,
+#         QtCore.Qt.LeftButton,
+#         QtCore.Qt.ControlModifier,
+#     )
+#     event = mpl.backend_bases.MouseEvent(
+#         "button_press_event",
+#         figure_canvas,
+#         0,
+#         10,
+#         guiEvent=qtEvent,
+#     )
 #     event.xdata = 0
 #     event.ydata = 10
 #     event.inaxes = linear.bezier_builder.ax
@@ -102,7 +146,5 @@ def test_editor_loads_native():
 #     # print(linear.cmap_model.get_Jpapbp(3))
 
 
-
 def approxeq(x, y, err=0.0001):
     return abs(y - x) < err
-

viscm/__main__.py

@@ -4,4 +4,5 @@
 # See file LICENSE.txt for license information.
 
 from .cli import cli
+
 cli()

viscm/bezierbuilder.py

@@ -1,4 +1,3 @@
-# coding=utf8
 # BézierBuilder
 #
 # Copyright (c) 2013, Juan Luis Cano Rodríguez <juanlu001@gmail.com>
@@ -32,17 +31,17 @@
 $ python bezier_builder.py
 
 """
-from __future__ import division, print_function, absolute_import
 
-import numpy as np
 from math import factorial
-from scipy import signal
 
+import numpy as np
+from matplotlib.backends.qt_compat import QtCore
 from matplotlib.lines import Line2D
-from matplotlib.backends.qt_compat import QtGui, QtCore
+
 from .minimvc import Trigger
 
-class ControlPointModel(object):
+
+class ControlPointModel:
     def __init__(self, xp, yp, fixed=None):
         # fixed is either None (if no point is fixed) or and index of a fixed
         # point
@@ -84,22 +83,22 @@ def set_control_points(self, xp, yp, fixed=None):
         self.trigger.fire()
 
 
-class ControlPointBuilder(object):
+class ControlPointBuilder:
     def __init__(self, ax, control_point_model):
         self.ax = ax
         self.control_point_model = control_point_model
 
         self.canvas = self.ax.figure.canvas
         xp, yp, _ = self.control_point_model.get_control_points()
-        self.control_polygon = Line2D(xp, yp,
-                                      ls="--", c="#666666", marker="x",
-                                      mew=2, mec="#204a87")
+        self.control_polygon = Line2D(
+            xp, yp, ls="--", c="#666666", marker="x", mew=2, mec="#204a87"
+        )
         self.ax.add_line(self.control_polygon)
 
         # Event handler for mouse clicking
-        self.canvas.mpl_connect('button_press_event', self.on_button_press)
-        self.canvas.mpl_connect('button_release_event', self.on_button_release)
-        self.canvas.mpl_connect('motion_notify_event', self.on_motion_notify)
+        self.canvas.mpl_connect("button_press_event", self.on_button_press)
+        self.canvas.mpl_connect("button_release_event", self.on_button_release)
+        self.canvas.mpl_connect("motion_notify_event", self.on_motion_notify)
 
         self._index = None  # Active vertex
 
@@ -109,7 +108,7 @@ def __init__(self, ax, control_point_model):
 
     def on_button_press(self, event):
         modkey = event.guiEvent.modifiers()
-        # Ignore clicks outside axes 
+        # Ignore clicks outside axes
         if event.inaxes != self.ax:
             return
         res, ind = self.control_polygon.contains(event)
@@ -118,8 +117,7 @@ def on_button_press(self, event):
         if res and (modkey == QtCore.Qt.ControlModifier or self.mode == "remove"):
             # Control-click deletes
             self.control_point_model.remove_point(ind["ind"][0])
-        if (modkey == QtCore.Qt.ShiftModifier or self.mode == "add"):
-
+        if modkey == QtCore.Qt.ShiftModifier or self.mode == "add":
             # Adding a new point. Find the two closest points and insert it in
             # between them.
             total_squared_dists = []
@@ -132,10 +130,7 @@ def on_button_press(self, event):
                 total_squared_dists.append(dist)
             best = np.argmin(total_squared_dists)
 
-            self.control_point_model.add_point(best + 1,
-                                               event.xdata,
-                                               event.ydata)
-
+            self.control_point_model.add_point(best + 1, event.xdata, event.ydata)
 
     def on_button_release(self, event):
         if event.button != 1:
@@ -170,7 +165,7 @@ def compute_bezier_points(xp, yp, at, method, grid=256):
     # arclength(t), and then invert it.
     t = np.linspace(0, 1, grid)
 
-    arclength = compute_arc_length(xp, yp, method, t=t)   
+    arclength = compute_arc_length(xp, yp, method, t=t)
     arclength /= arclength[-1]
     # Now (t, arclength) is a lookup table describing the t -> arclength
     # mapping. Invert it to get at -> t
@@ -181,6 +176,7 @@ def compute_bezier_points(xp, yp, at, method, grid=256):
 
     return method(list(zip(xp, yp)), at_t).T
 
+
 def compute_arc_length(xp, yp, method, t=None, grid=256):
     if t is None:
         t = np.linspace(0, 1, grid)
@@ -194,7 +190,8 @@ def compute_arc_length(xp, yp, method, t=None, grid=256):
     np.hypot(x_deltas, y_deltas, out=arclength_deltas[1:])
     return np.cumsum(arclength_deltas)
 
-class SingleBezierCurveModel(object):
+
+class SingleBezierCurveModel:
     def __init__(self, control_point_model, method="CatmulClark"):
         self.method = eval(method)
         self.control_point_model = control_point_model
@@ -216,15 +213,14 @@ def _refresh(self):
         # self.canvas.draw()
 
 
-class TwoBezierCurveModel(object):
+class TwoBezierCurveModel:
     def __init__(self, control_point_model, method="CatmulClark"):
         self.method = eval(method)
         self.control_point_model = control_point_model
         x, y = self.get_bezier_points()
         self.bezier_curve = Line2D(x, y)
         self.trigger = self.control_point_model.trigger
         self.trigger.add_callback(self._refresh)
-    
 
     def get_bezier_points(self, num=200):
         return self.get_bezier_points_at(np.linspace(0, 1, num))
@@ -233,15 +229,15 @@ def get_bezier_points_at(self, at, grid=256):
         at = np.asarray(at)
         if at.ndim == 0:
             at = np.array([at])
-            
-        low_mask = (at < 0.5)
-        high_mask = (at >= 0.5)
+
+        low_mask = at < 0.5
+        high_mask = at >= 0.5
 
         xp, yp, fixed = self.control_point_model.get_control_points()
         assert fixed is not None
 
-        low_xp = xp[:fixed + 1]
-        low_yp = yp[:fixed + 1]
+        low_xp = xp[: fixed + 1]
+        low_yp = yp[: fixed + 1]
         high_xp = xp[fixed:]
         high_yp = yp[fixed:]
 
@@ -257,21 +253,23 @@ def get_bezier_points_at(self, at, grid=256):
             low_at = (0.5 - (0.5 - low_at) * sf) * 2
         else:
             high_at = (0.5 + (high_at - 0.5) * sf) * 2 - 1
-            low_at = low_at * 2 
-
-        low_points = compute_bezier_points(low_xp, low_yp,
-                                           low_at, self.method, grid=grid)
-        high_points = compute_bezier_points(high_xp, high_yp,
-                                            high_at, self.method, grid=grid)
-        out = np.concatenate([low_points,high_points], 1)
+            low_at = low_at * 2
+
+        low_points = compute_bezier_points(
+            low_xp, low_yp, low_at, self.method, grid=grid
+        )
+        high_points = compute_bezier_points(
+            high_xp, high_yp, high_at, self.method, grid=grid
+        )
+        out = np.concatenate([low_points, high_points], 1)
         return out
 
     def _refresh(self):
         x, y = self.get_bezier_points()
         self.bezier_curve.set_data(x, y)
 
 
-class BezierCurveView(object):
+class BezierCurveView:
     def __init__(self, ax, bezier_curve_model):
         self.ax = ax
         self.bezier_curve_model = bezier_curve_model
@@ -291,19 +289,18 @@ def _refresh(self):
 
 
 # We used to use scipy.special.binom here,
-# but reimplementing it ourself lets us avoid pulling in a dependency 
+# but reimplementing it ourself lets us avoid pulling in a dependency
 # scipy just for that one function.
 def binom(n, k):
     return factorial(n) * 1.0 / (factorial(k) * factorial(n - k))
 
-def Bernstein(n, k):
-    """Bernstein polynomial.
 
-    """
+def Bernstein(n, k):
+    """Bernstein polynomial."""
     coeff = binom(n, k)
 
     def _bpoly(x):
-        return coeff * x ** k * (1 - x) ** (n - k)
+        return coeff * x**k * (1 - x) ** (n - k)
 
     return _bpoly
 
@@ -318,7 +315,8 @@ def Bezier(points, at):
     curve = np.zeros((at_flat.shape[0], 2))
     for ii in range(N):
         curve += np.outer(Bernstein(N - 1, ii)(at_flat), points[ii])
-    return curve.reshape(at.shape + (2,))
+    return curve.reshape((*at.shape, 2))
+
 
 def CatmulClark(points, at):
     points = np.asarray(points)
@@ -327,19 +325,10 @@ def CatmulClark(points, at):
         new_p = np.zeros((2 * len(points), 2))
         new_p[0] = points[0]
         new_p[-1] = points[-1]
-        new_p[1:-2:2] = 3/4. * points[:-1] + 1/4. * points[1:]
-        new_p[2:-1:2] = 1/4. * points[:-1] + 3/4. * points[1:]
+        new_p[1:-2:2] = 3 / 4.0 * points[:-1] + 1 / 4.0 * points[1:]
+        new_p[2:-1:2] = 1 / 4.0 * points[:-1] + 3 / 4.0 * points[1:]
         points = new_p
     xp, yp = zip(*points)
     xp = np.interp(at, np.linspace(0, 1, len(xp)), xp)
     yp = np.interp(at, np.linspace(0, 1, len(yp)), yp)
     return np.asarray(list(zip(xp, yp)))
-
-
-
-
-
-
-
-
-