diff --git a/src/gui/qt/gametable/mychancelabel.cpp b/src/gui/qt/gametable/mychancelabel.cpp index 577224c7..393d69a3 100644 --- a/src/gui/qt/gametable/mychancelabel.cpp +++ b/src/gui/qt/gametable/mychancelabel.cpp @@ -23,7 +23,7 @@ MyChanceLabel::~MyChanceLabel() { } -void MyChanceLabel::refreshChance(double *chance) +void MyChanceLabel::refreshChance(int *chance) { RFChance = chance[9]; SFChance = chance[8]; @@ -59,46 +59,46 @@ void MyChanceLabel::paintEvent(QPaintEvent * event) { painter.setFont(font); //Draw Texts - if(RFChance == 0.00) { painter.setPen(QColor(85,99,47)); } + if(RFChance == 0) { painter.setPen(QColor(85,99,47)); } else { painter.setPen(QColor(156,213,0)); } painter.drawText(QRectF(QPointF(2,0), QPointF(76,13)),Qt::AlignRight,"Royal Flush"); - painter.drawText(QRectF(QPointF(196,0), QPointF(236,13)),Qt::AlignRight,QString("%1%").arg(RFChance, 0, 'f', 2)); - if(SFChance == 0.00) { painter.setPen(QColor(85,99,47)); } + painter.drawText(QRectF(QPointF(196,0), QPointF(236,13)),Qt::AlignRight,QString("%1%").arg(RFChance)); + if(SFChance == 0) { painter.setPen(QColor(85,99,47)); } else { painter.setPen(QColor(156,213,0)); } painter.drawText(QRectF(QPointF(2,13), QPointF(76,26)),Qt::AlignRight,"Straight Flush"); - painter.drawText(QRectF(QPointF(196,13), QPointF(236,26)),Qt::AlignRight,QString("%1%").arg(SFChance, 0, 'f', 2)); - if(FOAKChance == 0.00) { painter.setPen(QColor(85,99,47)); } + painter.drawText(QRectF(QPointF(196,13), QPointF(236,26)),Qt::AlignRight,QString("%1%").arg(SFChance)); + if(FOAKChance == 0) { painter.setPen(QColor(85,99,47)); } else { painter.setPen(QColor(156,213,0)); } painter.drawText(QRectF(QPointF(2,26), QPointF(76,39)),Qt::AlignRight,"Four of a Kind"); - painter.drawText(QRectF(QPointF(196,26), QPointF(236,39)),Qt::AlignRight,QString("%1%").arg(FOAKChance, 0, 'f', 2)); - if(FHChance == 0.00) { painter.setPen(QColor(85,99,47)); } + painter.drawText(QRectF(QPointF(196,26), QPointF(236,39)),Qt::AlignRight,QString("%1%").arg(FOAKChance)); + if(FHChance == 0) { painter.setPen(QColor(85,99,47)); } else { painter.setPen(QColor(156,213,0)); } painter.drawText(QRectF(QPointF(2,39), QPointF(76,52)),Qt::AlignRight,"Full House"); - painter.drawText(QRectF(QPointF(196,39), QPointF(236,52)),Qt::AlignRight,QString("%1%").arg(FHChance, 0, 'f', 2)); - if(FLChance == 0.00) { painter.setPen(QColor(85,99,47)); } + painter.drawText(QRectF(QPointF(196,39), QPointF(236,52)),Qt::AlignRight,QString("%1%").arg(FHChance)); + if(FLChance == 0) { painter.setPen(QColor(85,99,47)); } else { painter.setPen(QColor(156,213,0)); } painter.drawText(QRectF(QPointF(2,52), QPointF(76,65)),Qt::AlignRight,"Flush"); - painter.drawText(QRectF(QPointF(196,52), QPointF(236,65)),Qt::AlignRight,QString("%1%").arg(FLChance, 0, 'f', 2)); - if(STRChance == 0.00) { painter.setPen(QColor(85,99,47)); } + painter.drawText(QRectF(QPointF(196,52), QPointF(236,65)),Qt::AlignRight,QString("%1%").arg(FLChance)); + if(STRChance == 0) { painter.setPen(QColor(85,99,47)); } else { painter.setPen(QColor(156,213,0)); } painter.drawText(QRectF(QPointF(2,65), QPointF(76,78)),Qt::AlignRight,"Straight"); - painter.drawText(QRectF(QPointF(196,65), QPointF(236,78)),Qt::AlignRight,QString("%1%").arg(STRChance, 0, 'f', 2)); - if(TOAKChance == 0.00) { painter.setPen(QColor(85,99,47)); } + painter.drawText(QRectF(QPointF(196,65), QPointF(236,78)),Qt::AlignRight,QString("%1%").arg(STRChance)); + if(TOAKChance == 0) { painter.setPen(QColor(85,99,47)); } else { painter.setPen(QColor(156,213,0)); } painter.drawText(QRectF(QPointF(2,78), QPointF(76,91)),Qt::AlignRight,"Three of a Kind"); - painter.drawText(QRectF(QPointF(196,78), QPointF(236,91)),Qt::AlignRight,QString("%1%").arg(TOAKChance, 0, 'f', 2)); - if(TPChance == 0.00) { painter.setPen(QColor(85,99,47)); } + painter.drawText(QRectF(QPointF(196,78), QPointF(236,91)),Qt::AlignRight,QString("%1%").arg(TOAKChance)); + if(TPChance == 0) { painter.setPen(QColor(85,99,47)); } else { painter.setPen(QColor(156,213,0)); } painter.drawText(QRectF(QPointF(2,91), QPointF(76,104)),Qt::AlignRight,"Two Pairs"); - painter.drawText(QRectF(QPointF(196,91), QPointF(236,104)),Qt::AlignRight,QString("%1%").arg(TPChance, 0, 'f', 2)); - if(OPChance == 0.00) { painter.setPen(QColor(85,99,47)); } + painter.drawText(QRectF(QPointF(196,91), QPointF(236,104)),Qt::AlignRight,QString("%1%").arg(TPChance)); + if(OPChance == 0) { painter.setPen(QColor(85,99,47)); } else { painter.setPen(QColor(156,213,0)); } painter.drawText(QRectF(QPointF(2,104), QPointF(76,117)),Qt::AlignRight,"One Pair"); - painter.drawText(QRectF(QPointF(196,104), QPointF(236,117)),Qt::AlignRight,QString("%1%").arg(OPChance, 0, 'f', 2)); - if(HCChance == 0.00) { painter.setPen(QColor(85,99,47)); } + painter.drawText(QRectF(QPointF(196,104), QPointF(236,117)),Qt::AlignRight,QString("%1%").arg(OPChance)); + if(HCChance == 0) { painter.setPen(QColor(85,99,47)); } else { painter.setPen(QColor(156,213,0)); } painter.drawText(QRectF(QPointF(2,117), QPointF(76,130)),Qt::AlignRight,"Highest Card"); - painter.drawText(QRectF(QPointF(196,117), QPointF(236,130)),Qt::AlignRight,QString("%1%").arg(HCChance, 0, 'f', 2)); + painter.drawText(QRectF(QPointF(196,117), QPointF(236,130)),Qt::AlignRight,QString("%1%").arg(HCChance)); //Draw gfx painter.setPen(QColor(0,0,0)); @@ -109,14 +109,14 @@ void MyChanceLabel::paintEvent(QPaintEvent * event) { linearGrad.setColorAt(1, Qt::red); painter.setBrush(linearGrad); - if(RFChance != 0.00) painter.drawRect(80,3,(107*RFChance)/100,7); - if(SFChance != 0.00) painter.drawRect(80,16,(107*SFChance)/100,7); - if(FOAKChance != 0.00) painter.drawRect(80,29,(107*FOAKChance)/100,7); - if(FHChance != 0.00) painter.drawRect(80,42,(107*FHChance)/100,7); - if(FLChance != 0.00) painter.drawRect(80,55,(107*FLChance)/100,7); - if(STRChance != 0.00) painter.drawRect(80,68,(107*STRChance)/100,7); - if(TOAKChance != 0.00) painter.drawRect(80,81,(107*TOAKChance)/100,7); - if(TPChance != 0.00) painter.drawRect(80,94,(107*TPChance)/100,7); - if(OPChance != 0.00) painter.drawRect(80,107,(107*OPChance)/100,7); - if(HCChance != 0.00) painter.drawRect(80,120,(107*HCChance)/100,7); + if(RFChance != 0) painter.drawRect(80,3,(107*RFChance)/100,7); + if(SFChance != 0) painter.drawRect(80,16,(107*SFChance)/100,7); + if(FOAKChance != 0) painter.drawRect(80,29,(107*FOAKChance)/100,7); + if(FHChance != 0) painter.drawRect(80,42,(107*FHChance)/100,7); + if(FLChance != 0) painter.drawRect(80,55,(107*FLChance)/100,7); + if(STRChance != 0) painter.drawRect(80,68,(107*STRChance)/100,7); + if(TOAKChance != 0) painter.drawRect(80,81,(107*TOAKChance)/100,7); + if(TPChance != 0) painter.drawRect(80,94,(107*TPChance)/100,7); + if(OPChance != 0) painter.drawRect(80,107,(107*OPChance)/100,7); + if(HCChance != 0) painter.drawRect(80,120,(107*HCChance)/100,7); } diff --git a/src/gui/qt/gametable/mychancelabel.h b/src/gui/qt/gametable/mychancelabel.h index 4a8a7591..47a33c2b 100644 --- a/src/gui/qt/gametable/mychancelabel.h +++ b/src/gui/qt/gametable/mychancelabel.h @@ -29,21 +29,21 @@ public: void setMyW ( gameTableImpl* theValue ) { myW = theValue; } void paintEvent(QPaintEvent * event); - void refreshChance(double*); + void refreshChance(int*); private: gameTableImpl *myW; - double RFChance; - double SFChance; - double FOAKChance; - double FHChance; - double FLChance; - double STRChance; - double TOAKChance; - double TPChance; - double OPChance; - double HCChance; + int RFChance; + int SFChance; + int FOAKChance; + int FHChance; + int FLChance; + int STRChance; + int TOAKChance; + int TPChance; + int OPChance; + int HCChance; }; #endif