Merge branch 'master' of newgeom:newgeom

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

diff --git a/src/Config/Config_FeatureReader.cpp b/src/Config/Config_FeatureReader.cpp
index db68af656efb2b81fb814b2a5315f6d62ba73eae..a3b7b56f2c1214cc99788c1d842847adad5c3e1a 100644 (file)
--- a/src/Config/Config_FeatureReader.cpp
+++ b/src/Config/Config_FeatureReader.cpp
@@ -5,77 +5,63 @@
  *      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.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+#include <libxml/xmlstring.h>
 
-#include <libxml\parser.h>
-#include <libxml\tree.h>
+#include <string>
 
 #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_XMLReader(theXmlFile), m_fetchWidgetCfg(false)
+Config_FeatureReader::Config_FeatureReader(const std::string& theXmlFile,
+                                           const std::string& theLibraryName,
+                                           const char* theEventGenerated)
+    : Config_XMLReader(theXmlFile),
+      myLibraryName(theLibraryName),
+      myEventGenerated(theEventGenerated ? theEventGenerated : "FeatureEvent")
 {
-#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)
 {
+  Events_ID aMenuItemEvent = Events_Loop::eventByName(myEventGenerated);
   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_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);
+    myLastGroup = getProperty(theNode, _ID);
   }
   if (isNode(theNode, NODE_WORKBENCH, NULL)) {
-    m_lastWorkbench = getProperty(theNode, _ID);
+    myLastWorkbench = getProperty(theNode, _ID);
   }
+  //Process SOURCE nodes.
+  Config_XMLReader::processNode(theNode);
 }
 
 bool Config_FeatureReader::processChildren(xmlNodePtr theNode)
@@ -90,7 +76,8 @@ void Config_FeatureReader::fillFeature(xmlNodePtr theRoot, Config_FeatureMessage
   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);
+  outFtMessage.setPluginLibrary(myLibraryName);
+  outFtMessage.setNestedFeatures(getProperty(theRoot, FEATURE_NESTED));
 }