diff --git a/src/musredit/PTextEdit.cpp b/src/musredit/PTextEdit.cpp index 6eacd217..9b94e6ea 100644 --- a/src/musredit/PTextEdit.cpp +++ b/src/musredit/PTextEdit.cpp @@ -1768,7 +1768,7 @@ void PTextEdit::musrMsr2Data() break; case 2: // run list file name runListFileName = fMsr2DataParam->runListFileName; - fi.setFile(runListFileName); + fi.setFile(QFileInfo(*fFilenames.find( currentEditor() )).absolutePath() + "/" + runListFileName); if (!fi.exists()) { str = QString("Run List File '%1' doesn't exist.").arg(runListFileName); QMessageBox::critical(this, "**ERROR**", @@ -1904,7 +1904,7 @@ void PTextEdit::musrMsr2Data() cmd.append("new"); } -// qDebug() << ">> " << cmd << endl; +// qDebug() << endl << ">> " << cmd << endl; PFitOutputHandler fitOutputHandler(QFileInfo(*fFilenames.find( currentEditor() )).absolutePath(), cmd); fitOutputHandler.setModal(true); @@ -1928,7 +1928,7 @@ void PTextEdit::musrMsr2Data() else fln = QString("%1").arg(i) + fMsr2DataParam->msrFileExtension + ".msr"; - load(fln); + load(QFileInfo(*fFilenames.find( currentEditor() )).absolutePath() + "/" + fln); } } break; @@ -1944,11 +1944,11 @@ void PTextEdit::musrMsr2Data() else fln += fMsr2DataParam->msrFileExtension + ".msr"; - load(fln); + load(QFileInfo(*fFilenames.find( currentEditor() )).absolutePath() + "/" + fln); } break; case 2: // run list file - file = new QFile(fMsr2DataParam->runListFileName); + file = new QFile(QFileInfo(*fFilenames.find( currentEditor() )).absolutePath() + "/" + fMsr2DataParam->runListFileName); if (!file->open(QIODevice::ReadOnly)) { str = QString("Couldn't open run list file %1, sorry.").arg(fMsr2DataParam->runListFileName); QMessageBox::critical(this, "**ERROR**", str.toLatin1(), QMessageBox::Ok, QMessageBox::NoButton); @@ -1966,7 +1966,7 @@ void PTextEdit::musrMsr2Data() else fln += fMsr2DataParam->msrFileExtension + ".msr"; - load(fln); + load(QFileInfo(*fFilenames.find( currentEditor() )).absolutePath() + "/" + fln); } } @@ -1990,7 +1990,7 @@ void PTextEdit::musrMsr2Data() fln = runList.section(" ", 0, 0, QString::SectionSkipEmpty) + QString("+global") + fMsr2DataParam->msrFileExtension + QString(".msr"); break; case 2: // run list file name - file = new QFile(fMsr2DataParam->runListFileName); + file = new QFile(QFileInfo(*fFilenames.find( currentEditor() )).absolutePath() + "/" + fMsr2DataParam->runListFileName); if (!file->open(QIODevice::ReadOnly)) { str = QString("Couldn't open run list file %1, sorry.").arg(fMsr2DataParam->runListFileName); QMessageBox::critical(this, "**ERROR**", str.toLatin1(), QMessageBox::Ok, QMessageBox::NoButton); @@ -2019,7 +2019,7 @@ void PTextEdit::musrMsr2Data() break; } - load(fln); + load(QFileInfo(*fFilenames.find( currentEditor() )).absolutePath() + "/" + fln); } } } diff --git a/src/musrgui/PTextEdit.cpp b/src/musrgui/PTextEdit.cpp index 8858fd00..6af2c6d2 100644 --- a/src/musrgui/PTextEdit.cpp +++ b/src/musrgui/PTextEdit.cpp @@ -1495,7 +1495,7 @@ void PTextEdit::musrMsr2Data() break; case 2: // run list file name runListFileName = fMsr2DataParam->runListFileName; - fi.setFile(runListFileName); + fi.setFile(QFileInfo(*fFilenames.find( currentEditor() )).dirPath() + "/" + runListFileName); if (!fi.exists()) { str = QString("Run List File '%1' doesn't exist.").arg(runListFileName); QMessageBox::critical(this, "**ERROR**", @@ -1651,7 +1651,7 @@ void PTextEdit::musrMsr2Data() else fln = QString("%1").arg(i) + fMsr2DataParam->msrFileExtension + ".msr"; - load(fln); + load(QFileInfo(*fFilenames.find( currentEditor() )).dirPath() + "/" + fln); } } break; @@ -1667,11 +1667,11 @@ void PTextEdit::musrMsr2Data() else fln += fMsr2DataParam->msrFileExtension + ".msr"; - load(fln); + load(QFileInfo(*fFilenames.find( currentEditor() )).dirPath() + "/" + fln); } break; case 2: // run list file - file = new QFile(fMsr2DataParam->runListFileName); + file = new QFile(QFileInfo(*fFilenames.find( currentEditor() )).dirPath() + "/" + fMsr2DataParam->runListFileName); if (!file->open(IO_ReadOnly)) { str = QString("Couldn't open run list file %1, sorry.").arg(fMsr2DataParam->runListFileName); QMessageBox::critical(this, "**ERROR**", str.latin1(), QMessageBox::Ok, QMessageBox::NoButton); @@ -1689,7 +1689,7 @@ void PTextEdit::musrMsr2Data() else fln += fMsr2DataParam->msrFileExtension + ".msr"; - load(fln); + load(QFileInfo(*fFilenames.find( currentEditor() )).dirPath() + "/" + fln); } } @@ -1712,7 +1712,7 @@ void PTextEdit::musrMsr2Data() fln = runList.section(" ", 0, 0, QString::SectionSkipEmpty) + QString("+global") + fMsr2DataParam->msrFileExtension + QString(".msr"); break; case 2: // run list file name - file = new QFile(fMsr2DataParam->runListFileName); + file = new QFile(QFileInfo(*fFilenames.find( currentEditor() )).dirPath() + "/" + fMsr2DataParam->runListFileName); if (!file->open(IO_ReadOnly)) { str = QString("Couldn't open run list file %1, sorry.").arg(fMsr2DataParam->runListFileName); QMessageBox::critical(this, "**ERROR**", str.latin1(), QMessageBox::Ok, QMessageBox::NoButton); @@ -1741,7 +1741,7 @@ void PTextEdit::musrMsr2Data() break; } - load(fln); + load(QFileInfo(*fFilenames.find( currentEditor() )).dirPath() + "/" + fln); } } }