-// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
-// This library is distributed in the hope that it will be useful
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
//
-// 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
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// 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
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include <Standard_Stream.hxx>
gp_Dir aDir(gp_Vec(aP1, aP2));
gp_Ax1 anAx1(aP1, aDir);
Standard_Real anAngle = RI.GetAngle();
+ if (fabs(anAngle) < Precision::Angular()) anAngle += 2*PI; // NPAL19665,19769
aTrsf.SetRotation(anAx1, anAngle);
//NPAL18620: performance problem: multiple locations are accumulated
//aShape = aTransformation.Shape();
TopLoc_Location aLocOrig = anOriginal.Location();
gp_Trsf aTrsfOrig = aLocOrig.Transformation();
- TopLoc_Location aLocRes (aTrsf * aTrsfOrig);
+ //TopLoc_Location aLocRes (aTrsf * aTrsfOrig); // gp_Trsf::Multiply() has a bug
+ aTrsfOrig.PreMultiply(aTrsf);
+ TopLoc_Location aLocRes (aTrsfOrig);
aShape = anOriginal.Located(aLocRes);
}
else if (aType == ROTATE_THREE_POINTS || aType == ROTATE_THREE_POINTS_COPY) {
aP1 = BRep_Tool::Pnt(TopoDS::Vertex(aV1));
aP2 = BRep_Tool::Pnt(TopoDS::Vertex(aV2));
- gp_Vec aVec1(aCP, aP1);
- gp_Vec aVec2(aCP, aP2);
- gp_Dir aDir(aVec1 ^ aVec2);
- gp_Ax1 anAx1(aCP, aDir);
+ gp_Vec aVec1 (aCP, aP1);
+ gp_Vec aVec2 (aCP, aP2);
+ gp_Dir aDir (aVec1 ^ aVec2);
+ gp_Ax1 anAx1 (aCP, aDir);
Standard_Real anAngle = aVec1.Angle(aVec2);
+ if (fabs(anAngle) < Precision::Angular()) anAngle += 2*PI; // NPAL19665
aTrsf.SetRotation(anAx1, anAngle);
//NPAL18620: performance problem: multiple locations are accumulated
// in shape and need a great time to process
//aShape = aTransformation.Shape();
TopLoc_Location aLocOrig = anOriginal.Location();
gp_Trsf aTrsfOrig = aLocOrig.Transformation();
- TopLoc_Location aLocRes (aTrsf * aTrsfOrig);
+ //TopLoc_Location aLocRes (aTrsf * aTrsfOrig); // gp_Trsf::Multiply() has a bug
+ aTrsfOrig.PreMultiply(aTrsf);
+ TopLoc_Location aLocRes (aTrsfOrig);
aShape = anOriginal.Located(aLocRes);
}
else if (aType == ROTATE_1D) {
gp_Trsf aTrsfOrig = aLocOrig.Transformation();
for (int i = 0; i < nbtimes; i++ ) {
- aTrsf.SetRotation(AX1, i*angle*PI180);
+ if (i == 0) { // NPAL19665
+ B.Add(aCompound, anOriginal);
+ }
+ else {
+ aTrsf.SetRotation(AX1, i*angle*PI180);
+ //TopLoc_Location aLocRes (aTrsf * aTrsfOrig); // gp_Trsf::Multiply() has a bug
+ gp_Trsf aTrsfNew (aTrsfOrig);
+ aTrsfNew.PreMultiply(aTrsf);
+ TopLoc_Location aLocRes (aTrsfNew);
+ B.Add(aCompound, anOriginal.Located(aLocRes));
+ }
//NPAL18620: performance problem: multiple locations are accumulated
// in shape and need a great time to process
//BRepBuilderAPI_Transform aBRepTransformation(anOriginal, aTrsf, Standard_False);
//B.Add(aCompound, aBRepTransformation.Shape());
- TopLoc_Location aLocRes (aTrsf * aTrsfOrig);
- B.Add(aCompound, anOriginal.Located(aLocRes));
}
aShape = aCompound;
}
else if (aType == ROTATE_2D) {
- Standard_Real DX, DY, DZ;
-
//Get direction
Handle(GEOM_Function) anAxis = RI.GetAxis();
if(anAxis.IsNull()) return 0;
if ( P1.IsEqual(P2, Precision::Confusion() ) ) return 0;
- gp_Vec Vec(P1.X()-P2.X(), P1.Y()-P2.Y(), P1.Z()-P2.Z());
+ gp_Vec Vec (P1.X()-P2.X(), P1.Y()-P2.Y(), P1.Z()-P2.Z());
Vec.Normalize();
Standard_Integer nbtimes2 = RI.GetNbIter2();
TopoDS_Compound aCompound;
BRep_Builder B;
B.MakeCompound( aCompound );
+
+ Standard_Real DX, DY, DZ;
+
for (int i = 0; i < nbtimes2; i++ ) {
+ DX = i * step * Vec.X();
+ DY = i * step * Vec.Y();
+ DZ = i * step * Vec.Z();
+ aVec.SetCoord( DX, DY, DZ );
+ aTrsf1.SetTranslation(aVec);
+
for (int j = 0; j < nbtimes1; j++ ) {
- DX = i * step * Vec.X();
- DY = i * step * Vec.Y();
- DZ = i * step * Vec.Z();
- aVec.SetCoord( DX, DY, DZ );
- aTrsf1.SetTranslation(aVec);
- aTrsf2.SetRotation(AX1, j*ang*PI180);
+ if (j == 0) { // NPAL19665
+ TopLoc_Location aLocRes (aTrsf1 * aTrsfOrig);
+ B.Add(aCompound, anOriginal.Located(aLocRes));
+ }
+ else {
+ aTrsf2.SetRotation(AX1, j*ang*PI180);
+ //TopLoc_Location aLocRes (aTrsf2 * aTrsf1 * aTrsfOrig); // gp_Trsf::Multiply() has a bug
+ gp_Trsf aTrsfNew (aTrsfOrig);
+ aTrsfNew.PreMultiply(aTrsf1);
+ aTrsfNew.PreMultiply(aTrsf2);
+ TopLoc_Location aLocRes (aTrsfNew);
+ B.Add(aCompound, anOriginal.Located(aLocRes));
+ }
//NPAL18620: performance problem: multiple locations are accumulated
// in shape and need a great time to process
//BRepBuilderAPI_Transform aBRepTrsf1 (anOriginal, aTrsf1, Standard_False);
//BRepBuilderAPI_Transform aBRepTrsf2 (aBRepTrsf1.Shape(), aTrsf2, Standard_False);
//B.Add(aCompound, aBRepTrsf2.Shape());
- TopLoc_Location aLocRes (aTrsf2 * aTrsf1 * aTrsfOrig);
- B.Add(aCompound, anOriginal.Located(aLocRes));
}
}
static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
static Handle_Standard_Type _aType = new Standard_Type("GEOMImpl_RotateDriver",
- sizeof(GEOMImpl_RotateDriver),
- 1,
- (Standard_Address)_Ancestors,
- (Standard_Address)NULL);
+ sizeof(GEOMImpl_RotateDriver),
+ 1,
+ (Standard_Address)_Ancestors,
+ (Standard_Address)NULL);
return _aType;
}
