ticket#5285 Implemented "save as" for OMSimulator models

OpenModelica · Jan 23, 2019 · 712d903 · 712d903
1 parent 5297e5b
commit 712d903
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 13 deletions.
diff --git a/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp b/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp
@@ -4607,6 +4607,12 @@ void LibraryWidget::saveAsLibraryTreeItem(LibraryTreeItem *pLibraryTreeItem)
     pDuplicateClassDialog->exec();
   } else if (pLibraryTreeItem->getLibraryType() == LibraryTreeItem::CompositeModel) {
     saveAsCompositeModelLibraryTreeItem(pLibraryTreeItem);
+  } else if (pLibraryTreeItem->getLibraryType() == LibraryTreeItem::OMS) {
+    if (pLibraryTreeItem->isTopLevel()) {
+      saveAsOMSLibraryTreeItem(pLibraryTreeItem);
+    } else {
+      saveAsLibraryTreeItem(pLibraryTreeItem->parent());
+    }
   } else {
     QMessageBox::information(this, Helper::applicationName + " - " + Helper::error, GUIMessages::getMessage(GUIMessages::ERROR_OCCURRED)
                              .arg(tr("Unable to save the file, unknown library type.")), Helper::ok);
@@ -4967,19 +4973,15 @@ bool LibraryWidget::saveOMSLibraryTreeItem(LibraryTreeItem *pLibraryTreeItem)
  */
 void LibraryWidget::saveOMSLibraryTreeItemHelper(LibraryTreeItem *pLibraryTreeItem, QString fileName)
 {
-  if (pLibraryTreeItem->isTopLevel()
-      || (pLibraryTreeItem->isSystemElement())
-      || (pLibraryTreeItem->parent()->isSystemElement() && pLibraryTreeItem->getOMSConnector())) {
-    pLibraryTreeItem->setIsSaved(true);
-    pLibraryTreeItem->setFileName(fileName);
-    if (pLibraryTreeItem->getModelWidget() && pLibraryTreeItem->getModelWidget()->isLoadedWidgetComponents()) {
-      pLibraryTreeItem->getModelWidget()->setWindowTitle(pLibraryTreeItem->getName());
-      pLibraryTreeItem->getModelWidget()->setModelFilePathLabel(fileName);
-    }
-    mpLibraryTreeModel->updateLibraryTreeItem(pLibraryTreeItem);
-    for (int i = 0; i < pLibraryTreeItem->childrenSize(); i++) {
-      saveOMSLibraryTreeItemHelper(pLibraryTreeItem->child(i), fileName);
-    }
+  pLibraryTreeItem->setIsSaved(true);
+  pLibraryTreeItem->setFileName(fileName);
+  if (pLibraryTreeItem->getModelWidget() && pLibraryTreeItem->getModelWidget()->isLoadedWidgetComponents()) {
+    pLibraryTreeItem->getModelWidget()->setWindowTitle(pLibraryTreeItem->getName());
+    pLibraryTreeItem->getModelWidget()->setModelFilePathLabel(fileName);
+  }
+  mpLibraryTreeModel->updateLibraryTreeItem(pLibraryTreeItem);
+  for (int i = 0; i < pLibraryTreeItem->childrenSize(); i++) {
+    saveOMSLibraryTreeItemHelper(pLibraryTreeItem->child(i), fileName);
   }
 }
 
@@ -5016,6 +5018,31 @@ bool LibraryWidget::saveAsCompositeModelLibraryTreeItem(LibraryTreeItem *pLibrar
   return saveCompositeModelLibraryTreeItem(pLibraryTreeItem, fileName);
 }
 
+/*!
+ * \brief LibraryWidget::saveAsOMSLibraryTreeItem
+ * Save as OMSimulator model.
+ * \param pLibraryTreeItem
+ * \return
+ */
+bool LibraryWidget::saveAsOMSLibraryTreeItem(LibraryTreeItem *pLibraryTreeItem)
+{
+  QString fileName;
+  QString name = pLibraryTreeItem->getName();
+  fileName = StringHandler::getSaveFileName(this, QString(Helper::applicationName).append(" - ").append(tr("Save File")), NULL,
+                                            Helper::omsFileTypes, NULL, "ssp", &name);
+  if (fileName.isEmpty()) { // if user press ESC
+    return false;
+  }
+
+  if (OMSProxy::instance()->saveModel(pLibraryTreeItem->getNameStructure(), fileName)) {
+    /* mark the file as saved and update the labels. */
+    saveOMSLibraryTreeItemHelper(pLibraryTreeItem, fileName);
+  } else {
+    return false;
+  }
+  return true;
+}
+
 /*!
  * \brief LibraryWidget::saveCompositeModelLibraryTreeItem
  * Saves a CompositeModel LibraryTreeItem.

diff --git a/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.h b/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.h
@@ -504,6 +504,7 @@ class LibraryWidget : public QWidget
   void saveOMSLibraryTreeItemHelper(LibraryTreeItem *pLibraryTreeItem, QString fileName);
   bool saveCompositeModelLibraryTreeItem(LibraryTreeItem *pLibraryTreeItem);
   bool saveAsCompositeModelLibraryTreeItem(LibraryTreeItem *pLibraryTreeItem);
+  bool saveAsOMSLibraryTreeItem(LibraryTreeItem *pLibraryTreeItem);
   bool saveCompositeModelLibraryTreeItem(LibraryTreeItem *pLibraryTreeItem, QString fileName);
   bool saveTotalLibraryTreeItemHelper(LibraryTreeItem *pLibraryTreeItem);
 public slots: