X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FConfig%2FConfig_WidgetReader.cpp;h=4a6590c68a20446a7300d17e4da827ca498b5730;hb=3f1a42a51c7de1911c75453ff7134593d7d2c6b1;hp=4899fe190ecfc05b38e33a07e3838fa12ea46f33;hpb=3874b57fe5aba25ff5aee2a07654fc23c1ee8eb0;p=modules%2Fshaper.git

diff --git a/src/Config/Config_WidgetReader.cpp b/src/Config/Config_WidgetReader.cpp
index 4899fe190..4a6590c68 100644
--- a/src/Config/Config_WidgetReader.cpp
+++ b/src/Config/Config_WidgetReader.cpp
@@ -45,9 +45,9 @@ std::string Config_WidgetReader::featureDescription(const std::string& theFeatur
 void Config_WidgetReader::processNode(xmlNodePtr theNode)
 {
   if (isNode(theNode, NODE_FEATURE, NULL)) {
-    myCurrentFeature = getProperty(theNode, _ID);
-    myWidgetCache[myCurrentFeature] = dumpNode(theNode);
-    myDescriptionCache[myCurrentFeature] = getProperty(theNode, FEATURE_TEXT);
+    std::string aFeature = getProperty(theNode, _ID);
+    myWidgetCache[aFeature] = dumpNode(theNode);
+    myDescriptionCache[aFeature] = getProperty(theNode, FEATURE_TEXT);
   }
   //Process SOURCE nodes.
   Config_XMLReader::processNode(theNode);
@@ -69,17 +69,16 @@ void Config_WidgetReader::resolveSourceNodes(xmlNodePtr theNode)
     if (isNode(aNode, NODE_SOURCE, NULL)) {
       Config_XMLReader aSourceReader = Config_XMLReader(getProperty(aNode, SOURCE_FILE));
       xmlNodePtr aSourceRoot = aSourceReader.findRoot();
-      if (!aSourceRoot) {
-        continue;
+      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);
       }
-      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);
   }
@@ -95,6 +94,14 @@ std::string Config_WidgetReader::dumpNode(xmlNodePtr theNode)
 {
   std::string result = "";
   if (!hasChild(theNode)) {
+    // feature which has the next property should be dumped itself
+    std::string anOwnPanel = getProperty(theNode, PROPERTY_PANEL_ID);
+    if (!anOwnPanel.empty()) {
+      xmlBufferPtr buffer = xmlBufferCreate();
+      int size = xmlNodeDump(buffer, theNode->doc, theNode, 0, 0);
+      result = std::string((char*) (buffer->content));
+      xmlBufferFree(buffer);
+    }
     return result;
   }
   //Replace all "source" nodes with content;