- Read the nested equations indexes for the nonlinear equation.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@18825 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jan 28, 2014 · a977dfc · a977dfc
1 parent 8dd8228
commit a977dfc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/OMEdit/OMEditGUI/Util/OMDumpXML.cpp b/OMEdit/OMEditGUI/Util/OMDumpXML.cpp
@@ -270,6 +270,7 @@ OMEquation::OMEquation(const OMEquation &eq)
     else
       ops.append(new OMOperation(*op));
   }
+  eqs = eq.eqs;
 }
 
 OMEquation::~OMEquation() {
@@ -357,6 +358,9 @@ bool MyHandler::startElement( const QString & namespaceURI, const QString & loca
     currentEquation.depends.clear();
     currentEquation.index = atts.value("index").toLong();
     currentEquation.kind = currentKind;
+    nestedEquations.clear();
+  } else if (qName == "eq") {
+    nestedEquations.append(atts.value("index").toLong());
   } else if (qName == "equations" ||
              qName == "jacobian-equations") {
     currentKind = regular;
@@ -400,6 +404,7 @@ bool MyHandler::endElement( const QString & namespaceURI, const QString & localN
   } else if (qName == "equation") {
     currentEquation.info = currentInfo;
     currentEquation.ops = operations;
+    currentEquation.eqs = nestedEquations;
     operations.clear();
     if (currentEquation.index != equations.size()) {
       printf("failing: %d expect %d\n", currentEquation.index, equations.size()+1);

diff --git a/OMEdit/OMEditGUI/Util/OMDumpXML.h b/OMEdit/OMEditGUI/Util/OMDumpXML.h
@@ -177,6 +177,7 @@ struct OMEquation {
   QStringList defines;
   QStringList depends;
   QList<OMOperation*> ops;
+  QList<int> eqs;
   OMEquation();
   OMEquation(const OMEquation& eq);
   ~OMEquation();
@@ -193,6 +194,7 @@ class MyHandler : private QXmlDefaultHandler {
 private:
   OMVariable currentVariable;
   OMEquation currentEquation;
+  QList<int> nestedEquations;
   OMInfo currentInfo;
   OMEquationType currentKind;
   QString currentText;