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

Change trace logger Log Last text to be a label instead of a checkbox. Logging will always go to screen even if also going to a file. The same buffer is used for both.

This commit is contained in:
mjbudd77 2021-08-14 12:59:00 -04:00
parent 03a40f22ac
commit d8a1425715
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -216,10 +216,9 @@ TraceLoggerDialog_t::TraceLoggerDialog_t(QWidget *parent)
mainLayout->addLayout(grid, 1); mainLayout->addLayout(grid, 1);
lbl = new QLabel(tr("Lines")); lbl = new QLabel(tr("Lines"));
logLastCbox = new QCheckBox(tr("Log Last")); logLastLbl = new QLabel(tr("Log Last"));
logMaxLinesComboBox = new QComboBox(); logMaxLinesComboBox = new QComboBox();
logLastCbox->setChecked(true);
logMaxLinesComboBox->addItem(tr("3,000,000"), 3000000); logMaxLinesComboBox->addItem(tr("3,000,000"), 3000000);
logMaxLinesComboBox->addItem(tr("1,000,000"), 1000000); logMaxLinesComboBox->addItem(tr("1,000,000"), 1000000);
logMaxLinesComboBox->addItem(tr("300,000"), 300000); logMaxLinesComboBox->addItem(tr("300,000"), 300000);
@ -270,7 +269,7 @@ TraceLoggerDialog_t::TraceLoggerDialog_t(QWidget *parent)
connect( clearButton, SIGNAL(clicked(void)), this, SLOT(clearLog(void))); connect( clearButton, SIGNAL(clicked(void)), this, SLOT(clearLog(void)));
hbox = new QHBoxLayout(); hbox = new QHBoxLayout();
hbox->addWidget(logLastCbox); hbox->addWidget(logLastLbl);
hbox->addWidget(logMaxLinesComboBox); hbox->addWidget(logMaxLinesComboBox);
hbox->addWidget(lbl); hbox->addWidget(lbl);
@ -425,20 +424,13 @@ void TraceLoggerDialog_t::updatePeriodic(void)
{ {
char traceViewDrawEnable; char traceViewDrawEnable;
if (logLastCbox->isChecked()) if (FCEUI_EmulationPaused())
{ {
if (FCEUI_EmulationPaused()) traceViewDrawEnable = 1;
{
traceViewDrawEnable = 1;
}
else
{
traceViewDrawEnable = autoUpdateCbox->isChecked();
}
} }
else else
{ {
traceViewDrawEnable = 0; traceViewDrawEnable = autoUpdateCbox->isChecked();
} }
if ( !logging || !logFileCbox->isChecked()) if ( !logging || !logFileCbox->isChecked())
@ -515,6 +507,8 @@ void TraceLoggerDialog_t::toggleLoggingOnOff(void)
diskThread->requestInterruption(); diskThread->requestInterruption();
diskThread->quit(); diskThread->quit();
diskThread->wait(1000); diskThread->wait(1000);
traceView->update();
} }
else else
{ {

2
src/drivers/Qt/TraceLogger.h
View File

@ -161,7 +161,7 @@ public:
void showBufferWarning(void); void showBufferWarning(void);
protected: protected:
QTimer *updateTimer; QTimer *updateTimer;
QCheckBox *logLastCbox; QLabel *logLastLbl;
QCheckBox *logFileCbox; QCheckBox *logFileCbox;
QComboBox *logMaxLinesComboBox; QComboBox *logMaxLinesComboBox;