Load the mo file as MetaModelica when loaded via "Load External Model…

…(s)"
OpenModelica · Apr 7, 2017 · c74c1a1 · c74c1a1
1 parent 767d9c6
commit c74c1a1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/OMEdit/OMEditGUI/MainWindow.cpp b/OMEdit/OMEditGUI/MainWindow.cpp
@@ -1377,7 +1377,7 @@ void MainWindow::loadExternalModels()
       pMessageBox->setStandardButtons(QMessageBox::Ok);
       pMessageBox->exec();
     } else {
-      mpLibraryWidget->openFile(file, Helper::utf8, false);
+      mpLibraryWidget->openFile(file, Helper::utf8, false, false, true);
     }
   }
   mpStatusBar->clearMessage();

diff --git a/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp b/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp
@@ -3408,8 +3408,9 @@ LibraryWidget::LibraryWidget(QWidget *pParent)
  * \param encoding
  * \param showProgress
  * \param checkFileExists
+ * \param loadExternalModel
  */
-void LibraryWidget::openFile(QString fileName, QString encoding, bool showProgress, bool checkFileExists)
+void LibraryWidget::openFile(QString fileName, QString encoding, bool showProgress, bool checkFileExists, bool loadExternalModel)
 {
   /* if the file doesn't exist then remove it from the recent files list. */
   QFileInfo fileInfo(fileName);
@@ -3431,7 +3432,7 @@ void LibraryWidget::openFile(QString fileName, QString encoding, bool showProgre
       return;
     }
   }
-  if (fileInfo.suffix().compare("mo") == 0) {
+  if (fileInfo.suffix().compare("mo") == 0 && !loadExternalModel) {
     openModelicaFile(fileName, encoding, showProgress);
   } else if (fileInfo.isDir()) {
     openDirectory(fileInfo, showProgress);

diff --git a/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.h b/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.h
@@ -389,7 +389,8 @@ class LibraryWidget : public QWidget
   LibraryTreeModel* getLibraryTreeModel() {return mpLibraryTreeModel;}
   LibraryTreeProxyModel* getLibraryTreeProxyModel() {return mpLibraryTreeProxyModel;}
   LibraryTreeView* getLibraryTreeView() {return mpLibraryTreeView;}
-  void openFile(QString fileName, QString encoding = Helper::utf8, bool showProgress = true, bool checkFileExists = false);
+  void openFile(QString fileName, QString encoding = Helper::utf8, bool showProgress = true, bool checkFileExists = false,
+                bool loadExternalModel = false);
   void openModelicaFile(QString fileName, QString encoding = Helper::utf8, bool showProgress = true);
   void openCompositeModelOrTextFile(QFileInfo fileInfo, bool showProgress = true);
   void openDirectory(QFileInfo fileInfo, bool showProgress = true);