Selection priority in Sketch, clear selection when sketch goes from entity to neutral...

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

diff --git a/src/ModuleBase/ModuleBase_WidgetSelector.cpp b/src/ModuleBase/ModuleBase_WidgetSelector.cpp
index 8aed922a3b728e1e29430149f1c20528c3a0260e..caa9c798b476182f4e98df1cda537e894cfcca93 100755 (executable)
--- a/src/ModuleBase/ModuleBase_WidgetSelector.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetSelector.cpp
@@ -13,16 +13,19 @@
 #include <ModuleBase_OperationDescription.h>
 #include <ModuleBase_WidgetFactory.h>
 #include <ModuleBase_IModule.h>
+#include <ModuleBase_ResultPrs.h>
+#include <ModuleBase_ViewerPrs.h>
+#include <ModuleBase_Events.h>
 
 #include <ModelAPI_ResultConstruction.h>
+#include <ModelAPI_Events.h>
 
 #include <TopoDS_Iterator.hxx>
 
 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)
 {
 }
 
@@ -32,7 +35,7 @@ ModuleBase_WidgetSelector::~ModuleBase_WidgetSelector()
 }
 
 //********************************************************************
-void ModuleBase_WidgetSelector::getGeomSelection(const ModuleBase_ViewerPrs& thePrs,
+void ModuleBase_WidgetSelector::getGeomSelection(const ModuleBase_ViewerPrsPtr& thePrs,
                                                       ObjectPtr& theObject,
                                                       GeomShapePtr& theShape)
 {
@@ -44,11 +47,17 @@ void ModuleBase_WidgetSelector::getGeomSelection(const ModuleBase_ViewerPrs& the
 //********************************************************************
 void ModuleBase_WidgetSelector::onSelectionChanged()
 {
-  clearAttribute();
-
-  QList<ModuleBase_ViewerPrs> aSelected = getFilteredSelected();
+  QList<ModuleBase_ViewerPrsPtr> aSelected = getFilteredSelected();
+  // equal vertices should not be used here
+  ModuleBase_ISelection::filterSelectionOnEqualPoints(aSelected);
 
   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 +70,27 @@ 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();
 }
 
+//********************************************************************
+QIntList ModuleBase_WidgetSelector::getShapeTypes() const
+{
+  QIntList aShapeTypes = shapeTypes();
+  if (aShapeTypes.contains(TopAbs_SOLID) || aShapeTypes.contains(TopAbs_SHAPE)) {
+    // it should be selectable for both, "solids" and "objects" types
+    aShapeTypes.append(TopAbs_COMPSOLID);
+  }
+  return aShapeTypes;
+}
+
+//********************************************************************
+QList<ModuleBase_ViewerPrsPtr> ModuleBase_WidgetSelector::getAttributeSelection() const
+{
+  return QList<ModuleBase_ViewerPrsPtr>();
+}
+
 //********************************************************************
 bool ModuleBase_WidgetSelector::acceptSubShape(const GeomShapePtr& theShape,
                                                const ResultPtr& theResult) const
@@ -101,10 +127,11 @@ bool ModuleBase_WidgetSelector::acceptSubShape(const GeomShapePtr& theShape,
   }
 
   QIntList::const_iterator anIt = aShapeTypes.begin(), aLast = aShapeTypes.end();
-  for (; anIt != aLast; anIt++) {
-    if (aShapeType == *anIt)
+  for (; anIt != aLast && !aValid; 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 =
@@ -117,7 +144,7 @@ bool ModuleBase_WidgetSelector::acceptSubShape(const GeomShapePtr& theShape,
 }
 
 //********************************************************************
-void ModuleBase_WidgetSelector::activateSelectionAndFilters(bool toActivate)
+bool ModuleBase_WidgetSelector::activateSelectionAndFilters(bool toActivate)
 {
   updateSelectionName();
 
@@ -126,7 +153,7 @@ void ModuleBase_WidgetSelector::activateSelectionAndFilters(bool toActivate)
   } else {
     myWorkshop->deactivateSubShapesSelection();
   }
-  activateFilters(toActivate);
+  return activateFilters(toActivate);
 }
 
 //********************************************************************
@@ -138,11 +165,13 @@ void ModuleBase_WidgetSelector::activateCustom()
   activateSelectionAndFilters(true);
 
   // Restore selection in the viewer by the attribute selection list
-  myWorkshop->setSelected(getAttributeSelection());
+  // it should be postponed to have current widget as active to validate restored selection
+  static Events_ID anEvent = Events_Loop::eventByName(EVENT_UPDATE_BY_WIDGET_SELECTION);
+  ModelAPI_EventCreator::get()->sendUpdated(myFeature, anEvent);
 }
 
 //********************************************************************
-bool ModuleBase_WidgetSelector::isValidSelectionCustom(const ModuleBase_ViewerPrs& thePrs)
+bool ModuleBase_WidgetSelector::isValidSelectionCustom(const ModuleBase_ViewerPrsPtr& thePrs)
 {
   GeomShapePtr aShape = myWorkshop->selection()->getShape(thePrs);
   ResultPtr aResult = myWorkshop->selection()->getResult(thePrs);
@@ -158,13 +187,14 @@ bool ModuleBase_WidgetSelector::isValidSelectionCustom(const ModuleBase_ViewerPr
 }
 
 //********************************************************************
-bool ModuleBase_WidgetSelector::setSelectionCustom(const ModuleBase_ViewerPrs& thePrs)
+bool ModuleBase_WidgetSelector::setSelectionCustom(const ModuleBase_ViewerPrsPtr& thePrs)
 {
   ObjectPtr anObject;
   GeomShapePtr aShape;
   getGeomSelection(thePrs, anObject, aShape);
 
-  setObject(anObject, aShape);
+  // the last flag is to be depending on hasObject is called before. To be corrected later
+  ModuleBase_Tools::setObject(attribute(), anObject, aShape, myWorkshop, myIsInValidate, true);
   return true;
 }
 
@@ -192,7 +222,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();