OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

0028449: Data Exchange - Wrong orientation of Annotation Plane in GD&T

Browse Source 
Fix orientation.
update test cases
This commit is contained in:
ika 2017-03-22 10:31:58 +03:00 committed by bugmaster
parent 811d6b7d4a
commit ea6e537889
3 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/STEPCAFControl/STEPCAFControl_Reader.cxx
View File

@ -1948,7 +1948,6 @@ Standard_Boolean readAnnotationPlane(const Handle(StepVisual_AnnotationPlane) th
{ {
if (theAnnotationPlane.IsNull()) if (theAnnotationPlane.IsNull())
return Standard_False; return Standard_False;
gp_Ax2 aPlaneAxes;
Handle(StepRepr_RepresentationItem) aPlaneItem = theAnnotationPlane->Item(); Handle(StepRepr_RepresentationItem) aPlaneItem = theAnnotationPlane->Item();
if (aPlaneItem.IsNull()) if (aPlaneItem.IsNull())
return Standard_False; return Standard_False;
@ -1965,23 +1964,11 @@ Standard_Boolean readAnnotationPlane(const Handle(StepVisual_AnnotationPlane) th
if (aA2P3D.IsNull()) if (aA2P3D.IsNull())
return Standard_False; return Standard_False;
// build gp_Ax2 from axes gp_Ax2 aPlaneAxes;
Handle(StepGeom_Direction) anAxis = aA2P3D->Axis(), Handle(Geom_Axis2Placement) anAxis = StepToGeom::MakeAxis2Placement(aA2P3D);
aRefDir = aA2P3D->RefDirection(); aPlaneAxes = anAxis->Ax2();
if (anAxis.IsNull() || aRefDir.IsNull()) gp_XYZ aLocPos = aPlaneAxes.Location().XYZ();
return Standard_False; aLocPos *= theFact;
Handle(TColStd_HArray1OfReal) aCoords;
aCoords = anAxis->DirectionRatios();
gp_Dir aXDir(aCoords->Value(1), aCoords->Value(2), aCoords->Value(3));
aCoords = aRefDir->DirectionRatios();
gp_Dir aYDir(aCoords->Value(1), aCoords->Value(2), aCoords->Value(3));
aPlaneAxes.SetDirection(aXDir.Crossed(aYDir));
aPlaneAxes.SetYDirection(aYDir);
//set location of the annotation plane
Handle(TColStd_HArray1OfReal) aLocCoords;
Handle(StepGeom_CartesianPoint) aLoc = aA2P3D->Location();
gp_Pnt aLocPos(aLoc->CoordinatesValue(1) * theFact, aLoc->CoordinatesValue(2) * theFact, aLoc->CoordinatesValue(3) * theFact);
aPlaneAxes.SetLocation(aLocPos); aPlaneAxes.SetLocation(aLocPos);
thePlane = aPlaneAxes; thePlane = aPlaneAxes;
return Standard_True; return Standard_True;

26
tests/bugs/step/bug28449 Normal file
View File

@ -0,0 +1,26 @@
puts "========"
puts "OCC28449"
puts "========"
puts ""
#################################################
# Wrong orientation of Annotation Plane in GD&T
#################################################
ReadStep Doc [locate_data_file bug26689_nist_ctc_01_asme1_ap242.stp]
set pos [XGetGDTPosition Doc 0:1:4:1]
regexp {normal: +([-0-9.+eE]+) ([-0-9.+eE]+) ([-0-9.+eE]+)} $pos full pos_x pos_y pos_z
regexp {x_direction: +([-0-9.+eE]+) ([-0-9.+eE]+) ([-0-9.+eE]+)} $pos full dir_x dir_y dir_z
set isOK 1
set prec 1e-7
if {[expr abs($pos_x)] > $prec || [expr abs($pos_y + 1)] > $prec || [expr abs($pos_z)] > $prec} {
set isOK 0
}
if {[expr abs($dir_x - 1)] > $prec || [expr abs($dir_y)] > $prec || [expr abs($dir_z)] > $prec} {
set isOK 0
}
if {$isOK == 0} {
puts "Error: wrong Annotation plane"
}

4
tests/gdt/dimensions/A8
View File

@ -32,7 +32,7 @@ if {$isOK} {
set c_value "10" set c_value "10"
set c_type "Size_CurveLength" set c_type "Size_CurveLength"
set c_pos {position: -5 0 7 set c_pos {position: -5 0 7
normal: -1 0 0 normal: 0 1 0
x_direction: 0 1 0 x_direction: 0 0 -1
} }
} }