fixes for geom_bar fill

Author: dxe4

plots/geom_bar_fill.png

@@ -916,7 +916,9 @@ def draw_sub_df(
             for i in range(len(styles) - 1):
                 style = merge_user_style(styles[i], fg)
                 poly_line = init_poly_line_from_points(
-                    view, [line_points[i].point(), line_points[i + 1].point()], deepcopy(style)
+                    view,
+                    [line_points[i].point(), line_points[i + 1].point()],
+                    deepcopy(style),
                 )
                 view.add_obj(poly_line)
     elif geom_type == GeomType.RASTER:

src/python_ggplot/gg/drawing.py

@@ -324,14 +324,19 @@ def _filled_count_geom_map(
     from python_ggplot.gg.styles.utils import apply_style
 
     grouped = df.groupby(filled_stat_geom.map_discrete_columns, sort=False)  # type: ignore
+    sorted_keys = sorted(grouped.groups.keys(), reverse=True)  # type: ignore
     col = pd.Series(dtype=float)  # For stacking
 
     all_classes = pd.Series(df[filled_stat_geom.get_x_col()].unique())  # type: ignore
     if len(filled_stat_geom.continuous_scales) > 0:
         raise GGException("continuous_scales > 0")
 
-    for keys, sub_df in grouped:  # type: ignore
-        apply_style(style, sub_df, filled_stat_geom.discrete_scales, [(keys[0], VString(i)) for i in grouped.groups])  # type: ignore
+    for keys in sorted_keys:  # type: ignore
+        sub_df = grouped.get_group(keys)  # type: ignore
+        key_values = list(product(filled_stat_geom.map_discrete_columns, [keys]))  # type: ignore
+        current_style = apply_style(
+            deepcopy(style), sub_df, filled_stat_geom.discrete_scales, key_values
+        )  # type: ignore
 
         weight_scale = filled_scales.get_weight_scale(
             filled_stat_geom.geom, optional=True
@@ -356,7 +361,7 @@ def _filled_count_geom_map(
         filled_geom.gg_data.yield_data[keys] = apply_cont_scale_if_any(  # type: ignore
             yield_df,
             filled_stat_geom.continuous_scales,
-            style,
+            current_style,
             filled_stat_geom.geom.geom_type,
             to_clone=True,
         )
@@ -527,6 +532,7 @@ def _filled_smooth_geom_map(
     style: "GGStyle",
 ) -> "FilledGeom":
     from python_ggplot.gg.styles.utils import apply_style
+
     grouped = df.groupby(filled_stat_geom.map_discrete_columns, sort=True)  # type: ignore
     sorted_keys = sorted(grouped.groups.keys(), reverse=True)  # type: ignore
     col = pd.Series(dtype=float)  # type: ignore
@@ -536,7 +542,7 @@ def _filled_smooth_geom_map(
         key_values = list(product(filled_stat_geom.map_discrete_columns, [keys]))  # type: ignore
         current_style = apply_style(
             deepcopy(style), sub_df, filled_stat_geom.discrete_scales, key_values
-        ) # type: ignore
+        )  # type: ignore
 
         yield_df = sub_df.copy()  # type: ignore
 

src/python_ggplot/gg/geom/utils.py

@@ -709,7 +709,6 @@ def get_name(self) -> str:
                 name = scale.gg_data.get_name()
                 if name:
                     return name
-        print(self)
         raise GGException("No name found")
 
 

src/python_ggplot/gg/scales/base.py

@@ -28,7 +28,6 @@
     series_is_str,
     series_value_type,
 )
-from python_ggplot.gg.geom.base import post_process_scales
 from python_ggplot.gg.scales import (
     AlphaScale,
     GGScale,
@@ -1090,5 +1089,4 @@ def fill_field(field_name: str, arg: List[GGScale]) -> None:
     if plot.facet is not None:
         add_facets(filled_scales_result, plot)
 
-    post_process_scales(filled_scales_result, plot)
     return filled_scales_result

src/python_ggplot/gg/scales/collect_and_fill.py

@@ -130,8 +130,9 @@ def get_coords(self) -> Dict[Any, Any]:
     def gather_coords(self) -> Dict[Any, Any]:
         return self.get_coords()
 
-
-    def find_go_by_go_by_filter(self, filter_: Callable[[GraphicsObject], bool], recursive: bool = True):
+    def find_go_by_go_by_filter(
+        self, filter_: Callable[[GraphicsObject], bool], recursive: bool = True
+    ):
         result: List[GraphicsObject] = []
         for object in self.objects:
             if filter_(object):

src/python_ggplot/graphics/views.py

@@ -64,7 +64,7 @@
     VLinearData,
 )
 from python_ggplot.gg.drawing import create_gobj_from_geom
-from python_ggplot.gg.geom.base import FilledGeom, Geom, GeomType
+from python_ggplot.gg.geom.base import FilledGeom, Geom, GeomType, post_process_scales
 from python_ggplot.gg.scales import FillColorScaleValue, ScaleValue
 from python_ggplot.gg.scales.base import (
     ColorScale,
@@ -1869,6 +1869,7 @@ def ggcreate(plot: GgPlot, width: float = 640.0, height: float = 480.0) -> PlotV
         raise GGException("Please use at least one `geom`!")
 
     filled_scales: FilledScales = _collect_scales(plot)
+    post_process_scales(filled_scales, plot)
     theme = build_theme(filled_scales, plot)
 
     coord_input = CoordsInput()

src/python_ggplot/public_interface/utils.py

@@ -34,6 +34,14 @@ def test_geom_bar():
     ggdraw_plot(res, plots_path / "geom_bar.png")
 
 
+def test_geom_bar_fill():
+    mpg = pd.read_csv(data_path / "mpg.csv")
+    plot = ggplot(mpg, aes("class", fill="drv")) + geom_bar()
+    res = ggcreate(plot)
+    ggdraw_plot(res, plots_path / "geom_bar_fill.png")
+    # print(res.view.find_go_by_go_name("geom_bar_rect"))
+
+
 @pytest.mark.xfail(reason="fix")
 def test_geom_point_and_text():
     """
@@ -85,7 +93,7 @@ def test_geom_histogram_fill():
 
 
 @pytest.mark.xfail(reason="")
-def test_geom_bar_fill():
+def test_geom_bar_fill_y_only():
     # Fill the bars
     # Fourth plot here https://ggplot2.tidyverse.org/reference/geom_bar.html
     mpg = pd.read_csv(data_path / "mpg.csv")