ticket:4708 Delete the intermediate compilation files after the simul…

…ation is finished.
OpenModelica · Jan 12, 2018 · bb64e1e · bb64e1e
1 parent ad8112d
commit bb64e1e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 8 deletions.
diff --git a/OMEdit/OMEditGUI/Simulation/SimulationOutputWidget.cpp b/OMEdit/OMEditGUI/Simulation/SimulationOutputWidget.cpp
@@ -438,6 +438,23 @@ void SimulationOutputWidget::embeddedServerInitialized()
   MainWindow::instance()->getSimulationDialog()->createOpcUaClient(mSimulationOptions);
 }
 
+/*!
+ * \brief SimulationOutputWidget::deleteIntermediateCompilationFiles
+ * Deletes the intermediate compilation files
+ */
+void SimulationOutputWidget::deleteIntermediateCompilationFiles()
+{
+  if (OptionsDialog::instance()->getSimulationPage()->getDeleteIntermediateCompilationFilesCheckBox()->isChecked()) {
+    QString workingDirectory = mSimulationOptions.getWorkingDirectory();
+    QString outputFile = mSimulationOptions.getOutputFileName();
+    foreach (QString fileName, mGeneratedFilesList) {
+      if (QFile::exists(QString("%1/%2").arg(workingDirectory, QString(fileName).arg(outputFile)))) {
+        QFile::remove(QString("%1/%2").arg(workingDirectory, QString(fileName).arg(outputFile)));
+      }
+    }
+  }
+}
+
 /*!
  * \brief SimulationOutputWidget::createSimulationProgressSocket
  * Slot activated when QTcpServer newConnection SIGNAL is raised.\n
@@ -539,14 +556,8 @@ void SimulationOutputWidget::compilationProcessFinished(int exitCode, QProcess::
   }
   mpArchivedSimulationItem->setStatus(Helper::finished);
   // remove the generated files
-  if (OptionsDialog::instance()->getSimulationPage()->getDeleteIntermediateCompilationFilesCheckBox()->isChecked()) {
-    QString workingDirectory = mSimulationOptions.getWorkingDirectory();
-    QString outputFile = mSimulationOptions.getOutputFileName();
-    foreach (QString fileName, mGeneratedFilesList) {
-      if (QFile::exists(QString("%1/%2").arg(workingDirectory, QString(fileName).arg(outputFile)))) {
-        QFile::remove(QString("%1/%2").arg(workingDirectory, QString(fileName).arg(outputFile)));
-      }
-    }
+  if (mSimulationOptions.getBuildOnly()) {
+    deleteIntermediateCompilationFiles();
   }
 }
 
@@ -644,6 +655,10 @@ void SimulationOutputWidget::simulationProcessFinished(int exitCode, QProcess::E
   mpCancelButton->setEnabled(false);
   MainWindow::instance()->getSimulationDialog()->simulationProcessFinished(mSimulationOptions, mResultFileLastModifiedDateTime);
   mpArchivedSimulationItem->setStatus(Helper::finished);
+  // remove the generated files
+  if (!mSimulationOptions.getBuildOnly()) {
+    deleteIntermediateCompilationFiles();
+  }
 }
 
 /*!

diff --git a/OMEdit/OMEditGUI/Simulation/SimulationOutputWidget.h b/OMEdit/OMEditGUI/Simulation/SimulationOutputWidget.h
@@ -110,6 +110,8 @@ class SimulationOutputWidget : public QWidget
   bool mSocketDisconnected;
   SimulationProcessThread *mpSimulationProcessThread;
   QDateTime mResultFileLastModifiedDateTime;
+
+  void deleteIntermediateCompilationFiles();
 public slots:
   void createSimulationProgressSocket();
   void readSimulationProgress();