X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FConfig%2FConfig_FeatureReader.cpp;h=2b024061a5335aa2ee405d36c6ddaca7726516e1;hb=e9f48e35e26dfce648e2f6ecbe1e43c51ba32a7e;hp=5c4ffba8e2f0650a41d6995b9b223073ace77022;hpb=758a57d77b6fa3a0485fa3378a1280c7e87a74aa;p=modules%2Fshaper.git diff --git a/src/Config/Config_FeatureReader.cpp b/src/Config/Config_FeatureReader.cpp index 5c4ffba8e..2b024061a 100644 --- a/src/Config/Config_FeatureReader.cpp +++ b/src/Config/Config_FeatureReader.cpp @@ -1,3 +1,5 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D + /* * Config_FeatureReader.cpp * @@ -8,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -29,7 +32,8 @@ Config_FeatureReader::Config_FeatureReader(const std::string& theXmlFile, const char* theEventGenerated) : Config_XMLReader(theXmlFile), myLibraryName(theLibraryName), - myEventGenerated(theEventGenerated ? theEventGenerated : EVENT_FEATURE_LOADED) + myEventGenerated(theEventGenerated ? theEventGenerated : Config_FeatureMessage::GUI_EVENT()), + myIsProcessWidgets(theEventGenerated != NULL) { } @@ -46,82 +50,92 @@ void Config_FeatureReader::processNode(xmlNodePtr theNode) { Events_ID aMenuItemEvent = Events_Loop::eventByName(myEventGenerated); if (isNode(theNode, NODE_FEATURE, NULL)) { - Events_Loop* aEvLoop = Events_Loop::loop(); - boost::shared_ptr aMessage( - new Config_FeatureMessage(aMenuItemEvent, this)); + storeAttribute(theNode, _ID); + std::shared_ptr aMessage(new Config_FeatureMessage(aMenuItemEvent, this)); fillFeature(theNode, aMessage); myFeatures.push_back(getProperty(theNode, _ID)); //If a feature has xml definition for it's widget: aMessage->setUseInput(hasChild(theNode)); - aEvLoop->send(aMessage); + Events_Loop::loop()->send(aMessage); //The m_last* variables always defined before fillFeature() call. XML is a tree. } else if (isNode(theNode, NODE_WORKBENCH, NODE_GROUP, NULL)) { storeAttribute(theNode, _ID); storeAttribute(theNode, WORKBENCH_DOC); + } else if (myIsProcessWidgets) { + // widgets, like shape_selector or containers, like toolbox + if (isAttributeNode(theNode)) { + std::shared_ptr aMessage(new Config_AttributeMessage(aMenuItemEvent, this)); + aMessage->setFeatureId(restoreAttribute(NODE_FEATURE, _ID)); + std::string anAttributeID = getProperty(theNode, _ID); + if (!anAttributeID.empty()) { + aMessage->setAttributeId(anAttributeID); + aMessage->setObligatory(getBooleanAttribute(theNode, ATTR_OBLIGATORY, true)); + aMessage->setConcealment(getBooleanAttribute(theNode, ATTR_CONCEALMENT, false)); + // nested "paged" widgets are not allowed, this issue may be resolved here: + if (hasParent(theNode, WDG_SWITCH_CASE, WDG_TOOLBOX_BOX, NULL)) { + 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->setSwitchId(restoreAttribute(kWdgSwitch, _ID)); + } + Events_Loop::loop()->send(aMessage); + } + // container pages, like "case" or "box" + } else if (isNode(theNode, WDG_SWITCH, WDG_SWITCH_CASE, WDG_TOOLBOX, WDG_TOOLBOX_BOX, NULL)) { + storeAttribute(theNode, _ID); // save case:caseId (or box:boxId) + } } - //Process SOURCE, VALIDATOR nodes. + //Process SOURCE nodes. Config_XMLReader::processNode(theNode); } +void Config_FeatureReader::cleanup(xmlNodePtr theNode) +{ + if (isNode(theNode, WDG_SWITCH, WDG_SWITCH_CASE, WDG_TOOLBOX, WDG_TOOLBOX_BOX, NULL)) { + // cleanup id of cases when leave case node + cleanupAttribute(theNode, _ID); + } +} + bool Config_FeatureReader::processChildren(xmlNodePtr theNode) { - return isNode(theNode, NODE_WORKBENCH, NODE_GROUP, NODE_FEATURE, NULL); + bool result = isNode(theNode, NODE_WORKBENCH, NODE_GROUP, NULL); + if(!result && myIsProcessWidgets) { + result = isNode(theNode, NODE_FEATURE, + WDG_TOOLBOX, WDG_TOOLBOX_BOX, + WDG_SWITCH, WDG_SWITCH_CASE, NULL); + } + return result; } -void Config_FeatureReader::fillFeature(xmlNodePtr theNode, - const boost::shared_ptr& outFeatureMessage) +void Config_FeatureReader::fillFeature(xmlNodePtr theFeatureNode, + const std::shared_ptr& outFeatureMessage) { - outFeatureMessage->setId(getProperty(theNode, _ID)); + outFeatureMessage->setId(getProperty(theFeatureNode, _ID)); outFeatureMessage->setPluginLibrary(myLibraryName); - outFeatureMessage->setNestedFeatures(getProperty(theNode, FEATURE_NESTED)); + outFeatureMessage->setNestedFeatures(getProperty(theFeatureNode, FEATURE_NESTED)); + outFeatureMessage->setActionsWhenNested(getNormalizedProperty(theFeatureNode, FEATURE_WHEN_NESTED)); - bool isInternal = isInternalFeature(theNode); + bool isInternal = getBooleanAttribute(theFeatureNode, ATTR_INTERNAL, false); outFeatureMessage->setInternal(isInternal); if (isInternal) { //Internal feature has no visual representation. return; } - outFeatureMessage->setText(getProperty(theNode, FEATURE_TEXT)); - outFeatureMessage->setTooltip(getProperty(theNode, FEATURE_TOOLTIP)); - outFeatureMessage->setIcon(getProperty(theNode, FEATURE_ICON)); - outFeatureMessage->setKeysequence(getProperty(theNode, FEATURE_KEYSEQUENCE)); + outFeatureMessage->setText(getProperty(theFeatureNode, FEATURE_TEXT)); + outFeatureMessage->setTooltip(getProperty(theFeatureNode, FEATURE_TOOLTIP)); + outFeatureMessage->setIcon(getProperty(theFeatureNode, FEATURE_ICON)); + outFeatureMessage->setKeysequence(getProperty(theFeatureNode, FEATURE_KEYSEQUENCE)); outFeatureMessage->setGroupId(restoreAttribute(NODE_GROUP, _ID)); outFeatureMessage->setWorkbenchId(restoreAttribute(NODE_WORKBENCH, _ID)); - outFeatureMessage->setDocumentKind(restoreAttribute(NODE_WORKBENCH, WORKBENCH_DOC)); -} - -bool Config_FeatureReader::isInternalFeature(xmlNodePtr theNode) -{ - std::string prop = getProperty(theNode, ATTRIBUTE_INTERNAL); - std::transform(prop.begin(), prop.end(), prop.begin(), ::tolower); - if (prop.empty() || prop == "false" || prop == "0") { - return false; + // Get document kind of a feature, if empty set workbench's kind (might be empty too) + std::string aDocKind = getProperty(theFeatureNode, FEATURE_DOC); + if(aDocKind.empty()) { + aDocKind = restoreAttribute(NODE_WORKBENCH, WORKBENCH_DOC); } - return true; -} - -void Config_FeatureReader::storeAttribute(xmlNodePtr theNode, - const char* theNodeAttribute) -{ - std::string aKey = getNodeName(theNode) + ":" + std::string(theNodeAttribute); - std::string aValue = getProperty(theNode, theNodeAttribute); - if(!aValue.empty()) { - myParentAttributes[aKey] = aValue; - } -} - -std::string Config_FeatureReader::restoreAttribute(xmlNodePtr theNode, - const char* theNodeAttribute) -{ - return restoreAttribute(getNodeName(theNode).c_str(), theNodeAttribute); -} -std::string Config_FeatureReader::restoreAttribute(const char* theNodeName, - const char* theNodeAttribute) -{ - std::string aKey = std::string(theNodeName) + ":" + std::string(theNodeAttribute); - std::string result = ""; - if(myParentAttributes.find(aKey) != myParentAttributes.end()) { - result = myParentAttributes[aKey]; - } - return result; + outFeatureMessage->setDocumentKind(aDocKind); }