X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FConfig%2FConfig_WidgetReader.cpp;h=4899fe190ecfc05b38e33a07e3838fa12ea46f33;hb=ea9b3a766e6401626c170e3ae5f591f67af22271;hp=7ba92f9961f5f6b7a5d7e08f4e2fd54ff1e8b29d;hpb=e2e9a14b1e74a37bf804b665c728ab71cc2f6e26;p=modules%2Fshaper.git

diff --git a/src/Config/Config_WidgetReader.cpp b/src/Config/Config_WidgetReader.cpp
index 7ba92f996..4899fe190 100644
--- a/src/Config/Config_WidgetReader.cpp
+++ b/src/Config/Config_WidgetReader.cpp
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 /*
  * Config_WidgetReader.cpp
  *
@@ -14,11 +16,12 @@
 #include <libxml/xpath.h>
 #include <libxml/xmlstring.h>
 
+#include <list>
+
 #ifdef _DEBUG
 #include <iostream>
 #endif
 
-
 Config_WidgetReader::Config_WidgetReader(const std::string& theXmlFile)
     : Config_XMLReader(theXmlFile)
 
@@ -39,13 +42,12 @@ std::string Config_WidgetReader::featureDescription(const std::string& theFeatur
   return myDescriptionCache[theFeatureName];
 }
 
-
 void Config_WidgetReader::processNode(xmlNodePtr theNode)
 {
   if (isNode(theNode, NODE_FEATURE, NULL)) {
-    std::string aNodeName = getProperty(theNode, _ID);
-    myWidgetCache[aNodeName] = dumpNode(theNode);;
-    myDescriptionCache[aNodeName] = getProperty(theNode, FEATURE_TEXT);
+    myCurrentFeature = getProperty(theNode, _ID);
+    myWidgetCache[myCurrentFeature] = dumpNode(theNode);
+    myDescriptionCache[myCurrentFeature] = getProperty(theNode, FEATURE_TEXT);
   }
   //Process SOURCE nodes.
   Config_XMLReader::processNode(theNode);
@@ -53,7 +55,40 @@ void Config_WidgetReader::processNode(xmlNodePtr theNode)
 
 bool Config_WidgetReader::processChildren(xmlNodePtr theNode)
 {
-  return isNode(theNode, NODE_WORKBENCH, NODE_GROUP, NULL);
+  //Read all nodes recursively, source and validator nodes have no children
+  return !isNode(theNode, NODE_VALIDATOR,
+                          NODE_SELFILTER,
+                          NODE_SOURCE, NULL);
+}
+
+void Config_WidgetReader::resolveSourceNodes(xmlNodePtr theNode)
+{
+  xmlNodePtr aNode = xmlFirstElementChild(theNode);
+  std::list<xmlNodePtr> aSourceNodes;
+  while (aNode != NULL) {
+    if (isNode(aNode, NODE_SOURCE, NULL)) {
+      Config_XMLReader aSourceReader = Config_XMLReader(getProperty(aNode, SOURCE_FILE));
+      xmlNodePtr aSourceRoot = aSourceReader.findRoot();
+      if (!aSourceRoot) {
+        continue;
+      }
+      xmlNodePtr aSourceNode = xmlFirstElementChild(aSourceRoot);
+      xmlNodePtr aTargetNode = xmlDocCopyNodeList(aNode->doc, aSourceNode);
+      while (aTargetNode != NULL) {
+        xmlNodePtr aNextNode = xmlNextElementSibling(aTargetNode);
+        xmlAddPrevSibling(aNode, aTargetNode);
+        aTargetNode = aNextNode;
+      }
+      aSourceNodes.push_back(aNode);
+    }
+    aNode = xmlNextElementSibling(aNode);
+  }
+  //Remove "SOURCE" node.
+  std::list<xmlNodePtr>::iterator it = aSourceNodes.begin();
+  for (; it != aSourceNodes.end(); it++) {
+    xmlUnlinkNode(*it);
+    xmlFreeNode(*it);
+  }
 }
 
 std::string Config_WidgetReader::dumpNode(xmlNodePtr theNode)
@@ -62,16 +97,11 @@ std::string Config_WidgetReader::dumpNode(xmlNodePtr theNode)
   if (!hasChild(theNode)) {
     return result;
   }
-  xmlNodePtr aChildrenNode = xmlFirstElementChild(theNode);
+  //Replace all "source" nodes with content;
+  resolveSourceNodes(theNode);
   xmlBufferPtr buffer = xmlBufferCreate();
-  if (isNode(aChildrenNode, NODE_SOURCE, NULL)) {
-    Config_XMLReader aSourceReader = 
-      Config_XMLReader(getProperty(aChildrenNode, SOURCE_FILE));
-    xmlNodePtr aSourceRoot = aSourceReader.findRoot();
-    int size = xmlNodeDump(buffer, aSourceRoot->doc, aSourceRoot, 0, 1);
-  } else {
-    int size = xmlNodeDump(buffer, theNode->doc, theNode, 0, 1);
-  }
+  int size = xmlNodeDump(buffer, theNode->doc, theNode, 0, 0);
   result = std::string((char*) (buffer->content));
+  xmlBufferFree(buffer);
   return result;
 }