ticket:4145 Make sure transformational debugger is window is shown.

OpenModelica · Nov 23, 2016 · 7032c24 · 7032c24
1 parent 2d943e0
commit 7032c24
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 27 deletions.
diff --git a/OMEdit/OMEditGUI/MainWindow.cpp b/OMEdit/OMEditGUI/MainWindow.cpp
@@ -1009,16 +1009,19 @@ void MainWindow::createOMNotebookCodeCell(LibraryTreeItem *pLibraryTreeItem, QDo
   textCellElement.appendChild(outputElement);
 }
 
+/*!
+ * \brief MainWindow::showTransformationsWidget
+ * Creates a TransformationsWidget and show it to the user.
+ * \param fileName
+ * \return
+ */
 TransformationsWidget *MainWindow::showTransformationsWidget(QString fileName)
 {
   TransformationsWidget *pTransformationsWidget = mTransformationsWidgetHash.value(fileName, 0);
-  if (!pTransformationsWidget)
-  {
-    pTransformationsWidget = new TransformationsWidget(fileName, this);
+  if (!pTransformationsWidget) {
+    pTransformationsWidget = new TransformationsWidget(fileName);
     mTransformationsWidgetHash.insert(fileName, pTransformationsWidget);
-  }
-  else
-  {
+  } else {
     pTransformationsWidget->reloadTransformations();
   }
   pTransformationsWidget->show();
@@ -1205,13 +1208,18 @@ void MainWindow::showOpenResultFileDialog()
   openResultFiles(fileNames);
 }
 
+/*!
+ * \brief MainWindow::showOpenTransformationFileDialog
+ * Slot activated when mpOpenTransformationFileAction triggered signal is raised.\n
+ * Shows a TransformationsWidget.
+ */
 void MainWindow::showOpenTransformationFileDialog()
 {
   QString fileName = StringHandler::getOpenFileName(this, QString(Helper::applicationName).append(" - ").append(Helper::chooseFile),
                                                     NULL, Helper::infoXmlFileTypes, NULL);
-  if (fileName.isEmpty())
+  if (fileName.isEmpty()) {
     return;
-
+  }
   showTransformationsWidget(fileName);
 }
 

diff --git a/OMEdit/OMEditGUI/Simulation/SimulationDialog.cpp b/OMEdit/OMEditGUI/Simulation/SimulationDialog.cpp
@@ -1001,28 +1001,18 @@ SimulationOptions SimulationDialog::createSimulationOptions()
 }
 
 /*!
-  Creates the SimulationOutputWidget.
-  */
+ * \brief SimulationDialog::createAndShowSimulationOutputWidget
+ * Creates the SimulationOutputWidget.
+ * \param simulationOptions
+ */
 void SimulationDialog::createAndShowSimulationOutputWidget(SimulationOptions simulationOptions)
 {
-  /*
-    If resimulation and show algorithmic debugger is checked then show algorithmic debugger.
-    If show transformational debugger is checked then show transformational debugger.
-    Otherwise run the normal resimulation.
-    */
+  /* If resimulation and show algorithmic debugger is checked then show algorithmic debugger.
+   * Otherwise run the normal resimulation.
+   */
   if (simulationOptions.isReSimulate() && simulationOptions.getLaunchAlgorithmicDebugger()) {
-    if (MainWindow::instance()->getOptionsDialog()->getDebuggerPage()->getAlwaysShowTransformationsCheckBox()->isChecked() ||
-        simulationOptions.getLaunchTransformationalDebugger() || simulationOptions.getProfiling() != "none") {
-      MainWindow::instance()->showTransformationsWidget(simulationOptions.getWorkingDirectory() + "/" + simulationOptions.getOutputFileName() + "_info.json");
-    }
     showAlgorithmicDebugger(simulationOptions);
   } else {
-    if (simulationOptions.isReSimulate()) {
-      if (MainWindow::instance()->getOptionsDialog()->getDebuggerPage()->getAlwaysShowTransformationsCheckBox()->isChecked() ||
-          simulationOptions.getLaunchTransformationalDebugger() || simulationOptions.getProfiling() != "none") {
-        MainWindow::instance()->showTransformationsWidget(simulationOptions.getWorkingDirectory() + "/" + simulationOptions.getOutputFileName() + "_info.json");
-      }
-    }
     SimulationOutputWidget *pSimulationOutputWidget = new SimulationOutputWidget(simulationOptions, MainWindow::instance());
     mSimulationOutputWidgetsList.append(pSimulationOutputWidget);
     int xPos = QApplication::desktop()->availableGeometry().width() - pSimulationOutputWidget->frameSize().width() - 20;
@@ -1345,6 +1335,10 @@ void SimulationDialog::simulationProcessFinished(SimulationOptions simulationOpt
       pVariablesWidget->insertVariablesItemsToTree(simulationOptions.getResultFileName(), workingDirectory, list, simulationOptions);
     }
   }
+  if (MainWindow::instance()->getOptionsDialog()->getDebuggerPage()->getAlwaysShowTransformationsCheckBox()->isChecked() ||
+      simulationOptions.getLaunchTransformationalDebugger() || simulationOptions.getProfiling() != "none") {
+    MainWindow::instance()->showTransformationsWidget(simulationOptions.getWorkingDirectory() + "/" + simulationOptions.getOutputFileName() + "_info.json");
+  }
 }
 
 /*!

diff --git a/OMEdit/OMEditGUI/Simulation/SimulationOutputWidget.cpp b/OMEdit/OMEditGUI/Simulation/SimulationOutputWidget.cpp
@@ -422,8 +422,9 @@ void SimulationOutputWidget::compilationProcessFinished(int exitCode, QProcess::
   mpProgressBar->setValue(1);
   mpCancelButton->setEnabled(false);
   if (exitStatus == QProcess::NormalExit && exitCode == 0) {
-    if (MainWindow::instance()->getOptionsDialog()->getDebuggerPage()->getAlwaysShowTransformationsCheckBox()->isChecked() ||
-        mSimulationOptions.getLaunchTransformationalDebugger() || mSimulationOptions.getProfiling() != "none") {
+    if (mSimulationOptions.getBuildOnly() &&
+        (MainWindow::instance()->getOptionsDialog()->getDebuggerPage()->getAlwaysShowTransformationsCheckBox()->isChecked() ||
+         mSimulationOptions.getLaunchTransformationalDebugger() || mSimulationOptions.getProfiling() != "none")) {
       MainWindow::instance()->showTransformationsWidget(mSimulationOptions.getWorkingDirectory() + "/" + mSimulationOptions.getOutputFileName() + "_info.json");
     }
     MainWindow::instance()->getSimulationDialog()->showAlgorithmicDebugger(mSimulationOptions);