- Documentation annotation fixes.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@10513 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Nov 15, 2011 · 12b5354 · 12b5354
1 parent 29b57cc
commit 12b5354
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/OMEdit/OMEditGUI/DocumentationWidget.cpp b/OMEdit/OMEditGUI/DocumentationWidget.cpp
@@ -223,8 +223,8 @@ DocumentationViewer::DocumentationViewer(DocumentationWidget *pParent)
     QString baseUrl = QString(Helper::OpenModelicaLibrary).replace("\\", "/").append("/Modelica ").append(versionStr).append("/Images/");
     setBaseUrl(baseUrl);
     // set page font settings
-    //settings()->setFontFamily(QWebSettings::StandardFont, "Verdana");
-    //settings()->setFontSize(QWebSettings::DefaultFontSize, 10);
+    settings()->setFontFamily(QWebSettings::StandardFont, "Verdana");
+    settings()->setFontSize(QWebSettings::DefaultFontSize, 10);
     // set page links settings
     page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
 

diff --git a/OMEdit/OMEditGUI/OMCProxy.cpp b/OMEdit/OMEditGUI/OMCProxy.cpp
@@ -1251,7 +1251,26 @@ QString OMCProxy::getDocumentationAnnotation(QString className)
     {
         sendCommand(expression);
         expressionResult = getResult();
-        QStringList lst = StringHandler::unparseStrings(expressionResult);
+        QStringList lst;
+        QStringList docsList = StringHandler::getStrings(StringHandler::removeFirstLastCurlBrackets(expressionResult));
+        foreach (QString docString, docsList)
+        {
+          docString = StringHandler::removeFirstLastCurlBrackets(docString);
+          if (docString.startsWith("info"))
+          {
+            docString = docString.mid(QString("info").length());
+            docString = StringHandler::removeFirstLastBrackets(docString);
+            docString = StringHandler::unparse(docString);
+            lst.append(docString);
+          }
+          else if (docString.startsWith("revisions"))
+          {
+            docString = docString.mid(QString("revisions").length());
+            docString = StringHandler::removeFirstLastBrackets(docString);
+            docString = StringHandler::unparse(docString);
+            lst.append(docString);
+          }
+        }
         QString doc;
         foreach (QString expressionResult, lst) {
             expressionResult = expressionResult.replace("Modelica://", "Modelica:/");