From 2ef1e4ebed52958d8c82f2b7d1ec594fd8168df5 Mon Sep 17 00:00:00 2001
From: vsv <vitaly.smetannikov@opencascade.com>
Date: Tue, 13 Dec 2016 16:36:59 +0300
Subject: [PATCH] Issue #1906: Use validators for the field panel

---
 src/CollectionPlugin/CollectionPlugin_WidgetField.cpp | 5 ++---
 src/CollectionPlugin/CollectionPlugin_WidgetField.h   | 2 +-
 src/CollectionPlugin/plugin-Collection.xml            | 4 +++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/CollectionPlugin/CollectionPlugin_WidgetField.cpp b/src/CollectionPlugin/CollectionPlugin_WidgetField.cpp
index de74d3c46..fbf743557 100644
--- a/src/CollectionPlugin/CollectionPlugin_WidgetField.cpp
+++ b/src/CollectionPlugin/CollectionPlugin_WidgetField.cpp
@@ -793,7 +793,7 @@ void CollectionPlugin_WidgetField::onStepMove(int theStep)
 
 //**********************************************************************************
 bool CollectionPlugin_WidgetField::
-  isValidSelection(const std::shared_ptr<ModuleBase_ViewerPrs>& thePrs)
+  isValidSelectionCustom(const std::shared_ptr<ModuleBase_ViewerPrs>& thePrs)
 {
   return (myShapeTypeCombo->currentIndex() == 5)? false : true;
 }
@@ -812,8 +812,7 @@ void CollectionPlugin_WidgetField::onSelectionChanged()
   if (myShapeTypeCombo->currentIndex() == 5)
     return;
 
-  QList<ModuleBase_ViewerPrsPtr> aSelected =
-    myWorkshop->selection()->getSelected(ModuleBase_ISelection::AllControls);
+  QList<ModuleBase_ViewerPrsPtr> aSelected = getFilteredSelected();
 
   AttributeSelectionListPtr aSelList =
     myFeature->data()->selectionList(CollectionPlugin_Field::SELECTED_ID());
diff --git a/src/CollectionPlugin/CollectionPlugin_WidgetField.h b/src/CollectionPlugin/CollectionPlugin_WidgetField.h
index 5f202f551..d732d99d4 100644
--- a/src/CollectionPlugin/CollectionPlugin_WidgetField.h
+++ b/src/CollectionPlugin/CollectionPlugin_WidgetField.h
@@ -51,7 +51,7 @@ public:
   /// Checks the widget validity. By default, it returns true.
   /// \param thePrs a selected presentation in the view
   /// \return a boolean value
-  virtual bool isValidSelection(const std::shared_ptr<ModuleBase_ViewerPrs>& theValue);
+  virtual bool isValidSelectionCustom(const std::shared_ptr<ModuleBase_ViewerPrs>& theValue);
 
   /// Returns true if the event is processed.
   virtual bool processEnter();
diff --git a/src/CollectionPlugin/plugin-Collection.xml b/src/CollectionPlugin/plugin-Collection.xml
index 33042ac49..6ebd05466 100644
--- a/src/CollectionPlugin/plugin-Collection.xml
+++ b/src/CollectionPlugin/plugin-Collection.xml
@@ -14,7 +14,9 @@
         title="Field"
         tooltip="Create create fields for selected shapes"
         icon="icons/Collection/field.png">
-        <field-panel/>
+        <field-panel id="selected">
+          <validator id="GeomValidators_BodyShapes"/>
+        </field-panel>
       </feature>      
     </group>
   </workbench>
-- 
2.39.2