From 6c4e231c89fcbd6e9dc707c39ea56754644826b2 Mon Sep 17 00:00:00 2001 From: Adeel Asghar Date: Tue, 30 Apr 2024 11:10:53 +0200 Subject: [PATCH] Read the error from the graphics annotation element (#12353) Adapt to the new output introduced in #12325 --- OMEdit/OMEditLIB/Modeling/Model.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/OMEdit/OMEditLIB/Modeling/Model.cpp b/OMEdit/OMEditLIB/Modeling/Model.cpp index 07e535864c..07c15628e4 100644 --- a/OMEdit/OMEditLIB/Modeling/Model.cpp +++ b/OMEdit/OMEditLIB/Modeling/Model.cpp @@ -641,12 +641,7 @@ namespace ModelInstance } if (jsonObject.contains("graphics")) { - if (jsonObject.value("graphics").isObject()) { - QJsonObject graphicsObject = jsonObject.value("graphics").toObject(); - if (graphicsObject.contains("$error")) { - MessagesWidget::instance()->addGUIMessage(MessageItem(MessageItem::Modelica, graphicsObject.value("$error").toString(), Helper::scriptingKind, Helper::errorLevel)); - } - } else if (jsonObject.value("graphics").isArray()) { + if (jsonObject.value("graphics").isArray()) { QJsonArray graphicsArray = jsonObject.value("graphics").toArray(); for (int i = 0; i < graphicsArray.size(); ++i) { QJsonObject graphicObject = graphicsArray.at(i).toObject(); @@ -677,6 +672,8 @@ namespace ModelInstance pBitmap->deserialize(graphicObject.value("elements").toArray()); mGraphics.append(pBitmap); } + } else if (graphicObject.contains("$error")) { + MessagesWidget::instance()->addGUIMessage(MessageItem(MessageItem::Modelica, graphicObject.value("$error").toString(), Helper::scriptingKind, Helper::errorLevel)); } } }