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

added timeout facility for musrfit, musrview, musrt0. Adopted musredit/musrgui accordingly.

Browse Source
This commit is contained in:
suter_a
2012-04-15 08:39:30 +00:00
parent 3a0715b3ed
commit 7368884482
16 changed files with 333 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/musredit/PTextEdit.cpp
View File

@@ -667,7 +667,7 @@ bool PTextEdit::validRunList(const QString runList)
int i = 0;
QString subStr;
bool done = false;
int val;
int val = 0;
bool ok;
while (!done) {
subStr = runList.section(' ', i, i, QString::SectionSkipEmpty);
@@ -1655,6 +1655,12 @@ void PTextEdit::musrFit()
break;
}
// add timeout
cmd.append("--timeout");
QString numStr;
numStr.setNum(fAdmin->getTimeout());
cmd.append(numStr);
PFitOutputHandler fitOutputHandler(QFileInfo(*fFilenames.find( currentEditor() )).absolutePath(), cmd);
fitOutputHandler.setModal(true);
fFileSystemWatcherActive = false;
@@ -2058,9 +2064,11 @@ void PTextEdit::musrView()
cmd = str + " \"";
str = *fFilenames.find( currentEditor() );
cmd += str + "\" &";
QString numStr;
numStr.setNum(fAdmin->getTimeout());
cmd += str + "\" --timeout " + numStr + " &";
system(cmd.toLatin1());
int status=system(cmd.toLatin1());
}
//----------------------------------------------------------------------------------------------------
@@ -2089,9 +2097,11 @@ void PTextEdit::musrT0()
cmd = str + " \"";
str = *fFilenames.find( currentEditor() );
cmd += str + "\" &";
QString numStr;
numStr.setNum(fAdmin->getTimeout());
cmd += str + "\" --timeout " + numStr + " &";
system(cmd.toLatin1());
int status=system(cmd.toLatin1());
QString fln = *fFilenames.find( currentEditor() );
}
@@ -2166,13 +2176,13 @@ void PTextEdit::musrSwapMsrMlog()
// swap files
QString cmd;
cmd = QString("cp \"") + currentFileName + QString("\" \"") + tempFileName + QString("\"");
system(cmd.toLatin1());
int status=system(cmd.toLatin1());
cmd = QString("cp \"") + swapFileName + QString("\" \"") + currentFileName + QString("\"");
system(cmd.toLatin1());
status=system(cmd.toLatin1());
cmd = QString("cp \"") + tempFileName + QString("\" \"") + swapFileName + QString("\"");
system(cmd.toLatin1());
status=system(cmd.toLatin1());
cmd = QString("rm \"") + tempFileName + QString("\"");
system(cmd.toLatin1());
status=system(cmd.toLatin1());
int currentIdx = fTabWidget->currentIndex();