X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FConfig%2FConfig_WidgetReader.cpp;h=25d1fdc65c090722c4dddf32bf36ad88068f4cd3;hb=f7fec0e59ee28ac393cce1143c881b9995ae000f;hp=3558c659652307e27ab1bf6ac314cc1d31bc8121;hpb=401394b2e312e5c4ecd6a410b90eb2c159a675bf;p=modules%2Fshaper.git

diff --git a/src/Config/Config_WidgetReader.cpp b/src/Config/Config_WidgetReader.cpp
index 3558c6596..25d1fdc65 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
  *
@@ -7,17 +9,19 @@
 
 #include <Config_WidgetReader.h>
 #include <Config_Keywords.h>
+#include <Config_Common.h>
+
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+#include <libxml/xpath.h>
+#include <libxml/xmlstring.h>
 
-#include <libxml\parser.h>
-#include <libxml\tree.h>
-#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)
 
@@ -28,22 +32,75 @@ Config_WidgetReader::~Config_WidgetReader()
 {
 }
 
-std::string Config_WidgetReader::featureWidgetCfg(std::string theFeatureName)
+std::string Config_WidgetReader::featureWidgetCfg(const std::string& theFeatureName)
 {
   return myWidgetCache[theFeatureName];
 }
 
+std::string Config_WidgetReader::featureDescription(const std::string& theFeatureName)
+{
+  return myDescriptionCache[theFeatureName];
+}
+
 void Config_WidgetReader::processNode(xmlNodePtr theNode)
 {
   if (isNode(theNode, NODE_FEATURE, NULL)) {
-    xmlBufferPtr buffer = xmlBufferCreate();
-    int size = xmlNodeDump(buffer, theNode->doc, theNode, 0, 1);
-    std::string aNodeName = getProperty(theNode, _ID);
-    myWidgetCache[aNodeName] = std::string((char*) buffer->content);
+    std::string aFeature = getProperty(theNode, _ID);
+    myWidgetCache[aFeature] = dumpNode(theNode);
+    myDescriptionCache[aFeature] = getProperty(theNode, FEATURE_TEXT);
   }
+  //Process SOURCE nodes.
+  Config_XMLReader::processNode(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) {
+        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)
+{
+  std::string result = "";
+  if (!hasChild(theNode)) {
+    return result;
+  }
+  //Replace all "source" nodes with content;
+  resolveSourceNodes(theNode);
+  xmlBufferPtr buffer = xmlBufferCreate();
+  int size = xmlNodeDump(buffer, theNode->doc, theNode, 0, 0);
+  result = std::string((char*) (buffer->content));
+  xmlBufferFree(buffer);
+  return result;
 }