ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

For the Qt GUI, added a PPU pattern tile zoomed view feature via a context menu. The pattern view context menu can now be use to change palettes, toggle tile grid lines, and enter/exit tile zoom mode. Also, added a Qt message capture function to get any error, warning, info, or debug messages that come out of the Qt application core.

This commit is contained in:
mjbudd77 2020-10-19 23:21:00 -04:00
parent 1c762f95d1
commit 2f716e0e77
3 changed files with 256 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/drivers/Qt/main.cpp
View File

@ -7,9 +7,36 @@
consoleWin_t *consoleWindow = NULL;
static void MessageOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg)
{
QByteArray localMsg = msg.toLocal8Bit();
const char *file = context.file ? context.file : "";
const char *function = context.function ? context.function : "";
switch (type)
{
case QtDebugMsg:
fprintf(stderr, "Qt Debug: %s (%s:%u, %s)\n", localMsg.constData(), file, context.line, function);
break;
case QtInfoMsg:
fprintf(stderr, "Qt Info: %s (%s:%u, %s)\n", localMsg.constData(), file, context.line, function);
break;
case QtWarningMsg:
fprintf(stderr, "Qt Warning: %s (%s:%u, %s)\n", localMsg.constData(), file, context.line, function);
break;
case QtCriticalMsg:
fprintf(stderr, "Qt Critical: %s (%s:%u, %s)\n", localMsg.constData(), file, context.line, function);
break;
case QtFatalMsg:
fprintf(stderr, "Qt Fatal: %s (%s:%u, %s)\n", localMsg.constData(), file, context.line, function);
break;
}
}
int main( int argc, char *argv[] )
{
int retval;
qInstallMessageHandler(MessageOutput);
QApplication app(argc, argv);
const char *styleSheetEnv = NULL;

210
src/drivers/Qt/ppuViewer.cpp
View File

@ -4,6 +4,8 @@
#include <stdint.h>
#include <QDir>
#include <QMenu>
#include <QAction>
#include <QPainter>
#include <QInputDialog>
#include <QMessageBox>
@ -247,6 +249,8 @@ ppuPatternView_t::ppuPatternView_t( int patternIndexID, QWidget *parent)
viewWidth = 256;
viewHeight = 256;
tileLabel = NULL;
mode = 0;
drawTileGrid = true;
}
//----------------------------------------------------
void ppuPatternView_t::setPattern( ppuPatternTable_t *p )
@ -316,8 +320,36 @@ void ppuPatternView_t::resizeEvent(QResizeEvent *event)
pattern->h = viewHeight / 128;
}
//----------------------------------------------------
void ppuPatternView_t::keyPressEvent(QKeyEvent *event)
{
//printf("Pattern View Key Press: 0x%x \n", event->key() );
if ( event->key() == Qt::Key_Z )
{
mode = !mode;
}
else if ( event->key() == Qt::Key_G )
{
if ( mode )
{
drawTileGrid = !drawTileGrid;
}
}
else if ( event->key() == Qt::Key_P )
{
pindex[ patternIndex ] = (pindex[ patternIndex ] + 1) % 9;
PPUViewSkip = 100;
FCEUD_UpdatePPUView( -1, 0 );
}
}
//----------------------------------------------------
void ppuPatternView_t::mouseMoveEvent(QMouseEvent *event)
{
if ( mode == 0 )
{
QPoint tile = convPixToTile( event->pos() );
if ( (tile.x() < 16) && (tile.y() < 16) )
@ -325,6 +357,9 @@ void ppuPatternView_t::mouseMoveEvent(QMouseEvent *event)
char stmp[64];
sprintf( stmp, "Tile: $%X%X", tile.y(), tile.x() );
tileLabel->setText( tr(stmp) );
selTile = tile;
}
}
}
//----------------------------------------------------------------------------
@ -339,14 +374,132 @@ void ppuPatternView_t::mousePressEvent(QMouseEvent * event)
FCEUD_UpdatePPUView( -1, 0 );
}
else if ( event->button() == Qt::RightButton )
}
//----------------------------------------------------
void ppuPatternView_t::contextMenuEvent(QContextMenuEvent *event)
{
QAction *act;
QMenu menu(this);
QMenu *subMenu;
QActionGroup *group;
QAction *paletteAct[9];
char stmp[64];
if ( mode )
{
pindex[ patternIndex ] = (pindex[ patternIndex ] + 1) % 9;
sprintf( stmp, "Exit Tile View: %X%X", selTile.y(), selTile.x() );
PPUViewSkip = 100;
act = new QAction(tr(stmp), &menu);
connect( act, SIGNAL(triggered(void)), this, SLOT(exitTileMode(void)) );
menu.addAction( act );
FCEUD_UpdatePPUView( -1, 0 );
act = new QAction(tr("Draw Tile Grid Lines"), &menu);
act->setCheckable(true);
act->setChecked(drawTileGrid);
connect( act, SIGNAL(triggered(void)), this, SLOT(toggleTileGridLines(void)) );
menu.addAction( act );
}
else
{
sprintf( stmp, "View Tile: %X%X", selTile.y(), selTile.x() );
act = new QAction(tr(stmp), &menu);
connect( act, SIGNAL(triggered(void)), this, SLOT(showTileMode(void)) );
menu.addAction( act );
}
subMenu = menu.addMenu(tr("Palette Select"));
group = new QActionGroup(this);
group->setExclusive(true);
for (int i=0; i<9; i++)
{
char stmp[8];
sprintf( stmp, "%i", i+1 );
paletteAct[i] = new QAction(tr(stmp), &menu);
paletteAct[i]->setCheckable(true);
group->addAction(paletteAct[i]);
subMenu->addAction(paletteAct[i]);
paletteAct[i]->setChecked( pindex[ patternIndex ] == i );
}
connect( paletteAct[0], SIGNAL(triggered(void)), this, SLOT(selPalette0(void)) );
connect( paletteAct[1], SIGNAL(triggered(void)), this, SLOT(selPalette1(void)) );
connect( paletteAct[2], SIGNAL(triggered(void)), this, SLOT(selPalette2(void)) );
connect( paletteAct[3], SIGNAL(triggered(void)), this, SLOT(selPalette3(void)) );
connect( paletteAct[4], SIGNAL(triggered(void)), this, SLOT(selPalette4(void)) );
connect( paletteAct[5], SIGNAL(triggered(void)), this, SLOT(selPalette5(void)) );
connect( paletteAct[6], SIGNAL(triggered(void)), this, SLOT(selPalette6(void)) );
connect( paletteAct[7], SIGNAL(triggered(void)), this, SLOT(selPalette7(void)) );
connect( paletteAct[8], SIGNAL(triggered(void)), this, SLOT(selPalette8(void)) );
menu.exec(event->globalPos());
}
//----------------------------------------------------
void ppuPatternView_t::toggleTileGridLines(void)
{
drawTileGrid = !drawTileGrid;
}
//----------------------------------------------------
void ppuPatternView_t::showTileMode(void)
{
mode = 1;
}
//----------------------------------------------------
void ppuPatternView_t::exitTileMode(void)
{
mode = 0;
}
//----------------------------------------------------
void ppuPatternView_t::selPalette0(void)
{
pindex[ patternIndex ] = 0;
}
//----------------------------------------------------
void ppuPatternView_t::selPalette1(void)
{
pindex[ patternIndex ] = 1;
}
//----------------------------------------------------
void ppuPatternView_t::selPalette2(void)
{
pindex[ patternIndex ] = 2;
}
//----------------------------------------------------
void ppuPatternView_t::selPalette3(void)
{
pindex[ patternIndex ] = 3;
}
//----------------------------------------------------
void ppuPatternView_t::selPalette4(void)
{
pindex[ patternIndex ] = 4;
}
//----------------------------------------------------
void ppuPatternView_t::selPalette5(void)
{
pindex[ patternIndex ] = 5;
}
//----------------------------------------------------
void ppuPatternView_t::selPalette6(void)
{
pindex[ patternIndex ] = 6;
}
//----------------------------------------------------
void ppuPatternView_t::selPalette7(void)
{
pindex[ patternIndex ] = 7;
}
//----------------------------------------------------
void ppuPatternView_t::selPalette8(void)
{
pindex[ patternIndex ] = 8;
}
//----------------------------------------------------
void ppuPatternView_t::paintEvent(QPaintEvent *event)
@ -366,7 +519,54 @@ void ppuPatternView_t::paintEvent(QPaintEvent *event)
xx = 0; yy = 0;
if ( PPUView_sprite16Mode[ patternIndex ] )
if ( mode == 1 )
{
w = viewWidth / 8;
h = viewHeight / 8;
if ( w < h )
{
h = w;
}
else
{
w = h;
}
ii = selTile.x();
jj = selTile.y();
// Draw Tile Pixels as rectangles
for (x=0; x < 8; x++)
{
yy = 0;
for (y=0; y < 8; y++)
{
painter.fillRect( xx, yy, w, h, pattern->tile[jj][ii].pixel[y][x].color );
yy += h;
}
xx += w;
}
if ( drawTileGrid )
{
// Draw Tile Pixel grid lines
xx = 0; y = 8*h;
for (x=0; x<9; x++)
{
painter.drawLine( xx, 0 , xx, y ); xx += w;
}
yy = 0; x = 8*w;
for (y=0; y<9; y++)
{
painter.drawLine( 0, yy , x, yy ); yy += h;
}
}
}
else if ( PPUView_sprite16Mode[ patternIndex ] )
{
for (i=0; i<16; i++) //Columns
{

18
src/drivers/Qt/ppuViewer.h
View File

@ -52,14 +52,32 @@ class ppuPatternView_t : public QWidget
protected:
void paintEvent(QPaintEvent *event);
void resizeEvent(QResizeEvent *event);
void keyPressEvent(QKeyEvent *event);
void mouseMoveEvent(QMouseEvent *event);
void mousePressEvent(QMouseEvent * event);
void contextMenuEvent(QContextMenuEvent *event);
int patternIndex;
int viewWidth;
int viewHeight;
int mode;
bool drawTileGrid;
QLabel *tileLabel;
QPoint selTile;
ppuPatternTable_t *pattern;
private slots:
void showTileMode(void);
void exitTileMode(void);
void selPalette0(void);
void selPalette1(void);
void selPalette2(void);
void selPalette3(void);
void selPalette4(void);
void selPalette5(void);
void selPalette6(void);
void selPalette7(void);
void selPalette8(void);
void toggleTileGridLines(void);
};
class ppuPalatteView_t : public QWidget