From 111b8a66790e5162c19889b9547e0c8e3845b9f0 Mon Sep 17 00:00:00 2001 From: Adeel Asghar Date: Wed, 8 Apr 2020 15:23:18 +0200 Subject: [PATCH] Read the correct file Fixed ticket:5895 --- OMEdit/OMEditLIB/Plotting/VariablesWidget.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OMEdit/OMEditLIB/Plotting/VariablesWidget.cpp b/OMEdit/OMEditLIB/Plotting/VariablesWidget.cpp index e7a724c47e0..cc84cf4aa7b 100644 --- a/OMEdit/OMEditLIB/Plotting/VariablesWidget.cpp +++ b/OMEdit/OMEditLIB/Plotting/VariablesWidget.cpp @@ -584,11 +584,11 @@ void VariablesTreeModel::insertVariablesItems(QString fileName, QString filePath mScalarVariablesHash.clear(); QString initFileName, infoFileName; if (simulationOptions.isValid()) { - initFileName = QString(simulationOptions.getOutputFileName()).append("_init.xml"); - infoFileName = QString(simulationOptions.getOutputFileName()).append("_info.json"); + initFileName = QString("%1_init.xml").arg(simulationOptions.getOutputFileName()); + infoFileName = QString("%1_info.json").arg(simulationOptions.getOutputFileName()); } else { - initFileName = QString(text).append("_info.json"); - infoFileName = QString(text).append("_init.xml"); + initFileName = QString("%1_init.xml").arg(text); + infoFileName = QString("%1_info.json").arg(text); } QFile initFile(QString(filePath).append(QDir::separator()).append(initFileName)); if (initFile.exists()) { @@ -615,7 +615,7 @@ void VariablesTreeModel::insertVariablesItems(QString fileName, QString filePath result = parser.parse(&infoFile, &ok).toMap(); if (!ok) { MessagesWidget::instance()->addGUIMessage(MessageItem(MessageItem::Modelica, GUIMessages::getMessage(GUIMessages::ERROR_OPENING_FILE).arg(infoFile.fileName()) - .arg(initFile.errorString()), Helper::scriptingKind, Helper::errorLevel)); + .arg(infoFile.errorString()), Helper::scriptingKind, Helper::errorLevel)); return; } QVariantMap vars = result["variables"].toMap();