X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FConfig%2FConfig_FeatureReader.cpp;h=6e6bbb85f6f7abdbb656619f58b35bce114f308c;hb=b8924e39fa627f19d6eee9c52973f839b6a647a5;hp=53c0d6c88dd4b5dcba8da1dc495c64d68887ae2c;hpb=e607e2c793a83dc30d483e1819f44c3497a08555;p=modules%2Fshaper.git

diff --git a/src/Config/Config_FeatureReader.cpp b/src/Config/Config_FeatureReader.cpp
index 53c0d6c88..6e6bbb85f 100644
--- a/src/Config/Config_FeatureReader.cpp
+++ b/src/Config/Config_FeatureReader.cpp
@@ -5,79 +5,64 @@
  *      Author: sbh
  */
 
+#include <Config_Keywords.h>
+#include <Config_Common.h>
+#include <Config_FeatureMessage.h>
 #include <Config_FeatureReader.h>
+#include <Events_Message.h>
+#include <Events_Loop.h>
 
-#include <Event_Loop.hxx>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+#include <libxml/xmlstring.h>
 
-#include <libxml\parser.h>
-#include <libxml\tree.h>
+#include <string>
+#include <algorithm>
 
 #ifdef _DEBUG
 #include <iostream>
 #endif
 
-//Hardcoded xml entities
-// * Nodes
-const static char* NODE_WORKBENCH = "workbench";
-const static char* NODE_GROUP = "group";
-const static char* NODE_FEATURE = "feature";
 
-// * Properties
-const static char* _ID = "id";
-//const static char* WORKBENCH_ID = "id";
-//const static char* GROUP_ID = "id";
-//const static char* FEATURE_ID = "id";
-const static char* FEATURE_TEXT = "text";
-const static char* FEATURE_TOOLTIP = "tooltip";
-const static char* FEATURE_ICON = "icon";
-const static char* FEATURE_KEYSEQUENCE = "keysequence";
-
-
-Config_FeatureReader::Config_FeatureReader(const std::string& theXmlFile)
+Config_FeatureReader::Config_FeatureReader(const std::string& theXmlFile,
+                                           const std::string& theLibraryName,
+                                           const char* theEventGenerated)
     : Config_XMLReader(theXmlFile),
-      m_fetchWidgetCfg(false)
+      myLibraryName(theLibraryName),
+      myEventGenerated(theEventGenerated ? theEventGenerated : EVENT_FEATURE_LOADED)
 {
-  #ifdef _DEBUG
-  if(!Event_Loop::Loop()) {
-    std::cout << "Config_FeatureReader::importWorkbench: "
-        << "No event loop registered" << std::endl;
-  }
-  #endif
 }
 
 Config_FeatureReader::~Config_FeatureReader()
 {
 }
 
-std::string Config_FeatureReader::featureWidgetCfg(std::string theFeatureName)
+std::list<std::string> Config_FeatureReader::features() const
 {
-  m_fetchWidgetCfg = true;
-  readAll();
-  m_fetchWidgetCfg = false;
-  return m_widgetCfg;
+  return myFeatures;
 }
 
 void Config_FeatureReader::processNode(xmlNodePtr theNode)
 {
-  if(isNode(theNode, NODE_FEATURE, NULL)) {
-    if(m_fetchWidgetCfg) {
-      xmlBufferPtr buffer = xmlBufferCreate();
-      int size = xmlNodeDump(buffer, theNode->doc, theNode, 0, 1);
-      m_widgetCfg = std::string((char*)buffer->content);
-    } else {
-      Event_Loop* aEvLoop = Event_Loop::Loop();
-      Config_FeatureMessage aMessage(aEvLoop->EventByName("menu_item"), this);
-      fillFeature(theNode, aMessage);
-      aEvLoop->Send(aMessage);
-    }
+  Events_ID aMenuItemEvent = Events_Loop::eventByName(myEventGenerated);
+  if (isNode(theNode, NODE_FEATURE, NULL)) {
+    Events_Loop* aEvLoop = Events_Loop::loop();
+    Config_FeatureMessage aMessage(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);
   }
   //The m_last* variables always defined before fillFeature() call. XML is a tree.
-  if(isNode(theNode, NODE_GROUP, NULL)) {
-    m_lastGroup = getProperty(theNode, _ID);
+  if (isNode(theNode, NODE_GROUP, NULL)) {
+    myLastGroup = getProperty(theNode, _ID);
   }
-  if(isNode(theNode, NODE_WORKBENCH, NULL)) {
-    m_lastWorkbench = getProperty(theNode, _ID);
+  if (isNode(theNode, NODE_WORKBENCH, NULL)) {
+    myLastWorkbench = getProperty(theNode, _ID);
   }
+  //Process SOURCE nodes.
+  Config_XMLReader::processNode(theNode);
 }
 
 bool Config_FeatureReader::processChildren(xmlNodePtr theNode)
@@ -85,15 +70,31 @@ bool Config_FeatureReader::processChildren(xmlNodePtr theNode)
   return isNode(theNode, NODE_WORKBENCH, NODE_GROUP, NULL);
 }
 
-void Config_FeatureReader::fillFeature(xmlNodePtr theRoot,
-                                       Config_FeatureMessage& outFtMessage)
+void Config_FeatureReader::fillFeature(xmlNodePtr theRoot, Config_FeatureMessage& outFtMessage)
 {
   outFtMessage.setId(getProperty(theRoot, _ID));
+  outFtMessage.setPluginLibrary(myLibraryName);
+  outFtMessage.setNestedFeatures(getProperty(theRoot, FEATURE_NESTED));
+  bool isFtInternal = isInternalFeature(theRoot);
+  outFtMessage.setInternal(isFtInternal);
+  if(isFtInternal) {
+    //Internal feature has no visual representation.
+    return;
+  }
   outFtMessage.setText(getProperty(theRoot, FEATURE_TEXT));
   outFtMessage.setTooltip(getProperty(theRoot, FEATURE_TOOLTIP));
   outFtMessage.setIcon(getProperty(theRoot, FEATURE_ICON));
   outFtMessage.setKeysequence(getProperty(theRoot, FEATURE_KEYSEQUENCE));
-  outFtMessage.setGroupId(m_lastGroup);
-  outFtMessage.setWorkbenchId(m_lastWorkbench);
+  outFtMessage.setGroupId(myLastGroup);
+  outFtMessage.setWorkbenchId(myLastWorkbench);
+}
 
+bool Config_FeatureReader::isInternalFeature(xmlNodePtr theRoot)
+{
+  std::string prop = getProperty(theRoot, FEATURE_INTERNAL);
+  std::transform(prop.begin(), prop.end(), prop.begin(), ::tolower);
+  if(prop.empty() || prop == "false" || prop == "0") {
+    return false;
+  }
+  return true;
 }