X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FConfig%2FConfig_FeatureReader.cpp;h=94274a40ab08361e14807d2e3c6fdbb335023ffb;hb=c6a92152ecb67e86489d0a17c8df5fa2e5bcf84e;hp=1f7a65b2dcbc366f278e94c9c37b4d09da2d57ae;hpb=63e954c524a2bf8ef9ee3098f6ee2eb14a9966dd;p=modules%2Fshaper.git

diff --git a/src/Config/Config_FeatureReader.cpp b/src/Config/Config_FeatureReader.cpp
index 1f7a65b2d..94274a40a 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 <Config_Keywords.h>
 #include <Config_Common.h>
 #include <Config_FeatureMessage.h>
+#include <Config_AttributeMessage.h>
 #include <Config_FeatureReader.h>
 #include <Events_Message.h>
 #include <Events_Loop.h>
@@ -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,18 +50,27 @@ 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<Config_FeatureMessage> aMessage(
-      new Config_FeatureMessage(aMenuItemEvent, this));
+    storeAttribute(theNode, _ID);
+    std::shared_ptr<Config_FeatureMessage> 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 && isWidgetNode(theNode)) {
+    std::shared_ptr<Config_AttributeMessage> 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));
+      Events_Loop::loop()->send(aMessage);
+    }
   }
   //Process SOURCE, VALIDATOR nodes.
   Config_XMLReader::processNode(theNode);
@@ -65,39 +78,38 @@ void Config_FeatureReader::processNode(xmlNodePtr theNode)
 
 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, NULL);
+  }
+  return result;
 }
 
-void Config_FeatureReader::fillFeature(xmlNodePtr theNode, 
-  const boost::shared_ptr<Config_FeatureMessage>& outFeatureMessage)
+void Config_FeatureReader::fillFeature(xmlNodePtr theFeatureNode,
+  const std::shared_ptr<Config_FeatureMessage>& 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));
 
-  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, FEATURE_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;
+  outFeatureMessage->setDocumentKind(aDocKind);
 }
 
 void Config_FeatureReader::storeAttribute(xmlNodePtr theNode,