Salome HOME
Multi-selection widget to be used in the extrusion feature.
[modules/shaper.git] / src / ModuleBase / ModuleBase_WidgetShapeSelector.cpp
index 211363d1661920c52520516f3498ec36407b4075..9f9cd941dece9e56d513763868ecb75f3addc4fa 100644 (file)
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        ModuleBase_WidgetShapeSelector.h
 // Created:     2 June 2014
 // Author:      Vitaly Smetannikov
@@ -8,7 +10,8 @@
 #include <ModuleBase_IWorkshop.h>
 #include <ModuleBase_IViewer.h>
 #include <ModuleBase_Tools.h>
-#include <ModuleBase_WidgetValueFeature.h>
+#include <ModuleBase_FilterFactory.h>
+#include <ModuleBase_Filter.h>
 
 #include <Config_WidgetAPI.h>
 #include <Events_Loop.h>
 #include <ModelAPI_Tools.h>
 #include <ModelAPI_ResultBody.h>
 #include <ModelAPI_AttributeRefAttr.h>
+#include <ModelAPI_Validator.h>
+#include <ModelAPI_ResultValidator.h>
+#include <ModelAPI_RefAttrValidator.h>
+#include <ModelAPI_ShapeValidator.h>
 
 #include <Config_WidgetAPI.h>
 #include <Events_Error.h>
 
 #include <GeomAPI_Shape.h>
 
+#include <SelectMgr_ListIteratorOfListOfFilter.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopExp_Explorer.hxx>
 
@@ -46,6 +54,8 @@
 #include <QString>
 #include <QEvent>
 #include <QDockWidget>
+#include <QApplication>
+#include <QFormLayout>
 
 #include <TopExp_Explorer.hxx>
 #include <TopoDS_Shape.hxx>
@@ -83,36 +93,29 @@ ModuleBase_WidgetShapeSelector::ModuleBase_WidgetShapeSelector(QWidget* theParen
                                                      ModuleBase_IWorkshop* theWorkshop,
                                                      const Config_WidgetAPI* theData,
                                                      const std::string& theParentId)
-    : ModuleBase_ModelWidget(theParent, theData, theParentId),
-      myWorkshop(theWorkshop), myIsActive(false), myUseSubShapes(false)
+    : ModuleBase_WidgetValidated(theParent, theData, theParentId),
+      myWorkshop(theWorkshop), myIsActive(false)
 {
-  myContainer = new QWidget(theParent);
-  QHBoxLayout* aLayout = new QHBoxLayout(myContainer);
+  QFormLayout* aLayout = new QFormLayout(this);
   ModuleBase_Tools::adjustMargins(aLayout);
 
   QString aLabelText = QString::fromStdString(theData->widgetLabel());
   QString aLabelIcon = QString::fromStdString(theData->widgetIcon());
-  myLabel = new QLabel(aLabelText, myContainer);
+  myLabel = new QLabel(aLabelText, this);
   if (!aLabelIcon.isEmpty())
     myLabel->setPixmap(QPixmap(aLabelIcon));
 
-  aLayout->addWidget(myLabel);
 
   QString aToolTip = QString::fromStdString(theData->widgetTooltip());
-  myTextLine = new QLineEdit(myContainer);
+  myTextLine = new QLineEdit(this);
   myTextLine->setReadOnly(true);
   myTextLine->setToolTip(aToolTip);
   myTextLine->installEventFilter(this);
 
-  aLayout->addWidget(myTextLine, 1);
+  aLayout->addRow(myLabel, myTextLine);
 
   std::string aTypes = theData->getProperty("shape_types");
   myShapeTypes = QString(aTypes.c_str()).split(' ', QString::SkipEmptyParts);
-
-  std::string aObjTypes = theData->getProperty("object_types");
-  myObjectTypes = QString(aObjTypes.c_str()).split(' ', QString::SkipEmptyParts);
-
-  myUseSubShapes = theData->getBooleanAttribute("use_subshapes", false); 
 }
 
 //********************************************************************
@@ -122,68 +125,82 @@ ModuleBase_WidgetShapeSelector::~ModuleBase_WidgetShapeSelector()
 }
 
 //********************************************************************
