Fixed the crash while saving metamodels.

OpenModelica · Mar 11, 2016 · b929db6 · b929db6
1 parent 4a5facf
commit b929db6
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 21 deletions.
diff --git a/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp b/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp
@@ -3512,9 +3512,9 @@ bool LibraryWidget::saveTextLibraryTreeItem(LibraryTreeItem *pLibraryTreeItem)
 bool LibraryWidget::saveMetaModelLibraryTreeItem(LibraryTreeItem *pLibraryTreeItem)
 {
   if (pLibraryTreeItem->getFileName().isEmpty()) {
-      return saveAsMetaModelLibraryTreeItem(pLibraryTreeItem);
+    return saveAsMetaModelLibraryTreeItem(pLibraryTreeItem);
   } else {
-     return saveMetaModelLibraryTreeItem(pLibraryTreeItem, pLibraryTreeItem->getFileName());
+    return saveMetaModelLibraryTreeItem(pLibraryTreeItem, pLibraryTreeItem->getFileName());
   }
 }
 
@@ -3530,9 +3530,9 @@ bool LibraryWidget::saveAsMetaModelLibraryTreeItem(LibraryTreeItem *pLibraryTree
   QString name = pLibraryTreeItem->getName();
   fileName = StringHandler::getSaveFileName(this, QString(Helper::applicationName).append(" - ").append(tr("Save File")), NULL,
                                             Helper::xmlFileTypes, NULL, "xml", &name);
-  if (fileName.isEmpty())   // if user press ESC
+  if (fileName.isEmpty()) {   // if user press ESC
     return false;
-
+  }
   return saveMetaModelLibraryTreeItem(pLibraryTreeItem, fileName);
 }
 
@@ -3553,11 +3553,13 @@ bool LibraryWidget::saveMetaModelLibraryTreeItem(LibraryTreeItem *pLibraryTreeIt
     file.close();
     /* mark the file as saved and update the labels. */
     pLibraryTreeItem->setIsSaved(true);
+    QString oldMetaModelFile = pLibraryTreeItem->getFileName();
     pLibraryTreeItem->setFileName(fileName);
     if (pLibraryTreeItem->getModelWidget()) {
       pLibraryTreeItem->getModelWidget()->setWindowTitle(pLibraryTreeItem->getNameStructure());
       pLibraryTreeItem->getModelWidget()->setModelFilePathLabel(fileName);
     }
+    mpLibraryTreeModel->updateLibraryTreeItem(pLibraryTreeItem);
     // Create folders for the submodels and copy there source file in them.
     MetaModelEditor *pMetaModelEditor = dynamic_cast<MetaModelEditor*>(pLibraryTreeItem->getModelWidget()->getEditor());
     GraphicsView *pGraphicsView = pLibraryTreeItem->getModelWidget()->getDiagramGraphicsView();
@@ -3566,30 +3568,33 @@ bool LibraryWidget::saveMetaModelLibraryTreeItem(LibraryTreeItem *pLibraryTreeIt
       QDomElement subModel = subModels.at(i).toElement();
       QString directoryName = subModel.attribute("Name");
       Component *pComponent = pGraphicsView->getComponentObject(directoryName);
-      if (pComponent) {
-        // create directory for submodel
-        QFileInfo fileInfo(fileName);
-        QString directoryPath = fileInfo.absoluteDir().absolutePath() + "/" + directoryName;
-        if (!QDir().exists(directoryPath)) {
-          QDir().mkpath(directoryPath);
-        }
-        // copy the submodel file to the created directory
-        QString modelFile = pComponent->getLibraryTreeItem()->getFileName();
-        QFileInfo modelFileInfo(modelFile);
-        QString newFileName = directoryPath + "/" + modelFileInfo.fileName();
-        if (modelFileInfo.absoluteFilePath().compare(newFileName) != 0) {
-          // first try to remove the file because QFile::copy will not override the file.
-          QFile::remove(newFileName);
-        }
-        QFile::copy(modelFileInfo.absoluteFilePath(), newFileName);
+      QString modelFile;
+      if (pComponent && pComponent->getLibraryTreeItem()) {
+        modelFile = pComponent->getLibraryTreeItem()->getFileName();
+      } else {
+        QFileInfo fileInfo(oldMetaModelFile);
+        modelFile = QString("%1/%2/%3").arg(fileInfo.absolutePath()).arg(directoryName).arg(subModel.attribute("ModelFile"));
+      }
+      // create directory for submodel
+      QFileInfo fileInfo(fileName);
+      QString directoryPath = fileInfo.absoluteDir().absolutePath() + "/" + directoryName;
+      if (!QDir().exists(directoryPath)) {
+        QDir().mkpath(directoryPath);
+      }
+      // copy the submodel file to the created directory
+      QFileInfo modelFileInfo(modelFile);
+      QString newFileName = directoryPath + "/" + modelFileInfo.fileName();
+      if (modelFileInfo.absoluteFilePath().compare(newFileName) != 0) {
+        // first try to remove the file because QFile::copy will not override the file.
+        QFile::remove(newFileName);
       }
+      QFile::copy(modelFileInfo.absoluteFilePath(), newFileName);
     }
   } else {
     QMessageBox::information(this, Helper::applicationName + " - " + Helper::error, GUIMessages::getMessage(GUIMessages::ERROR_OCCURRED)
                              .arg(GUIMessages::getMessage(GUIMessages::UNABLE_TO_SAVE_FILE).arg(file.errorString())), Helper::ok);
     return false;
   }
-  getMainWindow()->addRecentFile(pLibraryTreeItem->getFileName(), Helper::utf8);
   return true;
 }
 

