Added moveClass API support.

OpenModelica · Nov 30, 2015 · a1a7b13 · a1a7b13
1 parent 56d23eb
commit a1a7b13
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp b/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp
@@ -1379,6 +1379,9 @@ void LibraryTreeModel::updateChildLibraryTreeItemClassText(LibraryTreeItem *pLib
         ModelicaTextEditor *pModelicaTextEditor = dynamic_cast<ModelicaTextEditor*>(pChildLibraryTreeItem->getModelWidget()->getEditor());
         if (pModelicaTextEditor) {
           pModelicaTextEditor->setPlainText(pChildLibraryTreeItem->getClassText(this));
+          if (pModelicaTextEditor->isVisible()) {
+            pModelicaTextEditor->getPlainTextEdit()->getLineNumberArea()->update();
+          }
         }
       }
       if (pChildLibraryTreeItem->getChildren().size() > 0) {
@@ -1669,16 +1672,20 @@ void LibraryTreeModel::moveClassUpDown(LibraryTreeItem *pLibraryTreeItem, bool u
   int row = pLibraryTreeItem->row();
   bool update = false;
   if (up && row > 0) {
-    if (beginMoveRows(parentIndex, row, row, parentIndex, row - 1)) {
-      pParentLibraryTreeItem->moveChild(row, row - 1);
-      endMoveRows();
-      update = true;
+    if (mpLibraryWidget->getMainWindow()->getOMCProxy()->moveClass(pLibraryTreeItem->getNameStructure(), -1)) {
+      if (beginMoveRows(parentIndex, row, row, parentIndex, row - 1)) {
+        pParentLibraryTreeItem->moveChild(row, row - 1);
+        endMoveRows();
+        update = true;
+      }
     }
   } else if (!up && row < pParentLibraryTreeItem->getChildren().size() - 1) {
-    if (beginMoveRows(parentIndex, row, row, parentIndex, row + 2)) {
-      pParentLibraryTreeItem->moveChild(row, row + 1);
-      endMoveRows();
-      update = true;
+    if (mpLibraryWidget->getMainWindow()->getOMCProxy()->moveClass(pLibraryTreeItem->getNameStructure(), 1)) {
+      if (beginMoveRows(parentIndex, row, row, parentIndex, row + 2)) {
+        pParentLibraryTreeItem->moveChild(row, row + 1);
+        endMoveRows();
+        update = true;
+      }
     }
   }
   if (update) {
@@ -1691,7 +1698,7 @@ void LibraryTreeModel::moveClassUpDown(LibraryTreeItem *pLibraryTreeItem, bool u
         updateLibraryTreeItemClassText(pLibraryTreeItem);
       }
     } else {
-      // if we order in a package saved in folder strucutre then we should mark its parent unsaved so new package.order can be saved.
+      // if we order in a package saved in folder structure then we should mark its parent unsaved so new package.order can be saved.
       pParentLibraryTreeItem->setIsSaved(false);
       updateLibraryTreeItem(pParentLibraryTreeItem);
       if (pParentLibraryTreeItem->getModelWidget()) {

diff --git a/OMEdit/OMEditGUI/OMC/OMCProxy.cpp b/OMEdit/OMEditGUI/OMC/OMCProxy.cpp
@@ -2432,6 +2432,18 @@ void OMCProxy::getNonLinearSolvers(QStringList *methods, QStringList *descriptio
   }
 }
 
+/*!
+ * \brief OMCProxy::moveClass
+ * Moves the class.
+ * \param className
+ * \param offset
+ * \return
+ */
+bool OMCProxy::moveClass(QString className, int offset)
+{
+  return mpOMCInterface->moveClass(className, offset);
+}
+
 /*!
   \class CustomExpressionBox
   \brief A text box for executing OMC commands.

diff --git a/OMEdit/OMEditGUI/OMC/OMCProxy.h b/OMEdit/OMEditGUI/OMC/OMCProxy.h
@@ -223,6 +223,7 @@ class OMCProxy : public QObject
   void getInitializationMethods(QStringList *methods, QStringList *descriptions);
   void getLinearSolvers(QStringList *methods, QStringList *descriptions);
   void getNonLinearSolvers(QStringList *methods, QStringList *descriptions);
+  bool moveClass(QString className, int offset);
 signals:
   void commandFinished();
 public slots: