X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FConfig%2FConfig_FeatureReader.cpp;h=61c2ec179c8aa9f08260d99c9b6ea7138c8fb5e9;hb=f51f8ab55887ac6eff49fb9937a460abe1956517;hp=c0af30ac45e5c9ed4960cfa46e242c7aebaede56;hpb=dc7d4d86b58b81684abc9b5a2be8ec30f210c2da;p=modules%2Fshaper.git diff --git a/src/Config/Config_FeatureReader.cpp b/src/Config/Config_FeatureReader.cpp index c0af30ac4..61c2ec179 100644 --- a/src/Config/Config_FeatureReader.cpp +++ b/src/Config/Config_FeatureReader.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// Copyright (C) 2014-2020 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 @@ -12,10 +12,9 @@ // // 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 +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or -// email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include @@ -73,6 +72,7 @@ void Config_FeatureReader::processNode(xmlNodePtr theNode) //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, GROUP_TOOLBAR); storeAttribute(theNode, WORKBENCH_DOC, true); } else if (myIsProcessWidgets) { // widgets, like shape_selector or containers, like toolbox @@ -88,21 +88,27 @@ void Config_FeatureReader::processNode(xmlNodePtr theNode) aMessage->setConcealment(isConcealment); bool isMainArg = isConcealment && getBooleanAttribute(theNode, ATTR_MAIN_ARG, false); aMessage->setMainArgument(isMainArg); + aMessage->setGeometricalSelection(getBooleanAttribute(theNode, + ATTR_GEOMETRICAL_SELECTION, + false)); std::list > aCases; - xmlNodePtr aCaseNode = - hasParentRecursive(theNode, WDG_SWITCH_CASE, WDG_TOOLBOX_BOX, WDG_OPTIONALBOX, NULL); + xmlNodePtr aCaseNode = hasParentRecursive(theNode, + WDG_SWITCH_CASE, WDG_TOOLBOX_BOX, WDG_OPTIONALBOX, WDG_RADIOBOX_ITEM, NULL); while(aCaseNode) { std::string aCaseNodeID = getProperty(aCaseNode, _ID); std::string aSwitchNodeID = ""; const xmlChar* aName = aCaseNode->name; - xmlNodePtr aSwitchNode; + xmlNodePtr aSwitchNode = 0; if (!xmlStrcmp(aName, (const xmlChar *) WDG_SWITCH_CASE)) { aSwitchNode = hasParentRecursive(aCaseNode, WDG_SWITCH, NULL); } else if (!xmlStrcmp(aName, (const xmlChar *) WDG_TOOLBOX_BOX)) { aSwitchNode = hasParentRecursive(aCaseNode, WDG_TOOLBOX, NULL); } + else if (!xmlStrcmp(aName, (const xmlChar *)WDG_RADIOBOX_ITEM)) { + aSwitchNode = hasParentRecursive(aCaseNode, WDG_RADIOBOX, NULL); + } if (!xmlStrcmp(aName, (const xmlChar *) WDG_OPTIONALBOX)) { /// the box is optional, attribute is in case /// if the optional attribute value is not empty @@ -113,14 +119,15 @@ void Config_FeatureReader::processNode(xmlNodePtr theNode) aCases.push_back(std::make_pair(aSwitchNodeID, aCaseNodeID)); aCaseNode = hasParentRecursive(aSwitchNode, WDG_SWITCH_CASE, - WDG_TOOLBOX_BOX, WDG_OPTIONALBOX, NULL); + WDG_TOOLBOX_BOX, WDG_OPTIONALBOX, WDG_RADIOBOX_ITEM, NULL); } aMessage->setCases(aCases); Events_Loop::loop()->send(aMessage); } // container pages, like "case" or "box" } else if (isNode(theNode, WDG_OPTIONALBOX, WDG_SWITCH, WDG_SWITCH_CASE, - WDG_TOOLBOX, WDG_TOOLBOX_BOX, NULL)) { + WDG_TOOLBOX, WDG_TOOLBOX_BOX, + WDG_RADIOBOX, WDG_RADIOBOX_ITEM, NULL)) { storeAttribute(theNode, _ID); // save case:caseId (or box:boxId) } } @@ -131,7 +138,7 @@ void Config_FeatureReader::processNode(xmlNodePtr theNode) void Config_FeatureReader::cleanup(xmlNodePtr theNode) { if (isNode(theNode, WDG_OPTIONALBOX, WDG_SWITCH, WDG_SWITCH_CASE, - WDG_TOOLBOX, WDG_TOOLBOX_BOX, NULL)) { + WDG_TOOLBOX, WDG_TOOLBOX_BOX, WDG_RADIOBOX_ITEM, WDG_RADIOBOX, NULL)) { // cleanup id of cases when leave case node cleanupAttribute(theNode, _ID); } @@ -144,6 +151,7 @@ bool Config_FeatureReader::processChildren(xmlNodePtr theNode) result = isNode(theNode, NODE_FEATURE, WDG_GROUP, WDG_OPTIONALBOX, WDG_TOOLBOX, WDG_TOOLBOX_BOX, + WDG_RADIOBOX, WDG_RADIOBOX_ITEM, WDG_SWITCH, WDG_SWITCH_CASE, NULL); } return result; @@ -166,20 +174,42 @@ void Config_FeatureReader::fillFeature(xmlNodePtr theFeatureNode, bool isInternal = getBooleanAttribute(theFeatureNode, ATTR_INTERNAL, false); outFeatureMessage->setInternal(isInternal); - if (isInternal) { - //Internal feature has no visual representation. - return; - } + + std::string aHelpFile = getProperty(theFeatureNode, HELP_FILE); + if (!aHelpFile.empty()) + outFeatureMessage->setHelpFileName(myLibraryName + "/" + aHelpFile); + + bool isHideFaces = getBooleanAttribute(theFeatureNode, HIDEFACES_PANEL, false); + outFeatureMessage->setHideFacesPanel(isHideFaces); + + bool isConfirmAbort = getBooleanAttribute(theFeatureNode, ABORT_CONFIRMATION, true); + outFeatureMessage->setAbortConfirmation(isConfirmAbort); + + //if (isInternal) { + // //Internal feature has no visual representation. + // return; + //} std::string aText = Config_Translator::translate(anId, getProperty(theFeatureNode, FEATURE_TEXT)); outFeatureMessage->setText(aText); - std::string aToolTip = Config_Translator::translate(anId, - getProperty(theFeatureNode, FEATURE_TOOLTIP)); + bool isTitleInToolbar = getBooleanAttribute(theFeatureNode, FEATURE_TITLE_IN_TOOLBAR, true); + outFeatureMessage->setTitleInToolbar(isTitleInToolbar); + std::string aToolTip = Config_Translator::translate( + anId, getProperty(theFeatureNode, FEATURE_TOOLTIP)); outFeatureMessage->setTooltip(aToolTip); outFeatureMessage->setIcon(getProperty(theFeatureNode, FEATURE_ICON)); outFeatureMessage->setKeysequence(getProperty(theFeatureNode, FEATURE_KEYSEQUENCE)); - outFeatureMessage->setGroupId(restoreAttribute(NODE_GROUP, _ID)); - outFeatureMessage->setWorkbenchId(restoreAttribute(NODE_WORKBENCH, _ID)); + + std::string aGroupName = restoreAttribute(NODE_GROUP, _ID); + std::string aWBNName = restoreAttribute(NODE_WORKBENCH, _ID); + std::string isGroupToolbarId = restoreAttribute(NODE_GROUP, GROUP_TOOLBAR); + bool isGroupToolbar = false; + if (isGroupToolbarId.length() > 0) + isGroupToolbar = (isGroupToolbarId == "yes"); + outFeatureMessage->setGroupId(aGroupName); + outFeatureMessage->setWorkbenchId(aWBNName); + outFeatureMessage->setToolBarId(isGroupToolbar ? aGroupName : aWBNName); + // 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()) {