- OMEdit: Check getErrorString() after loadModel()

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@10124 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: sjoelund

OMEdit/OMEditGUI/LibraryWidget.cpp

@@ -621,12 +621,8 @@ void LibraryTree::createActions()
 void LibraryTree::addModelicaStandardLibrary()
 {
     // load Modelica Standard Library.
-    QStringList failed;
-    mpParentLibraryWidget->mpParentMainWindow->mpOMCProxy->loadStandardLibrary(failed);
+    mpParentLibraryWidget->mpParentMainWindow->mpOMCProxy->loadStandardLibrary();
 
-    foreach (QString lib, failed) {
-        mpParentLibraryWidget->mpParentMainWindow->mpMessageWidget->printGUIErrorMessage(QString("Failed to load library " + lib));
-    }
     QStringList libs = mpParentLibraryWidget->mpParentMainWindow->mpOMCProxy->getClassNames("");
     libs.sort();
     foreach (QString lib, libs) {

OMEdit/OMEditGUI/OMCProxy.cpp

@@ -449,13 +449,7 @@ void OMCProxy::restartApplication()
 QString OMCProxy::getErrorString()
 {
     sendCommand("getErrorString()");
-    if (getResult().size() > 3)
-        return getResult();
-    else
-    {
-        setResult(tr(""));
-        return getResult();
-    }
+    return StringHandler::unparse(getResult());
 }
 
 QString OMCProxy::getVersion()
@@ -511,7 +505,7 @@ QString OMCProxy::getEnvironmentVar(QString name)
 }
 
 //! Loads the OpenModelica Standard Library.
-void OMCProxy::loadStandardLibrary(QStringList &failed)
+void OMCProxy::loadStandardLibrary()
 {
     QSettings settings(QSettings::IniFormat, QSettings::UserScope, "openmodelica", "omedit");
 
@@ -532,7 +526,12 @@ void OMCProxy::loadStandardLibrary(QStringList &failed)
         QString command = "loadModel(" + lib + ",{\"" + version + "\"})";
         sendCommand(command);
         if (!StringHandler::unparseBool(getResult())) {
-            failed.prepend(lib);
+          mpParentMainWindow->mpMessageWidget->printGUIErrorMessage(getErrorString());
+        } else {
+          QString str = getErrorString();
+          if (str.size()) {
+            mpParentMainWindow->mpMessageWidget->printGUIWarningMessage(str);
+          }
         }
     }
 

OMEdit/OMEditGUI/OMCProxy.h

@@ -96,7 +96,7 @@ class OMCProxy : public QObject
     QString getAnnotationVersion();
     bool setEnvironmentVar(QString name, QString value);
     QString getEnvironmentVar(QString name);
-    void loadStandardLibrary(QStringList &failed);
+    void loadStandardLibrary();
     QStringList getClassNames(QString className = QString());
     QStringList getClassNamesRecursive(QString className);
     QStringList getClassInformation(QString modelName);