diff --git a/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp b/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp
@@ -3498,6 +3498,7 @@ void ModelWidget::getModelConnections()
  */
 void ModelWidget::getTLMSubModels()
 {
+  QFileInfo fileInfo(mpLibraryTreeItem->getFileName());
   MetaModelEditor *pMetaModelEditor = dynamic_cast<MetaModelEditor*>(mpEditor);
   QDomNodeList subModels = pMetaModelEditor->getSubModels();
   for (int i = 0; i < subModels.size(); i++) {
@@ -3521,6 +3522,7 @@ void ModelWidget::getTLMSubModels()
     QStringList dialogAnnotation;
     // get the attibutes of the submodel
     ComponentInfo *pComponentInfo = new ComponentInfo;
+    pComponentInfo->setName(subModel.attribute("Name"));
     pComponentInfo->setStartCommand(subModel.attribute("StartCommand"));
     bool exactStep;
     if (subModel.attribute("ExactStep").toLower().compare("1") == 0) {
@@ -3532,6 +3534,15 @@ void ModelWidget::getTLMSubModels()
     }
     pComponentInfo->setExactStep(exactStep);
     pComponentInfo->setModelFile(subModel.attribute("ModelFile"));
+    QString absoluteModelFilePath = QString("%1/%2/%3").arg(fileInfo.absolutePath()).arg(subModel.attribute("Name"))
+        .arg(subModel.attribute("ModelFile"));
+    // if ModelFile doesn't exist
+    if (!QFile::exists(absoluteModelFilePath)) {
+      QString msg = tr("Unable to find ModelFile <b>%1</b> for SubModel <b>%2</b>. The file location should be <b>%3</b>.")
+          .arg(subModel.attribute("ModelFile")).arg(subModel.attribute("Name")).arg(absoluteModelFilePath);
+      MessagesWidget *pMessagesWidget = mpModelWidgetContainer->getMainWindow()->getMessagesWidget();
+      pMessagesWidget->addGUIMessage(MessageItem(MessageItem::Modelica, "", false, 0, 0, 0, 0, msg, Helper::scriptingKind, Helper::errorLevel));
+    }
     // add submodel as component to view.
     mpDiagramGraphicsView->addComponentToView(subModel.attribute("Name"), pLibraryTreeItem, transformation, QPointF(0.0, 0.0), dialogAnnotation,
                                               pComponentInfo, false, true);