Changeset bb66619 in OpenModelica

Timestamp:

2022-03-07T12:50:28+01:00 (2 years ago)

Author:

Adeel Asghar <adeel.asghar@…>

Children:

5531a60d

Parents:

7f7f27ed

Message:

Start reading the results

Location:

OMEdit/OMEditLIB/OMS

Files:

• OMSSimulationOutputWidget.cpp (modified) (5 diffs)
• OMSSimulationOutputWidget.h (modified) (2 diffs)

OMEdit/OMEditLIB/OMS/OMSSimulationOutputWidget.cpp

@@ -63 +63 @@
 QString OMSInteractiveCommands::_signals = QStringLiteral("signals");
 QString OMSInteractiveCommands::available = QStringLiteral("available");
+QString OMSInteractiveCommands::results = QStringLiteral("results");
 
 /*!
@@ -399 +400 @@
 
 /*!
+ * \brief OMSSimulationOutputWidget::parseSimulationResults
+ * \param results
+ */
+void OMSSimulationOutputWidget::parseSimulationResults(const QVariant results)
+{
+  qDebug() << results.toMap();
+}
+
+/*!
  * \brief OMSSimulationOutputWidget::simulationProcessStarted
  * Updates the simulation output window when the simulation has started.
@@ -485 +495 @@
   if (data.startsWith(OMSInteractiveCommands::status.toStdString().c_str())) {
     jsonData = data.mid(QString(OMSInteractiveCommands::status).length());
+  } else if (data.startsWith(OMSInteractiveCommands::results.toStdString().c_str())) {
+    jsonData = data.mid(QString(OMSInteractiveCommands::results).length());
   } else {
     writeSimulationOutput(QString("Unknown simulation data %1.\n").arg(QString(data)), StringHandler::Error);
@@ -496 +508 @@
     if (data.startsWith(OMSInteractiveCommands::status.toStdString().c_str())) {
       parseSimulationProgress(jsonDocument.result);
+    } else if (data.startsWith(OMSInteractiveCommands::results.toStdString().c_str())) {
+      parseSimulationResults(jsonDocument.result);
     }
   }
@@ -509 +523 @@
 void OMSSimulationOutputWidget::simulationReply(const QByteArray &reply, const QJsonObject &jsonObject)
 {
-  writeSimulationOutput("client: " + reply + "\n", StringHandler::OMEditInfo);
+  if (MainWindow::instance()->isDebug()) {
+    writeSimulationOutput("client: " + reply + "\n", StringHandler::OMEditInfo);
+  }
   JsonDocument jsonDocument;
   if (jsonDocument.parse(reply)) {

OMEdit/OMEditLIB/OMS/OMSSimulationOutputWidget.h

@@ -62 +62 @@
   static QString _signals;
   static QString available;
+  static QString results;
 };
 
@@ -143 +144 @@
   void parseSimulationProgress(const QVariant progress);
   void parseSimulationVariables(const QVariant variables);
+  void parseSimulationResults(const QVariant results);
 signals:
   void sendRequest(const QJsonObject &jsonObject);