OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Headless: handle unknown command arguments better

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-05-06 12:46:44 +02:00
parent 911b69b56f
commit 07903a6324
4 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ApplicationCode/Application/RiaMain.cpp
View File

@@ -49,9 +49,22 @@ int main(int argc, char *argv[])
if (!result)
{
std::vector<cvf::String> unknownOptions = progOpt.unknownOptions();
QStringList unknownOptionsText;
for (cvf::String option : unknownOptions)
{
unknownOptionsText += QString("Unknown option: %1").arg(cvfqt::Utils::toQString(option));
}
const cvf::String usageText = progOpt.usageText(110, 30);
app->showInformationMessage(RiaApplication::commandLineParameterHelp() + cvfqt::Utils::toQString(usageText));
app->showErrorMessage(RiaApplication::commandLineParameterHelp() +
cvfqt::Utils::toQString(usageText) +
unknownOptionsText.join('\n'));
app->cleanupBeforeProgramExit();
if (dynamic_cast<RiaGuiApplication*>(app.get()) == nullptr)
{
return 1;
}
}
QLocale::setDefault(QLocale(QLocale::English, QLocale::UnitedStates));
@@ -64,7 +77,7 @@ int main(int argc, char *argv[])
}
else if (status == RiaApplication::EXIT_WITH_ERROR)
{
return 1;
return 2;
}
else if (status == RiaApplication::KEEP_GOING)
{