mirrors/JKQtPlotter
1
0
Fork 0
mirror of https://github.com/jkriege2/JKQtPlotter.git synced 2024-12-25 01:51:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

JKQTMathTextLabel now works better (use JKQTMathTextLabel::setMath() !!!)

Browse Source
This commit is contained in:
kriegerj 2015-09-01 12:43:04 +02:00
parent dbfcf0525b
commit b83d0cb879
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
jkqtmathtext.cpp
View File

@ -24,6 +24,7 @@
#include <QDebug>
#include <QFontDatabase>
#include <typeinfo>
#include <QApplication>
//#define QColor2String(color) QString(jkqtp_rgbtostring((color).red(), (color).green(), (color).blue(), (color).alpha()).c_str())
@ -4053,7 +4054,8 @@ void JKQTMathTextLabel::setMath(const QString &text, bool doRepaint)
if (text!=lastText || doRepaint){
lastText=text;
repaintDo=true;
repaint();
internalPaint();
update();
}
}
@ -4062,12 +4064,16 @@ void JKQTMathTextLabel::internalPaint()
{
//return;
//qDebug()<<"internalPaint "<<lastText<<repaintDo;
if (repaintDo) {
//if (repaintDo) {
QSizeF size;
{
repaintDo=false;
//qDebug()<<"internalPaint(): parse "<<m_mathText->parse(lastText)<<"\n "<<m_mathText->get_error_list().join("\n")<<"\n\n";
if (buffer.width()<=0 || buffer.height()<=0) buffer=QPixmap(100,100);
if (!m_mathText->parse(lastText)) {
qDebug()<<"JKQTMathTextLabel::internalPaint(): parse '"<<lastText<<"': "<<m_mathText->parse(lastText)<<"\n "<<m_mathText->get_error_list().join("\n")<<"\n\n";
}
if (buffer.width()<=0 || buffer.height()<=0) buffer=QPixmap(1000,100);
//qDebug()<<"internalPaint(): buffer "<<buffer.size();
QPainter p;
//qDebug()<<"internalPaint(): "<<p.begin(&buffer);
@ -4091,16 +4097,21 @@ void JKQTMathTextLabel::internalPaint()
m_mathText->draw(p,alignment(), QRectF(QPointF(0,0), size));
p.end();
}
}
setPixmap(buffer);
//}
//qDebug()<<"internalPaint(): setPixmap";
QApplication::processEvents();
//qDebug()<<"internalPaint(): DONE";
}
void JKQTMathTextLabel::paintEvent(QPaintEvent *event)
{
//QLabel::paintEvent(event);
//return;
internalPaint();
//qDebug()<<"paintEvent: "<<buffer.size();
setPixmap(buffer);
//QApplication::processEvents();
QLabel::paintEvent(event);
//qDebug()<<"paintEvent DONE: "<<size();
}