From 94559629d37e221a8a15d266275ba9a8bc725bc8 Mon Sep 17 00:00:00 2001
From: vsv <vsv@opencascade.com>
Date: Wed, 14 Nov 2018 15:26:43 +0300
Subject: [PATCH] Add/Remove filters

---
 CMakeLists.txt                                |   2 +-
 src/Config/plugins.xml.in                     |   2 +-
 src/{ViewFilters => Filters}/CMakeLists.txt   |  22 ++--
 .../ViewFilters.h => Filters/Filters.h}       |  14 +-
 .../Filters_HorizontalPlane.cpp}              |   6 +-
 .../Filters_HorizontalPlane.h}                |  10 +-
 .../Filters_Plugin.cpp}                       |  22 ++--
 .../Filters_Plugin.h}                         |  10 +-
 .../Filters_VerticalPlane.cpp}                |   6 +-
 .../Filters_VerticalPlane.h}                  |  10 +-
 src/GeomValidators/GeomValidators_Plugin.cpp  |   4 +-
 src/Model/CMakeLists.txt                      |   4 +-
 ...{Model_ViewFilter.cpp => Model_Filter.cpp} |   6 +-
 .../{Model_ViewFilter.h => Model_Filter.h}    |   8 +-
 src/Model/Model_Session.cpp                   |   2 +-
 src/ModelAPI/CMakeLists.txt                   |   2 +-
 ...odelAPI_ViewFilter.h => ModelAPI_Filter.h} |  59 ++++++---
 .../ModuleBase_WidgetSelectionFilter.cpp      | 120 +++++++++++++++++-
 .../ModuleBase_WidgetSelectionFilter.h        |  32 ++++-
 src/XGUI/XGUI_pictures.qrc                    |   3 +
 src/XGUI/pictures/accept.png                  | Bin 0 -> 1264 bytes
 src/XGUI/pictures/add.png                     | Bin 0 -> 3329 bytes
 src/XGUI/pictures/stop.png                    | Bin 0 -> 1137 bytes
 23 files changed, 250 insertions(+), 94 deletions(-)
 rename src/{ViewFilters => Filters}/CMakeLists.txt (73%)
 rename src/{ViewFilters/ViewFilters.h => Filters/Filters.h} (79%)
 rename src/{ViewFilters/ViewFilters_HorizontalPlane.cpp => Filters/Filters_HorizontalPlane.cpp} (88%)
 rename src/{ViewFilters/ViewFilters_HorizontalPlane.h => Filters/Filters_HorizontalPlane.h} (85%)
 rename src/{ViewFilters/ViewFilters_Plugin.cpp => Filters/Filters_Plugin.cpp} (67%)
 rename src/{ViewFilters/ViewFilters_Plugin.h => Filters/Filters_Plugin.h} (87%)
 rename src/{ViewFilters/ViewFilters_VerticalPlane.cpp => Filters/Filters_VerticalPlane.cpp} (88%)
 rename src/{ViewFilters/ViewFilters_VerticalPlane.h => Filters/Filters_VerticalPlane.h} (86%)
 rename src/Model/{Model_ViewFilter.cpp => Model_Filter.cpp} (91%)
 rename src/Model/{Model_ViewFilter.h => Model_Filter.h} (93%)
 rename src/ModelAPI/{ModelAPI_ViewFilter.h => ModelAPI_Filter.h} (63%)
 create mode 100644 src/XGUI/pictures/accept.png
 create mode 100644 src/XGUI/pictures/add.png
 create mode 100644 src/XGUI/pictures/stop.png

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 070bbdb49..a94cceb39 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -144,7 +144,7 @@ ADD_SUBDIRECTORY (src/PartSet)
 ADD_SUBDIRECTORY (src/XGUI)
 ADD_SUBDIRECTORY (src/ExchangePlugin)
 ADD_SUBDIRECTORY (src/GeomValidators)
-ADD_SUBDIRECTORY (src/ViewFilters)
+ADD_SUBDIRECTORY (src/Filters)
 ADD_SUBDIRECTORY (src/InitializationPlugin)
 ADD_SUBDIRECTORY (src/ParametersPlugin)
 ADD_SUBDIRECTORY (src/PythonAddons)
diff --git a/src/Config/plugins.xml.in b/src/Config/plugins.xml.in
index abf6b3239..9e91d97c0 100644
--- a/src/Config/plugins.xml.in
+++ b/src/Config/plugins.xml.in
@@ -20,7 +20,7 @@
 @ALL_SOLVERS@
 -->
   <plugin library="GeomValidators"/>
-  <plugin library="ViewFilters"/>
+  <plugin library="Filters"/>
   <plugin library="DFBrowser" internal="true"/>
 <!--
   <plugin library="SamplePanelPlugin" configuration="plugin-SamplePanel.xml"/>
