github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-06-11 06:12:34 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

*ScatterDraw: Included Maginor fix from https://www.ultimatepp.org/forums/index.php?t=msg&th=10759&start=0&

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@13550 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
koldo 2019-08-15 18:13:00 +00:00
parent 9608ee983f
commit ed14f07e4c
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
uppsrc/ScatterDraw/Legend.cpp
View file

@ -21,7 +21,12 @@ void ScatterDraw::DrawLegend(Draw& w) const {
int rowHeight = int(textScale*scaledFont.GetHeight());
int rowAscent = int(textScale*scaledFont.GetAscent());
scaledFont.Height(rowHeight);
int xWidth = scaledFont.GetWidth('X');
Upp::Font boldFont = scaledFont;
boldFont.Bold();
Upp::Font italic = scaledFont;
italic.Italic();
int xWidth = boldFont.GetWidth('X');
int lineLen = 4*xWidth;
Vector<String> legends;
@ -32,7 +37,7 @@ void ScatterDraw::DrawLegend(Draw& w) const {
if (legend.Find('[') < 0 && !series[i].unitsY.IsEmpty())
legend += " [" + series[i].unitsY + "]";
legends.Add(legend);
legendWidth = max<int>(legendWidth, GetTextSizeSpace(legend, scaledFont).cx);
legendWidth = max<int>(legendWidth, GetTextSizeSpace(legend, boldFont).cx);
}
}
legendWidth += lineLen + 3*xWidth;
@ -98,9 +103,6 @@ void ScatterDraw::DrawLegend(Draw& w) const {
if (!IsNull(legendBorderColor))
DrawRectangle(w, rect, textScale, 1, legendBorderColor);
}
Upp::Font italic = scaledFont;
italic.Italic();
scaledFont.Bold();
for(int row = 0, start = 0, i = 0, ireal = 0; row <= nrows; row++) {
for(; ireal < min(start + nlr, nlab); i++) {
if (series[i].showLegend) {
@ -117,7 +119,7 @@ void ScatterDraw::DrawLegend(Draw& w) const {
if (series[i].markWidth >= 1 && series[i].markPlot)
series[i].markPlot->Paint(w, plotScaleAvg, mark_p, series[i].markWidth, series[i].markColor,
series[i].markBorderWidth, series[i].markBorderColor);
Upp::Font &font = series[i].primaryY ? scaledFont : italic;
Upp::Font &font = series[i].primaryY ? boldFont : italic;
DrawText(w, lx + lineLen + xWidth, ly - int((2*rowAscent)/3), 0, legends[ireal], font, series[i].color);
ireal++;
}