Fix for the issue #2753 : error when dump/load script

[modules/shaper.git] / src / Config / Config_Common.cpp

diff --git a/src/Config/Config_Common.cpp b/src/Config/Config_Common.cpp
index cb866a7d55dbca72facd4af0cd0c8c825b8f3d0d..c83a33079f7df2bae5bbb7ee56fa48609e9e2e28 100644 (file)
--- a/src/Config/Config_Common.cpp
+++ b/src/Config/Config_Common.cpp
@@ -1,11 +1,22 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-/*
- * Config_Common.cpp
- *
- *  Created on: Apr 17, 2014
- *      Author: sbh
- */
+// Copyright (C) 2014-2017  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<mailto:webmaster.salome@opencascade.com>
+//
 
 #include "Config_Common.h"
 #include <Config_Keywords.h>
@@ -57,11 +68,12 @@ bool isAttributeNode(xmlNodePtr theNode)
   // it's parent is "feature" or "source" or page ("case" or "box")
   if(!hasParent(theNode, NODE_FEATURE, NODE_SOURCE,
                          WDG_GROUP, WDG_OPTIONALBOX,
-                         WDG_TOOLBOX_BOX, WDG_SWITCH_CASE, NULL))
+                         WDG_TOOLBOX_BOX, WDG_RADIOBOX_ITEM,
+                         WDG_SWITCH_CASE, NULL))
     return false;
 
   //it should not be a "source" or a "validator" node
-  bool isLogical = isNode(theNode, NODE_SOURCE, NODE_VALIDATOR, NODE_SELFILTER, NULL);
+  bool isLogical = isNode(theNode, NODE_SOURCE, NODE_VALIDATOR, NULL);
   // here must be only widgets not connected to attributes
   bool isPagedContainer = isNode(theNode, WDG_TOOLBOX_BOX,
                                           WDG_GROUP,
@@ -75,11 +87,11 @@ bool isWidgetNode(xmlNodePtr theNode)
     return false;
   // it's parent is "feature" or "source" or a page ("box", "case")
   if(!hasParent(theNode, NODE_FEATURE, NODE_SOURCE, WDG_GROUP, WDG_OPTIONALBOX,
-                         WDG_TOOLBOX_BOX, WDG_SWITCH_CASE, NULL))
+    WDG_TOOLBOX_BOX, WDG_RADIOBOX_ITEM, WDG_SWITCH_CASE, NULL))
     return false;
 
   //it should not be a "source" or a "validator" node
-  return !isNode(theNode, NODE_SOURCE, NODE_VALIDATOR, NODE_SELFILTER, NULL);
+  return !isNode(theNode, NODE_SOURCE, NODE_VALIDATOR, NULL);
 }
 
 // widget api?
@@ -88,7 +100,8 @@ bool isCaseNode(xmlNodePtr theNode)
   if(!isElementNode(theNode))
     return false;
 
-  return isNode(theNode, WDG_OPTIONALBOX, WDG_SWITCH_CASE, WDG_TOOLBOX_BOX, NULL);
+  return isNode(theNode, WDG_OPTIONALBOX, WDG_SWITCH_CASE, WDG_TOOLBOX_BOX,
+    WDG_RADIOBOX_ITEM, NULL);
 }
 
 bool hasChild(xmlNodePtr theNode)