palo/valentina
1
0
Fork 0
mirror of https://gitlab.com/smart-pattern/valentina.git synced 2024-10-01 04:41:40 +02:00
Code Issues Projects Releases Wiki Activity

Fixed broken path to measurements after using Save As option.

Browse source 
--HG--
branch : release
This commit is contained in:
Roman Telezhynskyi 2016-02-09 16:16:04 +02:00
parent aee23cf700
commit 30adc76bce
3 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog.txt
View file

@ -1,4 +1,5 @@
# Version 0.4.2
- Fixed broken path to measurements after using Save As option.
- Tool line. Block selecting the same point twice.
- [#443] Not valid dxf file. libdxf updated to version 3.12.2.0. Fixed drawing subpaths.
- Fixed combobox width in Dialog "Tool True Dart point".

2
src/app/valentina/mainwindow.cpp
View file

@ -2929,7 +2929,7 @@ bool MainWindow::SavePattern(const QString &fileName, QString &error)
qCDebug(vMainWindow, "Saving pattern file %s.", qUtf8Printable(fileName));
QFileInfo tempInfo(fileName);
const QString mPath = doc->MPath();
const QString mPath = AbsoluteMPath(curFile, doc->MPath());
if (not mPath.isEmpty() && curFile != fileName)
{
doc->SetPath(RelativeMPath(fileName, mPath));

24
src/libs/vmisc/def.cpp
View file

@ -33,6 +33,7 @@
#include <QComboBox>
#include <QDir>
#include <QPrinterInfo>
#include <QDebug>
// Keep synchronize all names with initialization in VTranslateVars class!!!!!
//measurements
@ -1705,38 +1706,35 @@ QString StrippedName(const QString &fullFileName)
//---------------------------------------------------------------------------------------------------------------------
QString RelativeMPath(const QString &patternPath, const QString &absoluteMPath)
{
if (patternPath.isEmpty())
if (patternPath.isEmpty() || absoluteMPath.isEmpty())
{
return absoluteMPath;
}
if (absoluteMPath.isEmpty() || QFileInfo(absoluteMPath).isRelative())
if (QFileInfo(absoluteMPath).isRelative())
{
qWarning() << QApplication::tr("The path to the measurments is already relative.");
return absoluteMPath;
}
QDir dir(QFileInfo(patternPath).absoluteDir());
return dir.relativeFilePath(absoluteMPath);
return QFileInfo(patternPath).absoluteDir().relativeFilePath(absoluteMPath);
}
//---------------------------------------------------------------------------------------------------------------------
QString AbsoluteMPath(const QString &patternPath, const QString &relativeMPath)
{
if (patternPath.isEmpty())
if (patternPath.isEmpty() || relativeMPath.isEmpty())
{
return relativeMPath;
}
else
{
if (relativeMPath.isEmpty() || QFileInfo(relativeMPath).isAbsolute())
{
return relativeMPath;
}
return QFileInfo(QFileInfo(patternPath).absoluteDir(), relativeMPath).absoluteFilePath();
if (QFileInfo(relativeMPath).isAbsolute())
{
qWarning() << QApplication::tr("The path to the measurments is already absolute.");
return relativeMPath;
}
return QString();// should never reach
return QFileInfo(QFileInfo(patternPath).absoluteDir(), relativeMPath).absoluteFilePath();
}
//---------------------------------------------------------------------------------------------------------------------