Skip to content
Snippets Groups Projects

Failed assertion throws runtime_error; message box moved to GUI main loop try..catch wrapper (#496)

Merged Wuttke, Joachim requested to merge i496j into r20.0
All threads resolved!
1 file
+ 8
5
Compare changes
  • Side-by-side
  • Inline
+ 35
33
@@ -13,7 +13,6 @@
// ************************************************************************************************
#include "App/AppOptions.h"
#include "App/MessageHandler.h"
#include "Base/Util/Assert.h"
#include "GUI/Application/ApplicationSettings.h"
#include "GUI/Support/Util/Path.h"
@@ -21,6 +20,7 @@
#include "GUI/View/Main/MainWindow.h"
#include "GUI/View/Tool/Globals.h"
#include "config_build.h"
#include <QApplication>
#include <QDir>
#include <QIcon>
#include <QLocale>
@@ -28,15 +28,6 @@
#include <QMetaType>
#include <QtGlobal>
auto guiFailedAssertion = [](std::string msg) {
#ifdef BA_DEBUG
std::cerr << "FATAL (catched in debug mode): " << msg << std::endl;
std::raise(11); // abort so that we can inspect the backtrace
#else
qFatal("%s", msg.c_str());
#endif
};
int main(int argc, char* argv[])
{
ApplicationOptions options(argc, argv);
@@ -44,35 +35,46 @@ int main(int argc, char* argv[])
QLocale::setDefault(QLocale(QLocale::English, QLocale::UnitedStates));
qRegisterMetaType<QVector<double>>("QVector<double>");
QApplication app(argc, argv);
QApplication::setApplicationName("BornAgain");
QApplication::setApplicationVersion(GUI::Util::Path::getBornAgainVersionString());
QApplication::setOrganizationName("BornAgain");
int ret = -1;
try {
QApplication app(argc, argv);
app.setApplicationName("BornAgain");
app.setApplicationVersion(GUI::Util::Path::getBornAgainVersionString());
app.setOrganizationName("BornAgain");
#ifndef Q_OS_MAC
QApplication::setWindowIcon(QIcon(":/images/BornAgain.ico"));
app.setWindowIcon(QIcon(":/images/BornAgain.ico"));
#endif
ApplicationSettings applicationSettings;
qInstallMessageHandler(messageHandler);
failedAssertion = guiFailedAssertion;
ApplicationSettings applicationSettings;
register1DDataLoaders();
register1DDataLoaders();
auto style = applicationSettings.styleToUse();
applicationSettings.loadStyle(style);
auto style = applicationSettings.styleToUse();
applicationSettings.loadStyle(style);
QString dir = GUI::Util::Path::appDataFolder();
if (!QDir().exists(dir))
QDir().mkpath(dir);
QString dir = GUI::Util::Path::appDataFolder();
if (!QDir().exists(dir))
QDir().mkpath(dir);
MainWindow win;
GUI::Global::mainWindow = &win;
if (options.find("geometry"))
win.resize(options.mainWindowSize());
if (options.find("project-file"))
win.loadProject(options.projectFile());
win.show();
MainWindow win;
GUI::Global::mainWindow = &win;
if (options.find("geometry"))
win.resize(options.mainWindowSize());
if (options.find("project-file"))
win.loadProject(options.projectFile());
win.show();
return QApplication::exec();
ret = app.exec();
} catch (const std::exception& ex) {
QApplication app(argc, argv);
QMessageBox msgbox(QMessageBox::Critical, "BornAgain: fatal bug",
QString("Sorry, you encountered a fatal bug.\n"
"The application will terminate.\n"
"Please note the following and inform the maintainers.\n\n")
+ ex.what() + "\n",
QMessageBox::Ok, nullptr);
msgbox.exec();
return 1;
}
return ret;
}
Loading