Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* StringChartLegendRenderer can now take a font on construction. 

* Resolved TODOs.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30544 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2009-05-01 21:26:56 +00:00
parent c729e7020f
commit 28b2684912
2 changed files with 46 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/apps/debuganalyzer/gui/chart/StringChartLegend.cpp
View File

@ -23,13 +23,28 @@ StringChartLegend::StringChartLegend(const char* string, int32 level)
// #pragma mark - StringChartLegendRenderer
StringChartLegendRenderer::StringChartLegendRenderer()
:
fFont(*be_plain_font)
{
_Init();
}
StringChartLegendRenderer::StringChartLegendRenderer(const BFont& font)
:
fFont(font)
{
_Init();
}
void
StringChartLegendRenderer::GetMinimumLegendSpacing(BView* view,
float* horizontal, float* vertical)
{
// TODO: Implement for real!
*horizontal = 40;
*vertical = 20;
*horizontal = 2 * fEmWidth;
*vertical = fFontHeight / 2;
}
@ -40,16 +55,8 @@ StringChartLegendRenderer::LegendSize(ChartLegend* _legend, BView* view)
if (legend == NULL)
return BSize();
// TODO: It's a bit expensive to do that for each legend!
// TODO: Have a font per renderer?
BFont font;
view->GetFont(&font);
font_height fh;
font.GetHeight(&fh);
float fontHeight = ceilf(fh.ascent) + ceilf(fh.descent);
float width = ceilf(font.StringWidth(legend->String()));
return BSize(width, fontHeight);
float width = ceilf(fFont.StringWidth(legend->String()));
return BSize(width, fFontHeight);
}
@ -61,12 +68,20 @@ StringChartLegendRenderer::RenderLegend(ChartLegend* _legend, BView* view,
if (legend == NULL)
return;
BFont font;
view->GetFont(&font);
font_height fh;
font.GetHeight(&fh);
point.y += fh.ascent;
point.y += ceil(fFontAscent);
view->SetFont(&fFont);
view->SetHighColor(rgb_color().set_to(0, 0, 0, 255));
view->DrawString(legend->String(), point);
}
void
StringChartLegendRenderer::_Init()
{
font_height fh;
fFont.GetHeight(&fh);
fFontAscent = ceilf(fh.ascent);
fFontHeight = fFontAscent + ceilf(fh.descent);
fEmWidth = ceilf(fFont.StringWidth("m", 1));
}

13
src/apps/debuganalyzer/gui/chart/StringChartLegend.h
View File

@ -5,6 +5,7 @@
#ifndef STRING_CHART_LEGEND_H
#define STRING_CHART_LEGEND_H
#include <Font.h>
#include <String.h>
#include "chart/ChartLegend.h"
@ -24,6 +25,9 @@ private:
class StringChartLegendRenderer : public ChartLegendRenderer {
public:
StringChartLegendRenderer();
StringChartLegendRenderer(const BFont& font);
virtual void GetMinimumLegendSpacing(BView* view,
float* horizontal, float* vertical);
@ -31,6 +35,15 @@ public:
BView* view);
virtual void RenderLegend(ChartLegend* legend, BView* view,
BPoint point);
private:
void _Init();
private:
BFont fFont;
float fFontAscent;
float fFontHeight;
float fEmWidth;
};