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 0eb2bfdaa5ac4975e8f554eae979df7dccb930a2..a3b7b56f2c1214cc99788c1d842847adad5c3e1a 100644 (file)
--- a/src/Config/Config_FeatureReader.cpp
+++ b/src/Config/Config_FeatureReader.cpp
@@ -5,74 +5,79 @@
  *      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>
 
 #ifdef _DEBUG
 #include <iostream>
 #endif
 
-//Hardcoded xml entities
-// * Nodes
 
-// * Properties
-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";
-const static char* FEATURE_GROUP_NAME = "name";
-
-
-
-
-Config_FeatureReader::Config_FeatureReader(const std::string& theXmlFile)
-    : Config_XMLReader(theXmlFile)
+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::list<std::string> Config_FeatureReader::features() const
+{
+  return myFeatures;
+}
+
 void Config_FeatureReader::processNode(xmlNodePtr theNode)
 {
-  if(isNode(theNode,"feature")) {
-    Event_Loop* aEvLoop = Event_Loop::Loop();
-    Config_FeatureMessage aMessage(aEvLoop->EventByName("Feature"), this);
+  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);
-    xmlNodePtr aGroupNode = theNode->parent;
-    if(aGroupNode) {
-      std::string aGroupName = getProperty(aGroupNode, FEATURE_GROUP_NAME);
-      aMessage.m_group = aGroupName;
-    }
-    aEvLoop->Send(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)) {
+    myLastGroup = 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)
 {
-  return isNode(theNode, "workbench")
-      || isNode(theNode, "group");
-//      || isNode(theNode, "feature");
+  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.m_id = getProperty(theRoot, FEATURE_ID);
-  outFtMessage.m_text = getProperty(theRoot, FEATURE_TEXT);
-  outFtMessage.m_tooltip = getProperty(theRoot, FEATURE_TOOLTIP);
-  outFtMessage.m_icon = getProperty(theRoot, FEATURE_ICON);
-  outFtMessage.m_keysequence = getProperty(theRoot, FEATURE_KEYSEQUENCE);
+  outFtMessage.setId(getProperty(theRoot, _ID));
+  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(myLastGroup);
+  outFtMessage.setWorkbenchId(myLastWorkbench);
+  outFtMessage.setPluginLibrary(myLibraryName);
+  outFtMessage.setNestedFeatures(getProperty(theRoot, FEATURE_NESTED));
 }