Changeset 13954

Timestamp:

2012-11-19T02:05:30+01:00 (11 years ago)

Author:

hubert.thieriot

Message:

• small omc function call improvment

Location:

trunk/OMOptim

Files:

• Core/OMC/MOomc.cpp (modified) (1 diff)
• GUI/Widgets/WidgetModelsList.cpp (modified) (1 diff)

trunk/OMOptim/Core/OMC/MOomc.cpp

@@ -443 +443 @@
     InfoSender::instance()->sendNormal("Instantiating model "+modelName);
     QString flatcmd = "instantiateModel("+modelName+")";
-    QString flattened = evalCommand(flatcmd);
-
+    QString errorString;
+    QString flattened = evalCommand(flatcmd,errorString);
+
+    if(flattened=="\"\"")
+        flattened.clear();
+
+    if(!errorString.isEmpty() && !flattened.isEmpty())
+        InfoSender::instance()->sendWarning("Instantiating model warned ["+modelName+"]");
+    else  if(!errorString.isEmpty() && flattened.isEmpty())
+        InfoSender::instance()->sendError("Instantiating model failed ["+modelName+"]");
+    else
+        InfoSender::instance()->sendNormal("Instantiating model successful ["+modelName+"]");
 
     return flattened;

trunk/OMOptim/GUI/Widgets/WidgetModelsList.cpp

@@ -79 +79 @@
 void WidgetModelsList::addModels(QStringList list)
 {
-
+    bool addedOk;
     for(int i=0;i<list.size();i++)
     {
-        if(!_problem->models().contains(list.at(i)))
-        {
-            _ui->filesList->addItem(list.at(i));
-            _problem->addModel(list.at(i));
-        }
+        _problem->addModel(list.at(i));
     }
 }