X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_WidgetShapeSelector.cpp;h=0bbeb05e8480d3ddffc8532ae826a2ee2c458f9d;hb=327f5bbd915fb32d21f2e524a8d97536e0e5dd4b;hp=578e1cdf9b7a7e7bc38d7919e96ce9d038635bd2;hpb=762c91644fd2b5eeb99e7ad783b844b565e9ae9d;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 578e1cdf9..0bbeb05e8 --- a/src/PartSet/PartSet_WidgetShapeSelector.cpp +++ b/src/PartSet/PartSet_WidgetShapeSelector.cpp @@ -10,119 +10,147 @@ #include #include +#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) +{ + myExternalObjectMgr = new PartSet_ExternalObjectsMgr(theData->getProperty("use_external"), true); +} -bool PartSet_WidgetShapeSelector::setObject(ObjectPtr theSelectedObject, GeomShapePtr theShape) +PartSet_WidgetShapeSelector::~PartSet_WidgetShapeSelector() { - ObjectPtr aSelectedObject = theSelectedObject; - GeomShapePtr aShape = theShape; + delete myExternalObjectMgr; +} + +//******************************************************************** +bool PartSet_WidgetShapeSelector::isValidSelectionCustom(const ModuleBase_ViewerPrs& thePrs) +{ + bool aValid = ModuleBase_WidgetShapeSelector::isValidSelectionCustom(thePrs); + if (aValid) { + ObjectPtr anObject = myWorkshop->selection()->getResult(thePrs); + aValid = myExternalObjectMgr->isValidObject(anObject); + } + return aValid; +} - FeaturePtr aSelectedFeature = ModelAPI_Feature::feature(aSelectedObject); - if (aSelectedFeature == myFeature) // In order to avoid selection of the same object - return false; +//******************************************************************** +void PartSet_WidgetShapeSelector::setObject(ObjectPtr theSelectedObject, GeomShapePtr theShape) +{ + FeaturePtr aSelectedFeature = ModelAPI_Feature::feature(theSelectedObject); + // Do check using of external feature 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; + // Processing of sketch object + if (aSPFeature.get() != NULL) { + GeomShapePtr aShape = theShape; + if (!aShape.get()) { + ResultPtr aResult = std::dynamic_pointer_cast(theSelectedObject); + if (aResult.get()) { + aShape = aResult->shape(); } } + setPointAttribute(theSelectedObject, aShape); } - return ModuleBase_WidgetShapeSelector::setObject(aSelectedObject, aShape); + else + ModuleBase_WidgetShapeSelector::setObject(theSelectedObject, theShape); } -//******************************************************************** -void PartSet_WidgetShapeSelector::storeAttributeValue() +void PartSet_WidgetShapeSelector::getGeomSelection(const ModuleBase_ViewerPrs& thePrs, + ObjectPtr& theObject, + GeomShapePtr& theShape) { - /// this is a temporary code, will be removed when master is merged to this branch - /*XGUI_ModuleConnector* aConnector = dynamic_cast(myWorkshop); - XGUI_Workshop* aWorkshop = aConnector->workshop(); - aWorkshop->displayer()->enableUpdateViewer(false); - */ - ModuleBase_WidgetShapeSelector::storeAttributeValue(); + 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 && myExternalObjectMgr->useExternal()) { + GeomShapePtr aShape = theShape; + if (!aShape.get()) { + ResultPtr aResult = myWorkshop->selection()->getResult(thePrs); + if (aResult.get()) + aShape = aResult->shape(); + } + if (aShape.get() != NULL && !aShape->isNull()) + theObject = myExternalObjectMgr->externalObject(theObject, aShape, sketch(), myIsInValidate); + } } //******************************************************************** -void PartSet_WidgetShapeSelector::restoreAttributeValue(const bool theValid) +GeomShapePtr PartSet_WidgetShapeSelector::getShape() const { - ModuleBase_WidgetShapeSelector::restoreAttributeValue(theValid); - /// this is a temporary code, will be removed when master is merged to this branch - /// after merge, the external edge should be removed always, without flag checking - if (!theValid) - removeExternal(); - /* - XGUI_ModuleConnector* aConnector = dynamic_cast(myWorkshop); - XGUI_Workshop* aWorkshop = aConnector->workshop(); - aWorkshop->displayer()->enableUpdateViewer(false);//->erase(myExternalObject); - aWorkshop->displayer()->enableUpdateViewer(true);*/ + // an empty shape by default + DataPtr aData = myFeature->data(); + AttributePtr anAttribute = aData->attribute(attributeID()); + GeomShapePtr aShape = PartSet_Tools::findShapeBy2DPoint(anAttribute, myWorkshop); + + if (!aShape.get()) + aShape = ModuleBase_WidgetShapeSelector::getShape(); + return aShape; } //******************************************************************** -void PartSet_WidgetShapeSelector::createExternal(ObjectPtr theSelectedObject, - GeomShapePtr theShape) +void PartSet_WidgetShapeSelector::restoreAttributeValue(const bool theValid) { - ObjectPtr aObj = PartSet_Tools::createFixedObjectByExternal(theShape->impl(), - theSelectedObject, mySketch); - if (aObj != myExternalObject) { - removeExternal(); - myExternalObject = aObj; - } + ModuleBase_WidgetShapeSelector::restoreAttributeValue(theValid); + myExternalObjectMgr->removeExternal(sketch(), myFeature, myWorkshop, true); } //******************************************************************** -void PartSet_WidgetShapeSelector::removeExternal() +void PartSet_WidgetShapeSelector::setPointAttribute(ObjectPtr theSelectedObject, GeomShapePtr theShape) { - if (myExternalObject.get()) { - DocumentPtr aDoc = myExternalObject->document(); - FeaturePtr aFeature = ModelAPI_Feature::feature(myExternalObject); - if (aFeature.get() != NULL) { - aDoc->removeFeature(aFeature); + DataPtr aData = myFeature->data(); + 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 = theShape->impl(); + aPntAttr = PartSet_Tools::findAttributeBy2dPoint(theSelectedObject, aTDSShape, mySketch); } - myExternalObject = NULL; + // 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 + aRefAttr->setObject(theSelectedObject); } }