Do not call show documentation when editing documentation

Fixes #11638 Calling show documentation while editing causes a recursion
OpenModelica · Nov 28, 2023 · bcdf13c · bcdf13c
1 parent db1e9a8
commit bcdf13c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/OMEdit/OMEditLIB/Modeling/DocumentationWidget.cpp b/OMEdit/OMEditLIB/Modeling/DocumentationWidget.cpp
@@ -927,11 +927,6 @@ void DocumentationWidget::saveDocumentation(LibraryTreeItem *pNextLibraryTreeIte
         pUpdateClassExperimentAnnotationCommand = new UpdateClassAnnotationCommand(pLibraryTreeItem, oldDocAnnotationString, newDocAnnotationString);
         pLibraryTreeItem->getModelWidget()->getUndoStack()->push(pUpdateClassExperimentAnnotationCommand);
         pLibraryTreeItem->getModelWidget()->updateModelText();
-      } else {
-        // send the documentation annotation to OMC
-        MainWindow::instance()->getOMCProxy()->addClassAnnotation(pLibraryTreeItem->getNameStructure(), newDocAnnotationString);
-        LibraryTreeModel *pLibraryTreeModel = MainWindow::instance()->getLibraryWidget()->getLibraryTreeModel();
-        pLibraryTreeModel->updateLibraryTreeItemClassText(pLibraryTreeItem);
       }
       /* ticket:5190 Save the class when documentation save button is hit. */
       MainWindow::instance()->getLibraryWidget()->saveLibraryTreeItem(pLibraryTreeItem);

diff --git a/OMEdit/OMEditLIB/Modeling/LibraryTreeWidget.cpp b/OMEdit/OMEditLIB/Modeling/LibraryTreeWidget.cpp
@@ -4645,6 +4645,7 @@ bool LibraryWidget::saveFile(QString fileName, QString contents)
  */
 bool LibraryWidget::saveLibraryTreeItem(LibraryTreeItem *pLibraryTreeItem)
 {
+  pLibraryTreeItem->getModelWidget()->processPendingModelUpdate();
   bool result = false;
   MainWindow::instance()->getStatusBar()->showMessage(tr("Saving %1").arg(pLibraryTreeItem->getNameStructure()));
   MainWindow::instance()->showProgressBar();
@@ -4698,6 +4699,7 @@ bool LibraryWidget::saveLibraryTreeItem(LibraryTreeItem *pLibraryTreeItem)
  */
 void LibraryWidget::saveAsLibraryTreeItem(LibraryTreeItem *pLibraryTreeItem)
 {
+  pLibraryTreeItem->getModelWidget()->processPendingModelUpdate();
   /* if user has done some changes in the Modelica text view then save & validate it in the AST before saving it to file. */
   if (pLibraryTreeItem->getModelWidget() && !pLibraryTreeItem->getModelWidget()->validateText(&pLibraryTreeItem)) {
     return;
@@ -4732,6 +4734,7 @@ void LibraryWidget::saveAsLibraryTreeItem(LibraryTreeItem *pLibraryTreeItem)
  */
 void LibraryWidget::saveTotalLibraryTreeItem(LibraryTreeItem *pLibraryTreeItem)
 {
+  pLibraryTreeItem->getModelWidget()->processPendingModelUpdate();
   MainWindow::instance()->getStatusBar()->showMessage(tr("Saving %1").arg(pLibraryTreeItem->getNameStructure()));
   MainWindow::instance()->showProgressBar();
   saveTotalLibraryTreeItemHelper(pLibraryTreeItem);

diff --git a/OMEdit/OMEditLIB/Modeling/ModelWidgetContainer.cpp b/OMEdit/OMEditLIB/Modeling/ModelWidgetContainer.cpp
@@ -6785,10 +6785,6 @@ void ModelWidget::reDrawModelWidget(const ModelInfo &modelInfo)
   loadModelInstance(false, modelInfo);
   // update the icon
   mpLibraryTreeItem->handleIconUpdated();
-  // if documentation view is visible then update it
-  if (MainWindow::instance()->getDocumentationDockWidget()->isVisible()) {
-    MainWindow::instance()->getDocumentationWidget()->showDocumentation(getLibraryTreeItem());
-  }
   updateViewButtonsBasedOnAccess();
   QApplication::restoreOverrideCursor();
 }
@@ -10040,7 +10036,6 @@ void ModelWidgetContainer::saveModelWidget()
                              GUIMessages::getMessage(GUIMessages::NO_MODELICA_CLASS_OPEN).arg(tr("saving")), Helper::ok);
     return;
   }
-  pModelWidget->processPendingModelUpdate();
   LibraryTreeItem *pLibraryTreeItem = pModelWidget->getLibraryTreeItem();
   MainWindow::instance()->getLibraryWidget()->saveLibraryTreeItem(pLibraryTreeItem);
 }