Changeset 616b347 in OpenModelica

Timestamp:

2016-02-04T16:44:24+01:00 (8 years ago)

Author:

Adeel Asghar <adeel.asghar@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

71c196d

Parents:

83d8885

Message:

Fixes #3665. Added component comment to the tooltip.

Location:

OMEdit/OMEditGUI

Files:

• Component/Component.cpp (modified) (6 diffs)
• Component/Component.h (modified) (2 diffs)
• Component/ComponentProperties.cpp (modified) (1 diff)
• Modeling/Commands.cpp (modified) (2 diffs)

OMEdit/OMEditGUI/Component/Component.cpp

@@ -369 +369 @@
   mpOriginItem = new OriginItem(this);
   createResizerItems();
-  setToolTip(tr("<b>%1</b> %2").arg(mpComponentInfo->getClassName()).arg(mpComponentInfo->getName()));
+  updateToolTip();
   if (mpLibraryTreeItem) {
     connect(mpLibraryTreeItem, SIGNAL(loadedForComponent()), SLOT(handleLoaded()));
@@ -420 +420 @@
   setTransform(mTransformation.getTransformationMatrix());
   mpOriginItem = 0;
-  setToolTip(tr("<b>%1</b> %2<br /><br />Component declared in %3").arg(mpComponentInfo->getClassName()).arg(mpComponentInfo->getName())
-             .arg(mpReferenceComponent->getGraphicsView()->getModelWidget()->getLibraryTreeItem()->getNameStructure()));
+  updateToolTip();
   if (mpLibraryTreeItem) {
     connect(mpLibraryTreeItem, SIGNAL(loadedForComponent()), SLOT(handleLoaded()));
@@ -466 +465 @@
   createResizerItems();
   mpGraphicsView->addItem(this);
-  setToolTip(tr("<b>%1</b> %2<br /><br />Component declared in %3").arg(mpComponentInfo->getClassName()).arg(mpComponentInfo->getName())
-             .arg(mpReferenceComponent->getGraphicsView()->getModelWidget()->getLibraryTreeItem()->getNameStructure()));
+  updateToolTip();
   if (mpLibraryTreeItem) {
     connect(mpLibraryTreeItem, SIGNAL(loadedForComponent()), SLOT(handleLoaded()));
@@ -1393 +1391 @@
 }
 
+/*!
+ * \brief Component::updateToolTip
+ * Updates the Component's tooltip.
+ */
+void Component::updateToolTip()
+{
+  if (mIsInheritedComponent || mComponentType == Component::Port) {
+    setToolTip(tr("<b>%1</b> %2<br/>%3<br /><br />Component declared in %4").arg(mpComponentInfo->getClassName())
+               .arg(mpComponentInfo->getName()).arg(mpComponentInfo->getComment())
+               .arg(mpReferenceComponent->getGraphicsView()->getModelWidget()->getLibraryTreeItem()->getNameStructure()));
+  } else {
+    setToolTip(tr("<b>%1</b> %2<br/>%3").arg(mpComponentInfo->getClassName()).arg(mpComponentInfo->getName()).arg(mpComponentInfo->getComment()));
+  }
+}
+
 void Component::updatePlacementAnnotation()
 {
@@ -1658 +1671 @@
 
 /*!
+ * \brief Component::componentCommentHasChanged
+ * Updates the Component's tooltip when the component comment has changed.
+ */
+void Component::componentCommentHasChanged()
+{
+  updateToolTip();
+  update();
+}
+
+/*!
  * \brief Component::componentNameHasChanged
  * Updates the Component's tooltip when the component name has changed. Emits displayTextChanged signal.
@@ -1663 +1686 @@
 void Component::componentNameHasChanged()
 {
-  if (mIsInheritedComponent || mComponentType == Component::Port) {
-    setToolTip(tr("<b>%1</b> %2<br /><br />Component declared in %3").arg(mpComponentInfo->getClassName())
-               .arg(mpComponentInfo->getName())
-               .arg(mpReferenceComponent->getGraphicsView()->getModelWidget()->getLibraryTreeItem()->getNameStructure()));
-  } else {
-    setToolTip(tr("<b>%1</b> %2").arg(mpComponentInfo->getClassName()).arg(mpComponentInfo->getName()));
-  }
+  updateToolTip();
   displayTextChangedRecursive();
   update();

OMEdit/OMEditGUI/Component/Component.h

@@ -262 +262 @@
   QString getParameterDisplayStringFromExtendsModifiers(QString parameterName);
   QString getParameterDisplayStringFromExtendsParameters(QString parameterName);
+  void updateToolTip();
 signals:
   void added();
@@ -284 +285 @@
   void finishResizeComponent();
   void resizedComponent();
+  void componentCommentHasChanged();
   void componentNameHasChanged();
   void displayTextChangedRecursive();

OMEdit/OMEditGUI/Component/ComponentProperties.cpp

@@ -484 +484 @@
   mpComponentClassCommentLabel = new Label(Helper::comment);
   mpComponentClassCommentTextBox = new Label(mpComponent->getLibraryTreeItem() ? mpComponent->getLibraryTreeItem()->mClassInformation.comment : "");
+  mpComponentClassCommentTextBox->setTextFormat(Qt::RichText);
   QGridLayout *pComponentClassGroupBoxLayout = new QGridLayout;
   pComponentClassGroupBoxLayout->setAlignment(Qt::AlignTop | Qt::AlignLeft);

OMEdit/OMEditGUI/Modeling/Commands.cpp

@@ -377 +377 @@
     if (pOMCProxy->setComponentComment(modelName, mpComponent->getComponentInfo()->getName(), comment)) {
       mpComponent->getComponentInfo()->setComment(comment);
+      mpComponent->componentCommentHasChanged();
+      if (mpComponent->getLibraryTreeItem()->isConnector()) {
+        if (mpComponent->getGraphicsView()->getViewType() == StringHandler::Icon) {
+          Component *pComponent = 0;
+          pComponent = mpComponent->getGraphicsView()->getModelWidget()->getDiagramGraphicsView()->getComponentObject(mpComponent->getName());
+          if (pComponent) {
+            pComponent->componentCommentHasChanged();
+          }
+        } else {
+          Component *pComponent = 0;
+          pComponent = mpComponent->getGraphicsView()->getModelWidget()->getIconGraphicsView()->getComponentObject(mpComponent->getName());
+          if (pComponent) {
+            pComponent->componentCommentHasChanged();
+          }
+        }
+      }
     } else {
       QMessageBox::critical(pModelWidget->getModelWidgetContainer()->getMainWindow(),
@@ -503 +519 @@
     if (pOMCProxy->setComponentComment(modelName, mpComponent->getComponentInfo()->getName(), comment)) {
       mpComponent->getComponentInfo()->setComment(comment);
+      mpComponent->componentCommentHasChanged();
+      if (mpComponent->getLibraryTreeItem()->isConnector()) {
+        if (mpComponent->getGraphicsView()->getViewType() == StringHandler::Icon) {
+          Component *pComponent = 0;
+          pComponent = mpComponent->getGraphicsView()->getModelWidget()->getDiagramGraphicsView()->getComponentObject(mpComponent->getName());
+          if (pComponent) {
+            pComponent->componentCommentHasChanged();
+          }
+        } else {
+          Component *pComponent = 0;
+          pComponent = mpComponent->getGraphicsView()->getModelWidget()->getIconGraphicsView()->getComponentObject(mpComponent->getName());
+          if (pComponent) {
+            pComponent->componentCommentHasChanged();
+          }
+        }
+      }
     } else {
       QMessageBox::critical(pModelWidget->getModelWidgetContainer()->getMainWindow(),