Salome HOME
Copyright update 2022
[modules/shaper.git] / src / ModuleBase / ModuleBase_WidgetSelectionFilter.cpp
index 5112ba68bcaed95001dbb34d3385a96acc3236ba..780d4cddd3f1da280c702508b3b0a688d4bfdda5 100644 (file)
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2022  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 #include "ModuleBase_WidgetSelectionFilter.h"
 #include "ModuleBase_Tools.h"
 #include "ModuleBase_IWorkshop.h"
+#include "ModuleBase_ISelectionActivate.h"
 #include "ModuleBase_IModule.h"
 #include "ModuleBase_IViewer.h"
 #include "ModuleBase_IPropertyPanel.h"
 #include "ModuleBase_PageWidget.h"
 #include "ModuleBase_WidgetMultiSelector.h"
 #include "ModuleBase_ResultPrs.h"
+#include "ModuleBase_WidgetFactory.h"
 
 #include <ModelAPI_Session.h>
 #include <ModelAPI_AttributeSelectionList.h>
+#include <ModelAPI_Events.h>
+#include <ModelAPI_FiltersFactory.h>
+#include <ModelAPI_ResultBody.h>
+
 #include <GeomAPI_ShapeExplorer.h>
+#include <GeomAPI_Edge.h>
+
+#include <Events_Loop.h>
+#include <Config_ValidatorReader.h>
 
 #include <AIS_InteractiveContext.hxx>
 #include <StdSelect_BRepOwner.hxx>
 #include <TopoDS_Compound.hxx>
 #include <BRep_Builder.hxx>
+#include <TopExp_Explorer.hxx>
 
 #include <QLayout>
 #include <QPushButton>
 #include <QGroupBox>
 #include <QDialog>
 #include <QToolButton>
+#include <QCheckBox>
+#include <QDir>
+
+#ifdef WIN32
+#pragma warning(disable : 4456) // for nested foreach
+#endif
 
-static FeaturePtr SelectorFeature;
-static std::string AttributeId;
+FeaturePtr ModuleBase_WidgetSelectionFilter::SelectorFeature;
+std::string ModuleBase_WidgetSelectionFilter::AttributeId;
 
 
 GeomAPI_Shape::ShapeType selectionType(const QString& theType)
@@ -82,33 +99,46 @@ ModuleBase_FilterStarter::ModuleBase_FilterStarter(const std::string& theFeature
   ModuleBase_Tools::adjustMargins(aMainLayout);
 
   aMainLayout->addStretch(1);
-  QPushButton* aLaunchBtn = new QPushButton(tr("Selection by filters"), this);
+  QPushButton* aLaunchBtn = new QPushButton(
+      ModuleBase_Tools::translate("FiltersSelection", "Selection by filters"), this);
   connect(aLaunchBtn, SIGNAL(clicked()), SLOT(onFiltersLaunch()));
   aMainLayout->addWidget(aLaunchBtn);
-
-  myFilterLbl = new QLabel(this);
-  myFilterLbl->setPixmap(QPixmap(":pictures/filter.png"));
-  aMainLayout->addWidget(myFilterLbl);
-
-  myModifyLbl = new QLabel(this);
-  myModifyLbl->setPixmap(QPixmap(":pictures/plus_minus.png"));
-  aMainLayout->addWidget(myModifyLbl);
-  aMainLayout->addStretch(1);
-
-  myFilterLbl->hide();
-  myModifyLbl->hide();
 }
 
 void ModuleBase_FilterStarter::onFiltersLaunch()
 {
+  static QString aHelpFileName = QString("FiltersPlugin") + QDir::separator() +
+    QString("FiltersPlugin.html");
+
+  ModuleBase_Operation* aParentOp = myWorkshop->currentOperation();
+  ModuleBase_OperationFeature* aFeatureOp = dynamic_cast<ModuleBase_OperationFeature*>(aParentOp);
+  if (aFeatureOp)
+    // Open transaction on filters operation finish
+    aFeatureOp->openTransactionOnResume();
+
+  QWidget* aParent = parentWidget();
   ModuleBase_WidgetMultiSelector* aSelector =
-    dynamic_cast<ModuleBase_WidgetMultiSelector*>(parent());
-  SelectorFeature = aSelector->feature();
-  AttributeId = aSelector->attributeID();
+    dynamic_cast<ModuleBase_WidgetMultiSelector*>(aParent);
+  while (!aSelector) {
+    aParent = aParent->parentWidget();
+    aSelector = dynamic_cast<ModuleBase_WidgetMultiSelector*>(aParent);
+  }
+  if (!aSelector)
+    return;
+  ModuleBase_WidgetSelectionFilter::SelectorFeature = aSelector->feature();
+  ModuleBase_WidgetSelectionFilter::AttributeId = aSelector->attributeID();
 
   // Launch Filters operation
   ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>
     (myWorkshop->module()->createOperation(myFeatureName));
+
+  AttributeSelectionListPtr aAttrList =
+    ModuleBase_WidgetSelectionFilter::SelectorFeature->selectionList(
+      ModuleBase_WidgetSelectionFilter::AttributeId);
+  FiltersFeaturePtr aFilters = aAttrList->filters();
+  if (aFilters.get())
+    aFOperation->setFeature(aFilters);
+  aFOperation->setHelpFileName(aHelpFileName);
   myWorkshop->processLaunchOperation(aFOperation);
 }
 
