Issue #1701 Preselecting before calling constraints does not put objects in the input...

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

diff --git a/src/ModuleBase/ModuleBase_IPropertyPanel.cpp b/src/ModuleBase/ModuleBase_IPropertyPanel.cpp
index 0a87a74c838943d7ac01623d9f3a38c3e125d149..eb338776b20a50e9c0672bdf8076b55e1a6448f9 100644 (file)
--- a/src/ModuleBase/ModuleBase_IPropertyPanel.cpp
+++ b/src/ModuleBase/ModuleBase_IPropertyPanel.cpp
@@ -9,6 +9,10 @@
 
 #include "ModuleBase_IPropertyPanel.h"
 #include "ModuleBase_ModelWidget.h"
+#include "ModuleBase_ToolBox.h"
+
+#include <ModelAPI_Validator.h>
+#include <ModelAPI_Session.h>
 
 ModuleBase_IPropertyPanel::ModuleBase_IPropertyPanel(QWidget* theParent) : QDockWidget(theParent), myIsEditing(false)
 {
@@ -25,12 +29,24 @@ ModuleBase_ModelWidget* ModuleBase_IPropertyPanel::findFirstAcceptingValueWidget
 {
   ModuleBase_ModelWidget* aFirstWidget = 0;
 
+  ModelAPI_ValidatorsFactory* aValidators = ModelAPI_Session::get()->validators();
+
   ModuleBase_ModelWidget* aWgt;
   QList<ModuleBase_ModelWidget*>::const_iterator aWIt;
+  bool isOffToolBox = false;
   for (aWIt = theWidgets.begin(); aWIt != theWidgets.end() && !aFirstWidget; ++aWIt) {
     aWgt = (*aWIt);
-    if (aWgt->canSetValue())
-      aFirstWidget = aWgt;
+    if (!aValidators->isCase(aWgt->feature(), aWgt->attributeID()))
+      continue; // this attribute is not participated in the current case
+
+    if (!aWgt->canAcceptFocus())
+      continue;
+
+    /// workaround for the same attributes used in different stacked widgets(attribute types)
+    if (ModuleBase_ToolBox::isOffToolBoxParent(aWgt))
+      continue;
+
+    aFirstWidget = aWgt;
   }
   return aFirstWidget;
 }