#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 <ModelAPI_AttributeSelection.h>
+#include <ModelAPI_AttributeSelectionList.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)
{
}
}
//********************************************************************
-void ModuleBase_WidgetSelector::getGeomSelection(const ModuleBase_ViewerPrs& thePrs,
+void ModuleBase_WidgetSelector::getGeomSelection(const ModuleBase_ViewerPrsPtr& thePrs,
ObjectPtr& theObject,
GeomShapePtr& theShape)
{
//********************************************************************
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*/);
- // "false" flag should be used here, it connects to the #26658 OCC bug, when the user click in
+ 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.
// the 3rd click in the same point allow using this point.
// calls validators for the feature and, as a result, updates the Apply button state.
updateObject(myFeature);
- if (isDone)
- updateFocus();
-
// we need to forget about previous validation result as the current selection can influence on it
clearValidatedCash();
+
+ if (theDone)
+ 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
+{
+ return QList<ModuleBase_ViewerPrsPtr>();
}
//********************************************************************
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;
}
}
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 =
}
//********************************************************************
-void ModuleBase_WidgetSelector::activateSelectionAndFilters(bool toActivate)
+bool ModuleBase_WidgetSelector::activateSelectionAndFilters(bool toActivate)
{
updateSelectionName();
} else {
myWorkshop->deactivateSubShapesSelection();
}
- activateFilters(toActivate);
+ return activateFilters(toActivate);
}
//********************************************************************
{
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);
}
//********************************************************************
-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);
- return true;
+ // the last flag is to be depending on hasObject is called before. To be corrected later
+ 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();
+ }
}
//********************************************************************
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();
