From: sbh <sergey.belash@opencascade.com>
Date: Thu, 24 Apr 2014 12:02:38 +0000 (+0400)
Subject: Merge branch 'master' of newgeom:newgeom.git
X-Git-Tag: V_0.2~118^2~5
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=6654a921211670c15a79a997ca666a174fe8a6f6;p=modules%2Fshaper.git

Merge branch 'master' of newgeom:newgeom.git

Conflicts:
	src/PartSet/PartSet_Module.cpp
---

6654a921211670c15a79a997ca666a174fe8a6f6
diff --cc src/Config/Config_FeatureReader.cpp
index 1b574cfba,229c4cec9..2fd10770e
--- a/src/Config/Config_FeatureReader.cpp
+++ b/src/Config/Config_FeatureReader.cpp
@@@ -36,19 -36,13 +36,19 @@@ Config_FeatureReader::~Config_FeatureRe
  {
  }
  
 +std::list<std::string> Config_FeatureReader::features() const
 +{
 +  return myFeatures;
 +}
 +
  void Config_FeatureReader::processNode(xmlNodePtr theNode)
  {
-   Event_ID aMenuItemEvent = Event_Loop::eventByName(myEventGenerated);
+   Events_ID aMenuItemEvent = Events_Loop::eventByName(myEventGenerated);
    if (isNode(theNode, NODE_FEATURE, NULL)) {
-     Event_Loop* aEvLoop = Event_Loop::loop();
+     Events_Loop* aEvLoop = Events_Loop::loop();
      Config_FeatureMessage aMessage(aMenuItemEvent, this);
      fillFeature(theNode, aMessage);
 +    myFeatures.push_back(getProperty(theNode, _ID));
      //If a feature has xml definition for it's widget:
      aMessage.setUseInput(hasChild(theNode));
      aEvLoop->send(aMessage);
diff --cc src/Config/Config_XMLReader.cpp
index 0ac45babf,3f07973df..e86579ede
--- a/src/Config/Config_XMLReader.cpp
+++ b/src/Config/Config_XMLReader.cpp
@@@ -6,10 -6,8 +6,10 @@@
   */
  
  #include <Config_XMLReader.h>
 +#include <Config_Keywords.h>
 +#include <Config_Common.h>
  
- #include <Event_Loop.h>
+ #include <Events_Loop.h>
  #include <libxml/parser.h>
  #include <libxml/tree.h>
  
@@@ -60,19 -58,16 +60,19 @@@ void Config_XMLReader::readAll(
  
  /*
   * Allows to customize reader's behavior for a node. Virtual.
-  * The default implementation does nothing. (In debug mode prints
+  * The default impl does nothing. (In debug mode prints
   * some info)
   */
 -void Config_XMLReader::processNode(xmlNodePtr aNode)
 +void Config_XMLReader::processNode(xmlNodePtr theNode)
  {
 -#ifdef _DEBUG
 -  std::cout << "Config_XMLReader::processNode: "
 -  << aNode->name << " content: "
 -  << aNode->content << std::endl;
 -#endif
 +  if (isNode(theNode, NODE_SOURCE, NULL)) {
 +    std::string aSourceFile = getProperty(theNode, SOURCE_FILE);
 +    Config_XMLReader aSourceReader = Config_XMLReader(aSourceFile);
 +    readRecursively(aSourceReader.findRoot());
 +    #ifdef _DEBUG
 +    std::cout << "Config_XMLReader::sourced node: " << aSourceFile << std::endl;
 +    #endif
 +  }
  }
  
  /*