Fixed bug involving empty_circle filled dots feature not working as intended

Author: sunroofgod

dabest/plotter.py

@@ -288,6 +288,7 @@ def effectsize_df_plotter(effectsize_df, **plot_kwargs):
         for i in range(len(idx)):
             filled.append(False)
             filled.extend([True] * (len(idx[i]) - 1))
+        print(f"filled is {filled}")
 
     names = color_groups if not color_by_subgroups else idx
     n_groups = len(color_groups)
@@ -686,39 +687,22 @@ def effectsize_df_plotter(effectsize_df, **plot_kwargs):
             else:
                 jitter = 1
 
-            if color_col is None: # Determine the use of hue
-                rawdata_plot = swarmplot(
-                    data=plot_data,
-                    x=xvar,
-                    y=yvar,
-                    ax=rawdata_axes,
-                    order=all_plot_groups,
-                    hue=xvar,
-                    palette=plot_palette_raw,
-                    zorder=1,
-                    side=asymmetric_side,
-                    jitter=jitter,
-                    is_drop_gutter=True,
-                    gutter_limit=0.45,
-                    **swarmplot_kwargs
-                )
-                rawdata_plot.legend().set_visible(False)
-            else:
-                rawdata_plot = swarmplot(
-                    data=plot_data,
-                    x=xvar,
-                    y=yvar,
-                    ax=rawdata_axes,
-                    order=all_plot_groups,
-                    hue=color_col,
-                    palette=plot_palette_raw,
-                    zorder=1,
-                    side=asymmetric_side,
-                    jitter=jitter,
-                    is_drop_gutter=True,
-                    gutter_limit=0.45,
-                    **swarmplot_kwargs
-                )
+            rawdata_plot = swarmplot(
+                data=plot_data,
+                x=xvar,
+                y=yvar,
+                ax=rawdata_axes,
+                order=all_plot_groups,
+                hue=color_col,
+                palette=plot_palette_raw,
+                zorder=3,
+                side=asymmetric_side,
+                jitter=jitter,
+                filled=filled,
+                is_drop_gutter=True,
+                gutter_limit=0.45,
+                **swarmplot_kwargs,
+            )
         else:
             # Plot the raw data as a barplot.
             bar1_df = pd.DataFrame(
@@ -1646,4 +1630,3 @@ def effectsize_df_plotter(effectsize_df, **plot_kwargs):
 
     # Return the figure.
     return fig
-

nbs/API/plotter.ipynb

@@ -347,6 +347,7 @@
     "        for i in range(len(idx)):\n",
     "            filled.append(False)\n",
     "            filled.extend([True] * (len(idx[i]) - 1))\n",
+    "        print(f\"filled is {filled}\")\n",
     "\n",
     "    names = color_groups if not color_by_subgroups else idx\n",
     "    n_groups = len(color_groups)\n",
@@ -745,39 +746,22 @@
     "            else:\n",
     "                jitter = 1\n",
     "\n",
-    "            if color_col is None:  # Determine the use of hue\n",
-    "                rawdata_plot = swarmplot(\n",
-    "                    data=plot_data,\n",
-    "                    x=xvar,\n",
-    "                    y=yvar,\n",
-    "                    ax=rawdata_axes,\n",
-    "                    order=all_plot_groups,\n",
-    "                    hue=xvar,\n",
-    "                    palette=plot_palette_raw,\n",
-    "                    zorder=1,\n",
-    "                    side=asymmetric_side,\n",
-    "                    jitter=jitter,\n",
-    "                    is_drop_gutter=True,\n",
-    "                    gutter_limit=0.45,\n",
-    "                    **swarmplot_kwargs,\n",
-    "                )\n",
-    "                rawdata_plot.legend().set_visible(False)\n",
-    "            else:\n",
-    "                rawdata_plot = swarmplot(\n",
-    "                    data=plot_data,\n",
-    "                    x=xvar,\n",
-    "                    y=yvar,\n",
-    "                    ax=rawdata_axes,\n",
-    "                    order=all_plot_groups,\n",
-    "                    hue=color_col,\n",
-    "                    palette=plot_palette_raw,\n",
-    "                    zorder=1,\n",
-    "                    side=asymmetric_side,\n",
-    "                    jitter=jitter,\n",
-    "                    is_drop_gutter=True,\n",
-    "                    gutter_limit=0.45,\n",
-    "                    **swarmplot_kwargs,\n",
-    "                )\n",
+    "            rawdata_plot = swarmplot(\n",
+    "                data=plot_data,\n",
+    "                x=xvar,\n",
+    "                y=yvar,\n",
+    "                ax=rawdata_axes,\n",
+    "                order=all_plot_groups,\n",
+    "                hue=color_col,\n",
+    "                palette=plot_palette_raw,\n",
+    "                zorder=3,\n",
+    "                side=asymmetric_side,\n",
+    "                jitter=jitter,\n",
+    "                filled=filled,\n",
+    "                is_drop_gutter=True,\n",
+    "                gutter_limit=0.45,\n",
+    "                **swarmplot_kwargs,\n",
+    "            )\n",
     "        else:\n",
     "            # Plot the raw data as a barplot.\n",
     "            bar1_df = pd.DataFrame(\n",