X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_FilterValidated.cpp;h=08314d734cc3cf2793e3e601ac6a9a53d891551d;hb=86c435d69e7b27d36c037ed028d79d8f32f021ac;hp=5bb26dac55ac995691f02fc411ba322317e6ba63;hpb=c910e9e2e9e68bc1a9f857d555a0201c2c4c75f1;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/ModuleBase_FilterValidated.cpp b/src/ModuleBase/ModuleBase_FilterValidated.cpp
index 5bb26dac5..08314d734 100644
--- a/src/ModuleBase/ModuleBase_FilterValidated.cpp
+++ b/src/ModuleBase/ModuleBase_FilterValidated.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 
-// File:        ModuleBase_FilterValidated.h
+// File:        ModuleBase_FilterValidated.cpp
 // Created:     17 Mar 2015
 // Author:      Natalia ERMOLAEVA
 
@@ -9,22 +9,34 @@
 
 #include <ModuleBase_IModule.h>
 #include <ModuleBase_IPropertyPanel.h>
+#include <ModuleBase_ISelection.h>
 #include <ModuleBase_Operation.h>
 #include <ModuleBase_WidgetValidated.h>
+#include <ModuleBase_ViewerPrs.h>
 
 IMPLEMENT_STANDARD_HANDLE(ModuleBase_FilterValidated, SelectMgr_Filter);
 IMPLEMENT_STANDARD_RTTIEXT(ModuleBase_FilterValidated, SelectMgr_Filter);
 
 Standard_Boolean ModuleBase_FilterValidated::IsOk(const Handle(SelectMgr_EntityOwner)& theOwner) const
 {
+  bool aValid = true;
   ModuleBase_Operation* anOperation = myWorkshop->module()->currentOperation();
-  if (!anOperation)
-    return true;
-
-  ModuleBase_IPropertyPanel* aPanel = anOperation->propertyPanel();
-  ModuleBase_ModelWidget* anActiveWidget = aPanel->activeWidget();
-  ModuleBase_WidgetValidated* aWidgetValidated = dynamic_cast<ModuleBase_WidgetValidated*>
-                                                                          (anActiveWidget);
-  return !aWidgetValidated || aWidgetValidated->isValid(theOwner);
+  if (anOperation) {
+    ModuleBase_IPropertyPanel* aPanel = anOperation->propertyPanel();
+    ModuleBase_ModelWidget* aCurrentWidget = aPanel->preselectionWidget();
+    if (!aCurrentWidget)
+      aCurrentWidget = myWorkshop->module()->activeWidget();
+    ModuleBase_WidgetValidated* aWidgetValidated = dynamic_cast<ModuleBase_WidgetValidated*>
+                                                                           (aCurrentWidget);
+    ModuleBase_ViewerPrs aPrs;
+    myWorkshop->selection()->fillPresentation(aPrs, theOwner);
+
+    aValid = !aWidgetValidated || aWidgetValidated->isValidSelection(aPrs);
+  }
+
+#ifdef DEBUG_FILTERS
+  qDebug(QString("ModuleBase_FilterValidated::IsOk = %1").arg(aValid).toStdString().c_str());
+#endif
+  return aValid;
 }