- Show the proper color for simulation output in formatted text mode.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@23606 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Nov 30, 2014 · 8358a94 · 8358a94
1 parent 7fd6d2c
commit 8358a94
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/OMEdit/OMEditGUI/Simulation/SimulationOutputHandler.cpp b/OMEdit/OMEditGUI/Simulation/SimulationOutputHandler.cpp
@@ -331,7 +331,11 @@ bool SimulationOutputHandler::startElement(const QString &namespaceURI, const QS
   Q_UNUSED(namespaceURI);
   Q_UNUSED(localName);
   if (qName == "message") {
-    mpSimulationMessage = new SimulationMessage(mpSimulationMessageModel->getRootSimulationMessage());
+    if (mpSimulationOutputWidget->isOutputStructured()) {
+      mpSimulationMessage = new SimulationMessage(mpSimulationMessageModel->getRootSimulationMessage());
+    } else {
+      mpSimulationMessage = new SimulationMessage;
+    }
     mpSimulationMessage->mStream = atts.value("stream");
     mpSimulationMessage->mType = StringHandler::getSimulationMessageType(atts.value("type"));
     mpSimulationMessage->mText = atts.value("text");
@@ -385,7 +389,13 @@ bool SimulationOutputHandler::fatalError(const QXmlParseException &exception)
       .arg(exception.columnNumber())
       .arg(exception.message())
       .arg(mOutputBuffer);
-  SimulationMessage *pSimulationMessage = new SimulationMessage(mpSimulationMessageModel->getRootSimulationMessage());
+  // construct the SimulationMessage object with error
+  SimulationMessage *pSimulationMessage;
+  if (mpSimulationOutputWidget->isOutputStructured()) {
+    pSimulationMessage = new SimulationMessage(mpSimulationMessageModel->getRootSimulationMessage());
+  } else {
+    pSimulationMessage = new SimulationMessage;
+  }
   pSimulationMessage->mStream = "stderr";
   pSimulationMessage->mType = StringHandler::getSimulationMessageType("error");
   pSimulationMessage->mText = error;

diff --git a/OMEdit/OMEditGUI/Simulation/SimulationOutputWidget.cpp b/OMEdit/OMEditGUI/Simulation/SimulationOutputWidget.cpp
@@ -338,6 +338,15 @@ void SimulationOutputWidget::writeSimulationMessage(SimulationMessage *pSimulati
   for (int i = 0 ; i < pSimulationMessage->mLevel ; ++i)
     error += "| ";
   error += pSimulationMessage->mText;
+  /* move the cursor down before adding to the logger. */
+  QTextCursor textCursor = mpSimulationOutputTextBrowser->textCursor();
+  textCursor.movePosition(QTextCursor::End);
+  mpSimulationOutputTextBrowser->setTextCursor(textCursor);
+  /* set the text color */
+  QTextCharFormat charFormat = mpSimulationOutputTextBrowser->currentCharFormat();
+  charFormat.setForeground(StringHandler::getSimulationMessageTypeColor(pSimulationMessage->mType));
+  mpSimulationOutputTextBrowser->setCurrentCharFormat(charFormat);
+  /* append the output */
   /* write the error message */
   mpSimulationOutputTextBrowser->insertPlainText(error);
   /* write the error link */