@@ -116,44 +146,89 @@ void ModuleBase_FilterStarter::onFiltersLaunch()
 //*****************************************************************************
 //*****************************************************************************
 ModuleBase_FilterItem::ModuleBase_FilterItem(
-  const std::string& theFilter, FeaturePtr theSelection, QWidget* theParent)
-  : QWidget(theParent), myFilterID(theFilter),
-    mySelection(std::dynamic_pointer_cast<ModelAPI_FiltersFeature>(theSelection))
+  const std::string& theFilter, ModuleBase_WidgetSelectionFilter* theParent)
+  : QWidget(theParent->filtersWidget()), myFilterID(theFilter),
+    mySelection(std::dynamic_pointer_cast<ModelAPI_FiltersFeature>(theParent->feature()))
+{
+  FilterPtr aFilter = ModelAPI_Session::get()->filters()->filter(theFilter);
+  std::string aXmlString = aFilter->xmlRepresentation();
+  if (aXmlString.length() == 0)
+    addItemRow(this);
+  else {
+    std::string anAttrPrefix; // this must be added to the attributes names for multiple filters
+    std::string aFilterKind = ModelAPI_Session::get()->filters()->id(aFilter);
+    if (theFilter != aFilterKind) {
+      anAttrPrefix = theFilter.substr(0, theFilter.size() - aFilterKind.size());
+    }
+    ModuleBase_WidgetFactory aFactory(aXmlString, theParent->workshop(), anAttrPrefix);
+    Config_ValidatorReader aValidatorReader(aXmlString, true);
+    aValidatorReader.setFeatureId(mySelection->getKind());
+    aValidatorReader.readAll();
+
+    QVBoxLayout* aLayout = new QVBoxLayout(this);
+    ModuleBase_Tools::zeroMargins(aLayout);
+
+    QWidget* aItemRow = new QWidget(this);
+    addItemRow(aItemRow);
+    aLayout->addWidget(aItemRow);
+
+    ModuleBase_PageWidget* aParamsWgt = new ModuleBase_PageWidget(this);
+    aParamsWgt->setFrameStyle(QFrame::Box | QFrame::Raised);
+    aFactory.createWidget(aParamsWgt);
+    ModuleBase_Tools::zeroMargins(aParamsWgt->layout());
+    myWidgets = aFactory.getModelWidgets();
+    foreach(ModuleBase_ModelWidget* aWidget, myWidgets) {
+      aWidget->setFeature(theParent->feature());
+      connect(aWidget, SIGNAL(focusInWidget(ModuleBase_ModelWidget*)),
+        theParent, SIGNAL(focusInWidget(ModuleBase_ModelWidget*)));
+      connect(aWidget, SIGNAL(focusOutWidget(ModuleBase_ModelWidget*)),
+        theParent, SIGNAL(focusOutWidget(ModuleBase_ModelWidget*)));
+      connect(aWidget, SIGNAL(objectUpdated()), theParent, SLOT(onObjectUpdated()));
+      aWidget->enableFocusProcessing();
+    }
+    aLayout->addWidget(aParamsWgt);
+  }
+}
+
+void ModuleBase_FilterItem::addItemRow(QWidget* theParent)
 {
-  QHBoxLayout* aLayout = new QHBoxLayout(this);
-  aLayout->setContentsMargins(0, 0, 0, 0);
+  std::string aContext = mySelection->getKind();
+  QHBoxLayout* aLayout = new QHBoxLayout(theParent);
+  ModuleBase_Tools::zeroMargins(aLayout);
 
   // Reverse filter button
-  myRevBtn = new QToolButton(this);
+  myRevBtn = new QToolButton(theParent);
   myRevBtn->setCheckable(true);
-  myRevBtn->setChecked(false);
+  bool isReversed = mySelection->isReversed(myFilterID);
+  myRevBtn->setChecked(isReversed);
   myRevBtn->setAutoRaise(true);
-  myRevBtn->setIcon(QIcon(":pictures/accept.png"));
-  myRevBtn->setToolTip(tr("Reverse the filter"));
+  if (isReversed)
+    myRevBtn->setIcon(QIcon(":pictures/reverce.png"));
+  else
+    myRevBtn->setIcon(QIcon(":pictures/add.png"));
+  myRevBtn->setToolTip(ModuleBase_Tools::translate(aContext, "Reverse the filter"));
   connect(myRevBtn, SIGNAL(toggled(bool)), SLOT(onReverse(bool)));
   aLayout->addWidget(myRevBtn);
 
   const std::string& aFilterName = ModelAPI_Session::get()->filters()->filter(myFilterID)->name();
-  aLayout->addWidget(new QLabel(aFilterName.c_str(), this), 1);
+  aLayout->addWidget(new QLabel(ModuleBase_Tools::translate(aContext, aFilterName), theParent), 1);
 
-  QToolButton* aDelBtn = new QToolButton(this);
-  aDelBtn->setIcon(QIcon(":pictures/button_cancel.png"));
+  QToolButton* aDelBtn = new QToolButton(theParent);
+  aDelBtn->setIcon(QIcon(":pictures/delete.png"));
   aDelBtn->setAutoRaise(true);
-  aDelBtn->setToolTip(tr("Delete the filter"));
+  aDelBtn->setToolTip(ModuleBase_Tools::translate(aContext, "Delete the filter"));
   connect(aDelBtn, SIGNAL(clicked(bool)), SLOT(onDelete()));
   aLayout->addWidget(aDelBtn);
-
-  myRevBtn->setChecked(mySelection->isReversed(myFilterID));
 }
 
