Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2024-11-17 07:47:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Have the app return 0 when successfully saving an image from the command line.

Browse source
This commit is contained in:
Leonardo Zide 2016-12-07 09:24:47 -08:00
parent ccadcf7e1a
commit 923e7513f1
3 changed files with 29 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
common/lc_application.cpp
View file

@ -185,7 +185,7 @@ void lcApplication::ParseStringArgument(int* CurArg, int argc, char* argv[], cha
}
}
bool lcApplication::Initialize(int argc, char* argv[], const char* LibraryInstallPath, const char* LDrawPath)
bool lcApplication::Initialize(int argc, char* argv[], const char* LibraryInstallPath, const char* LDrawPath, bool& ShowWindow)
{
char* LibPath = NULL;
@ -271,7 +271,8 @@ bool lcApplication::Initialize(int argc, char* argv[], const char* LibraryInstal
printf("LeoCAD Version " LC_VERSION_TEXT "\n");
printf("Compiled " __DATE__ "\n");
return false;
ShowWindow = false;
return true;
}
else if ((strcmp(Param, "-?") == 0) || (strcmp(Param, "--help") == 0))
{
@ -288,7 +289,8 @@ bool lcApplication::Initialize(int argc, char* argv[], const char* LibraryInstal
printf(" -3ds, --export-3ds <outfile.3ds>: Exports the model to 3DS format.\n");
printf(" \n");
return false;
ShowWindow = false;
return true;
}
else
printf("Unknown parameter: %s\n", Param);
@ -303,20 +305,21 @@ bool lcApplication::Initialize(int argc, char* argv[], const char* LibraryInstal
lcLoadDefaultKeyboardShortcuts();
lcLoadDefaultMouseShortcuts();
ShowWindow = !SaveImage && !SaveWavefront && !Save3DS;
if (!LoadPiecesLibrary(LibPath, LibraryInstallPath, LDrawPath))
{
if (SaveImage || SaveWavefront || Save3DS)
{
fprintf(stderr, "ERROR: Cannot load pieces library.");
return false;
}
QString Message;
if (mLibrary->LoadBuiltinPieces())
QMessageBox::information(gMainWindow, tr("LeoCAD"), tr("LeoCAD could not find a compatible Parts Library so only a small number of parts will be available.\n\n"
"Please visit http://www.leocad.org for information on how to download and install a library."));
Message = tr("LeoCAD could not find a compatible Parts Library so only a small number of parts will be available.\n\nPlease visit http://www.leocad.org for information on how to download and install a library.");
else
QMessageBox::information(gMainWindow, tr("LeoCAD"), tr("LeoCAD could not load Parts Library.\n\n"
"Please visit http://www.leocad.org for information on how to download and install a library."));
Message = tr("LeoCAD could not load Parts Library.\n\nPlease visit http://www.leocad.org for information on how to download and install a library.");
if (ShowWindow)
QMessageBox::information(gMainWindow, tr("LeoCAD"), Message);
else
fprintf(stderr, Message.toLatin1().constData());
}
gMainWindow->CreateWidgets();
@ -435,9 +438,6 @@ bool lcApplication::Initialize(int argc, char* argv[], const char* LibraryInstal
}
}
if (SaveImage || SaveWavefront || Save3DS)
return false;
return true;
}

2
common/lc_application.h
View file

@ -42,7 +42,7 @@ public:
~lcApplication();
void SetProject(Project* Project);
bool Initialize(int argc, char *argv[], const char* LibraryInstallPath, const char* LDrawPath);
bool Initialize(int argc, char *argv[], const char* LibraryInstallPath, const char* LDrawPath, bool& ShowWindow);
void Shutdown();
void ShowPreferencesDialog();

20
qt/qtmain.cpp
View file

@ -170,23 +170,29 @@ int main(int argc, char *argv[])
const char* LDrawPath = NULL;
#endif
if (!g_App->Initialize(argc, argv, libPath, LDrawPath))
bool ShowWindow;
if (!g_App->Initialize(argc, argv, libPath, LDrawPath, ShowWindow))
return 1;
gMainWindow->SetColorIndex(lcGetColorIndex(4));
gMainWindow->UpdateRecentFiles();
gMainWindow->show();
int ExecReturn = 0;
if (ShowWindow)
{
gMainWindow->SetColorIndex(lcGetColorIndex(4));
gMainWindow->UpdateRecentFiles();
gMainWindow->show();
#if !LC_DISABLE_UPDATE_CHECK
lcDoInitialUpdateCheck();
lcDoInitialUpdateCheck();
#endif
int execReturn = app.exec();
ExecReturn = app.exec();
}
delete gMainWindow;
gMainWindow = NULL;
delete g_App;
g_App = NULL;
return execReturn;
return ExecReturn;
}