X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FConfig%2FConfig_WidgetAPI.cpp;h=023ad2868ff8a647c819510b5924cef3e8f8eae5;hb=0932085a43a8895dac2cd4fe2cf562848379e51e;hp=2fdad673519fcd7f1be6fc49cdbadad3062ffb67;hpb=dc4b9ee9f5445b39bcaeb3b7f05627774e343ffa;p=modules%2Fshaper.git diff --git a/src/Config/Config_WidgetAPI.cpp b/src/Config/Config_WidgetAPI.cpp index 2fdad6735..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 +// #include #include @@ -12,14 +25,15 @@ #include #include +#include Config_WidgetAPI::Config_WidgetAPI(std::string theRawXml) { myDoc = xmlParseDoc(BAD_CAST theRawXml.c_str()); myCurrentNode = xmlDocGetRootElement(myDoc); + myFeatureId = getProperty(_ID); } - Config_WidgetAPI::~Config_WidgetAPI() { xmlFreeDoc(myDoc); @@ -31,9 +45,9 @@ bool Config_WidgetAPI::toNextWidget() xmlNodePtr aNextNode = myCurrentNode; do { aNextNode = aNextNode->next; - } while(aNextNode && !isElementNode(aNextNode)); + } while (aNextNode && !isElementNode(aNextNode)); - if(!aNextNode) { + if (!aNextNode) { toParentWidget(); return false; } @@ -43,19 +57,26 @@ bool Config_WidgetAPI::toNextWidget() bool Config_WidgetAPI::toChildWidget() { - if(myCurrentNode && hasChild(myCurrentNode)) { - myCurrentNode = myCurrentNode->children; - while(!isElementNode(myCurrentNode)) { - myCurrentNode = myCurrentNode->next; - } - return true; + if (myCurrentNode && hasChild(myCurrentNode)) { + 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 false; } bool Config_WidgetAPI::toParentWidget() { - if(myCurrentNode) { + if (myCurrentNode) { myCurrentNode = myCurrentNode->parent; } return myCurrentNode != NULL; @@ -64,50 +85,55 @@ bool Config_WidgetAPI::toParentWidget() std::string Config_WidgetAPI::widgetType() const { std::string result = ""; - if(myCurrentNode) { + if (myCurrentNode) { result = std::string((char *) myCurrentNode->name); } 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); } -std::string Config_WidgetAPI::widgetId() const +bool Config_WidgetAPI::getBooleanAttribute(const char* theAttributeName, bool theDefault) const { - return getProperty("id"); + return ::getBooleanAttribute(myCurrentNode, theAttributeName, theDefault); } -std::string Config_WidgetAPI::widgetTooltip() const +std::string Config_WidgetAPI::featureId() const { - return getProperty("tooltip"); + return myFeatureId; +} + +std::string Config_WidgetAPI::widgetId() const +{ + return getProperty(_ID); } std::string Config_WidgetAPI::widgetIcon() const { - return getProperty("icon"); + return getProperty(ATTR_ICON); } std::string Config_WidgetAPI::widgetLabel() const { - return getProperty("label"); + return getProperty(ATTR_LABEL); +} + +std::string Config_WidgetAPI::widgetTooltip() const +{ + return getProperty(ATTR_TOOLTIP); }