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

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

diff --git a/src/Config/Config_WidgetAPI.cpp b/src/Config/Config_WidgetAPI.cpp
index 214b4bdd5240c2d1280677a42161b677851b2e2f..023ad2868ff8a647c819510b5924cef3e8f8eae5 100644 (file)
--- a/src/Config/Config_WidgetAPI.cpp
+++ b/src/Config/Config_WidgetAPI.cpp
@@ -1,11 +1,22 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-/*
- * Config_WidgetAPI.cpp
- *
- *  Created on: Apr 1, 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_WidgetAPI.h>
 #include <Config_Keywords.h>
@@ -16,10 +27,11 @@
 
 #include <string>
 
-Config_WidgetAPI::Config_WidgetAPI(const std::string& theRawXml)
+Config_WidgetAPI::Config_WidgetAPI(std::string theRawXml)
 {
   myDoc = xmlParseDoc(BAD_CAST theRawXml.c_str());
   myCurrentNode = xmlDocGetRootElement(myDoc);
+  myFeatureId = getProperty(_ID);
 }
 
 Config_WidgetAPI::~Config_WidgetAPI()
@@ -46,11 +58,18 @@ bool Config_WidgetAPI::toNextWidget()
 bool Config_WidgetAPI::toChildWidget()
 {
   if (myCurrentNode && hasChild(myCurrentNode)) {
-    myCurrentNode = myCurrentNode->children;
-    while (myCurrentNode && !isElementNode(myCurrentNode)) {
-      myCurrentNode = myCurrentNode->next;
+    xmlNodePtr aChildNode = myCurrentNode->children;
+    // it is possible that among child nodes, there is no an element node, so
+    // we should not change the current node until not-zero node is found
+    // otherwise, it may happens that the current node is null and the node tree information
+    // is lost
+    while (aChildNode && !isElementNode(aChildNode)) {
+      aChildNode = aChildNode->next;
+    }
+    if (aChildNode != NULL) {
+      myCurrentNode = aChildNode;
+      return true;
     }
-    return myCurrentNode != NULL;
   }
   return false;
 }
@@ -63,29 +82,6 @@ bool Config_WidgetAPI::toParentWidget()
   return myCurrentNode != NULL;
 }
 
-std::list<xmlNodePtr> Config_WidgetAPI::attributes() const
-{
-  std::list<xmlNodePtr> aResult;
-  if (myCurrentNode && hasChild(myCurrentNode)) {
-    xmlNodePtr anAttributesNode = myCurrentNode->children;
-    while (anAttributesNode &&
-           (!isElementNode(anAttributesNode) ||
-            std::string((char *) anAttributesNode->name) != NODE_NAME_ATTRIBUTES)) {
-      anAttributesNode = anAttributesNode->next;
-    }
-    if (anAttributesNode && hasChild(anAttributesNode)) {
-      xmlNodePtr anAttributeNode = anAttributesNode->children;
-      while (anAttributeNode) {
-        if (isElementNode(anAttributeNode) &&
-            std::string((char *) anAttributeNode->name) == NODE_NAME_ATTRIBUTE)
-          aResult.push_back(anAttributeNode);
-        anAttributeNode = anAttributeNode->next;
-      }
-    }
-  }
-  return aResult;
-}
-
 std::string Config_WidgetAPI::widgetType() const
 {
   std::string result = "";
@@ -97,13 +93,13 @@ std::string Config_WidgetAPI::widgetType() const
 
 bool Config_WidgetAPI::isGroupBoxWidget() const
 {
-  return isNode(myCurrentNode, WDG_GROUP, WDG_CHECK_GROUP,
+  return isNode(myCurrentNode, WDG_GROUP, WDG_OPTIONALBOX,
                 NULL);
 }
 
 bool Config_WidgetAPI::isPagedWidget() const
 {
-  return isNode(myCurrentNode, WDG_TOOLBOX, WDG_SWITCH,
+  return isNode(myCurrentNode, WDG_TOOLBOX, WDG_SWITCH, WDG_RADIOBOX,
                 NULL);
 }
 
@@ -117,6 +113,11 @@ bool Config_WidgetAPI::getBooleanAttribute(const char* theAttributeName, bool th
   return ::getBooleanAttribute(myCurrentNode, theAttributeName, theDefault);
 }
 
+std::string Config_WidgetAPI::featureId() const
+{
+  return myFeatureId;
+}
+
 std::string Config_WidgetAPI::widgetId() const
 {
   return getProperty(_ID);
@@ -136,39 +137,3 @@ std::string Config_WidgetAPI::widgetTooltip() const
 {
   return getProperty(ATTR_TOOLTIP);
 }
-
-std::list<std::string> Config_WidgetAPI::getAttributes(const std::string& theRole/* = std::string()*/) const
-{
-  std::list<std::string> aResult;
-
-  if (theRole.empty() || theRole == ATTR_MAIN_ROLE)
-    aResult.push_back(widgetId());
-
-  if (theRole == ATTR_MAIN_ROLE)
-    return aResult;
-
-  std::list<xmlNodePtr> anAttributes = attributes();
-  for (auto it = anAttributes.begin(); it != anAttributes.end(); ++it) {
-    if (theRole.empty() || theRole == ::getProperty(*it, ATTR_ROLE))
-      aResult.push_back(::getProperty(*it, ATTR_ID));
-  }
-  return aResult;
-}
-
-std::string Config_WidgetAPI::getAttributeProperty(const std::string& theAttribute,
-                                                   const std::string& thePropName) const
-{
-  if (theAttribute == widgetId()) {
-    if (thePropName == ATTR_ROLE)
-      return ATTR_MAIN_ROLE;
-    return ::getProperty(myCurrentNode, thePropName.c_str());
-  }
-
-  std::list<xmlNodePtr> anAttributes = attributes();
-  for (auto it = anAttributes.begin(); it != anAttributes.end(); ++it) {
-    if (theAttribute == ::getProperty(*it, ATTR_ID))
-      return ::getProperty(*it, thePropName.c_str());
-  }
-  return std::string();
-}
-