plotedits tests done?

Author: markur4

.github/workflows/codecov.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Install plotastic (in editable mode! Otherwise 0% coverage)
       run: pip install -e .[dev]
     - name: Run tests and collect coverage
-      run: pytest tests --cov --cov-report=xml --cov-config .coveragerc 
+      run: pytest tests --cov --cov-report=xml 
     - name: Upload coverage reports to Codecov with GitHub Action
       uses: codecov/codecov-action@v3
       with:

src/plotastic/plotting/plotedits.py

@@ -54,7 +54,7 @@ def _standard_axtitle(
         :type capitalize: bool, optional
         :return: _description_
         :rtype: str
-        """        
+        """
         if isinstance(key, str):
             return ut.capitalize(key)
         elif isinstance(key, tuple):
@@ -76,13 +76,15 @@ def edit_titles(
         :type axtitles: dict, optional
         :return: _description_
         :rtype: PlotEdits | DataAnalysis
-        """        
-        
+        """
+
         ### Assert correct input
         if not axtitles is None:
             keys = list(dict(self.axes_iter__keys_ax).keys())
             for key, ax in axtitles.items():
-                assert key in keys, f"Can't edit titles, '{key}' should be one of {keys}"
+                assert (
+                    key in keys
+                ), f"Can't edit titles, '{key}' should be one of {keys}"
 
         ### Edit titles
         if not axtitles is None:
@@ -108,15 +110,15 @@ def edit_titles_with_func(
         :type connect: str, optional
         :return: _description_
         :rtype: PlotEdits | DataAnalysis
-        """        
+        """
         ### Default functions
         row_func = row_func or (lambda x: x)
         col_func = col_func or (lambda x: x)
 
         ### Don't use connect if only one facet
         # if self.factors_is_1_facet:
         #     connect=""
-        
+
         for rowkey, axes in self.axes_iter__row_axes:
             for ax in axes:
                 title = row_func(rowkey)
@@ -137,8 +139,7 @@ def edit_titles_replace(self, titles: list) -> "PlotEdits | DataAnalysis":
         :type titles: list
         :return: _description_
         :rtype: PlotEdits | DataAnalysis
-        """        
-        
+        """
 
         for ax, title in zip(self.axes_flat, titles):
             if not title is None:
@@ -386,7 +387,7 @@ def edit_x_ticklabels_rotate(
         params_KWS = {k: v for k, v in set_KWS.items() if k in ["pad"]}
 
         # == Rotate
-        for ax in self.axes.flatten():
+        for ax in self.axes_flat:
             obj = ax.get_xticklabels()  #' Retrieve ticks
             plt.setp(obj, **ticklabel_KWS)
             ax.tick_params(axis="x", **params_KWS)
@@ -396,11 +397,27 @@ def edit_x_ticklabels_rotate(
     #
     #' Grid ...................................................#
 
-    def edit_grid(self) -> "PlotEdits | DataAnalysis":
+    def edit_grid(
+        self,
+        y_major_kws: dict = None,
+        y_minor_kws: dict = None,
+        x_major_kws: dict = None,
+    ) -> "PlotEdits | DataAnalysis":
+        
+        ### Defaults
+        y_major_kwargs = dict(ls="-", linewidth=0.5, c="grey")
+        y_minor_kwargs = dict(ls="-", linewidth=0.2, c="grey")
+        x_major_kwargs = dict(ls="-", linewidth=0.3, c="grey")
+        ### Update user input
+        y_major_kwargs.update(**y_major_kws)
+        y_minor_kwargs.update(**y_minor_kws)
+        x_major_kwargs.update(**x_major_kws)
+        
+        
         for ax in self.axes_flat:
-            ax.yaxis.grid(True, which="major", ls="-", linewidth=0.5, c="grey")
-            ax.yaxis.grid(True, which="minor", ls="-", linewidth=0.2, c="grey")
-            ax.xaxis.grid(True, which="major", ls="-", linewidth=0.3, c="grey")
+            ax.yaxis.grid(True, which="major", **y_major_kwargs)
+            ax.yaxis.grid(True, which="minor", **y_minor_kwargs)
+            ax.xaxis.grid(True, which="major", **x_major_kwargs)
         return self
 
     #
@@ -438,7 +455,7 @@ def edit_legend(
         ### Prevent legend duplication:
         if reset_legend:
             self.remove_legend()
-            
+
         ### An Alias for borderaxespad
         if not pad is None and borderaxespad == 4:
             borderaxespad = pad

testing/make_htmlcov.sh

@@ -1,4 +1,5 @@
 
 
 ### From within project root
-pytest tests -n 3 --cov --cov-report html:testing/htmlcov --cov-config testing/.coveragerc 
+#' sadly coveragerc can't be in a different directory
+pytest tests -n 3 --cov --cov-report html:testing/htmlcov --cov-config .coveragerc 

tests/plotedits_test.py

@@ -1,3 +1,4 @@
+#
 # %%
 
 import pytest
@@ -10,13 +11,13 @@
 
 
 # %%
-titles_zip = [
+titles_tips = [
     {("Lunch", "Male"): "blaa"},
     {("Male"): "blAA"},
     None,
     None,
 ]
-zipped_tips = dac.add_zip_column(dac.zipped_noempty_tips, titles_zip)
+zipped_tips = dac.add_zip_column(dac.zipped_noempty_tips, titles_tips)
 
 
 @pytest.mark.parametrize("DF, dims, axtitles", zipped_tips)
@@ -56,13 +57,13 @@ def test_edit_titles_with_func(DF, dims):
     ipytest.run()
 
 # %%
-titles_zip = [
+titles_tips = [
     ["sdfsfd", None, "dd", None],
     [None, "aa"],
     None,
     None,
 ]
-zipped_tips = dac.add_zip_column(dac.zipped_noempty_tips, titles_zip)
+zipped_tips = dac.add_zip_column(dac.zipped_noempty_tips, titles_tips)
 
 
 @pytest.mark.parametrize("DF, dims, titles", zipped_tips)
@@ -123,7 +124,7 @@ def test_edit_y_ticklabel_percentage(DF, dims):
     DA = plst.DataAnalysis(data=DF, dims=dims, verbose=False)
     DA.plot().edit_y_ticklabel_percentage(
         decimals_major=1,
-        decimals_minor=1, # !! Not working
+        decimals_minor=1,  # !! Not working
     )
     if __name__ == "__main__":
         plt.show()
@@ -133,3 +134,140 @@ def test_edit_y_ticklabel_percentage(DF, dims):
 
 if __name__ == "__main__":
     ipytest.run()
+
+
+# %%
+@pytest.mark.parametrize("DF, dims", dac.zipped_ALL)
+def test_edit_y_ticklabels_log_minor(DF, dims):
+    DA = plst.DataAnalysis(data=DF, dims=dims, verbose=False)
+    DA.plot().edit_y_scale_log(base=2).edit_y_ticklabels_log_minor(
+        subs=[2, 3, 5, 7],
+    )
+    if __name__ == "__main__":
+        plt.show()
+    else:
+        plt.close("all")
+
+
+if __name__ == "__main__":
+    ipytest.run()
+
+
+# %%
+labels_zip = [
+    ["sdfsfd", "dddd"],
+    ["sdfsfd", "dddd"],
+    ["sdfsfd", "dddd"],
+    ["sdfsfd", "dddd"],
+]
+zipped_tips = dac.add_zip_column(dac.zipped_noempty_tips, labels_zip)
+
+
+@pytest.mark.parametrize("DF, dims, labels", zipped_tips)
+def test_edit_x_ticklabels_exchange(DF, dims, labels):
+    DA = plst.DataAnalysis(data=DF, dims=dims, verbose=False)
+    DA.plot().edit_x_ticklabels_exchange(
+        labels=labels,
+        labels_lowest_row=[l.upper() for l in labels],
+    )
+    if __name__ == "__main__":
+        plt.show()
+    else:
+        plt.close("all")
+
+
+if __name__ == "__main__":
+    ipytest.run()
+
+
+# %%
+@pytest.mark.parametrize("DF, dims", dac.zipped_ALL)
+def test_edit_x_ticklabels_exchange(DF, dims):
+    DA = plst.DataAnalysis(data=DF, dims=dims, verbose=False)
+    DA.plot().edit_x_ticklabels_rotate(
+        rotation=75,
+        ha="center",
+        # va="top",
+        pad=0.1,
+    )
+    if __name__ == "__main__":
+        plt.show()
+    else:
+        plt.close("all")
+
+
+if __name__ == "__main__":
+    ipytest.run()
+
+# %%
+plt.close("all")
+
+
+# %%
+@pytest.mark.parametrize("DF, dims", dac.zipped_ALL)
+def test_edit_grid(DF, dims):
+    plt.close()
+    DA = plst.DataAnalysis(data=DF, dims=dims, verbose=False)
+    (
+        DA.plot()
+        .edit_y_scale_log(base=2)  #' To see minor ticks
+        .edit_grid(
+            y_major_kws=dict(ls="--", linewidth=0.5, c="grey"),
+            y_minor_kws=dict(ls=":", linewidth=0.2, c="grey"),
+            x_major_kws=dict(ls="--", linewidth=0.6, c="grey"),
+        )
+    )
+    if __name__ == "__main__":
+        plt.show()
+    else:
+        plt.close("all")
+
+
+if __name__ == "__main__":
+    ipytest.run()
+
+
+# %%
+@pytest.mark.parametrize("DF, dims", dac.zipped_ALL)
+def test_edit_legend(DF, dims):
+    DA = plst.DataAnalysis(data=DF, dims=dims, verbose=False)
+    if DA.dims.hue:
+        DA.plot().edit_legend(
+            reset_legend=True,
+            title="HUI",
+            loc="upper right",
+            bbox_to_anchor=(1.3, 1),
+            borderaxespad=1,
+            pad=0.5,
+            frameon=True,
+        )  #' To see minor ticks
+
+    if __name__ == "__main__":
+        plt.show()
+    else:
+        plt.close("all")
+
+
+if __name__ == "__main__":
+    ipytest.run()
+
+
+@pytest.mark.parametrize("DF, dims", dac.zipped_ALL)
+def test_edit_fontsizes(DF, dims):
+    plt.close()
+    DA = plst.DataAnalysis(data=DF, dims=dims, verbose=False)
+
+    DA.plot().edit_fontsizes(
+        ticklabels=14,
+        xylabels=16,
+        axis_titles=18,
+    )  #' To see minor ticks
+
+    if __name__ == "__main__":
+        plt.show()
+    else:
+        plt.close("all")
+
+
+if __name__ == "__main__":
+    ipytest.run()