Read the default value

Fixed the annotation completer icon path Made the auto complete case insensitive Belonging to [master]: - #115
OpenModelica · Apr 8, 2019 · f461d84 · f461d84
1 parent fdc07bf
commit f461d84
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/OMEdit/OMEdit/OMEditGUI/Editors/BaseEditor.cpp b/OMEdit/OMEdit/OMEditGUI/Editors/BaseEditor.cpp
@@ -693,7 +693,7 @@ PlainTextEdit::PlainTextEdit(BaseEditor *pBaseEditor)
   pSortFilterProxyModel->sort(0,Qt::AscendingOrder);
   mpCompleter = new QCompleter(this);
   mpCompleter->setModel(pSortFilterProxyModel);
-  mpCompleter->setCaseSensitivity(Qt::CaseSensitive);
+  mpCompleter->setCaseSensitivity(Qt::CaseInsensitive);
   mpCompleter->setWrapAround(false);
   mpCompleter->setWidget(this);
   mpCompleter->setCompletionMode(QCompleter::PopupCompletion);

diff --git a/OMEdit/OMEdit/OMEditGUI/Editors/ModelicaEditor.cpp b/OMEdit/OMEdit/OMEditGUI/Editors/ModelicaEditor.cpp
@@ -246,7 +246,9 @@ void ModelicaEditor::getCompletionAnnotations(const QStringList &stack, QList<Co
       QList<ComponentInfo *> components = pAnnotation->getComponentsList();
       for (int i = 0; i < components.size(); ++i) {
         QString componentName = components[i]->getName();
-        annotations << CompleterItem(componentName, componentName + " = ", componentName, components[i]->getHTMLDescription());
+        QString componentValue = components[i]->getParameterValue(MainWindow::instance()->getOMCProxy(), pAnnotation->getNameStructure());
+        annotations << CompleterItem(componentName, QString("%1 = %2").arg(componentName, componentValue), componentName,
+                                     components[i]->getHTMLDescription());
       }
     }
   }

diff --git a/OMEdit/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp b/OMEdit/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp
@@ -672,8 +672,9 @@ LibraryTreeItem *LibraryTreeItem::getDirectComponentsClass(const QString &name)
 {
   QList<LibraryTreeItem*> children = childrenItems();
   for (int i = 0; i < children.size(); ++i) {
-    if (children[i]->getName() == name)
+    if (children[i]->getName() == name) {
       return children[i];
+    }
   }
   const QList<ComponentInfo*> &components = getComponentsList();
   for (int i = 0; i < components.size(); ++i) {

diff --git a/...I/Resources/icons/completerAnnotation.svg → ...I/Resources/icons/completerAnnotation.svg b/...I/Resources/icons/completerAnnotation.svg → ...I/Resources/icons/completerAnnotation.svg