X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FConfig%2FConfig_WidgetReader.cpp;h=5b785a55c22ad515e677ac47eaf06a7546ff142c;hb=adf26479b37f6238c3fd33b7da5f37dd57b68b00;hp=4899fe190ecfc05b38e33a07e3838fa12ea46f33;hpb=38afbd899a8645c83e17f2c24a17a2b7414911b4;p=modules%2Fshaper.git

diff --git a/src/Config/Config_WidgetReader.cpp b/src/Config/Config_WidgetReader.cpp
index 4899fe190..5b785a55c 100644
--- a/src/Config/Config_WidgetReader.cpp
+++ b/src/Config/Config_WidgetReader.cpp
@@ -1,11 +1,21 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-/*
- * Config_WidgetReader.cpp
- *
- *  Created on: Apr 2, 2014
- *      Author: sbh
- */
+// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <Config_WidgetReader.h>
 #include <Config_Keywords.h>
@@ -45,9 +55,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);
@@ -57,7 +67,6 @@ bool Config_WidgetReader::processChildren(xmlNodePtr theNode)
 {
   //Read all nodes recursively, source and validator nodes have no children
   return !isNode(theNode, NODE_VALIDATOR,
-                          NODE_SELFILTER,
                           NODE_SOURCE, NULL);
 }
 
@@ -69,17 +78,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;
-      }
-      xmlNodePtr aSourceNode = xmlFirstElementChild(aSourceRoot);
-      xmlNodePtr aTargetNode = xmlDocCopyNodeList(aNode->doc, aSourceNode);
-      while (aTargetNode != NULL) {
-        xmlNodePtr aNextNode = xmlNextElementSibling(aTargetNode);
-        xmlAddPrevSibling(aNode, aTargetNode);
-        aTargetNode = aNextNode;
+      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);
       }
-      aSourceNodes.push_back(aNode);
     }
     aNode = xmlNextElementSibling(aNode);
   }
@@ -95,6 +103,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;