From 468862ad35b54ff4cbc9c2e2c5f200ded84ded67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Du=C5=A1an=20Poizl?= Date: Mon, 13 Apr 2026 13:29:54 +0200 Subject: [PATCH] Do not print debug logs by default --- src/batchprocessing.cpp | 2 +- src/databasetree.cpp | 4 ++-- src/databaseview.cpp | 33 +++++++++++++++++---------------- src/main.cpp | 22 ++++++++++++++++++++-- 4 files changed, 40 insertions(+), 21 deletions(-) diff --git a/src/batchprocessing.cpp b/src/batchprocessing.cpp index fd83aa0..83bb6af 100644 --- a/src/batchprocessing.cpp +++ b/src/batchprocessing.cpp @@ -337,7 +337,7 @@ void BatchProcessing::newMessageCli(const QString &message, bool error) if(error) qWarning() << message; else - qDebug() << message; + qInfo() << message; } QJSValue BatchProcessing::getString(const QString &label, const QString &text) diff --git a/src/databasetree.cpp b/src/databasetree.cpp index 6a55fb8..ea567b1 100644 --- a/src/databasetree.cpp +++ b/src/databasetree.cpp @@ -447,7 +447,7 @@ DatabaseTreeView::DatabaseTreeView(Database *database, QWidget *parent) : QWidge ,_database(database) { QVBoxLayout *vlayout = new QVBoxLayout(this); - QHBoxLayout *hlayout = new QHBoxLayout(this); + QHBoxLayout *hlayout = new QHBoxLayout; _model = new DatabaseTree(database, this); _treeView = new QTreeView(this); @@ -473,7 +473,7 @@ DatabaseTreeView::DatabaseTreeView(Database *database, QWidget *parent) : QWidge connect(_filters, &QComboBox::currentIndexChanged, this, &DatabaseTreeView::filterChanged); filterChanged(_filters->currentIndex()); - QStackedWidget *stackedWidget = new QStackedWidget; + QStackedWidget *stackedWidget = new QStackedWidget(this); stackedWidget->addWidget(_treeView); stackedWidget->addWidget(_tableView); diff --git a/src/databaseview.cpp b/src/databaseview.cpp index 25fe774..dd9dd2f 100644 --- a/src/databaseview.cpp +++ b/src/databaseview.cpp @@ -1,19 +1,20 @@ -#include "databaseview.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "batchprocessing.h" +#include "databaseview.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include const QStringList DEFAULT_COLUMNS = {"EXPTIME", "OBJECT", "RA", "DEC"}; @@ -248,7 +249,7 @@ void FITSFileModel::prepareQuery() { setHeaderData(i++, Qt::Horizontal, column); } - std::cout << sql.toStdString() << std::endl; + qDebug() << "DB SQL" << sql; if(lastError().type() != QSqlError::NoError) qDebug() << "Database error" << lastError(); diff --git a/src/main.cpp b/src/main.cpp index b56370c..b03212c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,15 +1,28 @@ #include "mainwindow.h" #include -#include -#include #include #include +#include +#include #include #include "../thumbnailer/genthumbnail.h" #ifdef Q_OS_WIN64 #include #endif +bool DEBUG_LOG = false; + +QtMessageHandler defaultHandler = nullptr; + +void messageHandler(QtMsgType type, const QMessageLogContext &ctx, const QString &message) +{ + if(defaultHandler) + { + if(DEBUG_LOG || type != QtMsgType::QtDebugMsg) + defaultHandler(type, ctx, message); + } +} + int main(int argc, char *argv[]) { #ifdef __linux__ @@ -29,6 +42,7 @@ int main(int argc, char *argv[]) freopen("CONOUT$", "w", stderr); } #endif + defaultHandler = qInstallMessageHandler(messageHandler); QCommandLineParser cmd; cmd.addOption({"gl", "Use desktop OpenGL. This is default on x86 and MacOS platform."}); @@ -40,6 +54,7 @@ int main(int argc, char *argv[]) cmd.addOption({"scriptarg", "String that will be passed to script as variable \"scriparg\"", "arg"}); cmd.addOption({"outdir", "Output dir for script (default: CWD)", "dir", "."}); cmd.addOption({"noexit", "Do not exit application when script finish"}); + cmd.addOption({"debug", "Print debug info"}); cmd.addHelpOption(); QStringList cmdArgs; for(int i = 0; i < argc; i++) @@ -51,6 +66,9 @@ int main(int argc, char *argv[]) if(cmd.isSet("gles")) useGLES = true; + if(cmd.isSet("debug")) + DEBUG_LOG = true; + if(cmd.isSet("thumb")) { QCoreApplication app(argc, argv);