X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetShapeSelector.cpp;h=7031b5c1e2e5e22d0abdbac2fc3bc228cd5dea59;hb=e8fc74b565b939f9d7ab151c00006f4999572c86;hp=49fe8cf55b8043e12aa6fb36fcc9b9696e828059;hpb=4019e4f7f2008ea45b40e16118d895c4c8ba8a05;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
index 49fe8cf55..7031b5c1e 100644
--- a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
@@ -35,6 +35,7 @@
 #include <ModelAPI_Validator.h>
 #include <ModelAPI_ResultValidator.h>
 #include <ModelAPI_RefAttrValidator.h>
+#include <ModelAPI_ShapeValidator.h>
 
 #include <Config_WidgetAPI.h>
 #include <Events_Error.h>
@@ -92,7 +93,7 @@ ModuleBase_WidgetShapeSelector::ModuleBase_WidgetShapeSelector(QWidget* theParen
                                                      const Config_WidgetAPI* theData,
                                                      const std::string& theParentId)
     : ModuleBase_ModelWidget(theParent, theData, theParentId),
-      myWorkshop(theWorkshop), myIsActive(false), myUseSubShapes(false)
+      myWorkshop(theWorkshop), myIsActive(false)
 {
   myContainer = new QWidget(theParent);
   QHBoxLayout* aLayout = new QHBoxLayout(myContainer);
@@ -119,8 +120,6 @@ ModuleBase_WidgetShapeSelector::ModuleBase_WidgetShapeSelector(QWidget* theParen
 
   std::string aObjTypes = theData->getProperty("object_types");
   myObjectTypes = QString(aObjTypes.c_str()).split(' ', QString::SkipEmptyParts);
-
-  myUseSubShapes = theData->getBooleanAttribute("use_subshapes", false); 
 }
 
 //********************************************************************
@@ -137,45 +136,30 @@ bool ModuleBase_WidgetShapeSelector::storeValue() const
     return false;
 
   DataPtr aData = myFeature->data();
-  if (myUseSubShapes) {
-    ResultPtr aBody = std::dynamic_pointer_cast<ModelAPI_Result>(mySelectedObject);
-    if (aBody) {
-      AttributePtr aAttr = aData->attribute(attributeID());
-
-      // We have to check several attributes types
-      AttributeSelectionPtr aSelectAttr = 
-        std::dynamic_pointer_cast<ModelAPI_AttributeSelection>(aAttr);
-      if (aSelectAttr) {
-        aSelectAttr->setValue(aBody, myShape);
-        updateObject(myFeature);
-        return true;
-      } else {
-        AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID());
-        if (aRefAttr) {
-          aRefAttr->setObject(mySelectedObject);
-          updateObject(myFeature);
-          return true;
-        }
-      }
+  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;
       }
     }
   }
@@ -207,26 +191,21 @@ 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 {
+    AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID());
+    if (aRefAttr) {
+      mySelectedObject = aRefAttr->object();
     } else {
-      AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID());
-      if (aRefAttr) {
-        mySelectedObject = aRefAttr->object();
+      AttributeReferencePtr aRef = aData->reference(attributeID());
+      if (aRef) {
+        mySelectedObject = aRef->value();
       }
     }
-  } else {
-    AttributeReferencePtr aRef = aData->reference(attributeID());
-    if (aRef)
-      mySelectedObject = aRef->value();
-    else {
-      AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID());
-      if (aRefAttr)
-        mySelectedObject = aRefAttr->object();
-    }
   }
   updateSelectionName();
 
@@ -293,20 +272,28 @@ bool ModuleBase_WidgetShapeSelector::setSelection(ModuleBase_ViewerPrs theValue)
     return false;
 
   // Get sub-shapes from local selection
-  if (myUseSubShapes) {
-    if (!theValue.shape().IsNull()) {
-      aShape = std::shared_ptr<GeomAPI_Shape>(new GeomAPI_Shape());
-      aShape->setImpl(new TopoDS_Shape(theValue.shape()));
-    }
+  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 false;
-  } else {
-    if (!acceptObjectShape(aObject))
-      return false;
+  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(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);
@@ -328,33 +315,34 @@ void ModuleBase_WidgetShapeSelector::setObject(ObjectPtr theObj, std::shared_ptr
 }
 
 //********************************************************************
-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
@@ -390,12 +378,23 @@ bool ModuleBase_WidgetShapeSelector::acceptObjectType(const ObjectPtr theObject)
 //********************************************************************
 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("");
+      }
     }
   }
 }
@@ -412,45 +411,34 @@ void ModuleBase_WidgetShapeSelector::activateSelection(bool toActivate)
 
   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);
-        aViewer->clearSelectionFilters();
-        aViewer->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()) {
-        aViewer->removeSelectionFilter(myObjTypeFilter);
-        myObjTypeFilter.Nullify();
-      }
-      myWorkshop->deactivateSubShapesSelection();
-    }
+    myWorkshop->deactivateSubShapesSelection();
+  }
+
+  // the initial code is moved here in order to clear filters, it is possible, that it is excessive and 
+  // is performed outside
+  if (myIsActive && !myObjectTypes.isEmpty()) {
+    aViewer->clearSelectionFilters();
   }
-  // apply filters loaded from the XML definition of the widget
-  ModuleBase_FilterFactory* aFactory = myWorkshop->selectionFilters();
   SelectMgr_ListOfFilter aFilters;
-  aFactory->filters(parentID(), attributeID(), aFilters);
+  selectionFilters(aFilters);
   SelectMgr_ListIteratorOfListOfFilter aIt(aFilters);
   for (; aIt.More(); aIt.Next()) {
-    Handle(SelectMgr_Filter) aSelFilter = aIt.Value();
-    if (aSelFilter.IsNull())
-      continue;
-
-    Handle(ModuleBase_Filter) aFilter = Handle(ModuleBase_Filter)::DownCast(aIt.Value());
-    if (aFilter.IsNull())
-      continue;
+    const Handle(SelectMgr_Filter)& aSelFilter = aIt.Value();
     if (myIsActive)
-      aViewer->addSelectionFilter(aFilter);
+      aViewer->addSelectionFilter(aSelFilter);
     else
-      aViewer->removeSelectionFilter(aFilter);
+      aViewer->removeSelectionFilter(aSelFilter);
+  }
+  // the internal filter should be removed by the widget deactivation, it is done historically
+  if (!myIsActive && !myObjTypeFilter.IsNull()) {
+    myObjTypeFilter.Nullify();
   }
 }
 
@@ -472,20 +460,7 @@ void ModuleBase_WidgetShapeSelector::raisePanel() const
 }
 
 //********************************************************************
-//bool ModuleBase_WidgetShapeSelector::setSelection(ModuleBase_ViewerPrs theValue)
-//{
-//  if (theValue.object()) {
-//    ObjectPtr aObject = theValue.object();
-//    if (acceptObjectShape(aObject)) {
-//      setObject(aObject);
-//      return true;
-//    }
-//  }
-//  return false;
-//}
-
-//********************************************************************
-void ModuleBase_WidgetShapeSelector::activate()
+void ModuleBase_WidgetShapeSelector::activateCustom()
 {
   activateSelection(true);
 }
@@ -533,6 +508,17 @@ bool ModuleBase_WidgetShapeSelector::isValid(ObjectPtr theObj, std::shared_ptr<G
         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, aSelectAttr, theShape)) {
+          return false;
+        }
+      }
+    }
   }
   return true;
 }
\ No newline at end of file