OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0027916: Visualization - access violation occurs within AIS_ColoredShape::Compute() for NULL shape

Browse Source 
AIS_ColoredShape::Compute() - add NULL shape check.
AIS presentations - removed redundant clearance within ::Compute()
which is always done in advance within PrsMgr_PresentationManager::Update().
This commit is contained in:
kgv 2016-09-28 20:18:25 +03:00 committed by apn
parent b2bafb33a9
commit ede89abcb9
30 changed files with 5 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/AIS/AIS_AngleDimension.cxx
View File

@ -594,7 +594,6 @@ void AIS_AngleDimension::Compute (const Handle(PrsMgr_PresentationManager3d)& /*
const Handle(Prs3d_Presentation)& thePresentation,
const Standard_Integer theMode)
{
thePresentation->Clear();
mySelectionGeom.Clear (theMode);
if (!IsValid())

3
src/AIS/AIS_Axis.cxx
View File

@ -169,9 +169,6 @@ void AIS_Axis::Compute(const Handle(PrsMgr_PresentationManager3d)&,
const Handle(Prs3d_Presentation)& aPresentation,
const Standard_Integer)
{
aPresentation->Clear();
//Pro.... : pas de prise en compte des axes lors du FITALL (jmi)
aPresentation->SetInfiniteState (myInfiniteState);
aPresentation->SetDisplayPriority(5);

2
src/AIS/AIS_Chamf2dDimension.cxx
View File

@ -104,8 +104,6 @@ void AIS_Chamf2dDimension::Compute(const Handle(PrsMgr_PresentationManager3d)& ,
const Handle(Prs3d_Presentation)& aPresentation,
const Standard_Integer)
{
aPresentation->Clear();
Handle(Geom_Curve) gcurv;
gp_Pnt pfirst,plast;
const TopoDS_Edge& thechamfedge = TopoDS::Edge(myFShape);

2
src/AIS/AIS_Chamf3dDimension.cxx
View File

@ -99,8 +99,6 @@ void AIS_Chamf3dDimension::Compute(const Handle(PrsMgr_PresentationManager3d)& ,
const Handle(Prs3d_Presentation)& aPresentation,
const Standard_Integer)
{
aPresentation->Clear();
//----------------------------
// Calcul du centre de la face
//----------------------------

2
src/AIS/AIS_Circle.cxx
View File

@ -78,8 +78,6 @@ void AIS_Circle::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresenta
const Handle(Prs3d_Presentation)& aPresentation,
const Standard_Integer /*aMode*/)
{
aPresentation->Clear();
aPresentation->SetDisplayPriority(5);
if (myCircleIsArc) ComputeArc(aPresentation);

6
src/AIS/AIS_ColoredShape.cxx
View File

@ -299,7 +299,11 @@ void AIS_ColoredShape::Compute (const Handle(PrsMgr_PresentationManager3d)& ,
const Handle(Prs3d_Presentation)& thePrs,
const Standard_Integer theMode)
{
thePrs->Clear();
if (myshape.IsNull())
{
return;
}
if (IsInfinite())
{
thePrs->SetInfiniteState (Standard_True);

2
src/AIS/AIS_ConcentricRelation.cxx
View File

@ -66,8 +66,6 @@ void AIS_ConcentricRelation::Compute(const Handle(PrsMgr_PresentationManager3d)&
const Handle(Prs3d_Presentation)& aPresentation,
const Standard_Integer)
{
aPresentation->Clear();
TopAbs_ShapeEnum type2(mySShape.ShapeType());
aPresentation->SetInfiniteState(Standard_True);
switch (myFShape.ShapeType()) {

1
src/AIS/AIS_DiameterDimension.cxx
View File

@ -282,7 +282,6 @@ void AIS_DiameterDimension::Compute (const Handle(PrsMgr_PresentationManager3d)&
const Handle(Prs3d_Presentation)& thePresentation,
const Standard_Integer theMode)
{
thePresentation->Clear();
mySelectionGeom.Clear (theMode);
if (!IsValid())

3
src/AIS/AIS_EqualDistanceRelation.cxx
View File

@ -81,9 +81,6 @@ void AIS_EqualDistanceRelation::Compute( const Handle( PrsMgr_PresentationManage
const Handle( Prs3d_Presentation )& aPresentation,
const Standard_Integer )
{
aPresentation->Clear();
gp_Pnt Position12 = myPosition, Position34 = myPosition;
Handle(Prs3d_DimensionAspect) la = myDrawer->DimensionAspect();

2
src/AIS/AIS_EqualRadiusRelation.cxx
View File

@ -65,8 +65,6 @@ void AIS_EqualRadiusRelation::Compute( const Handle( PrsMgr_PresentationManager3
const Handle( Prs3d_Presentation )& aPresentation,
const Standard_Integer )
{
aPresentation->Clear();
BRepAdaptor_Curve FirstCurve( TopoDS::Edge( myFShape ) ), SecondCurve( TopoDS::Edge( mySShape ) );
Standard_Real FirstPar1 = FirstCurve.FirstParameter(), LastPar1 = FirstCurve.LastParameter(),

2
src/AIS/AIS_FixRelation.cxx
View File

@ -171,8 +171,6 @@ void AIS_FixRelation::Compute(const Handle(PrsMgr_PresentationManager3d)&,
const Handle(Prs3d_Presentation)& aPresentation,
const Standard_Integer)
{
aPresentation->Clear();
// Calculate position of the symbol and
// point of attach of the segment on the shape
gp_Pnt curpos;

2
src/AIS/AIS_IdenticRelation.cxx
View File

@ -309,8 +309,6 @@ void AIS_IdenticRelation::Compute(const Handle(PrsMgr_PresentationManager3d)&,
const Handle(Prs3d_Presentation)& aprs,
const Standard_Integer)
{
aprs->Clear();
switch ( myFShape.ShapeType() ) {
case TopAbs_VERTEX:

1
src/AIS/AIS_LengthDimension.cxx
View File

@ -272,7 +272,6 @@ void AIS_LengthDimension::Compute (const Handle(PrsMgr_PresentationManager3d)& /
const Handle(Prs3d_Presentation)& thePresentation,
const Standard_Integer theMode)
{
thePresentation->Clear();
mySelectionGeom.Clear (theMode);
if (!IsValid())

2
src/AIS/AIS_Line.cxx
View File

@ -117,8 +117,6 @@ void AIS_Line::Compute(const Handle(PrsMgr_PresentationManager3d)&,
const Handle(Prs3d_Presentation)& aPresentation,
const Standard_Integer)
{
aPresentation->Clear();
aPresentation->SetDisplayPriority(5);
if (!myLineIsSegment) ComputeInfiniteLine(aPresentation);

2
src/AIS/AIS_MaxRadiusDimension.cxx
View File

@ -104,8 +104,6 @@ void AIS_MaxRadiusDimension::Compute(const Handle(PrsMgr_PresentationManager3d)&
const Handle(Prs3d_Presentation)& aPresentation,
const Standard_Integer /*aMode*/)
{
aPresentation->Clear();
// if( myAutomaticPosition )
{//ota : recompute in any case
ComputeGeometry();

2
src/AIS/AIS_MidPointRelation.cxx
View File

@ -80,8 +80,6 @@ void AIS_MidPointRelation::Compute(const Handle(PrsMgr_PresentationManager3d)&,
const Handle(Prs3d_Presentation)& aprs,
const Standard_Integer)
{
aprs->Clear();
if (myTool.ShapeType() == TopAbs_VERTEX)
{
gp_Pnt pp;

2
src/AIS/AIS_MinRadiusDimension.cxx
View File

@ -104,8 +104,6 @@ void AIS_MinRadiusDimension::Compute(const Handle(PrsMgr_PresentationManager3d)&
const Handle(Prs3d_Presentation)& aPresentation,
const Standard_Integer /*aMode*/)
{
aPresentation->Clear();
// if( myAutomaticPosition )
//{ //ota : recompute ellipse always
ComputeGeometry();

4
src/AIS/AIS_OffsetDimension.cxx
View File

@ -90,10 +90,6 @@ void AIS_OffsetDimension::Compute(const Handle(PrsMgr_PresentationManager3d)&,
const Handle(Prs3d_Presentation)& aprs,
const Standard_Integer)
{
aprs->Clear();
//cout << endl << "This is strange Offset Dimension!" << endl;
gp_Trsf aInvertTrsf = myRelativePos;
//myArrowSize = fabs (myVal/5.);
myArrowSize = fabs (myVal/10.0);

2
src/AIS/AIS_ParallelRelation.cxx
View File

@ -98,8 +98,6 @@ void AIS_ParallelRelation::Compute(const Handle(PrsMgr_PresentationManager3d)&,
const Handle(Prs3d_Presentation)& aPresentation,
const Standard_Integer)
{
aPresentation->Clear();
switch (myFShape.ShapeType())
{
case TopAbs_FACE :

2
src/AIS/AIS_PerpendicularRelation.cxx
View File

@ -86,8 +86,6 @@ void AIS_PerpendicularRelation::Compute(const Handle(PrsMgr_PresentationManager3
const Handle(Prs3d_Presentation)& aPresentation,
const Standard_Integer)
{
aPresentation->Clear();
if (myFShape.ShapeType() == mySShape.ShapeType()) {
switch (myFShape.ShapeType()) {
case TopAbs_FACE :

2
src/AIS/AIS_Plane.cxx
View File

@ -238,8 +238,6 @@ void AIS_Plane::Compute(const Handle(PrsMgr_PresentationManager3d)& ,
const Handle(Prs3d_Presentation)& aPresentation,
const Standard_Integer aMode)
{
aPresentation->Clear();
ComputeFields();
aPresentation->SetInfiniteState(myInfiniteState);
myDrawer->PlaneAspect()->EdgesAspect()->SetWidth(myCurrentMode == 0? 1 : 3);

1
src/AIS/AIS_PlaneTrihedron.cxx
View File

@ -157,7 +157,6 @@ void AIS_PlaneTrihedron::Compute(const Handle(PrsMgr_PresentationManager3d)&,
const Handle(Prs3d_Presentation)& aPresentation,
const Standard_Integer)
{
aPresentation->Clear();
aPresentation->SetDisplayPriority(5);
// drawing axis in X direction
gp_Pnt first, last;

2
src/AIS/AIS_Point.cxx
View File

@ -79,8 +79,6 @@ void AIS_Point::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentat
const Handle(Prs3d_Presentation)& aPresentation,
const Standard_Integer aMode)
{
aPresentation->Clear();
aPresentation->SetInfiniteState(myInfiniteState);
if (aMode==0)

1
src/AIS/AIS_PointCloud.cxx
View File

@ -409,7 +409,6 @@ void AIS_PointCloud::Compute (const Handle(PrsMgr_PresentationManager3d)& /*theP
const Handle(Prs3d_Presentation)& thePrs,
const Standard_Integer theMode)
{
thePrs->Clear();
switch (theMode)
{
case AIS_PointCloud::DM_Points:

1
src/AIS/AIS_RadiusDimension.cxx
View File

@ -222,7 +222,6 @@ void AIS_RadiusDimension::Compute (const Handle(PrsMgr_PresentationManager3d)& /
const Handle(Prs3d_Presentation)& thePresentation,
const Standard_Integer theMode)
{
thePresentation->Clear();
mySelectionGeom.Clear (theMode);
if (!IsValid())

1
src/AIS/AIS_Shape.cxx
View File

@ -123,7 +123,6 @@ void AIS_Shape::Compute(const Handle(PrsMgr_PresentationManager3d)& /*aPresentat
const Handle(Prs3d_Presentation)& aPrs,
const Standard_Integer theMode)
{
aPrs->Clear();
if(myshape.IsNull()) return;
// wire,edge,vertex -> pas de HLR + priorite display superieure

2
src/AIS/AIS_SymmetricRelation.cxx
View File

@ -77,8 +77,6 @@ void AIS_SymmetricRelation::Compute(const Handle(PrsMgr_PresentationManager3d)&,
const Handle(Prs3d_Presentation)& aprs,
const Standard_Integer)
{
aprs->Clear();
switch (myFShape.ShapeType()) {
case TopAbs_FACE :
{

2
src/AIS/AIS_TangentRelation.cxx
View File

@ -96,8 +96,6 @@ void AIS_TangentRelation::Compute(const Handle(PrsMgr_PresentationManager3d)&,
const Handle(Prs3d_Presentation)& aPresentation,
const Standard_Integer)
{
aPresentation->Clear();
switch (myFShape.ShapeType())
{
case TopAbs_FACE :

2
src/AIS/AIS_TexturedShape.cxx
View File

@ -397,8 +397,6 @@ void AIS_TexturedShape::Compute (const Handle(PrsMgr_PresentationManager3d)& /*t
const Handle(Prs3d_Presentation)& thePrs,
const Standard_Integer theMode)
{
thePrs->Clear();
if (myshape.IsNull())
{
return;

2
src/AIS/AIS_Trihedron.cxx
View File

@ -276,8 +276,6 @@ void AIS_Trihedron::Compute(
const Handle(Prs3d_Presentation)& aPresentation,
const Standard_Integer aMode)
{
aPresentation->Clear();
aPresentation->SetInfiniteState (Standard_True);
switch(aMode){
case 0: