X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_WidgetShapeSelector.cpp;h=472b122e829813972c40327f8bc6bb3ccef2099b;hb=32208dedf0b2b5bd50b5b86c464f37a8e0eb07d0;hp=7352c1344cb42c50241b3fea9b8a860804f78c07;hpb=ba8119ee40e4a1f84df10304dd420d0b9c0a9527;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_WidgetShapeSelector.cpp b/src/PartSet/PartSet_WidgetShapeSelector.cpp old mode 100644 new mode 100755 index 7352c1344..472b122e8 --- a/src/PartSet/PartSet_WidgetShapeSelector.cpp +++ b/src/PartSet/PartSet_WidgetShapeSelector.cpp @@ -5,117 +5,113 @@ // Author: Vitaly Smetannikov #include "PartSet_WidgetShapeSelector.h" +#include "PartSet_Module.h" +#include "PartSet_SketcherMgr.h" #include #include #include #include +#include -#include +#include + +#include #include #include +#include +#include +#include +#include +#include + PartSet_WidgetShapeSelector::PartSet_WidgetShapeSelector(QWidget* theParent, ModuleBase_IWorkshop* theWorkshop, - const Config_WidgetAPI* theData, - const std::string& theParentId) -: ModuleBase_WidgetShapeSelector(theParent, theWorkshop, theData, theParentId) + const Config_WidgetAPI* theData) +: ModuleBase_WidgetShapeSelector(theParent, theWorkshop, theData) { + myUseSketchPlane = theData->getBooleanAttribute("use_sketch_plane", true); + myExternalObjectMgr = new PartSet_ExternalObjectsMgr(theData->getProperty("use_external"), + theData->getProperty("can_create_external"), true); } -bool PartSet_WidgetShapeSelector::setObject(ObjectPtr theSelectedObject, GeomShapePtr theShape) +PartSet_WidgetShapeSelector::~PartSet_WidgetShapeSelector() { - ObjectPtr aSelectedObject = theSelectedObject; - GeomShapePtr aShape = theShape; - - FeaturePtr aSelectedFeature = ModelAPI_Feature::feature(aSelectedObject); - if (aSelectedFeature == myFeature) // In order to avoid selection of the same object - return false; - std::shared_ptr aSPFeature = - std::dynamic_pointer_cast(aSelectedFeature); - if (aSPFeature.get() == NULL && aShape.get() != NULL && !aShape->isNull()) { - // Processing of external (non-sketch) object - createExternal(theSelectedObject, theShape); - if (myExternalObject) - aSelectedObject = myExternalObject; - else - return false; - } else { - // Processing of sketch object - DataPtr aData = myFeature->data(); - if (aShape) { - AttributePtr aAttr = aData->attribute(attributeID()); - AttributeRefAttrPtr aRefAttr = - std::dynamic_pointer_cast(aAttr); - if (aRefAttr) { - // it is possible that the point feature is selected. It should be used itself - // instead of searching an attribute for the shape - bool aShapeIsResult = false; - /*ResultPtr aResult = std::dynamic_pointer_cast(theSelectedObject); - if (aResult.get() != NULL) { - GeomShapePtr aShapePtr = aResult->shape(); - // it is important to call isEqual of the shape of result. - // It is a GeomAPI_Vertex shape for the point. The shape of the parameter is - // GeomAPI_Shape. It is important to use the realization of the isEqual method from - // GeomAPI_Vertex class - aShapeIsResult = aShapePtr.get() != NULL && aShapePtr->isEqual(theShape); - }*/ - - AttributePtr aPntAttr; - if (!aShapeIsResult) { - TopoDS_Shape aTDSShape = aShape->impl(); - aPntAttr = PartSet_Tools::findAttributeBy2dPoint(aSelectedObject, aTDSShape, mySketch); - } - // this is an alternative, whether the attribute should be set or object in the attribute - // the first check is the attribute because the object already exist - // the object is set only if there is no selected attribute - // test case is - preselection for distance operation, which contains two points selected on lines - if (aPntAttr) - aRefAttr->setAttr(aPntAttr); - else if (aSelectedObject) - aRefAttr->setObject(aSelectedObject); - return true; - } - } - } - return ModuleBase_WidgetShapeSelector::setObject(aSelectedObject, aShape); + delete myExternalObjectMgr; } //******************************************************************** -void PartSet_WidgetShapeSelector::restoreAttributeValue(const bool theValid) +bool PartSet_WidgetShapeSelector::activateSelectionAndFilters(bool toActivate) { - ModuleBase_WidgetShapeSelector::restoreAttributeValue(theValid); - removeExternal(); + bool aHasSelectionFilter = ModuleBase_WidgetShapeSelector::activateSelectionAndFilters + (toActivate); + if (!myUseSketchPlane) { + XGUI_Workshop* aWorkshop = XGUI_Tools::workshop(myWorkshop); + PartSet_Module* aModule = dynamic_cast(aWorkshop->module()); + bool isUsePlaneFilterOnly = !toActivate; + aModule->sketchMgr()->activatePlaneFilter(isUsePlaneFilterOnly); + } + return aHasSelectionFilter; } //******************************************************************** -void PartSet_WidgetShapeSelector::createExternal(ObjectPtr theSelectedObject, - GeomShapePtr theShape) +bool PartSet_WidgetShapeSelector::isValidSelectionCustom(const ModuleBase_ViewerPrsPtr& thePrs) { - ObjectPtr aObj = PartSet_Tools::createFixedObjectByExternal(theShape->impl(), - theSelectedObject, mySketch); - if (aObj != myExternalObject) { - removeExternal(); - myExternalObject = aObj; + bool aValid = ModuleBase_WidgetShapeSelector::isValidSelectionCustom(thePrs); + if (aValid) { + ObjectPtr anObject = myWorkshop->selection()->getResult(thePrs); + aValid = myExternalObjectMgr->isValidObject(anObject); } + return aValid; } -//******************************************************************** -void PartSet_WidgetShapeSelector::removeExternal() +void PartSet_WidgetShapeSelector::getGeomSelection(const ModuleBase_ViewerPrsPtr& thePrs, + ObjectPtr& theObject, + GeomShapePtr& theShape) { - if (myExternalObject.get()) { - DocumentPtr aDoc = myExternalObject->document(); - FeaturePtr aFeature = ModelAPI_Feature::feature(myExternalObject); - if (aFeature.get() != NULL) { - QObjectPtrList anObjects; - anObjects.append(aFeature); - // the external feature should be removed with all references, sketch feature should be ignored - std::set anIgnoredFeatures; - anIgnoredFeatures.insert(sketch()); - XGUI_Workshop::deleteFeatures(anObjects, anIgnoredFeatures); + ModuleBase_WidgetShapeSelector::getGeomSelection(thePrs, theObject, theShape); + + FeaturePtr aSelectedFeature = ModelAPI_Feature::feature(theObject); + std::shared_ptr aSPFeature = + std::dynamic_pointer_cast(aSelectedFeature); + // there is no a sketch feature is selected, but the shape exists, + // try to create an exernal object + // TODO: unite with the same functionality in PartSet_WidgetShapeSelector + if (aSPFeature.get() == NULL) { + ObjectPtr anExternalObject = ObjectPtr(); + GeomShapePtr anExternalShape = GeomShapePtr(); + if (myExternalObjectMgr->useExternal()) { + if (myExternalObjectMgr->canCreateExternal()) { + GeomShapePtr aShape = theShape; + if (!aShape.get()) { + ResultPtr aResult = myWorkshop->selection()->getResult(thePrs); + if (aResult.get()) + aShape = aResult->shape(); + } + if (aShape.get() != NULL && !aShape->isNull()) + anExternalObject = + myExternalObjectMgr->externalObject(theObject, aShape, sketch(), myIsInValidate); + } + else { /// use objects of found selection + anExternalObject = theObject; + anExternalShape = theShape; + } } - myExternalObject = NULL; + /// the object is null if the selected feature is "external"(not sketch entity feature of the + /// current sketch) and it is not created by object manager + theObject = anExternalObject; + theShape = anExternalShape; } } + +//******************************************************************** +void PartSet_WidgetShapeSelector::restoreAttributeValue(const AttributePtr& theAttribute, + const bool theValid) +{ + ModuleBase_WidgetShapeSelector::restoreAttributeValue(theAttribute, theValid); + myExternalObjectMgr->removeExternal(sketch(), myFeature, myWorkshop, true); +} +