Issue #1343. Improvement of Extrusion and Revolution operations: Bug correction:...

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

diff --git a/src/ModuleBase/ModuleBase_WidgetSelector.cpp b/src/ModuleBase/ModuleBase_WidgetSelector.cpp
index 8aed922a3b728e1e29430149f1c20528c3a0260e..5dc76b1644ce711acfb4b385399d1b58894a956f 100755 (executable)
--- a/src/ModuleBase/ModuleBase_WidgetSelector.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetSelector.cpp
@@ -13,6 +13,7 @@
 #include <ModuleBase_OperationDescription.h>
 #include <ModuleBase_WidgetFactory.h>
 #include <ModuleBase_IModule.h>
+#include <ModuleBase_ResultPrs.h>
 
 #include <ModelAPI_ResultConstruction.h>
 
@@ -20,9 +21,8 @@
 
 ModuleBase_WidgetSelector::ModuleBase_WidgetSelector(QWidget* theParent,
                                                      ModuleBase_IWorkshop* theWorkshop,
-                                                     const Config_WidgetAPI* theData,
-                                                     const std::string& theParentId)
- : ModuleBase_WidgetValidated(theParent, theWorkshop, theData, theParentId)
+                                                     const Config_WidgetAPI* theData)
+: ModuleBase_WidgetValidated(theParent, theWorkshop, theData)
 {
 }
 
@@ -44,11 +44,14 @@ void ModuleBase_WidgetSelector::getGeomSelection(const ModuleBase_ViewerPrs& the
 //********************************************************************
 void ModuleBase_WidgetSelector::onSelectionChanged()
 {
-  clearAttribute();
-
   QList<ModuleBase_ViewerPrs> aSelected = getFilteredSelected();
-
   bool isDone = setSelection(aSelected, true/*false*/);
+  updateOnSelectionChanged(isDone);
+}
+
+//********************************************************************
+void ModuleBase_WidgetSelector::updateOnSelectionChanged(const bool theDone)
+{
   // "false" flag should be used here, it connects to the #26658 OCC bug, when the user click in 
   // the same place repeatedly without mouse moved. In the case validation by filters is not
   // perfromed, so an invalid object is selected. E.g. distance constraint, selection of a point.
@@ -61,10 +64,16 @@ void ModuleBase_WidgetSelector::onSelectionChanged()
   // we need to forget about previous validation result as the current selection can influence on it
   clearValidatedCash();
 
-  if (isDone)
+  if (theDone)
     updateFocus();
 }
 
+//********************************************************************
+QList<ModuleBase_ViewerPrs> ModuleBase_WidgetSelector::getAttributeSelection() const
+{
+  return QList<ModuleBase_ViewerPrs>();
+}
+
 //********************************************************************
 bool ModuleBase_WidgetSelector::acceptSubShape(const GeomShapePtr& theShape,
                                                const ResultPtr& theResult) const
@@ -102,22 +111,24 @@ bool ModuleBase_WidgetSelector::acceptSubShape(const GeomShapePtr& theShape,
 
   QIntList::const_iterator anIt = aShapeTypes.begin(), aLast = aShapeTypes.end();
   for (; anIt != aLast; anIt++) {
-    if (aShapeType == *anIt)
+    TopAbs_ShapeEnum aCurrentShapeType = (TopAbs_ShapeEnum)*anIt;
+    if (aShapeType == aCurrentShapeType)
       aValid = true;
-    else if (*anIt == TopAbs_FACE) {
+    else if (aCurrentShapeType == TopAbs_FACE) {
       // try to process the construction shape only if there is no a selected shape in the viewer
       if (!theShape.get() && theResult.get()) {
         ResultConstructionPtr aCResult =
                                 std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(theResult);
         aValid = aCResult.get() && aCResult->facesNum() > 0;
       }
+      aValid = ModuleBase_ResultPrs::isValidShapeType(aCurrentShapeType, aShapeType);
     }
   }
   return aValid;
 }
 
 //********************************************************************
-void ModuleBase_WidgetSelector::activateSelectionAndFilters(bool toActivate)
+bool ModuleBase_WidgetSelector::activateSelectionAndFilters(bool toActivate)
 {
   updateSelectionName();
 
@@ -126,7 +137,7 @@ void ModuleBase_WidgetSelector::activateSelectionAndFilters(bool toActivate)
   } else {
     myWorkshop->deactivateSubShapesSelection();
   }
-  activateFilters(toActivate);
+  return activateFilters(toActivate);
 }
 
 //********************************************************************
@@ -164,7 +175,7 @@ bool ModuleBase_WidgetSelector::setSelectionCustom(const ModuleBase_ViewerPrs& t
   GeomShapePtr aShape;
   getGeomSelection(thePrs, anObject, aShape);
 
-  setObject(anObject, aShape);
+  ModuleBase_Tools::setObject(attributeToValidate(), anObject, aShape, myWorkshop, false);
   return true;
 }
 
@@ -192,7 +203,7 @@ std::string ModuleBase_WidgetSelector::generateName(const AttributePtr& theAttri
 
       ModuleBase_WidgetFactory aFactory(aXmlCfg, theWorkshop);
       std::string anAttributeTitle;
-      aFactory.getAttributeTitle(aFeature->getKind(), theAttribute->id(), anAttributeTitle);
+      aFactory.getAttributeTitle(theAttribute->id(), anAttributeTitle);
 
       std::stringstream aStreamName;
       aStreamName << theAttribute->owner()->data()->name() << "/"<< anAttributeTitle.c_str();