#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 <ModelAPI_AttributeSelection.h>
+#include <ModelAPI_AttributeSelectionList.h>
#include <TopoDS_Iterator.hxx>
//********************************************************************
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
+ // "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.
// the 3rd click in the same point allow using this point.
updateFocus();
}
+//********************************************************************
+QIntList ModuleBase_WidgetSelector::getShapeTypes() const
+{
+ QIntList aShapeTypes = shapeTypes();
+ // this type should be mentioned in XML, poor selection otherwise
+ if (/*aShapeTypes.contains(TopAbs_SOLID) ||*/
+ aShapeTypes.contains(ModuleBase_ResultPrs::Sel_Result/*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
{
aValid = true;
return aValid;
}
- // when the SHAPE type is provided by XML, the hole result shape can be selected.
- if (!aShape.get() && aShapeTypes.contains(TopAbs_SHAPE)) {
+ // when the SHAPE type is provided by XML as Object, the whole result shape should be selected.
+ if (!aShape.get() && aShapeTypes.contains(ModuleBase_ResultPrs::Sel_Result)) {
aValid = true;
return aValid;
}
std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(theResult);
aValid = aCResult.get() && aCResult->facesNum() > 0;
}
- if (!aValid) {
- // the compared shape types are not equal but presentation might allow some type for another
- // exactly it allow Wire type of the shape for Face XML shape type
- aValid = ModuleBase_ResultPrs::isValidShapeType(aCurrentShapeType, aShapeType);
- }
}
}
return aValid;
{
connect(myWorkshop, SIGNAL(selectionChanged()), this,
SLOT(onSelectionChanged()), Qt::UniqueConnection);
-
+
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);
}
//********************************************************************
getGeomSelection(thePrs, 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;
+ return ModuleBase_Tools::setObject(attribute(), anObject, aShape,
+ myWorkshop, myIsInValidate, true);
}
//********************************************************************
ModuleBase_ModelWidget::deactivate();
disconnect(myWorkshop, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged()));
activateSelectionAndFilters(false);
- ModuleBase_ModelWidget::deactivate();
+
+ /// clear temporary cash
+ AttributePtr anAttribute = attribute();
+ if (!anAttribute.get())
+ return;
+ std::string aType = anAttribute->attributeType();
+ if (anAttribute->attributeType() == ModelAPI_AttributeSelection::typeId()) {
+ AttributeSelectionPtr aSelectAttr =
+ std::dynamic_pointer_cast<ModelAPI_AttributeSelection>(anAttribute);
+ aSelectAttr->removeTemporaryValues();
+ }
+ else if (anAttribute->attributeType() == ModelAPI_AttributeSelectionList::typeId()) {
+ AttributeSelectionListPtr aSelectAttr =
+ std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(anAttribute);
+ aSelectAttr->removeTemporaryValues();
+ }
}
//********************************************************************