X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FConfig%2FConfig_WidgetAPI.cpp;h=023ad2868ff8a647c819510b5924cef3e8f8eae5;hb=0932085a43a8895dac2cd4fe2cf562848379e51e;hp=7d548ea245b838bda4b6a598be0a111a8252aa43;hpb=b669a9a22a6cde038878f727af42e3f27e52e0d6;p=modules%2Fshaper.git

diff --git a/src/Config/Config_WidgetAPI.cpp b/src/Config/Config_WidgetAPI.cpp
index 7d548ea24..023ad2868 100644
--- a/src/Config/Config_WidgetAPI.cpp
+++ b/src/Config/Config_WidgetAPI.cpp
@@ -1,9 +1,22 @@
-/*
- * 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>
@@ -13,12 +26,12 @@
 #include <libxml/tree.h>
 
 #include <string>
-#include <algorithm>
 
 Config_WidgetAPI::Config_WidgetAPI(std::string theRawXml)
 {
   myDoc = xmlParseDoc(BAD_CAST theRawXml.c_str());
   myCurrentNode = xmlDocGetRootElement(myDoc);
+  myFeatureId = getProperty(_ID);
 }
 
 Config_WidgetAPI::~Config_WidgetAPI()
@@ -45,11 +58,18 @@ bool Config_WidgetAPI::toNextWidget()
 bool Config_WidgetAPI::toChildWidget()
 {
   if (myCurrentNode && hasChild(myCurrentNode)) {
-    myCurrentNode = myCurrentNode->children;
-    while (!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 true;
   }
   return false;
 }
@@ -71,39 +91,31 @@ std::string Config_WidgetAPI::widgetType() const
   return result;
 }
 
-bool Config_WidgetAPI::isContainerWidget() const
+bool Config_WidgetAPI::isGroupBoxWidget() const
 {
-  return isNode(myCurrentNode, WDG_GROUP, WDG_CHECK_GROUP,
-  NULL);
+  return isNode(myCurrentNode, WDG_GROUP, WDG_OPTIONALBOX,
+                NULL);
 }
 
 bool Config_WidgetAPI::isPagedWidget() const
 {
-  return isNode(myCurrentNode, WDG_TOOLBOX, WDG_SWITCH,
-  NULL);
+  return isNode(myCurrentNode, WDG_TOOLBOX, WDG_SWITCH, WDG_RADIOBOX,
+                NULL);
 }
 
 std::string Config_WidgetAPI::getProperty(const char* thePropName) const
 {
-  std::string result = "";
-  char* aPropChars = (char*) xmlGetProp(myCurrentNode, BAD_CAST thePropName);
-  if (!aPropChars || aPropChars[0] == 0)
-    return result;
-  result = std::string(aPropChars);
-  return result;
+  return ::getProperty(myCurrentNode, thePropName);
 }
 
 bool Config_WidgetAPI::getBooleanAttribute(const char* theAttributeName, bool theDefault) const
 {
-  std::string prop = getProperty(theAttributeName);
-  std::transform(prop.begin(), prop.end(), prop.begin(), ::tolower);
-  bool result = theDefault;
-  if (prop == "true" || prop == "1") {
-    result = true;
-  } else if (prop == "false" || prop == "0") {
-    result = false;
-  }
-  return result;
+  return ::getBooleanAttribute(myCurrentNode, theAttributeName, theDefault);
+}
+
+std::string Config_WidgetAPI::featureId() const
+{
+  return myFeatureId;
 }
 
 std::string Config_WidgetAPI::widgetId() const
@@ -113,15 +125,15 @@ std::string Config_WidgetAPI::widgetId() const
 
 std::string Config_WidgetAPI::widgetIcon() const
 {
-  return getProperty(ANY_WDG_ICON);
+  return getProperty(ATTR_ICON);
 }
 
 std::string Config_WidgetAPI::widgetLabel() const
 {
-  return getProperty(ANY_WDG_LABEL);
+  return getProperty(ATTR_LABEL);
 }
 
 std::string Config_WidgetAPI::widgetTooltip() const
 {
-  return getProperty(ANY_WDG_TOOLTIP);
+  return getProperty(ATTR_TOOLTIP);
 }