Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
msvc compile patch
[modules/shaper.git]
/
src
/
PartSet
/
PartSet_ResultSketchPrs.cpp
diff --git
a/src/PartSet/PartSet_ResultSketchPrs.cpp
b/src/PartSet/PartSet_ResultSketchPrs.cpp
old mode 100755
(executable)
new mode 100644
(file)
index
7e62e4b
..
c6e5585
--- a/
src/PartSet/PartSet_ResultSketchPrs.cpp
+++ b/
src/PartSet/PartSet_ResultSketchPrs.cpp
@@
-1,4
+1,4
@@
-// Copyright (C) 2014-20
17
CEA/DEN, EDF R&D
+// Copyright (C) 2014-20
20
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
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-12,10
+12,9
@@
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
//
// 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
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA
//
//
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include "PartSet_ResultSketchPrs.h"
//
#include "PartSet_ResultSketchPrs.h"
@@
-25,7
+24,7
@@
#include <ModelAPI_Events.h>
#include <ModelAPI_Tools.h>
#include <ModelAPI_ResultConstruction.h>
#include <ModelAPI_Events.h>
#include <ModelAPI_Tools.h>
#include <ModelAPI_ResultConstruction.h>
-#include <ModelAPI_Result
CompSolid
.h>
+#include <ModelAPI_Result
Body
.h>
#include <GeomAPI_PlanarEdges.h>
#include <Events_InfoMessage.h>
#include <GeomAPI_PlanarEdges.h>
#include <Events_InfoMessage.h>
@@
-49,13
+48,19
@@
#include <Prs3d_LineAspect.hxx>
#include <Graphic3d_AspectMarker3d.hxx>
#include <Prs3d_LineAspect.hxx>
#include <Graphic3d_AspectMarker3d.hxx>
-#define DEBUG_WIRE
+
//
#define DEBUG_WIRE
#ifdef DEBUG_WIRE
#include <TopTools_IndexedMapOfShape.hxx>
#include <TopExp.hxx>
#endif
#ifdef DEBUG_WIRE
#include <TopTools_IndexedMapOfShape.hxx>
#include <TopExp.hxx>
#endif
+#include <Standard_Version.hxx>
+
+#if OCC_VERSION_HEX > 0x070400
+#include <StdPrs_ToolTriangulatedShape.hxx>
+#endif
+
//*******************************************************************************************
IMPLEMENT_STANDARD_RTTIEXT(PartSet_ResultSketchPrs, ViewerData_AISShape);
//*******************************************************************************************
IMPLEMENT_STANDARD_RTTIEXT(PartSet_ResultSketchPrs, ViewerData_AISShape);
@@
-72,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->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
// Activate individual repaintng if this is a part of compsolid
- Result
CompSolidPtr aCompSolid = ModelAPI_Tools::compSolid
Owner(myResult);
- SetAutoHilight(a
CompSolid
.get() == NULL);
+ Result
BodyPtr anOwner = ModelAPI_Tools::body
Owner(myResult);
+ SetAutoHilight(a
nOwner
.get() == NULL);
ModuleBase_Tools::setPointBallHighlighting(this);
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(
}
void PartSet_ResultSketchPrs::Compute(
@@
-105,10
+115,12
@@
void PartSet_ResultSketchPrs::Compute(
setAuxiliaryPresentationStyle(false);
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);
if (!myAuxiliaryCompound.IsNull()) {
setAuxiliaryPresentationStyle(true);
@@
-209,7
+221,11
@@
void PartSet_ResultSketchPrs::appendShapeSelection(const Handle(SelectMgr_Select
const TopAbs_ShapeEnum& theTypeOfSelection)
{
// POP protection against crash in low layers
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);
Standard_Real aDeflection = Prs3d::GetDeflection(theShape, myDrawer);
+#endif
try {
StdSelect_BRepSelectionTool::Load(theSelection,
this,
try {
StdSelect_BRepSelectionTool::Load(theSelection,
this,
@@
-281,7
+297,8
@@
void PartSet_ResultSketchPrs::fillShapes(TopoDS_Shape& theResultShape,
CompositeFeaturePtr aSketchFeature = std::dynamic_pointer_cast<ModelAPI_CompositeFeature>
(aResultFeature);
std::list<ResultPtr> anAuxiliaryResults;
CompositeFeaturePtr aSketchFeature = std::dynamic_pointer_cast<ModelAPI_CompositeFeature>
(aResultFeature);
std::list<ResultPtr> 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<ResultPtr> aResults = aFeature->results();
FeaturePtr aFeature = aSketchFeature->subFeature(i);
if (PartSet_Tools::isAuxiliarySketchEntity(aFeature)) {
std::list<ResultPtr> aResults = aFeature->results();