X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_ResultSketchPrs.cpp;h=380e4ac42f029ddcdcd803a80e272973a3933856;hb=b240d1def415f30a9569bd71f6715c72c0a92291;hp=d59619780139f74ec118fa62d7be50f22f06625f;hpb=152a49556bb45dbe2a979fc055c7f501c52a8125;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_ResultSketchPrs.cpp b/src/PartSet/PartSet_ResultSketchPrs.cpp old mode 100755 new mode 100644 index d59619780..380e4ac42 --- a/src/PartSet/PartSet_ResultSketchPrs.cpp +++ b/src/PartSet/PartSet_ResultSketchPrs.cpp @@ -1,8 +1,21 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: PartSet_ResultSketchPrs.h -// Created: 25 March 2015 -// Author: Natalia ERMOLAEVA +// Copyright (C) 2014-2019 CEA/DEN, EDF R&D +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include "PartSet_ResultSketchPrs.h" #include "PartSet_Tools.h" @@ -11,13 +24,16 @@ #include #include #include +#include #include -#include +#include #include #include +#include + #include #include @@ -26,10 +42,11 @@ #include #include #include -#include +#include #include #include #include +#include #define DEBUG_WIRE @@ -40,7 +57,6 @@ //******************************************************************************************* -IMPLEMENT_STANDARD_HANDLE(PartSet_ResultSketchPrs, ViewerData_AISShape); IMPLEMENT_STANDARD_RTTIEXT(PartSet_ResultSketchPrs, ViewerData_AISShape); PartSet_ResultSketchPrs::PartSet_ResultSketchPrs(ResultPtr theResult) @@ -51,31 +67,22 @@ PartSet_ResultSketchPrs::PartSet_ResultSketchPrs(ResultPtr theResult) TopoDS_Shape aShape = aShapePtr->impl(); Set(aShape); Handle(Prs3d_Drawer) aDrawer = Attributes(); - if (aDrawer->HasOwnPointAspect()) + if (aDrawer->HasOwnPointAspect()) aDrawer->PointAspect()->SetTypeOfMarker(Aspect_TOM_PLUS); else aDrawer->SetPointAspect(new Prs3d_PointAspect(Aspect_TOM_PLUS, Quantity_NOC_YELLOW, 1.)); // Activate individual repaintng if this is a part of compsolid - ResultCompSolidPtr aCompSolid = ModelAPI_Tools::compSolidOwner(myResult); - SetAutoHilight(aCompSolid.get() == NULL); -} + ResultBodyPtr anOwner = ModelAPI_Tools::bodyOwner(myResult); + SetAutoHilight(anOwner.get() == NULL); -bool PartSet_ResultSketchPrs::isValidShapeType(const TopAbs_ShapeEnum& theBaseType, - const TopAbs_ShapeEnum& theCheckedType) -{ - bool aValid = theBaseType == theCheckedType; - if (!aValid) { - // currently this functionality is for all, as we have no separate wire selection mode - // lately it should be corrected to have the following check only for sketch presentations - aValid = theBaseType == TopAbs_FACE && theCheckedType == TopAbs_WIRE; - } - return aValid; + ModuleBase_Tools::setPointBallHighlighting(this); } -void PartSet_ResultSketchPrs::Compute(const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, - const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer theMode) +void PartSet_ResultSketchPrs::Compute( + const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, + const Handle(Prs3d_Presentation)& thePresentation, + const Standard_Integer theMode) { thePresentation->Clear(); @@ -98,18 +105,23 @@ void PartSet_ResultSketchPrs::Compute(const Handle(PrsMgr_PresentationManager3d) setAuxiliaryPresentationStyle(false); // change deviation coefficient to provide more precise circle - ModuleBase_Tools::setDefaultDeviationCoefficient(Shape(), Attributes()); - AIS_Shape::Compute(thePresentationManager, thePresentation, theMode); - + //ModuleBase_Tools::setDefaultDeviationCoefficient(myResult, Attributes()); + try { + AIS_Shape::Compute(thePresentationManager, thePresentation, theMode); + } + catch (...) { + return; + } if (!myAuxiliaryCompound.IsNull()) { setAuxiliaryPresentationStyle(true); Handle(Prs3d_Drawer) aDrawer = Attributes(); - StdPrs_WFDeflectionShape::Add(thePresentation, myAuxiliaryCompound, aDrawer); + StdPrs_WFShape::Add(thePresentation, myAuxiliaryCompound, aDrawer); } if (!aReadyToDisplay) { - Events_Error::throwException("An empty AIS presentation: PartSet_ResultSketchPrs"); + Events_InfoMessage("PartSet_ResultSketchPrs", + "An empty AIS presentation: PartSet_ResultSketchPrs").send(); static const Events_ID anEvent = Events_Loop::eventByName(EVENT_EMPTY_AIS_PRESENTATION); ModelAPI_EventCreator::get()->sendUpdated(myResult, anEvent); } @@ -121,7 +133,8 @@ void debugInfo(const TopoDS_Shape& theShape, const TopAbs_ShapeEnum theType) TopTools_IndexedMapOfShape aSubShapes; TopExp::MapShapes (theShape, theType, aSubShapes); - Standard_Boolean isComesFromDecomposition = !((aSubShapes.Extent() == 1) && (theShape == aSubShapes (1))); + Standard_Boolean + isComesFromDecomposition = !((aSubShapes.Extent() == 1) && (theShape == aSubShapes (1))); int anExtent = aSubShapes.Extent(); for (Standard_Integer aShIndex = 1; aShIndex <= aSubShapes.Extent(); ++aShIndex) { @@ -132,13 +145,22 @@ void debugInfo(const TopoDS_Shape& theShape, const TopAbs_ShapeEnum theType) #endif void PartSet_ResultSketchPrs::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection, - const Standard_Integer aMode) + const Standard_Integer theMode) { - if (aMode > 8) + int aMode = theMode; + + if (aMode > 8 && + aMode != SketcherPrs_Tools::Sel_Sketch_Face && + aMode != SketcherPrs_Tools::Sel_Sketch_Wire) // In order to avoid using custom selection modes return; - if (aMode == AIS_Shape::SelectionMode(TopAbs_FACE)) { + bool aShapeIsChanged = false; + double aPrevDeviation = Attributes()->DeviationCoefficient(); + if (aMode == SketcherPrs_Tools::Sel_Sketch_Face || + aMode == SketcherPrs_Tools::Sel_Sketch_Wire) { + aMode = (aMode == SketcherPrs_Tools::Sel_Sketch_Face) ? AIS_Shape::SelectionMode(TopAbs_FACE) + : AIS_Shape::SelectionMode(TopAbs_WIRE); #ifdef DEBUG_WIRE const TopoDS_Shape& aShape = Shape(); debugInfo(aShape, TopAbs_VERTEX); // 24 @@ -150,13 +172,10 @@ void PartSet_ResultSketchPrs::ComputeSelection(const Handle(SelectMgr_Selection) TopoDS_Compound aComp; aBuilder.MakeCompound(aComp); aBuilder.Add(aComp, myOriginalShape); - + for(NCollection_List::Iterator anIt(mySketchFaceList); anIt.More(); anIt.Next()) { const TopoDS_Shape& aFace = anIt.Value(); aBuilder.Add(aComp, aFace); - // for sketch presentation in the face mode wires should be selectable also - // accoring to #1343 Improvement of Extrusion and Revolution operations - appendShapeSelection(aSelection, aFace, TopAbs_WIRE); } #ifdef DEBUG_WIRE debugInfo(aComp, TopAbs_VERTEX); // 24 @@ -165,18 +184,27 @@ void PartSet_ResultSketchPrs::ComputeSelection(const Handle(SelectMgr_Selection) debugInfo(aComp, TopAbs_FACE); // 2 #endif Set(aComp); - } else + double aBodyDefDeflection = Config_PropManager::real("Visualization", "body_deflection"); + Attributes()->SetDeviationCoefficient(aBodyDefDeflection); + aShapeIsChanged = true; + } + else Set(myOriginalShape); // append auxiliary compound to selection of edges/vertices if (aMode == AIS_Shape::SelectionMode(TopAbs_EDGE) || aMode == AIS_Shape::SelectionMode(TopAbs_VERTEX)) { - bool isVertex = aMode == AIS_Shape::SelectionMode(TopAbs_VERTEX); + bool isVertex = aMode == AIS_Shape::SelectionMode(TopAbs_VERTEX); appendShapeSelection(aSelection, myAuxiliaryCompound, isVertex ? TopAbs_VERTEX : TopAbs_EDGE); } AIS_Shape::ComputeSelection(aSelection, aMode); + + if (aShapeIsChanged) { + Attributes()->SetDeviationCoefficient(aPrevDeviation); + Set(myOriginalShape); + } } void PartSet_ResultSketchPrs::appendShapeSelection(const Handle(SelectMgr_Selection)& theSelection, @@ -199,28 +227,12 @@ void PartSet_ResultSketchPrs::appendShapeSelection(const Handle(SelectMgr_Select void PartSet_ResultSketchPrs::setAuxiliaryPresentationStyle(const bool isAuxiliary) { - std::vector aColor; - Standard_Real aWidth; - Standard_Integer aLineStyle; - - if (!isAuxiliary) { - aColor = Config_PropManager::color("Visualization", "result_construction_color", - ModelAPI_ResultConstruction::DEFAULT_COLOR()); - aWidth = PartSet_Tools::getAISDefaultWidth();// default width value - aLineStyle = SketchPlugin_SketchEntity::SKETCH_LINE_STYLE(); - } - else { - aColor = Config_PropManager::color("Visualization", "result_construction_color", - ModelAPI_ResultConstruction::DEFAULT_COLOR()); - aWidth = PartSet_Tools::getAISDefaultWidth();// default width value - aLineStyle = SketchPlugin_SketchEntity::SKETCH_LINE_STYLE_AUXILIARY(); - } + Standard_Integer aLineStyle = isAuxiliary? + SketchPlugin_SketchEntity::SKETCH_LINE_STYLE_AUXILIARY() : + SketchPlugin_SketchEntity::SKETCH_LINE_STYLE(); Handle(Prs3d_Drawer) aDrawer = Attributes(); - setColor(aDrawer, Quantity_Color(aColor[0] / 255., aColor[1] / 255., aColor[2] / 255., - Quantity_TOC_RGB)); - setWidth(aDrawer, aWidth); // set line style Handle(Prs3d_LineAspect) aLineAspect; @@ -231,13 +243,15 @@ void PartSet_ResultSketchPrs::setAuxiliaryPresentationStyle(const bool isAuxilia if (aDrawer->HasOwnWireAspect()) { aLineAspect = aDrawer->WireAspect(); } - Quantity_Color aCurrentColor; - Aspect_TypeOfLine aPrevLineType; - Standard_Real aCurrentWidth; - aLineAspect->Aspect()->Values(aCurrentColor, aPrevLineType, aCurrentWidth); + Quantity_Color aCurrentColor = aLineAspect->Aspect()->Color(); + Aspect_TypeOfLine aPrevLineType = aLineAspect->Aspect()->Type(); + Standard_Real aCurrentWidth = aLineAspect->Aspect()->Width(); bool isChangedLineType = aType != aPrevLineType; if (isChangedLineType) { - aLineAspect->SetTypeOfLine(aType); + Handle(Prs3d_LineAspect) aAspect = new Prs3d_LineAspect(aCurrentColor, aType, aCurrentWidth); + aDrawer->SetLineAspect(aAspect); + aDrawer->SetWireAspect(aAspect); + SetAttributes(aDrawer); } } @@ -251,7 +265,7 @@ void PartSet_ResultSketchPrs::fillShapes(TopoDS_Shape& theResultShape, return; theFaceList.Clear(); - ResultConstructionPtr aConstruction = + ResultConstructionPtr aConstruction = std::dynamic_pointer_cast(myResult); if (aConstruction.get()) { int aFacesNum = aConstruction->facesNum(); @@ -270,7 +284,8 @@ void PartSet_ResultSketchPrs::fillShapes(TopoDS_Shape& theResultShape, CompositeFeaturePtr aSketchFeature = std::dynamic_pointer_cast (aResultFeature); std::list anAuxiliaryResults; - for (int i = 0; i < aSketchFeature->numberOfSubs(); i++) { + int aNumberOfSubs = aSketchFeature->numberOfSubs(); + for (int i = 0; i < aNumberOfSubs; i++) { FeaturePtr aFeature = aSketchFeature->subFeature(i); if (PartSet_Tools::isAuxiliarySketchEntity(aFeature)) { std::list aResults = aFeature->results(); @@ -281,8 +296,10 @@ void PartSet_ResultSketchPrs::fillShapes(TopoDS_Shape& theResultShape, anAuxiliaryResults.push_back(aResult); } } - else { - /// append not-edges shapes, e.g. center of a circle, an arc, a point feature + else if (PartSet_Tools::isIncludeIntoSketchResult(aFeature)) { + // Append not-edges shapes, e.g. center of a circle, an arc, a point feature. + // Issue #2535: do not show elements produced by Projection or Intersection features, + // which should not be included into the sketch result. const std::list >& aRes = aFeature->results(); std::list >::const_iterator aResIter = aRes.cbegin(); for (; aResIter != aRes.cend(); aResIter++) { @@ -292,7 +309,7 @@ void PartSet_ResultSketchPrs::fillShapes(TopoDS_Shape& theResultShape, std::shared_ptr aGeomShape = aConstr->shape(); if (aGeomShape.get()) { const TopoDS_Shape& aShape = aGeomShape->impl(); - if (!aShape.IsNull() && aShape.ShapeType() != TopAbs_EDGE) + if (aShape.ShapeType() != TopAbs_EDGE) anAuxiliaryResults.push_back(aConstr); } }