removed parallel tree
This commit is contained in:
@@ -76,6 +76,27 @@ PFitOutputHandler::PFitOutputHandler(QString workingDirectory, QValueVector<QStr
|
||||
}
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------------------------------
|
||||
/**
|
||||
* <p>
|
||||
*/
|
||||
PFitOutputHandler::~PFitOutputHandler()
|
||||
{
|
||||
if (fProc->isRunning()) {
|
||||
qDebug("fProc still running");
|
||||
fProc->kill();
|
||||
}
|
||||
if (fProc->isRunning()) {
|
||||
QString msg = "fProc still running ...";
|
||||
qDebug(msg);
|
||||
}
|
||||
|
||||
if (fProc) {
|
||||
delete fProc;
|
||||
fProc = 0;
|
||||
}
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------------------------------
|
||||
/**
|
||||
* <p>
|
||||
@@ -115,8 +136,11 @@ void PFitOutputHandler::quitButtonPressed()
|
||||
{
|
||||
// if the fitting is still taking place, kill it
|
||||
if (fProc->isRunning()) {
|
||||
/*
|
||||
fProc->tryTerminate();
|
||||
QTimer::singleShot( 100, fProc, SLOT( kill() ) );
|
||||
*/
|
||||
fProc->kill();
|
||||
}
|
||||
|
||||
accept();
|
||||
|
||||
@@ -47,18 +47,19 @@ class PFitOutputHandler : public QDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
PFitOutputHandler(QString workingDirectory, QValueVector<QString> &cmd);
|
||||
~PFitOutputHandler() {}
|
||||
public:
|
||||
PFitOutputHandler(QString workingDirectory, QValueVector<QString> &cmd);
|
||||
virtual ~PFitOutputHandler();
|
||||
|
||||
private slots:
|
||||
void readFromStdOut();
|
||||
void readFromStdErr();
|
||||
void quitButtonPressed();
|
||||
void processDone();
|
||||
private slots:
|
||||
virtual void readFromStdOut();
|
||||
virtual void readFromStdErr();
|
||||
virtual void quitButtonPressed();
|
||||
virtual void processDone();
|
||||
|
||||
private:
|
||||
QProcess *fProc;
|
||||
|
||||
QVBox *fVbox;
|
||||
QTextEdit *fOutput;
|
||||
QPushButton *fQuitButton;
|
||||
|
||||
Reference in New Issue
Block a user