Deselection of objects with SHIFT: debug information

diff --git a/src/ModuleBase/ModuleBase_FilterValidated.cpp b/src/ModuleBase/ModuleBase_FilterValidated.cpp
index c977072a831a9da84c606555301e3ac4544a0769..bb56ba1491318356fcf5f9d62a5ebfd7983c01ca 100644 (file)
--- a/src/ModuleBase/ModuleBase_FilterValidated.cpp
+++ b/src/ModuleBase/ModuleBase_FilterValidated.cpp
@@ -14,15 +14,38 @@
 #include <ModuleBase_WidgetValidated.h>
 #include <ModuleBase_WidgetValidator.h>
 #include <ModuleBase_ViewerPrs.h>
+#include <ModuleBase_Tools.h>
 
 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;
+
+      //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_IPropertyPanel* aPanel = anOperation->propertyPanel();
     ModuleBase_ModelWidget* aCurrentWidget = aPanel->preselectionWidget();
     if (!aCurrentWidget)

diff --git a/src/ModuleBase/ModuleBase_Tools.cpp b/src/ModuleBase/ModuleBase_Tools.cpp
index da9486b70e57a7a6ee957f90e1744630c35e99bd..28e41314fd1657eb88105f4fe965f77a38e48c88 100755 (executable)
--- a/src/ModuleBase/ModuleBase_Tools.cpp
+++ b/src/ModuleBase/ModuleBase_Tools.cpp
@@ -271,7 +271,7 @@ QString objectInfo(const ObjectPtr& theObj, const bool isUseAttributesInfo)
   if (aFeature.get()) {
     aFeatureStr.append(QString(": %1").arg(aFeature->getKind().c_str()).toStdString().c_str());
     if (aFeature->data()->isValid()) {
-      aFeatureStr.append(QString(", name=%1").arg(aFeature->data()->name().c_str()).toStdString()
+      aFeatureStr.append(QString(", name=%1").arg(theObj->data()->name().c_str()).toStdString()
                                                                                        .c_str());
     }
     if (isUseAttributesInfo) {