luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't print Qt warnings for verbosity 0 - this will simplify the application tests

This commit is contained in:
Matthias Koefferlein 2022-05-29 17:36:54 +02:00
parent a02e9b4d05
commit f2b91997f0
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/klayout_main/klayout_main/klayout.cc
View File

@ -154,14 +154,16 @@ main(int a_argc, const char **a_argv)
#endif #endif
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050000
void myMessageOutput(QtMsgType type, const QMessageLogContext & /*ctx*/, const QString &msg) void custom_message_handler(QtMsgType type, const QMessageLogContext & /*ctx*/, const QString &msg)
{ {
switch (type) { switch (type) {
case QtDebugMsg: case QtDebugMsg:
fprintf(stderr, "Debug: %s\n", msg.toLocal8Bit ().constData ()); fprintf(stderr, "Debug: %s\n", msg.toLocal8Bit ().constData ());
break; break;
case QtWarningMsg: case QtWarningMsg:
fprintf(stderr, "Warning: %s\n", msg.toLocal8Bit ().constData ()); if (tl::verbosity () > 0) {
fprintf(stderr, "Warning: %s\n", msg.toLocal8Bit ().constData ());
}
break; break;
case QtCriticalMsg: case QtCriticalMsg:
fprintf(stderr, "Critical: %s\n", msg.toLocal8Bit ().constData ()); fprintf(stderr, "Critical: %s\n", msg.toLocal8Bit ().constData ());
@ -175,14 +177,16 @@ void myMessageOutput(QtMsgType type, const QMessageLogContext & /*ctx*/, const Q
} }
} }
#else #else
void myMessageOutput(QtMsgType type, const char *msg) void custom_message_handler(QtMsgType type, const char *msg)
{ {
switch (type) { switch (type) {
case QtDebugMsg: case QtDebugMsg:
fprintf(stderr, "Debug: %s\n", msg); fprintf(stderr, "Debug: %s\n", msg);
break; break;
case QtWarningMsg: case QtWarningMsg:
fprintf(stderr, "Warning: %s\n", msg); if (tl::verbosity () > 0) {
fprintf(stderr, "Warning: %s\n", msg);
}
break; break;
case QtCriticalMsg: case QtCriticalMsg:
fprintf(stderr, "Critical: %s\n", msg); fprintf(stderr, "Critical: %s\n", msg);
@ -223,7 +227,9 @@ klayout_main (int &argc, char **argv)
about_text += prg_about_text; about_text += prg_about_text;
lay::Version::set_about_text (about_text.c_str ()); lay::Version::set_about_text (about_text.c_str ());
// Capture the shortcut command line arguments // Capture the shortcut command line arguments and the verbosity settings
// for early errors and warnings
for (int i = 1; i < argc; ++i) { for (int i = 1; i < argc; ++i) {
if (argv [i] == std::string ("-v")) { if (argv [i] == std::string ("-v")) {
@ -236,6 +242,15 @@ klayout_main (int &argc, char **argv)
tl::info << lay::ApplicationBase::usage () << tl::noendl; tl::info << lay::ApplicationBase::usage () << tl::noendl;
return 0; return 0;
} else if (argv [i] == std::string ("-d") && (i + 1) < argc) {
int v = 0;
tl::from_string (argv [++i], v);
if (v < 0) {
v = 0;
}
tl::verbosity (v);
} }
} }
@ -255,9 +270,9 @@ int
klayout_main_cont (int &argc, char **argv) klayout_main_cont (int &argc, char **argv)
{ {
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050000
qInstallMessageHandler (myMessageOutput); qInstallMessageHandler (custom_message_handler);
#else #else
qInstallMsgHandler (myMessageOutput); qInstallMsgHandler (custom_message_handler);
#endif #endif
int result = 0; int result = 0;