sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

highlightRoundLabel --> refreshGameLabels

Browse Source
This commit is contained in:
doitux
2007-05-29 18:37:49 +00:00
parent 41b0a0129a
commit ccb339be04
12 changed files with 147 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/handinterface.h
-1
View File
@@ -76,7 +76,6 @@ public:
virtual void setLastPlayersTurn(const int& theValue) =0; virtual void setLastPlayersTurn(const int& theValue) =0;
virtual int getLastPlayersTurn() const =0; virtual int getLastPlayersTurn() const =0;
virtual void highlightRoundLabel() =0;
virtual void switchRounds() =0; virtual void switchRounds() =0;
}; };
src/engine/local_engine/localhand.cpp
+1 -25
View File
@@ -353,7 +353,7 @@ void LocalHand::switchRounds() {
//unhighlight actual players groupbox //unhighlight actual players groupbox
if(playerArray[lastPlayersTurn]->getMyActiveStatus() == 1) myGui->refreshGroupbox(lastPlayersTurn,1); if(playerArray[lastPlayersTurn]->getMyActiveStatus() == 1) myGui->refreshGroupbox(lastPlayersTurn,1);
highlightRoundLabel(); myGui->refreshGameLabels(actualRound);
// /*/*/*/*cout <<*/*/*/*/ "NextPlayerSpeed1 stop" << endl; // /*/*/*/*cout <<*/*/*/*/ "NextPlayerSpeed1 stop" << endl;
// //
// cout << "NextPlayerSpeed2 start" << endl; // cout << "NextPlayerSpeed2 start" << endl;
@@ -388,27 +388,3 @@ void LocalHand::switchRounds() {
} }
} }
void LocalHand::highlightRoundLabel() {
switch(actualRound) {
case 0: {
myGui->highlightRoundLabel("Preflop");
} break;
case 1: {
myGui->highlightRoundLabel("Flop");
} break;
case 2: {
myGui->highlightRoundLabel("Turn");
} break;
case 3: {
myGui->highlightRoundLabel("River");
} break;
case 4: {
myGui->highlightRoundLabel("");
} break;
default: {
myGui->highlightRoundLabel("!!! FEHLER !!!");
}
}
}
src/engine/local_engine/localhand.h
-1
View File
@@ -82,7 +82,6 @@ public:
void assignButtons(); void assignButtons();
void highlightRoundLabel();
void switchRounds(); void switchRounds();
src/engine/network_engine/clienthand.cpp
+1 -4
View File
@@ -74,8 +74,5 @@ ClientHand::switchRounds()
{ {
} }
void
ClientHand::highlightRoundLabel()
{
}
src/engine/network_engine/clienthand.h
-2
View File
@@ -79,8 +79,6 @@ public:
void setLastPlayersTurn(const int& theValue) { lastPlayersTurn = theValue; } void setLastPlayersTurn(const int& theValue) { lastPlayersTurn = theValue; }
int getLastPlayersTurn() const { return lastPlayersTurn; } int getLastPlayersTurn() const { return lastPlayersTurn; }
void highlightRoundLabel();
void switchRounds(); void switchRounds();
src/gui/generic/serverguiwrapper.cpp
+114 -114
View File
@@ -1,114 +1,114 @@
/*************************************************************************** /***************************************************************************
* Copyright (C) 2007 by Lothar May * * Copyright (C) 2007 by Lothar May *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by * * it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. * * (at your option) any later version. *
* * * *
* This program is distributed in the hope that it will be useful, * * This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of * * but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. * * GNU General Public License for more details. *
* * * *
* You should have received a copy of the GNU General Public License * * You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the * * along with this program; if not, write to the *
* Free Software Foundation, Inc., * * Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/ ***************************************************************************/
#include "serverguiwrapper.h" #include "serverguiwrapper.h"
#include <session.h> #include <session.h>
using namespace std; using namespace std;
ServerGuiWrapper::ServerGuiWrapper(ConfigFile *config, ClientCallback *clientcb, ServerCallback *servercb) ServerGuiWrapper::ServerGuiWrapper(ConfigFile *config, ClientCallback *clientcb, ServerCallback *servercb)
: myConfig(config), myClientcb(clientcb), myServercb(servercb) : myConfig(config), myClientcb(clientcb), myServercb(servercb)
{ {
} }
ServerGuiWrapper::~ServerGuiWrapper() ServerGuiWrapper::~ServerGuiWrapper()
{ {
} }
void ServerGuiWrapper::initGui(int speed) {} void ServerGuiWrapper::initGui(int speed) {}
Session &ServerGuiWrapper::getSession() Session &ServerGuiWrapper::getSession()
{ {
assert(mySession.get()); assert(mySession.get());
return *mySession; return *mySession;
} }
void ServerGuiWrapper::setSession(boost::shared_ptr<Session> session) void ServerGuiWrapper::setSession(boost::shared_ptr<Session> session)
{ {
mySession = session; mySession = session;
} }
void ServerGuiWrapper::refreshSet() const {} void ServerGuiWrapper::refreshSet() const {}
void ServerGuiWrapper::refreshCash() const {} void ServerGuiWrapper::refreshCash() const {}
void ServerGuiWrapper::refreshAction(int playerID, int playerAction) const {} void ServerGuiWrapper::refreshAction(int playerID, int playerAction) const {}
void ServerGuiWrapper::refreshChangePlayer() const {} void ServerGuiWrapper::refreshChangePlayer() const {}
void ServerGuiWrapper::refreshAll() const {} void ServerGuiWrapper::refreshAll() const {}
void ServerGuiWrapper::refreshPot() const {} void ServerGuiWrapper::refreshPot() const {}
void ServerGuiWrapper::refreshGroupbox(int playerID, int status) const {} void ServerGuiWrapper::refreshGroupbox(int playerID, int status) const {}
void ServerGuiWrapper::refreshPlayerName() const {} void ServerGuiWrapper::refreshPlayerName() const {}
void ServerGuiWrapper::refreshButton() const {} void ServerGuiWrapper::refreshButton() const {}
void ServerGuiWrapper::dealHoleCards() {} void ServerGuiWrapper::dealHoleCards() {}
void ServerGuiWrapper::dealFlopCards() {} void ServerGuiWrapper::dealFlopCards() {}
void ServerGuiWrapper::dealTurnCard() {} void ServerGuiWrapper::dealTurnCard() {}
void ServerGuiWrapper::dealRiverCard() {} void ServerGuiWrapper::dealRiverCard() {}
void ServerGuiWrapper::highlightRoundLabel(string round) const {} void ServerGuiWrapper::refreshGameLabels(int round) const {}
void ServerGuiWrapper::nextPlayerAnimation() {} void ServerGuiWrapper::nextPlayerAnimation() {}
void ServerGuiWrapper::preflopAnimation1() {} void ServerGuiWrapper::preflopAnimation1() {}
void ServerGuiWrapper::preflopAnimation2() {} void ServerGuiWrapper::preflopAnimation2() {}
void ServerGuiWrapper::flopAnimation1() {} void ServerGuiWrapper::flopAnimation1() {}
void ServerGuiWrapper::flopAnimation2() {} void ServerGuiWrapper::flopAnimation2() {}
void ServerGuiWrapper::turnAnimation1() {} void ServerGuiWrapper::turnAnimation1() {}
void ServerGuiWrapper::turnAnimation2() {} void ServerGuiWrapper::turnAnimation2() {}
void ServerGuiWrapper::riverAnimation1() {} void ServerGuiWrapper::riverAnimation1() {}
void ServerGuiWrapper::riverAnimation2() {} void ServerGuiWrapper::riverAnimation2() {}
void ServerGuiWrapper::postRiverAnimation1() {} void ServerGuiWrapper::postRiverAnimation1() {}
void ServerGuiWrapper::postRiverRunAnimation1() {} void ServerGuiWrapper::postRiverRunAnimation1() {}
void ServerGuiWrapper::flipHolecardsAllIn() {} void ServerGuiWrapper::flipHolecardsAllIn() {}
void ServerGuiWrapper::nextRoundCleanGui() {} void ServerGuiWrapper::nextRoundCleanGui() {}
void ServerGuiWrapper::meInAction() {} void ServerGuiWrapper::meInAction() {}
void ServerGuiWrapper::logPlayerActionMsg(string playerName, int action, int setValue) {} void ServerGuiWrapper::logPlayerActionMsg(string playerName, int action, int setValue) {}
void ServerGuiWrapper::logNewGameHandMsg(int gameID, int handID) {} void ServerGuiWrapper::logNewGameHandMsg(int gameID, int handID) {}
void ServerGuiWrapper::logPlayerWinsMsg(int playerID, int pot) {} void ServerGuiWrapper::logPlayerWinsMsg(int playerID, int pot) {}
void ServerGuiWrapper::logDealBoardCardsMsg(int roundID, int card1, int card2, int card3, int card4, int card5) {} void ServerGuiWrapper::logDealBoardCardsMsg(int roundID, int card1, int card2, int card3, int card4, int card5) {}
void ServerGuiWrapper::logFlipHoleCardsMsg(std::string playerName, int card1, int card2, int cardsValueInt, std::string showHas) {} void ServerGuiWrapper::logFlipHoleCardsMsg(std::string playerName, int card1, int card2, int cardsValueInt, std::string showHas) {}
void ServerGuiWrapper::SignalNetClientConnect(int actionID) { if (myClientcb) myClientcb->SignalNetClientConnect(actionID); } void ServerGuiWrapper::SignalNetClientConnect(int actionID) { if (myClientcb) myClientcb->SignalNetClientConnect(actionID); }
void ServerGuiWrapper::SignalNetClientGameInfo(int actionID) { if (myClientcb) myClientcb->SignalNetClientGameInfo(actionID); } void ServerGuiWrapper::SignalNetClientGameInfo(int actionID) { if (myClientcb) myClientcb->SignalNetClientGameInfo(actionID); }
void ServerGuiWrapper::SignalNetClientError(int errorID, int osErrorID) { if (myClientcb) myClientcb->SignalNetClientError(errorID, osErrorID); } void ServerGuiWrapper::SignalNetClientError(int errorID, int osErrorID) { if (myClientcb) myClientcb->SignalNetClientError(errorID, osErrorID); }
void ServerGuiWrapper::SignalNetClientPlayerJoined(const string &playerName) { if (myClientcb) myClientcb->SignalNetClientPlayerJoined(playerName); } void ServerGuiWrapper::SignalNetClientPlayerJoined(const string &playerName) { if (myClientcb) myClientcb->SignalNetClientPlayerJoined(playerName); }
void ServerGuiWrapper::SignalNetClientPlayerLeft(const string &playerName) { if (myClientcb) myClientcb->SignalNetClientPlayerLeft(playerName); } void ServerGuiWrapper::SignalNetClientPlayerLeft(const string &playerName) { if (myClientcb) myClientcb->SignalNetClientPlayerLeft(playerName); }
void ServerGuiWrapper::SignalNetClientGameStart(boost::shared_ptr<Game> game) { if (myClientcb) myClientcb->SignalNetClientGameStart(game); } void ServerGuiWrapper::SignalNetClientGameStart(boost::shared_ptr<Game> game) { if (myClientcb) myClientcb->SignalNetClientGameStart(game); }
void ServerGuiWrapper::SignalNetClientChatMsg(const string &playerName, const string &msg) { if (myClientcb) myClientcb->SignalNetClientChatMsg(playerName, msg); } void ServerGuiWrapper::SignalNetClientChatMsg(const string &playerName, const string &msg) { if (myClientcb) myClientcb->SignalNetClientChatMsg(playerName, msg); }
void ServerGuiWrapper::SignalNetServerSuccess(int actionID) { if (myServercb) myServercb->SignalNetServerSuccess(actionID); } void ServerGuiWrapper::SignalNetServerSuccess(int actionID) { if (myServercb) myServercb->SignalNetServerSuccess(actionID); }
void ServerGuiWrapper::SignalNetServerError(int errorID, int osErrorID) { if (myServercb) myServercb->SignalNetServerError(errorID, osErrorID); } void ServerGuiWrapper::SignalNetServerError(int errorID, int osErrorID) { if (myServercb) myServercb->SignalNetServerError(errorID, osErrorID); }
void ServerGuiWrapper::SignalNetServerPlayerJoined(const string &playerName) { if (myServercb) myServercb->SignalNetServerPlayerJoined(playerName); } void ServerGuiWrapper::SignalNetServerPlayerJoined(const string &playerName) { if (myServercb) myServercb->SignalNetServerPlayerJoined(playerName); }
void ServerGuiWrapper::SignalNetServerPlayerLeft(const string &playerName) { if (myServercb) myServercb->SignalNetServerPlayerLeft(playerName); } void ServerGuiWrapper::SignalNetServerPlayerLeft(const string &playerName) { if (myServercb) myServercb->SignalNetServerPlayerLeft(playerName); }
src/gui/generic/serverguiwrapper.h
+2 -3
View File
@@ -44,14 +44,13 @@ public:
void refreshAll() const; void refreshAll() const;
void refreshPlayerName() const; void refreshPlayerName() const;
void refreshButton() const; void refreshButton() const;
void refreshGameLabels(int round) const;
void dealHoleCards(); void dealHoleCards();
void dealFlopCards(); void dealFlopCards();
void dealTurnCard(); void dealTurnCard();
void dealRiverCard(); void dealRiverCard();
void highlightRoundLabel(std::string round) const;
void nextPlayerAnimation(); void nextPlayerAnimation();
void preflopAnimation1(); void preflopAnimation1();
src/gui/guiinterface.h
+1 -1
View File
@@ -56,7 +56,7 @@ public:
virtual void dealTurnCard()=0; virtual void dealTurnCard()=0;
virtual void dealRiverCard()=0; virtual void dealRiverCard()=0;
virtual void highlightRoundLabel(std::string) const=0; virtual void refreshGameLabels(int) const=0;
virtual void nextPlayerAnimation()=0; virtual void nextPlayerAnimation()=0;
src/gui/qt/guiwrapper.cpp
+1 -3
View File
@@ -58,15 +58,13 @@ void GuiWrapper::refreshPot() const { myW->signalRefreshPot(); }
void GuiWrapper::refreshGroupbox(int playerID, int status) const { myW->signalRefreshGroupbox(playerID, status); } void GuiWrapper::refreshGroupbox(int playerID, int status) const { myW->signalRefreshGroupbox(playerID, status); }
void GuiWrapper::refreshPlayerName() const { myW->signalRefreshPlayerName(); } void GuiWrapper::refreshPlayerName() const { myW->signalRefreshPlayerName(); }
void GuiWrapper::refreshButton() const { myW->signalRefreshButton(); } void GuiWrapper::refreshButton() const { myW->signalRefreshButton(); }
void GuiWrapper::refreshGameLabels(int round) const { myW->signalRefreshGameLabels(round); }
void GuiWrapper::dealHoleCards() { myW->signalDealHoleCards(); } void GuiWrapper::dealHoleCards() { myW->signalDealHoleCards(); }
void GuiWrapper::dealFlopCards() { myW->signalDealFlopCards0(); } void GuiWrapper::dealFlopCards() { myW->signalDealFlopCards0(); }
void GuiWrapper::dealTurnCard() { myW->signalDealTurnCards0(); } void GuiWrapper::dealTurnCard() { myW->signalDealTurnCards0(); }
void GuiWrapper::dealRiverCard() { myW->signalDealRiverCards0(); } void GuiWrapper::dealRiverCard() { myW->signalDealRiverCards0(); }
void GuiWrapper::highlightRoundLabel(string round) const { myW->signalHighlightRoundLabel(QString::fromUtf8(round.c_str())); }
void GuiWrapper::nextPlayerAnimation() { myW->signalNextPlayerAnimation(); } void GuiWrapper::nextPlayerAnimation() { myW->signalNextPlayerAnimation(); }
void GuiWrapper::preflopAnimation1() { myW->signalPreflopAnimation1(); } void GuiWrapper::preflopAnimation1() { myW->signalPreflopAnimation1(); }
src/gui/qt/guiwrapper.h
+1 -1
View File
@@ -58,7 +58,7 @@ public:
void dealTurnCard(); void dealTurnCard();
void dealRiverCard(); void dealRiverCard();
void highlightRoundLabel(std::string round) const; void refreshGameLabels(int round) const;
void nextPlayerAnimation(); void nextPlayerAnimation();
src/gui/qt/mainwindow/mainwindowimpl.cpp
+24 -12
View File
@@ -591,7 +591,7 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent)
connect(this, SIGNAL(signalDealTurnCards0()), this, SLOT(dealTurnCards0())); connect(this, SIGNAL(signalDealTurnCards0()), this, SLOT(dealTurnCards0()));
connect(this, SIGNAL(signalDealRiverCards0()), this, SLOT(dealRiverCards0())); connect(this, SIGNAL(signalDealRiverCards0()), this, SLOT(dealRiverCards0()));
connect(this, SIGNAL(signalHighlightRoundLabel(QString)), this, SLOT(highlightRoundLabel(QString))); connect(this, SIGNAL(signalRefreshGameLabels(int)), this, SLOT(refreshGameLabels(int)));
connect(this, SIGNAL(signalNextPlayerAnimation()), this, SLOT(nextPlayerAnimation())); connect(this, SIGNAL(signalNextPlayerAnimation()), this, SLOT(nextPlayerAnimation()));
connect(this, SIGNAL(signalPreflopAnimation1()), this, SLOT(preflopAnimation1())); connect(this, SIGNAL(signalPreflopAnimation1()), this, SLOT(preflopAnimation1()));
@@ -1204,19 +1204,31 @@ void mainWindowImpl::refreshGroupbox(int playerID, int status) {
} }
} }
void mainWindowImpl::highlightRoundLabel(QString round) { void mainWindowImpl::refreshGameLabels(int round) {
// für PostRiverRun (alte Runden stehen lassen) switch(round) {
if(round != "") { case 0: {
textLabel_handLabel->setText("Preflop");
// QPalette tempPalette = frame_handLabel->palette(); } break;
// tempPalette.setColor(QPalette::Window, highlight); case 1: {
// frame_handLabel->setPalette(tempPalette); textLabel_handLabel->setText("Flop");
} break;
textLabel_handLabel->setText(round); case 2: {
textLabel_handNumber->setText(QString::number(mySession->getCurrentGame()->getCurrentHand()->getMyID(),10)); textLabel_handLabel->setText("Turn");
textLabel_gameNumber->setText(QString::number(mySession->getCurrentGame()->getMyGameID(),10)); } break;
case 3: {
textLabel_handLabel->setText("River");
} break;
case 4: {
textLabel_handLabel->setText("");
} break;
default: {
textLabel_handLabel->setText("!!! ERROR !!!");
}
} }
textLabel_handNumber->setText(QString::number(mySession->getCurrentGame()->getCurrentHand()->getMyID(),10));
textLabel_gameNumber->setText(QString::number(mySession->getCurrentGame()->getMyGameID(),10));
} }
void mainWindowImpl::refreshAll() { void mainWindowImpl::refreshAll() {
src/gui/qt/mainwindow/mainwindowimpl.h
+2 -4
View File
@@ -94,7 +94,7 @@ signals:
void signalDealTurnCards0(); void signalDealTurnCards0();
void signalDealRiverCards0(); void signalDealRiverCards0();
void signalHighlightRoundLabel(QString); void signalRefreshGameLabels(int);
void signalNextPlayerAnimation(); void signalNextPlayerAnimation();
void signalPreflopAnimation1(); void signalPreflopAnimation1();
@@ -133,7 +133,7 @@ public slots:
void refreshGroupbox(int =-1, int =-1); void refreshGroupbox(int =-1, int =-1);
void refreshAll(); void refreshAll();
void refreshPlayerName(); void refreshPlayerName();
void refreshGameLabels(int);
void refreshButton(); void refreshButton();
void refreshPlayerAvatar(); void refreshPlayerAvatar();
@@ -144,8 +144,6 @@ public slots:
void meInAction(); void meInAction();
void disableMyButtons(); void disableMyButtons();
void highlightRoundLabel(QString);
void setGameSpeed(const int theValue) { guiGameSpeed = theValue; setSpeeds(); } // Achtung Faktor 10!!! void setGameSpeed(const int theValue) { guiGameSpeed = theValue; setSpeeds(); } // Achtung Faktor 10!!!
void callNewGameDialog() ; void callNewGameDialog() ;