// 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/IGESControl/IGESControl_IGESBoundary.cxx

@@ -150,6 +150,7 @@ static Standard_Boolean Connect (const Handle(ShapeAnalysis_Wire)& theSAW,
                                                      const Standard_Integer number,
                                                      Handle(ShapeExtend_WireData)& Gsewd) 
 {
+  (void)number;
   Gsewd                                = new ShapeExtend_WireData;//local translation (for mysewd)
   Handle(ShapeExtend_WireData) Gsewd3d = new ShapeExtend_WireData;//local translation (for mysewd3d)
   Handle(ShapeExtend_WireData) Gsewd2d = new ShapeExtend_WireData;//local translation (for mysewd2d)
@@ -384,17 +385,31 @@ static Standard_Boolean Connect (const Handle(ShapeAnalysis_Wire)& theSAW,
     }
   }
   
-  if (number > 1) {
-    okCurve   = okCurve && Connect (saw, mysewd, Gsewd, (len3d > 1) || (len2d > 1), maxtol,
-      distmin, revsewd, revnextsewd);
+  if (!mysewd.IsNull())
+  {
+    okCurve = okCurve && Connect(saw, mysewd, Gsewd, (len3d > 1) || (len2d > 1), maxtol,
+                                 distmin, revsewd, revnextsewd);
+  }
+  else
+  {
+    mysewd = Gsewd;
+  }
+  if (!mysewd3d.IsNull())
+  {
     okCurve3d = okCurve3d && Connect (saw3d, mysewd3d, Gsewd3d, len3d > 1, maxtol,
       distmin, revsewd, revnextsewd);
+  }
+  else
+  {
+    mysewd3d = Gsewd3d;
+  }
+  if (!mysewd2d.IsNull())
+  {
     okCurve2d = okCurve2d && Connect (saw2d, mysewd2d, Gsewd2d, len2d > 1, maxtol,
       distmin, revsewd, revnextsewd);
   }
-  else {
-    mysewd   = Gsewd;
-    mysewd3d = Gsewd3d;
+  else
+  {
     mysewd2d = Gsewd2d;
   }
   return okCurve;

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);      
 	}
@@ -1249,7 +1249,7 @@ Handle(Geom_Curve)  IGESToBRep_BasicCurve::TransferLine
 
   // modif du 15/10/97  : test moins severe
   // beaucoup de points confondus a GetEpsGeom()*GetUnitFactor()
-  if (!Ps.IsEqual(Pe,Precision::Confusion())) { //:l3 abv 11 Jan 99: GetEpsGeom()*GetUnitFactor()/10.)) {
+  if (!Ps.IsEqual(Pe,Precision::Confusion() / GetUnitFactor())) { //:l3 abv 11 Jan 99: GetEpsGeom()*GetUnitFactor()/10.)) {
     gp_Lin line(Ps, gp_Dir(gp_Vec(Ps,Pe)));
     Standard_Real t1 = ElCLib::Parameter(line, Ps);
     Standard_Real t2 = ElCLib::Parameter(line, Pe);
@@ -1299,7 +1299,7 @@ Handle(Geom2d_Curve)  IGESToBRep_BasicCurve::Transfer2dLine
 		 start->EndPoint().Y());
   }
 
-  if (!beg.IsEqual(end,Precision::PConfusion())) { //:l3 abv 11 Jan 99: GetEpsCoeff())) {
+  if (!beg.IsEqual(end,Precision::PConfusion() / GetUnitFactor())) { //:l3 abv 11 Jan 99: GetEpsCoeff())) {
     gp_Lin2d line2d(beg, gp_Dir2d(gp_Vec2d(beg,end)));
     Standard_Real t1 = ElCLib::Parameter(line2d, beg);
     Standard_Real t2 = ElCLib::Parameter(line2d, end);

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);
   }

src/RWStepAP214/RWStepAP214_GeneralModule.cxx

@@ -445,7 +445,6 @@
 #include <RWStepVisual_RWFillAreaStyle.hxx>
 #include <RWStepVisual_RWFillAreaStyleColour.hxx>
 #include <RWStepVisual_RWInvisibility.hxx>
-#include <RWStepVisual_RWLeaderDirectedCallout.hxx>
 #include <RWStepVisual_RWMechanicalDesignGeometricPresentationArea.hxx>
 #include <RWStepVisual_RWMechanicalDesignGeometricPresentationRepresentation.hxx>
 #include <RWStepVisual_RWOverRidingStyledItem.hxx>
@@ -911,10 +910,6 @@
 #include <StepShape_Vertex.hxx>
 #include <StepShape_VertexLoop.hxx>
 #include <StepShape_VertexPoint.hxx>
-#include <StepVisual_AnnotationCurveOccurrence.hxx>
-#include <StepVisual_AnnotationCurveOccurrenceAndGeomReprItem.hxx>
-#include <StepVisual_AnnotationLeaderCurveOccurrenceAndGeomReprItem.hxx>
-#include <StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem.hxx>
 #include <StepVisual_AnnotationText.hxx>
 #include <StepVisual_AnnotationTextOccurrence.hxx>
 #include <StepVisual_AreaInSet.hxx>
@@ -939,7 +934,6 @@
 #include <StepVisual_FillAreaStyle.hxx>
 #include <StepVisual_FillAreaStyleColour.hxx>
 #include <StepVisual_Invisibility.hxx>
-#include <StepVisual_LeaderDirectedCallout.hxx>
 #include <StepVisual_MechanicalDesignGeometricPresentationArea.hxx>
 #include <StepVisual_MechanicalDesignGeometricPresentationRepresentation.hxx>
 #include <StepVisual_OverRidingStyledItem.hxx>
@@ -1154,9 +1148,6 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_GeneralModule,StepData_GeneralModule)
 #include <RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx>
 #include <RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol.hxx>
 #include <RWStepVisual_RWAnnotationCurveOccurrence.hxx>
-#include <RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem.hxx>
-#include <RWStepVisual_RWAnnotationLeaderCurveOccurrenceAndGeomReprItem.hxx>
-#include <RWStepVisual_RWAnnotationLeaderTerminatorOccurrenceAndGeomReprItem.hxx>
 #include <RWStepVisual_RWAnnotationOccurrence.hxx>
 #include <RWStepVisual_RWAnnotationPlane.hxx>
 #include <RWStepVisual_RWDraughtingCallout.hxx>
@@ -1225,6 +1216,8 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_GeneralModule,StepData_GeneralModule)
 #include <RWStepVisual_RWCameraModelD3MultiClipping.hxx>
 #include <RWStepVisual_RWCameraModelD3MultiClippingIntersection.hxx>
 #include <RWStepVisual_RWCameraModelD3MultiClippingUnion.hxx>
+#include <StepVisual_AnnotationCurveOccurrenceAndGeomReprItem.hxx>
+#include <RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem.hxx>
 
 // Added for kinematics implementation
 #include <RWStepKinematics_RWActuatedKinPairAndOrderKinPair.hxx>
@@ -5874,27 +5867,6 @@ void RWStepAP214_GeneralModule::FillSharedCase(const Standard_Integer CN,
     aTool.Share(anEnt, iter);
   }
   break;
-  case 820:
-  {
-    DeclareAndCast(StepVisual_AnnotationLeaderCurveOccurrenceAndGeomReprItem, anEnt, ent);
-    RWStepVisual_RWAnnotationLeaderCurveOccurrenceAndGeomReprItem aTool;
-    aTool.Share(anEnt, iter);
-  }
-  break;
-  case 821:
-  {
-    DeclareAndCast(StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem, anEnt, ent);
-    RWStepVisual_RWAnnotationLeaderTerminatorOccurrenceAndGeomReprItem aTool;
-    aTool.Share(anEnt, iter);
-  }
-  break;
-  case 824:
-  {
-    DeclareAndCast(StepVisual_LeaderDirectedCallout, anEnt, ent);
-    RWStepVisual_RWLeaderDirectedCallout aTool;
-    aTool.Share(anEnt, iter);
-  }
-  break;
   default : break;
   }
 }
@@ -8201,15 +8173,7 @@ Standard_Boolean RWStepAP214_GeneralModule::NewVoid
    case 818:
      ent = new StepVisual_CubicBezierTriangulatedFace;
      break;
-   case 820:
-     ent = new StepVisual_AnnotationLeaderCurveOccurrenceAndGeomReprItem;
-     break;
-   case 821:
-     ent = new StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem;
-     break;
-   case 824:
-     ent = new StepVisual_LeaderDirectedCallout;
-     break;
+
   default: 
     return Standard_False;
   }
@@ -8906,9 +8870,6 @@ Standard_Integer  RWStepAP214_GeneralModule::CategoryNumber
   case 816: return cataux;
   case 817: return cataux;
   case 818: return cataux;
-  case 820: return catdr;
-  case 821: return catdr;
-  case 824: return cataux;
   default : break;
   }
   return 0;

src/RWStepAP214/RWStepAP214_ReadWriteModule.cxx

@@ -194,7 +194,6 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule)
 #include <StepGeom_Hyperbola.hxx>
 #include <StepGeom_IntersectionCurve.hxx>
 #include <StepVisual_Invisibility.hxx>
