X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_OperationPrs.cpp;h=7068063188130db566b6264cad07d91c1967c2b3;hb=35fe8b5049c223feef74dc631f5c2faeafa49483;hp=10d475066d66cbfd9a2f8e5b14087f67bb64b1f1;hpb=3579f30efb51c87649a92cda00eaafe4e699c506;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_OperationPrs.cpp b/src/PartSet/PartSet_OperationPrs.cpp index 10d475066..706806318 100755 --- a/src/PartSet/PartSet_OperationPrs.cpp +++ b/src/PartSet/PartSet_OperationPrs.cpp @@ -29,21 +29,25 @@ #include #include #include +#include #include #include #include -#include +#include #include #include #include #include +#include +#include //#define DEBUG_EMPTY_SHAPE +//#define DEBUG_OPERATION_PRS // multi-rotation/translation operation //#define DEBUG_HIDE_COPY_ATTRIBUTE @@ -52,12 +56,14 @@ #include #endif -IMPLEMENT_STANDARD_HANDLE(PartSet_OperationPrs, ViewerData_AISShape); IMPLEMENT_STANDARD_RTTIEXT(PartSet_OperationPrs, ViewerData_AISShape); PartSet_OperationPrs::PartSet_OperationPrs(ModuleBase_IWorkshop* theWorkshop) : ViewerData_AISShape(TopoDS_Shape()), myWorkshop(theWorkshop), myUseAISWidth(false) { +#ifdef DEBUG_OPERATION_PRS + qDebug("PartSet_OperationPrs::PartSet_OperationPrs"); +#endif myShapeColor = Quantity_Color(1, 1, 1, Quantity_TOC_RGB); // first presentation for having correct Compute until presentation with shapes are set @@ -82,10 +88,15 @@ void PartSet_OperationPrs::useAISWidth() myUseAISWidth = true; } -void PartSet_OperationPrs::Compute(const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, - const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer theMode) +void PartSet_OperationPrs::Compute( + const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, + const Handle(Prs3d_Presentation)& thePresentation, + const Standard_Integer theMode) { +#ifdef DEBUG_OPERATION_PRS + qDebug("PartSet_OperationPrs::Compute -- begin"); +#endif + SetColor(myShapeColor); thePresentation->Clear(); bool aReadyToDisplay = !myShapeToPrsMap.IsEmpty(); @@ -93,10 +104,15 @@ void PartSet_OperationPrs::Compute(const Handle(PrsMgr_PresentationManager3d)& t XGUI_Displayer* aDisplayer = XGUI_Tools::workshop(myWorkshop)->displayer(); Handle(Prs3d_Drawer) aDrawer = Attributes(); // create presentations on the base of the shapes - for(NCollection_DataMap::Iterator anIter(myShapeToPrsMap); - anIter.More(); anIter.Next()) { + BRep_Builder aBuilder; + TopoDS_Compound aComp; + aBuilder.MakeCompound(aComp); + for(NCollection_DataMap::Iterator + anIter(myShapeToPrsMap); anIter.More(); anIter.Next()) { const TopoDS_Shape& aShape = anIter.Key(); + aBuilder.Add(aComp, aShape); // change deviation coefficient to provide more precise circle + // as there is no result, the shape is processed to correct deviation. To be unified ModuleBase_Tools::setDefaultDeviationCoefficient(aShape, aDrawer); if (myUseAISWidth) { @@ -111,16 +127,19 @@ void PartSet_OperationPrs::Compute(const Handle(PrsMgr_PresentationManager3d)& t setWidth(aDrawer, aWidth); } } - StdPrs_WFDeflectionShape::Add(thePresentation, aShape, aDrawer); + StdPrs_WFShape::Add(thePresentation, aShape, aDrawer); } - + Set(aComp); if (!aReadyToDisplay) { - Events_InfoMessage("PartSet_OperationPrs", + Events_InfoMessage("PartSet_OperationPrs", "An empty AIS presentation: PartSet_OperationPrs").send(); std::shared_ptr aMsg = std::shared_ptr( new Events_Message(Events_Loop::eventByName(EVENT_EMPTY_OPERATION_PRESENTATION))); Events_Loop::loop()->send(aMsg); } +#ifdef DEBUG_OPERATION_PRS + qDebug("PartSet_OperationPrs::Compute -- end"); +#endif } void PartSet_OperationPrs::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection, @@ -151,7 +170,8 @@ void PartSet_OperationPrs::addValue(const ObjectPtr& theObject, const GeomShapeP if (theObject.get()) { ResultPtr aResult = std::dynamic_pointer_cast(theObject); if (aResult.get()) { - ResultCompSolidPtr aCompsolidResult = std::dynamic_pointer_cast(theObject); + ResultCompSolidPtr aCompsolidResult = + std::dynamic_pointer_cast(theObject); if (aCompsolidResult.get()) { if (aCompsolidResult->numberOfSubs() > 0) { for(int i = 0; i < aCompsolidResult->numberOfSubs(); i++) { @@ -168,7 +188,8 @@ void PartSet_OperationPrs::addValue(const ObjectPtr& theObject, const GeomShapeP else { FeaturePtr aFeature = ModelAPI_Feature::feature(theObject); if (aFeature.get()) { - AttributeBooleanPtr aCopyAttr = aFeature->data()->boolean(SketchPlugin_SketchEntity::COPY_ID()); + AttributeBooleanPtr aCopyAttr = + aFeature->data()->boolean(SketchPlugin_SketchEntity::COPY_ID()); if (aCopyAttr.get()) { bool isCopy = aCopyAttr->value(); if (isCopy) @@ -238,7 +259,7 @@ void PartSet_OperationPrs::getFeatureShapes(const FeaturePtr& theFeature, std::string anAttrType = anAttribute->attributeType(); if (anAttrType == ModelAPI_AttributeSelectionList::typeId()) { - std::shared_ptr aCurSelList = + std::shared_ptr aCurSelList = std::dynamic_pointer_cast(anAttribute); for(int i = 0; i < aCurSelList->size(); i++) { std::shared_ptr aSelAttribute = aCurSelList->value(i); @@ -272,7 +293,8 @@ void PartSet_OperationPrs::getFeatureShapes(const FeaturePtr& theFeature, ObjectPtr anObject; GeomShapePtr aShape; if (anAttrType == ModelAPI_AttributeRefAttr::typeId()) { - AttributeRefAttrPtr anAttr = std::dynamic_pointer_cast(anAttribute); + AttributeRefAttrPtr anAttr = + std::dynamic_pointer_cast(anAttribute); if (anAttr->isObject()) { anObject = anAttr->object(); } @@ -287,12 +309,14 @@ void PartSet_OperationPrs::getFeatureShapes(const FeaturePtr& theFeature, } } if (anAttrType == ModelAPI_AttributeSelection::typeId()) { - AttributeSelectionPtr anAttr = std::dynamic_pointer_cast(anAttribute); + AttributeSelectionPtr anAttr = + std::dynamic_pointer_cast(anAttribute); anObject = anAttr->context(); aShape = anAttr->value(); } if (anAttrType == ModelAPI_AttributeReference::typeId()) { - AttributeReferencePtr anAttr = std::dynamic_pointer_cast(anAttribute); + AttributeReferencePtr anAttr = + std::dynamic_pointer_cast(anAttribute); anObject = anAttr->value(); } addValue(anObject, aShape, theFeature, theWorkshop, theObjectShapes); @@ -313,9 +337,10 @@ void PartSet_OperationPrs::getResultShapes(const FeaturePtr& theFeature, XGUI_Displayer* aDisplayer = XGUI_Tools::workshop(theWorkshop)->displayer(); - std::list aFeatureResults = theFeature->results(); - std::list::const_iterator aRIt = aFeatureResults.begin(), - aRLast = aFeatureResults.end(); + std::list aResults; + ModelAPI_Tools::allResults(theFeature, aResults); + std::list::const_iterator aRIt = aResults.begin(), + aRLast = aResults.end(); for (; aRIt != aRLast; aRIt++) { ResultPtr aResult = *aRIt; GeomShapePtr aGeomShape = aResult->shape(); @@ -323,19 +348,51 @@ void PartSet_OperationPrs::getResultShapes(const FeaturePtr& theFeature, } } +void PartSet_OperationPrs::getPresentationShapes(const FeaturePtr& theFeature, + ModuleBase_IWorkshop* theWorkshop, + QMap >& theObjectShapes, + const bool theListShouldBeCleared) +{ + if (theListShouldBeCleared) + theObjectShapes.clear(); + + if (!theFeature.get() || !theFeature->data()->isValid()) // if feature is already removed + return; + + XGUI_Displayer* aDisplayer = XGUI_Tools::workshop(theWorkshop)->displayer(); + + GeomPresentablePtr aPrs = std::dynamic_pointer_cast(theFeature); + if (!aPrs.get()) + return; + + AISObjectPtr anAIS = aPrs->getAISObject(aDisplayer->getAISObject(theFeature)); + if (!anAIS.get()) + return; + + Handle(AIS_InteractiveObject) anAISPrs = anAIS->impl(); + if (!anAISPrs.IsNull()) { + Handle(AIS_Shape) aShapePrs = Handle(AIS_Shape)::DownCast(anAISPrs); + if (!aShapePrs.IsNull()) { + TopoDS_Shape aShape = aShapePrs->Shape(); + if (!aShape.IsNull()) { + std::shared_ptr aGeomShape(new GeomAPI_Shape()); + aGeomShape->setImpl(new TopoDS_Shape(aShape)); + appendShapeIfVisible(theWorkshop, theFeature, aGeomShape, theObjectShapes); + } + } + } +} + void PartSet_OperationPrs::getHighlightedShapes(ModuleBase_IWorkshop* theWorkshop, - QMap >& theObjectShapes) + QMap >& theObjectShapes) { theObjectShapes.clear(); QList aValues; - ModuleBase_IPropertyPanel* aPanel = theWorkshop->propertyPanel(); - if (aPanel) { - ModuleBase_ModelWidget* aWidget = aPanel->activeWidget(); - if (aWidget) { - aWidget->getHighlighted(aValues); - } - } + ModuleBase_ModelWidget* anActiveWidget = theWorkshop->module()->activeWidget(); + if (anActiveWidget) + anActiveWidget->getHighlighted(aValues); QList aShapes; QList::const_iterator anIIt = aValues.begin(), @@ -367,9 +424,11 @@ bool PartSet_OperationPrs::isSelectionAttribute(const AttributePtr& theAttribute anAttrType == ModelAPI_AttributeReference::typeId(); } -void PartSet_OperationPrs::fillShapeList(const QMap >& theFeatureShapes, +void PartSet_OperationPrs::fillShapeList( + const QMap >& theFeatureShapes, ModuleBase_IWorkshop* theWorkshop, - NCollection_DataMap& theShapeToPrsMap) + NCollection_DataMap& theShapeToPrsMap) { theShapeToPrsMap.Clear();