- Re-implement start & exit to handle Thread loop.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@25434 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Apr 7, 2015 · 41b3823 · 41b3823
1 parent ad75c46
commit 41b3823
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/OMEdit/OMEditGUI/MainWindow.cpp b/OMEdit/OMEditGUI/MainWindow.cpp
@@ -88,7 +88,7 @@ MainWindow::MainWindow(QSplashScreen *pSplashScreen, QWidget *parent)
   mpMessagesDockWidget->hide();
   connect(mpMessagesWidget, SIGNAL(MessageAdded()), mpMessagesDockWidget, SLOT(show()));
   // Reopen the standard output stream.
-  QString outputFileName = mpOMCProxy->changeDirectory()+ "/OMEditOutput.txt";
+  QString outputFileName = mpOMCProxy->changeDirectory()+ "/omeditoutput.txt";
   freopen(outputFileName.toStdString().c_str(), "w", stdout);
   setbuf(stdout, NULL); // used non-buffered stdout
   mpOutputFileDataNotifier = 0;
@@ -585,7 +585,6 @@ void MainWindow::beforeClosingMainWindow()
 {
   mpOMCProxy->quitOMC();
   if (mpOutputFileDataNotifier) {
-    mpOutputFileDataNotifier->stop();
     mpOutputFileDataNotifier->exit();
     mpOutputFileDataNotifier->wait();
     delete mpOutputFileDataNotifier;

diff --git a/OMEdit/OMEditGUI/Util/Utilities.cpp b/OMEdit/OMEditGUI/Util/Utilities.cpp
@@ -67,6 +67,18 @@ FileDataNotifier::FileDataNotifier(const QString fileName)
   mBytesAvailable = 0;
 }
 
+/*!
+ * \brief FileDataNotifier::exit
+ * Reimplementation of QThread::exit()
+ * Sets mStop to true.
+ * \param retcode
+ */
+void FileDataNotifier::exit(int retcode)
+{
+  mStop = true;
+  QThread::exit(retcode);
+}
+
 /*!
  * \brief FileDataNotifier::run
  * Reimplentation of QThread::run().
@@ -91,6 +103,18 @@ void FileDataNotifier::run()
   }
 }
 
+/*!
+ * \brief FileDataNotifier::start
+ * Reimplementation of QThread::start()
+ * Sets mStop to false.
+ * \param priority
+ */
+void FileDataNotifier::start(Priority priority)
+{
+  mStop = false;
+  QThread::start(priority);
+}
+
 Label::Label(QWidget *parent, Qt::WindowFlags flags)
   : QLabel(parent, flags), mElideMode(Qt::ElideNone), mText("")
 {

diff --git a/OMEdit/OMEditGUI/Util/Utilities.h b/OMEdit/OMEditGUI/Util/Utilities.h
@@ -75,13 +75,15 @@ class FileDataNotifier : public QThread
   Q_OBJECT
 public:
   FileDataNotifier(const QString fileName);
-  void stop() {mStop = true;}
+  void exit(int retcode = 0);
 private:
   QFile mFile;
   bool mStop;
   qint64 mBytesAvailable;
 protected:
   void run();
+public slots:
+  void start(Priority = InheritPriority);
 signals:
   void bytesAvailable(qint64 bytes);
 };