chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 11:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added selectable text antialiasing. Pie chart text overlay looked like crap

Browse Source
This commit is contained in:
Mark Watkins 2013-01-18 05:16:20 +10:00
parent a6478ca3e3
commit 2368c05fa7
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Graphs/gGraphView.cpp
View File

@ -1175,9 +1175,9 @@ void gGraph::qglColor(QColor col)
m_graphview->qglColor(col); m_graphview->qglColor(col);
} }
void gGraph::renderText(QString text, int x,int y, float angle, QColor color, QFont *font) void gGraph::renderText(QString text, int x,int y, float angle, QColor color, QFont *font,bool antialias)
{ {
m_graphview->AddTextQue(text,x,y,angle,color,font); m_graphview->AddTextQue(text,x,y,angle,color,font,antialias);
} }
void gGraph::paint(int originX, int originY, int width, int height) void gGraph::paint(int originX, int originY, int width, int height)
@ -2252,7 +2252,7 @@ void gGraphView::DrawTextQue()
painter.begin(pm); painter.begin(pm);
// Hmmm.. Maybe I need to be able to turn this on/off? // Hmmm.. Maybe I need to be able to turn this on/off?
painter.setRenderHint(QPainter::TextAntialiasing, true); painter.setRenderHint(QPainter::TextAntialiasing, q.antialias);
QBrush b(q.color); QBrush b(q.color);
@ -2344,7 +2344,7 @@ void gGraphView::DrawTextQue()
m_textque_items=0; m_textque_items=0;
} }
void gGraphView::AddTextQue(QString & text, short x, short y, float angle, QColor color, QFont * font) void gGraphView::AddTextQue(QString & text, short x, short y, float angle, QColor color, QFont * font,bool antialias)
{ {
#ifdef ENABLED_THREADED_DRAWING #ifdef ENABLED_THREADED_DRAWING
text_mutex.lock(); text_mutex.lock();
@ -2362,6 +2362,7 @@ void gGraphView::AddTextQue(QString & text, short x, short y, float angle, QColo
q.angle=angle; q.angle=angle;
q.color=color; q.color=color;
q.font=font; q.font=font;
q.antialias=antialias;
} }
void gGraphView::addGraph(gGraph *g,short group) void gGraphView::addGraph(gGraph *g,short group)

6
Graphs/gGraphView.h
View File

@ -249,6 +249,8 @@ struct TextQue
QColor color; QColor color;
//! \variable a pointer to the QFont to use to draw this text //! \variable a pointer to the QFont to use to draw this text
QFont *font; QFont *font;
//! \variable whether to use antialiasing to draw this text
bool antialias;
}; };
/*! \class MyScrollBar /*! \class MyScrollBar
@ -578,7 +580,7 @@ public:
void qglColor(QColor col); void qglColor(QColor col);
//! \brief Queues text for gGraphView object to draw it. //! \brief Queues text for gGraphView object to draw it.
void renderText(QString text, int x,int y, float angle=0.0, QColor color=Qt::black, QFont *font=defaultfont); void renderText(QString text, int x,int y, float angle=0.0, QColor color=Qt::black, QFont *font=defaultfont,bool antialias=true);
//! \brief Rounds Y scale values to make them look nice.. Applies the Graph Preference min/max settings. //! \brief Rounds Y scale values to make them look nice.. Applies the Graph Preference min/max settings.
void roundY(EventDataType &miny, EventDataType &maxy); void roundY(EventDataType &miny, EventDataType &maxy);
@ -908,7 +910,7 @@ public:
void selectionTime(); void selectionTime();
//! \brief Add the Text information to the Text Drawing Queue (called by gGraphs renderText method) //! \brief Add the Text information to the Text Drawing Queue (called by gGraphs renderText method)
void AddTextQue(QString & text, short x, short y, float angle=0.0, QColor color=Qt::black, QFont * font=defaultfont); void AddTextQue(QString & text, short x, short y, float angle=0.0, QColor color=Qt::black, QFont * font=defaultfont, bool antialias=true);
//! \brief Draw all Text in the text drawing queue, via QPainter //! \brief Draw all Text in the text drawing queue, via QPainter
void DrawTextQue(); void DrawTextQue();

2
Graphs/gSegmentChart.cpp
View File

@ -145,7 +145,7 @@ void gSegmentChart::paint(gGraph & w,int left, int top, int width, int height)
QString a=m_names[m]; //QString::number(floor(100.0/m_total*data),'f',0)+"%"; QString a=m_names[m]; //QString::number(floor(100.0/m_total*data),'f',0)+"%";
int x,y; int x,y;
GetTextExtent(a,x,y); GetTextExtent(a,x,y);
w.renderText(a,tpx-(x/2.0),(tpy+y/2.0)); w.renderText(a,tpx-(x/2.0),(tpy+y/2.0),0,Qt::black,defaultfont,false); // antialiasing looks like crap here..
} }
sum=q; sum=q;