}
} else {
AttributeSelectionPtr aSelectAttr = aData->selection(attributeID());
- ResultPtr aBody = std::dynamic_pointer_cast<ModelAPI_Result>(theSelectedObject);
- if (aSelectAttr && aBody && (theShape.get() != NULL)) {
- aSelectAttr->setValue(aBody, theShape);
+ ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(theSelectedObject);
+ if (aSelectAttr) {
+ aSelectAttr->setValue(aResult, theShape);
isChanged = true;
}
}
// In order to make reselection possible
// TODO: check with MPV clearAttribute();
- //QObjectPtrList aObjects = myWorkshop->selection()->selectedPresentations();
- QList<ModuleBase_ViewerPrs> aSelected = myWorkshop->selection()->getSelected();
- if (aSelected.size() > 0) {
- Handle(SelectMgr_EntityOwner) anOwner = aSelected.first().owner();
- if (isValid(anOwner)) {
- setSelection(anOwner);
- // the updateObject method should be called to flush the updated sigal. The workshop listens it,
- // calls validators for the feature and, as a result, updates the Apply button state.
- updateObject(myFeature);
- //if (theObj) {
- // raisePanel();
- //}
- //updateSelectionName();
- //emit valuesChanged();
- emit focusOutWidget(this);
- }
+ QList<ModuleBase_ViewerPrs> aSelectedPrs = getSelectedEntitiesOrObjects(myWorkshop->selection());
+ if (aSelectedPrs.empty())
+ return;
+ ModuleBase_ViewerPrs aPrs = aSelectedPrs.first();
+ if (aPrs.isEmpty() || !isValidSelection(aPrs))
+ return;
+
+ if (!aPrs.isEmpty() && isValidSelection(aPrs)) {
+ setSelectionCustom(aPrs);
+ // the updateObject method should be called to flush the updated sigal. The workshop listens it,
+ // calls validators for the feature and, as a result, updates the Apply button state.
+ updateObject(myFeature);
+ //if (theObj) {
+ // raisePanel();
+ //}
+ //updateSelectionName();
+ //emit valuesChanged();
+ emit focusOutWidget(this);
}
+
}
//********************************************************************
myObject = GeomValidators_Tools::getObject(anAttribute);
myShape = getShape();
- myRefAttribute = NULL;
+ myRefAttribute = AttributePtr();
myIsObject = false;
AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID());
if (aRefAttr) {
}
//********************************************************************
-bool ModuleBase_WidgetShapeSelector::setSelection(const Handle_SelectMgr_EntityOwner& theOwner)
+bool ModuleBase_WidgetShapeSelector::setSelectionCustom(const ModuleBase_ViewerPrs& thePrs)
{
bool isDone = false;
- ModuleBase_ViewerPrs aPrs;
- myWorkshop->selection()->fillPresentation(aPrs, theOwner);
- ObjectPtr aObject = aPrs.object();
+ // It should be checked by corresponded validator
+ ObjectPtr aObject = thePrs.object();
ObjectPtr aCurrentObject = GeomValidators_Tools::getObject(myFeature->attribute(attributeID()));
+ /*
if ((!aCurrentObject) && (!aObject))
- return false;
+ return false;*/
+ // It should be checked by corresponded validator
// Check that the selected object is result (others can not be accepted)
ResultPtr aRes = std::dynamic_pointer_cast<ModelAPI_Result>(aObject);
if (!aRes)
return false;
-
- if (myFeature) {
+ /*if (myFeature) {
// We can not select a result of our feature
const std::list<std::shared_ptr<ModelAPI_Result>>& aResList = myFeature->results();
std::list<std::shared_ptr<ModelAPI_Result> >::const_iterator aIt;
return false;
}
}
+ */
+ // It should be checked by corresponded validator
+ /*
// Check that object belongs to active document or PartSet
DocumentPtr aDoc = aRes->document();
SessionPtr aMgr = ModelAPI_Session::get();
if (!(aDoc == aMgr->activeDocument()) && !(aDoc == aMgr->moduleDocument()))
- return false;
+ return false;*/
+ // It should be checked by corresponded validator
// Check that the result has a shape
GeomShapePtr aShape = ModelAPI_Tools::shape(aRes);
if (!aShape)
return false;
// Get sub-shapes from local selection
- if (!aPrs.shape().IsNull()) {
+ if (!thePrs.shape().IsNull()) {
aShape = std::shared_ptr<GeomAPI_Shape>(new GeomAPI_Shape());
- aShape->setImpl(new TopoDS_Shape(aPrs.shape()));
+ aShape->setImpl(new TopoDS_Shape(thePrs.shape()));
}
// Check that the selection corresponds to selection type
if (!acceptSubShape(aShape))