myW removed from engine classes

src/gui/guiinterface.h

@@ -23,21 +23,46 @@
 // #include <iostream>
 #include <string>
 
+#include "session.h"
+#include "game.h"
+
+//wird nach Einbau der EngineInterfaces zu handinterface.h
+#include "localhand.h"
+
 
 class GuiInterface{
 public:
 	virtual ~GuiInterface();
 
-
-	virtual void showPlayerActionLogMsg(std::string playName, int &action, int &setValue) const=0;
-
+	
+	//wird nach Einbau der EngineInterfaces umbenannt in setGameInterface und cp.
+	virtual void setGame(Game*) =0;
+	virtual void setHand(LocalHand*) =0;
+	virtual void setSession(Session*) =0;
+// 
+	virtual int getMaxQuantityPlayers() const=0;
+	
+	//refresh-Funktionen
 	virtual void refreshSet() const=0;
 	virtual void refreshChangePlayer() const=0;
+	virtual void refreshPot() const=0;
+	virtual void refreshGroupbox() const=0;
+	virtual void refreshAll() const=0;
+	virtual void refreshPlayerName() const=0;
 
+// 	virtual void refreshButton() const=0;
+
+// 	virtual void refreshAction() const=0;
+// 	virtual void refreshCash() const=0;
+
+// 	// Karten-Funktionen
+	virtual void dealHoleCards() const=0;
 	virtual void dealFlopCards() const=0;
 	virtual void dealTurnCard() const=0;
 	virtual void dealRiverCard() const=0;
 
+	virtual void highlightRoundLabel(std::string) const=0;
+
 	virtual void nextPlayerAnimation() const=0;
 
 	virtual void preflopAnimation1() const=0;
@@ -53,8 +78,33 @@ public:
 	virtual void riverAnimation2() const=0;
 
 	virtual void postRiverAnimation1() const=0;
+	virtual void postRiverRunAnimation1() const=0;
 // 	virtual void postRiverAnimation2() const=0;
+
+// 	virtual void handSwitchRounds() const=0;
+// 
+// 	virtual void startNewHand() const=0;
+	virtual void nextRoundCleanGui() const=0;
+// 	
+// 	virtual void userWidgetsBackgroudColor() const=0;
+// 	virtual void timerBlockerFalse() const=0;
+	virtual void meInAction() const=0;
+
+
+
+
+	//log.cpp
+	virtual void showPlayerActionLogMsg(std::string playName, int action, int setValue) const=0;
+
+
+
+
+
 		
+	
+	
+
+
 
 };
 

src/gui/guiwrapper.cpp

@@ -44,18 +44,27 @@ GuiWrapper::~GuiWrapper()
 {
 }
 
+void GuiWrapper::setGame(Game *g) { myW->setGame(g); }
+void GuiWrapper::setHand(LocalHand *lh) { myW->setHand(lh); }
+void GuiWrapper::setSession(Session *s) { myW->setSession(s); }
 
-void GuiWrapper::showPlayerActionLogMsg(string playerName, int &action, int &setValue) const { 		myLog->showPlayerActionLogMsg(playerName, action, setValue); 
-}
+int GuiWrapper::getMaxQuantityPlayers() const { return myW->getMaxQuantityPlayers(); }
 
 void GuiWrapper::refreshSet() const { myW->refreshSet(); }
 void GuiWrapper::refreshChangePlayer() const { myW->refreshChangePlayer(); }
+void GuiWrapper::refreshAll() const { myW->refreshAll(); }
+void GuiWrapper::refreshPot() const { myW->refreshPot(); }
+void GuiWrapper::refreshGroupbox() const { myW->refreshGroupbox(); }
+void GuiWrapper::refreshPlayerName() const { myW->refreshPlayerName(); }
 
-
+void GuiWrapper::dealHoleCards() const { myW->dealHoleCards(); }
 void GuiWrapper::dealFlopCards() const { myW->dealFlopCards0(); }
 void GuiWrapper::dealTurnCard() const { myW->dealTurnCards0(); }
 void GuiWrapper::dealRiverCard() const { myW->dealRiverCards0(); }
 
+void GuiWrapper::highlightRoundLabel(string round) const { myW->highlightRoundLabel(round); }
+
+
 void GuiWrapper::nextPlayerAnimation() const { myW->nextPlayerAnimation(); }
 
 void GuiWrapper::preflopAnimation1() const { myW->preflopAnimation1(); }
@@ -71,3 +80,13 @@ void GuiWrapper::riverAnimation1() const { myW->riverAnimation1(); }
 void GuiWrapper::riverAnimation2() const { myW->riverAnimation2(); }
 
 void GuiWrapper::postRiverAnimation1() const { myW->postRiverAnimation1(); }
