Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix in preparation for https://github.com/nim-lang/Nim/pull/14447 #74

Merged
merged 2 commits into from
Jun 25, 2020
Merged

fix in preparation for https://github.com/nim-lang/Nim/pull/14447 #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68f96ee
fix in preparation for https://github.com/nim-lang/Nim/pull/14447
timotheecour May 28, 2020
69e6094
somehow sugar.capure was not defined for CI; maybe running old nim?
timotheecour May 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/ggplotnim.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2129,8 +2129,9 @@ proc drawAnnotations*(view: var Viewport, p: GgPlot) =
marginH.pos * 2.0,
unit = ukRelative)
# find longest line of annotation to base background on
let font = annot.font # refs https://github.com/nim-lang/Nim/pull/14447
let maxLine = annot.text.strip.splitLines.sortedByIt(
getStrWidth(it, annot.font).val
getStrWidth(it, font).val
)[^1]
let maxWidth = getStrWidth(maxLine, annot.font)
# calculate required width for background rectangle. string width +
Expand Down
3 changes: 3 additions & 0 deletions src/ggplotnim/postprocess_scales.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ proc applyTransformations(df: var DataFrame, scales: seq[Scale]) =
# transformations have been applied!
var fns: seq[FormulaNode]
for s in scales:
let s = s
# refs https://github.com/nim-lang/Nim/pull/14447
# alternative would be to use `sugar.capture(s)` instead of `closureScope`
if s.scKind == scTransformedData:
when defined(defaultBackend):
let col = evaluate(s.col)
Expand Down