mirror of
https://github.com/jkriege2/JKQtPlotter.git
synced 2024-11-15 18:15:52 +08:00
JKQTMathText: bugfixed some uninitialized variables
This commit is contained in:
parent
b872fda7f9
commit
715aa4e7d9
@ -96,7 +96,7 @@ void JKQTMathTextHorizontalListNode::getSizeInternal(QPainter& painter, JKQTMath
|
|||||||
if (nodeI_SuperScript) {
|
if (nodeI_SuperScript) {
|
||||||
if (i+1<nodes.size()) { // is there one mor node behind?
|
if (i+1<nodes.size()) { // is there one mor node behind?
|
||||||
if (dynamic_cast<JKQTMathTextSubscriptNode*>(nodes[i+1])) { // is this subscript?
|
if (dynamic_cast<JKQTMathTextSubscriptNode*>(nodes[i+1])) { // is this subscript?
|
||||||
double w1, w2, oh, bh, sp;
|
double w1=0, w2=0, oh=0, bh=0, sp=0;
|
||||||
nodes[i]->getSize(painter, currentEv, w1, bh, oh, sp, prevNodeSizePtrForSuperscript);
|
nodes[i]->getSize(painter, currentEv, w1, bh, oh, sp, prevNodeSizePtrForSuperscript);
|
||||||
|
|
||||||
if (bh>baselineHeight) {
|
if (bh>baselineHeight) {
|
||||||
@ -131,7 +131,7 @@ void JKQTMathTextHorizontalListNode::getSizeInternal(QPainter& painter, JKQTMath
|
|||||||
} else if (nodeI_SubScript) {
|
} else if (nodeI_SubScript) {
|
||||||
if (i+1<nodes.size()) { // is there one mor node behind?
|
if (i+1<nodes.size()) { // is there one mor node behind?
|
||||||
if (dynamic_cast<JKQTMathTextSuperscriptNode*>(nodes[i+1])) { // is this subscript?
|
if (dynamic_cast<JKQTMathTextSuperscriptNode*>(nodes[i+1])) { // is this subscript?
|
||||||
double w1, w2, oh, bh, sp;
|
double w1=0, w2=0, oh=0, bh=0, sp=0;
|
||||||
nodes[i]->getSize(painter, currentEv, w1, bh, oh, sp, prevNodeSizePtrForSubscript);
|
nodes[i]->getSize(painter, currentEv, w1, bh, oh, sp, prevNodeSizePtrForSubscript);
|
||||||
if (bh>baselineHeight) {
|
if (bh>baselineHeight) {
|
||||||
overallHeight=overallHeight+bh-baselineHeight;
|
overallHeight=overallHeight+bh-baselineHeight;
|
||||||
@ -162,7 +162,7 @@ void JKQTMathTextHorizontalListNode::getSizeInternal(QPainter& painter, JKQTMath
|
|||||||
//qDebug()<<"### subsupop: sub+super1 overallHeight="<<overallHeight<<" baselineHeight="<<baselineHeight;
|
//qDebug()<<"### subsupop: sub+super1 overallHeight="<<overallHeight<<" baselineHeight="<<baselineHeight;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
double w1, oh, bh, sp;
|
double w1=0, oh=0, bh=0, sp=0;
|
||||||
nodes[i]->getSize(painter, currentEv, w1, bh, oh, sp, prevNodeSizePtrForSubscript);
|
nodes[i]->getSize(painter, currentEv, w1, bh, oh, sp, prevNodeSizePtrForSubscript);
|
||||||
if (bh>baselineHeight) {
|
if (bh>baselineHeight) {
|
||||||
overallHeight=overallHeight+bh-baselineHeight;
|
overallHeight=overallHeight+bh-baselineHeight;
|
||||||
@ -300,7 +300,7 @@ void JKQTMathTextHorizontalListNode::getSizeInternal(QPainter& painter, JKQTMath
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (i<nodes.size() && doDraw) {
|
if (i<nodes.size() && doDraw) {
|
||||||
double w, oh, bh, sp;
|
double w=0, oh=0, bh=0, sp=0;
|
||||||
if (nodeI_SubScript) nodes[i]->getSize(painter, currentEv, w, bh, oh, sp, prevNodeSizePtrForSubscript);
|
if (nodeI_SubScript) nodes[i]->getSize(painter, currentEv, w, bh, oh, sp, prevNodeSizePtrForSubscript);
|
||||||
else if (nodeI_SuperScript) nodes[i]->getSize(painter, currentEv, w, bh, oh, sp, prevNodeSizePtrForSuperscript);
|
else if (nodeI_SuperScript) nodes[i]->getSize(painter, currentEv, w, bh, oh, sp, prevNodeSizePtrForSuperscript);
|
||||||
else nodes[i]->getSize(painter, currentEv, w, bh, oh, sp, nullptr);
|
else nodes[i]->getSize(painter, currentEv, w, bh, oh, sp, nullptr);
|
||||||
|
Loading…
Reference in New Issue
Block a user