Removed references of _info.xml

Author: adeas31

OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp

@@ -3290,7 +3290,7 @@ bool LibraryWidget::saveModelicaLibraryTreeItem(LibraryTreeItem *pLibraryTreeIte
     result = saveModelicaLibraryTreeItemHelper(pTopLevelLibraryTreeItem);
   }
 //  if (result) {
-//    /* We need to load the file again so that the line number information for model_info.xml is correct.
+//    /* We need to load the file again so that the line number information for model_info.json is correct.
 //     * Update to AST (makes source info WRONG), saving it (source info STILL WRONG), reload it (and omc knows the new lines)
 //     * In order to get rid of it save API should update omc with new line information.
 //     */

OMEdit/OMEditGUI/Simulation/SimulationOutputWidget.cpp

@@ -361,7 +361,7 @@ void SimulationOutputWidget::writeSimulationMessage(SimulationMessage *pSimulati
   mpSimulationOutputTextBrowser->insertPlainText(error);
   /* write the error link */
   if (!pSimulationMessage->mIndex.isEmpty()) {
-    mpSimulationOutputTextBrowser->insertHtml("&nbsp;<a href=\"omedittransformationsbrowser://" + QUrl::fromLocalFile(mSimulationOptions.getWorkingDirectory() + "/" + mSimulationOptions.getFileNamePrefix() + "_info.xml").path() + "?index=" + pSimulationMessage->mIndex + "\">Debug more</a><br />");
+    mpSimulationOutputTextBrowser->insertHtml("&nbsp;<a href=\"omedittransformationsbrowser://" + QUrl::fromLocalFile(mSimulationOptions.getWorkingDirectory() + "/" + mSimulationOptions.getFileNamePrefix() + "_info.json").path() + "?index=" + pSimulationMessage->mIndex + "\">Debug more</a><br />");
   } else {
     mpSimulationOutputTextBrowser->insertPlainText("\n");
   }

OMEdit/OMEditGUI/TransformationalDebugger/OMDumpXML.cpp

@@ -469,7 +469,7 @@ double rt_tock() {
 }
 
 int test_dump_xml_reader() {
-  QFile file("Modelica.Mechanics.MultiBody.Examples.Elementary.DoublePendulum_info.xml");
+  QFile file("Modelica.Mechanics.MultiBody.Examples.Elementary.DoublePendulum_info.json");
   rt_tick();
   MyHandler handler(file);
   qDebug() << QString("streaming done in: %1 ms\n").arg(rt_tock() *1e3);

OMEdit/OMEditGUI/TransformationalDebugger/TransformationsWidget.cpp

@@ -437,9 +437,9 @@ EquationTreeWidget::EquationTreeWidget(TransformationsWidget *pTransformationWid
 }
 
 TransformationsWidget::TransformationsWidget(QString infoXMLFullFileName, MainWindow *pMainWindow)
-  : mpMainWindow(pMainWindow), mInfoXMLFullFileName(infoXMLFullFileName)
+  : mpMainWindow(pMainWindow), mInfoJSONFullFileName(infoXMLFullFileName)
 {
-  if (!mInfoXMLFullFileName.endsWith("_info.json")) {
+  if (!mInfoJSONFullFileName.endsWith("_info.json")) {
     mProfJSONFullFileName = "";
     mProfilingDataRealFileName = "";
   } else {
@@ -454,7 +454,7 @@ TransformationsWidget::TransformationsWidget(QString infoXMLFullFileName, MainWi
   pReloadToolButton->setIcon(QIcon(":/Resources/icons/refresh.svg"));
   connect(pReloadToolButton, SIGNAL(clicked()), SLOT(reloadTransformations()));
   /* info xml file path label */
-  Label *pInfoXMLFilePathLabel = new Label(mInfoXMLFullFileName, this);
+  Label *pInfoXMLFilePathLabel = new Label(mInfoJSONFullFileName, this);
   pInfoXMLFilePathLabel->setElideMode(Qt::ElideMiddle);
   /* create status bar */
   QStatusBar *pStatusBar = new QStatusBar;
@@ -795,17 +795,17 @@ static OMEquation* getOMEquation(QList<OMEquation*> equations, int index)
 
 void TransformationsWidget::loadTransformations()
 {
-  QFile file(mInfoXMLFullFileName);
+  QFile file(mInfoJSONFullFileName);
   mEquations.clear();
   mVariables.clear();
   hasOperationsEnabled = false;
-  if (mInfoXMLFullFileName.endsWith(".json")) {
+  if (mInfoJSONFullFileName.endsWith(".json")) {
     QJson::Parser parser;
     bool ok;
     QVariantMap result;
     result = parser.parse(&file, &ok).toMap();
     if (!ok) {
-      QMessageBox::critical(this, QString(Helper::applicationName).append(" - ").append(Helper::parsingFailedJson), Helper::parsingFailedJson + ": " + mInfoXMLFullFileName, Helper::ok);
+      QMessageBox::critical(this, QString(Helper::applicationName).append(" - ").append(Helper::parsingFailedJson), Helper::parsingFailedJson + ": " + mInfoJSONFullFileName, Helper::ok);
       return;
     }
     QVariantMap vars = result["variables"].toMap();

OMEdit/OMEditGUI/TransformationalDebugger/TransformationsWidget.h

@@ -157,7 +157,7 @@ class TransformationsWidget : public QWidget
 {
   Q_OBJECT
 public:
-  TransformationsWidget(QString infoXMLFullFileName, MainWindow *pMainWindow);
+  TransformationsWidget(QString infoJSONFullFileName, MainWindow *pMainWindow);
   MainWindow* getMainWindow() {return mpMainWindow;}
   MyHandler* getInfoXMLFileHandler() {return mpInfoXMLFileHandler;}
   QTreeWidget* getEquationsTreeWidget() {return mpEquationsTreeWidget;}
@@ -184,7 +184,7 @@ class TransformationsWidget : public QWidget
   void clearTreeWidgetItems(QTreeWidget *pTreeWidget);
 private:
   MainWindow *mpMainWindow;
-  QString mInfoXMLFullFileName, mProfJSONFullFileName, mProfilingDataRealFileName;
+  QString mInfoJSONFullFileName, mProfJSONFullFileName, mProfilingDataRealFileName;
   int profilingNumSteps;
   MyHandler *mpInfoXMLFileHandler;
   TreeSearchFilters *mpTreeSearchFilters;

OMEdit/OMEditGUI/Util/Helper.cpp

@@ -55,7 +55,7 @@ QString Helper::imageFileTypes = "SVG (*.svg);;PNG image (*.png);;Windows BMP im
 QString Helper::bitmapFileTypes = "PNG image (*.png);Windows BMP image (*.bmp);JPEG (*.jpg *.jpeg)";
 QString Helper::fmuFileTypes = "FMU Files (*.fmu)";
 QString Helper::xmlFileTypes = "XML Files (*.xml)";
-QString Helper::infoXmlFileTypes = "OM Info Files (*_info.xml *_info.json)";
+QString Helper::infoXmlFileTypes = "OM Info Files (*_info.json)";
 QString Helper::matFileTypes = "MAT Files (*.mat)";
 QString Helper::omResultFileTypes = "OpenModelica Result Files (*.mat *.plt *.csv)";
 #ifdef WIN32