X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_ResultSketchPrs.cpp;h=497f5a0b2cc845d09310b4d392b1064edf30486d;hb=1fd15bed1c62f994a3438bc4a12f44d0361f98c9;hp=6b562be08137f2cc6fc54d67c987494c20c999bc;hpb=5b6031b015602aa07f5a6fc668c13ac3faf7a8a9;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 6b562be08..497f5a0b2 --- 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-2021 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,6 +24,7 @@ #include #include #include +#include #include #include @@ -34,13 +48,19 @@ #include #include -#define DEBUG_WIRE +//#define DEBUG_WIRE #ifdef DEBUG_WIRE #include #include #endif +#include + +#if OCC_VERSION_HEX > 0x070400 +#include +#endif + //******************************************************************************************* IMPLEMENT_STANDARD_RTTIEXT(PartSet_ResultSketchPrs, ViewerData_AISShape); @@ -57,12 +77,17 @@ PartSet_ResultSketchPrs::PartSet_ResultSketchPrs(ResultPtr theResult) aDrawer->PointAspect()->SetTypeOfMarker(Aspect_TOM_PLUS); else aDrawer->SetPointAspect(new Prs3d_PointAspect(Aspect_TOM_PLUS, Quantity_NOC_YELLOW, 1.)); + //aDrawer->SetTypeOfDeflection(Aspect_TOD_ABSOLUTE); // 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); ModuleBase_Tools::setPointBallHighlighting(this); + + // change deviation coefficient to provide more precise circle + ModuleBase_Tools::setDefaultDeviationCoefficient(Shape(), DynamicHilightAttributes()); + ModuleBase_Tools::setDefaultDeviationCoefficient(Shape(), Attributes()); } void PartSet_ResultSketchPrs::Compute( @@ -90,10 +115,12 @@ void PartSet_ResultSketchPrs::Compute( setAuxiliaryPresentationStyle(false); - // change deviation coefficient to provide more precise circle - //ModuleBase_Tools::setDefaultDeviationCoefficient(myResult, Attributes()); - AIS_Shape::Compute(thePresentationManager, thePresentation, theMode); - + try { + AIS_Shape::Compute(thePresentationManager, thePresentation, theMode); + } + catch (...) { + return; + } if (!myAuxiliaryCompound.IsNull()) { setAuxiliaryPresentationStyle(true); @@ -166,8 +193,7 @@ void PartSet_ResultSketchPrs::ComputeSelection(const Handle(SelectMgr_Selection) debugInfo(aComp, TopAbs_FACE); // 2 #endif Set(aComp); - double aBodyDefDeflection = Config_PropManager::real("Visualization", "body_deflection", - ModelAPI_ResultBody::DEFAULT_DEFLECTION()); + double aBodyDefDeflection = Config_PropManager::real("Visualization", "body_deflection"); Attributes()->SetDeviationCoefficient(aBodyDefDeflection); aShapeIsChanged = true; } @@ -195,7 +221,11 @@ void PartSet_ResultSketchPrs::appendShapeSelection(const Handle(SelectMgr_Select const TopAbs_ShapeEnum& theTypeOfSelection) { // POP protection against crash in low layers +#if OCC_VERSION_HEX > 0x070400 + Standard_Real aDeflection = StdPrs_ToolTriangulatedShape::GetDeflection(theShape, myDrawer); +#else Standard_Real aDeflection = Prs3d::GetDeflection(theShape, myDrawer); +#endif try { StdSelect_BRepSelectionTool::Load(theSelection, this, @@ -267,7 +297,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(); @@ -278,8 +309,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++) {