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
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
[modules/shaper.git]
/
src
/
Config
/
Config_FeatureReader.cpp
diff --git
a/src/Config/Config_FeatureReader.cpp
b/src/Config/Config_FeatureReader.cpp
index adf8f5e7abb8623d3edc81e1f442ec2393ef7835..dea07dfc7420203fffaa8da699e8ddd36fc3220d 100644
(file)
--- a/
src/Config/Config_FeatureReader.cpp
+++ b/
src/Config/Config_FeatureReader.cpp
@@
-76,12
+76,16
@@
void Config_FeatureReader::processNode(xmlNodePtr theNode)
const char* kWdgCase = hasParent(theNode, WDG_SWITCH_CASE, NULL)
? WDG_SWITCH_CASE
: WDG_TOOLBOX_BOX;
const char* kWdgCase = hasParent(theNode, WDG_SWITCH_CASE, NULL)
? WDG_SWITCH_CASE
: WDG_TOOLBOX_BOX;
+ const char* kWdgSwitch = hasParent(theNode, WDG_SWITCH_CASE, NULL)
+ ? WDG_SWITCH
+ : WDG_TOOLBOX;
aMessage->setCaseId(restoreAttribute(kWdgCase, _ID));
aMessage->setCaseId(restoreAttribute(kWdgCase, _ID));
+ aMessage->setSwitchId(restoreAttribute(kWdgSwitch, _ID));
}
Events_Loop::loop()->send(aMessage);
}
// container pages, like "case" or "box"
}
Events_Loop::loop()->send(aMessage);
}
// container pages, like "case" or "box"
- } else if (is
CaseNode(theNode
)) {
+ } else if (is
Node(theNode, WDG_SWITCH, WDG_SWITCH_CASE, WDG_TOOLBOX, WDG_TOOLBOX_BOX, NULL
)) {
storeAttribute(theNode, _ID); // save case:caseId (or box:boxId)
}
}
storeAttribute(theNode, _ID); // save case:caseId (or box:boxId)
}
}
@@
-91,7
+95,7
@@
void Config_FeatureReader::processNode(xmlNodePtr theNode)
void Config_FeatureReader::cleanup(xmlNodePtr theNode)
{
void Config_FeatureReader::cleanup(xmlNodePtr theNode)
{
- if (is
CaseNode(theNode
)) {
+ if (is
Node(theNode, WDG_SWITCH, WDG_SWITCH_CASE, WDG_TOOLBOX, WDG_TOOLBOX_BOX, NULL
)) {
// cleanup id of cases when leave case node
cleanupAttribute(theNode, _ID);
}
// cleanup id of cases when leave case node
cleanupAttribute(theNode, _ID);
}