-#include <StepVisual_LeaderDirectedCallout.hxx>
 #include <StepBasic_LengthMeasureWithUnit.hxx>
 #include <StepBasic_LengthUnit.hxx>
 #include <StepGeom_Line.hxx>
@@ -627,7 +626,6 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule)
 #include <RWStepGeom_RWHyperbola.hxx>
 #include <RWStepGeom_RWIntersectionCurve.hxx>
 #include <RWStepVisual_RWInvisibility.hxx>
-#include <RWStepVisual_RWLeaderDirectedCallout.hxx>
 #include <RWStepBasic_RWLengthMeasureWithUnit.hxx>
 #include <RWStepBasic_RWLengthUnit.hxx>
 #include <RWStepGeom_RWLine.hxx>
@@ -1362,9 +1360,6 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule)
 #include <RWStepDimTol_RWGeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx>
 #include <RWStepDimTol_RWGeoTolAndGeoTolWthMaxTol.hxx>
 #include <RWStepVisual_RWAnnotationCurveOccurrence.hxx>
-#include <RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem.hxx>
-#include <RWStepVisual_RWAnnotationLeaderCurveOccurrenceAndGeomReprItem.hxx>
-#include <RWStepVisual_RWAnnotationLeaderTerminatorOccurrenceAndGeomReprItem.hxx>
 #include <RWStepVisual_RWAnnotationOccurrence.hxx>
 #include <RWStepVisual_RWAnnotationPlane.hxx>
 #include <RWStepVisual_RWDraughtingCallout.hxx>
@@ -1415,9 +1410,6 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule)
 #include <StepDimTol_GeoTolAndGeoTolWthDatRefAndGeoTolWthMaxTol.hxx>
 #include <StepDimTol_GeoTolAndGeoTolWthMaxTol.hxx>
 #include <StepVisual_AnnotationCurveOccurrence.hxx>
-#include <StepVisual_AnnotationCurveOccurrenceAndGeomReprItem.hxx>
-#include <StepVisual_AnnotationLeaderCurveOccurrenceAndGeomReprItem.hxx>
-#include <StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem.hxx>
 #include <StepVisual_AnnotationPlane.hxx>
 #include <StepVisual_DraughtingCallout.hxx>
 
@@ -1450,6 +1442,8 @@ IMPLEMENT_STANDARD_RTTIEXT(RWStepAP214_ReadWriteModule,StepData_ReadWriteModule)
 #include <RWStepVisual_RWCameraModelD3MultiClipping.hxx>
 #include <RWStepVisual_RWCameraModelD3MultiClippingIntersection.hxx>
 #include <RWStepVisual_RWCameraModelD3MultiClippingUnion.hxx>
+#include <StepVisual_AnnotationCurveOccurrenceAndGeomReprItem.hxx>
+#include <RWStepVisual_RWAnnotationCurveOccurrenceAndGeomReprItem.hxx>
 
 #include <RWStepVisual_RWSurfaceStyleTransparent.hxx>
 #include <RWStepVisual_RWSurfaceStyleReflectanceAmbient.hxx>
@@ -1772,11 +1766,8 @@ static TCollection_AsciiString Reco_HalfSpaceSolid ("HALF_SPACE_SOLID");
 static TCollection_AsciiString Reco_Hyperbola ("HYPERBOLA");
 static TCollection_AsciiString Reco_IntersectionCurve ("INTERSECTION_CURVE");
 static TCollection_AsciiString Reco_Invisibility ("INVISIBILITY");
-static TCollection_AsciiString Reco_LeaderCurve ("LEADER_CURVE");
-static TCollection_AsciiString Reco_LeaderTerminator ("LEADER_TERMINATOR");
 static TCollection_AsciiString Reco_LengthMeasureWithUnit ("LENGTH_MEASURE_WITH_UNIT");
 static TCollection_AsciiString Reco_LengthUnit ("LENGTH_UNIT");
-static TCollection_AsciiString Reco_LeaderDirectedCallout ("LEADER_DIRECTED_CALLOUT");
 static TCollection_AsciiString Reco_Line ("LINE");
 static TCollection_AsciiString Reco_LocalTime ("LOCAL_TIME");
 static TCollection_AsciiString Reco_Loop ("LOOP");
@@ -2359,8 +2350,6 @@ static TCollection_AsciiString Reco_ComplexTriangulatedSurfaceSet("COMPLEX_TRIAN
 static TCollection_AsciiString Reco_CubicBezierTessellatedEdge("CUBIC_BEZIER_TESSELLATED_EDGE");
 static TCollection_AsciiString Reco_CubicBezierTriangulatedFace("CUBIC_BEZIER_TRIANGULATED_FACE");
 
-
-
 // -- Definition of the libraries --
 
 static NCollection_DataMap<TCollection_AsciiString, Standard_Integer> typenums;
@@ -3116,9 +3105,6 @@ RWStepAP214_ReadWriteModule::RWStepAP214_ReadWriteModule ()
   typenums.Bind(Reco_ComplexTriangulatedSurfaceSet, 816);
   typenums.Bind(Reco_CubicBezierTessellatedEdge, 817);
   typenums.Bind(Reco_CubicBezierTriangulatedFace, 818);
-  typenums.Bind(Reco_LeaderCurve, 822);
-  typenums.Bind(Reco_LeaderTerminator, 823);
-  typenums.Bind(Reco_LeaderDirectedCallout, 824);
 
   
 //    SHORT NAMES
@@ -3758,17 +3744,6 @@ Standard_Integer RWStepAP214_ReadWriteModule::CaseStep
         (types(8).IsEqual(StepType(247)))) {
         return 800;
       }
-      else if ((types(1).IsEqual(StepType(7))) &&
-               (types(2).IsEqual(StepType(10))) &&
-               (types(3).IsEqual(StepType(106))) &&
-               (types(4).IsEqual(StepType(144))) &&
-               (types(5).IsEqual(StepType(823))) &&
-               (types(6).IsEqual(StepType(247))) &&
-               (types(7).IsEqual(StepType(270))) &&
-               (types(8).IsEqual(StepType(294))))
-      {
-        return 821;
-      }
     }
     else if (NbComp == 7) {
       if ((types(1).IsEqual(StepType(48))) &&
@@ -3861,16 +3836,6 @@ Standard_Integer RWStepAP214_ReadWriteModule::CaseStep
                (types(7).IsEqual(StepType(271)))) {
         return 323;
       }
-      else if ((types(1).IsEqual(StepType(4))) &&
-               (types(2).IsEqual(StepType(7))) &&
-               (types(3).IsEqual(StepType(106))) &&
-               (types(4).IsEqual(StepType(144))) &&
-               (types(5).IsEqual(StepType(822))) &&
-               (types(6).IsEqual(StepType(247))) &&
-               (types(7).IsEqual(StepType(270))))
-      {
-        return 820;
-      }
     }
     // Added by FMA
     else if (NbComp == 6) {
@@ -4369,10 +4334,6 @@ Standard_Boolean RWStepAP214_ReadWriteModule::IsComplex
       return Standard_True;
     case 719:
       return Standard_True;
-    case 820:
-      return Standard_True;
-    case 821:
-      return Standard_True;
     default:
       return Standard_False;
     }
@@ -5131,9 +5092,6 @@ const TCollection_AsciiString& RWStepAP214_ReadWriteModule::StepType
   case 816: return Reco_ComplexTriangulatedSurfaceSet;
   case 817: return Reco_CubicBezierTessellatedEdge;
   case 818: return Reco_CubicBezierTriangulatedFace;
-  case 822: return Reco_LeaderCurve;
-  case 823: return Reco_LeaderTerminator;
-  case 824: return Reco_LeaderDirectedCallout;
   default : return PasReco;
   }
 }
@@ -5471,24 +5429,7 @@ Standard_Boolean RWStepAP214_ReadWriteModule::ComplexType(const Standard_Integer
       types.Append(StepType(709));
       types.Append(StepType(708));
       break;
-    case 820:
-      types.Append(StepType(4));
-      types.Append(StepType(7));
-      types.Append(StepType(106));
-      types.Append(StepType(144));
-      types.Append(StepType(822));
-      types.Append(StepType(247));
-      types.Append(StepType(270));
-      break;
-    case 821:
-      types.Append(StepType(4));
-      types.Append(StepType(10));
-      types.Append(StepType(106));
-      types.Append(StepType(144));
-      types.Append(StepType(823));
-      types.Append(StepType(247));
-      types.Append(StepType(270));
-      break;
+    default: return Standard_False;
     }
   return Standard_True;
 }
@@ -10753,28 +10694,7 @@ void RWStepAP214_ReadWriteModule::ReadStep(const Standard_Integer CN,
     aTool.ReadStep(data, num, ach, anEnt);
   }
   break;
-  case 820:
-  {
-    DeclareAndCast(StepVisual_AnnotationLeaderCurveOccurrenceAndGeomReprItem, anEnt, ent);
-    RWStepVisual_RWAnnotationLeaderCurveOccurrenceAndGeomReprItem aTool;
-    aTool.ReadStep(data, num, ach, anEnt);
-  }
-  break;
-  case 821:
-  {
-    DeclareAndCast(StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem, anEnt, ent);
-    RWStepVisual_RWAnnotationLeaderTerminatorOccurrenceAndGeomReprItem aTool;
-    aTool.ReadStep(data, num, ach, anEnt);
-  }
-  break;
-  case 824:
-  {
-    DeclareAndCast(StepVisual_LeaderDirectedCallout, anEnt, ent);
-    RWStepVisual_RWLeaderDirectedCallout aTool;
-    aTool.ReadStep(data, num, ach, anEnt);
-  }
-  break;
-  default:
+  default: 
     ach->AddFail("Type Mismatch when reading - Entity");
   }
   return;
