OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code Activity

0032351: Visualization, PrsDim_LengthDimension - add NULL checks for handling non-Line curves

Browse Source 
Added several missing NULL-checks.
Reduced restrictions on building Edge-Edge and Edge-Vertex length dimension.
Added empty constructor for more straightforward initialization from vdimension command.
This commit is contained in:
kgv
2021-05-10 09:05:11 +03:00
committed by bugmaster
parent 1220d98e7a
commit 14ba0bbad7
6 changed files with 222 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/ViewerTest/ViewerTest_RelationCommands.cxx
View File

@@ -770,26 +770,9 @@ static int VDimBuilder (Draw_Interpretor& /*theDi*/,
}
// Face-Face case
if (aShape1.ShapeType() == TopAbs_FACE && aShape2.ShapeType() == TopAbs_FACE)
Handle(PrsDim_LengthDimension) aLenDim = new PrsDim_LengthDimension();
if (isPlaneCustom)
{
aDim = new PrsDim_LengthDimension (TopoDS::Face (aShape1), TopoDS::Face (aShape2));
}
else if (aShape1.ShapeType() == TopAbs_FACE && aShape2.ShapeType() == TopAbs_EDGE)
{
aDim = new PrsDim_LengthDimension (TopoDS::Face (aShape1), TopoDS::Edge (aShape2));
}
else if (aShape1.ShapeType() == TopAbs_EDGE && aShape2.ShapeType() == TopAbs_FACE)
{
aDim = new PrsDim_LengthDimension (TopoDS::Face (aShape2), TopoDS::Edge (aShape1));
}
else
{
if (!isPlaneCustom)
{
Message::SendFail ("Error: can not build dimension without working plane.");
return 1;
}
// Vertex-Vertex case
if (aShape1.ShapeType() == TopAbs_VERTEX)
{
aWorkingPlane.SetLocation (BRep_Tool::Pnt (TopoDS::Vertex (aShape1)));
@@ -798,9 +781,16 @@ static int VDimBuilder (Draw_Interpretor& /*theDi*/,
{
aWorkingPlane.SetLocation (BRep_Tool::Pnt (TopoDS::Vertex (aShape2)));
}
aDim = new PrsDim_LengthDimension (aShape1, aShape2, aWorkingPlane);
aLenDim->SetCustomPlane (aWorkingPlane);
}
else if (aShape1.ShapeType() == TopAbs_VERTEX
&& aShape2.ShapeType() == TopAbs_VERTEX)
{
Message::SendFail ("Error: can not build dimension without working plane");
return 1;
}
aLenDim->SetMeasuredShapes (aShape1, aShape2);
aDim = aLenDim;
}
else
{