#include <ModuleBase_OperationDescription.h>
#include <ModuleBase_WidgetFactory.h>
#include <ModuleBase_IModule.h>
+#include <ModuleBase_ResultPrs.h>
+#include <ModuleBase_ViewerPrs.h>
#include <ModelAPI_ResultConstruction.h>
}
//********************************************************************
-void ModuleBase_WidgetSelector::getGeomSelection(const ModuleBase_ViewerPrs& thePrs,
+void ModuleBase_WidgetSelector::getGeomSelection(const ModuleBase_ViewerPrsPtr& thePrs,
ObjectPtr& theObject,
GeomShapePtr& theShape)
{
//********************************************************************
void ModuleBase_WidgetSelector::onSelectionChanged()
{
- QList<ModuleBase_ViewerPrs> aSelected = getFilteredSelected();
-
+ QList<ModuleBase_ViewerPrsPtr> 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.
// 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
+QList<ModuleBase_ViewerPrsPtr> ModuleBase_WidgetSelector::getAttributeSelection() const
{
- return QList<ModuleBase_ViewerPrs>();
+ return QList<ModuleBase_ViewerPrsPtr>();
}
//********************************************************************
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;
}
//********************************************************************
-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);
}
//********************************************************************
-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);
+ ModuleBase_Tools::setObject(attribute(), anObject, aShape, myWorkshop, myIsInValidate);
return true;
}