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

0025374: [6.8.0beta regression] gp_Trsf2d::SetMirror() looses transformation form

Browse Source 
1. Elements of gp_TrsfForm have been documented
2. gp_Trsf2d class has been reverted to non-regression case.

Update of test-cases
This commit is contained in:
nbv
2014-10-23 18:02:23 +04:00
committed by bugmaster
parent 7a13ab2df1
commit 9256a43d09
8 changed files with 55 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gp/gp.cdl
View File

@@ -34,8 +34,24 @@ is
exception VectorWithNullMagnitude inherits DomainError;
enumeration TrsfForm is
Identity, Rotation, Translation, PntMirror, Ax1Mirror, Ax2Mirror, Scale,
CompoundTrsf, Other
Identity,
-- Transformation matrix is identity.
Rotation,
-- "Rotation" transformation was applied
Translation,
-- "Translation" with given vector or "from point - to point" was applied
PntMirror,
-- central symmetry
Ax1Mirror,
-- rotational symmetry
Ax2Mirror,
-- bilateral symmetry
Scale,
-- "Scale" transformation was applied
CompoundTrsf,
-- All cases which is not enumerated here
Other
-- Transformation with not-orthogonal matrix
end TrsfForm;
---Purpose: Identifies the type of a geometric transformation.

4
src/gp/gp_Trsf.cxx
View File

@@ -273,10 +273,10 @@ void gp_Trsf::SetScaleFactor (const Standard_Real S)
scale = S;
As = scale - 1.;
if (As < 0) As = - As;
Standard_Boolean unit = As <= gp::Resolution();
Standard_Boolean unit = As <= gp::Resolution(); // = (scale == 1)
As = scale + 1.;
if (As < 0) As = - As;
Standard_Boolean munit = As <= gp::Resolution();
Standard_Boolean munit = As <= gp::Resolution(); // = (scale == -1)
switch (shape) {
case gp_Identity :

29
src/gp/gp_Trsf2d.cxx
View File

@@ -23,32 +23,31 @@
void gp_Trsf2d::SetMirror (const gp_Ax2d& A)
{
shape = gp_Ax1Mirror;
scale = - 1.0;
const gp_Dir2d& V = A.Direction ();
const gp_Pnt2d& P = A.Location ();
Standard_Real VX = V.X();
Standard_Real VY = V.Y();
Standard_Real X0 = P.X();
Standard_Real Y0 = P.Y();
matrix.SetCol (1, gp_XY (1.0 - 2.0 * VX * VX, -2.0 * VX * VY));
matrix.SetCol (2, gp_XY (-2.0 * VX * VY, 1.0 - 2.0 * VY * VY));
SetValues(1.0-2.0*VX*VX, -2.0*VX*VY, -2.0*((VX * VX - 1.0)*X0 + (VX*VY*Y0)),
-2.0*VX*VY, 1.0-2.0*VY*VY, -2.0*((VX*VY*X0)+(VY*VY-1.0)*Y0));
scale = - 1.0;
loc.SetCoord (-2.0 * ((VX * VX - 1.0) * X0 + (VX * VY * Y0)),
-2.0 * ((VX * VY * X0) + (VY * VY - 1.0) * Y0));
}
void gp_Trsf2d::SetTransformation (const gp_Ax2d& FromA1,
const gp_Ax2d& ToA2)
{
shape = gp_CompoundTrsf;
scale = 1.0;
//matrix from XOY to A2 :
const gp_XY& V1 = ToA2.Direction().XY();
gp_XY V2 (-V1.Y(), V1.X());
SetValues(V1.X(), V2.X(), ToA2.Location().X(),
V1.Y(), V2.Y(), ToA2.Location().Y());
scale = 1.0;
matrix.SetCol (1, V1);
matrix.SetCol (2, V2);
loc = ToA2.Location().XY();
matrix.Transpose();
loc.Multiply (matrix);
loc.Reverse();
@@ -66,14 +65,12 @@ void gp_Trsf2d::SetTransformation (const gp_Ax2d& FromA1,
void gp_Trsf2d::SetTransformation (const gp_Ax2d& A)
{
shape = gp_CompoundTrsf;
scale = 1.0;
const gp_XY& V1 = A.Direction().XY();
gp_XY V2 (-V1.Y(), V1.X());
SetValues(V1.X(), V2.X(), A.Location().X(),
V1.Y(), V2.Y(), A.Location().Y());
scale = 1.0;
matrix.SetCol (1, V1);
matrix.SetCol (2, V2);
loc = A.Location().XY();
matrix.Transpose();
loc.Multiply (matrix);
loc.Reverse();