kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge pull request #20874 from 3x380V/main-cleanup

Browse Source 
Main: cleanup
This commit is contained in:
Chris Hennes
2025-04-29 07:20:12 -05:00
committed by GitHub
parent 8cc1565dcb 8a0f94d59f
commit 1bf21f85bd
3 changed files with 55 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/Main/MainCmd.cpp
View File

@@ -27,17 +27,12 @@
#undef _PreComp_
#endif
#ifdef FC_OS_LINUX
#include <unistd.h>
#endif
#if HAVE_CONFIG_H
#include <config.h>
#endif // HAVE_CONFIG_H
#include <cstdio>
#include <sstream>
#include <ostream>
#include <QString>
// FreeCAD Base header
@@ -109,31 +104,28 @@ int main(int argc, char** argv)
}
catch (const Base::Exception& e) {
std::string appName = App::Application::Config()["ExeName"];
std::stringstream msg;
msg << "While initializing " << appName << " the following exception occurred: '"
<< e.what() << "'\n\n";
msg << "Python is searching for its runtime files in the following directories:\n"
<< Base::Interpreter().getPythonPath() << "\n\n";
msg << "Python version information:\n" << Py_GetVersion() << "\n";
std::cout << "While initializing " << appName << " the following exception occurred: '"
<< e.what() << "'\n\n";
std::cout << "Python is searching for its runtime files in the following directories:\n"
<< Base::Interpreter().getPythonPath() << "\n\n";
std::cout << "Python version information:\n" << Py_GetVersion() << "\n";
const char* pythonhome = getenv("PYTHONHOME");
if (pythonhome) {
msg << "\nThe environment variable PYTHONHOME is set to '" << pythonhome << "'.";
msg << "\nSetting this environment variable might cause Python to fail. Please contact "
"your administrator to unset it on your system.\n\n";
std::cout << "\nThe environment variable PYTHONHOME is set to '" << pythonhome << "'.";
std::cout << "\nSetting this environment variable might cause Python to fail. "
"Please contact your administrator to unset it on your system.";
}
else {
msg << "\nPlease contact the application's support team for more information.\n\n";
std::cout << "\nPlease contact the application's support team for more information.";
}
printf("Initialization of %s failed:\n%s", appName.c_str(), msg.str().c_str());
std::cout << std::endl;
exit(100);
}
catch (...) {
std::string appName = App::Application::Config()["ExeName"];
std::stringstream msg;
msg << "Unknown runtime error occurred while initializing " << appName << ".\n\n";
msg << "Please contact the application's support team for more information.\n\n";
printf("Initialization of %s failed:\n%s", appName.c_str(), msg.str().c_str());
std::cout << "Unknown runtime error occurred while initializing " << appName << ".\n\n";
std::cout << "Please contact the application's support team for more information.";
std::cout << std::endl;
exit(101);
}

74
src/Main/MainGui.cpp
View File