@@ -16318,27 +16238,6 @@ void RWStepAP214_ReadWriteModule::WriteStep(const Standard_Integer CN,
     aTool.WriteStep(SW, anEnt);
   }
   break;
-  case 820:
-  {
-    DeclareAndCast(StepVisual_AnnotationLeaderCurveOccurrenceAndGeomReprItem, anEnt, ent);
-    RWStepVisual_RWAnnotationLeaderCurveOccurrenceAndGeomReprItem aTool;
-    aTool.WriteStep(SW, anEnt);
-  }
-  break;
-  case 821:
-  {
-    DeclareAndCast(StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem, anEnt, ent);
-    RWStepVisual_RWAnnotationLeaderTerminatorOccurrenceAndGeomReprItem aTool;
-    aTool.WriteStep(SW, anEnt);
-  }
-  break;
-  case 824:
-  {
-    DeclareAndCast(StepVisual_LeaderDirectedCallout, anEnt, ent);
-    RWStepVisual_RWLeaderDirectedCallout aTool;
-    aTool.WriteStep(SW, anEnt);
-  }
-  break;
   default:
     return;
   }

src/RWStepVisual/FILES

@@ -6,10 +6,6 @@ RWStepVisual_RWAnnotationFillArea.cxx
 RWStepVisual_RWAnnotationFillArea.hxx
 RWStepVisual_RWAnnotationFillAreaOccurrence.cxx
 RWStepVisual_RWAnnotationFillAreaOccurrence.hxx
-RWStepVisual_RWAnnotationLeaderCurveOccurrenceAndGeomReprItem.cxx
-RWStepVisual_RWAnnotationLeaderCurveOccurrenceAndGeomReprItem.hxx
-RWStepVisual_RWAnnotationLeaderTerminatorOccurrenceAndGeomReprItem.cxx
-RWStepVisual_RWAnnotationLeaderTerminatorOccurrenceAndGeomReprItem.hxx
 RWStepVisual_RWAnnotationOccurrence.cxx
 RWStepVisual_RWAnnotationOccurrence.hxx
 RWStepVisual_RWAnnotationPlane.cxx
@@ -72,8 +68,6 @@ RWStepVisual_RWFillAreaStyleColour.cxx
 RWStepVisual_RWFillAreaStyleColour.hxx
 RWStepVisual_RWInvisibility.cxx
 RWStepVisual_RWInvisibility.hxx
-RWStepVisual_RWLeaderDirectedCallout.cxx
-RWStepVisual_RWLeaderDirectedCallout.hxx
 RWStepVisual_RWMechanicalDesignGeometricPresentationArea.cxx
 RWStepVisual_RWMechanicalDesignGeometricPresentationArea.hxx
 RWStepVisual_RWMechanicalDesignGeometricPresentationRepresentation.cxx

src/RWStepVisual/RWStepVisual_RWAnnotationLeaderCurveOccurrenceAndGeomReprItem.cxx

@@ -1,110 +0,0 @@
-// Copyright (c) 2023 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#include <RWStepVisual_RWAnnotationLeaderCurveOccurrenceAndGeomReprItem.hxx>
-
-#include <Interface_Check.hxx>
-#include <Interface_EntityIterator.hxx>
-#include <StepData_StepReaderData.hxx>
-#include <StepData_StepWriter.hxx>
-#include <StepVisual_AnnotationLeaderCurveOccurrenceAndGeomReprItem.hxx>
-
-//=======================================================================
-//function : ReadStep
-//purpose  :
-//=======================================================================
-void RWStepVisual_RWAnnotationLeaderCurveOccurrenceAndGeomReprItem::ReadStep(
-  const Handle(StepData_StepReaderData)& theData,
-  const Standard_Integer theNum,
-  Handle(Interface_Check)& theCheck,
-  const Handle(StepVisual_AnnotationLeaderCurveOccurrenceAndGeomReprItem)& theEntity) const
-{
-  Standard_Integer aNum = 0;
-  theData->NamedForComplex("REPRESENTATION_ITEM", "RPRITM", theNum, aNum, theCheck);
-  // Inherited field : name 
-  Handle(TCollection_HAsciiString) aName;
-  theData->ReadString(aNum, 1, "name", theCheck, aName);
-
-  theData->NamedForComplex("STYLED_ITEM", "STYITM", theNum, aNum, theCheck);
-  // Inherited field : styles
-  Handle(StepVisual_HArray1OfPresentationStyleAssignment) aStyles;
-  Handle(StepVisual_PresentationStyleAssignment) anEnt;
-  Standard_Integer aSubNum = 0;
-  if (theData->ReadSubList(aNum, 1, "styles", theCheck, aSubNum))
-  {
-    Standard_Integer aNbParams = theData->NbParams(aSubNum);
-    aStyles = new StepVisual_HArray1OfPresentationStyleAssignment(1, aNbParams);
-    for (Standard_Integer aParamInd = 1; aParamInd <= aNbParams; aParamInd++)
-    {
-      if (theData->ReadEntity(aSubNum, aParamInd, "presentation_style_assignment", theCheck,
-          STANDARD_TYPE(StepVisual_PresentationStyleAssignment), anEnt))
-      {
-        aStyles->SetValue(aParamInd, anEnt);
-      }
-    }
-  }
-
-  // Inherited field : item
-  Handle(Standard_Transient) aItem;
-  theData->ReadEntity(aNum, 2, "item", theCheck, STANDARD_TYPE(Standard_Transient), aItem);
-
-  // Initialization of the read entity
-  theEntity->Init(aName, aStyles, aItem);
-}
-
-//=======================================================================
-//function : WriteStep
-//purpose  :
-//=======================================================================
-void RWStepVisual_RWAnnotationLeaderCurveOccurrenceAndGeomReprItem::WriteStep(
-  StepData_StepWriter& theSW,
-  const Handle(StepVisual_AnnotationLeaderCurveOccurrenceAndGeomReprItem)& theEntity) const
-{
-  theSW.StartEntity("ANNOTATION_CURVE_OCCURRENCE");
-  theSW.StartEntity("ANNOTATION_OCCURRENCE");
-  theSW.StartEntity("DRAUGHTING_ANNOTATION_OCCURRENCE");
-  theSW.StartEntity("GEOMETRIC_REPRESENTATION_ITEM");
-  theSW.StartEntity("LEADER_CURVE");
-  theSW.StartEntity("REPRESENTATION_ITEM");
-  //Inherited field : name
-  theSW.Send(theEntity->Name());
-
-  theSW.StartEntity("STYLED_ITEM");
-  // Inherited field : styles
-  theSW.OpenSub();
-  for (StepVisual_HArray1OfPresentationStyleAssignment::Iterator anIter(theEntity->Styles()->Array1());
-       anIter.More(); anIter.Next())
-  {
-    theSW.Send(anIter.Value());
-  }
-  theSW.CloseSub();
-
-  // Inherited field : item
-  theSW.Send(theEntity->Item());
-}
-
-//=======================================================================
-//function : Share
-//purpose  :
-//=======================================================================
-void RWStepVisual_RWAnnotationLeaderCurveOccurrenceAndGeomReprItem::Share(
-  const Handle(StepVisual_AnnotationLeaderCurveOccurrenceAndGeomReprItem)& theEntity,
-  Interface_EntityIterator& theIter) const
-{
-  for (StepVisual_HArray1OfPresentationStyleAssignment::Iterator anIter(theEntity->Styles()->Array1());
-       anIter.More(); anIter.Next())
-  {
-    theIter.GetOneItem(anIter.Value());
-  }
-  theIter.GetOneItem(theEntity->Item());
-}

src/RWStepVisual/RWStepVisual_RWAnnotationLeaderCurveOccurrenceAndGeomReprItem.hxx

@@ -1,46 +0,0 @@
-// Copyright (c) 2023 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef _RWStepVisual_RWAnnotationLeaderCurveOccurrenceAndGeomReprItem_HeaderFile
-#define _RWStepVisual_RWAnnotationLeaderCurveOccurrenceAndGeomReprItem_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
-
-class StepData_StepReaderData;
-class Interface_Check;
-class StepVisual_AnnotationLeaderCurveOccurrenceAndGeomReprItem;
-class StepData_StepWriter;
-class Interface_EntityIterator;
-
-//! Read & Write Module for StepVisual_AnnotationLeaderCurveOccurrenceAndGeomReprItem
-class RWStepVisual_RWAnnotationLeaderCurveOccurrenceAndGeomReprItem
-{
-  DEFINE_STANDARD_ALLOC
-public:
-
-  RWStepVisual_RWAnnotationLeaderCurveOccurrenceAndGeomReprItem() {};
-
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData,
-                                const Standard_Integer theNum,
-                                Handle(Interface_Check)& theCheck,
-                                const Handle(StepVisual_AnnotationLeaderCurveOccurrenceAndGeomReprItem)& theEntity) const;
-
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW,
-                                 const Handle(StepVisual_AnnotationLeaderCurveOccurrenceAndGeomReprItem)& theEntity) const;
-
-  Standard_EXPORT void Share(const Handle(StepVisual_AnnotationLeaderCurveOccurrenceAndGeomReprItem)& theEntity,
-                             Interface_EntityIterator& theIter) const;
-};
-#endif // _RWStepVisual_RWAnnotationLeaderCurveOccurrenceAndGeomReprItem_HeaderFile

