X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FConfig%2FConfig_ValidatorReader.cpp;h=ffa0256128d99a50c51849e818a1b64e38cfc5cc;hb=deed7a286b0da886e8ef021a572814abf5a9d3b8;hp=ef969cd55c06483042d92b18588ae955ac454025;hpb=c7ed89ce495c3b8ef952f4afd45da259618d80ca;p=modules%2Fshaper.git

diff --git a/src/Config/Config_ValidatorReader.cpp b/src/Config/Config_ValidatorReader.cpp
index ef969cd55..ffa025612 100644
--- a/src/Config/Config_ValidatorReader.cpp
+++ b/src/Config/Config_ValidatorReader.cpp
@@ -1,21 +1,29 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-/*
- * Config_ValidatorReader.cpp
- *
- *  Created on: Mar 20, 2015
- *      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_ValidatorReader.h>
 #include <Config_Keywords.h>
 #include <Config_Common.h>
 #include <Config_ValidatorMessage.h>
-#include <Config_SelectionFilterMessage.h>
 #include <Config_PropManager.h>
 
 #include <Events_Loop.h>
-#include <Events_Error.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
@@ -25,8 +33,8 @@
 #include <iostream>
 #endif
 
-Config_ValidatorReader::Config_ValidatorReader(const std::string& theXmlFileName)
-: Config_XMLReader(theXmlFileName)
+Config_ValidatorReader::Config_ValidatorReader(const std::string& theXmlFileName, bool isXMLContent)
+: Config_XMLReader(theXmlFileName, isXMLContent)
 {
 }
 
@@ -38,8 +46,6 @@ void Config_ValidatorReader::processNode(xmlNodePtr theNode)
 {
   if (isNode(theNode, NODE_VALIDATOR, NULL)) {
     processValidator(theNode);
-  } else if (isNode(theNode, NODE_SELFILTER, NULL)) {
-    processSelectionFilter(theNode);
   } else if (isNode(theNode, NODE_FEATURE, NULL)) {
     storeAttribute(theNode, _ID);
   } else if (isWidgetNode(theNode)) {
@@ -71,7 +77,7 @@ void Config_ValidatorReader::processValidator(xmlNodePtr theNode)
 {
   Events_ID aValidatoEvent = Events_Loop::eventByName(EVENT_VALIDATOR_LOADED);
   Events_Loop* aEvLoop = Events_Loop::loop();
-  std::shared_ptr<Config_ValidatorMessage> 
+  std::shared_ptr<Config_ValidatorMessage>
     aMessage(new Config_ValidatorMessage(aValidatoEvent, this));
   std::string aValidatorId;
   std::list<std::string> aParameters;
@@ -79,27 +85,8 @@ void Config_ValidatorReader::processValidator(xmlNodePtr theNode)
   aMessage->setValidatorId(aValidatorId);
   aMessage->setValidatorParameters(aParameters);
   std::string aFeatureId = restoreAttribute(NODE_FEATURE, _ID);
-  aMessage->setFeatureId(aFeatureId);
-  // parent is attribute (widget)
-  if (!myCurrentWidget.empty()) {
-    std::string aParentId = restoreAttribute(myCurrentWidget.c_str(), _ID);
-    aMessage->setAttributeId(aParentId);
-  }
-  aEvLoop->send(aMessage);
-}
-
-void Config_ValidatorReader::processSelectionFilter(xmlNodePtr theNode)
-{
-  Events_ID aFilterEvent = Events_Loop::eventByName(EVENT_SELFILTER_LOADED);
-  Events_Loop* aEvLoop = Events_Loop::loop();
-  std::shared_ptr<Config_SelectionFilterMessage> aMessage =
-      std::make_shared<Config_SelectionFilterMessage>(aFilterEvent, this);
-  std::string aSelectionFilterId;
-  std::list<std::string> aParameters;
-  getParametersInfo(theNode, aSelectionFilterId, aParameters);
-  aMessage->setSelectionFilterId(aSelectionFilterId);
-  aMessage->setFilterParameters(aParameters);
-  std::string aFeatureId = restoreAttribute(NODE_FEATURE, _ID);
+  if (aFeatureId.length() == 0)
+    aFeatureId = myExtFeatureId;
   aMessage->setFeatureId(aFeatureId);
   // parent is attribute (widget)
   if (!myCurrentWidget.empty()) {