organ
/
Sanmill
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qt: Change enum Models to enum class

This commit is contained in:
Calcitem 2020-12-29 15:37:59 +08:00
parent 0915ed57af
commit c1930b9695
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ui/qt/game.cpp
View File

@ -235,7 +235,7 @@ void Game::gameReset()
for (int i = 0; i < rule.nTotalPiecesEachSide; i++) {
// 先手的棋子
md = isInverted ? PieceItem::whitePiece : PieceItem::blackPiece;
md = isInverted ? PieceItem::Models::whitePiece : PieceItem::Models::blackPiece;
newP = new PieceItem;
newP->setModel(md);
newP->setPos(scene.pos_p1);
@ -246,7 +246,7 @@ void Game::gameReset()
scene.addItem(newP);
// 后手的棋子
md = isInverted ? PieceItem::blackPiece : PieceItem::whitePiece;
md = isInverted ? PieceItem::Models::blackPiece : PieceItem::Models::whitePiece;
newP = new PieceItem;
newP->setModel(md);
newP->setPos(scene.pos_p2);
@ -325,12 +325,12 @@ void Game::setInvert(bool arg)
for (PieceItem *pieceItem : pieceList) {
if (pieceItem) {
// 黑子变白
if (pieceItem->getModel() == PieceItem::blackPiece)
pieceItem->setModel(PieceItem::whitePiece);
if (pieceItem->getModel() == PieceItem::Models::blackPiece)
pieceItem->setModel(PieceItem::Models::whitePiece);
// 白子变黑
else if (pieceItem->getModel() == PieceItem::whitePiece)
pieceItem->setModel(PieceItem::blackPiece);
else if (pieceItem->getModel() == PieceItem::Models::whitePiece)
pieceItem->setModel(PieceItem::Models::blackPiece);
// 刷新棋子显示
pieceItem->update();

10
src/ui/qt/pieceitem.cpp
View File

@ -46,7 +46,7 @@ PieceItem::PieceItem(QGraphicsItem *parent) :
//setAcceptHoverEvents(true);
// 默认模型为没有棋子
model = noPiece;
model = Models::noPiece;
// 棋子尺寸
size = PIECE_SIZE;
@ -93,7 +93,7 @@ void PieceItem::paint(QPainter *painter,
// 空模型不画棋子
switch (model) {
case blackPiece:
case Models::blackPiece:
// 如果模型为黑色，则画黑色棋子
#ifdef MOBILE_APP_UI
painter->setPen(Qt::NoPen);
@ -105,7 +105,7 @@ void PieceItem::paint(QPainter *painter,
#endif /* MOBILE_APP_UI */
break;
case whitePiece:
case Models::whitePiece:
// 如果模型为白色，则画白色棋子
#ifdef MOBILE_APP_UI
painter->setPen(Qt::NoPen);
@ -123,11 +123,11 @@ void PieceItem::paint(QPainter *painter,
// 如果模型要求显示序号
if (showNum) {
// 如果模型为黑色，用白色笔画序号
if (model == blackPiece)
if (model == Models::blackPiece)
painter->setPen(QColor(255, 255, 255));
// 如果模型为白色，用白色笔画序号
if (model == whitePiece)
if (model == Models::whitePiece)
painter->setPen(QColor(0, 0, 0));
// 字体

4
src/ui/qt/pieceitem.h
View File

@ -57,7 +57,7 @@ public:
}
// 模型状态枚举，用位运算标明
enum Models
enum class Models
{
noPiece = 0x1, // 空棋子
blackPiece = 0x2, // 黑色棋子
@ -94,7 +94,7 @@ public:
deleted = del;
if (deleted)
this->model = noPiece;
this->model = Models::noPiece;
update(boundingRect());
}