src/RWStepVisual/RWStepVisual_RWAnnotationLeaderTerminatorOccurrenceAndGeomReprItem.cxx

@@ -1,119 +0,0 @@
-// Copyright (c) 2023 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#include <RWStepVisual_RWAnnotationLeaderTerminatorOccurrenceAndGeomReprItem.hxx>
-
-#include <Interface_Check.hxx>
-#include <Interface_EntityIterator.hxx>
-#include <StepData_StepReaderData.hxx>
-#include <StepData_StepWriter.hxx>
-#include <StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem.hxx>
-
-//=======================================================================
-//function : ReadStep
-//purpose  :
-//=======================================================================
-void RWStepVisual_RWAnnotationLeaderTerminatorOccurrenceAndGeomReprItem::ReadStep(
-  const Handle(StepData_StepReaderData)& theData,
-  const Standard_Integer theNum,
-  Handle(Interface_Check)& theCheck,
-  const Handle(StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem)& theEntity) const
-{
-  Standard_Integer aNum = 0;
-  theData->NamedForComplex("REPRESENTATION_ITEM", "RPRITM", theNum, aNum, theCheck);
-  // Inherited field : name 
-  Handle(TCollection_HAsciiString) aName;
-  theData->ReadString(aNum, 1, "name", theCheck, aName);
-
-  theData->NamedForComplex("STYLED_ITEM", "STYITM", theNum, aNum, theCheck);
-  // Inherited field : styles
-  Handle(StepVisual_HArray1OfPresentationStyleAssignment) aStyles;
-  Handle(StepVisual_PresentationStyleAssignment) anEnt;
-  Standard_Integer aSubNum = 0;
-  if (theData->ReadSubList(aNum, 1, "styles", theCheck, aSubNum))
-  {
-    Standard_Integer aNbParams = theData->NbParams(aSubNum);
-    aStyles = new StepVisual_HArray1OfPresentationStyleAssignment(1, aNbParams);
-    for (Standard_Integer aParamInd = 1; aParamInd <= aNbParams; aParamInd++)
-    {
-      if (theData->ReadEntity(aSubNum, aParamInd, "presentation_style_assignment", theCheck,
-          STANDARD_TYPE(StepVisual_PresentationStyleAssignment), anEnt))
-      {
-        aStyles->SetValue(aParamInd, anEnt);
-      }
-    }
-  }
-
-  // Inherited field : item
-  Handle(Standard_Transient) aItem;
-  theData->ReadEntity(aNum, 2, "item", theCheck, STANDARD_TYPE(Standard_Transient), aItem);
-
-  theData->NamedForComplex("TERMINATOR_SYMBOL", "STYITM", theNum, aNum, theCheck);
-
-  Handle(StepVisual_AnnotationCurveOccurrence) aTermonator;
-  theData->ReadEntity(aNum, 1, "annotated_curve", theCheck, STANDARD_TYPE(StepVisual_AnnotationCurveOccurrence), aTermonator);
-
-  // Initialization of the read entity
-  theEntity->Init(aName, aStyles, aItem, aTermonator);
-}
-
-//=======================================================================
-//function : WriteStep
-//purpose  :
-//=======================================================================
-void RWStepVisual_RWAnnotationLeaderTerminatorOccurrenceAndGeomReprItem::WriteStep(
-  StepData_StepWriter& theSW,
-  const Handle(StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem)& theEntity) const
-{
-  theSW.StartEntity("ANNOTATION_CURVE_OCCURRENCE");
-  theSW.StartEntity("ANNOTATION_SYMBOL_OCCURRENCE");
-  theSW.StartEntity("DRAUGHTING_ANNOTATION_OCCURRENCE");
-  theSW.StartEntity("GEOMETRIC_REPRESENTATION_ITEM");
-  theSW.StartEntity("LEADER_TERMINATOR");
-  theSW.StartEntity("REPRESENTATION_ITEM");
-  //Inherited field : name
-  theSW.Send(theEntity->Name());
-
-  theSW.StartEntity("STYLED_ITEM");
-  // Inherited field : styles
-  theSW.OpenSub();
-  for (StepVisual_HArray1OfPresentationStyleAssignment::Iterator anIter(theEntity->Styles()->Array1());
-       anIter.More(); anIter.Next())
-  {
-    theSW.Send(anIter.Value());
-  }
-  theSW.CloseSub();
-
-  // Inherited field : item
-  theSW.Send(theEntity->Item());
-
-  theSW.StartEntity("TERMINATOR_SYMBOL");
-  theSW.Send(theEntity->Terminator());
-}
-
-//=======================================================================
-//function : Share
-//purpose  :
-//=======================================================================
-void RWStepVisual_RWAnnotationLeaderTerminatorOccurrenceAndGeomReprItem::Share(
-  const Handle(StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem)& theEntity,
-  Interface_EntityIterator& theIter) const
-{
-  for (StepVisual_HArray1OfPresentationStyleAssignment::Iterator anIter(theEntity->Styles()->Array1());
-       anIter.More(); anIter.Next())
-  {
-    theIter.GetOneItem(anIter.Value());
-  }
-  theIter.GetOneItem(theEntity->Item());
-  theIter.GetOneItem(theEntity->Terminator());
-}

src/RWStepVisual/RWStepVisual_RWAnnotationLeaderTerminatorOccurrenceAndGeomReprItem.hxx

@@ -1,46 +0,0 @@
-// Copyright (c) 2023 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef _RWStepVisual_RWAnnotationLeaderTerminatorOccurrenceAndGeomReprItem_HeaderFile
-#define _RWStepVisual_RWAnnotationLeaderTerminatorOccurrenceAndGeomReprItem_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
-
-class StepData_StepReaderData;
-class Interface_Check;
-class StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem;
-class StepData_StepWriter;
-class Interface_EntityIterator;
-
-//! Read & Write Module for StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem
-class RWStepVisual_RWAnnotationLeaderTerminatorOccurrenceAndGeomReprItem
-{
-  DEFINE_STANDARD_ALLOC
-public:
-
-  RWStepVisual_RWAnnotationLeaderTerminatorOccurrenceAndGeomReprItem() {};
-
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData,
-                                const Standard_Integer theNum,
-                                Handle(Interface_Check)& theCheck,
-                                const Handle(StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem)& theEntity) const;
-
-  Standard_EXPORT void WriteStep(StepData_StepWriter& theSW,
-                                 const Handle(StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem)& theEntity) const;
-
-  Standard_EXPORT void Share(const Handle(StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem)& theEntity,
-                             Interface_EntityIterator& theIter) const;
-};
-#endif // _RWStepVisual_RWAnnotationLeaderTerminatorOccurrenceAndGeomReprItem_HeaderFile

src/RWStepVisual/RWStepVisual_RWLeaderDirectedCallout.cxx

@@ -1,99 +0,0 @@
-// Copyright (c) 2023 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#include <RWStepVisual_RWLeaderDirectedCallout.hxx>
-
-#include <Interface_Check.hxx>
-#include <Interface_EntityIterator.hxx>
-#include <StepData_StepReaderData.hxx>
-#include <StepData_StepWriter.hxx>
-#include <StepVisual_LeaderDirectedCallout.hxx>
-
-//=======================================================================
-//function : RWStepVisual_RWLeaderDirectedCallout
-//purpose  :
-//=======================================================================
-RWStepVisual_RWLeaderDirectedCallout::RWStepVisual_RWLeaderDirectedCallout() {}
-
-//=======================================================================
-//function : ReadStep
-//purpose  :
-//=======================================================================
-void RWStepVisual_RWLeaderDirectedCallout::ReadStep(const Handle(StepData_StepReaderData)& theData,
-                                                    const Standard_Integer theNum,
-                                                    Handle(Interface_Check)& theCheck,
-                                                    const Handle(StepVisual_LeaderDirectedCallout)& theEnitity) const
-{
-  if (!theData->CheckNbParams(theNum, 2, theCheck, "draughting_callout"))
-  {
-    return;
-  }
-
-  // Inherited field : name
-  Handle(TCollection_HAsciiString) aName;
-  theData->ReadString(theNum, 1, "name", theCheck, aName);
-
-  // Own field: contents
-  Handle(StepVisual_HArray1OfDraughtingCalloutElement) aContents;
-  StepVisual_DraughtingCalloutElement anEnt;
-  Standard_Integer aNbSub;
-  if (theData->ReadSubList(theNum, 2, "contents", theCheck, aNbSub))
-  {
-    Standard_Integer aNbElements = theData->NbParams(aNbSub);
-    aContents = new StepVisual_HArray1OfDraughtingCalloutElement(1, aNbElements);
-    for (Standard_Integer anInd = 1; anInd <= aNbElements; anInd++)
-    {
-      if (theData->ReadEntity(aNbSub, anInd, "content", theCheck, anEnt))
-      {
-        aContents->SetValue(anInd, anEnt);
-      }
-    }
-  }
-
-  // Initialisation of the read entity
-  theEnitity->Init(aName, aContents);
-}
-
-//=======================================================================
-//function : WriteStep
-//purpose  :
-//=======================================================================
-void RWStepVisual_RWLeaderDirectedCallout::WriteStep(StepData_StepWriter& theSW,
-                                                     const Handle(StepVisual_LeaderDirectedCallout)& theEnitity) const
-{
-  // Inherited field: name
-  theSW.Send(theEnitity->Name());
-
-  // Own field: contents
-  theSW.OpenSub();
-  for (Standard_Integer anInd = 1; anInd <= theEnitity->NbContents(); anInd++)
-  {
-    theSW.Send(theEnitity->ContentsValue(anInd).Value());
-  }
-  theSW.CloseSub();
-}
-
-//=======================================================================
-//function : Share
-//purpose  :
-//=======================================================================
-void RWStepVisual_RWLeaderDirectedCallout::Share(const Handle(StepVisual_LeaderDirectedCallout)& theEnitity,
-                                                 Interface_EntityIterator& theIter) const
-{
-  // Own field: contents
-  const Standard_Integer aNb = theEnitity->NbContents();
-  for (Standard_Integer anInd = 1; anInd <= aNb; anInd++)
-  {
-    theIter.AddItem(theEnitity->ContentsValue(anInd).Value());
-  }
-}