-
 void ModuleBase_FilterItem::onReverse(bool theCheck)
 {
   mySelection->setReversed(myFilterID, theCheck);
   if (theCheck)
-    myRevBtn->setIcon(QIcon(":pictures/stop.png"));
+    myRevBtn->setIcon(QIcon(":pictures/reverce.png"));
   else
-    myRevBtn->setIcon(QIcon(":pictures/accept.png"));
+    myRevBtn->setIcon(QIcon(":pictures/add.png"));
+  emit reversedItem(this);
 }
 
 void ModuleBase_FilterItem::onDelete()
@@ -166,60 +241,49 @@ void ModuleBase_FilterItem::onDelete()
 //*****************************************************************************
 //*****************************************************************************
 ModuleBase_WidgetSelectionFilter::ModuleBase_WidgetSelectionFilter(QWidget* theParent,
-  ModuleBase_IWorkshop* theWorkshop, const Config_WidgetAPI* theData)
+  ModuleBase_IWorkshop* theWorkshop, const Config_WidgetAPI* theData, bool theReadOnly)
   : ModuleBase_ModelWidget(theParent, theData),
   myWorkshop(theWorkshop),
-  mySelectorFeature(SelectorFeature),
-  mySelectorAttribute(AttributeId)
+  mySelectorFeature(ModuleBase_WidgetSelectionFilter::SelectorFeature),
+  mySelectorAttribute(ModuleBase_WidgetSelectionFilter::AttributeId)
 {
   // Clear Old selection
-  AttributePtr aAttr = SelectorFeature->attribute(AttributeId);
-  AttributeSelectionListPtr aSelListAttr =
-    std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(aAttr);
-  mySelectionType = selectionType(aSelListAttr->selectionType().c_str());
-  aSelListAttr->clear();
+    AttributeSelectionListPtr aAttrList = mySelectorFeature->selectionList(mySelectorAttribute);
+    mySelectionType = selectionType(aAttrList->selectionType().c_str());
+  if (!theReadOnly) {
+    aAttrList->clear();
+  }
 
   // Define widgets
   QVBoxLayout* aMainLayout = new QVBoxLayout(this);
   ModuleBase_Tools::adjustMargins(aMainLayout);
 
-  myFiltersGroup = new QGroupBox(tr("Dynamic Filters"), this);
-  myGroupLayout = new QVBoxLayout(myFiltersGroup);
-  myGroupLayout->setContentsMargins(0, 0, 0, 0);
-  myGroupLayout->setSpacing(0);
+  QGroupBox* aFiltersGroup = new QGroupBox(translate("Filters"), this);
+  QVBoxLayout* aGroupLayout = new QVBoxLayout(aFiltersGroup);
+  aGroupLayout->setContentsMargins(0, 0, 0, 0);
+  aGroupLayout->setSpacing(0);
 
-  QWidget* aFiltersWgt = new QWidget(myFiltersGroup);
-  QHBoxLayout* aFiltersLay = new QHBoxLayout(aFiltersWgt);
-  ModuleBase_Tools::adjustMargins(aFiltersLay);
+  myFiltersWgt = new QWidget();
+  myFiltersLayout = new QVBoxLayout(myFiltersWgt);
+  myFiltersLayout->setContentsMargins(0, 0, 0, 0);
+  aGroupLayout->addWidget(myFiltersWgt);
 
-  QLabel* aFilterLbl = new QLabel(aFiltersWgt);
-  aFilterLbl->setPixmap(QPixmap(":pictures/filter.png"));
-
-  myFiltersCombo = new QComboBox(aFiltersWgt);
+  myFiltersCombo = new QComboBox(aFiltersGroup);
+  myFiltersCombo->addItem(translate("Add new filter..."));
   SessionPtr aSession = ModelAPI_Session::get();
   std::list<FilterPtr> allFilters =
     aSession->filters()->filters((GeomAPI_Shape::ShapeType) mySelectionType);
+  storeFilters(allFilters);
   QStringList aItems;
   std::list<FilterPtr>::const_iterator aIt;
   for (aIt = allFilters.cbegin(); aIt != allFilters.cend(); aIt++) {
-    aItems.push_back((*aIt)->name().c_str());
-    myFilters.push_back(aSession->filters()->id(*aIt));
+    aItems.push_back(translate((*aIt)->name().c_str()));
   }
   myFiltersCombo->addItems(aItems);
+  connect(myFiltersCombo, SIGNAL(currentIndexChanged(int)), SLOT(onAddFilter(int)));
 
-  QToolButton* aAddBtn = new QToolButton(aFiltersWgt);
-  aAddBtn->setIcon(QIcon(":pictures/add.png"));
-  aAddBtn->setAutoRaise(true);
-  aAddBtn->setToolTip(tr("Add the current filter"));
-  connect(aAddBtn, SIGNAL(clicked()), SLOT(onAddItem()));
-
-  aFiltersLay->addWidget(aFilterLbl);
-  aFiltersLay->addWidget(myFiltersCombo, 1);
-  aFiltersLay->addWidget(aAddBtn);
-
-  myGroupLayout->addWidget(aFiltersWgt);
-
-  aMainLayout->addWidget(myFiltersGroup);
+  aGroupLayout->addWidget(myFiltersCombo);
+  aMainLayout->addWidget(aFiltersGroup);
 
   // Select Button
   QWidget* aBtnWgt = new QWidget(this);
@@ -228,7 +292,7 @@ ModuleBase_WidgetSelectionFilter::ModuleBase_WidgetSelectionFilter(QWidget* theP
 
   aBtnLayout->addStretch(1);
 
-  mySelectBtn = new QPushButton(tr("Select"), aBtnWgt);
+  mySelectBtn = new QPushButton(translate("Select"), aBtnWgt);
   connect(mySelectBtn, SIGNAL(clicked()), SLOT(onSelect()));
   aBtnLayout->addWidget(mySelectBtn);
 
@@ -237,32 +301,29 @@ ModuleBase_WidgetSelectionFilter::ModuleBase_WidgetSelectionFilter(QWidget* theP
   // Label widgets
   QWidget* aLblWgt = new QWidget(this);
   QHBoxLayout* aLblLayout = new QHBoxLayout(aLblWgt);
-  ModuleBase_Tools::adjustMargins(aLblLayout);
+  ModuleBase_Tools::zeroMargins(aLblLayout);
 
-  aLblLayout->addWidget(new QLabel(tr("Number of selected objects:"), aLblWgt));
+  aLblLayout->addWidget(new QLabel(translate("Number of selected objects:"), aLblWgt));
 
   myNbLbl = new QLabel("0", aLblWgt);
   aLblLayout->addWidget(myNbLbl);
 
-  aMainLayout->addWidget(aLblWgt);
-
   // Show only button
-  QWidget* aBtn2Wgt = new QWidget(this);
-  QHBoxLayout* aBtn2Layout = new QHBoxLayout(aBtn2Wgt);
-  ModuleBase_Tools::adjustMargins(aBtn2Layout);
-
-  aBtn2Layout->addStretch(1);
-
-  myShowBtn = new QPushButton(tr("Show only"), aBtn2Wgt);
-  myShowBtn->setCheckable(true);
+  myShowBtn = new QCheckBox(translate("Show only"), this);
   connect(myShowBtn, SIGNAL(toggled(bool)), SLOT(onShowOnly(bool)));
-  aBtn2Layout->addWidget(myShowBtn);
+  aLblLayout->addWidget(myShowBtn);
 
-  aMainLayout->addWidget(aBtn2Wgt);
+  aMainLayout->addWidget(aLblWgt);
 
   aMainLayout->addStretch(1);
 
   updateSelectBtn();
+  if (theReadOnly) {
+    myFiltersCombo->hide();
+    mySelectBtn->hide();
+    aLblWgt->hide();
+    myShowBtn->hide();
+  }
 }
 
 ModuleBase_WidgetSelectionFilter::~ModuleBase_WidgetSelectionFilter()
@@ -272,60 +333,118 @@ ModuleBase_WidgetSelectionFilter::~ModuleBase_WidgetSelectionFilter()
     Handle(AIS_InteractiveContext) aCtx = myWorkshop->viewer()->AISContext();
     aCtx->Remove(myPreview, false);
     myPreview.Nullify();
-    if (myShowBtn->isChecked()) {
+    if (myListIO.Size() > 0) {
+      aCtx = myWorkshop->viewer()->AISContext();
       AIS_ListOfInteractive::const_iterator aIt;
       Handle(AIS_Shape) aShapeIO;
       for (aIt = myListIO.cbegin(); aIt != myListIO.cend(); aIt++) {
         aShapeIO = Handle(AIS_Shape)::DownCast(*aIt);
         if (!aShapeIO.IsNull()) {
           aCtx->Display(aShapeIO, false);
+          std::shared_ptr<GeomAPI_AISObject> anAISObj = AISObjectPtr(new GeomAPI_AISObject());
+          anAISObj->setImpl(new Handle(AIS_InteractiveObject)(aShapeIO));
+          myWorkshop->applyCurrentSelectionModes(anAISObj);
         }
       }
+      myListIO.Clear();
+      myShowBtn->setChecked(false);
     }
-    aCtx->UpdateCurrentViewer();
+    myWorkshop->viewer()->update();
   }
   SelectorFeature = FeaturePtr();
   AttributeId = "";
 }
 
-void ModuleBase_WidgetSelectionFilter::onAddItem()
+void ModuleBase_WidgetSelectionFilter::onAddFilter(int theIndex)
 {
-  int aId = myFiltersCombo->currentIndex();
-  myFiltersCombo->removeItem(aId);
+  if (theIndex == 0)
+    return;
+
+  ModelAPI_FiltersFactory* aFactory = ModelAPI_Session::get()->filters();
+  FiltersFeaturePtr aFiltersFeature =
+    std::dynamic_pointer_cast<ModelAPI_FiltersFeature>(myFeature);
+
+  std::string aText = myFiltersCombo->itemText(theIndex).toStdString();
 
-  std::list<std::string>::iterator aIt;
-  int i;
+  std::list<FilterPtr>::iterator aIt;
   std::string aFilter;
-  for (aIt = myFilters.begin(), i = 0; aIt != myFilters.cend(); i++, aIt++) {
-    if (i == aId) {
-      aFilter = (*aIt);
-      myFilters.erase(aIt);
-      break;
-    }
-  }
-  if (!aFilter.empty()) {
-    myUseFilters.push_back(aFilter);
-    ModuleBase_FilterItem* aItem =
-      new ModuleBase_FilterItem(aFilter, mySelectorFeature, myFiltersGroup);
-    connect(aItem, SIGNAL(deleteItem(ModuleBase_FilterItem*)),
-      SLOT(onDeleteItem(ModuleBase_FilterItem*)));
-    myGroupLayout->addWidget(aItem);
+  std::map<std::string, FilterPtr>::const_iterator aFound = myFilters.find(aText);
+  if (aFound == myFilters.end()) {
+    std::list<FilterPtr> aFilters = aFactory->filters((GeomAPI_Shape::ShapeType) mySelectionType);
+    storeFilters(aFilters);
+    aFound = myFilters.find(aText);
   }
+  if (aFound != myFilters.end())
+    aFilter = aFactory->id(aFound->second);
+
+  aFiltersFeature->addFilter(aFilter);
+  updateObject(myFeature);
+
+  QList<ModuleBase_FilterItem*> aList = itemsList();
+  if (!aList.isEmpty() && (aList.last()->widgets().size() > 0))
+    aList.last()->widgets().first()->emitFocusInWidget();
+  else
+    emitFocusInWidget();
+}
+
+ModuleBase_FilterItem* ModuleBase_WidgetSelectionFilter::onAddFilter(const std::string& theFilter)
+{
+  if (theFilter.length() == 0)
+    return 0;
+  ModuleBase_FilterItem* aItem = new ModuleBase_FilterItem(theFilter, this);
+  connect(aItem, SIGNAL(deleteItem(ModuleBase_FilterItem*)),
+    SLOT(onDeleteItem(ModuleBase_FilterItem*)));
+  connect(aItem, SIGNAL(reversedItem(ModuleBase_FilterItem*)),
+    SLOT(onReverseItem(ModuleBase_FilterItem*)));
+  myFiltersLayout->addWidget(aItem);
+
   updateSelectBtn();
   clearCurrentSelection(true);
   updateNumberSelected();
+  return aItem;
 }
 
 void ModuleBase_WidgetSelectionFilter::onDeleteItem(ModuleBase_FilterItem* theItem)
 {
   std::string aFilter = theItem->filter();
-  myGroupLayout->removeWidget(theItem);
+  QList<ModuleBase_ModelWidget*> aWidgets = theItem->widgets();
+  foreach(ModuleBase_ModelWidget* aWgt, aWidgets) {
+    aWgt->deactivate();
+  }
+  myFiltersLayout->removeWidget(theItem);
   theItem->deleteLater();
 
-  myUseFilters.remove(aFilter);
-  myFilters.push_back(aFilter);
-  myFiltersCombo->addItem(ModelAPI_Session::get()->filters()->filter(aFilter)->name().c_str());
+  ModelAPI_FiltersFactory* aFactory = ModelAPI_Session::get()->filters();
+  if (!aFactory->filter(aFilter)->isMultiple()) {
+    //myFilters.push_back(aFilter);
+    myFiltersCombo->addItem(ModelAPI_Session::get()->filters()->filter(aFilter)->name().c_str());
+  }
+  FiltersFeaturePtr aFiltersFeature =
+    std::dynamic_pointer_cast<ModelAPI_FiltersFeature>(myFeature);
+  aFiltersFeature->removeFilter(aFilter);
+
+  updateSelectBtn();
+  clearCurrentSelection(true);
+  updateNumberSelected();
+
+  myWorkshop->deactivateCurrentSelector();
+  myWorkshop->selectionActivate()->updateSelectionModes();
+  myWorkshop->selectionActivate()->updateSelectionFilters();
+  redisplayFeature();
+  emitFocusInWidget();
+  updateObject(myFeature);
+}
+
+
+void ModuleBase_WidgetSelectionFilter::redisplayFeature()
+{
+  static Events_ID aDispEvent = Events_Loop::loop()->eventByName(EVENT_OBJECT_TO_REDISPLAY);
+  ModelAPI_EventCreator::get()->sendUpdated(myFeature, aDispEvent);
+  Events_Loop::loop()->flush(aDispEvent);
+}
 
+void ModuleBase_WidgetSelectionFilter::onReverseItem(ModuleBase_FilterItem* theItem)
+{
   updateSelectBtn();
   clearCurrentSelection(true);
   updateNumberSelected();
@@ -333,52 +452,37 @@ void ModuleBase_WidgetSelectionFilter::onDeleteItem(ModuleBase_FilterItem* theIt
 
 void ModuleBase_WidgetSelectionFilter::onSelect()
 {
-  if (myUseFilters.size() == 0)
-    return;
   Handle(AIS_InteractiveContext) aCtx = myWorkshop->viewer()->AISContext();
   if (aCtx.IsNull())
     return;
 
   clearCurrentSelection();
 
+  FiltersFeaturePtr aFiltersFeature =
+    std::dynamic_pointer_cast<ModelAPI_FiltersFeature>(myFeature);
+  static SessionPtr aSession = ModelAPI_Session::get();
+  std::list< std::pair<ResultPtr, GeomShapePtr> > aResList =
+    aSession->filters()->select(aFiltersFeature, (GeomAPI_Shape::ShapeType)mySelectionType);
+
   BRep_Builder aBuilder;
   TopoDS_Compound aComp;
   aBuilder.MakeCompound(aComp);
 
-  if (!myShowBtn->isChecked()) {
-    myListIO.Clear();
-    aCtx->DisplayedObjects(AIS_KOI_Shape, -1, myListIO);
-    if (!myPreview.IsNull())
-      myListIO.Remove(myPreview);
-  }
-  AIS_ListOfInteractive::const_iterator aIt;
-  Handle(ModuleBase_ResultPrs) aShapeIO;
-  for (aIt = myListIO.cbegin(); aIt != myListIO.cend(); aIt++) {
-    aShapeIO = Handle(ModuleBase_ResultPrs)::DownCast(*aIt);
-    if (!aShapeIO.IsNull()) {
-      GeomShapePtr aShape(new GeomAPI_Shape);
-      aShape->setImpl(new TopoDS_Shape(aShapeIO->Shape()));
-      std::list<GeomShapePtr> aSubShapes =
-        aShape->subShapes((GeomAPI_Shape::ShapeType)mySelectionType);
-      std::list<GeomShapePtr>::const_iterator aShapesIt;
-      for (aShapesIt = aSubShapes.cbegin(); aShapesIt != aSubShapes.cend(); aShapesIt++) {
-        GeomShapePtr aShape = (*aShapesIt);
-        SessionPtr aSession = ModelAPI_Session::get();
-        bool isValid = aSession->filters()->isValid(myFeature, aShape);
-        if (isValid) {
-          TopoDS_Shape aTShape = aShape->impl<TopoDS_Shape>();
-          Handle(StdSelect_BRepOwner) aOwner = new StdSelect_BRepOwner(aTShape, aShapeIO, true);
-          aBuilder.Add(aComp, aTShape);
-
-          ModuleBase_ViewerPrsPtr aValue(new ModuleBase_ViewerPrs(aShapeIO->getResult(), aShape, aOwner));
-          myValues.append(aValue);
-        }
-      }
-    }
+  std::list< std::pair<ResultPtr, GeomShapePtr> >::const_iterator itSelected = aResList.cbegin();
+  for (; itSelected != aResList.cend(); itSelected++) {
+    ResultPtr aCurRes = (*itSelected).first;
+    GeomShapePtr aSubShape = (*itSelected).second;
+    TopoDS_Shape aTShape = aSubShape->impl<TopoDS_Shape>();
+    aBuilder.Add(aComp, aTShape);
+    ModuleBase_ViewerPrsPtr aValue (new ModuleBase_ViewerPrs(aCurRes, aSubShape));
+    myValues.append(aValue);
   }
+
   if (myValues.size() > 0)
     updatePreview(aComp);
   updateNumberSelected();
+  updateObject(myFeature);
+  onShowOnly(myShowBtn->isChecked());
 }
 
 void ModuleBase_WidgetSelectionFilter::updatePreview(const TopoDS_Shape& theShape)
@@ -389,8 +493,16 @@ void ModuleBase_WidgetSelectionFilter::updatePreview(const TopoDS_Shape& theShap
 
   if (myPreview.IsNull()) {
     myPreview = new AIS_Shape(theShape);
-    myPreview->SetDisplayMode(myShowBtn->isChecked()? AIS_Shaded : AIS_WireFrame);
-    myPreview->SetColor(Quantity_NOC_YELLOW);
+    myPreview->SetDisplayMode(AIS_Shaded);
+    myPreview->SetColor(Quantity_NOC_BLUE1);
+    Handle(Prs3d_Drawer) aDrawer = myPreview->Attributes();
+    if (aDrawer->HasOwnPointAspect()) {
+      aDrawer->PointAspect()->SetTypeOfMarker(Aspect_TOM_O_STAR);
+      aDrawer->PointAspect()->SetColor(Quantity_NOC_BLUE1);
+      aDrawer->PointAspect()->SetScale(2.);
+    }
+    else
+      aDrawer->SetPointAspect(new Prs3d_PointAspect(Aspect_TOM_O_STAR, Quantity_NOC_BLUE1, 2.));
     myPreview->SetTransparency();
     aCtx->Display(myPreview, true);
     aCtx->Deactivate(myPreview);
@@ -402,47 +514,72 @@ void ModuleBase_WidgetSelectionFilter::updatePreview(const TopoDS_Shape& theShap
 }
 
 
-void ModuleBase_WidgetSelectionFilter::onShowOnly(bool theErase)
+void ModuleBase_WidgetSelectionFilter::onShowOnly(bool theShow)
 {
-  if (myPreview.IsNull())
-    return;
   Handle(AIS_InteractiveContext) aCtx = myWorkshop->viewer()->AISContext();
-
-  if (theErase) {
-    aCtx->SetDisplayMode(myPreview, AIS_Shaded, false);
-    myListIO.Clear();
-    aCtx->DisplayedObjects(AIS_KOI_Shape, -1, myListIO);
-    myListIO.Remove(myPreview);
-  }
-  else {
-    aCtx->SetDisplayMode(myPreview, AIS_WireFrame, false);
+  if (theShow) {
+    AIS_ListOfInteractive aList;
+    aCtx->DisplayedObjects(AIS_KOI_Shape, -1, aList);
+    if (!myPreview.IsNull())
+      aList.Remove(myPreview);
+    if (aList.Size() > 0)
+      myListIO = aList;
   }
   AIS_ListOfInteractive::const_iterator aIt;
   Handle(AIS_Shape) aShapeIO;
+  bool isModified = false;
   for (aIt = myListIO.cbegin(); aIt != myListIO.cend(); aIt++) {
     aShapeIO = Handle(AIS_Shape)::DownCast(*aIt);
     if (!aShapeIO.IsNull()) {
-      if (theErase)
-        aCtx->Erase(aShapeIO, false);
-      else
-        aCtx->Display(aShapeIO, false);
+      if (theShow) {
+        if (aCtx->IsDisplayed(aShapeIO)) {
+          aCtx->Erase(aShapeIO, false);
+          isModified = true;
+        }
+      }
+      else {
+        if (!aCtx->IsDisplayed(aShapeIO)) {
+          aCtx->Display(aShapeIO, false);
+          std::shared_ptr<GeomAPI_AISObject> anAISObj = AISObjectPtr(new GeomAPI_AISObject());
+          anAISObj->setImpl(new Handle(AIS_InteractiveObject)(aShapeIO));
+          myWorkshop->applyCurrentSelectionModes(anAISObj);
+          isModified = true;
+        }
+      }
     }
   }
-  aCtx->UpdateCurrentViewer();
+  if (isModified)
+    myWorkshop->viewer()->update();
 }
 
 void ModuleBase_WidgetSelectionFilter::updateSelectBtn()
 {
-  mySelectBtn->setEnabled(myUseFilters.size() > 0);
+  FiltersFeaturePtr aFiltersFeature = std::dynamic_pointer_cast<ModelAPI_FiltersFeature>(myFeature);
+  mySelectBtn->setEnabled(aFiltersFeature.get() && (aFiltersFeature->filters().size() > 0));
 }
 
 void ModuleBase_WidgetSelectionFilter::updateNumberSelected()
 {
-  myNbLbl->setText(QString::number(myValues.size()));
+  int aNb = myValues.size();
+  myNbLbl->setText(QString::number(aNb));
+  if (aNb == 0) {
+    myFeature->setError(translate("Selection is empty").toStdString(), false, false);
+    myShowBtn->setChecked(false);
+    onShowOnly(false);
+    myShowBtn->setEnabled(false);
+  }
+  else {
+    myFeature->setError("", false, false);
+    myFeature->data()->execState(ModelAPI_StateDone);
+    myShowBtn->setEnabled(true);
+  }
 }
+
 QList<QWidget*> ModuleBase_WidgetSelectionFilter::getControls() const
 {
-  return QList<QWidget*>();
+  QList<QWidget*> aWidgets;
+  aWidgets.append(myFiltersCombo);
+  return aWidgets;
 }
 
 void ModuleBase_WidgetSelectionFilter::clearCurrentSelection(bool toUpdate)
@@ -455,13 +592,164 @@ void ModuleBase_WidgetSelectionFilter::clearCurrentSelection(bool toUpdate)
   }
 }
 
+void replaceSubShapesByResult(QList<ModuleBase_ViewerPrsPtr>& theResults, int theShapeType)
+{
+  QMap<ObjectPtr, QList<GeomShapePtr>> myResShapes;
+  // Sort sub-shapes by result
+  foreach (ModuleBase_ViewerPrsPtr aPrs, theResults) {
+    if (myResShapes.contains(aPrs->object()))
+      myResShapes[aPrs->object()].append(aPrs->shape());
+    else {
+      QList<GeomShapePtr> aShapes;
+      aShapes << aPrs->shape();
+      myResShapes[aPrs->object()] = aShapes;
+    }
+  }
+  // Find Results to replace by whole result
+  QList<GeomShapePtr> aShapes;
+  QList<ObjectPtr> aToReplace;
+  std::list<GeomShapePtr> aSubShapes;
+  foreach(ObjectPtr aObj, myResShapes.keys()) {
+    aShapes = myResShapes[aObj];
+    ResultPtr aRes = std::dynamic_pointer_cast<ModelAPI_Result>(aObj);
+    TopTools_MapOfShape aShapesMap;
+    if (aRes.get()) {
+      GeomShapePtr aSubShape = aRes->shape();
+      const TopoDS_Shape& aShape = aSubShape->impl<TopoDS_Shape>();
+      for (TopExp_Explorer anExp(aShape, (TopAbs_ShapeEnum)theShapeType);
+        anExp.More(); anExp.Next()) {
+        aShapesMap.Add(anExp.Current());
+      }
+    }
+    if (aShapes.count() == aShapesMap.Size())
+      aToReplace.append(aObj);
+  }
+  // Replace the found results
+  QList<ModuleBase_ViewerPrsPtr>::iterator aIt;
+  foreach(ObjectPtr aObj, aToReplace) {
+    for (aIt = theResults.begin(); aIt != theResults.end(); aIt++) {
+      if ((*aIt)->object() == aObj) {
+        theResults.removeAll(*aIt);
+        aIt--;
+      }
+    }
+    ModuleBase_ViewerPrsPtr aValue(new ModuleBase_ViewerPrs(aObj));
+    theResults.append(aValue);
+  }
+}
+
 void ModuleBase_WidgetSelectionFilter::onFeatureAccepted()
 {
   AttributePtr aAttr = mySelectorFeature->attribute(mySelectorAttribute);
   AttributeSelectionListPtr aSelListAttr =
     std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(aAttr);
   aSelListAttr->clear();
+  if (aSelListAttr->isWholeResultAllowed())
+    replaceSubShapesByResult(myValues, selectionType(aSelListAttr->selectionType().c_str()));
   foreach(ModuleBase_ViewerPrsPtr aPrs, myValues) {
     aSelListAttr->append(aPrs->object(), aPrs->shape());
   }
-}
\ No newline at end of file
+}
+
+bool ModuleBase_WidgetSelectionFilter::storeValueCustom()
+{
+  ModuleBase_ModelWidget* aActive = myWorkshop->propertyPanel()->activeWidget();
+  if (aActive)
+    return aActive->storeValue();
+  updateObject(myFeature);
+  return true;
+}
+
+QList<ModuleBase_FilterItem*> ModuleBase_WidgetSelectionFilter::itemsList() const
+{
+  return  myFiltersWgt->findChildren<ModuleBase_FilterItem*>();
+}
+
+
+bool ModuleBase_WidgetSelectionFilter::restoreValueCustom()
+{
+  ModelAPI_FiltersFactory* aFactory = ModelAPI_Session::get()->filters();
+  FiltersFeaturePtr aFiltersFeature = std::dynamic_pointer_cast<ModelAPI_FiltersFeature>(myFeature);
+
+  // Init filters member of the parent attribute
+  AttributeSelectionListPtr aAttrList = mySelectorFeature->selectionList(mySelectorAttribute);
+  if (aAttrList->filters() != aFiltersFeature) {
+    aAttrList->setFilters(aFiltersFeature);
+  }
+
+  QList<ModuleBase_FilterItem*> aItemsList = itemsList();
+  std::list<std::string> aFilters = aFiltersFeature->filters();
+
+  std::list<std::string>::const_iterator aIt;
+  int i = 0;
+  int aNbItems = aItemsList.size();
+  ModuleBase_FilterItem* aItem = 0;
+  bool isBlocked = myFiltersCombo->blockSignals(true);
+  for (aIt = aFilters.cbegin(); aIt != aFilters.cend(); aIt++, i++) {
+    std::string aStr = (*aIt);
+    aItem = 0;
+    if (i >= aNbItems) {
+      aItem = onAddFilter(aStr);
+      FilterPtr aFilterObj = aFactory->filter(aStr);
+      int aId = myFiltersCombo->findText(aFilterObj->name().c_str());
+      if ((aId != -1) && !aFilterObj->isMultiple())
+        myFiltersCombo->removeItem(aId);
+      if (aItem) {
+        QList<ModuleBase_ModelWidget*> aSubList = aItem->widgets();
+        foreach(ModuleBase_ModelWidget* aWgt, aSubList) {
+          aWgt->restoreValue();
+        }
+      }
+    }
+  }
+  myFiltersCombo->setCurrentIndex(0);
+  myFiltersCombo->blockSignals(isBlocked);
+  return true;
+}
+
+QString ModuleBase_WidgetSelectionFilter::getError(const bool theValueStateChecked) const
+{
+  QString aErrorMsg = ModuleBase_ModelWidget::getError(theValueStateChecked);
+  if (aErrorMsg.isEmpty()) {
+    if (myValues.size() == 0)
+      aErrorMsg = translate("Selection is empty");
+  }
+  return aErrorMsg;
+}
+
+void ModuleBase_WidgetSelectionFilter::onObjectUpdated()
+{
+  myShowBtn->setChecked(false);
+  clearCurrentSelection(true);
+  updateNumberSelected();
+
+  QList<ModuleBase_FilterItem*> aItemsList = itemsList();
+  foreach(ModuleBase_FilterItem* aItem, aItemsList) {
+    QList<ModuleBase_ModelWidget*> aWidgetsList = aItem->widgets();
+    foreach(ModuleBase_ModelWidget* aWidget, aWidgetsList) {
+      if (!aWidget->feature().get())
+        aWidget->setFeature(myFeature);
+      aWidget->restoreValue();
+    }
+  }
+  updateObject(myFeature);
+
+  // Redisplay the feature on order to Customize presentations from filters with selectors
+  static Events_ID EVENT_DISP = Events_Loop::loop()->eventByName(EVENT_OBJECT_TO_REDISPLAY);
+  ModelAPI_EventCreator::get()->sendUpdated(myFeature, EVENT_DISP);
+  Events_Loop::loop()->flush(EVENT_DISP);
+}
+
+void ModuleBase_WidgetSelectionFilter::storeFilters(const std::list<FilterPtr>& theFilters)
+{
+  for (std::list<FilterPtr>::const_iterator anIt = theFilters.begin();
+       anIt != theFilters.end(); ++anIt) {
+    std::string aName = translate((*anIt)->name()).toStdString();
+    myFilters[aName] = *anIt;
+  }
+}
+
+QString ModuleBase_WidgetSelectionFilter::translate(const std::string& theString) const
+{
+  return ModuleBase_Tools::translate(myFeatureId, theString);
+}