diff --git a/src/ViewFilters/CMakeLists.txt b/src/Filters/CMakeLists.txt
similarity index 73%
rename from src/ViewFilters/CMakeLists.txt
rename to src/Filters/CMakeLists.txt
index aa240cb1b..0b50d195d 100644
--- a/src/ViewFilters/CMakeLists.txt
+++ b/src/Filters/CMakeLists.txt
@@ -21,16 +21,16 @@
 INCLUDE(Common)
 
 SET(PROJECT_HEADERS
-    ViewFilters.h
-    ViewFilters_Plugin.h
-	ViewFilters_HorizontalPlane.h
-	ViewFilters_VerticalPlane.h
+    Filters.h
+    Filters_Plugin.h
+    Filters_HorizontalPlane.h
+    Filters_VerticalPlane.h
 )
 
 SET(PROJECT_SOURCES
-    ViewFilters_Plugin.cpp
-	ViewFilters_HorizontalPlane.cpp
-	ViewFilters_VerticalPlane.cpp
+    Filters_Plugin.cpp
+    Filters_HorizontalPlane.cpp
+    Filters_VerticalPlane.cpp
 )
 
 SET(PROJECT_LIBRARIES
@@ -40,9 +40,9 @@ SET(PROJECT_LIBRARIES
     GeomAPI
 )
 
-ADD_DEFINITIONS(-DVIEWFILTERS_EXPORTS ${OpenCASCADE_DEFINITIONS})
-ADD_LIBRARY(ViewFilters SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
-TARGET_LINK_LIBRARIES(ViewFilters ${PROJECT_LIBRARIES})
+ADD_DEFINITIONS(-DFILTERS_EXPORTS ${OpenCASCADE_DEFINITIONS})
+ADD_LIBRARY(Filters SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
+TARGET_LINK_LIBRARIES(Filters ${PROJECT_LIBRARIES})
 
 INCLUDE_DIRECTORIES(
   ${OpenCASCADE_INCLUDE_DIR}
@@ -53,4 +53,4 @@ INCLUDE_DIRECTORIES(
   ${PROJECT_SOURCE_DIR}/src/GeomDataAPI
 )
 
-INSTALL(TARGETS ViewFilters DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES})
+INSTALL(TARGETS Filters DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES})
diff --git a/src/ViewFilters/ViewFilters.h b/src/Filters/Filters.h
similarity index 79%
rename from src/ViewFilters/ViewFilters.h
rename to src/Filters/Filters.h
index 80b48b0ae..6e87a65dd 100644
--- a/src/ViewFilters/ViewFilters.h
+++ b/src/Filters/Filters.h
@@ -18,20 +18,20 @@
 // email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
 //
 
-#ifndef VIEWFILTERS_H
-#define VIEWFILTERS_H
+#ifndef FILTERS_H
+#define FILTERS_H
 
-#if defined VIEWFILTERS_EXPORTS
+#if defined FILTERS_EXPORTS
 #if defined WIN32
-#define VIEWFILTERS_EXPORT              __declspec( dllexport )
+#define FILTERS_EXPORT              __declspec( dllexport )
 #else
-#define VIEWFILTERS_EXPORT
+#define FILTERS_EXPORT
 #endif
 #else
 #if defined WIN32
-#define VIEWFILTERS_EXPORT              __declspec( dllimport )
+#define FILTERS_EXPORT              __declspec( dllimport )
 #else
-#define VIEWFILTERS_EXPORT
+#define FILTERS_EXPORT
 #endif
 #endif
 
diff --git a/src/ViewFilters/ViewFilters_HorizontalPlane.cpp b/src/Filters/Filters_HorizontalPlane.cpp
similarity index 88%
rename from src/ViewFilters/ViewFilters_HorizontalPlane.cpp
rename to src/Filters/Filters_HorizontalPlane.cpp
index ad025d6b0..13d5595cc 100644
--- a/src/ViewFilters/ViewFilters_HorizontalPlane.cpp
+++ b/src/Filters/Filters_HorizontalPlane.cpp
@@ -18,12 +18,12 @@
 // email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
 //
 
-#include "ViewFilters_HorizontalPlane.h"
+#include "Filters_HorizontalPlane.h"
 
 #include <GeomAPI_Face.h>
 #include <GeomAPI_Pln.h>
 
-bool ViewFilters_HorizontalPlane::isOk(const GeomShapePtr& theShape) const
+bool Filters_HorizontalPlane::isOk(const GeomShapePtr& theShape) const
 {
   if (!theShape->isFace())
     return false;
@@ -39,7 +39,7 @@ bool ViewFilters_HorizontalPlane::isOk(const GeomShapePtr& theShape) const
   return false;
 }
 
-std::list<int> ViewFilters_HorizontalPlane::shapeTypes() const
+std::list<int> Filters_HorizontalPlane::shapeTypes() const
 {
   std::list<int> aList;
   aList.push_back(GeomAPI_Shape::FACE);
diff --git a/src/ViewFilters/ViewFilters_HorizontalPlane.h b/src/Filters/Filters_HorizontalPlane.h
similarity index 85%
rename from src/ViewFilters/ViewFilters_HorizontalPlane.h
rename to src/Filters/Filters_HorizontalPlane.h
index 81dd19998..e5ad861f5 100644
--- a/src/ViewFilters/ViewFilters_HorizontalPlane.h
+++ b/src/Filters/Filters_HorizontalPlane.h
@@ -18,14 +18,14 @@
 // email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
 //
 
-#ifndef VIEWFILTERS_HORIZONTALPLANE_H_
-#define VIEWFILTERS_HORIZONTALPLANE_H_
+#ifndef FILTERS_HORIZONTALPLANE_H_
+#define FILTERS_HORIZONTALPLANE_H_
 
-#include "ViewFilters.h"
+#include "Filters.h"
 
-#include <ModelAPI_ViewFilter.h>
+#include <ModelAPI_Filter.h>
 
-class ViewFilters_HorizontalPlane : public ModelAPI_ViewFilter
+class Filters_HorizontalPlane : public ModelAPI_Filter
 {
 public:
   virtual bool isOk(const GeomShapePtr& theShape) const;
diff --git a/src/ViewFilters/ViewFilters_Plugin.cpp b/src/Filters/Filters_Plugin.cpp
similarity index 67%
rename from src/ViewFilters/ViewFilters_Plugin.cpp
rename to src/Filters/Filters_Plugin.cpp
index 305306469..4e0c766b4 100644
--- a/src/ViewFilters/ViewFilters_Plugin.cpp
+++ b/src/Filters/Filters_Plugin.cpp
@@ -18,29 +18,29 @@
 // email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
 //
 
-#include "ViewFilters_Plugin.h"
-#include "ViewFilters_HorizontalPlane.h"
-#include "ViewFilters_VerticalPlane.h"
+#include "Filters_Plugin.h"
+#include "Filters_HorizontalPlane.h"
+#include "Filters_VerticalPlane.h"
 
 #include <ModelAPI_Session.h>
-#include <ModelAPI_ViewFilter.h>
+#include <ModelAPI_Filter.h>
 
 // the only created instance of this plugin
-static ViewFilters_Plugin* MY_VIEWFILTERS_INSTANCE = new ViewFilters_Plugin();
+static Filters_Plugin* MY_VIEWFILTERS_INSTANCE = new Filters_Plugin();
 
-ViewFilters_Plugin::ViewFilters_Plugin()
+Filters_Plugin::Filters_Plugin()
 {
   // register validators
   SessionPtr aMgr = ModelAPI_Session::get();
   ModelAPI_FiltersFactory* aFactory = aMgr->filters();
-  aFactory->registerFilter("HorizontalFaces", new ViewFilters_HorizontalPlane);
-  aFactory->registerFilter("VerticalFaces", new ViewFilters_VerticalPlane);
+  aFactory->registerFilter("HorizontalFaces", new Filters_HorizontalPlane);
+  aFactory->registerFilter("VerticalFaces", new Filters_VerticalPlane);
 
-  // register this plugin
-  ModelAPI_Session::get()->registerPlugin(this);
+  // Do not register this plugin because it doesn't creates features
+  //ModelAPI_Session::get()->registerPlugin(this);
 }
 
-FeaturePtr ViewFilters_Plugin::createFeature(std::string theFeatureID)
+FeaturePtr Filters_Plugin::createFeature(std::string theFeatureID)
 {
   // feature of such kind is not found
   return FeaturePtr();
diff --git a/src/ViewFilters/ViewFilters_Plugin.h b/src/Filters/Filters_Plugin.h
similarity index 87%
rename from src/ViewFilters/ViewFilters_Plugin.h
rename to src/Filters/Filters_Plugin.h
index e7b5f73a6..3adb7ab4d 100644
--- a/src/ViewFilters/ViewFilters_Plugin.h
+++ b/src/Filters/Filters_Plugin.h
@@ -18,10 +18,10 @@
 // email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
 //
 
-#ifndef VIEWFILTERS_PLUGIN_H_
-#define VIEWFILTERS_PLUGIN_H_
+#ifndef FILTERS_PLUGIN_H_
+#define FILTERS_PLUGIN_H_
 
-#include "ViewFilters.h"
+#include "Filters.h"
 #include <ModelAPI_Plugin.h>
 #include <ModelAPI_Feature.h>
 
@@ -29,14 +29,14 @@
  * \ingroup Plugins
  * \brief Interface common for any plugin: allows to use plugin by the plugins manager.
  */
-class VIEWFILTERS_EXPORT ViewFilters_Plugin : public ModelAPI_Plugin
+class FILTERS_EXPORT Filters_Plugin : public ModelAPI_Plugin
 {
 public:
   /// Creates the feature object of this plugin by the feature string ID
   virtual FeaturePtr createFeature(std::string theFeatureID);
 
 public:
-  ViewFilters_Plugin();
+  Filters_Plugin();
 };
 
 #endif
diff --git a/src/ViewFilters/ViewFilters_VerticalPlane.cpp b/src/Filters/Filters_VerticalPlane.cpp
similarity index 88%
rename from src/ViewFilters/ViewFilters_VerticalPlane.cpp
rename to src/Filters/Filters_VerticalPlane.cpp
index 1b80909e0..48334749d 100644
--- a/src/ViewFilters/ViewFilters_VerticalPlane.cpp
+++ b/src/Filters/Filters_VerticalPlane.cpp
@@ -18,12 +18,12 @@
 // email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
 //
 
-#include "ViewFilters_VerticalPlane.h"
+#include "Filters_VerticalPlane.h"
 
 #include <GeomAPI_Face.h>
 #include <GeomAPI_Pln.h>
 
-bool ViewFilters_VerticalPlane::isOk(const GeomShapePtr& theShape) const
+bool Filters_VerticalPlane::isOk(const GeomShapePtr& theShape) const
 {
   if (!theShape->isFace())
     return false;
@@ -39,7 +39,7 @@ bool ViewFilters_VerticalPlane::isOk(const GeomShapePtr& theShape) const
   return false;
 }
 
-std::list<int> ViewFilters_VerticalPlane::shapeTypes() const
+std::list<int> Filters_VerticalPlane::shapeTypes() const
 {
   std::list<int> aList;
   aList.push_back(GeomAPI_Shape::FACE);
diff --git a/src/ViewFilters/ViewFilters_VerticalPlane.h b/src/Filters/Filters_VerticalPlane.h
similarity index 86%
rename from src/ViewFilters/ViewFilters_VerticalPlane.h
rename to src/Filters/Filters_VerticalPlane.h
index f724c359c..2dc201fd5 100644
--- a/src/ViewFilters/ViewFilters_VerticalPlane.h
+++ b/src/Filters/Filters_VerticalPlane.h
@@ -18,14 +18,14 @@
 // email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
 //
 
-#ifndef VIEWFILTERS_VERTICALPLANE_H_
-#define VIEWFILTERS_VERTICALPLANE_H_
+#ifndef FILTERS_VERTICALPLANE_H_
+#define FILTERS_VERTICALPLANE_H_
 
-#include "ViewFilters.h"
+#include "Filters.h"
 
-#include <ModelAPI_ViewFilter.h>
+#include <ModelAPI_Filter.h>
 
-class ViewFilters_VerticalPlane : public ModelAPI_ViewFilter
+class Filters_VerticalPlane : public ModelAPI_Filter
 {
 public:
   virtual bool isOk(const GeomShapePtr& theShape) const;
diff --git a/src/GeomValidators/GeomValidators_Plugin.cpp b/src/GeomValidators/GeomValidators_Plugin.cpp
index 733fc17bf..3eddc7ad9 100644
--- a/src/GeomValidators/GeomValidators_Plugin.cpp
+++ b/src/GeomValidators/GeomValidators_Plugin.cpp
@@ -65,8 +65,8 @@ GeomValidators_Plugin::GeomValidators_Plugin()
   aFactory->registerValidator("GeomValidators_NotSelfIntersected",
                               new GeomValidators_NotSelfIntersected);
 
-  // register this plugin
-  ModelAPI_Session::get()->registerPlugin(this);
+  // Do not register this plugin because it doesn't creates features
+  //ModelAPI_Session::get()->registerPlugin(this);
 }
 
 FeaturePtr GeomValidators_Plugin::createFeature(std::string theFeatureID)
diff --git a/src/Model/CMakeLists.txt b/src/Model/CMakeLists.txt
index 7970e3313..11ba5e120 100644
--- a/src/Model/CMakeLists.txt
+++ b/src/Model/CMakeLists.txt
@@ -56,7 +56,7 @@ SET(PROJECT_HEADERS
     Model_FeatureValidator.h
     Model_AttributeValidator.h
     Model_SelectionNaming.h
-	Model_ViewFilter.h
+	Model_Filter.h
 )
 
 SET(PROJECT_SOURCES
@@ -94,7 +94,7 @@ SET(PROJECT_SOURCES
     Model_FeatureValidator.cpp
     Model_AttributeValidator.cpp
     Model_SelectionNaming.cpp
-	Model_ViewFilter.cpp
+	Model_Filter.cpp
 )
 
 SET(PROJECT_LIBRARIES
diff --git a/src/Model/Model_ViewFilter.cpp b/src/Model/Model_Filter.cpp
similarity index 91%
rename from src/Model/Model_ViewFilter.cpp
rename to src/Model/Model_Filter.cpp
index 7c964a207..16999086c 100644
--- a/src/Model/Model_ViewFilter.cpp
+++ b/src/Model/Model_Filter.cpp
@@ -18,15 +18,15 @@
 // email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
 //
 
-#include "Model_ViewFilter.h"
+#include "Model_Filter.h"
 
 #include <Events_InfoMessage.h>
 
 
-void Model_FiltersFactory::registerFilter(const std::string& theID, ModelAPI_ViewFilter* theFilter)
+void Model_FiltersFactory::registerFilter(const std::string& theID, ModelAPI_Filter* theFilter)
 {
   if (myFilters.find(theID) != myFilters.end()) {
-    Events_InfoMessage("Model_ViewFilter", "Filter %1 is already registered").arg(theID).send();
+    Events_InfoMessage("Model_FiltersFactory", "Filter %1 is already registered").arg(theID).send();
   }
   else {
     myFilters[theID] = FilterPtr(theFilter);
diff --git a/src/Model/Model_ViewFilter.h b/src/Model/Model_Filter.h
similarity index 93%
rename from src/Model/Model_ViewFilter.h
rename to src/Model/Model_Filter.h
index 54dae1b81..35fc45760 100644
--- a/src/Model/Model_ViewFilter.h
+++ b/src/Model/Model_Filter.h
@@ -19,12 +19,12 @@
 // email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
 //
 
-#ifndef Model_ViewFilter_H_
-#define Model_ViewFilter_H_
+#ifndef Model_Filter_H_
+#define Model_Filter_H_
 
 #include "Model.h"
 
-#include <ModelAPI_ViewFilter.h>
+#include <ModelAPI_Filter.h>
 
 #include <map>
 
@@ -38,7 +38,7 @@ class Model_FiltersFactory : public ModelAPI_FiltersFactory
 public:
   /// Register an instance of a filter
   /// \param theID
-  virtual void registerFilter(const std::string& theID, ModelAPI_ViewFilter* theFilter);
+  virtual void registerFilter(const std::string& theID, ModelAPI_Filter* theFilter);
 
   /// Returns list of filters for the given shape type
   /// \param theType a shape type
diff --git a/src/Model/Model_Session.cpp b/src/Model/Model_Session.cpp
index 6cd59d9fe..099f6e2c1 100644
--- a/src/Model/Model_Session.cpp
+++ b/src/Model/Model_Session.cpp
@@ -27,7 +27,7 @@
 #include <Model_Application.h>
 #include <Model_Events.h>
 #include <Model_Validator.h>
-#include <Model_ViewFilter.h>
+#include <Model_Filter.h>
 #include <ModelAPI_Events.h>
 #include <Events_Loop.h>
 #include <Events_InfoMessage.h>
diff --git a/src/ModelAPI/CMakeLists.txt b/src/ModelAPI/CMakeLists.txt
index 2566acfba..2292e07d9 100644
--- a/src/ModelAPI/CMakeLists.txt
+++ b/src/ModelAPI/CMakeLists.txt
@@ -66,7 +66,7 @@ SET(PROJECT_HEADERS
     ModelAPI_Tools.h
     ModelAPI_Validator.h
     ModelAPI_Entity.h
-	ModelAPI_ViewFilter.h
+	ModelAPI_Filter.h
 )
 
 SET(PROJECT_SOURCES
diff --git a/src/ModelAPI/ModelAPI_ViewFilter.h b/src/ModelAPI/ModelAPI_Filter.h
similarity index 63%
rename from src/ModelAPI/ModelAPI_ViewFilter.h
rename to src/ModelAPI/ModelAPI_Filter.h
index a49760c0c..660cb2692 100644
--- a/src/ModelAPI/ModelAPI_ViewFilter.h
+++ b/src/ModelAPI/ModelAPI_Filter.h
@@ -18,35 +18,33 @@
 // email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
 //
 
-#ifndef ModelAPI_ViewFilter_H_
-#define ModelAPI_ViewFilter_H_
+#ifndef ModelAPI_Filter_H_
+#define ModelAPI_Filter_H_
 
 #include "ModelAPI.h"
+#include "ModelAPI_Object.h"
 
 #include <GeomAPI_Shape.h>
 
 #include <list>
 
 
-/**\class ModelAPI_ViewFilter
-* \ingroup DataModel
-* \brief An interface class for parameters of filters definition
-*/
-class ModelAPI_FilterParameter
-{
-public:
-  virtual ~ModelAPI_FilterParameter() {}
-};
-
-typedef std::shared_ptr<ModelAPI_FilterParameter> FilterParamPtr;
-
 /**\class ModelAPI_ViewFilter
 * \ingroup DataModel
 * \brief An interface class for filter objects
 */
-class ModelAPI_ViewFilter
+class ModelAPI_Filter
 {
 public:
+  enum ParameterType {
+    NoParameter,
+    RealParameter,
+    ShapeParameter,
+    ObjectParameter
+  };
+
+  /// Returns name of the filter to represent it in GUI
+  virtual std::string name() const = 0;
 
   /// Returns true if the given shape is accepted by filter
   /// \param theShape the given shape
@@ -55,14 +53,33 @@ public:
   /// Returns list of supported types of shapes (see GeomAPI_Shape::ShapeType)
   virtual std::list<int> shapeTypes() const = 0;
 
-  /// Set parameter for the filter
-  virtual void setParameter(const FilterParamPtr& theParam) {}
+  // Returns type of used parameter
+  virtual ParameterType parameterType() const { return NoParameter;  }
 
-  /// Returns name of the filter to represent it in GUI
-  virtual std::string name() const = 0;
+  /// Set double parameter for the filter
+  virtual void setParameter(double theParam) {}
+
+  /// Set shape parameter for the filter
+  virtual void setParameter(const GeomShapePtr& theParam) {}
+
+  /// Set object parameter for the filter
+  virtual void setParameter(const ObjectPtr& theParam) {}
+
+  /// Returns object parameter
+  virtual ObjectPtr objectParameter() const { return ObjectPtr(); }
+
+  /// Returns shape parameter
+  virtual GeomShapePtr shapeParameter() const { return GeomShapePtr(); }
+
+  /// Returns real parameter
+  virtual double realParameter() const { return 0; }
+
+  /// Returns shape parameter type. Types from GeomAPI_Shape  have to be used.
+  /// A type GeomAPI_Shape::SHAPE means any shape
+  virtual int shapeParameterType() const { return GeomAPI_Shape::SHAPE; }
 };
 
-typedef std::shared_ptr<ModelAPI_ViewFilter> FilterPtr;
+typedef std::shared_ptr<ModelAPI_Filter> FilterPtr;
 
 
 /**\class ModelAPI_ValidatorsFactory
@@ -74,7 +91,7 @@ class ModelAPI_FiltersFactory
 public:
   /// Register an instance of a filter
   /// \param theID
-  virtual void registerFilter(const std::string& theID, ModelAPI_ViewFilter* theFilter) = 0;
+  virtual void registerFilter(const std::string& theID, ModelAPI_Filter* theFilter) = 0;
 
   /// Returns list of filters for the given shape type
   /// \param theType a shape type
diff --git a/src/ModuleBase/ModuleBase_WidgetSelectionFilter.cpp b/src/ModuleBase/ModuleBase_WidgetSelectionFilter.cpp
index 6bebae61e..7f91db2b3 100644
--- a/src/ModuleBase/ModuleBase_WidgetSelectionFilter.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetSelectionFilter.cpp
@@ -26,12 +26,15 @@
 #include "ModuleBase_PageWidget.h"
 #include "ModuleBase_WidgetSelector.h"
 
+#include <ModelAPI_Session.h>
+
 #include <QLayout>
 #include <QPushButton>
 #include <QLabel>
 #include <QComboBox>
 #include <QGroupBox>
 #include <QDialog>
+#include <QToolButton>
 
 static int SelectionType = 0;
 
@@ -95,6 +98,47 @@ void ModuleBase_FilterStarter::setSelectionType(const QString& theType)
     myShapeType = GeomAPI_Shape::SHAPE;
 }
 
+//*****************************************************************************
+//*****************************************************************************
+//*****************************************************************************
+ModuleBase_FilterItem::ModuleBase_FilterItem(const FilterPtr& theFilter, QWidget* theParent)
+  : QWidget(theParent), myFilter(theFilter)
+{
+  QHBoxLayout* aLayout = new QHBoxLayout(this);
+  aLayout->setContentsMargins(0, 0, 0, 0);
+
+  // Reverse filter button
+  myRevBtn = new QToolButton(this);
+  myRevBtn->setCheckable(true);
+  myRevBtn->setChecked(false);
+  myRevBtn->setAutoRaise(true);
+  myRevBtn->setIcon(QIcon(":pictures/accept.png"));
+  connect(myRevBtn, SIGNAL(toggled(bool)), SLOT(onReverse(bool)));
+  aLayout->addWidget(myRevBtn);
+
+  aLayout->addWidget(new QLabel(myFilter->name().c_str(), this), 1);
+
+  QToolButton* aDelBtn = new QToolButton(this);
+  aDelBtn->setIcon(QIcon(":pictures/button_cancel.png"));
+  aDelBtn->setAutoRaise(true);
+  connect(aDelBtn, SIGNAL(clicked(bool)), SLOT(onDelete()));
+  aLayout->addWidget(aDelBtn);
+}
+
+
+void ModuleBase_FilterItem::onReverse(bool theCheck)
+{
+  if (theCheck)
+    myRevBtn->setIcon(QIcon(":pictures/stop.png"));
+  else
+    myRevBtn->setIcon(QIcon(":pictures/accept.png"));
+}
+
+void ModuleBase_FilterItem::onDelete()
+{
+  emit deleteItem(this);
+}
+
 
 //*****************************************************************************
 //*****************************************************************************
@@ -108,30 +152,92 @@ ModuleBase_WidgetSelectionFilter::ModuleBase_WidgetSelectionFilter(QWidget* theP
   ModuleBase_Tools::adjustMargins(aMainLayout);
 
   myFiltersGroup = new QGroupBox(tr("Dynamic Filters"), this);
-  QVBoxLayout* aGroupLayout = new QVBoxLayout(myFiltersGroup);
+  myGroupLayout = new QVBoxLayout(myFiltersGroup);
+  myGroupLayout->setContentsMargins(0, 0, 0, 0);
+  myGroupLayout->setSpacing(0);
 
   QWidget* aFiltersWgt = new QWidget(myFiltersGroup);
   QHBoxLayout* aFiltersLay = new QHBoxLayout(aFiltersWgt);
+  ModuleBase_Tools::adjustMargins(aFiltersLay);
 
   QLabel* aFilterLbl = new QLabel(aFiltersWgt);
   aFilterLbl->setPixmap(QPixmap(":pictures/filter.png"));
 
   myFiltersCombo = new QComboBox(aFiltersWgt);
-
-  QPushButton* aAddBtn = new QPushButton(tr("Add"), aFiltersWgt);
-  connect(aAddBtn, SIGNAL(clicked()), SLOT(onAddFilter()));
+  SessionPtr aSession = ModelAPI_Session::get();
+  myFilters =
+    aSession->filters()->filtersForShapeType((GeomAPI_Shape::ShapeType) mySelectionType);
+  QStringList aItems;
+  std::list<FilterPtr>::const_iterator aIt;
+  for (aIt = myFilters.cbegin(); aIt != myFilters.cend(); aIt++)
+    aItems.push_back((*aIt)->name().c_str());
+  myFiltersCombo->addItems(aItems);
+
+  QToolButton* aAddBtn = new QToolButton(aFiltersWgt);
+  aAddBtn->setIcon(QIcon(":pictures/add.png"));
+  aAddBtn->setAutoRaise(true);
+  aAddBtn->setToolTip(tr("Add current filter"));
+  connect(aAddBtn, SIGNAL(clicked()), SLOT(onAddItem()));
 
   aFiltersLay->addWidget(aFilterLbl);
-  aFiltersLay->addWidget(myFiltersCombo);
+  aFiltersLay->addWidget(myFiltersCombo, 1);
   aFiltersLay->addWidget(aAddBtn);
 
-  aGroupLayout->addWidget(aFiltersWgt);
+  myGroupLayout->addWidget(aFiltersWgt);
 
   aMainLayout->addWidget(myFiltersGroup);
+
+  QWidget* aBtnWgt = new QWidget(this);
+  QHBoxLayout* aBtnLayout = new QHBoxLayout(aBtnWgt);
+  ModuleBase_Tools::adjustMargins(aBtnLayout);
+
+  aBtnLayout->addStretch(1);
+
+  QPushButton* aSelectBtn = new QPushButton(tr("Select"), aBtnWgt);
+  connect(aSelectBtn, SIGNAL(clicked()), SLOT(onSelect()));
+  aBtnLayout->addWidget(aSelectBtn);
+
+  aMainLayout->addWidget(aBtnWgt);
+
   aMainLayout->addStretch(1);
 }
 
-void ModuleBase_WidgetSelectionFilter::onAddFilter()
+void ModuleBase_WidgetSelectionFilter::onAddItem()
+{
+  int aId = myFiltersCombo->currentIndex();
+  myFiltersCombo->removeItem(aId);
+
+  std::list<FilterPtr>::iterator aIt;
+  int i;
+  FilterPtr aFilter;
+  for (aIt = myFilters.begin(), i = 0; aIt != myFilters.cend(); i++, aIt++) {
+    if (i == aId) {
+      aFilter = (*aIt);
+      myFilters.erase(aIt);
+      break;
+    }
+  }
+  if (aFilter.get()) {
+    myUseFilters.push_back(aFilter);
+    ModuleBase_FilterItem* aItem = new ModuleBase_FilterItem(aFilter, myFiltersGroup);
+    connect(aItem, SIGNAL(deleteItem(ModuleBase_FilterItem*)),
+      SLOT(onDeleteItem(ModuleBase_FilterItem*)));
+    myGroupLayout->addWidget(aItem);
+  }
+}
+
+void ModuleBase_WidgetSelectionFilter::onDeleteItem(ModuleBase_FilterItem* theItem)
+{
+  FilterPtr aFilter = theItem->filter();
+  myGroupLayout->removeWidget(theItem);
+  theItem->deleteLater();
+
+  myUseFilters.remove(aFilter);
+  myFilters.push_back(aFilter);
+  myFiltersCombo->addItem(aFilter->name().c_str());
+}
+
+void ModuleBase_WidgetSelectionFilter::onSelect()
 {
 
 }
diff --git a/src/ModuleBase/ModuleBase_WidgetSelectionFilter.h b/src/ModuleBase/ModuleBase_WidgetSelectionFilter.h
index 0ffec2a37..842f236a5 100644
--- a/src/ModuleBase/ModuleBase_WidgetSelectionFilter.h
+++ b/src/ModuleBase/ModuleBase_WidgetSelectionFilter.h
@@ -24,11 +24,15 @@
 #include "ModuleBase.h"
 #include "ModuleBase_ModelWidget.h"
 
+#include <ModelAPI_Filter.h>
 #include <QWidget>
 
 class QLabel;
 class QComboBox;
 class QGroupBox;
+class QToolButton;
+class QVBoxLayout;
+
 class ModuleBase_IWorkshop;
 
 class MODULEBASE_EXPORT ModuleBase_FilterStarter: public QWidget
@@ -55,6 +59,26 @@ private:
 };
 
 
+class ModuleBase_FilterItem : public QWidget
+{
+  Q_OBJECT
+public:
+  ModuleBase_FilterItem(const FilterPtr& theFilter, QWidget* theParent);
+
+  FilterPtr filter() const { return myFilter; }
+
+signals:
+  void deleteItem(ModuleBase_FilterItem* theItem);
+
+  private slots:
+  void onReverse(bool theCheck);
+  void onDelete();
+
+private:
+  FilterPtr myFilter;
+  QToolButton* myRevBtn;
+};
+
 class ModuleBase_WidgetSelectionFilter : public ModuleBase_ModelWidget
 {
   Q_OBJECT
@@ -75,15 +99,21 @@ protected:
   virtual bool restoreValueCustom() { return true; }
 
 private slots:
-  void onAddFilter();
+  void onAddItem();
+  void onDeleteItem(ModuleBase_FilterItem* theItem);
+  void onSelect();
 
 private:
   ModuleBase_IWorkshop* myWorkshop;
 
   QComboBox* myFiltersCombo;
   QGroupBox* myFiltersGroup;
+  QVBoxLayout* myGroupLayout;
 
   int mySelectionType;
+  std::list<FilterPtr> myFilters;
+  std::list<FilterPtr> myUseFilters;
 };
 
+
 #endif
\ No newline at end of file
diff --git a/src/XGUI/XGUI_pictures.qrc b/src/XGUI/XGUI_pictures.qrc
index ace18607c..58421888e 100644
--- a/src/XGUI/XGUI_pictures.qrc
+++ b/src/XGUI/XGUI_pictures.qrc
@@ -80,5 +80,8 @@
 
      <file>pictures/filter.png</file>
      <file>pictures/plus_minus.png</file>
+     <file>pictures/add.png</file>
+     <file>pictures/accept.png</file>
+     <file>pictures/stop.png</file>
  </qresource>
  </RCC>
diff --git a/src/XGUI/pictures/accept.png b/src/XGUI/pictures/accept.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1eea8982f2ee93c2f1190bc32f19ca3f523b45d
GIT binary patch
literal 1264
zcmV<M1P}X(P)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9
za%BK;VQFr3E^cLXAT%y9E;JKBXv6>j1Yt=;K~y+TEmT`<lXV>ZeDQ*bcu5EmNkmZS
z+V!%sF=Xu4^|F?3qA)fb%sn^+Zx~I$7`Z)&Kwvx&coAbn9+a1D^tRqRT(aP}=-hx!
zTsAvK2CS^zt>6E0{B`>9C2ha|IsbEh=lrU0ftQ$MPf3w|k_o;DU@r^s<AXCp>Gq@_
zXK!D?*@5ry)7?wB`lxR<&1cR7C<MbYl`veWi-=>T!X$qMOe_IYHFRL--MQq?2d|xY
zSn1y)wf-us36w+UEr;G`!J8hZ+?n_|)iKuT<xo$6vz45Q=Lx@@6tShqiV7mR*gbJA
zUEA3tSNk`>6n4NIal#b0!H}qiIqHHTW`{Od24ja6rv}c=Ov}voQ1ONo>SBcnxtvIj
zT~80p+k<sd@3+8|aKIRMpn$-}gpIyiQ5deK&zoQj+psP`7hJO9-0kzzggvAR_L?FE
z3Nv!5eb2A^uqs#rGu>Vg+k~|-Hwt3}$f=3dpeW)(UaS(Xa4q_$4&a+Vzr@-$8+uZ|
zjYFbEA;vACd!Zqd*A9J-B<><R&i~0=^yG+Z$(jSjog2~j@Eyvd85f6Ju%dlE_VpeX
zsuTwl27G$x`q2@szY;}cMW3izn2Cu9jR_YK|3|I~T5#%*t>C;7qf>P#^;=;G+2HWi
zV{|S#p-hYU*2eA+GWo$$m_no^V5b9C6hz!GcDZ1tSs5aBSb}bhX7*u*?MGv*0lKgS
zx-J`vJk{uabQQ{jY-*w=x<jlcqCGt==zshbTDlvdrPvD+PUwkfeQ+agJa}ut(xu_u
zSmUoCwa$eg%sw01$HGwVvDED5NE253OK|2+JygB}Q}f&LZoD3O!E)qxR^ZzkHBeb2
z#xvVc9<U;>i>g6(%`r-py5_kTfif+pyPLcALKCV$Nw^Hb5jz;$hQ~y<HA+BF75+|t
zhFNwH@5dXE7qXC&8cLMvK)o{is?nRe21-rDkM^}<MW~z#=fJw)dW4fUFdFJe`g8Q(
ze;a}~p=0<X<a?_q!QAl47KM-(u~8kGF`m7z=Hd_cO!m&L^E#z2CpBtAG4<((p(bSc
z*9&tQ&orRg?}9FFhl#pnrbkcqbeAj1_Gy(tM5&N!tqO7B@YUn9Ydob3H|0}*v}Ebz
z%_EqYKZXyl?55SA0mmuLDD^Aqh9+E2<aKf|GjNN<lqj6@#SqdoI`>a>XY>=H@s>b)
zrHVjQh0bcYV~sF|Ho?&4L}7$hhvuRSSEBf`3vEfy9FcrM_-ANo#p_wF=Fty(|C&wy
zzN>3L(|XECK`B|G&8Gl#xtWj>BlT;QuMB0Kb-ZmfFhZEq5KIHEKA}jamN3RmOsGbB
zv3ZiE&-^&}%S1zbmn;srVfI>K^x0A5bHE+gE{^n`eAJh|b%V~nCpnhV(l3*oKc~=t
zia|1=7lJPV&%OvDUZq2=DLIq5nYn||cpRQFKN6EY7|q^)$RS(l{RVKMkz(#yB6^w&
ayznmv*KQn*Q%K+d0000<MNUMnLSTXo=vXKK

literal 0
HcmV?d00001

diff --git a/src/XGUI/pictures/add.png b/src/XGUI/pictures/add.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b051f647fecd43ea4ed665486734acb38eaa952
GIT binary patch
literal 3329
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
LNkvXXu0mjf4`n&o

literal 0
HcmV?d00001

diff --git a/src/XGUI/pictures/stop.png b/src/XGUI/pictures/stop.png
new file mode 100644
index 0000000000000000000000000000000000000000..49ebf5c4b8274207ad91f3d16e751a682188af2a
GIT binary patch
literal 1137
zcmV-%1djWOP)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9
za%BK;VQFr3E^cLXAT%y9E;JKBXv6>j1L8?UK~y+TjZ|Aq9Ay-qsJ*BaL4(G4d-27@
z#8^Wrg<bYGdmDCN6i^7hv{7ul#Rs%CO(4-e)i#jS+8{ouDa06!G4aw;39+_lOINZx
zdt(cA?|0by%>4i7*`<$|`0(YNf99NT&VSB#Mqpgo$2s2x#_nP&->U%~0QRf3%IS*V
zpWM2-jN-x~Dl6AfPscau-6S;V6~-TGaP0w=@pi`e;{ur0&Q*Sg%G5h4=n-DoI-L6c
zn`Qa!H)B4RLkmkr1RcEyIt`GAhY&t>vR?K37AW=|mEmdL;JcZ|cMF`cPK~L18c?37
zW#S*nlgCQ|u?Go@9$ANlAR^baPBWsC0U=8_Ji{*{_3O`72L4_{V{Kf)E&&R^mjh3+
z&FrW02ggexqaI0@4hgpf8K(moNg^vD)o(}4ZKZccMD03wTux*!{c?jU>){L!3JO!6
zC!+JWW<RTkjJ+t*RdOy<izw+fxBQITh%_PBZ${oJA}@)Eiw1Z{N9v7eWR~)u5j61E
zY8y9$p}_&<ZF&kaAm_ADf{lDDa)c};Zo`5!*&LB&Bol%b9bz+Q6969*sI()g`7e_Z
z>PggLLcpp+(AtZT*oUyFN5H0|XVh$wK(^^Od$>mDI1$}^{SZ^jr5II&uY(^?mLj??
zBu^eiVR;6H-_Ia_d5Y}x&bTs-><?dIV`u=YG>B3l1OXgB%E#WX1rBs!bLlj|zWrZd
z>LmmYy$UZ?UH05)5uNvaIKCx!A3$MgddH-lz?I(+JUk4ar5ELu>r9}Ij|WanWJ7)3
zh)qqPxbg+^f1Ychu>2qRYX<2Ha|n;P;BlB)F%U>KiRLo%bB!Q1cim}%Y`4Hmlk-Y?
z$PQBTZTOqYcJytZ$zQV>5Vagc@W@zIEmuDg7;vf@iR9$LmyomeAtl*J#nzTqGX2}g
z-bU+85=fA?ni5&p_h4i8+%1~?n4mJvNY0giK0m`lrh_f5WLx^NA>*<kMMyRkO-MB1
zA{~*2Qf34G9vxxz=-OGj)uW{B#{FEwE6P@}<UKl$py>swibN^dsR}#NEiw`%Rg)r;
zBq3|o!y`G=)Z)c36)~W4cDJB0txZ$;lXS(m8p%Y$H*t*lMIEBn9>nR(Nm`i%tw%wk
z^$<;1H|nrDG{}+*KV75ojWWjeE1cg)|0C?vxVDEwZ6kJxRZ5HT@8)aryKlhn?nlIC
zLzq^=Zxaz1dYP|Hov2kqs~0J@i*s~>p@T%-Nh_i~$H5<?eYuBmwSz%zF7c$&sBKol
zGD=tfz~<#8lswneayq_51S5oJsU3TXq@7|Zhd=x;I)JP^G5^`700000NkvXXu0mjf
D0SO0X

literal 0
HcmV?d00001

-- 
2.39.2