Read and display according to new model_info.json file

OpenModelica · Jul 11, 2017 · 3082898 · 3082898
1 parent 375731a
commit 3082898
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/OMEdit/OMEditGUI/TransformationalDebugger/OMDumpXML.cpp b/OMEdit/OMEditGUI/TransformationalDebugger/OMDumpXML.cpp
@@ -249,24 +249,26 @@ QString OMEquation::toString()
 {
   if (tag == "dummy") {
     return "";
-  } else if (tag == "assign") {
+  } else if (tag == "assign" || tag == "torn" || tag == "jacobian") {
     if (text.size()==1) {
-     return QString("%1 := %2").arg(defines[0]).arg(text[0]);
+     return QString("(%1) %2 := %3").arg(tag).arg(defines[0]).arg(text[0]);
     } else {
-     return QString("%1 := %2").arg(text[0]).arg(text[1]);
+     return QString("(%1) %2 := %3").arg(tag).arg(text[0]).arg(text[1]);
     }
   } else if (tag == "statement" || tag == "algorithm") {
     return text.join("\n");
-  } else if (tag == "container") {
+  } else if (tag == "system") {
     return QString("%1, size %2").arg(display).arg(eqs.size());
+  } else if (tag == "tornsystem") {
+    return QString("%1 (torn), unknowns: %2, iteration variables: %3").arg(display).arg(unknowns).arg(defines.size());
   } else if (tag == "nonlinear") {
     return QString("nonlinear, size %1").arg(eqs.size());
   } else if (tag == "linear") {
     return QString("linear, size %1").arg(defines.size());
   } else if (tag == "residual") {
     return "(residual) " + text[0] + " = 0";
   } else {
-    return "(" + display + "): " + text.join(",");
+    return "(" + display + ") " + text.join(",");
   }
 }
 

diff --git a/OMEdit/OMEditGUI/TransformationalDebugger/OMDumpXML.h b/OMEdit/OMEditGUI/TransformationalDebugger/OMDumpXML.h
@@ -183,6 +183,7 @@ struct OMEquation {
   QStringList depends;
   QList<OMOperation*> ops;
   QList<int> eqs;
+  int unknowns;
   OMEquation();
   ~OMEquation();
   QString toString();

diff --git a/OMEdit/OMEditGUI/TransformationalDebugger/TransformationsWidget.cpp b/OMEdit/OMEditGUI/TransformationalDebugger/TransformationsWidget.cpp
@@ -750,8 +750,7 @@ TransformationsWidget::TransformationsWidget(QString infoJSONFullFileName, QWidg
 static QStringList variantListToStringList(const QVariantList lst)
 {
   QStringList strs;
-  foreach(QVariant v, lst){
-    QString s = v.toString();
+  foreach(QVariant v, lst) {
     strs << v.toString().trimmed();
   }
   return strs;
@@ -876,6 +875,7 @@ void TransformationsWidget::loadTransformations()
       } else {
         eq->display = eq->tag;
       }
+      eq->unknowns = veq["unknowns"].toInt();
       QVariantMap sourceMap = veq["source"].toMap();
       variantToSource(veq["source"].toMap(), eq->info, eq->types, eq->ops);
       if (!hasOperationsEnabled && sourceMap.contains("operations")) {