src/RWStepVisual/RWStepVisual_RWLeaderDirectedCallout.hxx

@@ -1,46 +0,0 @@
-// Copyright (c) 2023 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef _RWStepVisual_RWLeaderDirectedCallout_HeaderFile
-#define _RWStepVisual_RWLeaderDirectedCallout_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
-
-class Interface_EntityIterator;
-class StepData_StepReaderData;
-class Interface_Check;
-class StepVisual_LeaderDirectedCallout;
-class StepData_StepWriter;
-
-//! Read & Write Module for LeaderDirectedCallout
-class RWStepVisual_RWLeaderDirectedCallout
-{
-  DEFINE_STANDARD_ALLOC
-public:
-
-  Standard_EXPORT RWStepVisual_RWLeaderDirectedCallout();
-
-  Standard_EXPORT void ReadStep(const Handle(StepData_StepReaderData)& theData,
-                                const Standard_Integer theNum,
-                                Handle(Interface_Check)& theCheck,
-                                const Handle(StepVisual_LeaderDirectedCallout)& theEntity) const;
-
-  Standard_EXPORT void WriteStep(StepData_StepWriter& SW,
-                                 const Handle(StepVisual_LeaderDirectedCallout)& theEntity) const;
-
-  Standard_EXPORT void Share(const Handle(StepVisual_LeaderDirectedCallout)& theEntity,
-                             Interface_EntityIterator& theIter)  const;
-};
-#endif // _RWStepVisual_RWLeaderDirectedCallout_HeaderFile

src/STEPCAFControl/STEPCAFControl_Reader.cxx

@@ -4692,16 +4692,9 @@ void collectRepresentationItems(const Interface_Graph& theGraph,
   const Handle(StepShape_ShapeRepresentation)& theRepresentation,
   NCollection_Sequence<Handle(StepRepr_RepresentationItem)>& theItems)
 {
-  for(StepRepr_HArray1OfRepresentationItem::Iterator anIter(theRepresentation->Items()->Array1());
-      anIter.More(); anIter.Next())
-  {
-    const Handle(StepRepr_RepresentationItem)& anReprItem = anIter.Value();
-    if (anReprItem.IsNull())
-    {
-      continue;
-    }
-    theItems.Append(anReprItem);
-  }
+  Handle(StepRepr_HArray1OfRepresentationItem) aReprItems = theRepresentation->Items();
+  for (Standard_Integer itemIt = aReprItems->Lower(); itemIt <= aReprItems->Upper(); itemIt++)
+    theItems.Append(aReprItems->Value(itemIt));
 
   Interface_EntityIterator entIt = theGraph.TypedSharings(theRepresentation, STANDARD_TYPE(StepRepr_RepresentationRelationship));
   for (entIt.Start(); entIt.More(); entIt.Next())

src/StepAP214/StepAP214_Protocol.cxx

@@ -163,7 +163,6 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepGeom_Hyperbola.hxx>
 #include <StepGeom_IntersectionCurve.hxx>
 #include <StepVisual_Invisibility.hxx>
-#include <StepVisual_LeaderDirectedCallout.hxx>
 #include <StepBasic_LengthUnit.hxx>
 #include <StepGeom_Line.hxx>
 #include <StepBasic_LocalTime.hxx>
@@ -664,8 +663,6 @@ static Standard_CString schemaAP242DIS = "AP242_MANAGED_MODEL_BASED_3D_ENGINEERI
 #include <StepVisual_CameraModelD3MultiClipping.hxx>
 #include <StepVisual_CameraModelD3MultiClippingIntersection.hxx>
 #include <StepVisual_CameraModelD3MultiClippingUnion.hxx>
-#include <StepVisual_AnnotationLeaderCurveOccurrenceAndGeomReprItem.hxx>
-#include <StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem.hxx>
 #include <StepVisual_AnnotationCurveOccurrenceAndGeomReprItem.hxx>
 
 // Added for kinematics implementation
@@ -1561,9 +1558,6 @@ StepAP214_Protocol::StepAP214_Protocol ()
   types.Bind(STANDARD_TYPE(StepVisual_ComplexTriangulatedSurfaceSet), 816);
   types.Bind(STANDARD_TYPE(StepVisual_CubicBezierTessellatedEdge), 817);
   types.Bind(STANDARD_TYPE(StepVisual_CubicBezierTriangulatedFace), 818);
-  types.Bind(STANDARD_TYPE(StepVisual_AnnotationLeaderCurveOccurrenceAndGeomReprItem), 820);
-  types.Bind(STANDARD_TYPE(StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem), 821);
-  types.Bind(STANDARD_TYPE(StepVisual_LeaderDirectedCallout), 824);
 }
 
 

src/StepVisual/FILES

