Merge pull request #343 from nschloe/marker

info on scatter markers

Author: nschloe

test/test_marker.py

@@ -1,17 +1,19 @@
+import matplotlib.pyplot as plt
+import numpy as np
+
 from helpers import assert_equality
 
 
 def plot():
-    from matplotlib import pyplot as plt
-    import numpy as np
-
     fig, ax = plt.subplots()
     with plt.style.context(("ggplot")):
         t = np.linspace(0, 2 * np.pi, 11)
         s = np.sin(t)
         c = np.cos(t)
-        ax.plot(t, s, "ko-", mec="r", markevery=20)
-        ax.plot(t, c, "ks--", mec="r", markevery=20)
+        s2 = np.sin(2 * t)
+        ax.plot(t, s, "ko-", mec="r", markevery=2)
+        ax.plot(t, c, "ks--", mec="r", markevery=3)
+        ax.scatter(t, s2, s=100, c="black", marker="+")
         ax.set_xlim(t[0], t[-1])
         ax.set_xlabel("t")
         ax.set_ylabel("y")
@@ -22,4 +24,8 @@ def plot():
 
 def test():
     assert_equality(plot, __file__[:-3] + "_reference.tex")
-    return
+
+
+if __name__ == "__main__":
+    plot()
+    plt.show()

test/test_marker_reference.tex

@@ -15,7 +15,22 @@
 ymin=-1.1, ymax=1.1,
 ytick style={color=black}
 ]
-\addplot [semithick, black, mark=*, mark size=3, mark repeat=20, mark options={solid,draw=red}]
+\addplot [only marks, draw=black, fill=black, colormap/viridis]
+table{%
+x                      y
+0 0
+0.628318530717959 0.951056516295154
+1.25663706143592 0.587785252292473
+1.88495559215388 -0.587785252292473
+2.51327412287183 -0.951056516295154
+3.14159265358979 -2.44929359829471e-16
+3.76991118430775 0.951056516295154
+4.39822971502571 0.587785252292473
+5.02654824574367 -0.587785252292473
+5.65486677646163 -0.951056516295154
+6.28318530717959 -4.89858719658941e-16
+};
+\addplot [semithick, black, mark=*, mark size=3, mark repeat=2, mark options={solid,draw=red}]
 table {%
 0 0
 0.628318530717959 0.587785252292473
@@ -29,7 +44,7 @@
 5.65486677646163 -0.587785252292473
 6.28318530717959 -2.44929359829471e-16
 };
-\addplot [semithick, black, dashed, mark=square*, mark size=3, mark repeat=20, mark options={solid,draw=red}]
+\addplot [semithick, black, dashed, mark=square*, mark size=3, mark repeat=3, mark options={solid,draw=red}]
 table {%
 0 1
 0.628318530717959 0.809016994374947

tikzplotlib/__about__.py

@@ -2,5 +2,5 @@
 __email__ = "[email protected]"
 __copyright__ = "Copyright (c) 2010-2019, {} <{}>".format(__author__, __email__)
 __license__ = "License :: OSI Approved :: MIT License"
-__version__ = "0.8.2"
+__version__ = "0.8.3"
 __status__ = "Development Status :: 5 - Production/Stable"

tikzplotlib/axes.py

@@ -847,7 +847,7 @@ def _find_associated_colorbar(obj):
 
 
 def _try_f2i(x):
-    """Convert losslessly float to int if possible.
+    """If possible, convert float to int without rounding.
     Used for log base: if not used, base for log scale can be "10.0" (and then
     printed as such  by pgfplots).
     """

tikzplotlib/path.py

@@ -152,6 +152,10 @@ def draw_pathcollection(data, obj):
         except (TypeError, IndexError):
             ls = None
 
+        # TODO marker info
+        # <https://github.com/nschloe/tikzplotlib/issues/324>
+        # <https://github.com/matplotlib/matplotlib/issues/15496>
+
     is_contour = len(dd) == 1
     if is_contour:
         draw_options = ["draw=none"]