Changeset c8233fa in OpenModelica

Timestamp:

2021-01-18T16:01:20+01:00 (3 years ago)

Author:

GitHub <noreply@…>

Branches:

Added-citation-metadata, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

2b3b8739, 4300ee8d, 77c8dbfa, a59d6c96, f1f813af

Parents:

971ba11e

git-author:

Adeel Asghar <adeel.asghar@…> (01/18/21 16:01:20)

git-committer:

GitHub <noreply@…> (01/18/21 16:01:20)

Message:

Enable the simulation output tab after starting the simulation (#7085)

Fixes #6341

Location:

OMEdit/OMEditLIB/Simulation

Files:

• SimulationOutputHandler.cpp (modified) (2 diffs)
• SimulationOutputHandler.h (modified) (1 diff)
• SimulationOutputWidget.cpp (modified) (3 diffs)
• SimulationOutputWidget.h (modified) (1 diff)
• SimulationProcessThread.cpp (modified) (1 diff)
• SimulationProcessThread.h (modified) (1 diff)

OMEdit/OMEditLIB/Simulation/SimulationOutputHandler.cpp

@@ -259 +259 @@
   mLevel = 0;
   mNumberOfBytes = 0;
+  mShownDisplayLimitReachedMessage = false;
   mpSimulationMessage = 0;
   QString simulationLogFilePath = QString("%1/%2.log").arg(mpSimulationOutputWidget->getSimulationOptions().getWorkingDirectory())
@@ -353 +354 @@
    * and display a message showing that the limit is reached.
    */
-  static int init = 0;
   if (isMaximumDisplayLimitReached()) {
     // Only generate the reached display limit message once.
-    if (!init) {
-      init = 1;
+    if (!mShownDisplayLimitReachedMessage) {
+      mShownDisplayLimitReachedMessage = true;
 
       while (mLevel > 0) {

OMEdit/OMEditLIB/Simulation/SimulationOutputHandler.h

@@ -98 +98 @@
   int mLevel;
   int mNumberOfBytes;
+  bool mShownDisplayLimitReachedMessage;
   SimulationMessage* mpSimulationMessage;
   QMap<int, SimulationMessage*> mSimulationMessagesLevelMap;

OMEdit/OMEditLIB/Simulation/SimulationOutputWidget.cpp

@@ -407 +407 @@
           SLOT(compilationProcessFinished(int,QProcess::ExitStatus)));
   connect(mpSimulationProcessThread, SIGNAL(sendSimulationStarted()), SLOT(simulationProcessStarted()));
+  connect(mpSimulationProcessThread, SIGNAL(enableSimulationOutputTab()), SLOT(enableSimulationOutputTab()));
   connect(mpSimulationProcessThread, SIGNAL(sendSimulationOutput(QString,StringHandler::SimulationMessageType,bool)),
           SLOT(writeSimulationOutput(QString,StringHandler::SimulationMessageType,bool)));
@@ -667 +668 @@
 
 /*!
+ * \brief SimulationOutputWidget::enableSimulationOutputTab
+ * Slot activated when SimulationProcessThread enableSimulationOutputTab SIGNAL is raised.
+ * Enables and makes the simulation output tab active.
+ */
+void SimulationOutputWidget::enableSimulationOutputTab()
+{
+  // make the output tab enabled and current only once.
+  mpGeneratedFilesTabWidget->setTabEnabled(0, true);
+  mpGeneratedFilesTabWidget->setCurrentIndex(0);
+}
+
+/*!
  * \brief SimulationOutputWidget::writeSimulationOutput
  * Slot activated when SimulationProcessThread sendSimulationOutput signal is raised.\n
@@ -708 +721 @@
   Q_UNUSED(exitCode);
   Q_UNUSED(exitStatus);
-  mpGeneratedFilesTabWidget->setTabEnabled(0, true);
-  /* make the output tab the current one */
-  mpGeneratedFilesTabWidget->setCurrentIndex(0);
   mpProgressLabel->setText(tr("Simulation of %1 is finished.").arg(mSimulationOptions.getClassName()));
   mpProgressBar->setValue(mpProgressBar->maximum());

OMEdit/OMEditLIB/Simulation/SimulationOutputWidget.h

@@ -124 +124 @@
   void compilationProcessFinished(int exitCode, QProcess::ExitStatus exitStatus);
   void simulationProcessStarted();
+  void enableSimulationOutputTab();
   void writeSimulationOutput(QString output, StringHandler::SimulationMessageType type, bool textFormat);
   void simulationProcessFinished(int exitCode, QProcess::ExitStatus exitStatus);

OMEdit/OMEditLIB/Simulation/SimulationProcessThread.cpp

@@ -149 +149 @@
   mpSimulationProcess->setProcessEnvironment(processEnvironment);
 #endif
+  emit enableSimulationOutputTab();
   emit sendSimulationOutput(QString("%1 %2").arg(fileName).arg(args.join(" ")), StringHandler::OMEditInfo, true);
   mpSimulationProcess->start(fileName, args);

OMEdit/OMEditLIB/Simulation/SimulationProcessThread.h

@@ -84 +84 @@
   void sendSimulationStarted();
   void sendEstablishConnectionRunning();
+  void enableSimulationOutputTab();
   void sendSimulationOutput(QString, StringHandler::SimulationMessageType type, bool);
   void sendSimulationFinished(int, QProcess::ExitStatus);