+void GuiWrapper::postRiverRunAnimation1() const { myW->postRiverRunAnimation1(); }
+
+void GuiWrapper::nextRoundCleanGui() const { myW->nextRoundCleanGui(); }
+
+void GuiWrapper::meInAction() const { myW->meInAction(); }
+
+void GuiWrapper::showPlayerActionLogMsg(string playerName, int action, int setValue) const { myLog->showPlayerActionLogMsg(playerName, action, setValue); }
+
+
+

src/gui/guiwrapper.h

@@ -21,6 +21,8 @@
 #define GUIWRAPPER_H
 
 #include <guiinterface.h>
+#include <string>
+#include <iostream>
 
 class mainWindowImpl;
 class Log;
@@ -34,32 +36,48 @@ public:
 
     ~GuiWrapper();
 
+	void setGame(Game*);
+	void setHand(LocalHand*);
+	void setSession(Session*);	
+
+	int getMaxQuantityPlayers() const;
+
+	void refreshSet() const;
+	void refreshChangePlayer() const;
+	void refreshPot() const;
+	void refreshGroupbox() const;
+	void refreshAll() const;
+	void refreshPlayerName() const;
 	
+	void dealHoleCards() const;
+	void dealFlopCards() const;
+	void dealTurnCard() const;
+	void dealRiverCard() const;
 
-	virtual void showPlayerActionLogMsg(std::string playerName, int &action, int &setValue) const;
-	virtual void refreshSet() const;
-	virtual void refreshChangePlayer() const;
+	void highlightRoundLabel(std::string round) const;
 
-	virtual void dealFlopCards() const;
-	virtual void dealTurnCard() const;
-	virtual void dealRiverCard() const;
+	void nextPlayerAnimation() const;
 
-	virtual void nextPlayerAnimation() const;
-
-	virtual void preflopAnimation1() const;
-	virtual void preflopAnimation2() const;
+	void preflopAnimation1() const;
+	void preflopAnimation2() const;
 	
-	virtual void flopAnimation1() const;
-	virtual void flopAnimation2() const;
+	void flopAnimation1() const;
+	void flopAnimation2() const;
 
-	virtual void turnAnimation1() const;
-	virtual void turnAnimation2() const;
+	void turnAnimation1() const;
+	void turnAnimation2() const;
 
-	virtual void riverAnimation1() const;
-	virtual void riverAnimation2() const;
+	void riverAnimation1() const;
+	void riverAnimation2() const;
 
-	virtual void postRiverAnimation1() const;
-// 	virtual void postRiverAnimation2() const;
+	void postRiverAnimation1() const;
+	void postRiverRunAnimation1() const;
+
+	void nextRoundCleanGui() const;
+
+	void meInAction() const;
+
+	void showPlayerActionLogMsg(std::string playerName, int action, int setValue) const;
 
 private: 
 

src/gui/log.cpp

@@ -62,11 +62,3 @@ void Log::showPlayerActionLogMsg(string playerName, int &action, int &setValue)
 
 
 
-// void Log::msgPlayerAction(QString playerName, int action , int setValue) {
-// 
-// 	
-// 	
-// // 	actualHand->getMainWindowImpl()->textBrowser_Log->append(msg);
-// 
-// }
-

src/gui/mainwindowimpl.cpp

@@ -343,7 +343,9 @@ void mainWindowImpl::refreshGroupbox() {
 
 }
 
-void mainWindowImpl::highlightRoundLabel(QString round) { 
+void mainWindowImpl::highlightRoundLabel(string tempround) { 
+
+	QString round (QString::fromStdString(tempround));
 
 	// für PostRiverRun (alte Runden stehen lassen)
 	if(round != "") {

src/gui/mainwindowimpl.h

@@ -22,23 +22,18 @@
 
 #include "ui_mainwindow.h"
 #include <iostream>
+#include <string>
 
 #include <QtGui>
 #include <QtCore>
 
-/*#include "newgamedialogimpl.h"
-#include "aboutpokerthimpl.h"
-#include "game.h"
-#include "localhand.h"
-#include "session.h"*/
-//#include "player.h"
-//#include "board.h"
-
 class Game;
-class LocalHand;
 class Session;
+class LocalHand;
+
 class QColor;
 
+
 class mainWindowImpl: public QMainWindow, public Ui::mainWindow {
 Q_OBJECT
 public:
@@ -74,7 +69,7 @@ public:
 	void meInAction();
 	void disableMyButtons();
 
-	void highlightRoundLabel(QString);
+	void highlightRoundLabel(std::string);
 
 public slots: