diff --git a/src/gui/qt/gametable.ui b/src/gui/qt/gametable.ui index ad25fdf1..24d7b2f0 100644 --- a/src/gui/qt/gametable.ui +++ b/src/gui/qt/gametable.ui @@ -1780,7 +1780,7 @@ Kick - + diff --git a/src/gui/qt/gametable/mychancelabel.cpp b/src/gui/qt/gametable/mychancelabel.cpp index 9e1418c8..e86574c6 100644 --- a/src/gui/qt/gametable/mychancelabel.cpp +++ b/src/gui/qt/gametable/mychancelabel.cpp @@ -25,21 +25,32 @@ MyChanceLabel::~MyChanceLabel() void MyChanceLabel::refreshChance(int **chance) { - RFChance = chance[9][0]; - SFChance = chance[8][0]; - FOAKChance = chance[7][0]; - FHChance = chance[6][0]; - FLChance = chance[5][0]; - STRChance = chance[4][0]; - TOAKChance = chance[3][0]; - TPChance = chance[2][0]; - OPChance = chance[1][0]; - HCChance = chance[0][0]; + RFChance[0] = chance[9][0]; + SFChance[0] = chance[8][0]; + FOAKChance[0] = chance[7][0]; + FHChance[0] = chance[6][0]; + FLChance[0] = chance[5][0]; + STRChance[0] = chance[4][0]; + TOAKChance[0] = chance[3][0]; + TPChance[0] = chance[2][0]; + OPChance[0] = chance[1][0]; + HCChance[0] = chance[0][0]; + + RFChance[1] = chance[9][1]; + SFChance[1] = chance[8][1]; + FOAKChance[1] = chance[7][1]; + FHChance[1] = chance[6][1]; + FLChance[1] = chance[5][1]; + STRChance[1] = chance[4][1]; + TOAKChance[1] = chance[3][1]; + TPChance[1] = chance[2][1]; + OPChance[1] = chance[1][1]; + HCChance[1] = chance[0][1]; update(); } -void MyChanceLabel::paintEvent(QPaintEvent * event) { +void MyChanceLabel::paintEvent(QPaintEvent * /*event*/) { QPainter painter(this); @@ -59,46 +70,46 @@ void MyChanceLabel::paintEvent(QPaintEvent * event) { painter.setFont(font); //Draw Texts - if(RFChance == 0) { painter.setPen(QColor(85,99,47)); } + if(RFChance[1] == 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)); - if(SFChance == 0) { painter.setPen(QColor(85,99,47)); } + painter.drawText(QRectF(QPointF(196,0), QPointF(236,13)),Qt::AlignRight,QString("%1%").arg(RFChance[0])); + if(SFChance[1] == 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)); - if(FOAKChance == 0) { painter.setPen(QColor(85,99,47)); } + painter.drawText(QRectF(QPointF(196,13), QPointF(236,26)),Qt::AlignRight,QString("%1%").arg(SFChance[0])); + if(FOAKChance[1] == 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)); - if(FHChance == 0) { painter.setPen(QColor(85,99,47)); } + painter.drawText(QRectF(QPointF(196,26), QPointF(236,39)),Qt::AlignRight,QString("%1%").arg(FOAKChance[0])); + if(FHChance[1] == 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)); - if(FLChance == 0) { painter.setPen(QColor(85,99,47)); } + painter.drawText(QRectF(QPointF(196,39), QPointF(236,52)),Qt::AlignRight,QString("%1%").arg(FHChance[0])); + if(FLChance[1] == 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)); - if(STRChance == 0) { painter.setPen(QColor(85,99,47)); } + painter.drawText(QRectF(QPointF(196,52), QPointF(236,65)),Qt::AlignRight,QString("%1%").arg(FLChance[0])); + if(STRChance[1] == 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)); - if(TOAKChance == 0) { painter.setPen(QColor(85,99,47)); } + painter.drawText(QRectF(QPointF(196,65), QPointF(236,78)),Qt::AlignRight,QString("%1%").arg(STRChance[0])); + if(TOAKChance[1] == 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)); - if(TPChance == 0) { painter.setPen(QColor(85,99,47)); } + painter.drawText(QRectF(QPointF(196,78), QPointF(236,91)),Qt::AlignRight,QString("%1%").arg(TOAKChance[0])); + if(TPChance[1] == 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)); - if(OPChance == 0) { painter.setPen(QColor(85,99,47)); } + painter.drawText(QRectF(QPointF(196,91), QPointF(236,104)),Qt::AlignRight,QString("%1%").arg(TPChance[0])); + if(OPChance[1] == 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)); - if(HCChance == 0) { painter.setPen(QColor(85,99,47)); } + painter.drawText(QRectF(QPointF(196,104), QPointF(236,117)),Qt::AlignRight,QString("%1%").arg(OPChance[0])); + if(HCChance[1] == 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)); + painter.drawText(QRectF(QPointF(196,117), QPointF(236,130)),Qt::AlignRight,QString("%1%").arg(HCChance[0])); //Draw gfx painter.setPen(QColor(0,0,0)); @@ -109,31 +120,42 @@ void MyChanceLabel::paintEvent(QPaintEvent * event) { linearGrad.setColorAt(1, Qt::red); painter.setBrush(linearGrad); - if(RFChance != 0) painter.drawRect(80,3,(117*RFChance)/100,7); - if(SFChance != 0) painter.drawRect(80,16,(117*SFChance)/100,7); - if(FOAKChance != 0) painter.drawRect(80,29,(117*FOAKChance)/100,7); - if(FHChance != 0) painter.drawRect(80,42,(117*FHChance)/100,7); - if(FLChance != 0) painter.drawRect(80,55,(117*FLChance)/100,7); - if(STRChance != 0) painter.drawRect(80,68,(117*STRChance)/100,7); - if(TOAKChance != 0) painter.drawRect(80,81,(117*TOAKChance)/100,7); - if(TPChance != 0) painter.drawRect(80,94,(117*TPChance)/100,7); - if(OPChance != 0) painter.drawRect(80,107,(117*OPChance)/100,7); - if(HCChance != 0) painter.drawRect(80,120,(117*HCChance)/100,7); + if(RFChance[1] != 0) painter.drawRect(80,3,(117*RFChance[0])/100,7); + if(SFChance[1] != 0) painter.drawRect(80,16,(117*SFChance[0])/100,7); + if(FOAKChance[1] != 0) painter.drawRect(80,29,(117*FOAKChance[0])/100,7); + if(FHChance[1] != 0) painter.drawRect(80,42,(117*FHChance[0])/100,7); + if(FLChance[1] != 0) painter.drawRect(80,55,(117*FLChance[0])/100,7); + if(STRChance[1] != 0) painter.drawRect(80,68,(117*STRChance[0])/100,7); + if(TOAKChance[1] != 0) painter.drawRect(80,81,(117*TOAKChance[0])/100,7); + if(TPChance[1] != 0) painter.drawRect(80,94,(117*TPChance[0])/100,7); + if(OPChance[1] != 0) painter.drawRect(80,107,(117*OPChance[0])/100,7); + if(HCChance[1] != 0) painter.drawRect(80,120,(117*HCChance[0])/100,7); } void MyChanceLabel::resetChance() { - RFChance = 0; - SFChance = 0; - FOAKChance = 0; - FHChance = 0; - FLChance = 0; - STRChance = 0; - TOAKChance = 0; - TPChance = 0; - OPChance = 0; - HCChance = 0; + RFChance[0] = 0; + SFChance[0] = 0; + FOAKChance[0] = 0; + FHChance[0] = 0; + FLChance[0] = 0; + STRChance[0] = 0; + TOAKChance[0] = 0; + TPChance[0] = 0; + OPChance[0] = 0; + HCChance[0] = 0; + + RFChance[1] = 0; + SFChance[1] = 0; + FOAKChance[1] = 0; + FHChance[1] = 0; + FLChance[1] = 0; + STRChance[1] = 0; + TOAKChance[1] = 0; + TPChance[1] = 0; + OPChance[1] = 0; + HCChance[1] = 0; update(); } \ No newline at end of file diff --git a/src/gui/qt/gametable/mychancelabel.h b/src/gui/qt/gametable/mychancelabel.h index da8542e4..9e37d0ef 100644 --- a/src/gui/qt/gametable/mychancelabel.h +++ b/src/gui/qt/gametable/mychancelabel.h @@ -35,16 +35,16 @@ public: private: gameTableImpl *myW; - int RFChance; - int SFChance; - int FOAKChance; - int FHChance; - int FLChance; - int STRChance; - int TOAKChance; - int TPChance; - int OPChance; - int HCChance; + int RFChance[2]; + int SFChance[2]; + int FOAKChance[2]; + int FHChance[2]; + int FLChance[2]; + int STRChance[2]; + int TOAKChance[2]; + int TPChance[2]; + int OPChance[2]; + int HCChance[2]; }; #endif