renamed is_point to is_scatter

Author: Davide-sd

doc/source/changelog.rst

@@ -65,13 +65,15 @@ v4.0.0
 
   * BREAKING: Split the ``GeometrySeries`` into ``Geometry2DSeries`` and
     ``Geometry3DSeries`` for better code separation.
+  * BREAKING: Changed the init signature of ``NicholsLineSeries``.
   * Added attribute ``Geometry2DSeries.range_x`` which allows to plot a
     ``Line2D`` in the specified range along the x-axis.
   * Added attribute ``LineOver1DRangeSeries.poles_rendering_kw``,
     which is a dictionary of keyword arguments passed to the specific plotting
     library renderer in order to customize the appearance of vertical lines
     representing essential discontinuities.
-  * BREAKING: Changed the init signature of ``NicholsLineSeries``.
+  * Renamed attribute ``is_point`` to ``is_scatter`` to better represent
+    its intention.
   * Fixed bugs:
 
     * with the numerical algorithm about singularities detection of

spb/backends/bokeh/bokeh.py

@@ -247,7 +247,7 @@ def _set_piecewise_color(self, s, color):
         if "color" not in s.rendering_kw:
             # only set the color if the user didn't do that already
             s.rendering_kw["color"] = color
-            if s.is_point and (not s.is_filled):
+            if s.is_scatter and (not s.is_filled):
                 s.rendering_kw["fill_color"] = "white"
 
     @staticmethod
@@ -348,7 +348,7 @@ def _get_segments(self, x, y, *others):
 
     def _create_gradient_line(
         self, x_key, y_key, p_key, source, colormap, name, line_kw,
-        is_point=False
+        is_scatter=False
     ):
         param = source[p_key]
         color_mapper = self.bokeh.models.LinearColorMapper(
@@ -361,7 +361,7 @@ def _create_gradient_line(
             line_color={"field": p_key, "transform": color_mapper},
         )
         kw = self.merge({}, lkw, line_kw)
-        if not is_point:
+        if not is_scatter:
             glyph = self.bokeh.models.MultiLine(xs=x_key, ys=y_key, **kw)
         else:
             glyph = self.bokeh.models.Scatter(x=x_key, y=y_key, **kw)

spb/backends/bokeh/renderers/line2d.py

@@ -8,7 +8,7 @@ def _draw_line2d_helper(renderer, data):
 
     if s.is_parametric and s.use_cm:
         x, y, param = data
-        if not s.is_point:
+        if not s.is_scatter:
             x, y, param = p._get_segments(x, y, param)
         colormap = (
             next(p._cyccm)
@@ -18,7 +18,7 @@ def _draw_line2d_helper(renderer, data):
         source = {"xs": x, "ys": y, "us": param}
         ds, line, cb, kw = p._create_gradient_line(
             "xs", "ys", "us", source, colormap, s.get_label(p.use_latex),
-            s.rendering_kw, s.is_point)
+            s.rendering_kw, s.is_scatter)
         h = p._fig.add_glyph(ds, line)
         handle.append(h)
         tooltips = [("x", "@xs"), ("y", "@ys"), ("u", "@us")]
@@ -46,7 +46,7 @@ def _draw_line2d_helper(renderer, data):
             line_width=2, color=color,
             legend_label=s.get_label(p.use_latex)
         )
-        if not s.is_point:
+        if not s.is_scatter:
             kw = p.merge({}, lkw, s.rendering_kw)
             handle = [p._fig.line("xs", "ys", source=source, **kw)]
         else:
@@ -84,7 +84,7 @@ def _update_line2d_helper(renderer, data, handles):
 
     if s.is_2Dline and s.is_parametric and s.use_cm:
         x, y, param = data
-        if not s.is_point:
+        if not s.is_scatter:
             xs, ys, us = p._get_segments(x, y, param)
         else:
             xs, ys, us = x, y, param

spb/backends/bokeh/renderers/nichols.py

@@ -19,7 +19,7 @@ def _draw_nichols_helper(renderer, data):
             else next(p._cm)
         )
 
-        if not s.is_point:
+        if not s.is_scatter:
             ol_phase, ol_mag, omega, cl_phase, cl_mag = p._get_segments(
                 ol_phase, ol_mag, omega,
                 cl_phase, cl_mag
@@ -33,7 +33,7 @@ def _draw_nichols_helper(renderer, data):
         ds, line, cb, kw = p._create_gradient_line(
             "ol_p", "ol_m", "o", source,
             colormap, s.get_label(p.use_latex),
-            s.rendering_kw, s.is_point)
+            s.rendering_kw, s.is_scatter)
         h = p._fig.add_glyph(ds, line)
         handles.append(h)
 
