Debug of filters arguments processing

diff --git a/src/Model/Model_Data.cpp b/src/Model/Model_Data.cpp
index 5f867fca1a508b003442d814c6726cbbaa9f50a5..16355161ada949afd7e3fa07fdec8783dde6c755 100644 (file)
--- a/src/Model/Model_Data.cpp
+++ b/src/Model/Model_Data.cpp
@@ -240,7 +240,7 @@ AttributePtr Model_Data::addFloatingAttribute(
   int anIndex;
   TDF_Label aLab;
   if (myLab.IsAttribute(TDF_TagSource::GetID())) {
-    TDF_Label aLab = myLab.NewChild(); // already exists a floating attribute, create the next
+    aLab = myLab.NewChild(); // already exists a floating attribute, create the next
     anIndex = aLab.Tag();
   } else { // put the first floating attribute, quite far from other standard attributes
     anIndex = int(myAttrs.size()) + 1000;

diff --git a/src/Model/Model_Filter.cpp b/src/Model/Model_Filter.cpp
index 84b0bd5f7991efb477221d361ecd720c84e78d16..b0592b35e9b81225d89fed6faa25884357312b69 100644 (file)
--- a/src/Model/Model_Filter.cpp
+++ b/src/Model/Model_Filter.cpp
@@ -38,21 +38,28 @@ bool Model_FiltersFactory::isValid(FeaturePtr theFiltersFeature, GeomShapePtr th
   // prepare all filters args
   ModelAPI_FiltersArgs anArgs;
   std::map<FilterPtr, bool> aReverseFlags; /// map of all filters to the reverse values
-  static const std::string& anEmptyType("");
-  std::list<std::shared_ptr<ModelAPI_Attribute> > allAttrs =
-    theFiltersFeature->data()->attributes(anEmptyType);
-  std::list<std::shared_ptr<ModelAPI_Attribute> >::iterator anAttr = allAttrs.begin();
-  for(; anAttr != allAttrs.end(); anAttr++) {
-    const std::string& anAttrID = (*anAttr)->id();
-    if (anAttrID.find(kFilterSeparator) == std::string::npos) { // possible a filter reverse flag
-      std::shared_ptr<ModelAPI_AttributeBoolean> aReverse = theFiltersFeature->boolean(anAttrID);
-      if (aReverse.get() && myFilters.find(anAttrID) != myFilters.end()) {
-        aReverseFlags[myFilters[anAttrID] ] = aReverse->value();
+
+  std::list<std::string> aGroups;
+  theFiltersFeature->data()->allGroups(aGroups);
+  for(std::list<std::string>::iterator aGIter = aGroups.begin(); aGIter != aGroups.end(); aGIter++)
+  {
+    if (myFilters.find(*aGIter) == myFilters.end())
+      continue;
+    std::list<std::shared_ptr<ModelAPI_Attribute> > anAttrs;
+    theFiltersFeature->data()->attributesOfGroup(*aGIter, anAttrs);
+    std::list<std::shared_ptr<ModelAPI_Attribute> >::iterator anAttrIter = anAttrs.begin();
+    for(; anAttrIter != anAttrs.end(); anAttrIter++) {
+      std::string anArgID = (*anAttrIter)->id().substr((*aGIter).length() + 2);
+      if (anArgID.empty()) { // reverse flag
+        std::shared_ptr<ModelAPI_AttributeBoolean> aReverse =
+          std::dynamic_pointer_cast<ModelAPI_AttributeBoolean>(*anAttrIter);
+        aReverseFlags[myFilters[*aGIter] ] = aReverse->value();
+      } else {
+        anArgs.add(*anAttrIter);
       }
-    } else { // an argument of a filter
-      anArgs.add(*anAttr);
     }
   }
+
   // iterate filters and check shape for validity for all of them
   std::map<FilterPtr, bool>::iterator aFilter = aReverseFlags.begin();
   for(; aFilter != aReverseFlags.end(); aFilter++) {