Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Issue #1351: partition is not done
[modules/shaper.git]
/
src
/
Config
/
Config_WidgetAPI.cpp
diff --git
a/src/Config/Config_WidgetAPI.cpp
b/src/Config/Config_WidgetAPI.cpp
index 2fdad673519fcd7f1be6fc49cdbadad3062ffb67..1249f9ab817ecd59e05b037d57a0390ad19caa40 100644
(file)
--- a/
src/Config/Config_WidgetAPI.cpp
+++ b/
src/Config/Config_WidgetAPI.cpp
@@
-1,3
+1,5
@@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
/*
* Config_WidgetAPI.cpp
*
/*
* Config_WidgetAPI.cpp
*
@@
-12,6
+14,7
@@
#include <libxml/parser.h>
#include <libxml/tree.h>
#include <libxml/parser.h>
#include <libxml/tree.h>
+#include <string>
Config_WidgetAPI::Config_WidgetAPI(std::string theRawXml)
{
Config_WidgetAPI::Config_WidgetAPI(std::string theRawXml)
{
@@
-19,7
+22,6
@@
Config_WidgetAPI::Config_WidgetAPI(std::string theRawXml)
myCurrentNode = xmlDocGetRootElement(myDoc);
}
myCurrentNode = xmlDocGetRootElement(myDoc);
}
-
Config_WidgetAPI::~Config_WidgetAPI()
{
xmlFreeDoc(myDoc);
Config_WidgetAPI::~Config_WidgetAPI()
{
xmlFreeDoc(myDoc);
@@
-31,9
+33,9
@@
bool Config_WidgetAPI::toNextWidget()
xmlNodePtr aNextNode = myCurrentNode;
do {
aNextNode = aNextNode->next;
xmlNodePtr aNextNode = myCurrentNode;
do {
aNextNode = aNextNode->next;
- } while(aNextNode && !isElementNode(aNextNode));
+ } while
(aNextNode && !isElementNode(aNextNode));
- if(!aNextNode) {
+ if
(!aNextNode) {
toParentWidget();
return false;
}
toParentWidget();
return false;
}
@@
-43,19
+45,19
@@
bool Config_WidgetAPI::toNextWidget()
bool Config_WidgetAPI::toChildWidget()
{
bool Config_WidgetAPI::toChildWidget()
{
- if(myCurrentNode && hasChild(myCurrentNode)) {
+ if
(myCurrentNode && hasChild(myCurrentNode)) {
myCurrentNode = myCurrentNode->children;
myCurrentNode = myCurrentNode->children;
- while
(
!isElementNode(myCurrentNode)) {
+ while
(myCurrentNode &&
!isElementNode(myCurrentNode)) {
myCurrentNode = myCurrentNode->next;
myCurrentNode = myCurrentNode->next;
- }
- return
true
;
+ }
+ return
myCurrentNode != NULL
;
}
return false;
}
bool Config_WidgetAPI::toParentWidget()
{
}
return false;
}
bool Config_WidgetAPI::toParentWidget()
{
- if(myCurrentNode) {
+ if
(myCurrentNode) {
myCurrentNode = myCurrentNode->parent;
}
return myCurrentNode != NULL;
myCurrentNode = myCurrentNode->parent;
}
return myCurrentNode != NULL;
@@
-64,50
+66,50
@@
bool Config_WidgetAPI::toParentWidget()
std::string Config_WidgetAPI::widgetType() const
{
std::string result = "";
std::string Config_WidgetAPI::widgetType() const
{
std::string result = "";
- if(myCurrentNode) {
+ if
(myCurrentNode) {
result = std::string((char *) myCurrentNode->name);
}
return result;
}
result = std::string((char *) myCurrentNode->name);
}
return result;
}
-bool Config_WidgetAPI::is
Container
Widget() const
+bool Config_WidgetAPI::is
GroupBox
Widget() const
{
return isNode(myCurrentNode, WDG_GROUP, WDG_CHECK_GROUP,
{
return isNode(myCurrentNode, WDG_GROUP, WDG_CHECK_GROUP,
-
NULL);
+ NULL);
}
bool Config_WidgetAPI::isPagedWidget() const
{
return isNode(myCurrentNode, WDG_TOOLBOX, WDG_SWITCH,
}
bool Config_WidgetAPI::isPagedWidget() const
{
return isNode(myCurrentNode, WDG_TOOLBOX, WDG_SWITCH,
-
NULL);
+ NULL);
}
std::string Config_WidgetAPI::getProperty(const char* thePropName) const
{
}
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::widget
Tooltip
() const
+std::string Config_WidgetAPI::widget
Id
() const
{
{
- return getProperty(
"tooltip"
);
+ return getProperty(
_ID
);
}
std::string Config_WidgetAPI::widgetIcon() const
{
}
std::string Config_WidgetAPI::widgetIcon() const
{
- return getProperty(
"icon"
);
+ return getProperty(
ATTR_ICON
);
}
std::string Config_WidgetAPI::widgetLabel() const
{
}
std::string Config_WidgetAPI::widgetLabel() const
{
- return getProperty("label");
+ return getProperty(ATTR_LABEL);
+}
+
+std::string Config_WidgetAPI::widgetTooltip() const
+{
+ return getProperty(ATTR_TOOLTIP);
}
}