// trying to avoid regressions

Updated IGESToBRep_CurveAndSurface and its childs to work with geometry as is not scaled yet.

src/BRepBndLib/BRepBndLib.cxx

@@ -127,14 +127,6 @@ void BRepBndLib::Add(const TopoDS_Shape& S, Bnd_Box& B, Standard_Boolean useTria
   for (ex.Init(S,TopAbs_EDGE,TopAbs_FACE); ex.More(); ex.Next())
   {
     const TopoDS_Edge& E = TopoDS::Edge(ex.Current());
- 
-    if (!useTriangulation && BRep_Tool::IsGeometric(E))
-    {
-      BC.Initialize(E);
-      BndLib_Add3dCurve::Add(BC, BRep_Tool::Tolerance(E), B);
-      continue;
-    }
-
     Handle(Poly_Polygon3D) P3d = BRep_Tool::Polygon3D(E, l);
     if (!P3d.IsNull() && P3d->NbNodes() > 0)
     {
@@ -151,7 +143,7 @@ void BRepBndLib::Add(const TopoDS_Shape& S, Bnd_Box& B, Standard_Boolean useTria
     else
     {
       BRep_Tool::PolygonOnTriangulation(E, Poly, T, l);
-      if (!Poly.IsNull() && !T.IsNull() && T->NbNodes() > 0)
+      if (useTriangulation && !Poly.IsNull() && !T.IsNull() && T->NbNodes() > 0)
       {
         const TColStd_Array1OfInteger& Indices = Poly->Nodes();
         nbNodes = Indices.Length();

src/BRepOffset/BRepOffset_Analyse.cxx

@@ -41,7 +41,6 @@
 #include <TopoDS_Vertex.hxx>
 #include <TopTools_MapOfShape.hxx>
 #include <ChFi3d.hxx>
-#include <LocalAnalysis_SurfaceContinuity.hxx>
 
 static void CorrectOrientationOfTangent(gp_Vec& TangVec,
                                         const TopoDS_Vertex& aVertex,
@@ -51,12 +50,6 @@ static void CorrectOrientationOfTangent(gp_Vec& TangVec,
   if (aVertex.IsSame(Vlast))
     TangVec.Reverse();
 }
-
-static Standard_Boolean CheckMixedContinuity (const TopoDS_Edge&  theEdge,
-                                              const TopoDS_Face&  theFace1,
-                                              const TopoDS_Face&  theFace2,
-                                              const Standard_Real theAngTol);
-
 //=======================================================================
 //function : BRepOffset_Analyse
 //purpose  : 
@@ -112,168 +105,15 @@ static void EdgeAnalyse(const TopoDS_Edge&         E,
   }
   else
   {
-    Standard_Boolean isTwoSplines = (aSurfType1 == GeomAbs_BSplineSurface || aSurfType1 == GeomAbs_BezierSurface) &&
-                                    (aSurfType2 == GeomAbs_BSplineSurface || aSurfType2 == GeomAbs_BezierSurface);
-    Standard_Boolean isMixedConcavity = Standard_False;
-    if (isTwoSplines)
-    {
-      Standard_Real anAngTol = 0.1;
-      isMixedConcavity = CheckMixedContinuity(E, F1, F2, anAngTol);
-    }
-
-    if (!isMixedConcavity)
-    {
-      if (ChFi3d::IsTangentFaces(E, F1, F2)) //weak condition
-      {
-        ConnectType = ChFiDS_Tangential;
-      }
-      else
-      {
-        ConnectType = ChFi3d::DefineConnectType(E, F1, F2, SinTol, Standard_False);
-      }
-    }
+    if (ChFi3d::IsTangentFaces(E, F1, F2)) //weak condition
+      ConnectType = ChFiDS_Tangential;
     else
-    {
-      ConnectType = ChFiDS_Mixed;
-    }
+      ConnectType = ChFi3d::DefineConnectType(E, F1, F2, SinTol, Standard_False);
   }
    
   I.Type(ConnectType);
   LI.Append(I);
 }
-//=======================================================================
-//function : CheckMixedConcavity
-//purpose  : 
-//=======================================================================
-Standard_Boolean CheckMixedContinuity (const TopoDS_Edge&  theEdge,
-                                       const TopoDS_Face&  theFace1,
-                                       const TopoDS_Face&  theFace2,
-                                       const Standard_Real theAngTol)
-{
-  Standard_Boolean aMixedCont = Standard_False;
-  GeomAbs_Shape aCurrOrder = BRep_Tool::Continuity(theEdge, theFace1, theFace2);
-  if (aCurrOrder > GeomAbs_C0)
-  {
-    //Method BRep_Tool::Continuity(...) always returns minimal continuity between faces
-    //so, if aCurrOrder > C0 it means that faces are tangent along whole edge.
-    return aMixedCont;
-  }
-  //But we caqnnot trust result, if it is C0. because this value set by default.
-  Standard_Real TolC0 = Max(0.001, 1.5*BRep_Tool::Tolerance(theEdge));
-
-  Standard_Real aFirst;
-  Standard_Real aLast;
-
-  Handle(Geom2d_Curve) aC2d1, aC2d2;
-
-  if (!theFace1.IsSame(theFace2) &&
-    BRep_Tool::IsClosed(theEdge, theFace1) &&
-    BRep_Tool::IsClosed(theEdge, theFace2))
-  {
-    //Find the edge in the face 1: this edge will have correct orientation
-    TopoDS_Edge anEdgeInFace1;
-    TopoDS_Face aFace1 = theFace1;
-    aFace1.Orientation(TopAbs_FORWARD);
-    TopExp_Explorer anExplo(aFace1, TopAbs_EDGE);
-    for (; anExplo.More(); anExplo.Next())
-    {
-      const TopoDS_Edge& anEdge = TopoDS::Edge(anExplo.Current());
-      if (anEdge.IsSame(theEdge))
-      {
-        anEdgeInFace1 = anEdge;
-        break;
-      }
-    }
-    if (anEdgeInFace1.IsNull())
-    {
-      return aMixedCont;
-    }
-
-    aC2d1 = BRep_Tool::CurveOnSurface(anEdgeInFace1, aFace1, aFirst, aLast);
-    TopoDS_Face aFace2 = theFace2;
-    aFace2.Orientation(TopAbs_FORWARD);
-    anEdgeInFace1.Reverse();
-    aC2d2 = BRep_Tool::CurveOnSurface(anEdgeInFace1, aFace2, aFirst, aLast);
-  }
-  else
-  {
-    // Obtaining of pcurves of edge on two faces.
-    aC2d1 = BRep_Tool::CurveOnSurface(theEdge, theFace1, aFirst, aLast);
-    //For the case of seam edge
-    TopoDS_Edge EE = theEdge;
-    if (theFace1.IsSame(theFace2))
-    {
-      EE.Reverse();
-    }
-    aC2d2 = BRep_Tool::CurveOnSurface(EE, theFace2, aFirst, aLast);
-  }
-
-  if (aC2d1.IsNull() || aC2d2.IsNull())
-  {
-    return aMixedCont;
-  }
-
-  // Obtaining of two surfaces from adjacent faces.
-  Handle(Geom_Surface) aSurf1 = BRep_Tool::Surface(theFace1);
-  Handle(Geom_Surface) aSurf2 = BRep_Tool::Surface(theFace2);
-
-  if (aSurf1.IsNull() || aSurf2.IsNull())
-  {
-    return aMixedCont;
-  }
-
-  Standard_Integer aNbSamples = 23;
-
-  // Computation of the continuity.
-  Standard_Real    aPar;
-  Standard_Real    aDelta = (aLast - aFirst) / (aNbSamples - 1);
-  Standard_Integer i, istart = 1;
-  Standard_Boolean isG1 = Standard_False;
-
-  for (i = 1, aPar = aFirst; i <= aNbSamples; i++, aPar += aDelta) 
-  {
-    if (i == aNbSamples) aPar = aLast;
-
-    LocalAnalysis_SurfaceContinuity aCont(aC2d1, aC2d2, aPar,
-      aSurf1, aSurf2, GeomAbs_G1, 0.001, TolC0, theAngTol, theAngTol, theAngTol);
-    if (aCont.IsDone())
-    {
-      istart = i + 1;
-      isG1 = aCont.IsG1();
-      break;
-    }
-  }
-
-  if (istart > aNbSamples / 2)
-  {
-    return aMixedCont;
-  }
-
-  for (i = istart, aPar = aFirst; i <= aNbSamples; i++, aPar += aDelta) 
-  {
-    if (i == aNbSamples) aPar = aLast;
-
-    LocalAnalysis_SurfaceContinuity aCont(aC2d1, aC2d2, aPar,
-      aSurf1, aSurf2, GeomAbs_G1, 0.001, TolC0, theAngTol, theAngTol, theAngTol);
-    if (!aCont.IsDone())
-    {
-      continue;
-    }
-
-    if (aCont.IsG1() == isG1)
-    {
-      continue;
-    }
-    else
-    {
-       aMixedCont = Standard_True;
-       break;
-    }
-  }
-
-  return aMixedCont;
-
-}
 
 //=======================================================================
 //function : BuildAncestors

src/BRepOffset/BRepOffset_Error.hxx

@@ -29,8 +29,7 @@ enum BRepOffset_Error
   BRepOffset_CannotTrimEdges,        //!< exception while trim edges
   BRepOffset_CannotFuseVertices,     //!< exception while fuse vertices
   BRepOffset_CannotExtentEdge,       //!< exception while extent edges
-  BRepOffset_UserBreak,              //!< user break
-  BRepOffset_MixedConnectivity       //!< Different connectivity of faces along edge: partially C0 and tangent
+  BRepOffset_UserBreak               //!< user break
 };
 
 #endif // _BRepOffset_Error_HeaderFile

src/BRepOffset/BRepOffset_MakeOffset.cxx

@@ -910,19 +910,6 @@ void BRepOffset_MakeOffset::MakeOffsetShape(const Message_ProgressRange& theRang
     myAnalyse.SetFaceOffsetMap (myFaceOffset);
   }
   myAnalyse.Perform(myFaceComp,TolAngle, aPS.Next(aSteps(PIOperation_Analyse)));
-  TopExp_Explorer anEExp(myFaceComp, TopAbs_EDGE);
-  for (; anEExp.More(); anEExp.Next())
-  {
-    const TopoDS_Edge& anE = TopoDS::Edge(anEExp.Current());
-    const BRepOffset_ListOfInterval& aLI = myAnalyse.Type(anE);
-    if (aLI.IsEmpty())
-      continue;
-    if (aLI.Last().Type() == ChFiDS_Mixed)
-    {
-      myError = BRepOffset_MixedConnectivity;
-      return;
-    }
-  }
   if (!aPS.More())
   {
     myError = BRepOffset_UserBreak;
@@ -2973,36 +2960,6 @@ void BRepOffset_MakeOffset::MakeMissingWalls (const Message_ProgressRange& theRa
       TopExp::Vertices(anEdge, V1, V2);
       Standard_Real aF, aL;
       const Handle(Geom_Curve) aC = BRep_Tool::Curve(anEdge, aF, aL);
-      if (V3.IsNull() && V4.IsNull())
-      {
-        // Initially offset edge is created without vertices.
-        // Then edge is trimmed by intersection line between  
-        // two adjacent extended offset faces and get vertices.
-        // When intersection lines are invalid for any reason, 
-        // (one of reson is mixed connectivity of faces)
-        // algoritm of cutting offset edge by intersection line 
-        // can fail and offset edge cannot get vertices.
-        // Follwing workaround is only to avoid exeption if V3 and V4 are Null
-        // Vertex points are invalid.
-        Standard_Real anOEF, anOEL;
-        TopAbs_Orientation anOEOri = OE.Orientation();
-        OE.Orientation(TopAbs_FORWARD);
-        Handle(Geom_Curve) anOEC = BRep_Tool::Curve(OE, anOEF, anOEL);
-        BRep_Builder aBB;
-        gp_Pnt aP1 = anOEC->Value(aF);
-        gp_Pnt aP2 = anOEC->Value(aL);
-        TopoDS_Vertex anOEV1, anOEV2;
-        Standard_Real aTol = Max(BRep_Tool::Tolerance(V1), BRep_Tool::Tolerance(V2));
-        aBB.MakeVertex(anOEV1, aP1, aTol);
-        anOEV1.Orientation(TopAbs_FORWARD);
-        aBB.MakeVertex(anOEV2, aP2, aTol);
-        anOEV2.Orientation(TopAbs_REVERSED);
-        aBB.Add(OE, anOEV1);
-        aBB.Add(OE, anOEV2);
-        aBB.Range(OE, aF, aL);
-        OE.Orientation(anOEOri);
-        TopExp::Vertices(OE, V4, V3);
-      }
       if (!aC.IsNull() &&
          (!aC->IsClosed() && !aC->IsPeriodic()))
       {

src/BRepTest/BRepTest_CurveCommands.cxx

@@ -281,11 +281,9 @@ static Standard_Integer mkedge(Draw_Interpretor& di, Standard_Integer n, const c
 
   Handle(Geom_Curve)   C   = DrawTrSurf::GetCurve(a[2]);
   Handle(Geom2d_Curve) C2d = DrawTrSurf::GetCurve2d(a[2]);
-  Handle(Poly_Polygon3D) P3d = DrawTrSurf::GetPolygon3D(a[2]);
-
-  if (C.IsNull() && C2d.IsNull() && P3d.IsNull()) {
+  if (C.IsNull() && C2d.IsNull()) {
     //std::cout << a[2] << " is not a curve" << std::endl;
-    di << a[2] << " is not a curve or polygon 3d\n";
+    di << a[2] << " is not a curve\n";
     return 1;
   }
 
@@ -293,12 +291,7 @@ static Standard_Integer mkedge(Draw_Interpretor& di, Standard_Integer n, const c
 
   if (n == 3) {
     if (!C.IsNull())   edge = BRepBuilderAPI_MakeEdge(C);
-    else  if (!C2d.IsNull())  edge = BRepBuilderAPI_MakeEdge2d(C2d);
-    else
-    {
-      BRep_Builder aBB;
-      aBB.MakeEdge(edge, P3d);
-    }
+    else               edge = BRepBuilderAPI_MakeEdge2d(C2d);
   }
   else {
     Handle(Geom_Surface) S;

src/BRepTest/BRepTest_FeatureCommands.cxx

@@ -415,11 +415,6 @@ static void reportOffsetState(Draw_Interpretor& theCommands,
     theCommands << "ERROR. Can not extent edge.";
     break;
   }
-  case  BRepOffset_MixedConnectivity:
-  {
-    theCommands << "ERROR. Mixed connectivity of faces.";
-    break;
-  }
   default:
   {
     theCommands << "ERROR. offsetperform operation not done.";
@@ -979,10 +974,7 @@ Standard_Integer thickshell(Draw_Interpretor& theCommands,
   const BRepOffset_Error aRetCode = B.Error();
   reportOffsetState(theCommands, aRetCode);
 
-  if (!B.Shape().IsNull())
-  {
-    DBRep::Set(a[1], B.Shape());
-  }
+  DBRep::Set(a[1], B.Shape());
   return 0;
 }
 
@@ -1117,10 +1109,7 @@ Standard_Integer offsetshape(Draw_Interpretor& theCommands,
   const BRepOffset_Error aRetCode = B.Error();
   reportOffsetState(theCommands, aRetCode);
 
-  if (!B.Shape().IsNull())
-  {
-    DBRep::Set(a[1], B.Shape());
-  }
+  DBRep::Set(a[1], B.Shape());
 
   return 0;
 }

src/ChFi3d/ChFi3d_Builder_1.cxx

@@ -692,6 +692,7 @@ void ChFi3d_Builder::PerformExtremity (const Handle(ChFiDS_Spine)& Spine)
     else{
       sst = Spine->LastStatus(); 
       iedge = Spine->NbEdges();
+      E[0] = Spine->Edges(iedge);
       V = Spine->LastVertex();
     }
     //Before all it is checked if the tangency is not dead.
@@ -702,7 +703,6 @@ void ChFi3d_Builder::PerformExtremity (const Handle(ChFiDS_Spine)& Spine)
     }
 
     if(sst == ChFiDS_BreakPoint){
-      Standard_Integer aLocNbG1Connections = 0;
       TopTools_ListIteratorOfListOfShape It;//,Jt;
       Standard_Boolean sommetpourri = Standard_False;
       TopTools_IndexedMapOfOrientedShape EdgesOfV;
@@ -720,10 +720,7 @@ void ChFi3d_Builder::PerformExtremity (const Handle(ChFiDS_Spine)& Spine)
         if (!F2.IsNull() && ChFi3d::IsTangentFaces(anEdge, F1, F2, GeomAbs_G2)) //smooth edge
         {
           if (!F1.IsSame(F2))
-          {
             NbG1Connections++;
-            aLocNbG1Connections++;
-          }
           continue;
         }
         
@@ -762,7 +759,7 @@ void ChFi3d_Builder::PerformExtremity (const Handle(ChFiDS_Spine)& Spine)
       if (EdgesOfV.Extent() != 3)
         sommetpourri = Standard_True;
       
-      if(!sommetpourri && aLocNbG1Connections < 4){
+      if(!sommetpourri){
 	sst = ChFi3d_EdgeState(E,myEFMap);
       }
       if(ii==1)Spine->SetFirstStatus(sst);

src/ChFiDS/ChFiDS_TypeOfConcavity.hxx

@@ -24,8 +24,7 @@ ChFiDS_Concave,
 ChFiDS_Convex,
 ChFiDS_Tangential,
 ChFiDS_FreeBound,
-ChFiDS_Other,
-ChFiDS_Mixed
+ChFiDS_Other
 };
 
 #endif // _ChFiDS_TypeOfConcavity_HeaderFile

src/IGESToBRep/IGESToBRep_BRepEntity.cxx

@@ -395,7 +395,7 @@ TopoDS_Shape IGESToBRep_BRepEntity::TransferLoop(const Handle(IGESSolid_Loop)& s
 	    Curves2d->SetValue (i, start->ParametricCurve(iedge,i));
 	}
 	Handle(ShapeExtend_WireData) lsewd;//result of translation of current edge
-	Result = Result & IB->Transfer (okCurve, okCurve3d, okCurve2d,
+	Result = Result && IB->Transfer (okCurve, okCurve3d, okCurve2d,
 					curve3d, Curves2d, !orientation,
 					iedge, lsewd);
 	if (iedge == 1) sewd = IB->WireData();//initialization

src/IGESToBRep/IGESToBRep_BasicCurve.cxx

@@ -343,7 +343,7 @@ Handle(Geom_Curve) IGESToBRep_BasicCurve::TransferConicArc
     //The dimensions should be also obliged:
     //[a]=[b]=[c]=L^-2
     //if ( (Abs(a-c) <= GetEpsGeom()) && (Abs(b) < GetEpsCoeff()))
-    Standard_Real eps2 = Precision::PConfusion() * Precision::PConfusion();
+    Standard_Real eps2 = (Precision::PConfusion() * Precision::PConfusion()) / GetUnitFactor();
     if ( (Abs(a-c) <= eps2) && (Abs(b) < eps2)) {
     
 //                          =================
@@ -358,8 +358,8 @@ Handle(Geom_Curve) IGESToBRep_BasicCurve::TransferConicArc
 
         t1 = ElCLib::Parameter(circ, startPoint);
         t2 = ElCLib::Parameter(circ, endPoint);
-	if (t1 > t2 && (t1 - t2) > Precision::Confusion()) t2 += 2.*M_PI;
-	if (Abs(t1 - t2) <= Precision::Confusion())  { // t1 = t2
+	if (t1 > t2 && (t1 - t2) > Precision::Confusion() / GetUnitFactor()) t2 += 2.*M_PI;
+	if (Abs(t1 - t2) <= Precision::Confusion() / GetUnitFactor())  { // t1 = t2
 	  Message_Msg msg1160("IGES_1160");
 	  SendWarning(st, msg1160);      
 	}

src/IGESToBRep/IGESToBRep_BasicSurface.cxx

@@ -312,7 +312,7 @@ Handle(Geom_CylindricalSurface) IGESToBRep_BasicSurface::TransferRigthCylindrica
     // Direction Reading Error : Null IGESEntity
     return res;
   }
-  if (radius < Precision::Confusion()) {
+  if (radius < Precision::Confusion() / GetUnitFactor()) {
     return res;
   }
     
@@ -374,7 +374,7 @@ Handle(Geom_ConicalSurface) IGESToBRep_BasicSurface::TransferRigthConicalSurface
   if (radius < 0) {
     return res;
   }
-  if (radius < Precision::Confusion())
+  if (radius < Precision::Confusion() / GetUnitFactor())
     radius = 0.;
   
   gp_Pnt Pt = Point->Value();
@@ -427,7 +427,7 @@ Handle(Geom_SphericalSurface) IGESToBRep_BasicSurface::TransferSphericalSurface
     // Direction Reading Error : Null IGESEntity
     return res;
   }
-  if (radius < Precision::Confusion()){
+  if (radius < Precision::Confusion() / GetUnitFactor()){
    
     return res;
   }
@@ -483,7 +483,7 @@ Handle(Geom_ToroidalSurface) IGESToBRep_BasicSurface::TransferToroidalSurface
     // Direction Reading Error : Null IGESEntity
     return res;
   }
-  if (major < Precision::Confusion()||minor < Precision::Confusion()){
+  if (major < Precision::Confusion() / GetUnitFactor() || minor < Precision::Confusion() / GetUnitFactor()){
    
     return res;
   }

src/IGESToBRep/IGESToBRep_TopoCurve.cxx

@@ -1330,7 +1330,7 @@ TopoDS_Shape IGESToBRep_TopoCurve::TransferBoundaryOnFace(TopoDS_Face&  face,
     } 
     else
       Curves2d = start->ParameterCurves(i);
-    Result = Result & IB->Transfer (okCurve, okCurve3d, okCurve2d,
+    Result = Result && IB->Transfer (okCurve, okCurve3d, okCurve2d,
 				    start->ModelSpaceCurve(i), start->Sense(i) == 2,
 				    Curves2d, i);
   }

tests/bugs/iges/bug33326

@@ -1,17 +0,0 @@
-puts "==================================================="
-puts "0033326: Data Exchange, IGES Import - Ignoring unit value for validating geometry"
-puts "==================================================="
-puts ""
-
-pload DCAF
-
-Close D -silent
-
-ReadIges D [locate_data_file "bug33326.igs"]
-vclear
-vinit View1
-XDisplay -dispMode 1 D
-vfit
-vdump "$imagedir/${casename}_src.png"
-
-Close D

tests/bugs/modalg_2/bug5805_3

@@ -1,4 +1,4 @@
-puts "TODO OCC26556 ALL: ERROR. Mixed connectivity of faces."
+puts "TODO OCC26556 ALL: ERROR. offsetperform operation not done."
 
 puts "============"
 puts "OCC5805"
@@ -20,7 +20,6 @@ if { [catch { offsetshape result a -1 a_6 } catch_result] } {
    puts "Faulty ${BugNumber} : offsetshape is wrong"
 }
 
-if { [isdraw result] } {
 checkmaxtol result -min_tol 1.
 
 checkprops result -s 1185.03 
@@ -28,4 +27,3 @@ checkshape result
 
 checknbshapes result -vertex 10 -edge 15 -wire 7 -face 7 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 41
 checkview -display result -2d -path ${imagedir}/${test_image}.png
-}

tests/bugs/modalg_2/bug5805_4

@@ -1,4 +1,6 @@
-puts "TODO OCC25925 ALL: ERROR. Mixed connectivity of faces."
+puts "TODO OCC25925 ALL: ERROR. offsetperform operation not done."
+puts "TODO OCC25925 ALL: Tcl Exception:"
+puts "TODO OCC25925 ALL: TEST INCOMPLETE"
 
 puts "============"
 puts "OCC5805"
@@ -23,7 +25,6 @@ if { [catch { offsetperform result } catch_result] } {
    puts "Faulty ${BugNumber} : offsetshape is wrong"
 }
 
-if { [isdraw result] } {
 checkmaxtol result -min_tol 1.
 
 checkprops result -s 1185.03 
@@ -31,4 +32,3 @@ checkshape result
 
 checknbshapes result -vertex 10 -edge 15 -wire 7 -face 7 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 41
 checkview -display result -2d -path ${imagedir}/${test_image}.png
-}

tests/bugs/modalg_2/bug5805_5

@@ -1,5 +1,3 @@
-puts "TODO OCC25925 ALL: ERROR. Mixed connectivity of faces."
-
 puts "============"
 puts "OCC5805"
 puts "============"
@@ -23,7 +21,6 @@ if { [catch { offsetperform result } catch_result] } {
    puts "Faulty ${BugNumber} : offsetshape is wrong"
 }
 
-if { [isdraw result] } {
 checkmaxtol result -min_tol 1.
 
 checkprops result -s 876.584 
@@ -31,5 +28,3 @@ checkshape result
 
 checknbshapes result -vertex 10 -edge 15 -wire 7 -face 7 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 41
 checkview -display result -2d -path ${imagedir}/${test_image}.png
-}
- 

tests/bugs/modalg_3/bug5805_6

@@ -1,5 +1,3 @@
-puts "TODO OCC25925 ALL: ERROR. Mixed connectivity of faces."
-
 puts "============"
 puts "OCC5805"
 puts "============"
@@ -18,12 +16,9 @@ if { [catch { offsetshape result a -1 } catch_result] } {
    puts "Faulty ${BugNumber} : offsetshape is wrong"
 }
 
-if { [isdraw result] } {
 checkmaxtol result -min_tol 1.
 
 checkprops result -s 876.584
 checkshape result
 checknbshapes result -vertex 10 -edge 15 -wire 7 -face 7 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 41
 checkview -display result -2d -path ${imagedir}/${test_image}.png
-}
- 

tests/bugs/modalg_8/bug33113

@@ -1,18 +0,0 @@
-puts "================================"
-puts "OCC33113: Modeling Algorithms - BRepFilletAPI_MakeFillet::Build SIGSEGV"
-puts "================================"
-
-restore [locate_data_file bug33113.brep] sh
-
-explode sh e
-copy sh_4 e
-
-explode sh So
-copy sh_1 s
-
-fillet res s 0.1 e
-
-checkshape res
-
-checkview -display res -3d -path ${imagedir}/${test_image}.png
-

tests/lowalgos/bnd/bug30292

@@ -1,68 +0,0 @@
-puts "========"
-puts "0030292: Modeling Algorithms - BRepBndLib should avoid using Poly_Polygon3D when called with useTriangulation set to false"
-puts "========"
-puts ""
-
-## geometric edge without any discrete representations
-
-circle c 0 0 0 1
-mkedge e c
-set res1 [bounding e]
-set res2 [bounding e -noTriangulation]
-if {$res1 != $res2} {
- puts "Error: bounding boxes are different for geometric edge"
-}
-
-## geometric edge with polygon 3d
-
-incmesh e 0.1
-set res1_ref "-1.1000000999999999 -1.0927089740980542 -0.10000010000000001 1.1000000999999999 1.092708974098054 0.10000010000000001"
-set res2_ref "-1.0000001000000001 -1.0000001000000001 -9.9999999999999995e-08 1.0000001000000001 1.0000001000000001 9.9999999999999995e-08"
-unset res1
-set res1 [bounding e]
-foreach dd $res1 {
-  if ![regexp $dd $res1_ref] {
-    puts "Error: bounding box is wrong"
-  }
-}
-unset res2
-set res2 [bounding e -noTriangulation]
-foreach dd $res2 {
-  if ![regexp $dd $res2_ref] {
-   puts "Error: bounding box is wrong"  
-  }
-}
-
-## geometric edge with polygon on triangulation
-
-pcylinder cyl 1 1
-incmesh cyl 0.1
-explode cyl e
-renamevar cyl_3 e
-unset res1
-set res1 [bounding e]
-foreach dd $res1 {
-  if ![regexp $dd $res1_ref] {
-    puts "Error: bounding box is wrong"
-  }
-}
-unset res2
-set res2 [bounding e -noTriangulation]
-foreach dd $res2 {
-  if ![regexp $dd $res2_ref] {
-   puts "Error: bounding box is wrong"  
-  }
-}
-
-## not geometric edge with polygon 3d
-
-polygon3d pol3d 5 1 0 0 0 1 0 -1 0 0 0 -1 0 1 0 0
-mkedge e pol3d
-unset res1
-set res1 [bounding e]
-unset res2
-set res2 [bounding e -noTriangulation]
-if {$res1 != $res2} {
- puts "Error: bounding boxes are different for not geometric edge"
-}
-

tests/offset/bugs/bug26288

@@ -1,5 +1,4 @@
 puts "TODO OCC26030 ALL: Error : The offset cannot be built"
-puts "TODO OCC26030 ALL: ERROR. Mixed connectivity of faces."
 
 puts "========"
 puts "OCC26288"

tests/offset/bugs/bug27913

@@ -1,5 +1,6 @@
-puts "TODO OCC26577 All: ERROR. Mixed connectivity of faces."
-puts "TODO OCC26577 All: Error : The offset cannot be built."
+puts "TODO OCC26577 All: Error :  is WRONG because number of EDGE entities in shape"
+puts "TODO OCC26577 All: Error :  is WRONG because number of SHELL entities in shape"
+
 
 puts "=============================================================="
 puts "0027913: Sharing between edges was lost after offset operation"
@@ -11,11 +12,9 @@ offsetparameter 1e-7 p i
 offsetload s 10
 offsetperform result
 
-if { [isdraw result] } {
- unifysamedom result_unif result
+unifysamedom result_unif result
 
- checkshape result
- checkview -display result_unif -2d -path ${imagedir}/${test_image}.png
+checkshape result
+checkview -display result_unif -2d -path ${imagedir}/${test_image}.png
 
- checknbshapes result -ref [lrange [nbshapes s] 8 19]
-}
+checknbshapes result -ref [lrange [nbshapes s] 8 19]

tests/offset/bugs/bug30055

@@ -1,13 +0,0 @@
-puts "REQUIRED All: ERROR. Mixed connectivity of faces."
-puts "REQUIRED All: Error : The offset cannot be built."
-puts "============"
-puts "0030055: BRepOffset_MakeOffset throws TopoDS_Vertex hasn't gp_Pnt in intersection mode"
-puts "============"
-
-restore [locate_data_file bug30055.brep] a
-
-thickshell result a 1 i
-
-if { [isdraw result] } {
-   puts "ERROR - result must not be buit"
-}

tests/offset/bugs/bug5806

@@ -1,6 +1,4 @@
-puts "TODO OCC25925 ALL: ERROR. Mixed connectivity of faces."
-puts "TODO OCC25925 ALL: Error : The offset cannot be built."
-
+puts "TODO OCC25925 ALL: ERROR. offsetperform operation not done."
 puts "============"
 puts "OCC5806"
 puts "============"
@@ -30,12 +28,11 @@ explode resthru f
 if { [catch { offsetshape result resthru -0.5 resthru_6 resthru_7 } catch_result] } {
    puts "Faulty ${BugNumber} : offsetshape is wrong"
 }
-if { [isdraw result] } {
-  checkmaxtol result -min_tol 1.
 
-  checkprops result -s 1116.06 
-  checkshape result
+checkmaxtol result -min_tol 1.
 
-  checknbshapes result -vertex 10 -edge 15 -wire 7 -face 7 -shell 1 -solid 1 -compsolid 0 -  compound 0 -shape 41
-  checkview -display result -2d -path ${imagedir}/${test_image}.png
-}
+checkprops result -s 1116.06 
+checkshape result
+
+checknbshapes result -vertex 10 -edge 15 -wire 7 -face 7 -shell 1 -solid 1 -compsolid 0 -compound 0 -shape 41
+checkview -display result -2d -path ${imagedir}/${test_image}.png

tests/offset/shape/A2

@@ -1,7 +1,7 @@
 puts "TODO OCC23190 ALL: ERROR. C0 continuity of input data."
 puts "TODO OCC23190 ALL: Error: The command cannot be built"
-puts "TODO OCC23068 ALL: Error : The offset cannot be built."
-
+puts "TODO OCC23190 ALL: result is not a topological shape!!!"
+puts "TODO OCC23068 ALL: TEST INCOMPLETE"
 # Original bug : hkg60144/pro15325
 # Date : 17Juillet98
 

tests/offset/shape/A3

@@ -1,7 +1,7 @@
 puts "TODO OCC23190 ALL: ERROR. C0 continuity of input data."
 puts "TODO OCC23190 ALL: Error: The command cannot be built"
-puts "TODO OCC23068 ALL: Error : The offset cannot be built."
-
+puts "TODO OCC23190 ALL: result is not a topological shape!!!"
+puts "TODO OCC23068 ALL: TEST INCOMPLETE"
 # Original bug : cts21271
 # Date : 11Sept98
 

tests/perf/modalg/bug26443_1

@@ -1,5 +1,3 @@
-puts "TODO OCC25925 ALL: ERROR. Mixed connectivity of faces."
-
 puts "========"
 puts "OCC26443"
 puts "========"
@@ -17,8 +15,6 @@ offsetshape r a -2
 dchrono h stop counter offsetshape
 fit
 
-if { [isdraw r] } {
 checkshape r
 checknbshapes r -ref [lrange [nbshapes a] 8 19]
 checkview -screenshot -2d -path ${imagedir}/${test_image}.png
-}