@@ -0,0 +1,310 @@
+StepVisual_AnnotationCurveOccurrence.cxx
+StepVisual_AnnotationCurveOccurrence.hxx
+StepVisual_AnnotationCurveOccurrenceAndGeomReprItem.cxx
+StepVisual_AnnotationCurveOccurrenceAndGeomReprItem.hxx
+StepVisual_AnnotationFillArea.cxx
+StepVisual_AnnotationFillArea.hxx
+StepVisual_AnnotationFillAreaOccurrence.cxx
+StepVisual_AnnotationFillAreaOccurrence.hxx
+StepVisual_AnnotationOccurrence.cxx
+StepVisual_AnnotationOccurrence.hxx
+StepVisual_AnnotationPlane.cxx
+StepVisual_AnnotationPlane.hxx
+StepVisual_AnnotationPlaneElement.cxx
+StepVisual_AnnotationPlaneElement.hxx
+StepVisual_AnnotationText.cxx
+StepVisual_AnnotationText.hxx
+StepVisual_AnnotationTextOccurrence.cxx
+StepVisual_AnnotationTextOccurrence.hxx
+StepVisual_AreaInSet.cxx
+StepVisual_AreaInSet.hxx
+StepVisual_AreaOrView.cxx
+StepVisual_AreaOrView.hxx
+StepVisual_Array1OfAnnotationPlaneElement.hxx
+StepVisual_Array1OfBoxCharacteristicSelect.hxx
+StepVisual_Array1OfCameraModelD3MultiClippingInterectionSelect.hxx
+StepVisual_Array1OfCameraModelD3MultiClippingUnionSelect.hxx
+StepVisual_Array1OfCurveStyleFontPattern.hxx
+StepVisual_Array1OfDirectionCountSelect.hxx
+StepVisual_Array1OfDraughtingCalloutElement.hxx
+StepVisual_Array1OfFillStyleSelect.hxx
+StepVisual_Array1OfInvisibleItem.hxx
+StepVisual_Array1OfLayeredItem.hxx
+StepVisual_Array1OfPresentationStyleAssignment.hxx
+StepVisual_Array1OfPresentationStyleSelect.hxx
+StepVisual_Array1OfRenderingPropertiesSelect.hxx
+StepVisual_Array1OfStyleContextSelect.hxx
+StepVisual_Array1OfSurfaceStyleElementSelect.hxx
+StepVisual_Array1OfTextOrCharacter.hxx
+StepVisual_BackgroundColour.cxx
+StepVisual_BackgroundColour.hxx
+StepVisual_BoxCharacteristicSelect.cxx
+StepVisual_BoxCharacteristicSelect.hxx
+StepVisual_CameraImage.cxx
+StepVisual_CameraImage.hxx
+StepVisual_CameraImage2dWithScale.cxx
+StepVisual_CameraImage2dWithScale.hxx
+StepVisual_CameraImage3dWithScale.cxx
+StepVisual_CameraImage3dWithScale.hxx
+StepVisual_CameraModel.cxx
+StepVisual_CameraModel.hxx
+StepVisual_CameraModelD2.cxx
+StepVisual_CameraModelD2.hxx
+StepVisual_CameraModelD3.cxx
+StepVisual_CameraModelD3.hxx
+StepVisual_CameraModelD3MultiClipping.cxx
+StepVisual_CameraModelD3MultiClipping.hxx
+StepVisual_CameraModelD3MultiClippingInterectionSelect.cxx
+StepVisual_CameraModelD3MultiClippingInterectionSelect.hxx
+StepVisual_CameraModelD3MultiClippingIntersection.cxx
+StepVisual_CameraModelD3MultiClippingIntersection.hxx
+StepVisual_CameraModelD3MultiClippingUnion.cxx
+StepVisual_CameraModelD3MultiClippingUnion.hxx
+StepVisual_CameraModelD3MultiClippingUnionSelect.cxx
+StepVisual_CameraModelD3MultiClippingUnionSelect.hxx
+StepVisual_CameraUsage.cxx
+StepVisual_CameraUsage.hxx
+StepVisual_CentralOrParallel.hxx
+StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel.cxx
+StepVisual_CharacterizedObjAndRepresentationAndDraughtingModel.hxx
+StepVisual_Colour.cxx
+StepVisual_Colour.hxx
+StepVisual_ColourRgb.cxx
+StepVisual_ColourRgb.hxx
+StepVisual_ColourSpecification.cxx
+StepVisual_ColourSpecification.hxx
+StepVisual_CompositeText.cxx
+StepVisual_CompositeText.hxx
+StepVisual_CompositeTextWithExtent.cxx
+StepVisual_CompositeTextWithExtent.hxx
+StepVisual_ContextDependentInvisibility.cxx
+StepVisual_ContextDependentInvisibility.hxx
+StepVisual_ContextDependentOverRidingStyledItem.cxx
+StepVisual_ContextDependentOverRidingStyledItem.hxx
+StepVisual_CurveStyle.cxx
+StepVisual_CurveStyle.hxx
+StepVisual_CurveStyleFont.cxx
+StepVisual_CurveStyleFont.hxx
+StepVisual_CurveStyleFontPattern.cxx
+StepVisual_CurveStyleFontPattern.hxx
+StepVisual_CurveStyleFontSelect.cxx
+StepVisual_CurveStyleFontSelect.hxx
+StepVisual_DirectionCountSelect.cxx
+StepVisual_DirectionCountSelect.hxx
+StepVisual_DraughtingAnnotationOccurrence.cxx
+StepVisual_DraughtingAnnotationOccurrence.hxx
+StepVisual_DraughtingCallout.cxx
+StepVisual_DraughtingCallout.hxx
+StepVisual_DraughtingCalloutElement.cxx
+StepVisual_DraughtingCalloutElement.hxx
+StepVisual_DraughtingModel.cxx
+StepVisual_DraughtingModel.hxx
+StepVisual_DraughtingPreDefinedColour.cxx
+StepVisual_DraughtingPreDefinedColour.hxx
+StepVisual_DraughtingPreDefinedCurveFont.cxx
+StepVisual_DraughtingPreDefinedCurveFont.hxx
+StepVisual_ExternallyDefinedCurveFont.cxx
+StepVisual_ExternallyDefinedCurveFont.hxx
+StepVisual_ExternallyDefinedTextFont.cxx
+StepVisual_ExternallyDefinedTextFont.hxx
+StepVisual_FillAreaStyle.cxx
+StepVisual_FillAreaStyle.hxx
+StepVisual_FillAreaStyleColour.cxx
+StepVisual_FillAreaStyleColour.hxx
+StepVisual_FillStyleSelect.cxx
+StepVisual_FillStyleSelect.hxx
+StepVisual_FontSelect.cxx
+StepVisual_FontSelect.hxx
+StepVisual_HArray1OfAnnotationPlaneElement.hxx
+StepVisual_HArray1OfBoxCharacteristicSelect.hxx
+StepVisual_HArray1OfCameraModelD3MultiClippingInterectionSelect.hxx
+StepVisual_HArray1OfCameraModelD3MultiClippingUnionSelect.hxx
+StepVisual_HArray1OfCurveStyleFontPattern.hxx
+StepVisual_HArray1OfDirectionCountSelect.hxx
+StepVisual_HArray1OfDraughtingCalloutElement.hxx
+StepVisual_HArray1OfFillStyleSelect.hxx
+StepVisual_HArray1OfInvisibleItem.hxx
+StepVisual_HArray1OfLayeredItem.hxx
+StepVisual_HArray1OfPresentationStyleAssignment.hxx
+StepVisual_HArray1OfPresentationStyleSelect.hxx
+StepVisual_HArray1OfRenderingPropertiesSelect.hxx
+StepVisual_HArray1OfStyleContextSelect.hxx
+StepVisual_HArray1OfSurfaceStyleElementSelect.hxx
+StepVisual_HArray1OfTextOrCharacter.hxx
+StepVisual_Invisibility.cxx
+StepVisual_Invisibility.hxx
+StepVisual_InvisibilityContext.cxx
+StepVisual_InvisibilityContext.hxx
+StepVisual_InvisibleItem.cxx
+StepVisual_InvisibleItem.hxx
+StepVisual_LayeredItem.cxx
+StepVisual_LayeredItem.hxx
+StepVisual_MarkerMember.cxx
+StepVisual_MarkerMember.hxx
+StepVisual_MarkerSelect.cxx
+StepVisual_MarkerSelect.hxx
+StepVisual_MarkerType.hxx
+StepVisual_MechanicalDesignGeometricPresentationArea.cxx
+StepVisual_MechanicalDesignGeometricPresentationArea.hxx
+StepVisual_MechanicalDesignGeometricPresentationRepresentation.cxx
+StepVisual_MechanicalDesignGeometricPresentationRepresentation.hxx
+StepVisual_NullStyle.hxx
+StepVisual_NullStyleMember.cxx
+StepVisual_NullStyleMember.hxx
+StepVisual_OverRidingStyledItem.cxx
+StepVisual_OverRidingStyledItem.hxx
+StepVisual_PlanarBox.cxx
+StepVisual_PlanarBox.hxx
+StepVisual_PlanarExtent.cxx
+StepVisual_PlanarExtent.hxx
+StepVisual_PointStyle.cxx
+StepVisual_PointStyle.hxx
+StepVisual_PreDefinedColour.cxx
+StepVisual_PreDefinedColour.hxx
+StepVisual_PreDefinedCurveFont.cxx
+StepVisual_PreDefinedCurveFont.hxx
+StepVisual_PreDefinedItem.cxx
+StepVisual_PreDefinedItem.hxx
+StepVisual_PreDefinedTextFont.cxx
+StepVisual_PreDefinedTextFont.hxx
+StepVisual_PresentationArea.cxx
+StepVisual_PresentationArea.hxx
+StepVisual_PresentationLayerAssignment.cxx
+StepVisual_PresentationLayerAssignment.hxx
+StepVisual_PresentationLayerUsage.cxx
+StepVisual_PresentationLayerUsage.hxx
+StepVisual_PresentationRepresentation.cxx
+StepVisual_PresentationRepresentation.hxx
+StepVisual_PresentationRepresentationSelect.cxx
+StepVisual_PresentationRepresentationSelect.hxx
+StepVisual_PresentationSet.cxx
+StepVisual_PresentationSet.hxx
+StepVisual_PresentationSize.cxx
+StepVisual_PresentationSize.hxx
+StepVisual_PresentationSizeAssignmentSelect.cxx
+StepVisual_PresentationSizeAssignmentSelect.hxx
+StepVisual_PresentationStyleAssignment.cxx
+StepVisual_PresentationStyleAssignment.hxx
+StepVisual_PresentationStyleByContext.cxx
+StepVisual_PresentationStyleByContext.hxx
+StepVisual_PresentationStyleSelect.cxx
+StepVisual_PresentationStyleSelect.hxx
+StepVisual_PresentationView.cxx
+StepVisual_PresentationView.hxx
+StepVisual_PresentedItem.cxx
+StepVisual_PresentedItem.hxx
+StepVisual_PresentedItemRepresentation.cxx
+StepVisual_PresentedItemRepresentation.hxx
+StepVisual_RenderingPropertiesSelect.cxx
+StepVisual_RenderingPropertiesSelect.hxx
+StepVisual_RepositionedTessellatedGeometricSet.hxx
+StepVisual_RepositionedTessellatedGeometricSet.cxx
+StepVisual_RepositionedTessellatedItem.hxx
+StepVisual_RepositionedTessellatedItem.cxx
+StepVisual_ShadingSurfaceMethod.hxx
+StepVisual_StyleContextSelect.cxx
+StepVisual_StyleContextSelect.hxx
+StepVisual_StyledItem.cxx
+StepVisual_StyledItem.hxx
+StepVisual_StyledItemTarget.cxx
+StepVisual_StyledItemTarget.hxx
+StepVisual_SurfaceSide.hxx
+StepVisual_SurfaceSideStyle.cxx
+StepVisual_SurfaceSideStyle.hxx
+StepVisual_SurfaceStyleBoundary.cxx
+StepVisual_SurfaceStyleBoundary.hxx
+StepVisual_SurfaceStyleControlGrid.cxx
+StepVisual_SurfaceStyleControlGrid.hxx
+StepVisual_SurfaceStyleElementSelect.cxx
+StepVisual_SurfaceStyleElementSelect.hxx
+StepVisual_SurfaceStyleFillArea.cxx
+StepVisual_SurfaceStyleFillArea.hxx
+StepVisual_SurfaceStyleParameterLine.cxx
+StepVisual_SurfaceStyleParameterLine.hxx
+StepVisual_SurfaceStyleReflectanceAmbient.cxx
+StepVisual_SurfaceStyleReflectanceAmbient.hxx
+StepVisual_SurfaceStyleRendering.cxx
+StepVisual_SurfaceStyleRendering.hxx
+StepVisual_SurfaceStyleRenderingWithProperties.cxx
+StepVisual_SurfaceStyleRenderingWithProperties.hxx
+StepVisual_SurfaceStyleSegmentationCurve.cxx
+StepVisual_SurfaceStyleSegmentationCurve.hxx
+StepVisual_SurfaceStyleSilhouette.cxx
+StepVisual_SurfaceStyleSilhouette.hxx
+StepVisual_SurfaceStyleTransparent.cxx
+StepVisual_SurfaceStyleTransparent.hxx
+StepVisual_SurfaceStyleUsage.cxx
+StepVisual_SurfaceStyleUsage.hxx
+StepVisual_Template.cxx
+StepVisual_Template.hxx
+StepVisual_TemplateInstance.cxx
+StepVisual_TemplateInstance.hxx
+StepVisual_TextLiteral.cxx
+StepVisual_TextLiteral.hxx
+StepVisual_TextOrCharacter.cxx
+StepVisual_TextOrCharacter.hxx
+StepVisual_TextPath.hxx
+StepVisual_TextStyle.cxx
+StepVisual_TextStyle.hxx
+StepVisual_TextStyleForDefinedFont.cxx
+StepVisual_TextStyleForDefinedFont.hxx
+StepVisual_TextStyleWithBoxCharacteristics.cxx
+StepVisual_TextStyleWithBoxCharacteristics.hxx
+StepVisual_ViewVolume.cxx
+StepVisual_ViewVolume.hxx
+StepVisual_TessellatedAnnotationOccurrence.hxx
+StepVisual_TessellatedAnnotationOccurrence.cxx
+StepVisual_TessellatedItem.hxx
+StepVisual_TessellatedItem.cxx
+StepVisual_TessellatedGeometricSet.hxx
+StepVisual_TessellatedGeometricSet.cxx
+StepVisual_TessellatedCurveSet.hxx
+StepVisual_TessellatedCurveSet.cxx
+StepVisual_CoordinatesList.hxx
+StepVisual_CoordinatesList.cxx
+StepVisual_Array1OfTessellatedEdgeOrVertex.hxx
+StepVisual_Array1OfTessellatedStructuredItem.hxx
+StepVisual_ComplexTriangulatedFace.cxx
+StepVisual_ComplexTriangulatedFace.hxx
+StepVisual_ComplexTriangulatedSurfaceSet.cxx
+StepVisual_ComplexTriangulatedSurfaceSet.hxx
+StepVisual_CubicBezierTessellatedEdge.cxx
+StepVisual_CubicBezierTessellatedEdge.hxx
+StepVisual_CubicBezierTriangulatedFace.cxx
+StepVisual_CubicBezierTriangulatedFace.hxx
+StepVisual_EdgeOrCurve.cxx
+StepVisual_EdgeOrCurve.hxx
+StepVisual_FaceOrSurface.cxx
+StepVisual_FaceOrSurface.hxx
+StepVisual_HArray1OfTessellatedEdgeOrVertex.hxx
+StepVisual_HArray1OfTessellatedStructuredItem.hxx
+StepVisual_PathOrCompositeCurve.cxx
+StepVisual_PathOrCompositeCurve.hxx
+StepVisual_TessellatedConnectingEdge.cxx
+StepVisual_TessellatedConnectingEdge.hxx
+StepVisual_TessellatedEdge.cxx
+StepVisual_TessellatedEdge.hxx
+StepVisual_TessellatedEdgeOrVertex.cxx
+StepVisual_TessellatedEdgeOrVertex.hxx
+StepVisual_TessellatedFace.cxx
+StepVisual_TessellatedFace.hxx
+StepVisual_TessellatedPointSet.cxx
+StepVisual_TessellatedPointSet.hxx
+StepVisual_TessellatedShapeRepresentation.cxx
+StepVisual_TessellatedShapeRepresentation.hxx
+StepVisual_TessellatedShapeRepresentationWithAccuracyParameters.cxx
+StepVisual_TessellatedShapeRepresentationWithAccuracyParameters.hxx
+StepVisual_TessellatedShell.cxx
+StepVisual_TessellatedShell.hxx
+StepVisual_TessellatedSolid.cxx
+StepVisual_TessellatedSolid.hxx
+StepVisual_TessellatedStructuredItem.cxx
+StepVisual_TessellatedStructuredItem.hxx
+StepVisual_TessellatedSurfaceSet.cxx
+StepVisual_TessellatedSurfaceSet.hxx
+StepVisual_TessellatedVertex.cxx
+StepVisual_TessellatedVertex.hxx
+StepVisual_TessellatedWire.cxx
+StepVisual_TessellatedWire.hxx
+StepVisual_TriangulatedFace.cxx
+StepVisual_TriangulatedFace.hxx

