Avoid of reference to not-initialized attributes values

[modules/shaper.git] / src / ModuleBase / ModuleBase_FilterValidated.cpp

diff --git a/src/ModuleBase/ModuleBase_FilterValidated.cpp b/src/ModuleBase/ModuleBase_FilterValidated.cpp
index bb56ba1491318356fcf5f9d62a5ebfd7983c01ca..097eb60cb82d4e7dc7acd52169c3ade72c17f5bd 100644 (file)
--- a/src/ModuleBase/ModuleBase_FilterValidated.cpp
+++ b/src/ModuleBase/ModuleBase_FilterValidated.cpp
@@ -6,6 +6,7 @@
 
 #include "ModuleBase_FilterValidated.h"
 #include "ModuleBase_IWorkshop.h"
+#include "ModuleBase_IViewer.h"
 
 #include <ModuleBase_IModule.h>
 #include <ModuleBase_IPropertyPanel.h>
@@ -19,32 +20,15 @@
 IMPLEMENT_STANDARD_HANDLE(ModuleBase_FilterValidated, SelectMgr_Filter);
 IMPLEMENT_STANDARD_RTTIEXT(ModuleBase_FilterValidated, SelectMgr_Filter);
 
-//#define DEBUG_CURRENT_SELECTION
-
 Standard_Boolean ModuleBase_FilterValidated::IsOk(const Handle(SelectMgr_EntityOwner)& theOwner) const
 {
   bool aValid = true;
   ModuleBase_Operation* anOperation = myWorkshop->module()->currentOperation();
   if (anOperation) {
-#ifdef DEBUG_CURRENT_SELECTION
-    QString aPrefix = "ModuleBase_FilterValidated::IsOk: ";
-    QList<ModuleBase_ViewerPrsPtr> aSelected = myWorkshop->selection()->getSelected(ModuleBase_ISelection::Viewer);
-    QList<ModuleBase_ViewerPrsPtr>::const_iterator anIt = aSelected.begin(), aLast = aSelected.end();
-    QStringList anInfo;
-    ModuleBase_ViewerPrsPtr aPrs;
-    for (; anIt != aLast; anIt++) {
-      aPrs = (*anIt);
-      if (!aPrs.get())
-        continue;
+    ModuleBase_IViewer* aViewer = myWorkshop->viewer();
+    Handle(AIS_InteractiveContext) aContext = aViewer->AISContext();
 
-      //GeomShapePtr aShape = aPrs->shape();
-      ObjectPtr anObject = aPrs->object();
-      QString anObjectInfo = anObject.get() ? ModuleBase_Tools::objectInfo(anObject) : "";
-      anInfo.append(anObjectInfo);
-    }
-    QString anInfoStr = anInfo.join(";\t");
-    qDebug(QString("%1: %2, %3").arg(aPrefix).arg(anInfo.size()).arg(anInfoStr).toStdString().c_str());
-#endif
+    ModuleBase_Tools::selectionInfo(aContext, "ModuleBase_FilterValidated::IsOk");
 
     ModuleBase_IPropertyPanel* aPanel = anOperation->propertyPanel();
     ModuleBase_ModelWidget* aCurrentWidget = aPanel->preselectionWidget();