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

Trace logger menu bars page size fixes.

This commit is contained in:
mjbudd77 2021-07-17 21:26:54 -04:00
parent 7eb3dcddb7
commit 67e19b6d13
1 changed files with 48 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/drivers/Qt/TraceLogger.cpp
View File

@ -107,6 +107,7 @@ static int oldcodecount = 0, olddatacount = 0;
static traceRecord_t *recBuf = NULL; static traceRecord_t *recBuf = NULL;
static int recBufMax = 0; static int recBufMax = 0;
static int recBufHead = 0; static int recBufHead = 0;
static int recBufNum = 0;
static traceRecord_t *logBuf = NULL; static traceRecord_t *logBuf = NULL;
static int logBufMax = 3000000; static int logBufMax = 3000000;
static int logBufHead = 0; static int logBufHead = 0;
@ -203,8 +204,9 @@ TraceLoggerDialog_t::TraceLoggerDialog_t(QWidget *parent)
hbar->setMinimum(0); hbar->setMinimum(0);
hbar->setMaximum(100); hbar->setMaximum(100);
vbar->setMinimum(0); vbar->setMinimum(0);
vbar->setMaximum(recBufMax); vbar->setMaximum(0);
vbar->setValue(recBufMax); vbar->setValue(0);
vbar->setInvertedAppearance(true);
grid->addWidget(traceView, 0, 0); grid->addWidget(traceView, 0, 0);
grid->addWidget(vbar, 0, 1); grid->addWidget(vbar, 0, 1);
@ -455,8 +457,8 @@ void TraceLoggerDialog_t::logMaxLinesChanged(int index)
initTraceLogBuffer(maxLines); initTraceLogBuffer(maxLines);
vbar->setMaximum(recBufMax); vbar->setMaximum(0);
vbar->setValue(recBufMax); vbar->setValue(0);
logging = logPrev; logging = logPrev;
} }
@ -569,6 +571,7 @@ void TraceLoggerDialog_t::hbarChanged(int val)
//---------------------------------------------------- //----------------------------------------------------
void TraceLoggerDialog_t::vbarChanged(int val) void TraceLoggerDialog_t::vbarChanged(int val)
{ {
//printf("VBAR: %i \n", val );
traceView->update(); traceView->update();
} }
//---------------------------------------------------- //----------------------------------------------------
@ -1055,7 +1058,7 @@ int initTraceLogBuffer(int maxRecs)
{ {
recBufMax = 0; recBufMax = 0;
} }
recBufHead = 0; recBufNum = recBufHead = 0;
} }
return recBuf == NULL; return recBuf == NULL;
} }
@ -1083,6 +1086,11 @@ static void pushToLogBuffer(traceRecord_t &rec)
recBuf[recBufHead] = rec; recBuf[recBufHead] = rec;
recBufHead = (recBufHead + 1) % recBufMax; recBufHead = (recBufHead + 1) % recBufMax;
if ( recBufNum < recBufMax )
{
recBufNum++;
}
if ( logBuf ) if ( logBuf )
{ {
int nextHead, delayCount = 0; int nextHead, delayCount = 0;
@ -1356,7 +1364,7 @@ void QTraceLogView::calcFontData(void)
pxLineSpacing = metrics.lineSpacing() * 1.25; pxLineSpacing = metrics.lineSpacing() * 1.25;
pxLineLead = pxLineSpacing - pxCharHeight; pxLineLead = pxLineSpacing - pxCharHeight;
pxCursorHeight = pxCharHeight; pxCursorHeight = pxCharHeight;
pxLineWidth = pxCharWidth * LOG_LINE_MAX_LEN; pxLineWidth = pxCharWidth * 20;
viewLines = (viewHeight / pxLineSpacing) + 1; viewLines = (viewHeight / pxLineSpacing) + 1;
} }
@ -1672,10 +1680,14 @@ void QTraceLogView::resizeEvent(QResizeEvent *event)
if (viewWidth >= pxLineWidth) if (viewWidth >= pxLineWidth)
{ {
pxLineXScroll = 0; pxLineXScroll = 0;
hbar->hide();
} }
else else
{ {
pxLineXScroll = (int)(0.010f * (float)hbar->value() * (float)(pxLineWidth - viewWidth)); hbar->setPageStep( viewWidth );
hbar->setMaximum( pxLineWidth - viewWidth );
hbar->show();
pxLineXScroll = hbar->value();
} }
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
@ -2071,7 +2083,7 @@ void QTraceLogView::drawText(QPainter *painter, int x, int y, const char *txt, i
//---------------------------------------------------- //----------------------------------------------------
void QTraceLogView::paintEvent(QPaintEvent *event) void QTraceLogView::paintEvent(QPaintEvent *event)
{ {
int i, x, y, v, ofs, row, start, end, nrow, lineLen; int i, x, y, v, row, start, end, nrow, lineLen;
QPainter painter(this); QPainter painter(this);
char line[256]; char line[256];
QColor hlgtFG("white"), hlgtBG("blue"); QColor hlgtFG("white"), hlgtBG("blue");
@ -2093,12 +2105,31 @@ void QTraceLogView::paintEvent(QPaintEvent *event)
v = vbar->value(); v = vbar->value();
if (v < viewLines) if ( viewLines >= recBufNum )
v = viewLines; {
vbar->hide();
}
else
{
vbar->setMaximum( recBufNum - viewLines );
vbar->setPageStep( viewLines );
vbar->show();
}
ofs = recBufMax - v; if (viewWidth >= pxLineWidth)
{
pxLineXScroll = 0;
hbar->hide();
}
else
{
hbar->setPageStep( viewWidth );
hbar->setMaximum( pxLineWidth - viewWidth );
hbar->show();
pxLineXScroll = hbar->value();
}
end = recBufHead - ofs; end = recBufHead - v;
if (end < 0) if (end < 0)
end += recBufMax; end += recBufMax;
@ -2127,8 +2158,6 @@ void QTraceLogView::paintEvent(QPaintEvent *event)
hlgtText.clear(); hlgtText.clear();
} }
pxLineXScroll = (int)(0.010f * (float)hbar->value() * (float)(pxLineWidth - viewWidth));
x = -pxLineXScroll; x = -pxLineXScroll;
y = pxLineSpacing; y = pxLineSpacing;
@ -2139,6 +2168,11 @@ void QTraceLogView::paintEvent(QPaintEvent *event)
rec[row].convToText(line, &lineLen); rec[row].convToText(line, &lineLen);
lineText[row].assign(line); lineText[row].assign(line);
if ( (lineLen*pxCharWidth) > pxLineWidth )
{
pxLineWidth = (lineLen*pxCharWidth);
}
//printf("Line %i: '%s'\n", row, line ); //printf("Line %i: '%s'\n", row, line );
drawText(&painter, x, y, line, 256); drawText(&painter, x, y, line, 256);