src/StepVisual/StepVisual_AnnotationLeaderCurveOccurrenceAndGeomReprItem.cxx

@@ -1,22 +0,0 @@
-// Copyright (c) 2023 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#include <StepVisual_AnnotationLeaderCurveOccurrenceAndGeomReprItem.hxx>
-
-IMPLEMENT_STANDARD_RTTIEXT(StepVisual_AnnotationLeaderCurveOccurrenceAndGeomReprItem, StepVisual_AnnotationCurveOccurrence)
-
-//=======================================================================
-//function : StepVisual_AnnotationLeaderCurveOccurrenceAndGeomReprItem
-//purpose  :
-//=======================================================================
-StepVisual_AnnotationLeaderCurveOccurrenceAndGeomReprItem::StepVisual_AnnotationLeaderCurveOccurrenceAndGeomReprItem() {}

src/StepVisual/StepVisual_AnnotationLeaderCurveOccurrenceAndGeomReprItem.hxx

@@ -1,34 +0,0 @@
-// Copyright (c) 2023 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef _StepVisual_AnnotationLeaderCurveOccurrenceAndGeomReprItem_HeaderFile
-#define _StepVisual_AnnotationLeaderCurveOccurrenceAndGeomReprItem_HeaderFile
-
-#include <Standard.hxx>
-
-#include <StepVisual_AnnotationCurveOccurrence.hxx>
-
-//! Added for Dimensional Tolerances
-//! Complex STEP entity AnnotationOccurrence & AnnotationOccurrence
-//! & DraughtingAnnotationOccurrence & GeometricRepresentationItem
-//! & LeaderCurve & RepresentationItem & StyledItem
-class StepVisual_AnnotationLeaderCurveOccurrenceAndGeomReprItem : public StepVisual_AnnotationCurveOccurrence
-{
-public:
-
-  Standard_EXPORT StepVisual_AnnotationLeaderCurveOccurrenceAndGeomReprItem();
-
-  DEFINE_STANDARD_RTTIEXT(StepVisual_AnnotationLeaderCurveOccurrenceAndGeomReprItem, StepVisual_AnnotationCurveOccurrence)
-
-};
-#endif // _StepVisual_AnnotationLeaderCurveOccurrenceAndGeomReprItem_HeaderFile

src/StepVisual/StepVisual_AnnotationLeaderTerminatorCurveOccurrenceAndGeomReprItem.cxx

@@ -1,35 +0,0 @@
-// Copyright (c) 2023 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#include <StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem.hxx>
-
-IMPLEMENT_STANDARD_RTTIEXT(StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem, StepVisual_AnnotationCurveOccurrence)
-
-//=======================================================================
-//function : StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem
-//purpose  :
-//=======================================================================
-StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem::StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem() {}
-
-//=======================================================================
-//function : Init
-//purpose  :
-//=======================================================================
-void StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem::Init(const Handle(TCollection_HAsciiString)& theName,
-                                                                               const Handle(StepVisual_HArray1OfPresentationStyleAssignment)& theStyles,
-                                                                               const Handle(Standard_Transient)& theItem,
-                                                                               const Handle(StepVisual_AnnotationCurveOccurrence)& theAnnotatedTerminator)
-{
-  StepVisual_StyledItem::Init(theName, theStyles, theItem);
-  myAnnotatedTerminator = theAnnotatedTerminator;
-}

src/StepVisual/StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem.cxx

@@ -1,35 +0,0 @@
-// Copyright (c) 2023 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#include <StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem.hxx>
-
-IMPLEMENT_STANDARD_RTTIEXT(StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem, StepVisual_AnnotationOccurrence)
-
-//=======================================================================
-//function : StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem
-//purpose  :
-//=======================================================================
-StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem::StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem() {}
-
-//=======================================================================
-//function : Init
-//purpose  :
-//=======================================================================
-void StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem::Init(const Handle(TCollection_HAsciiString)& theName,
-                                                                               const Handle(StepVisual_HArray1OfPresentationStyleAssignment)& theStyles,
-                                                                               const Handle(Standard_Transient)& theItem,
-                                                                               const Handle(StepVisual_AnnotationCurveOccurrence)& theAnnotatedTerminator)
-{
-  StepVisual_StyledItem::Init(theName, theStyles, theItem);
-  myAnnotatedTerminator = theAnnotatedTerminator;
-}

