LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

Finally (hopefully) fixed the run-list-file interface of musrgui/musredit to msr2data (MUSR-202)

Browse Source
This commit is contained in:
Bastian M. Wojek 2011-08-03 09:16:47 +00:00
parent 09c810b461
commit 4490f103f3
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/musredit/PTextEdit.cpp
View File

@ -1768,7 +1768,7 @@ void PTextEdit::musrMsr2Data()
break; break;
case 2: // run list file name case 2: // run list file name
runListFileName = fMsr2DataParam->runListFileName; runListFileName = fMsr2DataParam->runListFileName;
fi.setFile(runListFileName); fi.setFile(QFileInfo(*fFilenames.find( currentEditor() )).absolutePath() + "/" + runListFileName);
if (!fi.exists()) { if (!fi.exists()) {
str = QString("Run List File '%1' doesn't exist.").arg(runListFileName); str = QString("Run List File '%1' doesn't exist.").arg(runListFileName);
QMessageBox::critical(this, "**ERROR**", QMessageBox::critical(this, "**ERROR**",
@ -1904,7 +1904,7 @@ void PTextEdit::musrMsr2Data()
cmd.append("new"); cmd.append("new");
} }
// qDebug() << ">> " << cmd << endl; // qDebug() << endl << ">> " << cmd << endl;
PFitOutputHandler fitOutputHandler(QFileInfo(*fFilenames.find( currentEditor() )).absolutePath(), cmd); PFitOutputHandler fitOutputHandler(QFileInfo(*fFilenames.find( currentEditor() )).absolutePath(), cmd);
fitOutputHandler.setModal(true); fitOutputHandler.setModal(true);
@ -1928,7 +1928,7 @@ void PTextEdit::musrMsr2Data()
else else
fln = QString("%1").arg(i) + fMsr2DataParam->msrFileExtension + ".msr"; fln = QString("%1").arg(i) + fMsr2DataParam->msrFileExtension + ".msr";
load(fln); load(QFileInfo(*fFilenames.find( currentEditor() )).absolutePath() + "/" + fln);
} }
} }
break; break;
@ -1944,11 +1944,11 @@ void PTextEdit::musrMsr2Data()
else else
fln += fMsr2DataParam->msrFileExtension + ".msr"; fln += fMsr2DataParam->msrFileExtension + ".msr";
load(fln); load(QFileInfo(*fFilenames.find( currentEditor() )).absolutePath() + "/" + fln);
} }
break; break;
case 2: // run list file 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)) { if (!file->open(QIODevice::ReadOnly)) {
str = QString("Couldn't open run list file %1, sorry.").arg(fMsr2DataParam->runListFileName); str = QString("Couldn't open run list file %1, sorry.").arg(fMsr2DataParam->runListFileName);
QMessageBox::critical(this, "**ERROR**", str.toLatin1(), QMessageBox::Ok, QMessageBox::NoButton); QMessageBox::critical(this, "**ERROR**", str.toLatin1(), QMessageBox::Ok, QMessageBox::NoButton);
@ -1966,7 +1966,7 @@ void PTextEdit::musrMsr2Data()
else else
fln += fMsr2DataParam->msrFileExtension + ".msr"; 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"); fln = runList.section(" ", 0, 0, QString::SectionSkipEmpty) + QString("+global") + fMsr2DataParam->msrFileExtension + QString(".msr");
break; break;
case 2: // run list file name 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)) { if (!file->open(QIODevice::ReadOnly)) {
str = QString("Couldn't open run list file %1, sorry.").arg(fMsr2DataParam->runListFileName); str = QString("Couldn't open run list file %1, sorry.").arg(fMsr2DataParam->runListFileName);
QMessageBox::critical(this, "**ERROR**", str.toLatin1(), QMessageBox::Ok, QMessageBox::NoButton); QMessageBox::critical(this, "**ERROR**", str.toLatin1(), QMessageBox::Ok, QMessageBox::NoButton);
@ -2019,7 +2019,7 @@ void PTextEdit::musrMsr2Data()
break; break;
} }
load(fln); load(QFileInfo(*fFilenames.find( currentEditor() )).absolutePath() + "/" + fln);
} }
} }
} }

14
src/musrgui/PTextEdit.cpp
View File

@ -1495,7 +1495,7 @@ void PTextEdit::musrMsr2Data()
break; break;
case 2: // run list file name case 2: // run list file name
runListFileName = fMsr2DataParam->runListFileName; runListFileName = fMsr2DataParam->runListFileName;
fi.setFile(runListFileName); fi.setFile(QFileInfo(*fFilenames.find( currentEditor() )).dirPath() + "/" + runListFileName);
if (!fi.exists()) { if (!fi.exists()) {
str = QString("Run List File '%1' doesn't exist.").arg(runListFileName); str = QString("Run List File '%1' doesn't exist.").arg(runListFileName);
QMessageBox::critical(this, "**ERROR**", QMessageBox::critical(this, "**ERROR**",
@ -1651,7 +1651,7 @@ void PTextEdit::musrMsr2Data()
else else
fln = QString("%1").arg(i) + fMsr2DataParam->msrFileExtension + ".msr"; fln = QString("%1").arg(i) + fMsr2DataParam->msrFileExtension + ".msr";
load(fln); load(QFileInfo(*fFilenames.find( currentEditor() )).dirPath() + "/" + fln);
} }
} }
break; break;
@ -1667,11 +1667,11 @@ void PTextEdit::musrMsr2Data()
else else
fln += fMsr2DataParam->msrFileExtension + ".msr"; fln += fMsr2DataParam->msrFileExtension + ".msr";
load(fln); load(QFileInfo(*fFilenames.find( currentEditor() )).dirPath() + "/" + fln);
} }
break; break;
case 2: // run list file 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)) { if (!file->open(IO_ReadOnly)) {
str = QString("Couldn't open run list file %1, sorry.").arg(fMsr2DataParam->runListFileName); str = QString("Couldn't open run list file %1, sorry.").arg(fMsr2DataParam->runListFileName);
QMessageBox::critical(this, "**ERROR**", str.latin1(), QMessageBox::Ok, QMessageBox::NoButton); QMessageBox::critical(this, "**ERROR**", str.latin1(), QMessageBox::Ok, QMessageBox::NoButton);
@ -1689,7 +1689,7 @@ void PTextEdit::musrMsr2Data()
else else
fln += fMsr2DataParam->msrFileExtension + ".msr"; 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"); fln = runList.section(" ", 0, 0, QString::SectionSkipEmpty) + QString("+global") + fMsr2DataParam->msrFileExtension + QString(".msr");
break; break;
case 2: // run list file name 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)) { if (!file->open(IO_ReadOnly)) {
str = QString("Couldn't open run list file %1, sorry.").arg(fMsr2DataParam->runListFileName); str = QString("Couldn't open run list file %1, sorry.").arg(fMsr2DataParam->runListFileName);
QMessageBox::critical(this, "**ERROR**", str.latin1(), QMessageBox::Ok, QMessageBox::NoButton); QMessageBox::critical(this, "**ERROR**", str.latin1(), QMessageBox::Ok, QMessageBox::NoButton);
@ -1741,7 +1741,7 @@ void PTextEdit::musrMsr2Data()
break; break;
} }
load(fln); load(QFileInfo(*fFilenames.find( currentEditor() )).dirPath() + "/" + fln);
} }
} }
} }