0023774: Incorrect conversion from gp_Trsf2d to gp_Trsf

Adding test command for this fix
Adding test case for this fix

diff --git a/src/QABugs/QABugs_19.cxx b/src/QABugs/QABugs_19.cxx
index 6f6265d0972b0fb8a2ce3c73102fe2a1a1fa6206..4b03646960be9c05ce738216d9bb957b3c38c3d3 100755 (executable)
--- a/src/QABugs/QABugs_19.cxx
+++ b/src/QABugs/QABugs_19.cxx
@@ -287,6 +287,106 @@ Standard_Integer OCC22595 (Draw_Interpretor& di, Standard_Integer argc, const ch
   return 0;
 }
 
+#include <TopoDS_Face.hxx>
+#include <TopoDS_Face.hxx>
+#include <TopoDS.hxx>
+#include <BRepBuilderAPI_Transform.hxx>
+#include <BRepExtrema_DistShapeShape.hxx>
+#include <BRepTools.hxx>
+
+Standard_Boolean static OCC23774Test(const TopoDS_Face& grossPlateFace, const TopoDS_Shape& originalWire, Draw_Interpretor& di)
+{
+  BRepExtrema_DistShapeShape distShapeShape(grossPlateFace,originalWire,Extrema_ExtFlag_MIN);
+  if(!distShapeShape.IsDone()) {
+    di <<"Distance ShapeShape is Not Done\n";
+    return Standard_False;
+  }
+
+  if(distShapeShape.Value() > 0.01) {
+    di << "Wrong Dist = " <<distShapeShape.Value() << "\n";
+    return Standard_False;
+  } else
+    di << "Dist0 = " <<distShapeShape.Value() <<"\n";
+
+  //////////////////////////////////////////////////////////////////////////
+  /// First Flip Y
+  const gp_Pnt2d axis1P1(1474.8199035519228,1249.9995745636970);
+  const gp_Pnt2d axis1P2(1474.8199035519228,1250.9995745636970);
+
+  gp_Vec2d mirrorVector1(axis1P1,axis1P2);
+
+  gp_Trsf2d mirror1;
+  mirror1.SetMirror(gp_Ax2d(axis1P1,mirrorVector1));
+
+  BRepBuilderAPI_Transform transformer1(mirror1);
+  transformer1.Perform(originalWire);
+  if(!transformer1.IsDone()) {
+    di << "Not Done1 " << "\n";
+    return Standard_False;
+  }
+  const TopoDS_Shape& step1ModifiedShape = transformer1.ModifiedShape(originalWire);
+  
+  BRepExtrema_DistShapeShape distShapeShape1(grossPlateFace,step1ModifiedShape,Extrema_ExtFlag_MIN);
+  if(!distShapeShape1.IsDone())
+    return Standard_False;
+  if(distShapeShape1.Value() > 0.01) {
+    di << "Dist = " <<distShapeShape1.Value() <<"\n";
+    return Standard_False;
+  } else
+    di << "Dist1 = " <<distShapeShape1.Value() <<"\n";
+
+  //////////////////////////////////////////////////////////////////////////
+  /// Second flip Y
+  transformer1.Perform(step1ModifiedShape);
+  if(!transformer1.IsDone()) {
+    di << "Not Done1 \n";
+    return Standard_False;
+  }
+  const TopoDS_Shape& step2ModifiedShape = transformer1.ModifiedShape(step1ModifiedShape);
+  BRepTools::Write(step2ModifiedShape, Standard_CString ("SecondMirrorWire.brep"));
+
+  //This is identity matrix for values but for type is gp_Rotation ?!
+  gp_Trsf2d mirror11 = mirror1;
+  mirror11.PreMultiply(mirror1);
+
+  BRepExtrema_DistShapeShape distShapeShape2(grossPlateFace,step2ModifiedShape);//,Extrema_ExtFlag_MIN);
+  if(!distShapeShape2.IsDone())
+    return Standard_False;
+
+  //This last test case give error (the value is 1008.8822038689706)
+  if(distShapeShape2.Value() > 0.01) {
+    di  << "Wrong Dist2 = " <<distShapeShape2.Value() <<"\n";
+    Standard_Integer N = distShapeShape2.NbSolution();
+    di << "Nb = " <<N <<"\n";
+    for (Standard_Integer i=1;i <= N;i++)
+        di <<"Sol(" <<i<<") = " <<distShapeShape2.PointOnShape1(i).Distance(distShapeShape2.PointOnShape2(i)) <<"\n";
+    return Standard_False;
+  }
+  di << "Distance2 = " <<distShapeShape2.Value() <<"\n";
+ 
+  return Standard_True;
+}
+static Standard_Integer OCC23774(Draw_Interpretor& di, Standard_Integer n, const char** a)
+{ 
+
+  if (n != 3) {
+       di <<"OCC23774: invalid number of input parameters\n";
+       return 1;
+  }
+
+  const char *ns1 = (a[1]), *ns2 = (a[2]);
+  TopoDS_Shape S1(DBRep::Get(ns1)), S2(DBRep::Get(ns2));
+  if (S1.IsNull() || S2.IsNull()) {
+       di <<"OCC23774: Null input shapes\n";
+       return 1;
+  }
+  const TopoDS_Face& aFace  = TopoDS::Face(S1);
+  if(!OCC23774Test(aFace, S2, di))
+       di << "Something is wrong\n";
+
+ return 0;
+}
+
 void QABugs::Commands_19(Draw_Interpretor& theCommands) {
   const char *group = "QABugs";
 
@@ -298,6 +398,7 @@ void QABugs::Commands_19(Draw_Interpretor& theCommands) {
   theCommands.Add ("OCC23595", "OCC23595", __FILE__, OCC23595, group);
   theCommands.Add ("OCC22611", "OCC22611 string nb", __FILE__, OCC22611, group);
   theCommands.Add ("OCC22595", "OCC22595", __FILE__, OCC22595, group);
+  theCommands.Add ("OCC23774", "OCC23774 shape1 shape2", __FILE__, OCC23774, group);
 
   return;
 }

diff --git a/src/gp/gp_Trsf.cdl b/src/gp/gp_Trsf.cdl
index 35398efa6e0f2418164a86605d17fa637345c554..6604dab6de4731afd9180b73656d7515bec42e48 100755 (executable)
--- a/src/gp/gp_Trsf.cdl
+++ b/src/gp/gp_Trsf.cdl
@@ -64,7 +64,6 @@ is
         --- Purpose : Returns the identity transformation.
 
   Create(T : Trsf2d from gp) returns Trsf from gp;
-        ---C++: inline
         ---Purpose: Creates  a 3D transformation from the 2D transformation T.
         -- The resulting transformation has a homogeneous
         -- vectorial part, V3, and a translation part, T3, built from T:

diff --git a/src/gp/gp_Trsf.cxx b/src/gp/gp_Trsf.cxx
index cb9ab504ca14cac70c8c77bb9e0ec35e60f14482..32a3d7b579a966795265a7b5de764f04830617d2 100755 (executable)
--- a/src/gp/gp_Trsf.cxx
+++ b/src/gp/gp_Trsf.cxx
@@ -27,6 +27,30 @@
 #include <gp.hxx>
 #include <Standard_ConstructionError.hxx>
 
+
+//=======================================================================
+//function : gp_Trsf
+//purpose  : Constructor from 2d
+//=======================================================================
+
+gp_Trsf::gp_Trsf (const gp_Trsf2d& T) : 
+scale(T.ScaleFactor()),
+shape(T.Form()),
+loc(T.TranslationPart().X(),T.TranslationPart().Y(), 0.0)
+{
+  const gp_Mat2d& M = T.HVectorialPart();
+  matrix(1,1) = M(1,1);
+  matrix(1,2) = M(1,2);
+  matrix(2,1) = M(2,1);
+  matrix(2,2) = M(2,2);
+  matrix(3,3) = 1.;
+  if (shape == gp_Ax1Mirror)
+  {
+    scale = 1;
+    matrix.Multiply(-1);
+  }
+}
+
 //=======================================================================
 //function : SetMirror
 //purpose  : 

diff --git a/src/gp/gp_Trsf.lxx b/src/gp/gp_Trsf.lxx
index 540b75282b16509407fe82284410da601a5ddb09..507dafd392da4827532e66836302ffcf466b2b38 100755 (executable)
--- a/src/gp/gp_Trsf.lxx
+++ b/src/gp/gp_Trsf.lxx
@@ -32,19 +32,6 @@ matrix(1,0,0, 0,1,0, 0,0,1),
 loc(0.0, 0.0, 0.0)
 {}
 
-inline gp_Trsf::gp_Trsf (const gp_Trsf2d& T) : 
-scale(T.ScaleFactor()),
-shape(T.Form()),
-loc(T.TranslationPart().X(),T.TranslationPart().Y(), 0.0)
-{
-  const gp_Mat2d& M = T.HVectorialPart();
-  matrix(1,1) = M(1,1);
-  matrix(1,2) = M(1,2);
-  matrix(2,1) = M(2,1);
-  matrix(2,2) = M(2,2);
-  matrix(3,3) = 1.;
-}
-
 inline void gp_Trsf::SetMirror (const gp_Pnt& P) 
 {
   shape = gp_PntMirror;

diff --git a/tests/bugs/fclasses/bug23774 b/tests/bugs/fclasses/bug23774
new file mode 100755 (executable)
index 0000000..fc10eb5
--- /dev/null
+++ b/tests/bugs/fclasses/bug23774
@@ -0,0 +1,74 @@
+puts "==========="
+puts "OCC23774"
+puts "==========="
+######################################################
+# Incorrect conversion from gp_Trsf2d to gp_Trsf
+######################################################
+
+pload QAcommands
+pload TOPTEST
+
+set BugNumber OCC23774
+
+restore [locate_data_file bug23774_GrossPlateFace.brep] face
+restore [locate_data_file bug23774_OriginalWire.brep] wire
+
+set Info [OCC23774 face wire]
+
+regexp {Dist0 += +([-0-9.+eE]+)} ${Info} full Dist0
+regexp {Dist1 += +([-0-9.+eE]+)} ${Info} full Dist1
+regexp {Distance2 += +([-0-9.+eE]+)} ${Info} full Distance2
+puts "Dist0 = ${Dist0}"
+puts "Dist1 = ${Dist1}"
+puts "Distance2 = ${Distance2}"
+
+set face_tolerance [maxtolerance face]
+regexp { +Face +: +Min +[-0-9.+eE]+ +Max +([-0-9.+eE]+)} ${face_tolerance} full F_MaxFaceTolerance
+regexp { +Edge +: +Min +[-0-9.+eE]+ +Max +([-0-9.+eE]+)} ${face_tolerance} full F_MaxEdgeTolerance
+regexp { +Vertex +: +Min +[-0-9.+eE]+ +Max +([-0-9.+eE]+)} ${face_tolerance} full F_MaxVertexTolerance
+
+set wire_tolerance [maxtolerance wire]
+regexp { +Face +: +Min +[-0-9.+eE]+ +Max +([-0-9.+eE]+)} ${face_tolerance} full W_MaxFaceTolerance
+regexp { +Edge +: +Min +[-0-9.+eE]+ +Max +([-0-9.+eE]+)} ${face_tolerance} full W_MaxEdgeTolerance
+regexp { +Vertex +: +Min +[-0-9.+eE]+ +Max +([-0-9.+eE]+)} ${face_tolerance} full W_MaxVertexTolerance
+
+set max_tolerance ${F_MaxFaceTolerance}
+if { ${F_MaxEdgeTolerance} > ${max_tolerance} } {
+   set max_tolerance ${F_MaxEdgeTolerance}
+}
+if { ${F_MaxVertexTolerance} > ${max_tolerance} } {
+   set max_tolerance ${F_MaxVertexTolerance}
+}
+if { ${W_MaxFaceTolerance} > ${max_tolerance} } {
+   set max_tolerance ${W_MaxFaceTolerance}
+}
+if { ${W_MaxEdgeTolerance} > ${max_tolerance} } {
+   set max_tolerance ${W_MaxEdgeTolerance}
+}
+if { ${W_MaxVertexTolerance} > ${max_tolerance} } {
+   set max_tolerance ${W_MaxVertexTolerance}
+}
+puts "max_tolerance = ${max_tolerance}"
+
+set status 0
+set Dist0_GoodValue 0.
+set Dist1_GoodValue 0.
+set Distance2_GoodValue 0.
+
+if { [expr abs(${Dist0} - ${Dist0_GoodValue})] > ${max_tolerance} } {
+   set status 1
+}
+if { [expr abs(${Dist1} - ${Dist1_GoodValue})] > ${max_tolerance} } {
+   set status 1
+}
+if { [expr abs(${Distance2} - ${Distance2_GoodValue})] > ${max_tolerance} } {
+   set status 1
+}
+
+# Resume
+puts ""
+if { ${status} != 0 } {
+   puts "Faulty ${BugNumber}"
+} else {
+   puts "OK ${BugNumber}"
+}