Merge pull request #62 from adeas31/packageOrder

ticket:4152 Use getClassNames API with includeConstants true
OpenModelica · Nov 29, 2016 · 9db63a7 · 9db63a7
2 parents 5ee52d3 + e824f37
commit 9db63a7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp b/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp
@@ -4032,8 +4032,11 @@ bool LibraryWidget::saveModelicaLibraryTreeItemFolder(LibraryTreeItem *pLibraryT
   }
   // create a package.order file
   QString contents = "";
-  for (int i = 0; i < pLibraryTreeItem->childrenSize(); i++) {
-    contents.append(pLibraryTreeItem->child(i)->getName()).append("\n");
+  /* Ticket #4152. package.order should contain constants and classes.*/
+  QStringList childClasses = MainWindow::instance()->getOMCProxy()->getClassNames(pLibraryTreeItem->getNameStructure(), false,
+                                                                                  false, false, false, true, true);
+  for (int i = 0; i < childClasses.size(); i++) {
+    contents.append(childClasses.at(i)).append("\n");
   }
   // create a new package.order file
   saveFile(QString("%1/package.order").arg(fileInfo.absoluteDir().absolutePath()), contents);

diff --git a/OMEdit/OMEditGUI/OMC/OMCProxy.cpp b/OMEdit/OMEditGUI/OMC/OMCProxy.cpp
@@ -707,9 +707,10 @@ void OMCProxy::loadUserLibraries()
  * \param showProtected - returns the protected classes as well.
  * \return
  */
-QStringList OMCProxy::getClassNames(QString className, bool recursive, bool qualified, bool sort, bool builtin, bool showProtected)
+QStringList OMCProxy::getClassNames(QString className, bool recursive, bool qualified, bool sort, bool builtin, bool showProtected,
+                                    bool includeConstants)
 {
-  return mpOMCInterface->getClassNames(className, recursive, qualified, sort, builtin, showProtected);
+  return mpOMCInterface->getClassNames(className, recursive, qualified, sort, builtin, showProtected, includeConstants);
 }
 
 /*!

diff --git a/OMEdit/OMEditGUI/OMC/OMCProxy.h b/OMEdit/OMEditGUI/OMC/OMCProxy.h
@@ -111,7 +111,7 @@ class OMCProxy : public QObject
   void loadSystemLibraries();
   void loadUserLibraries();
   QStringList getClassNames(QString className = QString("AllLoadedClasses"), bool recursive = false, bool qualified = false,
-                            bool sort = false, bool builtin = false, bool showProtected = true);
+                            bool sort = false, bool builtin = false, bool showProtected = true, bool includeConstants = false);
   QStringList searchClassNames(QString searchText, bool findInText = false);
   OMCInterface::getClassInformation_res getClassInformation(QString className);
   bool isPackage(QString className);