chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 18:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Loggin improvements, qt5 logging fixes

Browse Source
This commit is contained in:
Mark Watkins 2013-01-22 07:47:40 +10:00
parent 267ac2864c
commit a604c9df1a
2 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
main.cpp
View File

@ -34,27 +34,48 @@
MainWindow *mainwin=NULL; MainWindow *mainwin=NULL;
void MyOutputHandler(QtMsgType type, const char *msg) { #if QT_VERSION < QT_VERSION_CHECK(5,0,0)
void MyOutputHandler(QtMsgType type, const char *msgtxt) {
#else
void MyOutputHandler(QtMsgType type, const QMessageLogContext & context, const QString &msgtxt) {
#endif
if (!mainwin) { if (!mainwin) {
// qInstallMessageHandler(0);
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
fprintf(stderr,"Pre/Post: %s\n",msgtxt.toLocal8Bit().constData());
#else
fprintf(stderr,"Pre/Post: %s\n",msgtxt);
#endif
return; return;
} }
QString msg,typestr;
switch (type) { switch (type) {
case QtDebugMsg:
mainwin->Log(msg);
break;
case QtWarningMsg: case QtWarningMsg:
mainwin->Log(QString("Warning: ")+msg); typestr=QString("Warning: ");
break; break;
case QtFatalMsg: case QtFatalMsg:
mainwin->Log(QString("Fatal: ")+msg); typestr=QString("Fatal: ");
break; break;
case QtCriticalMsg: case QtCriticalMsg:
mainwin->Log(QString("Critical: ")+msg); typestr=QString("Critical: ");
break;
default:
typestr=QString("Debug: ");
break; break;
// Popup a messagebox
//abort();
} }
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
msg=typestr+msgtxt+QString(" (%1:%2, %3)").arg(context.file).arg(context.line).arg(context.function);
#else
msg=typestr+msgtxt;
#endif
mainwin->Log(msg);
if (type==QtFatalMsg) {
abort();
}
//loglock.unlock(); //loglock.unlock();
} }
@ -252,9 +273,9 @@ int main(int argc, char *argv[])
qDebug() << "Selected" << QApplication::font().family(); qDebug() << "Selected" << QApplication::font().family();
#if QT_VERSION < QT_VERSION_CHECK(5,0,0) #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
// qInstallMessageHandler(MyOutputHandler); qInstallMessageHandler(MyOutputHandler);
//#else #else
qInstallMsgHandler(MyOutputHandler); qInstallMsgHandler(MyOutputHandler);
#endif #endif
//#endif //#endif

6
mainwindow.cpp
View File

@ -63,15 +63,16 @@ void MainWindow::Log(QString s)
strlock.lock(); strlock.lock();
// only do this in the main thread? // only do this in the main thread?
for (int i=0;i<logbuffer.size();i++) for (int i=0;i<logbuffer.size();i++) {
ui->logText->appendPlainText(logbuffer[i]); ui->logText->appendPlainText(logbuffer[i]);
fprintf(stderr,"%s\n",logbuffer[i].toLocal8Bit().constData());
}
logbuffer.clear(); logbuffer.clear();
strlock.unlock(); strlock.unlock();
//loglock.unlock(); //loglock.unlock();
} }
MainWindow::MainWindow(QWidget *parent) : MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent), QMainWindow(parent),
ui(new Ui::MainWindow) ui(new Ui::MainWindow)
@ -218,6 +219,7 @@ MainWindow::~MainWindow()
// Shutdown and Save the current User profile // Shutdown and Save the current User profile
Profiles::Done(); Profiles::Done();
mainwin=NULL; mainwin=NULL;
delete ui; delete ui;
} }