src/StepVisual/StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem.hxx

@@ -1,46 +0,0 @@
-// Copyright (c) 2023 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef _StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem_HeaderFile
-#define _StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem_HeaderFile
-
-#include <Standard.hxx>
-
-#include <StepVisual_AnnotationCurveOccurrence.hxx>
-
-//! Added for Dimensional Tolerances
-//! Complex STEP entity AnnotationOccurrence & AnnotationSymbolOccurrence
-//! & DraughtingAnnotationOccurrence & GeometricRepresentationItem
-//! & LeaderTerminator & RepresentationItem & StyledItem
-class StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem : public StepVisual_AnnotationOccurrence
-{
-public:
-
-  Standard_EXPORT StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem();
-  
-  Standard_EXPORT void Init(const Handle(TCollection_HAsciiString)& theName,
-                            const Handle(StepVisual_HArray1OfPresentationStyleAssignment)& theStyles,
-                            const Handle(Standard_Transient)& theItem,
-                            const Handle(StepVisual_AnnotationCurveOccurrence)& theAnnotatedTerminator);
-
-  const Handle(StepVisual_AnnotationCurveOccurrence)& Terminator() const { return myAnnotatedTerminator; }
-
-  void SetTerminator(const Handle(StepVisual_AnnotationCurveOccurrence)& theAnnotatedTerminator) { myAnnotatedTerminator = theAnnotatedTerminator; }
-
-  DEFINE_STANDARD_RTTIEXT(StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem, StepVisual_AnnotationOccurrence)
-
-private:
-
-  Handle(StepVisual_AnnotationCurveOccurrence) myAnnotatedTerminator;
-};
-#endif // _StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem_HeaderFile

src/StepVisual/StepVisual_DraughtingCalloutElement.cxx

@@ -14,11 +14,9 @@
 // commercial license or contractual agreement.
 
 #include <StepVisual_DraughtingCalloutElement.hxx>
-
 #include <Interface_Macros.hxx>
 #include <StepVisual_AnnotationCurveOccurrence.hxx>
 #include <StepVisual_AnnotationFillAreaOccurrence.hxx>
-#include <StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem.hxx>
 #include <StepVisual_AnnotationTextOccurrence.hxx>
 #include <StepVisual_TessellatedAnnotationOccurrence.hxx>
 
@@ -26,12 +24,14 @@
 //function : StepVisual_DraughtingCalloutElement
 //purpose  : 
 //=======================================================================
-StepVisual_DraughtingCalloutElement::StepVisual_DraughtingCalloutElement() {}
+
+StepVisual_DraughtingCalloutElement::StepVisual_DraughtingCalloutElement () {  }
 
 //=======================================================================
 //function : CaseNum
-//purpose  :
+//purpose  : 
 //=======================================================================
+
 Standard_Integer StepVisual_DraughtingCalloutElement::CaseNum(const Handle(Standard_Transient)& ent) const
 {
   if (ent.IsNull()) return 0;
@@ -39,51 +39,17 @@ Standard_Integer StepVisual_DraughtingCalloutElement::CaseNum(const Handle(Stand
   if (ent->IsKind(STANDARD_TYPE(StepVisual_AnnotationTextOccurrence))) return 2;
   if (ent->IsKind(STANDARD_TYPE(StepVisual_TessellatedAnnotationOccurrence))) return 3;
   if (ent->IsKind(STANDARD_TYPE(StepVisual_AnnotationFillAreaOccurrence))) return 4;
-  if (ent->IsKind(STANDARD_TYPE(StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem))) return 5;
   return 0;
 }
 
-//=======================================================================
-//function : AnnotationCurveOccurrence
-//purpose  :
-//=======================================================================
 Handle(StepVisual_AnnotationCurveOccurrence) StepVisual_DraughtingCalloutElement::AnnotationCurveOccurrence() const
-{
-  return GetCasted(StepVisual_AnnotationCurveOccurrence, Value());
-}
+{  return GetCasted(StepVisual_AnnotationCurveOccurrence,Value());  }
 
-//=======================================================================
-//function : TessellatedAnnotationOccurrence
-//purpose  :
-//=======================================================================
 Handle(StepVisual_TessellatedAnnotationOccurrence) StepVisual_DraughtingCalloutElement::TessellatedAnnotationOccurrence()  const
-{
-  return GetCasted(StepVisual_TessellatedAnnotationOccurrence, Value());
-}
+{  return GetCasted(StepVisual_TessellatedAnnotationOccurrence,Value()); } 
 
-//=======================================================================
-//function : AnnotationTextOccurrence
-//purpose  :
-//=======================================================================
 Handle(StepVisual_AnnotationTextOccurrence) StepVisual_DraughtingCalloutElement::AnnotationTextOccurrence()  const
-{
-  return GetCasted(StepVisual_AnnotationTextOccurrence, Value());
-}
+{  return GetCasted(StepVisual_AnnotationTextOccurrence, Value()); }
 
-//=======================================================================
-//function : AnnotationFillAreaOccurrence
-//purpose  :
-//=======================================================================
 Handle(StepVisual_AnnotationFillAreaOccurrence) StepVisual_DraughtingCalloutElement::AnnotationFillAreaOccurrence()  const
-{
-  return GetCasted(StepVisual_AnnotationFillAreaOccurrence, Value());
-}
-
-//=======================================================================
-//function : AnnotationLeaderTerminatorOccurrence
-//purpose  :
-//=======================================================================
-Handle(StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem) StepVisual_DraughtingCalloutElement::AnnotationLeaderTerminatorOccurrence() const
-{
-  return GetCasted(StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem, Value());
-}
+{ return GetCasted(StepVisual_AnnotationFillAreaOccurrence, Value()); }

src/StepVisual/StepVisual_DraughtingCalloutElement.hxx

@@ -25,7 +25,6 @@
 class Standard_Transient;
 class StepVisual_AnnotationCurveOccurrence;
 class StepVisual_AnnotationFillAreaOccurrence;
-class StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem;
 class StepVisual_AnnotationTextOccurrence;
 class StepVisual_TessellatedAnnotationOccurrence;
 
@@ -43,7 +42,6 @@ public:
   //! 2 -> AnnotationTextOccurrence
   //! 3 -> TessellatedAnnotationOccurrence
   //! 4 -> AnnotationFillAreaOccurrence
-  //! 5 -> AnnotationLeaderTerminatorOccurrence
   //! 0 else
   Standard_EXPORT Standard_Integer CaseNum (const Handle(Standard_Transient)& ent)  const;
   
@@ -58,9 +56,5 @@ public:
 
   //! returns Value as a AnnotationFillAreaOccurrence
   Standard_EXPORT Handle(StepVisual_AnnotationFillAreaOccurrence) AnnotationFillAreaOccurrence()  const;
-
-  //! returns Value as a AnnotationLeaderTerminatorOccurrence
-  Standard_EXPORT Handle(StepVisual_AnnotationLeaderTerminatorOccurrenceAndGeomReprItem) AnnotationLeaderTerminatorOccurrence() const;
-
 };
 #endif // StepVisual_DraughtingCalloutElement

src/StepVisual/StepVisual_LeaderDirectedCallout.cxx

@@ -1,22 +0,0 @@
-// Copyright (c) 2023 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#include <StepVisual_LeaderDirectedCallout.hxx>
-
-IMPLEMENT_STANDARD_RTTIEXT(StepVisual_LeaderDirectedCallout, StepVisual_DraughtingCallout)
-
-//=======================================================================
-//function : StepVisual_LeaderDirectedCallout
-//purpose  :
-//=======================================================================
-StepVisual_LeaderDirectedCallout::StepVisual_LeaderDirectedCallout ()  {}

src/StepVisual/StepVisual_LeaderDirectedCallout.hxx

@@ -1,28 +0,0 @@
-// Copyright (c) 2023 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef _StepVisual_LeaderDirectedCallout_HeaderFile
-#define _StepVisual_LeaderDirectedCallout_HeaderFile
-
-#include <StepVisual_DraughtingCallout.hxx>
-
-class StepVisual_LeaderDirectedCallout : public StepVisual_DraughtingCallout
-{
-public:
-
-  //! Returns a LeaderDirectedCallout
-  Standard_EXPORT StepVisual_LeaderDirectedCallout();
-
-  DEFINE_STANDARD_RTTIEXT(StepVisual_LeaderDirectedCallout, StepVisual_DraughtingCallout)
-};
-#endif // _StepVisual_LeaderDirectedCallout_HeaderFile

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/bugs/step/bug33331

@@ -1,14 +0,0 @@
-puts "===================================="
-puts "0033331: Data Exchange, Step Import - Unsupported Representation Items"
-puts "===================================="
-puts ""
-
-pload DCAF
-Close D -silent
-
-param "read.stepcaf.subshapes.name" 1
-
-ReadStep D [locate_data_file bug33331.stp]
-
-param "read.stepcaf.subshapes.name" 0
-Close D

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
-}