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

Merged muonspin/musrfit:root6 into master

Browse Source
This commit is contained in:
Zaher Salman 2018-07-11 11:51:39 +02:00
commit 955b628c23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/musredit_qt5/musredit/PFitOutputHandler.cpp
View File

@ -48,7 +48,8 @@ PFitOutputHandler::PFitOutputHandler(QString workingDirectory, QVector<QString>
// Layout
fVbox = new QVBoxLayout( this );
//Qt.3x fVbox->resize(800, 500);
fOutput = new QTextEdit();
fOutput = new QPlainTextEdit();
fOutput->setMaximumBlockCount(1000);
fVbox->addWidget(fOutput);
fOutput->setMinimumSize(800, 455);
fOutput->setReadOnly(true);
@ -125,7 +126,7 @@ void PFitOutputHandler::readFromStdOut()
{
// Read and process the data.
// Bear in mind that the data might be output in chunks.
fOutput->append( fProc->readAllStandardOutput() );
fOutput->appendPlainText( fProc->readAllStandardOutput() );
}
//----------------------------------------------------------------------------------------------------
@ -136,7 +137,7 @@ void PFitOutputHandler::readFromStdErr()
{
// Read and process the data.
// Bear in mind that the data might be output in chunks.
fOutput->append( fProc->readAllStandardError() );
fOutput->appendPlainText( fProc->readAllStandardError() );
}
//----------------------------------------------------------------------------------------------------

4
src/musredit_qt5/musredit/PFitOutputHandler.h
View File

@ -34,7 +34,7 @@
#include <QProcess>
#include <QDialog>
#include <QVBoxLayout>
#include <QTextEdit>
#include <QPlainTextEdit>
#include <QPushButton>
#include <QMessageBox>
#include <QVector>
@ -66,7 +66,7 @@ private:
QProcess *fProc; ///< pointer to the musrfit process
QVBoxLayout *fVbox; ///< pointer to the dialog layout manager
QTextEdit *fOutput; ///< the captured musrfit output is written (read only) into this text edit object.
QPlainTextEdit *fOutput; ///< the captured musrfit output is written (read only) into this text edit object.
QPushButton *fQuitButton; ///< quit button, either to interrupt the fit or to close the dialog at the end of the fit.
};