Merge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0

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

diff --git a/src/Config/Config_FeatureReader.cpp b/src/Config/Config_FeatureReader.cpp
index 839eca2410e55d74eaab5aa26e70778309e5bd30..2b024061a5335aa2ee405d36c6ddaca7726516e1 100644 (file)
--- a/src/Config/Config_FeatureReader.cpp
+++ b/src/Config/Config_FeatureReader.cpp
@@ -61,26 +61,53 @@ void Config_FeatureReader::processNode(xmlNodePtr theNode)
   } 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);
+  } else if (myIsProcessWidgets) {
+    // widgets, like shape_selector or containers, like toolbox
+    if (isAttributeNode(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));
+        // nested "paged" widgets are not allowed, this issue may be resolved here:
+        if (hasParent(theNode, WDG_SWITCH_CASE, WDG_TOOLBOX_BOX, NULL)) {
+          const char* kWdgCase = hasParent(theNode, WDG_SWITCH_CASE, NULL)
+                                 ? WDG_SWITCH_CASE
+                                 : WDG_TOOLBOX_BOX;
+          const char* kWdgSwitch = hasParent(theNode, WDG_SWITCH_CASE, NULL)
+                                   ? WDG_SWITCH
+                                   : WDG_TOOLBOX;
+          aMessage->setCaseId(restoreAttribute(kWdgCase, _ID));
+          aMessage->setSwitchId(restoreAttribute(kWdgSwitch, _ID));
+        }
+        Events_Loop::loop()->send(aMessage);
+      }
+    // container pages, like "case" or "box"
+    } else if (isNode(theNode, WDG_SWITCH, WDG_SWITCH_CASE, WDG_TOOLBOX, WDG_TOOLBOX_BOX, NULL)) {
+      storeAttribute(theNode, _ID); // save case:caseId (or box:boxId)
     }
   }
-  //Process SOURCE, VALIDATOR nodes.
+  //Process SOURCE nodes.
   Config_XMLReader::processNode(theNode);
 }
 
+void Config_FeatureReader::cleanup(xmlNodePtr theNode)
+{
+  if (isNode(theNode, WDG_SWITCH, WDG_SWITCH_CASE, WDG_TOOLBOX, WDG_TOOLBOX_BOX, NULL)) {
+    // cleanup id of cases when leave case node
+    cleanupAttribute(theNode, _ID);
+  }
+}
+
 bool Config_FeatureReader::processChildren(xmlNodePtr theNode)
 {
   bool result = isNode(theNode, NODE_WORKBENCH, NODE_GROUP, NULL);
   if(!result && myIsProcessWidgets) {
-    result = isNode(theNode, NODE_FEATURE, NULL);
+    result = isNode(theNode, NODE_FEATURE, 
+                             WDG_TOOLBOX, WDG_TOOLBOX_BOX,
+                             WDG_SWITCH, WDG_SWITCH_CASE, NULL);
   }
   return result;
 }
@@ -112,29 +139,3 @@ void Config_FeatureReader::fillFeature(xmlNodePtr theFeatureNode,
   }
   outFeatureMessage->setDocumentKind(aDocKind);
 }
-
-void Config_FeatureReader::storeAttribute(xmlNodePtr theNode,
-                                          const char* theNodeAttribute)
-{
-  std::string aKey = getNodeName(theNode) + ":" + std::string(theNodeAttribute);
-  std::string aValue = getProperty(theNode, theNodeAttribute);
-  if(!aValue.empty()) {
-    myParentAttributes[aKey] = aValue;
-  }
-}
-
-std::string Config_FeatureReader::restoreAttribute(xmlNodePtr theNode,
-                                                   const char* theNodeAttribute)
-{
-  return restoreAttribute(getNodeName(theNode).c_str(), theNodeAttribute);
-}
-std::string Config_FeatureReader::restoreAttribute(const char* theNodeName,
-                                                   const char* theNodeAttribute)
-{
-  std::string aKey = std::string(theNodeName) + ":" + std::string(theNodeAttribute);
-  std::string result = "";
-  if(myParentAttributes.find(aKey) != myParentAttributes.end()) {
-    result = myParentAttributes[aKey];
-  }
-  return result;
-}