- Fixed go to line. Compare the current & parent models filename.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@18780 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: adeas31

OMEdit/OMEditGUI/GUI/Widgets/LibraryTreeWidget.cpp

@@ -1010,6 +1010,23 @@ bool LibraryTreeWidget::saveLibraryTreeNode(LibraryTreeNode *pLibraryTreeNode)
   return result;
 }
 
+LibraryTreeNode* LibraryTreeWidget::findParentLibraryTreeNodeSavedInSameFile(LibraryTreeNode *pLibraryTreeNode, QFileInfo fileInfo)
+{
+  LibraryTreeNode *pParentLibraryTreeNode = getLibraryTreeNode(pLibraryTreeNode->getParentName());
+  if (pParentLibraryTreeNode)
+  {
+    QFileInfo libraryTreeNodeFileInfo(pParentLibraryTreeNode->getFileName());
+    if (fileInfo.absoluteFilePath().compare(libraryTreeNodeFileInfo.absoluteFilePath()) == 0)
+      return findParentLibraryTreeNodeSavedInSameFile(pParentLibraryTreeNode, fileInfo);
+    else
+      return pLibraryTreeNode;
+  }
+  else
+  {
+    return pLibraryTreeNode;
+  }
+}
+
 bool LibraryTreeWidget::saveLibraryTreeNodeHelper(LibraryTreeNode *pLibraryTreeNode)
 {
   mpMainWindow->getStatusBar()->showMessage(QString(tr("Saving")).append(" ").append(pLibraryTreeNode->getNameStructure()));

OMEdit/OMEditGUI/GUI/Widgets/LibraryTreeWidget.h

@@ -169,6 +169,7 @@ class LibraryTreeWidget : public QTreeWidget
   bool unloadClass(LibraryTreeNode *pLibraryTreeNode, bool askQuestion = true);
   void unloadClassHelper(LibraryTreeNode *pLibraryTreeNode);
   bool saveLibraryTreeNode(LibraryTreeNode *pLibraryTreeNode);
+  LibraryTreeNode* findParentLibraryTreeNodeSavedInSameFile(LibraryTreeNode *pLibraryTreeNode, QFileInfo fileInfo);
 private:
   MainWindow *mpMainWindow;
   bool mIsSearchTree;

OMEdit/OMEditGUI/GUI/Widgets/TransformationsWidget.cpp

@@ -412,6 +412,28 @@ void VariablePage::fetchVariableData(QTreeWidgetItem *pVariableTreeItem, int col
   fetchDefinedInEquations(variable);
   /* fetch used in equations */
   fetchUsedInEquations(variable);
+  /* open the model with and go to the variable line */
+  MainWindow *pMainWindow = mpTransformationsWidget->getMainWindow();
+  QFileInfo fileInfo(variable.info.file);
+  foreach (LibraryTreeNode* pLibraryTreeNode, pMainWindow->getLibraryTreeWidget()->getLibraryTreeNodesList())
+  {
+    QFileInfo libraryTreeNodeFileInfo(pLibraryTreeNode->getFileName());
+    if (fileInfo.absoluteFilePath().compare(libraryTreeNodeFileInfo.absoluteFilePath()) == 0)
+    {
+      /* find the root library tree node. */
+      LibraryTreeNode *pParentLibraryTreeNode;
+      pParentLibraryTreeNode = pMainWindow->getLibraryTreeWidget()->findParentLibraryTreeNodeSavedInSameFile(pLibraryTreeNode, fileInfo);
+      if (pParentLibraryTreeNode)
+      {
+        pMainWindow->getLibraryTreeWidget()->showModelWidget(pParentLibraryTreeNode);
+        if (pParentLibraryTreeNode->getModelWidget())
+        {
+          pParentLibraryTreeNode->getModelWidget()->showModelicaTextView(true);
+          pParentLibraryTreeNode->getModelWidget()->getModelicaTextWidget()->getModelicaTextEdit()->goToLineNumber(variable.info.lineStart);
+        }
+      }
+    }
+  }
 }
 
 void VariablePage::variablesItemChanged(QTreeWidgetItem *current)
@@ -564,7 +586,7 @@ void EquationPage::fetchEquationData(int equationIndex)
   fetchDepends(equation);
   /* fetch operations */
   fetchOperations(equation);
-  /* open the model with and go to the line */
+  /* open the model with and go to the equation line */
   MainWindow *pMainWindow = mpTransformationsWidget->getMainWindow();
   QFileInfo fileInfo(equation.info.file);
   foreach (LibraryTreeNode* pLibraryTreeNode, pMainWindow->getLibraryTreeWidget()->getLibraryTreeNodesList())
@@ -573,7 +595,8 @@ void EquationPage::fetchEquationData(int equationIndex)
     if (fileInfo.absoluteFilePath().compare(libraryTreeNodeFileInfo.absoluteFilePath()) == 0)
     {
       /* find the root library tree node. */
-      LibraryTreeNode *pParentLibraryTreeNode = pMainWindow->getLibraryTreeWidget()->getLibraryTreeNode(StringHandler::getFirstWordBeforeDot(pLibraryTreeNode->getNameStructure()));
+      LibraryTreeNode *pParentLibraryTreeNode;
+      pParentLibraryTreeNode = pMainWindow->getLibraryTreeWidget()->findParentLibraryTreeNodeSavedInSameFile(pLibraryTreeNode, fileInfo);
       if (pParentLibraryTreeNode)
       {
         pMainWindow->getLibraryTreeWidget()->showModelWidget(pParentLibraryTreeNode);