From b9f940d658cf2a1e974f2f47c9cf5cbbe9cc2e8e Mon Sep 17 00:00:00 2001
From: Lazaro Alonso <lazarus.alon@gmail.com>
Date: Wed, 7 Aug 2024 17:20:15 +0200
Subject: [PATCH] fixes AoG, and found bugs

---
 docs/gen_mds.jl                  | 1 +
 examples/aog/MarketData.jl       | 4 ++--
 examples/aog/density_ridges.jl   | 3 ++-
 examples/aog/penguinsAoG.jl      | 4 ++--
 examples/aog/textScatterLines.jl | 6 +++---
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/docs/gen_mds.jl b/docs/gen_mds.jl
index 859dcce2..3f7c7f91 100644
--- a/docs/gen_mds.jl
+++ b/docs/gen_mds.jl
@@ -23,6 +23,7 @@ function get_files(folders)
                 "textScatterLines.jl",
                 "gott_azimuthal.jl",
                 "us_states.jl",
+                "gapminder",
                 ])
                 
             fpaths  = "$(f)/" .* names
diff --git a/examples/aog/MarketData.jl b/examples/aog/MarketData.jl
index 1caabc80..bba01aed 100644
--- a/examples/aog/MarketData.jl
+++ b/examples/aog/MarketData.jl
@@ -32,11 +32,11 @@ save("market_data2.svg", current_figure()); # hide
 df = DataFrame(ohlc)
 pltd = data(df[200:280,:])
 plt = pltd * mapping(:timestamp, :Open => "StockChart")
-plt *= mapping(fillto=:Close, color = (:Open, :Close) => isless => "Open<Close")
+plt *= mapping(color = (:Open, :Close) => isless => "Open<Close") # fillto=:Close, because of this, the plot is wrong
 plt *= visual(BarPlot)
 
 with_theme(theme_dark(), size = (800,500)) do
-    draw(plt, palettes =(; color = [:deepskyblue, :firebrick3]))
+    draw(plt, scales(Color = (; palette = [:deepskyblue, :firebrick3])))
 end
 
 save("market_data3.svg", current_figure()); # hide
diff --git a/examples/aog/density_ridges.jl b/examples/aog/density_ridges.jl
index 0045256c..b903abca 100644
--- a/examples/aog/density_ridges.jl
+++ b/examples/aog/density_ridges.jl
@@ -31,7 +31,8 @@ save("densityridges1.png", current_figure()); # hide
 p_len  = data(penguins)
 ## p_len = AoG.density()
 p_len *= mapping(:flipper_length_mm, color=:species)
-p_len *= visual(AoG.Density, direction=:y, offset = 1.0,
+p_len *= AoG.density()
+p_len *= visual(direction=:y, offset = 1.0, # direction is not working!
     alpha = 0.2, strokewidth = 1.5, strokecolor = :grey20)
 draw(p_len)
 
diff --git a/examples/aog/penguinsAoG.jl b/examples/aog/penguinsAoG.jl
index b145a940..cafa4755 100644
--- a/examples/aog/penguinsAoG.jl
+++ b/examples/aog/penguinsAoG.jl
@@ -19,10 +19,10 @@ p_len  = data(penguins)
 p_len *= mapping(:flipper_length_mm => (t -> t / 10) => "flipper length (cm)",
     :bill_length_mm => (t -> t / 10) => "bill length (cm)")
 ## declare the grouping and the respective visual attribute
-p_len *= mapping(color=:species, marker=:species)
+p_len *= mapping(color=:species)
 
 with_theme(theme_ggplot2(),size = (600,400), palette=palette, Scatter=(cycle=cycle,)) do
-    draw(p_len + p_len * linear(); 
+    draw(p_len * mapping(marker=:species) + p_len * linear(); 
         axis = (; title="Flipper and bill length"))
 end
 
diff --git a/examples/aog/textScatterLines.jl b/examples/aog/textScatterLines.jl
index ae51ee32..92bf44da 100644
--- a/examples/aog/textScatterLines.jl
+++ b/examples/aog/textScatterLines.jl
@@ -8,9 +8,9 @@ d = DataFrame(name = repeat(["A","B","C","D","E","F"], inner=4),
       time=repeat([0,1,3,6], outer=6), value = rand(24));
 
 pSL = data(d)
-pSL *= mapping(:time, :value, color = :name, #text = :name => verbatim # now is not working :(
-    )
-pSL *= visual(ScatterLines) # + visual(Makie.Text, align = (:center, :bottom))
+pSL *= mapping(:time, :value)
+pSL *= mapping(color = :name) * visual(ScatterLines) +
+    mapping(color = :name, text = :name => verbatim) * visual(Makie.Text, align = (:center, :bottom))
 with_theme(theme_ggplot2(), size = (600,400)) do
     draw(pSL)
 end