Add class annotation for new classes.

OpenModelica · Oct 22, 2015 · 49a4408 · 49a4408
1 parent 981224e
commit 49a4408
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 12 deletions.
diff --git a/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp b/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp
@@ -1482,7 +1482,7 @@ LibraryTreeItem* LibraryTreeModel::getLibraryTreeItemFromFile(QString fileName,
  * \param text
  * \param show
  */
-void LibraryTreeModel::showModelWidget(LibraryTreeItem *pLibraryTreeItem, QString text, bool show, bool newModel)
+void LibraryTreeModel::showModelWidget(LibraryTreeItem *pLibraryTreeItem, QString text, bool show)
 {
   QApplication::setOverrideCursor(Qt::WaitCursor);
   if (show) {
@@ -1501,7 +1501,7 @@ void LibraryTreeModel::showModelWidget(LibraryTreeItem *pLibraryTreeItem, QStrin
       pLibraryTreeItem->getModelWidget()->hide();
     }
   } else {
-    ModelWidget *pModelWidget = new ModelWidget(pLibraryTreeItem, mpLibraryWidget->getMainWindow()->getModelWidgetContainer(), text, newModel);
+    ModelWidget *pModelWidget = new ModelWidget(pLibraryTreeItem, mpLibraryWidget->getMainWindow()->getModelWidgetContainer(), text);
     pLibraryTreeItem->setModelWidget(pModelWidget);
     pLibraryTreeItem->getModelWidget()->setWindowTitle(pLibraryTreeItem->getNameStructure() + (pLibraryTreeItem->isSaved() ? "" : "*"));
     if (show) {

diff --git a/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.h b/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.h
@@ -240,7 +240,7 @@ class LibraryTreeModel : public QAbstractItemModel
   void loadLibraryTreeItemPixmap(LibraryTreeItem *pLibraryTreeItem);
   void loadDependentLibraries(QStringList libraries);
   LibraryTreeItem* getLibraryTreeItemFromFile(QString fileName, int lineNumber);
-  void showModelWidget(LibraryTreeItem *pLibraryTreeItem, QString text = QString(""), bool show = true, bool newModel = false);
+  void showModelWidget(LibraryTreeItem *pLibraryTreeItem, QString text = QString(""), bool show = true);
   void showHideProtectedClasses();
   bool unloadClass(LibraryTreeItem *pLibraryTreeItem, bool askQuestion = true);
   bool unloadTLMOrTextFile(LibraryTreeItem *pLibraryTreeItem, bool askQuestion = true);

diff --git a/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp b/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp
@@ -2203,7 +2203,7 @@ void WelcomePageWidget::openLatestNewsItem(QListWidgetItem *pItem)
   QDesktopServices::openUrl(url);
 }
 
-ModelWidget::ModelWidget(LibraryTreeItem* pLibraryTreeItem, ModelWidgetContainer *pModelWidgetContainer, QString text, bool newModel)
+ModelWidget::ModelWidget(LibraryTreeItem* pLibraryTreeItem, ModelWidgetContainer *pModelWidgetContainer, QString text)
   : QWidget(pModelWidgetContainer), mpModelWidgetContainer(pModelWidgetContainer), mpLibraryTreeItem(pLibraryTreeItem),
     mloadWidgetComponents(false), mReloadNeeded(false)
 {
@@ -2224,11 +2224,6 @@ ModelWidget::ModelWidget(LibraryTreeItem* pLibraryTreeItem, ModelWidgetContainer
     connect(mpUndoStack, SIGNAL(canUndoChanged(bool)), SLOT(handleCanUndoChanged(bool)));
     connect(mpUndoStack, SIGNAL(canRedoChanged(bool)), SLOT(handleCanRedoChanged(bool)));
     mpUndoView = new QUndoView(mpUndoStack);
-    if (newModel) {
-      mpIconGraphicsView->addClassAnnotation(false);
-      mpDiagramGraphicsView->addClassAnnotation(false);
-      updateModelicaText();
-    }
     loadModelWidget();
     mpEditor = 0;
   } else {

diff --git a/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.h b/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.h
@@ -326,7 +326,7 @@ class ModelWidget : public QWidget
 {
   Q_OBJECT
 public:
-  ModelWidget(LibraryTreeItem* pLibraryTreeItem, ModelWidgetContainer *pModelWidgetContainer, QString text, bool newModel);
+  ModelWidget(LibraryTreeItem* pLibraryTreeItem, ModelWidgetContainer *pModelWidgetContainer, QString text);
 
   class InheritedClass : public QObject
   {

diff --git a/OMEdit/OMEditGUI/Modeling/ModelicaClassDialog.cpp b/OMEdit/OMEditGUI/Modeling/ModelicaClassDialog.cpp
@@ -353,15 +353,19 @@ void ModelicaClassDialog::createModelicaClass()
   bool wasNonExisting = false;
   pLibraryTreeItem = pLibraryTreeModel->createLibraryTreeItem(mpNameTextBox->text().trimmed(), pParentLibraryTreeItem, wasNonExisting, false, false, true);
   pLibraryTreeItem->setSaveContentsType(mpSaveContentsInOneFileCheckBox->isChecked() ? LibraryTreeItem::SaveInOneFile : LibraryTreeItem::SaveFolderStructure);
-  pLibraryTreeModel->updateLibraryTreeItemClassText(pLibraryTreeItem);
   if (wasNonExisting) {
     // load the LibraryTreeItem pixmap
     pLibraryTreeModel->loadLibraryTreeItemPixmap(pLibraryTreeItem);
     pLibraryTreeModel->loadNonExistingLibraryTreeItem(pLibraryTreeItem);
   }
   pLibraryTreeItem->setExpanded(true);
   // show the ModelWidget
-  pLibraryTreeModel->showModelWidget(pLibraryTreeItem, "", true, true);
+  pLibraryTreeModel->showModelWidget(pLibraryTreeItem, "", true);
+  if (pLibraryTreeItem->getModelWidget()) {
+    pLibraryTreeItem->getModelWidget()->getIconGraphicsView()->addClassAnnotation(false);
+    pLibraryTreeItem->getModelWidget()->getDiagramGraphicsView()->addClassAnnotation(false);
+    pLibraryTreeItem->getModelWidget()->updateModelicaText();
+  }
   accept();
 }