diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Revision history for granite +## 0.7.1.1 -- 2026-05-25 +* `GeomTile` honours a continuous `scaleFill` (`SColorContinuous`) via smooth RGB interpolation, and no longer emits a stray category legend entry. + ## 0.7.1.0 -- 2026-05-25 * Numeric `aesAlpha` mappings are now honoured for points (per-point opacity); previously only the per-layer `defAlpha` was applied. diff --git a/granite.cabal b/granite.cabal --- a/granite.cabal +++ b/granite.cabal @@ -1,6 +1,6 @@ cabal-version: 3.0 name: granite -version: 0.7.1.0 +version: 0.7.1.1 synopsis: Easy terminal plotting. description: A terminal plotting library for quick and easy visualisation. license: MIT diff --git a/src/Granite/Render/Pipeline.hs b/src/Granite/Render/Pipeline.hs --- a/src/Granite/Render/Pipeline.hs +++ b/src/Granite/Render/Pipeline.hs @@ -67,6 +67,7 @@ Mapping (..), PolarAes (..), PolarDir (..), + Scale (..), Scales (..), Size (..), Theme (..), @@ -147,12 +148,15 @@ Just t -> not (Text.null t) Nothing -> False colorMaps = map (layerColorMap palette (chartData chart)) (chartLayers chart) + fillCols = case scaleFill (chartScales chart) of + Just (SColorContinuous cs) -> Just cs + _ -> Nothing legendEntries = collectLegend (chartLayers chart) palette colorMaps hasRightLegend = not (null legendEntries) box = computePlotBox (chartSize chart) theme hasTitle hasRightLegend False panels = layoutPanels theme box chart - panelMarks = concatMap (renderPanel theme palette coord colorMaps) panels + panelMarks = concatMap (renderPanel theme palette coord colorMaps fillCols) panels legend = legendMarks theme box legendEntries title = titleMarks theme box (chartTitle chart) @@ -174,14 +178,24 @@ [ColorSpec] -> Coord -> [Maybe [(Text, ColorSpec)]] -> + Maybe [ColorSpec] -> PanelSpec -> [Mark] -renderPanel theme palette coord colorMaps ps = +renderPanel theme palette coord colorMaps fillCols ps = let proj = buildProjector coord (panelBox ps) (panelXScale ps) (panelYScale ps) cmap i = if i < length colorMaps then colorMaps !! i else Nothing layerMarks = concat - [ runLayer theme (panelBox ps) proj palette (cmap i) i (panelData ps) layer + [ runLayer + theme + (panelBox ps) + proj + palette + (cmap i) + fillCols + i + (panelData ps) + layer | (i, layer) <- zip [0 :: Int ..] (panelLayers ps) ] axes = axesMarks theme (panelBox ps) coord (panelXScale ps) (panelYScale ps) @@ -414,11 +428,12 @@ Projector -> [ColorSpec] -> Maybe [(Text, ColorSpec)] -> + Maybe [ColorSpec] -> Int -> DataFrame -> Layer -> [Mark] -runLayer theme box proj palette colorMap ix globalFrame layer = +runLayer theme box proj palette colorMap fillCols ix globalFrame layer = let frame0 = fromMaybe globalFrame (layerData layer) framePostStat = applyStat (layerStat layer) (layerMapping layer) frame0 frame = applyPosition (layerPosition layer) (layerMapping layer) framePostStat @@ -456,7 +471,7 @@ GeomHistogram -> drawBars proj frame m col GeomRibbon -> drawRibbon proj frame m col GeomErrorbar -> drawErrorbar proj frame m col - GeomTile -> drawTiles proj frame m col + GeomTile -> drawTiles proj frame m col fillCols GeomBoxplot -> drawBoxplot proj frame m col GeomDensity -> drawDensity proj frame m col GeomText -> drawText proj frame m col (themeFontSize theme) @@ -580,8 +595,9 @@ ] _ -> [] -drawTiles :: Projector -> DataFrame -> Mapping -> Color -> [Mark] -drawTiles proj frame m col = +drawTiles :: + Projector -> DataFrame -> Mapping -> Color -> Maybe [ColorSpec] -> [Mark] +drawTiles proj frame m col fillCols = case (resolveNumColumn frame (aesX m), resolveNumColumn frame (aesY m)) of (Just xs, Just ys) -> let wX = barWidth xs / 0.8 @@ -600,7 +616,9 @@ if hi == lo then 0.5 else (vs !! i - lo) / (hi - lo) - in gradientColor t + in case fillCols of + Just cs -> continuousColorFor cs t + Nothing -> gradientColor t _ -> col in [ rectFromCorners (proj (x - halfX) (y - halfY)) @@ -625,6 +643,26 @@ ix = floor (clamped * fromIntegral n) :: Int in palette !! ix +{- | Map @t@ in [0,1] to a colour by piecewise-linear RGB interpolation across +the anchor colours (used to honour a continuous 'scaleFill' on tiles). +-} +continuousColorFor :: [ColorSpec] -> Double -> Color +continuousColorFor specs t = + case map specToColor specs of + [] -> gradientColor t + [c] -> c + colors -> + let n = length colors + clamped = max 0 (min 1 t) + pos = clamped * fromIntegral (n - 1) + i = min (n - 2) (floor pos) + frac = pos - fromIntegral i + Color r1 g1 b1 = colors !! i + Color r2 g2 b2 = colors !! (i + 1) + lerp a b = + round (fromIntegral a + frac * (fromIntegral b - fromIntegral a)) + in Color (lerp r1 r2) (lerp g1 g2) (lerp b1 b2) + drawBoxplot :: Projector -> DataFrame -> Mapping -> Color -> [Mark] drawBoxplot proj frame m col = case ( resolveNumColumn frame (aesX m) @@ -952,6 +990,7 @@ where entriesFor ix layer cmap | GeomText <- layerGeom layer = [] + | GeomTile <- layerGeom layer = [] | Just levelColors <- cmap = levelColors | otherwise = [(legendName ix layer, palette !! (ix `mod` max 1 (length palette)))] diff --git a/test/GoldenSpec.hs b/test/GoldenSpec.hs --- a/test/GoldenSpec.hs +++ b/test/GoldenSpec.hs @@ -24,6 +24,7 @@ import Granite.Spec ( BinSpec (..), Chart (..), + ColorSpec (..), ColumnRef (..), Coord (..), Facet (..), @@ -266,6 +267,44 @@ , chartSize = SizeChars 30 16 } +-- A continuous-fill heatmap: GeomTile coloured by a numeric column through a +-- 'SColorContinuous' scaleFill (blue -> white -> red). Exercises the continuous +-- tile colour path + the suppressed tile legend. +contHeatmap :: Chart +contHeatmap = + let coords = + [ (fromIntegral x, fromIntegral y, fromIntegral (x + y) :: Double) + | x <- [0 .. 3 :: Int] + , y <- [0 .. 3 :: Int] + ] + df = + fromColumns + [ ("x", ColNum [x | (x, _, _) <- coords]) + , ("y", ColNum [y | (_, y, _) <- coords]) + , ("z", ColNum [z | (_, _, z) <- coords]) + ] + tile = + (defLayer GeomTile) + { layerMapping = + emptyMapping + { aesX = Just (ColumnRef "x") + , aesY = Just (ColumnRef "y") + , aesFill = Just (ColumnRef "z") + } + , layerStat = StatIdentity + } + in emptyChart + { chartData = df + , chartLayers = [tile] + , chartScales = + defScales + { scaleFill = + Just (SColorContinuous [Hex "#2166ac", Hex "#f7f7f7", Hex "#b2182b"]) + } + , chartTitle = Just "Continuous heatmap" + , chartSize = SizeChars 40 14 + } + -- A four-petal rose in polar coordinates: r = |sin(2θ)| sampled at 33 -- angular positions. Locks in the polar projector + polar chrome. polarRose :: Chart @@ -377,6 +416,9 @@ it "pie chart renders to expected SVG output" $ goldenText "pie-basic.svg" (renderChartSvg pieBasic) + + it "continuous-fill heatmap renders to expected SVG output" $ + goldenText "heatmap-continuous.svg" (renderChartSvg contHeatmap) describe "Sizing" $ do it "responsive scatter renders to expected SVG output" $ diff --git a/test/golden/heatmap-continuous.svg b/test/golden/heatmap-continuous.svg new file mode 100644 --- /dev/null +++ b/test/golden/heatmap-continuous.svg @@ -0,0 +1,30 @@ + + + + +0.0 +1.0 +2.0 +3.0 +0.0 +1.0 +2.0 +3.0 + + + + + + + + + + + + + + + + +Continuous heatmap + diff --git a/test/golden/plotly-heatmap-annotated.svg b/test/golden/plotly-heatmap-annotated.svg --- a/test/golden/plotly-heatmap-annotated.svg +++ b/test/golden/plotly-heatmap-annotated.svg @@ -1,64 +1,62 @@ - + -0.0 -2.0 -4.0 +0.0 +2.0 +4.0 0.0 2.0 4.0 - - - - - - - - - - - - - - - - - - - - - - - - - -1.0 -0.9 -0.5 -0.1 --0.4 -1.5 -1.4 -1.0 -0.6 -0.1 -1.8 -1.7 -1.4 -0.9 -0.4 -2.0 -1.9 -1.5 -1.1 -0.6 -1.9 -1.8 -1.4 -1.0 -0.5 -Annotated heatmap - -series 0 + + + + + + + + + + + + + + + + + + + + + + + + + +1.0 +0.9 +0.5 +0.1 +-0.4 +1.5 +1.4 +1.0 +0.6 +0.1 +1.8 +1.7 +1.4 +0.9 +0.4 +2.0 +1.9 +1.5 +1.1 +0.6 +1.9 +1.8 +1.4 +1.0 +0.5 +Annotated heatmap diff --git a/test/golden/plotly-heatmap-annotated.txt b/test/golden/plotly-heatmap-annotated.txt --- a/test/golden/plotly-heatmap-annotated.txt +++ b/test/golden/plotly-heatmap-annotated.txt @@ -1,16 +1,16 @@ - Annotated heatmap  - │██████████████████████████████ ██  - 4.0 │█-0.4██0.1███0.4███0.6███0.5██ ██series 0  - │██████████████████████████████  - │██0.1██0.6███0.9███1.1███1.0██  - │██████████████████████████████  - │██████████████████████████████  - 2.0 │██0.5██1.0███1.4███1.5███1.4██  - │██████████████████████████████  - │██0.9██1.4███1.7███1.9███1.8██  - │██████████████████████████████  - │██1.0██1.5███1.8███2.0███1.9██  - 0.0 │██████████████████████████████  - ┼───────────────────────────────  - 0.0 2.0 4.0  + Annotated heatmap  + │███████████████████████████████████████  + 4.0 │██-0.4█████0.1████0.4█████0.6█████0.5██  + │███████████████████████████████████████  + │███0.1█████0.6████0.9█████1.1█████1.0██  + │███████████████████████████████████████  + │███████████████████████████████████████  + 2.0 │███0.5█████1.0████1.4█████1.5█████1.4██  + │███████████████████████████████████████  + │███0.9█████1.4████1.7█████1.9█████1.8██  + │███████████████████████████████████████  + │███1.0█████1.5████1.8█████2.0█████1.9██  + 0.0 │███████████████████████████████████████  + ┼─────────────────────────────────────────  + 0.0 2.0 4.0  diff --git a/test/golden/plotly-heatmap.svg b/test/golden/plotly-heatmap.svg --- a/test/golden/plotly-heatmap.svg +++ b/test/golden/plotly-heatmap.svg @@ -1,39 +1,37 @@ - + -0.0 -2.0 -4.0 +0.0 +2.0 +4.0 0.0 2.0 4.0 - - - - - - - - - - - - - - - - - - - - - - - - - -Heatmap - -series 0 + + + + + + + + + + + + + + + + + + + + + + + + + +Heatmap diff --git a/test/golden/plotly-heatmap.txt b/test/golden/plotly-heatmap.txt --- a/test/golden/plotly-heatmap.txt +++ b/test/golden/plotly-heatmap.txt @@ -1,16 +1,16 @@ - Heatmap  - │██████████████████████████████ ██  - 4.0 │██████████████████████████████ ██series 0  - │██████████████████████████████  - │██████████████████████████████  - │██████████████████████████████  - │██████████████████████████████  - 2.0 │██████████████████████████████  - │██████████████████████████████  - │██████████████████████████████  - │██████████████████████████████  - │██████████████████████████████  - 0.0 │██████████████████████████████  - ┼───────────────────────────────  - 0.0 2.0 4.0  + Heatmap  + │███████████████████████████████████████  + 4.0 │███████████████████████████████████████  + │███████████████████████████████████████  + │███████████████████████████████████████  + │███████████████████████████████████████  + │███████████████████████████████████████  + 2.0 │███████████████████████████████████████  + │███████████████████████████████████████  + │███████████████████████████████████████  + │███████████████████████████████████████  + │███████████████████████████████████████  + 0.0 │███████████████████████████████████████  + ┼─────────────────────────────────────────  + 0.0 2.0 4.0