Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2024-12-27 21:58:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't require a known extension when saving images from the command line.

Browse source
This commit is contained in:
Leonardo Zide 2017-11-24 11:48:46 -08:00
parent f51f8d205c
commit 2071d6810a
2 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
common/lc_application.cpp
View file

@ -337,11 +337,9 @@ bool lcApplication::Initialize(int argc, char* argv[], QList<QPair<QString, bool
gMainWindow->CreateWidgets();
// Create a new project.
Project* NewProject = new Project();
SetProject(NewProject);
// Load project.
if (ProjectName && gMainWindow->OpenProject(ProjectName))
{
if (ModelName)
@ -384,17 +382,9 @@ bool lcApplication::Initialize(int argc, char* argv[], QList<QPair<QString, bool
if (ImageName)
FileName = ImageName;
else
{
FileName = ProjectName;
QString Extension = QFileInfo(FileName).suffix().toLower();
if (Extension.isEmpty())
{
FileName += lcGetProfileString(LC_PROFILE_IMAGE_EXTENSION);
}
else if (Extension != "bmp" && Extension != "jpg" && Extension != "jpeg" && Extension != "png")
{
FileName = FileName.left(FileName.length() - Extension.length() - 1);
FileName = FileName.left(FileName.length() - QFileInfo(FileName).suffix().length() - 1);
FileName += lcGetProfileString(LC_PROFILE_IMAGE_EXTENSION);
}
@ -404,17 +394,11 @@ bool lcApplication::Initialize(int argc, char* argv[], QList<QPair<QString, bool
ImageStart = ImageEnd;
if ((ImageStart == 0) && (ImageEnd == 0))
{
ImageStart = ImageEnd = mProject->GetActiveModel()->GetCurrentStep();
}
else if ((ImageStart == 0) && (ImageEnd != 0))
{
ImageStart = ImageEnd;
}
else if ((ImageStart != 0) && (ImageEnd == 0))
{
ImageEnd = ImageStart;
}
if (ImageStart > 255)
ImageStart = 255;

3
common/lc_model.cpp
View file

@ -1344,6 +1344,9 @@ void lcModel::SaveStepImages(const QString& BaseName, bool AddStepSuffix, bool Z
QImageWriter Writer(FileName);
if (Writer.format().isEmpty())
Writer.setFormat("png");
if (!Writer.write(View.GetRenderImage()))
{
QMessageBox::information(gMainWindow, tr("Error"), tr("Error writing to file '%1':\n%2").arg(FileName, Writer.errorString()));