- 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_IViewer* aViewer = myWorkshop->viewer();
+ Handle(AIS_InteractiveContext) aContext = aViewer->AISContext();
+
+ ModuleBase_Tools::selectionInfo(aContext, "ModuleBase_FilterValidated::IsOk");
+
+ ModuleBase_IPropertyPanel* aPanel = anOperation->propertyPanel();
+ ModuleBase_ModelWidget* aCurrentWidget = aPanel->preselectionWidget();
+ if (!aCurrentWidget)
+ aCurrentWidget = myWorkshop->module()->activeWidget();
+ if (aCurrentWidget) {
+ ModuleBase_ViewerPrsPtr aPrs(new ModuleBase_ViewerPrs());
+ myWorkshop->selection()->fillPresentation(aPrs, theOwner);
+ ModuleBase_WidgetValidated* aWidgetValidated = dynamic_cast<ModuleBase_WidgetValidated*>
+ (aCurrentWidget);
+ if (aWidgetValidated)
+ aValid = !aWidgetValidated || aWidgetValidated->isValidSelection(aPrs);
+ else{
+ ModuleBase_WidgetValidator* aWidgetValidator = aCurrentWidget->widgetValidator();
+ if (aWidgetValidator)
+ aValid = aWidgetValidator->isValidSelection(aPrs);
+ }
+ }
+ }
+
+#ifdef DEBUG_FILTERS
+ qDebug(QString("ModuleBase_FilterValidated::IsOk = %1").arg(aValid).toStdString().c_str());
+#endif
+ return aValid;