-bool ModuleBase_WidgetShapeSelector::storeValue() const
+bool ModuleBase_WidgetShapeSelector::storeValueCustom() const
 {
   FeaturePtr aSelectedFeature = ModelAPI_Feature::feature(mySelectedObject);
   if (aSelectedFeature == myFeature)  // In order to avoid selection of the same object
     return false;
 
   DataPtr aData = myFeature->data();
-  if (myUseSubShapes) {
-    ResultPtr aBody = std::dynamic_pointer_cast<ModelAPI_Result>(mySelectedObject);
-    if (aBody) {
-      AttributePtr aAttr = aData->attribute(attributeID());
-
-      AttributeSelectionPtr aSelectAttr = 
-        std::dynamic_pointer_cast<ModelAPI_AttributeSelection>(aAttr);
-      if (aSelectAttr)
-        aSelectAttr->setValue(aBody, myShape);
+  AttributeReferencePtr aRef = aData->reference(attributeID());
+  if (aRef) {
+    ObjectPtr aObject = aRef->value();
+    if (!(aObject && aObject->isSame(mySelectedObject))) {
+      aRef->setValue(mySelectedObject);
       updateObject(myFeature);
       return true;
     }
   } else {
-    AttributeReferencePtr aRef = aData->reference(attributeID());
-    if (aRef) {
-      ObjectPtr aObject = aRef->value();
+    AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID());
+    if (aRefAttr) {
+      ObjectPtr aObject = aRefAttr->object();
       if (!(aObject && aObject->isSame(mySelectedObject))) {
-        aRef->setValue(mySelectedObject);
+        aRefAttr->setObject(mySelectedObject);
         updateObject(myFeature);
         return true;
       }
     } else {
-      AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID());
-      if (aRefAttr) {
-        ObjectPtr aObject = aRefAttr->object();
-        if (!(aObject && aObject->isSame(mySelectedObject))) {
-          aRefAttr->setObject(mySelectedObject);
-          updateObject(myFeature);
-          return true;
-        }
+      AttributeSelectionPtr aSelectAttr = aData->selection(attributeID());
+      ResultPtr aBody = std::dynamic_pointer_cast<ModelAPI_Result>(mySelectedObject);
+      if (aSelectAttr && aBody && (myShape.get() != NULL)) {
+        aSelectAttr->setValue(aBody, myShape);
+        updateObject(myFeature);
+        return true;
       }
     }
   }
   return false;
 }
 
+//********************************************************************
+void ModuleBase_WidgetShapeSelector::clearAttribute()
+{
+  DataPtr aData = myFeature->data();
+  AttributeSelectionPtr aSelect = aData->selection(attributeID());
+  if (aSelect) {
+    aSelect->setValue(ResultPtr(), std::shared_ptr<GeomAPI_Shape>(new GeomAPI_Shape()));
+    return;
+  }
+  AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID());
+  if (aRefAttr) {
+    aRefAttr->setObject(ObjectPtr());
+    return;
+  }
+  AttributeReferencePtr aRef = aData->reference(attributeID());
+  if (aRef) {
+    aRef->setObject(ObjectPtr());
+  }
+}
+
 //********************************************************************
 bool ModuleBase_WidgetShapeSelector::restoreValue()
 {
   DataPtr aData = myFeature->data();
   bool isBlocked = this->blockSignals(true);
-  if (myUseSubShapes) {
-    AttributeSelectionPtr aSelect = aData->selection(attributeID());
-    if (aSelect) {
-      mySelectedObject = aSelect->context();
-      myShape = aSelect->value();
-    }
+
+  AttributeSelectionPtr aSelect = aData->selection(attributeID());
+  if (aSelect) {
+    mySelectedObject = aSelect->context();
+    myShape = aSelect->value();
   } else {
-    AttributeReferencePtr aRef = aData->reference(attributeID());
-    if (aRef)
-      mySelectedObject = aRef->value();
-    else {
-      AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID());
-      if (aRefAttr)
-        mySelectedObject = aRefAttr->object();
+    AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID());
+    if (aRefAttr) {
+      mySelectedObject = aRefAttr->object();
+    } else {
+      AttributeReferencePtr aRef = aData->reference(attributeID());
+      if (aRef) {
+        mySelectedObject = aRef->value();
+      }
     }
   }
   updateSelectionName();
@@ -203,64 +220,78 @@ QList<QWidget*> ModuleBase_WidgetShapeSelector::getControls() const
 //********************************************************************
 void ModuleBase_WidgetShapeSelector::onSelectionChanged()
 {
-  QObjectPtrList aObjects = myWorkshop->selection()->selectedPresentations();
-  if (aObjects.size() > 0) {
-    ObjectPtr aObject = aObjects.first();
-    if ((!mySelectedObject) && (!aObject))
-      return;
+  // In order to make reselection possible
+  // TODO: check with MPV clearAttribute();
+
+  //QObjectPtrList aObjects = myWorkshop->selection()->selectedPresentations();
+  QList<ModuleBase_ViewerPrs> aSelected = myWorkshop->selection()->getSelected();
+  if (aSelected.size() > 0) {
+    if (setSelection(aSelected.first()))
+      emit focusOutWidget(this);
+  }
+}
 
-    // Check that the selected object is result (others can not be accepted)
-    ResultPtr aRes = std::dynamic_pointer_cast<ModelAPI_Result>(aObject);
-    if (!aRes)
-      return;
+//********************************************************************
+bool ModuleBase_WidgetShapeSelector::setSelection(ModuleBase_ViewerPrs theValue)
+{
+  ObjectPtr aObject = theValue.object();
+  if ((!mySelectedObject) && (!aObject))
+    return false;
 
-    if (myFeature) {
-      // We can not select a result of our feature
-      const std::list<std::shared_ptr<ModelAPI_Result>>& aResList = myFeature->results();
-      std::list<std::shared_ptr<ModelAPI_Result> >::const_iterator aIt;
-      for (aIt = aResList.cbegin(); aIt != aResList.cend(); ++aIt) {
-        if ((*aIt) == aRes)
-          return;
-      }
-    }
-    // Check that object belongs to active document or PartSet
-    DocumentPtr aDoc = aRes->document();
-    SessionPtr aMgr = ModelAPI_Session::get();
-    if (!(aDoc == aMgr->activeDocument()) && !(aDoc == aMgr->moduleDocument()))
-      return;
+  // Check that the selected object is result (others can not be accepted)
+  ResultPtr aRes = std::dynamic_pointer_cast<ModelAPI_Result>(aObject);
+  if (!aRes)
+    return false;
 
-    // Check that the result has a shape
-    GeomShapePtr aShape = ModelAPI_Tools::shape(aRes);
-    if (!aShape)
-      return;
+  if (myFeature) {
+    // We can not select a result of our feature
+    const std::list<std::shared_ptr<ModelAPI_Result>>& aResList = myFeature->results();
+    std::list<std::shared_ptr<ModelAPI_Result> >::const_iterator aIt;
+    for (aIt = aResList.cbegin(); aIt != aResList.cend(); ++aIt) {
+      if ((*aIt) == aRes)
+        return false;
+    }
+  }
+  // Check that object belongs to active document or PartSet
+  DocumentPtr aDoc = aRes->document();
+  SessionPtr aMgr = ModelAPI_Session::get();
+  if (!(aDoc == aMgr->activeDocument()) && !(aDoc == aMgr->moduleDocument()))
+    return false;
 
-    /// Check that object has acceptable type
-    if (!acceptObjectType(aObject)) 
-      return;
+  // Check that the result has a shape
+  GeomShapePtr aShape = ModelAPI_Tools::shape(aRes);
+  if (!aShape)
+    return false;
 
-    // Get sub-shapes from local selection
-    if (myUseSubShapes) {
-      NCollection_List<TopoDS_Shape> aShapeList;
-      std::list<ObjectPtr> aOwners;
-      myWorkshop->selection()->selectedShapes(aShapeList, aOwners);
-      if (aShapeList.Extent() > 0) {
-        aShape = std::shared_ptr<GeomAPI_Shape>(new GeomAPI_Shape());
-        aShape->setImpl(new TopoDS_Shape(aShapeList.First()));
-      }
-    }
+  // Get sub-shapes from local selection
+  if (!theValue.shape().IsNull()) {
+    aShape = std::shared_ptr<GeomAPI_Shape>(new GeomAPI_Shape());
+    aShape->setImpl(new TopoDS_Shape(theValue.shape()));
+  }
 
-    // Check that the selection corresponds to selection type
-    if (myUseSubShapes) {
-      if (!acceptSubShape(aShape))
-        return;
-    } else {
-      if (!acceptObjectShape(aObject))
-        return;
+  // Check that the selection corresponds to selection type
+  if (!acceptSubShape(aShape))
+    return false;
+//  if (!acceptObjectShape(aObject))
+//      return false;
+
+  // Check whether the value is valid for the viewer selection filters
+  Handle(SelectMgr_EntityOwner) anOwner = theValue.owner();
+  if (!anOwner.IsNull()) {
+    SelectMgr_ListOfFilter aFilters;
+    selectionFilters(myWorkshop, aFilters);
+    SelectMgr_ListIteratorOfListOfFilter aIt(aFilters);
+    for (; aIt.More(); aIt.Next()) {
+      const Handle(SelectMgr_Filter)& aFilter = aIt.Value();
+      if (!aFilter->IsOk(anOwner))
+        return false;
     }
+  }
+  if (isValid(aObject, aShape)) {
     setObject(aObject, aShape);
-    //activateSelection(false);
-    emit focusOutWidget(this);
+    return true;
   }
+  return false;
 }
 
 //********************************************************************
@@ -272,38 +303,38 @@ void ModuleBase_WidgetShapeSelector::setObject(ObjectPtr theObj, std::shared_ptr
     raisePanel();
   } 
   updateSelectionName();
-  //activateSelection(false);
   emit valuesChanged();
 }
 
 //********************************************************************
-bool ModuleBase_WidgetShapeSelector::acceptObjectShape(const ObjectPtr theResult) const
-{
-  ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(theResult);
-
-  // Check that the shape of necessary type
-  std::shared_ptr<GeomAPI_Shape> aShapePtr = ModelAPI_Tools::shape(aResult);
-  if (!aShapePtr)
-    return false;
-  TopoDS_Shape aShape = aShapePtr->impl<TopoDS_Shape>();
-  if (aShape.IsNull())
-    return false;
-
-  TopAbs_ShapeEnum aShapeType = aShape.ShapeType();
-  if (aShapeType == TopAbs_COMPOUND) {
-    foreach (QString aType, myShapeTypes) {
-      TopExp_Explorer aEx(aShape, shapeType(aType));
-      if (aEx.More())
-        return true;
-    }
-  } else {
-    foreach (QString aType, myShapeTypes) {
-      if (shapeType(aType) == aShapeType)
-        return true;
-    }
-  }
-  return false;
-}
+//bool ModuleBase_WidgetShapeSelector::acceptObjectShape(const ObjectPtr theResult) const
+//{
+//  ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(theResult);
+//
+//  // Check that the shape of necessary type
+//  std::shared_ptr<GeomAPI_Shape> aShapePtr = ModelAPI_Tools::shape(aResult);
+//  if (!aShapePtr)
+//    return false;
+//  TopoDS_Shape aShape = aShapePtr->impl<TopoDS_Shape>();
+//  if (aShape.IsNull())
+//    return false;
+//
+//  TopAbs_ShapeEnum aShapeType = aShape.ShapeType();
+//  if (aShapeType == TopAbs_COMPOUND) {
+//    foreach (QString aType,
+//      myShapeTypes) {
+//      TopExp_Explorer aEx(aShape, shapeType(aType));
+//      if (aEx.More())
+//        return true;
+//    }
+//  } else {
+//    foreach (QString aType, myShapeTypes) {
+//      if (shapeType(aType) == aShapeType)
+//        return true;
+//    }
+//  }
+//  return false;
+//}
 
 //********************************************************************
 bool ModuleBase_WidgetShapeSelector::acceptSubShape(std::shared_ptr<GeomAPI_Shape> theShape) const
@@ -316,35 +347,26 @@ bool ModuleBase_WidgetShapeSelector::acceptSubShape(std::shared_ptr<GeomAPI_Shap
   return false;
 }
 
-//********************************************************************
-bool ModuleBase_WidgetShapeSelector::acceptObjectType(const ObjectPtr theObject) const
-{
-  // Definition of types is not obligatory. If types are not defined then
-  // it means that accepted any type
-  if (myObjectTypes.isEmpty())
-    return true;
-
-  foreach (QString aType, myObjectTypes) {
-    if (aType.toLower() == "construction") {
-      ResultConstructionPtr aConstr = 
-        std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(theObject);
-      return (aConstr != NULL);
-    } // ToDo: Process other types of objects
-  }
-  // Object type is defined but not found
-  return false;
-}
-
-
 //********************************************************************
 void ModuleBase_WidgetShapeSelector::updateSelectionName()
 {
-  if (mySelectedObject) {
-    std::string aName = mySelectedObject->data()->name();
-    myTextLine->setText(QString::fromStdString(aName));
-  } else {
-    if (myIsActive) {
-      myTextLine->setText("");
+  DataPtr aData = myFeature->data();
+  bool isNameUpdated = false;
+  if (aData.get() != NULL) {
+    AttributeSelectionPtr aSelect = aData->selection(attributeID());
+    if (aSelect) {
+      myTextLine->setText(QString::fromStdString(aSelect->namingName()));
+      isNameUpdated = true;
+    }
+  }
+  if (!isNameUpdated) {
+    if (mySelectedObject) {
+      std::string aName = mySelectedObject->data()->name();
+      myTextLine->setText(QString::fromStdString(aName));
+    } else {
+      if (myIsActive) {
+        myTextLine->setText("");
+      }
     }
   }
 }
@@ -359,35 +381,22 @@ void ModuleBase_WidgetShapeSelector::activateSelection(bool toActivate)
   updateSelectionName();
 
   if (myIsActive) {
-    connect(myWorkshop, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged()));
-    if (myUseSubShapes) {
-
-      QIntList aList;
-      foreach (QString aType, myShapeTypes)
-        aList.append(shapeType(aType));
-      myWorkshop->activateSubShapesSelection(aList);
-      if (!myObjectTypes.isEmpty()) {
-        myObjTypeFilter = new ModuleBase_ObjectTypesFilter(myWorkshop, myObjectTypes);
-        myWorkshop->viewer()->clearSelectionFilters();
-        myWorkshop->viewer()->addSelectionFilter(myObjTypeFilter);
-      }
+    QIntList aList;
+    foreach (QString aType, myShapeTypes) {
+      aList.append(shapeType(aType));
     }
+    myWorkshop->activateSubShapesSelection(aList);
   } else {
-    disconnect(myWorkshop, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged()));
-    if (myUseSubShapes) {
-      if (!myObjTypeFilter.IsNull()) {
-        myWorkshop->viewer()->removeSelectionFilter(myObjTypeFilter);
-        myObjTypeFilter.Nullify();
-      }
-      myWorkshop->deactivateSubShapesSelection();
-    }
+    myWorkshop->deactivateSubShapesSelection();
   }
+
+  activateFilters(myWorkshop, myIsActive);
 }
 
 //********************************************************************
 void ModuleBase_WidgetShapeSelector::raisePanel() const
 {
-  QWidget* aParent = myContainer->parentWidget();
+  QWidget* aParent = this->parentWidget();
   QWidget* aLastPanel = 0;
   while (!aParent->inherits("QDockWidget")) {
     aLastPanel = aParent;
@@ -402,30 +411,100 @@ void ModuleBase_WidgetShapeSelector::raisePanel() const
 }
 
 //********************************************************************
-bool ModuleBase_WidgetShapeSelector::setValue(ModuleBase_WidgetValue* theValue)
+void ModuleBase_WidgetShapeSelector::activateCustom()
 {
-  if (theValue) {
-    ModuleBase_WidgetValueFeature* aFeatureValue =
-        dynamic_cast<ModuleBase_WidgetValueFeature*>(theValue);
-    if (aFeatureValue && aFeatureValue->object()) {
-      ObjectPtr aObject = aFeatureValue->object();
-      if (acceptObjectShape(aObject)) {
-        setObject(aObject);
-        return true;
-      }
-    }
-  }
-  return false;
+  connect(myWorkshop, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged()));
+  activateSelection(true);
 }
 
 //********************************************************************
-void ModuleBase_WidgetShapeSelector::activate()
+void ModuleBase_WidgetShapeSelector::deactivate()
 {
-  activateSelection(true);
+  activateSelection(false);
+  disconnect(myWorkshop, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged()));
 }
 
 //********************************************************************
-void ModuleBase_WidgetShapeSelector::deactivate()
+bool ModuleBase_WidgetShapeSelector::isValid(ObjectPtr theObj, std::shared_ptr<GeomAPI_Shape> theShape)
 {
-  activateSelection(false);
+  bool isValid = ModuleBase_WidgetValidated::isValid(theObj, theShape);
+  if (!isValid)
+    return false;
+
+  SessionPtr aMgr = ModelAPI_Session::get();
+  ModelAPI_ValidatorsFactory* aFactory = aMgr->validators();
+  std::list<ModelAPI_Validator*> aValidators;
+  std::list<std::list<std::string> > anArguments;
+  aFactory->validators(parentID(), attributeID(), aValidators, anArguments);
+
+  DataPtr aData = myFeature->data();
+  //AttributePtr aAttr = aData->attribute(attributeID());
+  AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID());
+  if (aRefAttr) {
+    // 1. saves the previous attribute values
+    bool isObject = aRefAttr->isObject();
+    ObjectPtr aPrevObject = aRefAttr->object();
+    AttributePtr aPrevAttr = aRefAttr->attr();
+
+    // 2. store the current values, disable the model's update
+    aData->blockSendAttributeUpdated(true);
+    ObjectPtr aPrevSelectedObject = mySelectedObject;
+    GeomShapePtr aPrevShape = myShape;
+
+    mySelectedObject = theObj;
+    myShape = theShape;
+    storeValueCustom();
+
+    // 3. check the acceptability of the current values
+    std::list<ModelAPI_Validator*>::iterator aValidator = aValidators.begin();
+    std::list<std::list<std::string> >::iterator aArgs = anArguments.begin();
+    bool aValid = true;
+    for (; aValidator != aValidators.end() && aValid; aValidator++, aArgs++) {
+      const ModelAPI_RefAttrValidator* aAttrValidator =
+          dynamic_cast<const ModelAPI_RefAttrValidator*>(*aValidator);
+      if (aAttrValidator) {
+        aValid = aAttrValidator->isValid(aRefAttr, *aArgs);
+      }
+    }
+
+    // 4. if the values are not valid, restore the previous values to the attribute
+    //if (!aValid) {
+    mySelectedObject = aPrevSelectedObject;
+    myShape = aPrevShape;
+    if (isObject)
+      aRefAttr->setObject(aPrevObject);
+    else
+      aRefAttr->setAttr(aPrevAttr);
+    //}
+    // 5. enable the model's update
+    aData->blockSendAttributeUpdated(false);
+    //updateObject(myFeature);
+
+    return aValid;
+  }
+
+  // Check the acceptability of the object as attribute
+  std::list<ModelAPI_Validator*>::iterator aValidator = aValidators.begin();
+  std::list<std::list<std::string> >::iterator aArgs = anArguments.begin();
+  for (; aValidator != aValidators.end(); aValidator++, aArgs++) {
+    const ModelAPI_RefAttrValidator* aAttrValidator =
+        dynamic_cast<const ModelAPI_RefAttrValidator*>(*aValidator);
+    if (aAttrValidator) {
+      //if (!aAttrValidator->isValid(myFeature, *aArgs, theObj)) {
+      //  return false;
+      //}
+    }
+    else {
+      const ModelAPI_ShapeValidator* aShapeValidator = 
+                               dynamic_cast<const ModelAPI_ShapeValidator*>(*aValidator);
+      if (aShapeValidator) {
+        DataPtr aData = myFeature->data();
+        AttributeSelectionPtr aSelectAttr = aData->selection(attributeID());
+        if (!aShapeValidator->isValid(myFeature, *aArgs, theObj, aSelectAttr, theShape)) {
+          return false;
+        }
+      }
+    }
+  }
+  return true;
 }