@@ -28,15 +28,10 @@
#include <dbghelp.h>
#endif
#ifdef _PreComp_
#undef _PreComp_
#endif
#ifdef FC_OS_LINUX
#include <unistd.h>
#endif
#if HAVE_CONFIG_H
#include <config.h>
#endif // HAVE_CONFIG_H
@@ -95,33 +90,43 @@ private:
FILE* file;
};
static void DisplayInfo(const QString& msg, bool preformatted = true)
static bool inGuiMode()
{
// if console option is set then run in cmd mode
if (App::Application::Config()["Console"] == "1") {
std::cout << msg.toStdString();
return;
return false;
}
QString appName = QString::fromStdString(App::Application::Config()["ExeName"]);
QMessageBox msgBox;
msgBox.setIcon(QMessageBox::Information);
msgBox.setWindowTitle(appName);
msgBox.setDetailedText(msg);
msgBox.setText(preformatted ? QStringLiteral("<pre>%1</pre>").arg(msg) : msg);
msgBox.exec();
return App::Application::Config()["RunMode"] == "Gui"
|| App::Application::Config()["RunMode"] == "Internal";
}
static void DisplayCritical(const QString& msg, bool preformatted = true)
static void displayInfo(const QString& msg, bool preformatted = true)
{
if (App::Application::Config()["Console"] == "1") {
std::cerr << msg.toStdString();
return;
if (inGuiMode()) {
QString appName = QString::fromStdString(App::Application::Config()["ExeName"]);
QMessageBox msgBox;
msgBox.setIcon(QMessageBox::Information);
msgBox.setWindowTitle(appName);
msgBox.setDetailedText(msg);
msgBox.setText(preformatted ? QStringLiteral("<pre>%1</pre>").arg(msg) : msg);
msgBox.exec();
}
else {
std::cout << msg.toStdString();
}
}
QString appName = QString::fromStdString(App::Application::Config()["ExeName"]);
QString title = QObject::tr("Initialization of %1 failed").arg(appName);
QString text = preformatted ? QStringLiteral("<pre>%1</pre>").arg(msg) : msg;
QMessageBox::critical(nullptr, title, text);
static void displayCritical(const QString& msg, bool preformatted = true)
{
if (inGuiMode()) {
QString appName = QString::fromStdString(App::Application::Config()["ExeName"]);
QString title = QObject::tr("Initialization of %1 failed").arg(appName);
QString text = preformatted ? QStringLiteral("<pre>%1</pre>").arg(msg) : msg;
QMessageBox::critical(nullptr, title, text);
}
else {
std::cerr << msg.toStdString();
}
}
int main(int argc, char** argv)
@@ -216,7 +221,7 @@ int main(int argc, char** argv)
#endif
// to set window icon on wayland, the desktop file has to be available to the compositor
QGuiApplication::setDesktopFileName(
QString::fromLatin1(App::Application::Config()["DesktopFileName"].c_str()));
QString::fromStdString(App::Application::Config()["DesktopFileName"]));
#if defined(_MSC_VER)
// create a dump file when the application crashes
@@ -244,7 +249,7 @@ int main(int argc, char** argv)
catch (const Base::UnknownProgramOption& e) {
QApplication app(argc, argv);
QString msg = QString::fromLatin1(e.what());
DisplayCritical(msg);
displayCritical(msg);
exit(1);
}
catch (const Base::ProgramInformation& e) {
@@ -261,13 +266,13 @@ int main(int argc, char** argv)
msg = data;
}
DisplayInfo(msg);
displayInfo(msg);
exit(0);
}
catch (const Base::Exception& e) {
// Popup an own dialog box instead of that one of Windows
QApplication app(argc, argv);
QString appName = QString::fromLatin1(App::Application::Config()["ExeName"].c_str());
QString appName = QString::fromStdString(App::Application::Config()["ExeName"]);
QString msg;
msg = QObject::tr("While initializing %1 the following exception occurred: '%2'\n\n"
"Python is searching for its files in the following directories:\n%3\n\n"
@@ -288,18 +293,18 @@ int main(int argc, char** argv)
"\nPlease contact the application's support team for more information.\n\n");
}
DisplayCritical(msg, false);
displayCritical(msg, false);
exit(100);
}
catch (...) {
// Popup an own dialog box instead of that one of Windows
QApplication app(argc, argv);
QString appName = QString::fromLatin1(App::Application::Config()["ExeName"].c_str());
QString appName = QString::fromStdString(App::Application::Config()["ExeName"]);
QString msg =
QObject::tr("Unknown runtime error occurred while initializing %1.\n\n"
"Please contact the application's support team for more information.\n\n")
.arg(appName);
DisplayCritical(msg, false);
displayCritical(msg, false);
exit(101);
}
@@ -312,12 +317,7 @@ int main(int argc, char** argv)
std::streambuf* oldcerr = std::cerr.rdbuf(&stdcerr);
try {
// if console option is set then run in cmd mode
if (App::Application::Config()["Console"] == "1") {
App::Application::runApplication();
}
if (App::Application::Config()["RunMode"] == "Gui"
|| App::Application::Config()["RunMode"] == "Internal") {
if (inGuiMode()) {
Gui::Application::runApplication();
}
else {

14
src/Main/MainPy.cpp
View File

@@ -31,10 +31,6 @@
#include <windows.h>
#endif
#if defined(FC_OS_LINUX) || defined(FC_OS_BSD)
#include <unistd.h>
#endif
#ifdef FC_OS_MACOSX
#include <mach-o/dyld.h>
#include <string>
@@ -45,7 +41,6 @@
#endif // HAVE_CONFIG_H
#include <cstdio>
#include <sstream>
#include <iostream>
#include <QByteArray>
@@ -176,11 +171,10 @@ PyMOD_INIT_FUNC(FreeCAD)
}
catch (const Base::Exception& e) {
std::string appName = App::Application::Config()["ExeName"];
std::stringstream msg;
msg << "While initializing " << appName << " the following exception occurred: '"
<< e.what() << "'\n\n";
msg << "\nPlease contact the application's support team for more information.\n\n";
printf("Initialization of %s failed:\n%s", appName.c_str(), msg.str().c_str());
std::cout << "While initializing " << appName << " the following exception occurred: '"
<< e.what() << "'\n\n";
std::cout << "Please contact the application's support team for more information."
<< std::endl;
}
Base::EmptySequencer* seq = new Base::EmptySequencer();