@@ -51,7 +51,7 @@ def _draw_nichols_helper(renderer, data):
             legend_label=s.get_label(p.use_latex)
         )
         arrows = None
-        if not s.is_point:
+        if not s.is_scatter:
             kw = p.merge({}, lkw, s.rendering_kw)
             handles.append(p._fig.line("ol_p", "ol_m", source=source, **kw))
 
@@ -97,7 +97,7 @@ def _update_nichols_helper(renderer, data, handles):
     omega, ol_phase, ol_mag, cl_phase, cl_mag = data
 
     if s.use_cm:
-        if not s.is_point:
+        if not s.is_scatter:
             ol_phase, ol_mag, omega, cl_phase, cl_mag = p._get_segments(
                 ol_phase, ol_mag, omega,
                 cl_phase, cl_mag

spb/backends/bokeh/renderers/root_locus.py

@@ -31,7 +31,7 @@ def _draw_root_locus_helper(renderer, data):
     lkw = dict(
         line_color=color, line_width=2, legend_label=s.get_label(p.use_latex)
     )
-    if s.is_point:
+    if s.is_scatter:
         lkw["marker"] = "o"
 
     kw = p.merge({}, lkw, s.rendering_kw)

spb/backends/k3d/renderers/line3d.py

@@ -8,7 +8,7 @@ def _draw_line3d_helper(renderer, data):
     if s.is_2Dline:
         raise NotImplementedError
 
-    if s.is_point:
+    if s.is_scatter:
         if s.is_parametric:
             x, y, z, param = data
         else:
@@ -62,7 +62,7 @@ def _update_line3d_helper(renderer, data, handle):
     p, s = renderer.plot, renderer.series
     np = p.np
 
-    if s.is_3Dline and s.is_point:
+    if s.is_3Dline and s.is_scatter:
         if s.is_parametric:
             x, y, z, _ = data
         else:

spb/backends/matplotlib/renderers/line2d.py

@@ -14,7 +14,7 @@ def _draw_line2d_helper(renderer, data):
             if p._use_cyclic_cm(param, s.is_complex)
             else next(p._cm)
         )
-        if not s.is_point:
+        if not s.is_scatter:
             lkw = dict(array=param, cmap=colormap)
             kw = p.merge({}, lkw, s.rendering_kw)
             segments = p.get_segments(x, y)
@@ -39,7 +39,7 @@ def _draw_line2d_helper(renderer, data):
             label=s.get_label(p.use_latex) if s.show_in_legend else "_nolegend_",
             color=color
         )
-        if s.is_point:
+        if s.is_scatter:
             lkw["marker"] = "o"
             lkw["linestyle"] = "None"
             if not s.is_filled:
@@ -72,7 +72,7 @@ def _update_line2d_helper(renderer, data, handles):
     if s.is_parametric and s.use_cm:
         line, kw, colorbar, cax = line_handles
 
-        if not s.is_point:
+        if not s.is_scatter:
             segments = p.get_segments(x, y)
             line.set_segments(segments)
         else:

spb/backends/matplotlib/renderers/line3d.py

@@ -10,7 +10,7 @@ def _draw_line3d_helper(renderer, data):
         param = p.np.ones_like(x)
     lkw = dict()
 
-    if not s.is_point:
+    if not s.is_scatter:
         if s.use_cm:
             segments = p.get_segments(x, y, z)
             lkw["cmap"] = next(p._cm)

spb/backends/matplotlib/renderers/nichols.py

@@ -10,7 +10,7 @@ def _draw_nichols_helper(renderer, data):
 
     if s.use_cm:
         colormap = next(p._cm)
-        if not s.is_point:
+        if not s.is_scatter:
             lkw = dict(array=omega, cmap=colormap)
             kw = p.merge({}, lkw, s.rendering_kw)
             segments = p.get_segments(ol_phase, ol_mag)
@@ -32,7 +32,7 @@ def _draw_nichols_helper(renderer, data):
             color=color
         )
 
-        if s.is_point:
+        if s.is_scatter:
             lkw["marker"] = "o"
             lkw["linestyle"] = "None"
             if not s.is_filled:
@@ -61,7 +61,7 @@ def _update_nichols_helper(renderer, data, handles):
     if s.use_cm:
         line, kw, is_cb_added, cax = handles
 
-        if not s.is_point:
+        if not s.is_scatter:
             segments = p.get_segments(ol_phase, ol_mag)
             line.set_segments(segments)
         else:

spb/backends/matplotlib/renderers/root_locus.py

@@ -27,7 +27,7 @@ def _draw_root_locus_helper(renderer, data):
     lkw = dict(
         color=color
     )
-    if s.is_point:
+    if s.is_scatter:
         lkw["marker"] = "o"
         lkw["linestyle"] = "None"
         if not s.is_filled: