aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert to absolute path and show measurements.

Browse Source 
--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2015-08-26 17:31:45 +03:00
parent 0cacf1034a
commit 2f34e86322
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/app/valentina/mainwindow.cpp
View File

@ -336,6 +336,19 @@ QString MainWindow::RelativeMPath(const QString &patternPath, const QString &abs
return dir.relativeFilePath(absoluteMPath); return dir.relativeFilePath(absoluteMPath);
} }
//---------------------------------------------------------------------------------------------------------------------
QString MainWindow::AbsoluteMPath(const QString &patternPath, const QString &relativeMPath) const
{
if (patternPath.isEmpty())
{
return relativeMPath;
}
else
{
return QFileInfo(QFileInfo(patternPath).absoluteDir(), relativeMPath).absoluteFilePath();
}
}
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
/** /**
* @brief OptionDraw help change name of pattern piece. * @brief OptionDraw help change name of pattern piece.
@ -1020,7 +1033,7 @@ void MainWindow::LoadIndividual()
{ {
if (not doc->MPath().isEmpty()) if (not doc->MPath().isEmpty())
{ {
watcher->removePath(QFileInfo(QFileInfo(curFile).absoluteDir(), doc->MPath()).absoluteFilePath()); watcher->removePath(AbsoluteMPath(curFile, doc->MPath()));
} }
doc->SetPath(RelativeMPath(curFile, mPath)); doc->SetPath(RelativeMPath(curFile, mPath));
watcher->addPath(mPath); watcher->addPath(mPath);
@ -1046,7 +1059,7 @@ void MainWindow::LoadStandard()
{ {
if (not doc->MPath().isEmpty()) if (not doc->MPath().isEmpty())
{ {
watcher->removePath(QFileInfo(QFileInfo(curFile).absoluteDir(), doc->MPath()).absoluteFilePath()); watcher->removePath(AbsoluteMPath(curFile, doc->MPath()));
} }
doc->SetPath(RelativeMPath(curFile, mPath)); doc->SetPath(RelativeMPath(curFile, mPath));
watcher->addPath(mPath); watcher->addPath(mPath);
@ -1069,17 +1082,19 @@ void MainWindow::ShowMeasurements()
{ {
if (not doc->MPath().isEmpty()) if (not doc->MPath().isEmpty())
{ {
const QString absoluteMPath = AbsoluteMPath(curFile, doc->MPath());
QString run; QString run;
if (qApp->patternType() == MeasurementsType::Standard) if (qApp->patternType() == MeasurementsType::Standard)
{ {
run = QString("\"%1\" \"%2\" -u %3 -h %4 -s %5").arg(qApp->TapeFilePath()).arg(doc->MPath()) run = QString("\"%1\" \"%2\" -u %3 -h %4 -s %5").arg(qApp->TapeFilePath()).arg(absoluteMPath)
.arg(VDomDocument::UnitsToStr(qApp->patternUnit())) .arg(VDomDocument::UnitsToStr(qApp->patternUnit()))
.arg(static_cast<int>(pattern->height())) .arg(static_cast<int>(pattern->height()))
.arg(static_cast<int>(pattern->size())); .arg(static_cast<int>(pattern->size()));
} }
else else
{ {
run = QString("\"%1\" \"%2\" -u %3").arg(qApp->TapeFilePath()).arg(doc->MPath()) run = QString("\"%1\" \"%2\" -u %3").arg(qApp->TapeFilePath()).arg(absoluteMPath)
.arg(VDomDocument::UnitsToStr(qApp->patternUnit())); .arg(VDomDocument::UnitsToStr(qApp->patternUnit()));
} }
QProcess::startDetached(run); QProcess::startDetached(run);
@ -1933,7 +1948,7 @@ void MainWindow::Clear()
qCDebug(vMainWindow, "Returned to Draw mode."); qCDebug(vMainWindow, "Returned to Draw mode.");
pattern->Clear(); pattern->Clear();
qCDebug(vMainWindow, "Clearing pattern."); qCDebug(vMainWindow, "Clearing pattern.");
watcher->removePath(QFileInfo(QFileInfo(curFile).absoluteDir(), doc->MPath()).absoluteFilePath()); watcher->removePath(AbsoluteMPath(curFile, doc->MPath()));
doc->clear(); doc->clear();
setCurrentFile(QString()); setCurrentFile(QString());
qCDebug(vMainWindow, "Clearing scenes."); qCDebug(vMainWindow, "Clearing scenes.");
@ -3065,10 +3080,8 @@ void MainWindow::LoadPattern(const QString &fileName)
if (not path.isEmpty()) if (not path.isEmpty())
{ {
//Search absolute path
path = QFileInfo(QFileInfo(fileName).absoluteDir(), path).absoluteFilePath();
// Check if exist // Check if exist
path = CheckPathToMeasurements(fileName, path); path = CheckPathToMeasurements(fileName, AbsoluteMPath(fileName, path));
if (path.isEmpty()) if (path.isEmpty())
{ {
Clear(); Clear();

1
src/app/valentina/mainwindow.h
View File

@ -300,6 +300,7 @@ private:
void ToggleMSync(bool toggle); void ToggleMSync(bool toggle);
QString RelativeMPath(const QString &patternPath, const QString &absoluteMPath) const; QString RelativeMPath(const QString &patternPath, const QString &absoluteMPath) const;
QString AbsoluteMPath(const QString &patternPath, const QString &relativeMPath) const;
}; };
#endif // MAINWINDOW_H #endif // MAINWINDOW_H