[WIP] Disable the diagram and text view for Access.icon and Access.do…

…cumentation
OpenModelica · Dec 1, 2017 · c72eace · c72eace
1 parent 13fa5ac
commit c72eace
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 5 deletions.
diff --git a/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp b/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp
@@ -456,11 +456,20 @@ void LibraryTreeItem::setClassInformation(OMCInterface::getClassInformation_res
     setReadOnly(classInformation.fileReadOnly);
     // handle the Access annotation
     LibraryTreeItem::Access access = getAccess();
-    if (access == LibraryTreeItem::hide && mpModelWidget) {
-      QMdiSubWindow *pSubWindow = MainWindow::instance()->getModelWidgetContainer()->getMdiSubWindow(mpModelWidget);
-      if (pSubWindow) {
-        pSubWindow->close();
-      }
+    switch (access) {
+      case LibraryTreeItem::hide:
+        if (mpModelWidget) {
+          QMdiSubWindow *pSubWindow = MainWindow::instance()->getModelWidgetContainer()->getMdiSubWindow(mpModelWidget);
+          if (pSubWindow) {
+            pSubWindow->close();
+          }
+        }
+        break;
+      default:
+        break;
+    }
+    if (mpModelWidget) {
+      mpModelWidget->updateViewButtonsBasedOnAccess();
     }
   }
 }
@@ -521,6 +530,8 @@ LibraryTreeItem::Access LibraryTreeItem::getAccess()
     return LibraryTreeItem::packageText;
   } else if (mClassInformation.access.compare("Access.packageDuplicate") == 0) {
     return LibraryTreeItem::packageDuplicate;
+  } else if (mpParentLibraryTreeItem) {   // if there is not override for Access annotation then look in the parent class.
+    return mpParentLibraryTreeItem->getAccess();
   } else {
     return LibraryTreeItem::all;
   }

diff --git a/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp b/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp
@@ -3613,6 +3613,7 @@ void ModelWidget::reDrawModelWidget()
 //    if (mpEditor) {
 //      mpEditor->getPlainTextEdit()->document()->clearUndoRedoStacks();
 //    }
+    updateViewButtonsBasedOnAccess();
     // announce the change.
     mpLibraryTreeItem->emitLoaded();
   }
@@ -4540,6 +4541,29 @@ void ModelWidget::endMacro()
   }
 }
 
+/*!
+ * \brief ModelWidget::updateViewButtonsBasedOnAccess
+ * Update the view buttons i.e., icon, diagram and text based on the Access annotation.
+ */
+void ModelWidget::updateViewButtonsBasedOnAccess()
+{
+  if (mCreateModelWidgetComponents) {
+    LibraryTreeItem::Access access = mpLibraryTreeItem->getAccess();
+    switch (access) {
+      case LibraryTreeItem::icon:
+      case LibraryTreeItem::documentation:
+        mpIconViewToolButton->setChecked(true);
+        mpDiagramViewToolButton->setEnabled(false);
+        mpTextViewToolButton->setEnabled(false);
+        break;
+      default:
+        mpDiagramViewToolButton->setEnabled(true);
+        mpTextViewToolButton->setEnabled(true);
+        break;
+    }
+  }
+}
+
 /*!
  * \brief ModelWidget::getModelInheritedClasses
  * Gets the class inherited classes.
@@ -5549,6 +5573,7 @@ void ModelWidgetContainer::addModelWidget(ModelWidget *pModelWidget, bool checkP
       pModelWidget->getDiagramViewToolButton()->setChecked(true);
     }
   }
+  pModelWidget->updateViewButtonsBasedOnAccess();
   if (!checkPreferedView || pModelWidget->getLibraryTreeItem()->getLibraryType() != LibraryTreeItem::Modelica) {
     return;
   }
@@ -5581,6 +5606,7 @@ void ModelWidgetContainer::addModelWidget(ModelWidget *pModelWidget, bool checkP
       }
     }
   }
+  pModelWidget->updateViewButtonsBasedOnAccess();
 }
 
 /*!

diff --git a/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.h b/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.h
@@ -413,6 +413,7 @@ class ModelWidget : public QWidget
   bool writeVisualXMLFile(QString fileName, bool canWriteVisualXMLFile = false);
   void beginMacro(const QString &text);
   void endMacro();
+  void updateViewButtonsBasedOnAccess();
 private:
   ModelWidgetContainer *mpModelWidgetContainer;
   LibraryTreeItem *mpLibraryTreeItem;