Merge branch 'master' into CR28720

1 link update for each new segment

src/Draft/Draft_FaceInfo.cxx

@@ -37,7 +37,9 @@ Draft_FaceInfo::Draft_FaceInfo (const Handle(Geom_Surface)& S,\
 				const Standard_Boolean HasNewGeometry):
        myNewGeom(HasNewGeometry)
 {
-  myGeom = S;
+  Handle(Geom_RectangularTrimmedSurface) T = Handle(Geom_RectangularTrimmedSurface)::DownCast(S);
+  if (!T.IsNull()) myGeom = T->BasisSurface();
+  else             myGeom = S;
 }
 
 

src/Draft/Draft_Modification_1.cxx

@@ -481,7 +481,7 @@ Standard_Boolean Draft_Modification::Propagate ()
           Handle(Geom_Surface)::DownCast(S->Transformed(L.Transformation()));
 
         const Handle(Standard_Type)& typs = S->DynamicType();
-        if (/*typs == STANDARD_TYPE(Geom_CylindricalSurface) ||*/
+        if (typs == STANDARD_TYPE(Geom_CylindricalSurface) ||
             typs == STANDARD_TYPE(Geom_ConicalSurface)) {
           Standard_Real umin,umax,vmin,vmax;
           BRepTools::UVBounds(F,umin,umax,vmin,vmax);
@@ -1062,11 +1062,7 @@ void Draft_Modification::Perform ()
               //Find the first curve to glue
               TColGeom_SequenceOfCurve Candidates;
               if (S1->DynamicType() == STANDARD_TYPE(Geom_CylindricalSurface) ||
-                  S1->DynamicType() == STANDARD_TYPE(Geom_ConicalSurface) ||
-                  S1->DynamicType() == STANDARD_TYPE(Geom_RectangularTrimmedSurface) &&
-                  Handle(Geom_RectangularTrimmedSurface)::DownCast(S1)->BasisSurface()->DynamicType() == STANDARD_TYPE(Geom_CylindricalSurface) ||
-                  S1->DynamicType() == STANDARD_TYPE(Geom_RectangularTrimmedSurface) &&
-                  Handle(Geom_RectangularTrimmedSurface)::DownCast(S1)->BasisSurface()->DynamicType() == STANDARD_TYPE(Geom_ConicalSurface))
+                  S1->DynamicType() == STANDARD_TYPE(Geom_ConicalSurface)) 
               {
                 for (i = 1; i <= i2s.NbLines(); i++)
                 {

tests/bugs/modalg_8/bug32857

@@ -1,72 +0,0 @@
-puts "================"
-puts "0032857: Problem when finding the intersection between a new face made after a draft and the inner face of body"
-puts "================"
-puts ""
-# Script reproducing the problematic draft case in FreeCAD issue #2497
-#Category: Modeling
-#Title: OCCT Tutorial pocketed ring
-
-pload MODELING VISUALIZATION
-
-# Set basic dimensions. Problems appear when inner_rad < pocket_center.
-dset height 10
-dset inner_rad 39
-dset outer_rad 50
-dset pocket_center 40
-dset pocket_rad 20
-dset pocket_depth 5
-
-# Construct base profile (the "my_ring")
-puts "Constructing my_ring..."
-
-circle c_inner 0 0 0 0 0 1 inner_rad
-circle c_outer 0 0 0 0 0 1 outer_rad
-mkedge e_inner c_inner
-mkedge e_outer c_outer
-wire w_inner e_inner
-wire w_outer e_outer
-
-plane p0
-mkface my_ring_inner_base p0 w_inner
-mkface my_ring_outer_base p0 w_outer
-
-prism my_ring_inner my_ring_inner_base 0 0 height
-prism my_ring_outer my_ring_outer_base 0 0 height
-
-bcut my_ring my_ring_outer my_ring_inner
-
-# Make the pocket
-puts "Constructing pocket..."
-
-circle pocket_base pocket_center 0 0 0 0 1 pocket_rad
-mkedge pocket_base pocket_base
-wire pocket_base pocket_base
-
-mkface pocket_base p0 pocket_base
-
-prism my_pocket pocket_base 0 0 pocket_depth
-
-# Make the cut
-puts "Making the cut"
-
-bcut slotted_ring my_ring my_pocket
-
-explode slotted_ring F
-
-# Make the draft
-puts "Drafting the face"
-
-# Found face by trial and error: slotted_ring_3
-# Perform the draft
-depouille slotted_ring_with_draft slotted_ring 0 0 -1 slotted_ring_3 44 0 1 0 0 0 1
-
-#checking result
-checkshape slotted_ring_with_draft
-checknbshapes slotted_ring_with_draft -shape 48 -vertex 12 -edge 18 -face 7 -wire 8
-checkprops slotted_ring_with_draft -s 11466.5 -v 28662.9
-
-puts "Showing result..."
-
-# Display result
-checkview -display slotted_ring_with_draft -2d -path ${imagedir}/${test_image}.png
-