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

running astyle

Browse Source
This commit is contained in:
floty
2014-06-08 17:04:59 +02:00
parent 16f3f6ceb2
commit a2d7c2e916
5 changed files with 44 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/local_engine/localhand.cpp
+20 -20
View File
@@ -158,19 +158,19 @@ void LocalHand::start()
void LocalHand::assignButtons() void LocalHand::assignButtons()
{ {
PlayerListIterator seatIt; PlayerListIterator seatIt;
// delete all buttons // delete all buttons
for (seatIt=seatsList->begin(); seatIt!=seatsList->end(); ++seatIt) { for (seatIt=seatsList->begin(); seatIt!=seatsList->end(); ++seatIt) {
(*seatIt)->setMyButton(BUTTON_NONE); (*seatIt)->setMyButton(BUTTON_NONE);
} }
// assign dealer button // assign dealer button
seatIt = getSeatIt(dealerPosition); seatIt = getSeatIt(dealerPosition);
if(seatIt == seatsList->end()) { if(seatIt == seatsList->end()) {
throw LocalException(__FILE__, __LINE__, ERR_SEAT_NOT_FOUND); throw LocalException(__FILE__, __LINE__, ERR_SEAT_NOT_FOUND);
} }
(*seatIt)->setMyButton(BUTTON_DEALER); (*seatIt)->setMyButton(BUTTON_DEALER);
// assign Small Blind next to dealer. ATTENTION: in heads up it is big blind // assign Small Blind next to dealer. ATTENTION: in heads up it is big blind
@@ -181,40 +181,40 @@ void LocalHand::assignButtons()
throw LocalException(__FILE__, __LINE__, ERR_SEAT_NOT_FOUND); throw LocalException(__FILE__, __LINE__, ERR_SEAT_NOT_FOUND);
} }
for(size_t i=0; i<seatsList->size(); i++) { for(size_t i=0; i<seatsList->size(); i++) {
++dealerPositionIt; ++dealerPositionIt;
if(dealerPositionIt == seatsList->end()) dealerPositionIt = seatsList->begin(); if(dealerPositionIt == seatsList->end()) dealerPositionIt = seatsList->begin();
PlayerListIterator activePlayerIt = getActivePlayerIt( (*dealerPositionIt)->getMyUniqueID() ); PlayerListIterator activePlayerIt = getActivePlayerIt( (*dealerPositionIt)->getMyUniqueID() );
if(activePlayerIt != activePlayerList->end() ) { if(activePlayerIt != activePlayerList->end() ) {
nextActivePlayerFound = true; nextActivePlayerFound = true;
if(activePlayerList->size() > 2) { if(activePlayerList->size() > 2) {
//small blind normal //small blind normal
(*activePlayerIt)->setMyButton(2); (*activePlayerIt)->setMyButton(2);
smallBlindPosition = (*activePlayerIt)->getMyUniqueID(); smallBlindPosition = (*activePlayerIt)->getMyUniqueID();
} else { } else {
//big blind in heads up //big blind in heads up
(*activePlayerIt)->setMyButton(3); (*activePlayerIt)->setMyButton(3);
bigBlindPosition = (*activePlayerIt)->getMyUniqueID(); bigBlindPosition = (*activePlayerIt)->getMyUniqueID();
// lastPlayerAction for showing cards // lastPlayerAction for showing cards
} }
// first player after dealer have to show his cards first (in showdown) // first player after dealer have to show his cards first (in showdown)
lastActionPlayerID = (*activePlayerIt)->getMyUniqueID(); lastActionPlayerID = (*activePlayerIt)->getMyUniqueID();
myBoard->setLastActionPlayerID(lastActionPlayerID); myBoard->setLastActionPlayerID(lastActionPlayerID);
++activePlayerIt; ++activePlayerIt;
if(activePlayerIt == activePlayerList->end()) activePlayerIt = activePlayerList->begin(); if(activePlayerIt == activePlayerList->end()) activePlayerIt = activePlayerList->begin();
if(activePlayerList->size() > 2) { if(activePlayerList->size() > 2) {
//big blind normal //big blind normal
(*activePlayerIt)->setMyButton(3); (*activePlayerIt)->setMyButton(3);
bigBlindPosition = (*activePlayerIt)->getMyUniqueID(); bigBlindPosition = (*activePlayerIt)->getMyUniqueID();
} else { } else {
//small blind in heads up //small blind in heads up
(*activePlayerIt)->setMyButton(2); (*activePlayerIt)->setMyButton(2);
smallBlindPosition = (*activePlayerIt)->getMyUniqueID(); smallBlindPosition = (*activePlayerIt)->getMyUniqueID();
} }
break; break;
src/gui/qt/gametable/gametableimpl.cpp
+1 -2
View File
@@ -4310,8 +4310,7 @@ void gameTableImpl::restoreGameTableGeometry()
int availableHeight = dw.screenGeometry().height(); int availableHeight = dw.screenGeometry().height();
this->showNormal(); this->showNormal();
this->setGeometry(0,0,availableWidth, availableHeight); this->setGeometry(0,0,availableWidth, availableHeight);
} } else {
else {
this->showFullScreen(); this->showFullScreen();
} }
#endif #endif
src/gui/qt/gametable/log/guilog.cpp
+19 -19
View File
@@ -42,7 +42,7 @@ using namespace std;
guiLog::guiLog(gameTableImpl* w, ConfigFile *c) : myW(w), myConfig(c), myLogDir(0), myHtmlLogFile(0), myHtmlLogFile_old(0), myTxtLogFile(0), tb(0) guiLog::guiLog(gameTableImpl* w, ConfigFile *c) : myW(w), myConfig(c), myLogDir(0), myHtmlLogFile(0), myHtmlLogFile_old(0), myTxtLogFile(0), tb(0)
{ {
newVersion = true; newVersion = true;
myW->setGuiLog(this); myW->setGuiLog(this);
myStyle = myW->getMyGameTableStyle(); myStyle = myW->getMyGameTableStyle();
@@ -566,7 +566,7 @@ int guiLog::exportLog(QString fileStringPdb,int modus,int uniqueGameID_req)
switch(modus) { switch(modus) {
case 1: case 1:
log_string = "<h3><b>" + log_string + "</b></h3>\n"; log_string = "<h3><b>" + log_string + "</b></h3>\n";
// if(!newVersion) log_string = "<img src='logo.png'>\n" + log_string; // if(!newVersion) log_string = "<img src='logo.png'>\n" + log_string;
break; break;
case 2: case 2:
log_string += ""; log_string += "";
@@ -657,7 +657,7 @@ int guiLog::exportLog(QString fileStringPdb,int modus,int uniqueGameID_req)
switch(modus) { switch(modus) {
case 1: case 1:
log_string = "<table><tr><td width=\"600\" align=\"center\"><hr noshade size=\"3\"><b>" + log_string; log_string = "<table><tr><td width=\"600\" align=\"center\"><hr noshade size=\"3\"><b>" + log_string;
if(!newVersion) log_string += "</b></td><td></td></tr></table>"; if(!newVersion) log_string += "</b></td><td></td></tr></table>";
else log_string += "</b></td></tr></table>"; else log_string += "</b></td></tr></table>";
break; break;
case 2: case 2:
@@ -719,7 +719,7 @@ int guiLog::exportLog(QString fileStringPdb,int modus,int uniqueGameID_req)
switch(modus) { switch(modus) {
case 1: case 1:
if(!newVersion) log_string += "</br>"; if(!newVersion) log_string += "</br>";
else log_string += "<br />"; else log_string += "<br />";
break; break;
case 2: case 2:
@@ -757,7 +757,7 @@ int guiLog::exportLog(QString fileStringPdb,int modus,int uniqueGameID_req)
log_string += ")"; log_string += ")";
switch(modus) { switch(modus) {
case 1: case 1:
if(!newVersion) log_string += "</br>"; if(!newVersion) log_string += "</br>";
else log_string += "<br />"; else log_string += "<br />";
break; break;
case 2: case 2:
@@ -780,7 +780,7 @@ int guiLog::exportLog(QString fileStringPdb,int modus,int uniqueGameID_req)
} }
} }
if(newVersion) { if(newVersion) {
if(modus == 1) log_string += "<br />"; if(modus == 1) log_string += "<br />";
@@ -902,7 +902,7 @@ int guiLog::exportLog(QString fileStringPdb,int modus,int uniqueGameID_req)
if(nRow_Action == 1) { if(nRow_Action == 1) {
switch(modus) { switch(modus) {
case 1: case 1:
if(!newVersion) log_string += "</br>"; if(!newVersion) log_string += "</br>";
else log_string += "<br />"; else log_string += "<br />";
break; break;
case 2: case 2:
@@ -920,7 +920,7 @@ int guiLog::exportLog(QString fileStringPdb,int modus,int uniqueGameID_req)
} }
if(!newVersion && modus==1) log_string += "</br>"; if(!newVersion && modus==1) log_string += "</br>";
writeLog(log_string,modus); writeLog(log_string,modus);
log_string = ""; log_string = "";
@@ -948,10 +948,10 @@ int guiLog::exportLog(QString fileStringPdb,int modus,int uniqueGameID_req)
} }
switch(modus) { switch(modus) {
case 1: case 1:
if(!newVersion) round_string = "</br><b>" + round_string + "</b>"; if(!newVersion) round_string = "</br><b>" + round_string + "</b>";
else round_string = "<br /><b>" + round_string + "</b>"; else round_string = "<br /><b>" + round_string + "</b>";
if(round_ctr >= GAME_STATE_FLOP) { if(round_ctr >= GAME_STATE_FLOP) {
if(!newVersion) round_string = "</br>\n" + round_string; if(!newVersion) round_string = "</br>\n" + round_string;
else round_string = "<br />\n" + round_string; else round_string = "<br />\n" + round_string;
} }
break; break;
@@ -1018,7 +1018,7 @@ int guiLog::exportLog(QString fileStringPdb,int modus,int uniqueGameID_req)
for(action_ctr=1; action_ctr<=nRow_Action; action_ctr++) { for(action_ctr=1; action_ctr<=nRow_Action; action_ctr++) {
switch(modus) { switch(modus) {
case 1: case 1:
if(!newVersion) { if(!newVersion) {
if(action_ctr>1 && (boost::lexical_cast<std::string>(results.result_Action[3*(action_ctr-1)+1]) == "wins" || boost::lexical_cast<std::string>(results.result_Action[3*(action_ctr-1)+1]) == "sits out" || boost::lexical_cast<std::string>(results.result_Action[3*(action_ctr-1)+1]) == "wins (side pot)")) if(action_ctr>1 && (boost::lexical_cast<std::string>(results.result_Action[3*(action_ctr-1)+1]) == "wins" || boost::lexical_cast<std::string>(results.result_Action[3*(action_ctr-1)+1]) == "sits out" || boost::lexical_cast<std::string>(results.result_Action[3*(action_ctr-1)+1]) == "wins (side pot)"))
log_string += "\n"; log_string += "\n";
else else
@@ -1036,7 +1036,7 @@ int guiLog::exportLog(QString fileStringPdb,int modus,int uniqueGameID_req)
default: default:
; ;
} }
if(!newVersion && boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) == "wins (side pot)") { if(!newVersion && boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) == "wins (side pot)") {
action_string += player[boost::lexical_cast<int>(results.result_Action[3*action_ctr])-1]; action_string += player[boost::lexical_cast<int>(results.result_Action[3*action_ctr])-1];
action_string += " wins $"; action_string += " wins $";
action_string += boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+2]); action_string += boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+2]);
@@ -1056,7 +1056,7 @@ int guiLog::exportLog(QString fileStringPdb,int modus,int uniqueGameID_req)
if(boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) == "wins game") { if(boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) == "wins game") {
switch(modus) { switch(modus) {
case 1: case 1:
if(!newVersion) action_string = "</br></br><i><b>" + action_string + " " + boost::lexical_cast<std::string>(gameID) + "!</i></b></br>"; if(!newVersion) action_string = "</br></br><i><b>" + action_string + " " + boost::lexical_cast<std::string>(gameID) + "!</i></b></br>";
else action_string = "</br><i><b>" + action_string + " " + boost::lexical_cast<std::string>(gameID) + "!</b></i>"; else action_string = "</br><i><b>" + action_string + " " + boost::lexical_cast<std::string>(gameID) + "!</b></i>";
break; break;
case 2: case 2:
@@ -1074,7 +1074,7 @@ int guiLog::exportLog(QString fileStringPdb,int modus,int uniqueGameID_req)
if(boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) == "wins" || boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) == "wins (side pot)") { if(boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) == "wins" || boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) == "wins (side pot)") {
switch(modus) { switch(modus) {
case 1: case 1:
if(!newVersion) action_string = "</br><i>" + action_string + "</i>"; if(!newVersion) action_string = "</br><i>" + action_string + "</i>";
else action_string = "<i>" + action_string + "</i>"; else action_string = "<i>" + action_string + "</i>";
break; break;
case 3: case 3:
@@ -1089,7 +1089,7 @@ int guiLog::exportLog(QString fileStringPdb,int modus,int uniqueGameID_req)
if(boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) == "has left the game" || boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) == "was kicked from the game" || boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) == "is game admin now" || boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) == "has joined the game") { if(boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) == "has left the game" || boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) == "was kicked from the game" || boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) == "is game admin now" || boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) == "has joined the game") {
switch(modus) { switch(modus) {
case 1: case 1:
if(!newVersion) action_string = "<i>" + action_string + "!</i>"; if(!newVersion) action_string = "<i>" + action_string + "!</i>";
else action_string = "<i>" + action_string + "</i>"; else action_string = "<i>" + action_string + "</i>";
break; break;
case 3: case 3:
@@ -1104,7 +1104,7 @@ int guiLog::exportLog(QString fileStringPdb,int modus,int uniqueGameID_req)
if(boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) == "sits out") { if(boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) == "sits out") {
switch(modus) { switch(modus) {
case 1: case 1:
if(!newVersion) action_string = "</br><i><span style=\"font-size:smaller;\">" + action_string + "</span></i>"; if(!newVersion) action_string = "</br><i><span style=\"font-size:smaller;\">" + action_string + "</span></i>";
else action_string = "<i><span style=\"font-size:smaller;\">" + action_string + "</span></i>"; else action_string = "<i><span style=\"font-size:smaller;\">" + action_string + "</span></i>";
break; break;
case 3: case 3:
@@ -1121,7 +1121,7 @@ int guiLog::exportLog(QString fileStringPdb,int modus,int uniqueGameID_req)
// show cards // show cards
if(boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) == "shows" || boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) == "has") { if(boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) == "shows" || boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) == "has") {
// log cards // log cards
if(!newVersion && round_ctr == GAME_STATE_POST_RIVER) log_string += " [ "; if(!newVersion && round_ctr == GAME_STATE_POST_RIVER) log_string += " [ ";
else log_string += " ["; else log_string += " [";
if(modus == 1 || modus == 3) log_string += "<b>"; if(modus == 1 || modus == 3) log_string += "<b>";
@@ -1192,10 +1192,10 @@ int guiLog::exportLog(QString fileStringPdb,int modus,int uniqueGameID_req)
} }
if(!newVersion && boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) != "wins" && boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) != "shows" && boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) != "has" && boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) != "sits out" && boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) != "wins (side pot)" && boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) != "wins game" && boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) != "has left the game" && boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) != "was kicked from the game" && boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) != "is game admin now" && boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) != "has joined the game") { if(!newVersion && boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) != "wins" && boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) != "shows" && boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) != "has" && boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) != "sits out" && boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) != "wins (side pot)" && boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) != "wins game" && boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) != "has left the game" && boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) != "was kicked from the game" && boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) != "is game admin now" && boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) != "has joined the game") {
log_string += "."; log_string += ".";
} }
if(newVersion && boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) != "wins game" && boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) != "has left the game" && boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) != "was kicked from the game" && boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) != "is game admin now" && boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) != "has joined the game") if(newVersion && boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) != "wins game" && boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) != "has left the game" && boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) != "was kicked from the game" && boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) != "is game admin now" && boost::lexical_cast<std::string>(results.result_Action[3*action_ctr+1]) != "has joined the game")
log_string += "."; log_string += ".";
} }
src/gui/qt/gametable/log/guilog.h
+1 -1
View File
@@ -137,7 +137,7 @@ private:
QTextBrowser* tb; QTextBrowser* tb;
GameTableStyleReader *myStyle; GameTableStyleReader *myStyle;
std::string mySqliteLogFileName; std::string mySqliteLogFileName;
bool newVersion; bool newVersion;
friend class GuiWrapper; friend class GuiWrapper;
src/gui/qt/logfiledialog/logfiledialog.cpp
+3 -4
View File
@@ -180,8 +180,8 @@ void LogFileDialog::exportLogToTxt()
if(selectedItem) { if(selectedItem) {
QFileInfo fi(selectedItem->data(0, Qt::UserRole).toString()); QFileInfo fi(selectedItem->data(0, Qt::UserRole).toString());
QFileDialog dlg(this, tr("Export PokerTH log file to plain text"), QFileDialog dlg(this, tr("Export PokerTH log file to plain text"),
QDir::homePath()+"/"+fi.baseName()+".txt", QDir::homePath()+"/"+fi.baseName()+".txt",
tr("PokerTH plain text log (*.txt)")); tr("PokerTH plain text log (*.txt)"));
dlg.setFileMode(QFileDialog::AnyFile); dlg.setFileMode(QFileDialog::AnyFile);
dlg.setAcceptMode(QFileDialog::AcceptSave); dlg.setAcceptMode(QFileDialog::AcceptSave);
#ifdef ANDROID #ifdef ANDROID
@@ -251,8 +251,7 @@ void LogFileDialog::keyPressEvent ( QKeyEvent * event )
if(ui->treeWidget_logFiles->hasFocus()) { if(ui->treeWidget_logFiles->hasFocus()) {
ui->pushButton_deleteLog->click(); ui->pushButton_deleteLog->click();
} }
} } else {
else {
QDialog::keyPressEvent(event); QDialog::keyPressEvent(event);
} }
} }