Task 3.2. Concealment into multi-level Compounds

[modules/shaper.git] / src / Config / Config_FeatureReader.cpp

diff --git a/src/Config/Config_FeatureReader.cpp b/src/Config/Config_FeatureReader.cpp
index ffb5bc372731df987a2853961d47152e958d8d92..16da267c6fa950021871982cf609f2fc017bb287 100644 (file)
--- 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-2019  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<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 #include <Config_Keywords.h>
@@ -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,10 +88,13 @@ 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<std::pair<std::string, std::string> > 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 = "";
@@ -116,7 +119,7 @@ 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);
@@ -135,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);
   }
@@ -178,13 +181,27 @@ void Config_FeatureReader::fillFeature(xmlNodePtr theFeatureNode,
 
   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));
-  outFeatureMessage->setTooltip(aToolTip);
+  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 aHelpFile = getProperty(theFeatureNode, HELP_FILE);
+  if (!aHelpFile.empty())
+    outFeatureMessage->setHelpFileName(myLibraryName + "/" + aHelpFile);
+
+  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()) {